diff options
| -rw-r--r-- | Next/SHA1s | 342 | ||||
| -rw-r--r-- | Next/Trees | 344 | ||||
| -rw-r--r-- | Next/merge.log | 12823 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 13510 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..f5b0948a766f --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,342 @@ +Name SHA1 +---- ---- +origin e359bce39d9085ab24eaa0bb0778bb5f6894144a +fixes e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +kbuild-current bcbcf50f521843445c9ea320a0569874f88c4b7a +arc-current 1582f08d83d7899410fb111eba560c26ace249a1 +arm-current d2f7eca60b29006285d57c7035539e33300e89e5 +arm64-fixes 22315a2296f4c251fa92aec45fbbae37e9301b6c +arm-soc-fixes b5144a2bf401f06962761b9d16ad8f0983213582 +drivers-memory-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +m68k-current 34e5269bf987aff9a33ad3ab4f5d65c02913cbc1 +powerpc-fixes 791f9e36599d94af5a76d3f74d04e16326761aae +s390-fixes a994eddb947ea9ebb7b14d9a1267001699f0a136 +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current d19d8d345eecd9247cbe6cbf27aef271bd88aba7 +net bbd6f0a948139970f4a615dff189d9a503681a39 +bpf b02265429681c9c827c45978a61a9f00be5ea9aa +ipsec b515d2637276a3810d6595e10ab02c13bfd0b63a +netfilter bbd6f0a948139970f4a615dff189d9a503681a39 +ipvs 4acd47644ef1e1c8f8f5bc40b7cf1c5b9bcbbc4e +wireless-drivers e7020bb068d8be50a92f48e36b236a1a1ef9282e +mac80211 eefb45eef5c4c425e87667af8f5e904fbdd47abf +rdma-fixes d434405aaab7d0ebc516b68a8fc4100922d7f5ef +sound-current e861431303d23428bf26e8496252d7bee260a956 +sound-asoc-fixes d143a69fd452a047440391fcbe290ff416b14ab5 +regmap-fixes 78d889705732ba856feee4d7bfa74a12fe48c480 +regulator-fixes 0bbefa641a324b5416a88189069ff5a30975970c +spi-fixes cc4e1ea50bba32eadc0a05ec17f628fb92e91458 +pci-current cf673bd0cc973b25961d41355990beaed710068f +driver-core.current 4a0225c3d208cfa6e4550f2210ffd9114a952a81 +tty.current 4a0225c3d208cfa6e4550f2210ffd9114a952a81 +usb.current 4a0225c3d208cfa6e4550f2210ffd9114a952a81 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes 0d02ec6b3136c73c09e7859f0d0e4e2c4c07b49b +usb-chipidea-fixes c1d8a521dbd765bbcd8cda74527f87a8f60104cc +phy da848f9a0e139bd0ad21afbdd425214d9f3d3b91 +staging.current 4a0225c3d208cfa6e4550f2210ffd9114a952a81 +iio-fixes 4d28b580e80a214d18bd2bf15162d0f9052e4dfc +char-misc.current 8e3a3249502d8ff92d73d827fb41dd44c5a16f76 +soundwire-fixes fde5d7f27108a444aa288ab9dfaa0a0c25e80b6d +thunderbolt-fixes 9f4ad9e425a1d3b6a34617b8ea226d56a119a717 +input-current 56cfe6f820a6315291eb5a1b82bb49633b993d3b +crypto-current e3a606f2c544b231f6079c8c5fea451e772e1139 +ide 6800cd8cbc6e35989f8d1aa20fac58031231b90f +vfio-fixes 909290786ea335366e21d7f1ed5812b90f2f0a92 +kselftest-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +dmaengine-fixes ea9aadc06a9f10ad20a90edc0a484f1147d88a7a +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 9c1a07442c95f6e64dc8de099e9f35ea73db7852 +kvms390-fixes 735931f9a51ab09cf795721b37696b420484625f +hwmon-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +nvdimm-fixes 99a81dcc717ddd41b069eb6f8271cde469db2da3 +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes 3b7ec4d1b5cbc9ac08b540b403d7c363b3a65a61 +vfs-fixes 173e84953eaaf17864a707efa2b8cd4c233b3129 +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes a3790a8a94fc0234c5d38013b48e74ef221ec84c +samsung-krzk-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +pinctrl-samsung-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +devicetree-fixes d473d32c2fbac2d1d7082c61899cfebd34eb267a +scsi-fixes e4ec10228fdf09b88ba018009f14a696fb50d3f2 +drm-fixes aca38735ae624b93c71c055b68d5802b8f356ea5 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 2d292995bb8f49a2596bef522679c1e1454f3230 +mmc-fixes 7412dee9f1fd3e224202b633fdfa6eeaebe0307e +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +hyperv-fixes 37df9f3fedb6aeaff5564145e8162aab912c9284 +soc-fsl-fixes 2663b3388551230cbc4606a40fabf3331ceb59e4 +risc-v-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 2e8496f31d0be8f43849b2980b069f3a9805d047 +spdx 9f4ad9e425a1d3b6a34617b8ea226d56a119a717 +gpio-brgl-fixes ddd8d94ca31e768c76cf8bfe34ba7b10136b3694 +gpio-intel-fixes b41ba2ec54a70908067034f139aa23d0dd2985ce +pinctrl-intel-fixes 196d941753297d0ca73c563ccd7d00be049ec226 +erofs-fixes 9f377622a484de0818c49ee01e0ab4eedf6acd81 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 7fd53f41f771d250eb08db08650940f017e37c26 +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes 17cbe03872be8878e2f84047424350d036915df1 +cel-fixes 9f4ad9e425a1d3b6a34617b8ea226d56a119a717 +drm-misc-fixes ffe8768fb8f391cb478466778c55e2110525c15c +kspp-gustavo 36f9ff9e03de89691274a6aec45aa079bd3ae405 +kbuild 2a66140108eba4020d924a2ea589ccb8fd8113a9 +compiler-attributes 19c329f6808995b142b3966301f217c831e7cf31 +dma-mapping a7f3d3d3600c8ed119eb0d2483de0062ce2e3707 +asm-generic 38489db09b109c22eedf6cd3846ef742bceb45fe +arc def9d2780727cec3313ed3522d0123158d87224d +arm d744d01b03f7bc5a8b1f43040270bf4153ed8f4c +arm64 2a20b08f06e70860272bc7f52b5423c1b2f06696 +arm-perf 2c2e21e78a945b174629944281997bbcb839e6bb +arm-soc d42805807be7cb74a13c1d3b0035148f3637e035 +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 09dc799bceb512f3088cc6256b8707122c80221f +aspeed 61fbc42084f46f82dde66b04f3b14ccfadc7b9c5 +at91 969bbb49f36c4764ba59fb764f162abc4204a4af +drivers-memory 93567c59f9b0adc1e3278b13b294a97397ed7b86 +imx-mxs 1f0f76f795d501e41235372ad4c5be4e115e8c31 +keystone 9d2e21ed98a24584daa3c90698ce81f5cc307a27 +mediatek 068acd3c4e4cb68878c37f541639f0e7c75508a7 +mvebu 79e93f9dc81ab9967dc7ae64a6d8467eed98e1f3 +omap 44e97f6fb29badd34311b72e3f970dc2908672e0 +qcom 0109038cffefddbb05198e0f778019541eded8a1 +raspberrypi fbdcf1d2012639e3abdbb97bb6dea9105673d57e +realtek 486f29df69413411a205d3101bae0427a892bee4 +renesas 0bacf4d3d27649e90a1223b1bc0a128316138030 +reset 7941ad8d45e2613966d879746a7d52e7ba8db134 +rockchip f40c51456fe0012a458bf76a1fda13a743f5f840 +samsung-krzk 8a4d4cd15c393963ab07cddb699ee0ced2792899 +scmi 9f4ad9e425a1d3b6a34617b8ea226d56a119a717 +stm32 6ed9269265e10669d62280a869652dbe26f43ecb +sunxi 9fa021aa01fdc9576f4b523543210017af22fbb8 +tegra 93b9ea9ca307789ed41c641235207b35e68effe9 +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new 112e5934ff3a7505e583365213a27f990922b76b +xilinx fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +clk e3efa50969a8b051401db424ddf6fb832ee4bdd0 +clk-imx 054ef44ea3ef2883e0f63c9a54c91c07f321a0b4 +clk-renesas f2fb4fe62390b293bc6edc04cc7002940c441359 +clk-samsung a38fd8748464831584a19438cbb3082b5a2dab15 +csky d3900e8d918f8fbd1366b9c2998e2830e66a0081 +h8300 6e5e55227c959716103945e7140614c4c2faf439 +m68k 34e5269bf987aff9a33ad3ab4f5d65c02913cbc1 +m68knommu 6b3788e5fb8041211ac2fa7c818ca9010e976a74 +microblaze 47de4477a8e6bfd202640567ce4bf17cc1de60be +mips 7e9be673cb1b0be0f4279a960c2ecb28a147c327 +nds32 40e0dd851e7b7afe219820fb270b09016e41d4fc +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 1683f7de65dbf0a2c6a7d639173fe92430a28930 +parisc-hd adf27404e8a02cbcca9610bc51e41986c880b5aa +powerpc ee1bc694fbaec1a662770703fc34a74abf418938 +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl 242b0b398ccd34f73772120bd27a87a1bf00e30b +risc-v df29598aaf5c01f77580a42c465857edf750a991 +s390 246f3bc6ded3fb91f9498602463035ee20fb20cc +sh 2882b7626f4903a8e9250b328cdf7396a6deecac +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml ed102bf2afed226703eaf85a704755bdbea34583 +xtensa 6a8eb99e130f3f7658de2776934374fe1c41279e +pidfd 8fac44cbbaa2c7501c1819aa358abdc3874089b6 +fscrypt a14d0b6764917b21ee6fdfd2a8a4c2920fbefcce +fscache 3003bbd0697b659944237f3459489cb596ba196c +afs 7af08140979a6e7e12b78c93b8625c8d25b084e2 +btrfs 8a03ef87ec7e34635963c93326b1d87bb717b3f2 +ceph c59c36dc957204a456c084c968f8d23ae22405a3 +cifs a8a6082d4ae29d98129440c4a5de8e6ea3de0983 +cifsd 7e6448ce1c083a2ebf8c6b0bf94ceb168e25e892 +configfs 14fbbc8297728e880070f7b077b3301a8c698ef9 +ecryptfs 9046625511ad8dfbc8c6c2de16b3532c43d68d48 +erofs 8e6c8fa9f2e95c88a642521a5da19a8e31748846 +exfat c6e2f52e3051e8d898d38840104638ca8bbcdec2 +ext3 bf7ea7068a022e8cacacb80186d4b1d1fc0a41bc +ext4 6c0912739699d8e4b6a87086401bf3ad3c59502d +f2fs 9557727876674893d35940fddbd03d3b505e7ed8 +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 3c9c14338c12fb6f8d3aea7e7a1b7f93ce9e84b0 +jfs b462cecfa32315cd5acbbaa0968a7deabb4e29af +nfs d99f2487e1de23a2e902d1a359a85a48bfd21fe7 +nfs-anna 4f8be1f53bf615102d103c0509ffa9596f65b718 +nfsd c3213d260a23e263ef85ba21ac68c9e7578020b5 +cel b9f83ffaa0c096b4c832a43964fe6bff3acffe10 +orangefs c1048828c3dbd96c7e371fae658e5f40e6a45e99 +overlayfs 5e717c6fa41ff9b9b0c1e5959ccf5d8ef42f804b +ubifs 9a29f7f020e06f14eb126bcb84a7f0d166415824 +v9fs f8b139e2f24112f4e21f1eb02c7fc7600fea4b8d +xfs 76adf92a30f3b92a7f91bb00b28ea80efccd0f01 +zonefs 6980d29ce4da223ad7f0751c7f1d61d3c6b54ab3 +iomap ad89b66cbad18ca146cbc75f64706d4ca6635973 +djw-vfs 9b8523423b23ee3dfd88e32f5b7207be56a4e782 +file-locks cbe6fc4e01421c890d74422cdd04c6b1c8f62dda +vfs e8727aec724e4a8dd8b0fab1816fc71e32a9f0ce +printk a386d19acc30bf3ca929e9146924f2c69ab3682f +pci e4e573c9a39080f43693c70e4efd805674ba0216 +pstore 9d843e8fafc7c0b15d8f511d146c0c3d7c816634 +hid 2b84a0f6c2c20af0d1e7870399c1aad26357ba7e +i2c f9743e4d0a62adce1356b351a3d8a586097220c3 +i3c 0d95f41ebde40d552bb4fea64b1d618607915fd6 +dmi 3cb4d29a2633170208c96240c7e85148679ceee3 +hwmon-staging 9049572fb145746725b198a19e27fa2671b80448 +jc_docs 80342d484afceec491bcc85ff1e32c5491c1182f +v4l-dvb 0b276e470a4d43e1365d3eb53c608a3d208cabd4 +v4l-dvb-next bf05bf16c76bb44ab5156223e1e58e26dfe30a88 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 3c44d15e5ffdbc1b9d31d098b65c5cb50211d802 +cpufreq-arm dbbd49bade0548db87ceb1943951dea456af2e22 +cpupower a38fd8748464831584a19438cbb3082b5a2dab15 +devfreq 0a7dc8318c2817fb33dc50946f7ca6e0ff28f036 +opp a8bb0e872bfb962de4653ce8f8723c0e1f712ce3 +thermal c310e546164d5cca4c12faf9582b75989b030b68 +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm 2fd8db2dd05d895961c7c7b9fa02d72f385560e4 +swiotlb 95b079d8215b83b37fa59341fda92fcb9392f14a +rdma 6cc9e215eb277513719c32b9ba40e5012b02db57 +net-next 99ba0ea616aabdc8e26259fd722503e012199a76 +bpf-next 3733bfbbdd28f7a65340d0058d15d15190a4944a +ipsec-next 747b67088f8d34b3ec64d31447a1044be92dd348 +mlx5-next 63f9c44bca5e10fb1fd86aee7e38039ed98f95cc +netfilter-next 99ba0ea616aabdc8e26259fd722503e012199a76 +ipvs-next e9377a911d772d27ef2810c241154ba479bad368 +wireless-drivers-next 9382531ec63fc123d1d6ff07b0558b6af4ea724b +bluetooth 1c55c39f8232f02a742e6e84c812574f7c460a7b +mac80211-next 5d869070569a23aa909c6e7e9d010fc438a492ef +gfs2 e5966cf20f0c7e40fd8c208ba1614e1a35a8deee +mtd a881537dfaf281bfcb94313d69dcf9ef8fc89afe +nand 32cbc7cb70b07041e82f897f96b3035358470b14 +spi-nor 46094049a49be777f12a9589798f7c70b90cd03f +crypto e3a606f2c544b231f6079c8c5fea451e772e1139 +drm a1a1ca70deb3ec600eeabb21de7f3f48aaae5695 +drm-misc 74deef03a44ae77db85dd80e7ef95777a902e0b3 +amdgpu 2d571da893897d655ec26ef4625854e1b8ffa748 +drm-intel 270e3cc5aa382f63ea20b93c3d20162a891dc638 +drm-tegra c79184a9c029dbbc0b37279c9cb7a6ac57461654 +drm-msm a29c8c0241654d5f3165d52e9307e4feff955621 +imx-drm 74181df8c6db48e4737237186989fdcb1414e0f3 +etnaviv 7d614ab2f20503ed8766363d41f8607337571adf +regmap ccac12acc0c0d66b26ce7834e2dcf54ae159e63a +sound e861431303d23428bf26e8496252d7bee260a956 +sound-asoc ffc9841d5200a484ea0ecc645157b4d7b873f3a6 +modules 33121347fb1c359bd6e3e680b9f2c6ced5734a81 +input d12b64b9764ea17554fb230784ebf91287ed807e +block 3e867c7a5cdffe3e7ccab498265d7e305e92b80f +device-mapper f99a8e4373eeacb279bc9696937a55adbff7a28a +pcmcia e9d503fef7da2cc0610ce9cd056d0347ec9cafc4 +mmc 97fce126e279690105ee15be652b465fd96f9997 +mfd f9386c91574fe6da9f4fca9a47734816b0db0019 +backlight 04758386757c1ef339b18d996976911be61d5efb +battery d0a43c12ee9f57ddb284272187bd18726c2c2c98 +regulator 4dd1c95306980c997b9a32e72877e060c25dc6f3 +security 047843bdb3160e8fb225f3752616ac7257033fe4 +apparmor d108370c644b153382632b3e5511ade575c91c86 +integrity 781a5739489949fd0f32432a9da17f7ddbccf1cc +keys e377c31f788fc98815e1ab90b5a35704ce35843a +safesetid 1ca86ac1ec8d201478e9616565d4df5d51595cfc +selinux e4c82eafb609c2badc56f4e11bc50fcf44b8e9eb +smack 7ef4c19d245f3dc233fd4be5acea436edd1d83d8 +tomoyo 5dc33592e95534dc8455ce3e9baaaf3dae0fff82 +tpmdd aec00aa04b1131e17e6744681b380779f89d77b3 +watchdog bf05bf16c76bb44ab5156223e1e58e26dfe30a88 +iommu 2d471b20c55e13c98d1dba413bf2de618e89cdac +audit b75d8f38bcc9599af42635530c00268c71911f11 +devicetree 031cc263c037a95e5d1249cbd3d55b77021f1eb8 +mailbox 2335f556b3afadbee6548456f543f53ac3d1af42 +spi cc4e1ea50bba32eadc0a05ec17f628fb92e91458 +tip eb4fae8d3b9ed65099eea96665aa4a11e4862ac4 +clockevents 8120891105ba32b45bc35f7dc07e6d87a8314556 +edac faf042d15093164879f1a5d9b9805190ac6f7d40 +irqchip debf69cfd4c618c7036a13cc4edd1faf87ce7d53 +ftrace e1db6338d6fa0d409e45cf20ab5aeaca704f68e7 +rcu 7982b0dd319fc4e978c6448db2f68b539d0fb0f2 +kvm 3bf0fcd754345d7ea63e1446015ba65ece6788ca +kvm-arm 9a8aae605b80fc0a830cdce747eed48e11acc067 +kvm-ppc 72476aaa469179222b92c380de60c76b4cb9a318 +kvms390 44bada28219031f9e8e86b84460606efa57b871e +xen-tip f5079a9a2a31607a2343e544e9182ce35b030578 +percpu bd0d09ebd4f8cca0b3e09a257d8571ac170020ac +workqueues 89e28ce60cb65971c73359c66d076aa20a395cd5 +drivers-x86 e7882cd7aebe0696fbe178df1f30257e5729fdda +chrome-platform d61b3f9b91be32f714b218377ab5081932e3ebc2 +hsi 5c08b0f75575648032f309a6f58294453423ed93 +leds 23a700455a1bc55f3ea20675e574181b8c129306 +ipmi 07cbd87b0416d7b6b8419b2a56bc63659de5d066 +driver-core 4a0225c3d208cfa6e4550f2210ffd9114a952a81 +usb 4a0225c3d208cfa6e4550f2210ffd9114a952a81 +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 039b81d50a4822edfc07a7c2e6963823e993b2f0 +usb-chipidea-next 10076de33b5ed5b1e049593a611d2fd9eba60565 +tty 4a0225c3d208cfa6e4550f2210ffd9114a952a81 +char-misc 8e3a3249502d8ff92d73d827fb41dd44c5a16f76 +extcon 7b1222b224aff41739319ae81cd266825464ad8f +phy-next 8a6b85b14f082d266b0312562f7372e1a8f5dfb3 +soundwire 14968dd36a507866be0edfc2a05d48c997da5d99 +thunderbolt 6f3badead6a078cf3c71f381f9d84ac922984a00 +vfio adaeb718d46f6b42a3fc1dffd4f946f26b33779a +staging 4a0225c3d208cfa6e4550f2210ffd9114a952a81 +iio 6470a8206a10cae1f18a3e5a95dde2b364a06e10 +mux 3516bd729358a2a9b090c1905bd2a3fa926e24c6 +icc c1de07884f2bafa11ad3780cf08b234c88c2cc9d +dmaengine 0bde4444ec44b8e64bbd4af72fcaef58bcdbd4ce +cgroup ffeee417d97f9171bce9f43c22c9f477e4c84f54 +scsi 755e78ccbb075197205c37a16956e23b23f517d0 +scsi-mkp 85367040511f8402d7e4054d8c17b053c75e33ff +vhost 8a5c3eb99b236bef6d1e584e3ccf6c6d7832cb4b +rpmsg dc0e14fa833b084315015b9fcc45b11793885a08 +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl edc510855d963b5687b05a5b39a72bd35fc4c4ba +gpio-intel 058459043e71b5c1703194ea71aab576c0ff4f4d +pinctrl 835109266494b5b5661676a53efa5ea8f77a8c70 +pinctrl-intel 5b613df3f499e305f3aecd58090a71ec0d92930d +pinctrl-renesas 61232cd6efca6e4d2705993850d014343ba604c4 +pinctrl-samsung a38fd8748464831584a19438cbb3082b5a2dab15 +pwm a6efb35019d00f483a0e5f188747723371d659fe +userns 95ebabde382c371572297915b104e55403674e73 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +random ab9a7e27044b87ff2be47b8f8e095400e7fccc44 +kselftest e75074781f1735c1976bc551e29ccf2ba9a4b17f +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching c150bbbb1731c5b6c0b232320c450dcd3b5c9fde +coresight 1efbcec2ef8c037f1e801c76e4b9434ee2400be7 +rtc 9b9310445f5a6741399ebe2ba08137fecd7f73f9 +nvdimm 30c10d32152dd09c2158e9cab8a6c7adaa09278e +at24 fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +ntb 5c8fe583cce542aa0b84adc939ce85293de36e5e +seccomp a3fc712c5b37aec802438fe0de095d7f6f3827a3 +kspp f4648c7412997680ccb3778459932483607b386c +gnss 994adcbd37148acfa593c9ec2880a81ef97c7041 +fsi 4a851d714eadeabd65c7e321a2e7830f77d945c4 +slimbus 0320ed0a82364b3b175ab83ad11c7e4d9ad828a9 +nvmem e8405ad55f4c955b4961772cada4078c6b10909c +xarray 2c7e57a02708a69d0194f9ef2a7b7e54f5a0484a +hyperv 753ed9c95c37d058e50e7d42bbe296ee0bf6670d +auxdisplay 701454bce906241ba7f50e2773881560d6404d29 +kgdb 83fa2d13d628be901a21cdfb3553963cd8858052 +hmm fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +fpga a78a51a851ed3edc83264a67e2ba77a34f27965f +kunit a38fd8748464831584a19438cbb3082b5a2dab15 +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +cfi f3907773d60229afa8e6c0a3ee5085715192a9cb +kunit-next de2fcb3e62013738f22bbb42cbd757d9a242574e +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +mhi a503d1628c9c341dc5e1a26272e38182dca3e823 +memblock 097d43d8570457c1af9b09fab15412697b177f35 +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +iomem-mmap-vs-gup ac8b8400620a4b0d9ca903ee9ad440bec736f5fa +rust fef0214731ccdff3f674940e579903ccc9638f93 +cxl e49d033bddf5b565044e2abe4241353959bc9120 +tpmdd-jejb 69977d1aeeca7b18001ef462002f20b5f0e89e8b +akpm-current e0f4bf8e11f89bf10507b0de7b2e35d7ec4ecfb3 +akpm cf4f16d39746181be1599c35b4caa676e1c85cd9 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..2eba2c2ef2cf --- /dev/null +++ b/Next/Trees @@ -0,0 +1,344 @@ +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 +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +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 +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#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 +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-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 +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +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 +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +tpmdd-jejb git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/tpmdd.git#tpmdd-for-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..36f05e6f0cd1 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,12823 @@ +$ date -R +Wed, 28 Apr 2021 08:14:53 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 68% (6104/8912)
Updating files: 69% (6150/8912)
Updating files: 70% (6239/8912)
Updating files: 71% (6328/8912)
Updating files: 72% (6417/8912)
Updating files: 73% (6506/8912)
Updating files: 74% (6595/8912)
Updating files: 75% (6684/8912)
Updating files: 76% (6774/8912)
Updating files: 77% (6863/8912)
Updating files: 78% (6952/8912)
Updating files: 79% (7041/8912)
Updating files: 80% (7130/8912)
Updating files: 81% (7219/8912)
Updating files: 82% (7308/8912)
Updating files: 83% (7397/8912)
Updating files: 84% (7487/8912)
Updating files: 85% (7576/8912)
Updating files: 86% (7665/8912)
Updating files: 87% (7754/8912)
Updating files: 88% (7843/8912)
Updating files: 89% (7932/8912)
Updating files: 90% (8021/8912)
Updating files: 91% (8110/8912)
Updating files: 92% (8200/8912)
Updating files: 93% (8289/8912)
Updating files: 94% (8378/8912)
Updating files: 95% (8467/8912)
Updating files: 96% (8556/8912)
Updating files: 97% (8645/8912)
Updating files: 98% (8734/8912)
Updating files: 99% (8823/8912)
Updating files: 100% (8912/8912)
Updating files: 100% (8912/8912), done. +HEAD is now at 55ba0fe059a5 Merge tag 'for-5.13-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux +Merging origin/master (e359bce39d90 Merge tag 'audit-pr-20210426' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit) +$ git merge origin/master +Updating 55ba0fe059a5..e359bce39d90 +Fast-forward + Documentation/ABI/stable/procfs-audit_loginuid | 27 + + Documentation/ABI/testing/sysfs-class-devfreq | 5 +- + Documentation/admin-guide/kernel-parameters.txt | 4 +- + Documentation/admin-guide/ramoops.rst | 4 +- + .../devicetree/bindings/devfreq/rk3399_dmc.txt | 75 +- + .../devicetree/bindings/mtd/nand-controller.yaml | 7 + + .../mtd/partitions/linksys,ns-partitions.yaml | 74 ++ + .../bindings/mtd/partitions/nvmem-cells.yaml | 99 ++ + .../devicetree/bindings/mtd/qcom,nandc.yaml | 196 ++++ + .../devicetree/bindings/mtd/qcom_nandc.txt | 142 --- + Documentation/devicetree/bindings/nvmem/nvmem.yaml | 3 - + .../devicetree/bindings/regulator/fan53555.txt | 4 +- + .../bindings/regulator/qcom,rpmh-regulator.txt | 180 --- + .../bindings/regulator/qcom,rpmh-regulator.yaml | 162 +++ + .../bindings/reserved-memory/ramoops.txt | 10 +- + .../devicetree/bindings/spi/brcm,spi-bcm-qspi.txt | 245 ---- + .../devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml | 198 ++++ + .../devicetree/bindings/spi/cadence-quadspi.txt | 68 -- + .../devicetree/bindings/spi/cdns,qspi-nor.yaml | 143 +++ + .../devicetree/bindings/spi/fsl,spi-fsl-qspi.yaml | 96 ++ + .../bindings/spi/mediatek,spi-mtk-nor.yaml | 1 + + .../devicetree/bindings/spi/spi-fsl-qspi.txt | 66 -- + .../devicetree/bindings/spi/spi-mt65xx.txt | 2 + + .../devicetree/bindings/spi/spi-nxp-fspi.txt | 2 + + .../devicetree/bindings/spi/spi-slave-mt27xx.txt | 1 + + .../devicetree/bindings/trivial-devices.yaml | 6 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/locking.rst | 11 +- + Documentation/filesystems/netfs_library.rst | 526 +++++++++ + Documentation/filesystems/vfs.rst | 15 + + Documentation/firmware-guide/acpi/debug.rst | 36 +- + Documentation/hwmon/amd_energy.rst | 119 -- + Documentation/hwmon/bpa-rs600.rst | 74 ++ + Documentation/hwmon/corsair-psu.rst | 13 +- + Documentation/hwmon/fsp-3y.rst | 28 + + Documentation/hwmon/index.rst | 7 +- + Documentation/hwmon/ir36021.rst | 63 ++ + Documentation/hwmon/max15301.rst | 87 ++ + Documentation/hwmon/nzxt-kraken2.rst | 42 + + Documentation/hwmon/stpddc60.rst | 90 ++ + Documentation/hwmon/sysfs-interface.rst | 8 + + Documentation/hwmon/tps53679.rst | 13 +- + Documentation/power/runtime_pm.rst | 4 + + Documentation/spi/spi-summary.rst | 7 +- + MAINTAINERS | 61 +- + Makefile | 17 + + arch/Kconfig | 45 + + arch/arm/mach-pxa/icontrol.c | 12 +- + arch/arm/mach-pxa/zeus.c | 6 +- + arch/arm/mach-spear/spear320.c | 2 - + arch/arm/mach-spear/spear3xx.c | 10 - + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/memory.h | 16 + + arch/arm64/include/asm/mmu_context.h | 4 +- + arch/arm64/include/asm/topology.h | 10 +- + arch/arm64/kernel/acpi_parking_protocol.c | 3 +- + arch/arm64/kernel/alternative.c | 4 +- + arch/arm64/kernel/cpu-reset.h | 10 +- + arch/arm64/kernel/cpufeature.c | 4 +- + arch/arm64/kernel/ftrace.c | 2 +- + arch/arm64/kernel/psci.c | 3 +- + arch/arm64/kernel/smp_spin_table.c | 3 +- + arch/arm64/kernel/topology.c | 109 +- + arch/arm64/kvm/hyp/nvhe/Makefile | 6 +- + arch/arm64/kvm/vgic/vgic-its.c | 8 +- + arch/arm64/kvm/vgic/vgic.c | 3 +- + arch/powerpc/platforms/cell/spufs/coredump.c | 3 +- + arch/powerpc/platforms/cell/spufs/inode.c | 10 +- + arch/x86/kernel/e820.c | 4 +- + arch/x86/power/hibernate.c | 89 +- + block/blk-mq-sched.c | 3 +- + block/blk-mq.c | 3 +- + drivers/acpi/ac.c | 30 +- + drivers/acpi/acpi_apd.c | 8 +- + drivers/acpi/acpi_ipmi.c | 1 - + drivers/acpi/acpi_lpss.c | 2 + + drivers/acpi/acpi_pad.c | 4 + + drivers/acpi/acpi_processor.c | 51 +- + drivers/acpi/acpi_video.c | 43 +- + drivers/acpi/acpica/acpredef.h | 15 + + drivers/acpi/acpica/acresrc.h | 4 + + drivers/acpi/acpica/acutils.h | 1 + + drivers/acpi/acpica/amlresrc.h | 19 +- + drivers/acpi/acpica/rscalc.c | 4 +- + drivers/acpi/acpica/rsdump.c | 8 + + drivers/acpi/acpica/rsdumpinfo.c | 26 + + drivers/acpi/acpica/rsinfo.c | 6 +- + drivers/acpi/acpica/rslist.c | 9 +- + drivers/acpi/acpica/rsmisc.c | 19 + + drivers/acpi/acpica/rsserial.c | 75 ++ + drivers/acpi/acpica/utresdecode.c | 10 +- + drivers/acpi/acpica/utresrc.c | 1 + + drivers/acpi/apei/einj.c | 1 - + drivers/acpi/apei/erst.c | 2 +- + drivers/acpi/apei/hest.c | 2 +- + drivers/acpi/battery.c | 63 +- + drivers/acpi/button.c | 9 +- + drivers/acpi/cppc_acpi.c | 96 +- + drivers/acpi/custom_method.c | 2 +- + drivers/acpi/device_pm.c | 3 + + drivers/acpi/device_sysfs.c | 19 +- + drivers/acpi/dock.c | 7 +- + drivers/acpi/glue.c | 8 +- + drivers/acpi/hed.c | 1 - + drivers/acpi/internal.h | 4 +- + drivers/acpi/nfit/core.c | 5 +- + drivers/acpi/numa/hmat.c | 5 +- + drivers/acpi/pci_irq.c | 34 +- + drivers/acpi/pci_link.c | 164 ++- + drivers/acpi/pmic/intel_pmic_chtcrc.c | 2 +- + drivers/acpi/power.c | 18 +- + drivers/acpi/processor_driver.c | 6 +- + drivers/acpi/processor_idle.c | 38 +- + 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 | 178 ++- + drivers/acpi/sleep.h | 1 - + drivers/acpi/sysfs.c | 14 +- + drivers/acpi/utils.c | 37 +- + drivers/acpi/video_detect.c | 24 + + drivers/android/binder.c | 11 +- + drivers/base/arch_topology.c | 89 +- + drivers/base/power/clock_ops.c | 2 +- + drivers/base/power/domain.c | 36 - + drivers/base/power/runtime.c | 2 +- + drivers/base/power/wakeup.c | 17 +- + drivers/base/power/wakeup_stats.c | 2 +- + drivers/base/regmap/regmap-debugfs.c | 1 + + drivers/base/regmap/regmap-irq.c | 126 ++- + drivers/clk/keystone/sci-clk.c | 4 +- + drivers/clk/mvebu/armada-37xx-periph.c | 83 +- + drivers/cpufreq/Kconfig | 23 +- + drivers/cpufreq/Kconfig.arm | 10 + + drivers/cpufreq/armada-37xx-cpufreq.c | 111 +- + drivers/cpufreq/cppc_cpufreq.c | 259 ++++- + drivers/cpufreq/cpufreq-dt.c | 9 +- + drivers/cpufreq/cpufreq.c | 3 - + drivers/cpufreq/ia64-acpi-cpufreq.c | 4 +- + drivers/cpufreq/intel_pstate.c | 107 +- + drivers/cpufreq/s5pv210-cpufreq.c | 14 +- + drivers/cpuidle/Kconfig.arm | 2 +- + drivers/cpuidle/cpuidle-tegra.c | 19 +- + drivers/cpuidle/driver.c | 4 + + drivers/cpuidle/governors/menu.c | 17 +- + drivers/cpuidle/governors/teo.c | 54 +- + 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 +- + drivers/firmware/dmi-id.c | 1 + + drivers/firmware/psci/psci.c | 7 +- + drivers/gpu/drm/drm_modes.c | 3 +- + drivers/gpu/drm/i915/gt/intel_engine_user.c | 3 +- + drivers/gpu/drm/i915/gvt/debugfs.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 3 +- + 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/gpu/drm/radeon/radeon_cs.c | 4 +- + drivers/hwmon/Kconfig | 20 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/acpi_power_meter.c | 29 +- + drivers/hwmon/adc128d818.c | 2 +- + drivers/hwmon/adm9240.c | 982 ++++++++-------- + drivers/hwmon/amd_energy.c | 379 ------- + drivers/hwmon/applesmc.c | 34 +- + drivers/hwmon/corsair-psu.c | 355 ++++-- + drivers/hwmon/dell-smm-hwmon.c | 8 + + 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/intel-m10-bmc-hwmon.c | 122 ++ + 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 | 22 +- + drivers/hwmon/nzxt-kraken2.c | 234 ++++ + drivers/hwmon/occ/common.c | 69 +- + drivers/hwmon/occ/sysfs.c | 4 +- + drivers/hwmon/pmbus/Kconfig | 51 +- + drivers/hwmon/pmbus/Makefile | 5 + + drivers/hwmon/pmbus/adm1266.c | 1 + + drivers/hwmon/pmbus/adm1275.c | 1 + + drivers/hwmon/pmbus/bel-pfe.c | 1 + + drivers/hwmon/pmbus/bpa-rs600.c | 173 +++ + drivers/hwmon/pmbus/fsp-3y.c | 254 +++++ + drivers/hwmon/pmbus/ibm-cffps.c | 1 + + drivers/hwmon/pmbus/inspur-ipsps.c | 29 +- + drivers/hwmon/pmbus/ir35221.c | 1 + + drivers/hwmon/pmbus/ir36021.c | 80 ++ + drivers/hwmon/pmbus/ir38064.c | 1 + + drivers/hwmon/pmbus/irps5401.c | 1 + + drivers/hwmon/pmbus/isl68137.c | 1 + + drivers/hwmon/pmbus/lm25066.c | 1 + + drivers/hwmon/pmbus/ltc2978.c | 1 + + drivers/hwmon/pmbus/ltc3815.c | 1 + + drivers/hwmon/pmbus/max15301.c | 190 ++++ + drivers/hwmon/pmbus/max16064.c | 1 + + drivers/hwmon/pmbus/max16601.c | 1 + + drivers/hwmon/pmbus/max20730.c | 1 + + drivers/hwmon/pmbus/max20751.c | 1 + + drivers/hwmon/pmbus/max31785.c | 1 + + drivers/hwmon/pmbus/max34440.c | 1 + + drivers/hwmon/pmbus/max8688.c | 1 + + drivers/hwmon/pmbus/mp2975.c | 1 + + drivers/hwmon/pmbus/pm6764tr.c | 1 + + drivers/hwmon/pmbus/pmbus.c | 1 + + drivers/hwmon/pmbus/pmbus.h | 1 + + drivers/hwmon/pmbus/pmbus_core.c | 63 +- + drivers/hwmon/pmbus/pxe1610.c | 10 + + drivers/hwmon/pmbus/q54sj108a2.c | 1 + + drivers/hwmon/pmbus/stpddc60.c | 249 ++++ + drivers/hwmon/pmbus/tps40422.c | 1 + + drivers/hwmon/pmbus/tps53679.c | 52 +- + drivers/hwmon/pmbus/ucd9000.c | 1 + + drivers/hwmon/pmbus/ucd9200.c | 1 + + drivers/hwmon/pmbus/xdpe12284.c | 1 + + drivers/hwmon/pmbus/zl6100.c | 1 + + drivers/hwmon/s3c-hwmon.c | 4 +- + drivers/hwmon/sch5627.c | 521 ++++----- + 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 +- + drivers/idle/intel_idle.c | 5 +- + drivers/iio/adc/ti-ads131e08.c | 10 +- + drivers/iio/light/acpi-als.c | 4 +- + .../infiniband/hw/usnic/usnic_uiom_interval_tree.c | 3 +- + drivers/interconnect/qcom/bcm-voter.c | 2 +- + drivers/md/raid5.c | 3 +- + drivers/memory/samsung/exynos5422-dmc.c | 13 +- + drivers/mfd/intel-m10-bmc.c | 10 + + drivers/misc/lkdtm/usercopy.c | 2 +- + drivers/misc/sram.c | 4 +- + drivers/mmc/host/sdhci-msm.c | 19 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 8 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 14 +- + drivers/mtd/chips/cfi_cmdset_0020.c | 2 + + drivers/mtd/devices/mtd_dataflash.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 | 23 +- + drivers/mtd/mtdpart.c | 2 +- + drivers/mtd/mtdswap.c | 14 +- + drivers/mtd/nand/ecc-sw-bch.c | 10 +- + drivers/mtd/nand/ecc-sw-hamming.c | 10 +- + drivers/mtd/nand/onenand/onenand_base.c | 5 +- + drivers/mtd/nand/onenand/onenand_samsung.c | 1 + + drivers/mtd/nand/raw/atmel/nand-controller.c | 6 +- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 69 +- + drivers/mtd/nand/raw/fsmc_nand.c | 3 + + 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/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/raw/stm32_fmc2_nand.c | 2 + + drivers/mtd/nand/spi/core.c | 2 + + drivers/mtd/nand/spi/gigadevice.c | 69 +- + 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 +- + 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 | 478 +------- + drivers/mtd/spi-nor/core.h | 71 +- + drivers/mtd/spi-nor/issi.c | 3 +- + drivers/mtd/spi-nor/macronix.c | 6 +- + drivers/mtd/spi-nor/otp.c | 377 +++++++ + 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 +- + drivers/nvme/host/core.c | 3 +- + drivers/opp/core.c | 122 +- + drivers/opp/of.c | 36 + + drivers/pci/controller/cadence/pcie-cadence-host.c | 3 +- + drivers/pci/pci.c | 16 +- + drivers/powercap/intel_rapl_common.c | 1 + + drivers/powercap/intel_rapl_msr.c | 1 + + drivers/regulator/bd9576-regulator.c | 11 +- + drivers/regulator/core.c | 59 +- + drivers/regulator/da9121-regulator.c | 80 +- + drivers/regulator/da9121-regulator.h | 13 + + drivers/regulator/fan53555.c | 136 ++- + drivers/regulator/helpers.c | 101 +- + drivers/regulator/mt6360-regulator.c | 4 +- + drivers/regulator/of_regulator.c | 6 +- + drivers/regulator/pf8x00-regulator.c | 1 + + drivers/regulator/qcom-rpmh-regulator.c | 62 +- + drivers/regulator/qcom_spmi-regulator.c | 2 + + drivers/regulator/s2mpa01.c | 4 - + drivers/regulator/s2mps11.c | 22 +- + drivers/regulator/scmi-regulator.c | 4 +- + drivers/spi/Kconfig | 28 +- + drivers/spi/Makefile | 5 +- + drivers/spi/{spi-altera.c => spi-altera-core.c} | 166 +-- + drivers/spi/spi-altera-dfl.c | 204 ++++ + drivers/spi/spi-altera-platform.c | 172 +++ + drivers/spi/spi-ath79.c | 3 +- + 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-hsspi.c | 7 +- + drivers/spi/spi-bcm63xx.c | 8 +- + drivers/spi/spi-bitbang.c | 9 +- + drivers/spi/spi-butterfly.c | 13 +- + drivers/spi/spi-cadence-quadspi.c | 8 +- + drivers/spi/spi-davinci.c | 9 +- + drivers/spi/spi-dln2.c | 5 +- + drivers/spi/spi-falcon.c | 2 +- + drivers/spi/spi-fsi.c | 31 +- + drivers/spi/spi-fsl-espi.c | 17 +- + drivers/spi/spi-fsl-lpspi.c | 2 +- + drivers/spi/spi-fsl-spi.c | 23 +- + drivers/spi/spi-geni-qcom.c | 16 +- + drivers/spi/spi-hisi-kunpeng.c | 505 +++++++++ + drivers/spi/spi-hisi-sfc-v3xx.c | 7 +- + drivers/spi/spi-imx.c | 39 +- + drivers/spi/spi-jcore.c | 3 +- + drivers/spi/spi-lm70llp.c | 13 +- + drivers/spi/spi-loopback-test.c | 3 +- + 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 | 14 +- + drivers/spi/spi-omap2-mcspi.c | 24 +- + drivers/spi/spi-orion.c | 5 +- + drivers/spi/spi-pl022.c | 108 +- + drivers/spi/spi-pxa2xx-pci.c | 2 +- + drivers/spi/spi-pxa2xx.c | 6 +- + drivers/spi/spi-qcom-qspi.c | 18 +- + drivers/spi/spi-qup.c | 2 +- + drivers/spi/spi-rockchip.c | 19 +- + drivers/spi/spi-s3c64xx.c | 31 +- + drivers/spi/spi-sh.c | 4 +- + drivers/spi/spi-slave-mt27xx.c | 36 +- + drivers/spi/spi-sprd-adi.c | 2 +- + drivers/spi/spi-stm32-qspi.c | 106 +- + drivers/spi/spi-stm32.c | 39 +- + drivers/spi/spi-tegra20-sflash.c | 3 +- + drivers/spi/spi-ti-qspi.c | 20 +- + drivers/spi/spi-topcliff-pch.c | 3 +- + drivers/spi/spi-zynqmp-gqspi.c | 178 +-- + drivers/spi/spi.c | 97 +- + drivers/spi/spidev.c | 1 + + drivers/staging/greybus/spilib.c | 5 +- + drivers/tty/serial/qcom_geni_serial.c | 23 +- + fs/9p/vfs_inode.c | 4 +- + fs/9p/vfs_inode_dotl.c | 14 +- + 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 | 13 +- + fs/afs/internal.h | 59 +- + fs/afs/rxrpc.c | 150 +-- + fs/afs/write.c | 657 +++++------ + fs/afs/yfsclient.c | 82 +- + fs/binfmt_elf.c | 4 +- + fs/binfmt_elf_fdpic.c | 3 +- + fs/btrfs/ctree.h | 3 + + fs/btrfs/inode.c | 4 + + fs/btrfs/ioctl.c | 226 +--- + fs/btrfs/raid56.c | 3 +- + fs/btrfs/tree-log.c | 3 +- + fs/btrfs/volumes.c | 3 +- + fs/cachefiles/Makefile | 1 + + fs/cachefiles/interface.c | 5 +- + fs/cachefiles/internal.h | 9 + + fs/cachefiles/io.c | 420 +++++++ + 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/ecryptfs/inode.c | 22 + + fs/efivarfs/file.c | 77 -- + fs/efivarfs/inode.c | 44 + + fs/ext2/ext2.h | 7 +- + fs/ext2/file.c | 2 + + fs/ext2/ioctl.c | 88 +- + fs/ext2/namei.c | 2 + + fs/ext4/ext4.h | 12 +- + fs/ext4/file.c | 2 + + fs/ext4/fsmap.c | 4 +- + fs/ext4/ialloc.c | 2 +- + fs/ext4/ioctl.c | 208 +--- + fs/ext4/namei.c | 2 + + fs/ext4/verity.c | 2 +- + fs/f2fs/f2fs.h | 3 + + fs/f2fs/file.c | 218 +--- + fs/f2fs/namei.c | 2 + + fs/f2fs/verity.c | 2 +- + 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/fuse/Makefile | 2 +- + fs/fuse/dir.c | 12 +- + fs/fuse/file.c | 435 +------ + fs/fuse/fuse_i.h | 40 +- + fs/fuse/inode.c | 2 +- + fs/fuse/ioctl.c | 490 ++++++++ + fs/fuse/readdir.c | 2 +- + fs/gfs2/file.c | 63 +- + fs/gfs2/glock.c | 3 +- + fs/gfs2/glops.c | 22 +- + fs/gfs2/inode.c | 4 + + fs/gfs2/inode.h | 3 + + fs/gfs2/log.c | 2 +- + fs/gfs2/lops.c | 3 +- + fs/hfsplus/dir.c | 2 + + fs/hfsplus/hfsplus_fs.h | 14 +- + fs/hfsplus/inode.c | 54 + + fs/hfsplus/ioctl.c | 84 -- + fs/hostfs/hostfs_kern.c | 1 - + fs/inode.c | 91 +- + fs/ioctl.c | 325 ++++++ + fs/iomap/buffered-io.c | 3 +- + fs/iomap/swapfile.c | 38 +- + fs/jfs/file.c | 6 +- + fs/jfs/ioctl.c | 111 +- + fs/jfs/jfs_dinode.h | 7 - + fs/jfs/jfs_inode.h | 4 +- + fs/jfs/namei.c | 6 +- + fs/libfs.c | 1 + + fs/namei.c | 25 +- + fs/netfs/Kconfig | 23 + + fs/netfs/Makefile | 5 + + fs/netfs/internal.h | 97 ++ + fs/netfs/read_helper.c | 1185 ++++++++++++++++++++ + fs/netfs/stats.c | 59 + + fs/nfs/fs_context.c | 3 + + fs/nfs/inode.c | 6 +- + fs/nfs/internal.h | 1 + + fs/nfs/super.c | 6 +- + fs/nfsd/nfsproc.c | 2 +- + fs/nilfs2/file.c | 2 + + fs/nilfs2/ioctl.c | 61 +- + fs/nilfs2/namei.c | 2 + + fs/nilfs2/nilfs.h | 3 + + fs/ocfs2/dlmglue.c | 12 +- + fs/ocfs2/file.c | 2 + + fs/ocfs2/ioctl.c | 59 +- + fs/ocfs2/ioctl.h | 3 + + fs/ocfs2/namei.c | 3 + + fs/ocfs2/ocfs2_ioctl.h | 8 - + fs/openpromfs/inode.c | 67 +- + fs/orangefs/file.c | 79 -- + fs/orangefs/inode.c | 50 + + fs/orangefs/orangefs-utils.c | 2 +- + fs/overlayfs/dir.c | 2 + + fs/overlayfs/file.c | 110 -- + fs/overlayfs/inode.c | 77 ++ + fs/overlayfs/namei.c | 4 +- + fs/overlayfs/overlayfs.h | 5 +- + fs/overlayfs/readdir.c | 4 - + fs/proc/array.c | 2 + + fs/pstore/ram.c | 7 +- + fs/pstore/ram_core.c | 18 +- + fs/reiserfs/file.c | 2 + + fs/reiserfs/ioctl.c | 121 +- + fs/reiserfs/namei.c | 2 + + fs/reiserfs/reiserfs.h | 7 +- + fs/reiserfs/super.c | 2 +- + fs/ubifs/dir.c | 2 + + fs/ubifs/file.c | 2 + + fs/ubifs/gc.c | 7 +- + fs/ubifs/ioctl.c | 78 +- + fs/ubifs/replay.c | 4 +- + fs/ubifs/ubifs.h | 3 + + fs/vboxsf/dir.c | 4 +- + fs/vboxsf/super.c | 4 +- + fs/vboxsf/utils.c | 68 +- + fs/vboxsf/vfsmod.h | 4 +- + fs/xattr.c | 14 +- + fs/xfs/libxfs/xfs_fs.h | 4 - + fs/xfs/scrub/bitmap.c | 4 +- + fs/xfs/xfs_bmap_item.c | 4 +- + fs/xfs/xfs_buf.c | 6 +- + fs/xfs/xfs_extent_busy.c | 4 +- + fs/xfs/xfs_extent_busy.h | 3 +- + fs/xfs/xfs_extfree_item.c | 4 +- + fs/xfs/xfs_inode.c | 10 +- + fs/xfs/xfs_ioctl.c | 258 +---- + fs/xfs/xfs_ioctl.h | 11 + + fs/xfs/xfs_ioctl32.c | 2 - + fs/xfs/xfs_ioctl32.h | 2 - + fs/xfs/xfs_iops.c | 7 + + fs/xfs/xfs_refcount_item.c | 4 +- + fs/xfs/xfs_rmap_item.c | 4 +- + fs/xfs/xfs_symlink.c | 4 +- + include/acpi/acoutput.h | 2 +- + include/acpi/acpi_bus.h | 20 + + include/acpi/acpi_drivers.h | 12 - + include/acpi/acpixf.h | 2 +- + include/acpi/acrestyp.h | 9 +- + include/acpi/actbl1.h | 54 +- + include/acpi/actbl2.h | 240 +++- + include/acpi/actbl3.h | 70 +- + include/acpi/acuuid.h | 1 + + include/acpi/cppc_acpi.h | 40 + + include/acpi/platform/acgcc.h | 2 +- + include/asm-generic/bug.h | 16 + + include/asm-generic/vmlinux.lds.h | 20 +- + include/linux/acpi.h | 10 + + include/linux/amba/pl022.h | 10 - + include/linux/arch_topology.h | 19 +- + include/linux/binfmts.h | 1 + + include/linux/bpf.h | 4 +- + include/linux/cfi.h | 41 + + include/linux/compiler-clang.h | 3 + + include/linux/compiler_types.h | 8 + + include/linux/coredump.h | 14 +- + include/linux/cpuidle.h | 4 +- + include/linux/cred.h | 2 +- + include/linux/devfreq.h | 9 + + include/linux/fileattr.h | 59 + + include/linux/freezer.h | 1 - + include/linux/fs.h | 186 ++- + include/linux/fscache-cache.h | 4 + + include/linux/fscache.h | 50 +- + include/linux/init.h | 6 +- + include/linux/intel_rapl.h | 2 +- + include/linux/ioport.h | 2 +- + include/linux/list_sort.h | 7 +- + include/linux/lsm_hook_defs.h | 6 +- + include/linux/lsm_hooks.h | 18 +- + include/linux/mfd/lpc_ich.h | 2 +- + include/linux/mm.h | 10 + + include/linux/module.h | 13 +- + include/linux/mtd/blktrans.h | 11 + + include/linux/mtd/mtd.h | 9 +- + 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 | 15 +- + include/linux/mtd/spi-nor.h | 8 + + include/linux/netfs.h | 234 ++++ + include/linux/nfs_fs_sb.h | 1 + + include/linux/overflow.h | 2 +- + include/linux/pagemap.h | 42 +- + include/linux/parport.h | 12 +- + include/linux/pci.h | 4 +- + include/linux/platform_data/{ => x86}/intel-spi.h | 0 + include/linux/pm.h | 1 - + include/linux/pm_opp.h | 44 +- + include/linux/pm_runtime.h | 2 +- + include/linux/qcom-geni-se.h | 2 - + include/linux/regmap.h | 16 + + include/linux/regulator/driver.h | 9 +- + include/linux/security.h | 18 +- + include/linux/spi/altera.h | 21 + + include/linux/spi/spi.h | 23 +- + include/linux/uio.h | 10 + + include/net/af_rxrpc.h | 2 +- + include/trace/events/afs.h | 74 +- + include/trace/events/netfs.h | 261 +++++ + include/uapi/mtd/mtd-abi.h | 2 + + init/Kconfig | 2 +- + init/init_task.c | 2 +- + kernel/Makefile | 4 + + kernel/audit.c | 4 +- + kernel/audit.h | 12 +- + kernel/auditfilter.c | 3 +- + kernel/auditsc.c | 19 +- + kernel/bpf/bpf_lsm.c | 3 +- + kernel/cfi.c | 329 ++++++ + kernel/kallsyms.c | 55 +- + kernel/kthread.c | 3 +- + kernel/module.c | 43 + + kernel/power/autosleep.c | 2 +- + kernel/power/snapshot.c | 2 +- + kernel/power/swap.c | 2 +- + kernel/sched/core.c | 1 + + kernel/sched/cpufreq_schedutil.c | 29 +- + kernel/seccomp.c | 2 +- + kernel/time/tick-sched.c | 6 +- + kernel/workqueue.c | 2 +- + lib/iov_iter.c | 318 +++++- + lib/list_sort.c | 17 +- + lib/test_list_sort.c | 3 +- + mm/filemap.c | 65 +- + mm/internal.h | 7 +- + mm/readahead.c | 101 +- + net/netlabel/netlabel_unlabeled.c | 2 +- + net/netlabel/netlabel_user.h | 2 +- + net/rxrpc/recvmsg.c | 9 +- + net/tipc/name_table.c | 4 +- + net/wireless/core.c | 21 +- + net/wireless/nl80211.c | 24 +- + scripts/Makefile.modfinal | 2 +- + scripts/module.lds.S | 19 +- + 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/classmap.h | 5 +- + 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 +- + tools/power/acpi/common/cmfsize.c | 2 +- + tools/power/pm-graph/sleepgraph.py | 2 +- + tools/spi/Makefile | 5 +- + 657 files changed, 17839 insertions(+), 8974 deletions(-) + create mode 100644 Documentation/ABI/stable/procfs-audit_loginuid + 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 Documentation/devicetree/bindings/mtd/qcom,nandc.yaml + delete mode 100644 Documentation/devicetree/bindings/mtd/qcom_nandc.txt + delete mode 100644 Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt + create mode 100644 Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/cadence-quadspi.txt + create mode 100644 Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml + create mode 100644 Documentation/devicetree/bindings/spi/fsl,spi-fsl-qspi.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-fsl-qspi.txt + create mode 100644 Documentation/filesystems/netfs_library.rst + delete mode 100644 Documentation/hwmon/amd_energy.rst + create mode 100644 Documentation/hwmon/bpa-rs600.rst + create mode 100644 Documentation/hwmon/fsp-3y.rst + create mode 100644 Documentation/hwmon/ir36021.rst + create mode 100644 Documentation/hwmon/max15301.rst + create mode 100644 Documentation/hwmon/nzxt-kraken2.rst + create mode 100644 Documentation/hwmon/stpddc60.rst + delete mode 100644 drivers/hwmon/amd_energy.c + create mode 100644 drivers/hwmon/nzxt-kraken2.c + create mode 100644 drivers/hwmon/pmbus/bpa-rs600.c + create mode 100644 drivers/hwmon/pmbus/fsp-3y.c + create mode 100644 drivers/hwmon/pmbus/ir36021.c + create mode 100644 drivers/hwmon/pmbus/max15301.c + create mode 100644 drivers/hwmon/pmbus/stpddc60.c + 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 + create mode 100644 drivers/mtd/spi-nor/otp.c + create mode 100644 drivers/mtd/spi-nor/swp.c + rename drivers/spi/{spi-altera.c => spi-altera-core.c} (56%) + create mode 100644 drivers/spi/spi-altera-dfl.c + create mode 100644 drivers/spi/spi-altera-platform.c + create mode 100644 drivers/spi/spi-hisi-kunpeng.c + create mode 100644 fs/cachefiles/io.c + create mode 100644 fs/fscache/io.c + create mode 100644 fs/fuse/ioctl.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/cfi.h + create mode 100644 include/linux/fileattr.h + create mode 100644 include/linux/netfs.h + rename include/linux/platform_data/{ => x86}/intel-spi.h (100%) + create mode 100644 include/trace/events/netfs.h + create mode 100644 kernel/cfi.c +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 (1582f08d83d7 ARC: entry: fix off-by-one error in syscall number validation) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/Makefile | 2 +- + arch/arc/include/asm/cmpxchg.h | 4 ++-- + arch/arc/kernel/entry.S | 2 +- + arch/arc/kernel/kgdb.c | 1 + + arch/arc/kernel/process.c | 8 ++++---- + arch/arc/kernel/signal.c | 4 ++-- + 6 files changed, 11 insertions(+), 10 deletions(-) +Merging arm-current/fixes (d2f7eca60b29 ARM: 9071/1: uprobes: Don't hook on thumb instructions) +$ git merge arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (22315a2296f4 arm64: alternatives: Move length validation in alternative_{insn, endif}) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (b5144a2bf401 dt-bindings: nvmem: mediatek: remove duplicate mt8192 line) +$ git merge arm-soc-fixes/arm/fixes +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/nvmem/mtk-efuse.txt | 1 - + 1 file changed, 1 deletion(-) +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 (34e5269bf987 m68k: sun3x: Remove unneeded semicolon) +$ 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 +Already up to date. +Merging s390-fixes/fixes (a994eddb947e s390/entry: save the caller of psw_idle) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) +$ git merge sparc/master +Already up to date. +Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (bbd6f0a94813 bnxt_en: Fix RX consumer index logic in the error path.) +$ git merge net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + arch/arm/boot/dts/uniphier-pxs2.dtsi | 2 +- + arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 2 +- + arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 4 +- + drivers/net/bonding/bond_main.c | 7 +-- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 10 +++-- + .../net/ethernet/marvell/prestera/prestera_main.c | 3 +- + drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 1 + + drivers/net/ethernet/renesas/ravb_main.c | 35 +++++---------- + drivers/net/ethernet/sfc/ef10.c | 3 +- + drivers/net/ethernet/sfc/farch.c | 16 +++---- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 12 +++-- + drivers/net/ethernet/ti/davinci_emac.c | 4 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 5 ++- + drivers/net/geneve.c | 4 +- + drivers/net/phy/intel-xway.c | 21 +++++++++ + drivers/net/phy/marvell.c | 52 +++++++++++++--------- + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 7 +-- + net/8021q/vlan.c | 3 ++ + net/8021q/vlan.h | 4 ++ + net/core/dev.c | 8 ++-- + net/core/neighbour.c | 4 ++ + net/mptcp/protocol.c | 25 ++++++++++- + net/openvswitch/meter.c | 4 +- + net/qrtr/mhi.c | 8 ++-- + net/sched/sch_taprio.c | 6 +++ + net/vmw_vsock/virtio_transport_common.c | 28 ++++++++---- + net/vmw_vsock/vmci_transport.c | 3 +- + 28 files changed, 184 insertions(+), 98 deletions(-) +Merging bpf/master (b02265429681 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) +$ git merge bpf/master +Already up to date. +Merging ipsec/master (b515d2637276 xfrm: xfrm_state_mtu should return at least 1280 for ipv6) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 1 + + net/ipv4/esp4.c | 2 +- + net/ipv6/esp6.c | 2 +- + net/xfrm/xfrm_state.c | 14 ++++++++++++-- + 4 files changed, 15 insertions(+), 4 deletions(-) +Merging netfilter/master (bbd6f0a94813 bnxt_en: Fix RX consumer index logic in the error path.) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (4acd47644ef1 MAINTAINERS: update) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (e7020bb068d8 iwlwifi: Fix softirq/hardirq disabling in iwl_pcie_gen2_enqueue_hcmd()) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (eefb45eef5c4 neighbour: Prevent Race condition in neighbour subsytem) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (d434405aaab7 Linux 5.12-rc7) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (e861431303d2 ALSA: virtio: fix kernel-doc) +$ git merge sound-current/for-linus +Auto-merging sound/soc/ti/ams-delta.c +Removing include/sound/rt5645.h +Removing include/linux/platform_data/asoc-mx27vis.h +Auto-merging drivers/spi/spi-imx.c +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 - + .../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 +- + .../devicetree/bindings/sound/tlv320aic3x.txt | 21 +- + MAINTAINERS | 12 +- + 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/control.h | 35 +- + include/sound/core.h | 2 +- + include/sound/graph_card.h | 4 - + include/sound/hda_register.h | 8 +- + include/sound/rt5645.h | 32 - + include/sound/simple_card_utils.h | 128 +- + include/sound/soc-acpi.h | 4 + + include/sound/soc-component.h | 8 +- + include/sound/soc-dpcm.h | 10 +- + include/sound/soc.h | 36 +- + include/sound/sof.h | 4 +- + 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 | 272 ++- + sound/core/control_led.c | 777 ++++++++ + 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/isa/sb/emu8000.c | 4 +- + sound/isa/sb/sb16_csp.c | 8 +- + 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 | 70 +- + 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/ideapad_s740_helper.c | 492 ++++++ + sound/pci/hda/patch_ca0132.c | 4 +- + sound/pci/hda/patch_cirrus.c | 1128 +++++++++++- + sound/pci/hda/patch_hdmi.c | 29 +- + sound/pci/hda/patch_realtek.c | 86 +- + 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/soc/Kconfig | 2 +- + sound/soc/Makefile | 4 +- + sound/soc/amd/Kconfig | 8 +- + sound/soc/amd/acp-da7219-max98357a.c | 386 +++- + sound/soc/amd/acp3x-rt5682-max9836.c | 46 +- + sound/soc/amd/raven/acp3x-i2s.c | 8 +- + sound/soc/amd/raven/acp3x-pcm-dma.c | 6 +- + sound/soc/amd/renoir/acp3x-pdm-dma.c | 4 +- + 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/adau17x1.c | 13 +- + sound/soc/codecs/adau1977.c | 2 - + sound/soc/codecs/ak4458.c | 66 +- + sound/soc/codecs/ak4458.h | 1 + + sound/soc/codecs/ak5558.c | 122 +- + .../soc/codecs/arizona-jack.c | 577 +++--- + sound/soc/codecs/arizona.h | 46 +- + sound/soc/codecs/cros_ec_codec.c | 2 +- + sound/soc/codecs/cs35l35.c | 3 +- + sound/soc/codecs/cs35l36.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 | 13 +- + sound/soc/codecs/da7219-aad.c | 2 +- + sound/soc/codecs/da7219.c | 5 +- + 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 | 7 +- + sound/soc/codecs/lpass-tx-macro.c | 2 +- + sound/soc/codecs/lpass-va-macro.c | 9 +- + sound/soc/codecs/lpass-wsa-macro.c | 15 +- + 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 | 65 +- + sound/soc/codecs/rt1011.h | 1 - + sound/soc/codecs/rt1015.c | 27 +- + sound/soc/codecs/rt1015.h | 10 + + sound/soc/codecs/rt1015p.c | 13 +- + sound/soc/codecs/rt1016.c | 11 +- + sound/soc/codecs/rt1019.c | 608 +++++++ + sound/soc/codecs/rt1019.h | 158 ++ + 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/rt286.c | 34 +- + sound/soc/codecs/rt298.c | 9 +- + 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 | 20 +- + 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 | 1583 +++++++++++++++++ + sound/soc/codecs/rt711-sdca.h | 240 +++ + 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 | 369 +++- + sound/soc/codecs/rt715.h | 3 + + sound/soc/codecs/sgtl5000.c | 6 +- + sound/soc/codecs/sigmadsp-regmap.c | 2 +- + sound/soc/codecs/sigmadsp.c | 18 +- + sound/soc/codecs/sigmadsp.h | 2 +- + sound/soc/codecs/sti-sas.c | 3 - + sound/soc/codecs/tas2552.c | 4 +- + sound/soc/codecs/tas2562.c | 3 +- + sound/soc/codecs/tas2764.c | 2 +- + sound/soc/codecs/tas2770.c | 4 +- + sound/soc/codecs/tlv320aic32x4.c | 12 +- + sound/soc/codecs/tlv320aic3x-i2c.c | 72 + + sound/soc/codecs/tlv320aic3x-spi.c | 78 + + sound/soc/codecs/tlv320aic3x.c | 111 +- + sound/soc/codecs/tlv320aic3x.h | 13 + + 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 | 4 +- + sound/soc/codecs/wcd934x.c | 12 +- + 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/codecs/wsa881x.c | 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_aud2htx.c | 4 +- + sound/soc/fsl/fsl_audmix.c | 3 +- + sound/soc/fsl/fsl_dma.c | 3 - + sound/soc/fsl/fsl_easrc.c | 13 +- + 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 | 422 ++--- + sound/soc/generic/simple-card-utils.c | 299 +++- + sound/soc/generic/simple-card.c | 272 +-- + 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 | 48 +- + 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_sdw.c | 11 + + sound/soc/intel/boards/sof_wm8804.c | 6 +- + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 223 +++ + 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/keembay/kmb_platform.c | 7 +- + 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-frddr.c | 27 +- + 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/src.c | 9 + + sound/soc/sh/rcar/ssi.c | 267 ++- + sound/soc/sh/rcar/ssiu.c | 22 +- + sound/soc/sh/siu_pcm.c | 6 +- + sound/soc/soc-acpi.c | 2 +- + sound/soc/soc-component.c | 16 +- + sound/soc/soc-compress.c | 15 +- + sound/soc/soc-core.c | 55 +- + sound/soc/soc-dai.c | 2 +- + sound/soc/soc-dapm.c | 24 +- + sound/soc/soc-ops.c | 2 +- + sound/soc/soc-pcm.c | 527 +++--- + sound/soc/soc-topology.c | 16 +- + sound/soc/soc-utils.c | 6 + + sound/soc/sof/Kconfig | 11 + + sound/soc/sof/core.c | 14 +- + sound/soc/sof/debug.c | 21 +- + sound/soc/sof/intel/Kconfig | 2 +- + sound/soc/sof/intel/bdw.c | 8 +- + sound/soc/sof/intel/byt.c | 22 +- + sound/soc/sof/intel/hda-dai.c | 44 + + sound/soc/sof/intel/hda-dsp.c | 11 +- + sound/soc/sof/intel/hda.c | 10 +- + sound/soc/sof/intel/hda.h | 2 +- + sound/soc/sof/intel/pci-tgl.c | 20 +- + sound/soc/sof/intel/tgl.c | 2 +- + sound/soc/sof/nocodec.c | 39 +- + sound/soc/sof/ops.h | 6 +- + sound/soc/sof/pcm.c | 38 +- + sound/soc/sof/sof-acpi-dev.c | 18 +- + sound/soc/sof/sof-audio.c | 63 +- + sound/soc/sof/sof-audio.h | 2 + + sound/soc/sof/sof-of-dev.c | 18 +- + sound/soc/sof/sof-pci-dev.c | 20 +- + sound/soc/sof/sof-priv.h | 2 +- + sound/soc/sof/topology.c | 250 ++- + sound/soc/sti/sti_uniperif.c | 3 + + sound/soc/sti/uniperif.h | 4 +- + sound/soc/stm/stm32_adfsdm.c | 2 +- + sound/soc/stm/stm32_sai_sub.c | 5 +- + sound/soc/sunxi/sun4i-codec.c | 4 +- + 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 | 64 +- + sound/soc/tegra/tegra20_i2s.h | 1 + + sound/soc/tegra/tegra20_spdif.c | 20 +- + sound/soc/tegra/tegra30_ahub.c | 172 +- + sound/soc/tegra/tegra30_ahub.h | 5 +- + sound/soc/tegra/tegra30_i2s.c | 69 +- + sound/soc/tegra/tegra_audio_graph_card.c | 5 +- + 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 +- + sound/usb/card.c | 16 +- + sound/usb/clock.c | 18 +- + sound/usb/endpoint.c | 11 +- + sound/usb/implicit.c | 162 +- + sound/usb/midi.c | 125 +- + 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 | 94 + + sound/usb/quirks.c | 20 +- + sound/usb/usbaudio.h | 4 + + sound/virtio/Kconfig | 10 + + sound/virtio/Makefile | 13 + + sound/virtio/virtio_card.c | 439 +++++ + 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 +++++ + 422 files changed, 23418 insertions(+), 4011 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/rt1019.yaml + delete mode 100644 include/linux/platform_data/asoc-mx27vis.h + delete mode 100644 include/sound/rt5645.h + create mode 100644 include/uapi/linux/virtio_snd.h + create mode 100644 sound/core/control_led.c + create mode 100644 sound/pci/hda/ideapad_s740_helper.c + 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 + 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-fixes/for-linus (d143a69fd452 Merge remote-tracking branch 'asoc/for-5.12' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Already up to date. +Merging regmap-fixes/for-linus (78d889705732 Merge remote-tracking branch 'regmap/for-5.12' into regmap-linus) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (0bbefa641a32 Merge remote-tracking branch 'regulator/for-5.12' into regulator-linus) +$ git merge regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (cc4e1ea50bba Merge remote-tracking branch 'spi/for-5.13' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) +$ 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" +Using index info to reconstruct a base tree... +M drivers/iio/adc/ti-ads131e08.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +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 (4a0225c3d208 Merge tag 'spi-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (4a0225c3d208 Merge tag 'spi-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (4a0225c3d208 Merge tag 'spi-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ 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 (c1d8a521dbd7 usb: cdnsp: Fix lack of removing request from pending list.) +$ git merge usb-chipidea-fixes/for-usb-fixes +Auto-merging drivers/usb/cdns3/cdnsp-gadget.c +Auto-merging drivers/usb/cdns3/cdns3-gadget.c +Merge made by the 'recursive' strategy. + drivers/usb/cdns3/cdns3-gadget.c | 4 +++- + drivers/usb/cdns3/cdnsp-gadget.c | 14 +++++++------- + 2 files changed, 10 insertions(+), 8 deletions(-) +Merging phy/fixes (da848f9a0e13 phy: qcom-qmp: add hbr3_hbr2 voltage and premphasis swing table) +$ git merge phy/fixes +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 +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 8424c0e18205] Merge remote-tracking branch 'phy/fixes' +$ git diff -M --stat --summary HEAD^.. +Merging staging.current/staging-linus (4a0225c3d208 Merge tag 'spi-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (4d28b580e80a iio: core: fix ioctl handlers removal) +$ git merge iio-fixes/fixes-togreg +Auto-merging drivers/iio/light/gp2ap002.c +Auto-merging drivers/iio/industrialio-core.c +Auto-merging drivers/iio/accel/Kconfig +Merge made by the 'recursive' strategy. + drivers/iio/accel/Kconfig | 1 - + drivers/iio/common/hid-sensors/Kconfig | 1 + + drivers/iio/gyro/Kconfig | 1 - + drivers/iio/gyro/mpu3050-core.c | 13 +++++++++++-- + drivers/iio/humidity/Kconfig | 1 - + drivers/iio/industrialio-core.c | 6 ------ + drivers/iio/light/Kconfig | 2 -- + drivers/iio/light/gp2ap002.c | 5 +++-- + drivers/iio/magnetometer/Kconfig | 1 - + drivers/iio/orientation/Kconfig | 2 -- + drivers/iio/pressure/Kconfig | 1 - + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 1 + + drivers/iio/temperature/Kconfig | 1 - + 13 files changed, 16 insertions(+), 20 deletions(-) +Merging char-misc.current/char-misc-linus (8e3a3249502d Merge tag 'char-misc-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc) +$ 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 +Auto-merging drivers/soundwire/cadence_master.c +Auto-merging drivers/soundwire/bus.c +Merge made by the 'recursive' strategy. +Merging thunderbolt-fixes/fixes (9f4ad9e425a1 Linux 5.12) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (56cfe6f820a6 Input: elants_i2c - drop zero-checking of ABS_MT_TOUCH_MAJOR resolution) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (e3a606f2c544 fsverity: relax build time dependency on CRYPTO_SHA256) +$ 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 (909290786ea3 vfio/pci: Add missing range check in vfio_pci_mmap) +$ 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 (ea9aadc06a9f dmaengine: idxd: fix wq cleanup of WQCFG registers) +$ git merge dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (2fb164f0ce95 mtd: rawnand: mtk: Fix WAITRDY break condition and timeout) +$ git merge mtd-fixes/mtd/fixes +Already up to date. +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 +Already up to date. +Merging kvm-fixes/master (9c1a07442c95 KVM: x86/xen: Take srcu lock when accessing kvm_memslots()) +$ 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 (99a81dcc717d Merge branch 'for-5.12/cxl' into libnvdimm-fixes) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date! +Merge made by the 'recursive' strategy. +Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing) +$ git merge cxl-fixes/fixes +Already up to date. +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 (173e84953eaa fs: fix reporting supported extra file attributes for statx()) +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. + fs/stat.c | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ 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 (d473d32c2fba of: property: fw_devlink: do not link ".*,nr-gpios") +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (e4ec10228fdf scsi: lpfc: Fix bad memory access during VPD DUMP mailbox command) +$ git merge scsi-fixes/fixes +Auto-merging include/linux/hyperv.h +Auto-merging drivers/scsi/smartpqi/smartpqi_init.c +Auto-merging drivers/scsi/libsas/sas_ata.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 block/blk-mq.c +Auto-merging block/blk-mq-sched.c +Merge made by the 'recursive' strategy. + .../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/ata/libata-eh.c | 2 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 14 +- + drivers/message/fusion/lsi/mpi.h | 4 +- + drivers/message/fusion/lsi/mpi_ioc.h | 2 +- + drivers/message/fusion/mptbase.c | 9 +- + drivers/message/fusion/mptbase.h | 2 +- + drivers/message/fusion/mptctl.c | 8 - + drivers/message/fusion/mptdebug.h | 7 +- + drivers/message/fusion/mptlan.c | 9 +- + drivers/message/fusion/mptsas.c | 10 +- + drivers/s390/scsi/zfcp_aux.c | 28 +- + drivers/s390/scsi/zfcp_def.h | 6 +- + drivers/s390/scsi/zfcp_diag.c | 42 - + drivers/s390/scsi/zfcp_diag.h | 7 - + drivers/s390/scsi/zfcp_ext.h | 4 +- + drivers/s390/scsi/zfcp_fsf.c | 1 - + drivers/s390/scsi/zfcp_qdio.c | 68 +- + drivers/s390/scsi/zfcp_qdio.h | 5 + + drivers/s390/scsi/zfcp_sysfs.c | 14 +- + drivers/s390/scsi/zfcp_unit.c | 4 +- + drivers/scsi/3w-9xxx.c | 14 +- + drivers/scsi/3w-sas.c | 13 +- + drivers/scsi/3w-xxxx.c | 6 +- + drivers/scsi/53c700.c | 6 +- + drivers/scsi/BusLogic.c | 2 +- + drivers/scsi/FlashPoint.c | 6 +- + drivers/scsi/a100u2w.c | 13 +- + drivers/scsi/aacraid/aachba.c | 13 +- + 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.h | 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.h | 3 - + 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 | 15 +- + drivers/scsi/device_handler/scsi_dh_alua.c | 39 +- + drivers/scsi/device_handler/scsi_dh_emc.c | 4 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 4 +- + 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/fcoe/fcoe_transport.c | 2 +- + drivers/scsi/fnic/fnic_debugfs.c | 3 +- + drivers/scsi/fnic/fnic_fcs.c | 16 +- + drivers/scsi/fnic/fnic_main.c | 3 - + drivers/scsi/fnic/fnic_scsi.c | 6 +- + drivers/scsi/fnic/fnic_trace.c | 18 +- + drivers/scsi/hisi_sas/hisi_sas.h | 3 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 38 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 6 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 44 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 88 +- + 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/phy.h | 1 - + 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/jazz_esp.c | 4 +- + drivers/scsi/libfc/fc_fcp.c | 2 +- + drivers/scsi/libfc/fc_lport.c | 14 +- + drivers/scsi/libfc/fc_rport.c | 2 +- + 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.h | 3 +- + drivers/scsi/lpfc/lpfc_attr.c | 140 +- + drivers/scsi/lpfc/lpfc_bsg.c | 30 +- + drivers/scsi/lpfc/lpfc_crtn.h | 11 +- + drivers/scsi/lpfc/lpfc_ct.c | 44 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 21 +- + drivers/scsi/lpfc/lpfc_disc.h | 3 +- + drivers/scsi/lpfc/lpfc_els.c | 755 ++--- + drivers/scsi/lpfc/lpfc_hbadisc.c | 34 +- + drivers/scsi/lpfc/lpfc_hw4.h | 176 +- + drivers/scsi/lpfc/lpfc_init.c | 154 +- + drivers/scsi/lpfc/lpfc_mbox.c | 38 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 282 +- + drivers/scsi/lpfc/lpfc_nvme.c | 20 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 31 +- + drivers/scsi/lpfc/lpfc_scsi.c | 124 +- + drivers/scsi/lpfc/lpfc_sli.c | 144 +- + 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 | 514 ++-- + drivers/scsi/mpt3sas/mpt3sas_base.h | 5 +- + drivers/scsi/mpt3sas/mpt3sas_config.c | 10 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 45 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.h | 12 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 65 +- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 7 +- + drivers/scsi/mvsas/mv_sas.h | 2 +- + drivers/scsi/mvumi.c | 9 +- + drivers/scsi/myrb.c | 126 +- + drivers/scsi/myrs.c | 117 +- + drivers/scsi/nsp32.c | 31 +- + drivers/scsi/pm8001/pm8001_ctl.c | 151 +- + drivers/scsi/pm8001/pm8001_ctl.h | 5 + + drivers/scsi/pm8001/pm8001_hwi.c | 92 +- + drivers/scsi/pm8001/pm8001_hwi.h | 1 + + drivers/scsi/pm8001/pm8001_init.c | 19 +- + drivers/scsi/pm8001/pm8001_sas.c | 31 +- + drivers/scsi/pm8001/pm8001_sas.h | 5 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 49 +- + drivers/scsi/pm8001/pm80xx_hwi.h | 1 + + drivers/scsi/pmcraid.c | 70 +- + drivers/scsi/qedf/qedf.h | 3 +- + drivers/scsi/qedf/qedf_dbg.h | 1 - + drivers/scsi/qedf/qedf_main.c | 18 +- + 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 | 15 +- + 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 | 223 +- + 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_nx.c | 6 - + drivers/scsi/qla4xxx/ql4_os.c | 33 +- + drivers/scsi/scsi.c | 13 + + drivers/scsi/scsi_debug.c | 229 +- + drivers/scsi/scsi_dh.c | 2 +- + drivers/scsi/scsi_error.c | 66 +- + drivers/scsi/scsi_lib.c | 119 +- + drivers/scsi/scsi_priv.h | 7 +- + drivers/scsi/scsi_scan.c | 23 +- + drivers/scsi/scsi_sysfs.c | 6 +- + drivers/scsi/sd.c | 7 +- + drivers/scsi/sd_zbc.c | 2 +- + drivers/scsi/sg.c | 2 +- + drivers/scsi/sim710.c | 14 +- + drivers/scsi/smartpqi/smartpqi.h | 310 +- + drivers/scsi/smartpqi/smartpqi_init.c | 3147 ++++++++++++-------- + drivers/scsi/smartpqi/smartpqi_sas_transport.c | 39 +- + drivers/scsi/smartpqi/smartpqi_sis.c | 9 +- + drivers/scsi/smartpqi/smartpqi_sis.h | 1 + + drivers/scsi/sni_53c710.c | 5 +- + drivers/scsi/snic/snic_debugfs.c | 20 +- + drivers/scsi/storvsc_drv.c | 84 +- + drivers/scsi/sun3x_esp.c | 4 +- + 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 | 11 +- + 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 | 8 +- + drivers/scsi/ufs/ufshcd.c | 285 +- + drivers/scsi/ufs/ufshcd.h | 30 +- + drivers/scsi/ufs/ufshci.h | 40 +- + drivers/target/iscsi/iscsi_target.c | 20 +- + 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 | 36 +- + drivers/target/target_core_device.c | 12 +- + 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 | 42 +- + drivers/target/target_core_pscsi.c | 7 +- + drivers/target/target_core_rd.c | 27 +- + drivers/target/target_core_rd.h | 1 + + drivers/target/target_core_sbc.c | 4 +- + drivers/target/target_core_spc.c | 6 +- + 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 | 440 +-- + drivers/target/target_core_xcopy.c | 10 +- + drivers/target/tcm_fc/tfc_cmd.c | 14 +- + drivers/target/tcm_fc/tfc_sess.c | 2 +- + 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/libfcoe.h | 2 +- + include/scsi/scsi.h | 21 +- + include/scsi/scsi_cmnd.h | 3 + + include/scsi/scsi_device.h | 10 +- + include/scsi/scsi_dh.h | 5 +- + include/scsi/scsi_eh.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 +- + 257 files changed, 7238 insertions(+), 5370 deletions(-) +Merging drm-fixes/drm-fixes (aca38735ae62 Merge tag 'drm-intel-fixes-2021-04-22' of git://anongit.freedesktop.org/drm/drm-intel 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 (2d292995bb8f Merge tag 'gvt-fixes-2021-04-20' of https://github.com/intel/gvt-linux into drm-intel-fixes) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (7412dee9f1fd mmc: meson-gx: replace WARN_ONCE with dev_warn_once about scatterlist size alignment in block mode) +$ 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 (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ 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 | 64 +++++++++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 40 insertions(+), 24 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 (9f4ad9e425a1 Linux 5.12) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (ddd8d94ca31e gpio: omap: Save and restore sysconfig) +$ git merge gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (b41ba2ec54a7 gpiolib: Read "gpio-line-names" from a firmware node) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (196d94175329 pinctrl: lewisburg: Update number of pins in community) +$ 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 (9f4ad9e425a1 Linux 5.12) +$ git merge cel-fixes/for-rc +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (ffe8768fb8f3 drm/vc4: remove unused function) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/ttm/ttm_bo.c | 2 ++ + drivers/gpu/drm/vc4/vc4_vec.c | 6 ------ + 2 files changed, 2 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 (2a66140108eb Merge branch 'kconfig' into for-next) +$ git merge kbuild/for-next +Auto-merging tools/testing/selftests/kvm/Makefile +Removing scripts/test_dwarf5_support.sh +Removing scripts/Makefile.modsign +Auto-merging lib/Kconfig.debug +Auto-merging kernel/Makefile +Auto-merging init/Kconfig +Auto-merging certs/.gitignore +CONFLICT (content): Merge conflict in certs/.gitignore +Auto-merging arch/x86/Makefile +Removing arch/ia64/kernel/syscalls/syscalltbl.sh +Removing arch/ia64/kernel/syscalls/syscallhdr.sh +Auto-merging arch/arm64/Kconfig +Removing arch/alpha/kernel/syscalls/syscalltbl.sh +Removing arch/alpha/kernel/syscalls/syscallhdr.sh +Auto-merging arch/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Resolved 'certs/.gitignore' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 217592c7949b] Merge remote-tracking branch 'kbuild/for-next' +$ git diff -M --stat --summary HEAD^.. + .gitignore | 10 +- + Documentation/devicetree/bindings/.gitignore | 4 +- + 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 + + MAINTAINERS | 1 + + Makefile | 238 ++++++-------- + arch/.gitignore | 4 +- + arch/Kconfig | 3 +- + arch/alpha/kernel/syscalls/Makefile | 14 +- + arch/alpha/kernel/syscalls/syscallhdr.sh | 36 -- + arch/alpha/kernel/syscalls/syscalltbl.sh | 32 -- + arch/alpha/kernel/systbls.S | 3 +- + arch/arm64/Kconfig | 3 + + arch/arm64/Makefile | 2 +- + arch/ia64/kernel/entry.S | 3 +- + arch/ia64/kernel/syscalls/Makefile | 16 +- + arch/ia64/kernel/syscalls/syscallhdr.sh | 36 -- + arch/ia64/kernel/syscalls/syscalltbl.sh | 32 -- + arch/powerpc/boot/wrapper | 2 +- + arch/x86/Makefile | 4 +- + certs/.gitignore | 4 +- + drivers/memory/.gitignore | 2 +- + drivers/tty/vt/.gitignore | 6 +- + fs/proc/proc_sysctl.c | 7 +- + include/linux/compiler-version.h | 2 +- + include/linux/elfnote-lto.h | 14 + + init/Kconfig | 77 +++-- + init/version.c | 2 + + kernel/.gitignore | 5 +- + kernel/Makefile | 9 +- + kernel/configs/tiny-base.config | 1 + + kernel/gen_kheaders.sh | 2 +- + lib/.gitignore | 10 +- + lib/Kconfig.debug | 13 +- + samples/auxdisplay/.gitignore | 2 +- + samples/binderfs/.gitignore | 3 +- + samples/connector/.gitignore | 2 +- + samples/hidraw/.gitignore | 2 +- + samples/mei/.gitignore | 2 +- + samples/nitro_enclaves/.gitignore | 2 +- + samples/pidfd/.gitignore | 2 +- + samples/seccomp/.gitignore | 8 +- + samples/timers/.gitignore | 2 +- + samples/vfs/.gitignore | 4 +- + samples/watch_queue/.gitignore | 3 +- + samples/watchdog/.gitignore | 2 +- + scripts/.gitignore | 18 +- + scripts/Kbuild.include | 80 ----- + scripts/Kconfig.include | 6 + + scripts/Makefile.asm-generic | 4 +- + scripts/Makefile.build | 19 +- + scripts/Makefile.clean | 2 +- + scripts/Makefile.compiler | 74 +++++ + scripts/Makefile.dtbinst | 2 +- + scripts/Makefile.headersinst | 2 +- + scripts/Makefile.lib | 19 +- + scripts/Makefile.modinst | 113 ++++++- + scripts/Makefile.modpost | 32 +- + scripts/Makefile.modsign | 29 -- + scripts/Makefile.package | 2 +- + scripts/as-version.sh | 82 +++++ + scripts/basic/.gitignore | 2 +- + scripts/basic/fixdep.c | 43 +-- + scripts/cc-version.sh | 20 +- + scripts/dtc/.gitignore | 4 +- + scripts/dummy-tools/gcc | 6 + + scripts/gcc-plugins/.gitignore | 2 +- + scripts/genksyms/.gitignore | 2 +- + scripts/genksyms/Makefile | 2 +- + scripts/kconfig/.gitignore | 13 +- + scripts/kconfig/Makefile | 21 +- + scripts/kconfig/conf.c | 363 ++++++++++++++++----- + scripts/kconfig/confdata.c | 277 +++------------- + scripts/kconfig/expr.h | 6 - + scripts/kconfig/gconf.c | 15 +- + scripts/kconfig/internal.h | 9 + + scripts/kconfig/lexer.l | 3 - + scripts/kconfig/lkc.h | 21 -- + scripts/kconfig/lkc_proto.h | 1 + + scripts/kconfig/lxdialog/util.c | 4 +- + scripts/kconfig/mconf.c | 15 +- + scripts/kconfig/menu.c | 23 +- + scripts/kconfig/nconf.c | 58 ++-- + scripts/kconfig/nconf.gui.c | 284 +++++++--------- + scripts/kconfig/nconf.h | 51 ++- + scripts/kconfig/parser.y | 27 +- + scripts/kconfig/qconf.cc | 1 + + scripts/kconfig/streamline_config.pl | 4 +- + scripts/kconfig/symbol.c | 3 +- + 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/.gitignore | 8 +- + scripts/mod/modpost.c | 50 ++- + scripts/modules-check.sh | 4 +- + scripts/nsdeps | 2 +- + scripts/recordmcount.pl | 2 +- + scripts/setlocalversion | 2 +- + scripts/tags.sh | 2 +- + scripts/test_dwarf5_support.sh | 8 - + tools/build/Build.include | 24 ++ + tools/testing/selftests/bpf/Makefile | 2 +- + tools/testing/selftests/kvm/Makefile | 2 +- + tools/testing/selftests/net/mptcp/mptcp_connect.sh | 2 +- + tools/testing/selftests/powerpc/pmu/ebb/Makefile | 2 +- + tools/thermal/tmon/Makefile | 2 +- + usr/.gitignore | 4 +- + usr/gen_initramfs.sh | 2 +- + usr/include/.gitignore | 4 +- + 116 files changed, 1292 insertions(+), 1334 deletions(-) + delete mode 100644 arch/alpha/kernel/syscalls/syscallhdr.sh + delete mode 100644 arch/alpha/kernel/syscalls/syscalltbl.sh + delete mode 100644 arch/ia64/kernel/syscalls/syscallhdr.sh + delete mode 100644 arch/ia64/kernel/syscalls/syscalltbl.sh + create mode 100644 include/linux/elfnote-lto.h + 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 100644 scripts/kconfig/internal.h + 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 (d744d01b03f7 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/asm/set_memory.h | 8 - + arch/arm/include/uapi/asm/Kbuild | 1 - + arch/arm/include/uapi/asm/unistd.h | 1 - + arch/arm/kernel/asm-offsets.c | 3 + + arch/arm/kernel/entry-common.S | 8 +- + arch/arm/kernel/hw_breakpoint.c | 2 +- + arch/arm/kernel/machine_kexec.c | 8 - + arch/arm/kernel/smccc-call.S | 11 +- + arch/arm/kernel/suspend.c | 19 ++- + arch/arm/mm/cache-v7.S | 58 +++---- + arch/arm/mm/dump.c | 4 +- + arch/arm/mm/init.c | 21 --- + arch/arm/mm/proc-v7.S | 39 +++-- + arch/arm/mm/ptdump_debugfs.c | 15 +- + 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 --- + 22 files changed, 246 insertions(+), 348 deletions(-) + delete mode 100644 arch/arm/tools/syscallhdr.sh + delete mode 100644 arch/arm/tools/syscalltbl.sh +Merging arm64/for-next/core (2a20b08f06e7 ACPI: irq: Prevent unregistering of GIC SGIs) +$ git merge arm64/for-next/core +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/kernel/process.c +Auto-merging arch/arm64/kernel/alternative.c +CONFLICT (content): Merge conflict in arch/arm64/kernel/alternative.c +Auto-merging arch/arm64/include/asm/memory.h +Auto-merging arch/arm64/Kconfig +Resolved 'arch/arm64/kernel/alternative.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 39f4fa2a0351] Merge remote-tracking branch 'arm64/for-next/core' +$ git diff -M --stat --summary HEAD^.. + arch/arm64/Kconfig | 11 +---------- + arch/arm64/include/asm/kernel-pgtable.h | 2 +- + arch/arm64/include/asm/memory.h | 4 ++-- + arch/arm64/include/asm/sparsemem.h | 3 --- + arch/arm64/kernel/alternative.c | 3 +-- + arch/arm64/kernel/process.c | 9 +++------ + arch/arm64/kernel/vdso32/Makefile | 8 -------- + arch/arm64/mm/init.c | 8 ++------ + arch/arm64/mm/mmu.c | 2 -- + arch/arm64/mm/ptdump.c | 2 -- + drivers/acpi/arm64/gtdt.c | 10 ++++++---- + drivers/acpi/irq.c | 6 +++++- + 12 files changed, 21 insertions(+), 47 deletions(-) +Merging arm-perf/for-next/perf (2c2e21e78a94 arm64: perf: Remove redundant initialization in perf_event.c) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (d42805807be7 Merge branch 'arm/drivers' into for-next) +$ git merge arm-soc/for-next +Auto-merging arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts +Resolved 'arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0d365595fa69] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/arm-soc-for-next-contents.txt | 213 +++++++++++++++++++++++++++++++++ + 1 file changed, 213 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) +$ git merge actions/for-next +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (09dc799bceb5 Merge branch 'v5.13/fixes' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + drivers/soc/amlogic/meson-clk-measure.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) +Merging aspeed/for-next (61fbc42084f4 Merge branches 'wpcm450-for-v5.13', 'dt-for-v5.13' and 'lpc-for-v5.13' 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging drivers-memory/for-next (93567c59f9b0 Merge branch 'mem-ctrl-next' into for-next) +$ git merge drivers-memory/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (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. + arch/arm64/boot/dts/mediatek/mt8167.dtsi | 270 +++++++++++++++++++++++++++++++ + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 60 +++---- + 2 files changed, 301 insertions(+), 29 deletions(-) +Merging mvebu/for-next (79e93f9dc81a Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (44e97f6fb29b Merge branch 'fixes' into for-next) +$ git merge omap/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 ------ + 1 file changed, 6 deletions(-) +Merging qcom/for-next (0109038cffef Merge branches 'arm64-defconfig-for-5.13', 'arm64-for-5.13', 'defconfig-for-5.13', 'drivers-for-5.13' and 'dts-for-5.13' into for-next) +$ git merge qcom/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 194196458d9e] 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 (0bacf4d3d276 Merge branch 'renesas-arm-dt-for-v5.13' into renesas-next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + .../hihope-rzg2-ex-aistarvision-mipi-adapter-2.1.dtsi | 2 -- + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 8 ++++++++ + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 8 ++++++++ + arch/arm64/boot/dts/renesas/r8a774c0-ek874-mipi-2.1.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 4 ++++ + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 8 ++++++++ + arch/arm64/boot/dts/renesas/r8a77950.dtsi | 4 ++++ + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 12 ++++++++++++ + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 8 ++++++++ + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 8 ++++++++ + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 8 ++++++++ + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 4 ++++ + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 8 ++++++++ + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 2 -- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 4 ++++ + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 3 --- + 16 files changed, 85 insertions(+), 8 deletions(-) +Merging reset/reset/next (7941ad8d45e2 reset: RESET_INTEL_GW should depend on X86) +$ git merge reset/reset/next +Auto-merging drivers/reset/core.c +CONFLICT (content): Merge conflict in drivers/reset/core.c +Auto-merging drivers/reset/Kconfig +Resolved 'drivers/reset/core.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 535cd2de8aad] Merge remote-tracking branch 'reset/reset/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/reset/microchip,rst.yaml | 58 ++++++++ + drivers/reset/Kconfig | 12 +- + drivers/reset/Makefile | 1 + + drivers/reset/core.c | 20 +-- + drivers/reset/reset-bcm6345.c | 2 +- + drivers/reset/reset-berlin.c | 2 +- + drivers/reset/reset-microchip-sparx5.c | 146 +++++++++++++++++++++ + drivers/reset/reset-oxnas.c | 2 +- + drivers/reset/reset-ti-syscon.c | 4 +- + drivers/reset/reset-uniphier.c | 2 +- + drivers/reset/reset-zynqmp.c | 4 +- + drivers/reset/sti/reset-syscfg.c | 2 +- + 12 files changed, 235 insertions(+), 20 deletions(-) + create mode 100644 Documentation/devicetree/bindings/reset/microchip,rst.yaml + create mode 100644 drivers/reset/reset-microchip-sparx5.c +Merging rockchip/for-next (f40c51456fe0 Merge branch 'v5.13-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/rockchip,rk3568-cru.yaml | 60 + + 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 +++++++++++ + 18 files changed, 2857 insertions(+), 90 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3568-cru.yaml + 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging scmi/for-linux-next (9f4ad9e425a1 Linux 5.12) +$ git merge scmi/for-linux-next +Already up to date. +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 arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts +Auto-merging arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts +Auto-merging MAINTAINERS +Resolved 'arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts' using previous resolution. +Resolved 'arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 62a21a9871a4] Merge remote-tracking branch 'sunxi/sunxi/for-next' +$ git diff -M --stat --summary HEAD^.. + 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 +- + 4 files changed, 28 insertions(+), 17 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 +Already up to date. +Merging xilinx/for-next (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge xilinx/for-next +Already up to date. +Merging clk/clk-next (e3efa50969a8 Merge branch 'clk-ralink' into clk-next) +$ git merge clk/clk-next +Auto-merging drivers/clk/clk.c +Auto-merging drivers/clk/Makefile +Auto-merging drivers/clk/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/clock/mediatek,mt7621-sysc.yaml | 68 +++ + .../devicetree/bindings/clock/qcom,gcc-sdm845.yaml | 82 +++ + .../devicetree/bindings/clock/qcom,gcc.yaml | 2 - + MAINTAINERS | 6 + + arch/mips/ralink/mt7621.c | 6 +- + drivers/clk/Kconfig | 1 + + drivers/clk/Makefile | 1 + + drivers/clk/at91/sama7g5.c | 6 +- + drivers/clk/clk.c | 20 +- + 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 +- + drivers/clk/qcom/a53-pll.c | 1 + + drivers/clk/qcom/a7-pll.c | 1 + + drivers/clk/qcom/apss-ipq-pll.c | 1 + + drivers/clk/qcom/clk-rpmh.c | 2 + + drivers/clk/qcom/dispcc-sc7180.c | 70 ++- + drivers/clk/qcom/dispcc-sdm845.c | 217 ++++--- + drivers/clk/qcom/dispcc-sm8250.c | 124 ++-- + drivers/clk/qcom/gcc-sc7180.c | 196 +++---- + drivers/clk/qcom/gcc-sc7280.c | 248 ++++---- + drivers/clk/qcom/gcc-sc8180x.c | 122 ++-- + drivers/clk/qcom/gcc-sdm845.c | 650 ++++++++++----------- + drivers/clk/qcom/gcc-sdx55.c | 8 +- + drivers/clk/qcom/gcc-sm8150.c | 100 ++-- + drivers/clk/qcom/gcc-sm8250.c | 345 ++++++----- + drivers/clk/qcom/gcc-sm8350.c | 418 +++++++------ + drivers/clk/qcom/gpucc-sc7180.c | 3 - + drivers/clk/qcom/gpucc-sdm845.c | 45 +- + drivers/clk/qcom/gpucc-sm8150.c | 9 +- + drivers/clk/qcom/gpucc-sm8250.c | 9 +- + drivers/clk/qcom/videocc-sc7180.c | 4 - + drivers/clk/qcom/videocc-sdm845.c | 55 +- + drivers/clk/qcom/videocc-sm8150.c | 20 +- + drivers/clk/qcom/videocc-sm8250.c | 30 +- + drivers/clk/ralink/Kconfig | 11 + + drivers/clk/ralink/Makefile | 2 + + drivers/clk/ralink/clk-mt7621.c | 495 ++++++++++++++++ + 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/samsung/clk-exynos4412-isp.c | 4 +- + drivers/clk/samsung/clk-exynos7.c | 7 +- + drivers/clk/samsung/clk-s5pv210-audss.c | 4 +- + drivers/clk/socfpga/clk-agilex.c | 117 ++-- + drivers/clk/socfpga/clk-gate-a10.c | 9 +- + drivers/clk/socfpga/clk-gate-s10.c | 17 +- + drivers/clk/socfpga/clk-gate.c | 11 +- + 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 | 45 +- + drivers/clk/socfpga/clk-pll.c | 18 +- + drivers/clk/socfpga/clk-s10.c | 68 +-- + drivers/clk/socfpga/stratix10-clk.h | 24 +- + drivers/clk/uniphier/clk-uniphier-mux.c | 4 +- + drivers/clk/zynqmp/Kconfig | 4 +- + drivers/clk/zynqmp/pll.c | 24 +- + drivers/staging/mt7621-dts/gbpc1.dts | 11 - + drivers/staging/mt7621-dts/mt7621.dtsi | 82 ++- + include/dt-bindings/clock/imx8mp-clock.h | 3 - + include/dt-bindings/clock/mt7621-clk.h | 41 ++ + 87 files changed, 2394 insertions(+), 1927 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/mediatek,mt7621-sysc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-sdm845.yaml + create mode 100644 drivers/clk/ralink/Kconfig + create mode 100644 drivers/clk/ralink/Makefile + create mode 100644 drivers/clk/ralink/clk-mt7621.c + create mode 100644 include/dt-bindings/clock/mt7621-clk.h +Merging clk-imx/for-next (054ef44ea3ef clk: imx: Reference preceded by free) +$ git merge clk-imx/for-next +Already up to date. +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 (a38fd8748464 Linux 5.12-rc2) +$ git merge clk-samsung/for-next +Already up to date. +Merging csky/linux-next (d3900e8d918f csky: uaccess.h: Coding convention with asm generic) +$ git merge csky/linux-next +Merge made by the 'recursive' strategy. + arch/csky/include/asm/Kbuild | 1 + + arch/csky/include/asm/asid.h | 2 +- + arch/csky/include/asm/barrier.h | 2 +- + arch/csky/include/asm/segment.h | 7 - + arch/csky/include/asm/uaccess.h | 362 ++++++++------------------------------- + arch/csky/include/asm/vdso.h | 2 +- + arch/csky/kernel/entry.S | 1 - + arch/csky/lib/usercopy.c | 364 +++++++++++++++++++++++----------------- + arch/csky/mm/fault.c | 2 +- + arch/csky/mm/syscache.c | 1 + + 10 files changed, 291 insertions(+), 453 deletions(-) +Merging h8300/h8300-next (6e5e55227c95 Merge tag 'v5.11' into h8300-next) +$ git merge h8300/h8300-next +Auto-merging drivers/tty/serial/sh-sci.c +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 (34e5269bf987 m68k: sun3x: Remove unneeded semicolon) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (6b3788e5fb80 m68k: coldfire: fix irq ranges) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/coldfire/intc-simr.c | 12 ++++++------ + arch/riscv/Kconfig | 1 + + fs/Kconfig.binfmt | 3 +++ + fs/binfmt_flat.c | 18 +++++++++++++----- + 4 files changed, 23 insertions(+), 11 deletions(-) +Merging microblaze/next (47de4477a8e6 microblaze: add 'fallthrough' to memcpy/memset/memmove) +$ 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/memcpy.c | 4 +++ + arch/microblaze/lib/memmove.c | 5 ++++ + arch/microblaze/lib/memset.c | 2 ++ + arch/microblaze/lib/uaccess_old.S | 2 +- + arch/microblaze/mm/init.c | 2 +- + 9 files changed, 18 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 (7e9be673cb1b MIPS: BCM63XX: Use BUG_ON instead of condition followed by BUG.) +$ git merge mips/mips-next +Auto-merging lib/Kconfig.debug +Removing arch/mips/sgi-ip27/TODO +Auto-merging arch/mips/ralink/mt7621.c +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 | 31 +- + arch/mips/Kconfig.debug | 1 + + arch/mips/alchemy/common/clock.c | 3 +- + arch/mips/bcm63xx/clk.c | 2 +- + arch/mips/bcm63xx/gpio.c | 9 +- + arch/mips/bmips/dma.c | 2 +- + arch/mips/boot/compressed/Makefile | 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/cavium-octeon/octeon-memcpy.S | 8 +- + 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/generic/board-boston.its.S | 10 +- + arch/mips/generic/board-jaguar2.its.S | 16 +- + arch/mips/generic/board-luton.its.S | 8 +- + arch/mips/generic/board-ni169445.its.S | 10 +- + arch/mips/generic/board-ocelot.its.S | 20 +- + arch/mips/generic/board-serval.its.S | 8 +- + arch/mips/generic/board-xilfpga.its.S | 10 +- + arch/mips/generic/vmlinux.its.S | 10 +- + arch/mips/include/asm/Kbuild | 7 +- + arch/mips/include/asm/asmmacro.h | 3 +- + arch/mips/include/asm/bootinfo.h | 2 +- + arch/mips/include/asm/div64.h | 55 +- + arch/mips/include/asm/io.h | 14 +- + arch/mips/include/asm/kvm_host.h | 238 --- + .../asm/mach-cavium-octeon/kernel-entry-init.h | 8 + + 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 + + .../asm/mach-loongson64/kernel-entry-init.h | 27 + + arch/mips/include/asm/mach-loongson64/loongson.h | 27 +- + arch/mips/include/asm/mach-ralink/mt7621.h | 7 +- + arch/mips/include/asm/mips-cps.h | 23 +- + 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/pci.h | 1 - + arch/mips/include/asm/processor.h | 9 - + arch/mips/include/asm/thread_info.h | 6 - + arch/mips/include/asm/uaccess.h | 598 +++---- + arch/mips/include/asm/vdso/gettimeofday.h | 26 +- + arch/mips/kernel/Makefile | 8 +- + 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/relocate_kernel.S | 9 +- + 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/reset.c | 113 ++ + 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-legacy.c | 23 +- + arch/mips/pci/pci-mt7620.c | 5 +- + arch/mips/pci/pci-rt2880.c | 50 +- + arch/mips/pci/pci-rt3883.c | 10 +- + 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 +- + arch/mips/vdso/Makefile | 4 +- + drivers/firmware/broadcom/bcm47xx_nvram.c | 92 +- + drivers/irqchip/irq-loongson-liointc.c | 60 +- + include/asm-generic/div64.h | 10 +- + lib/Kconfig.debug | 10 + + lib/math/Makefile | 2 + + lib/math/test_div64.c | 249 +++ + 152 files changed, 2690 insertions(+), 6030 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 + create mode 100644 lib/math/test_div64.c +Merging nds32/next (40e0dd851e7b nds32: Fix bogus reference to <asm/procinfo.h>) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (1683f7de65db soc: litex: Remove duplicated header file inclusion) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (adf27404e8a0 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 (ee1bc694fbae powerpc/kvm: Fix build error when PPC_MEM_KEYS/PPC_PSERIES=n) +$ git merge powerpc/next +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging arch/powerpc/platforms/pseries/lpar.c +Removing arch/powerpc/net/bpf_jit_asm.S +Removing arch/powerpc/net/bpf_jit32.h +Removing arch/powerpc/lib/inst.c +Removing arch/powerpc/kernel/syscalls/syscalltbl.sh +Removing arch/powerpc/kernel/syscalls/syscallhdr.sh +Auto-merging arch/powerpc/kernel/signal_32.c +Auto-merging arch/powerpc/kernel/ptrace/ptrace-view.c +Auto-merging arch/arm64/include/asm/vdso/gettimeofday.h +Auto-merging Documentation/powerpc/papr_hcalls.rst +Merge made by the 'recursive' strategy. + Documentation/admin-guide/sysctl/net.rst | 2 +- + .../debug/debug-vm-pgtable/arch-support.txt | 2 +- + Documentation/powerpc/papr_hcalls.rst | 14 + + Documentation/powerpc/vas-api.rst | 4 +- + arch/arm64/include/asm/vdso/compat_gettimeofday.h | 3 +- + arch/arm64/include/asm/vdso/gettimeofday.h | 2 +- + arch/powerpc/Kconfig | 32 +- + arch/powerpc/Kconfig.debug | 1 + + arch/powerpc/Makefile | 11 +- + arch/powerpc/configs/ppc64_defconfig | 2 + + arch/powerpc/configs/pseries_defconfig | 2 + + arch/powerpc/include/asm/Kbuild | 1 - + arch/powerpc/include/asm/asm-prototypes.h | 2 - + arch/powerpc/include/asm/barrier.h | 16 - + arch/powerpc/include/asm/book3s/32/kup.h | 126 +-- + arch/powerpc/include/asm/book3s/32/pgtable.h | 2 - + 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/book3s/64/pgtable.h | 5 +- + arch/powerpc/include/asm/book3s/64/radix.h | 6 +- + arch/powerpc/include/asm/bug.h | 5 +- + arch/powerpc/include/asm/cacheflush.h | 15 +- + arch/powerpc/include/asm/cpm2.h | 2 +- + arch/powerpc/include/asm/fixmap.h | 9 + + arch/powerpc/include/asm/futex.h | 12 +- + arch/powerpc/include/asm/hvcall.h | 4 +- + arch/powerpc/include/asm/hvconsole.h | 3 + + arch/powerpc/include/asm/hydra.h | 2 - + arch/powerpc/include/asm/inst.h | 55 +- + arch/powerpc/include/asm/interrupt.h | 173 ++- + arch/powerpc/include/asm/irq.h | 2 - + arch/powerpc/include/asm/jump_label.h | 21 +- + arch/powerpc/include/asm/kasan.h | 2 +- + arch/powerpc/include/asm/kfence.h | 33 + + arch/powerpc/include/asm/kup.h | 27 +- + arch/powerpc/include/asm/kvm_book3s.h | 2 + + arch/powerpc/include/asm/kvm_ppc.h | 3 +- + arch/powerpc/include/asm/mmu_context.h | 2 +- + arch/powerpc/include/asm/nohash/32/kup-8xx.h | 56 +- + arch/powerpc/include/asm/nohash/32/mmu-8xx.h | 3 + + arch/powerpc/include/asm/nohash/64/pgtable.h | 5 +- + arch/powerpc/include/asm/opal.h | 2 +- + arch/powerpc/include/asm/perf_event_server.h | 8 +- + arch/powerpc/include/asm/pgtable.h | 2 - + arch/powerpc/include/asm/ppc-opcode.h | 13 + + arch/powerpc/include/asm/ppc_asm.h | 30 - + arch/powerpc/include/asm/processor.h | 9 +- + arch/powerpc/include/asm/ptrace.h | 45 +- + arch/powerpc/include/asm/qspinlock.h | 21 +- + arch/powerpc/include/asm/reg.h | 6 +- + arch/powerpc/include/asm/rtas.h | 6 +- + arch/powerpc/include/asm/simple_spinlock.h | 6 +- + arch/powerpc/include/asm/smp.h | 6 + + arch/powerpc/include/asm/spinlock.h | 3 + + arch/powerpc/include/asm/thread_info.h | 7 +- + arch/powerpc/include/asm/topology.h | 2 +- + arch/powerpc/include/asm/uaccess.h | 389 +++---- + arch/powerpc/include/asm/unistd.h | 1 + + arch/powerpc/include/asm/vdso/gettimeofday.h | 10 + + arch/powerpc/include/asm/vdso_datapage.h | 2 - + arch/powerpc/include/asm/vio.h | 1 + + arch/powerpc/include/asm/xive.h | 1 + + arch/powerpc/include/uapi/asm/errno.h | 1 + + arch/powerpc/include/uapi/asm/posix_types.h | 5 - + arch/powerpc/kernel/align.c | 72 +- + arch/powerpc/kernel/asm-offsets.c | 17 - + arch/powerpc/kernel/eeh.c | 15 +- + arch/powerpc/kernel/entry_32.S | 796 +++----------- + arch/powerpc/kernel/entry_64.S | 40 +- + arch/powerpc/kernel/exceptions-64e.S | 425 +------- + arch/powerpc/kernel/exceptions-64s.S | 60 +- + arch/powerpc/kernel/fadump.c | 18 +- + 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 | 156 ++- + arch/powerpc/kernel/head_book3s_32.S | 242 ++--- + arch/powerpc/kernel/head_booke.h | 203 ++-- + arch/powerpc/kernel/head_fsl_booke.S | 70 +- + arch/powerpc/kernel/hw_breakpoint_constraints.c | 2 +- + arch/powerpc/kernel/idle_6xx.S | 14 +- + arch/powerpc/kernel/idle_book3s.S | 4 + + arch/powerpc/kernel/idle_e500.S | 14 +- + arch/powerpc/kernel/interrupt.c | 67 +- + arch/powerpc/kernel/iommu.c | 46 +- + arch/powerpc/kernel/irq.c | 132 +-- + arch/powerpc/kernel/jump_label.c | 4 +- + arch/powerpc/kernel/kgdb.c | 2 +- + arch/powerpc/kernel/legacy_serial.c | 33 +- + arch/powerpc/kernel/mce.c | 5 +- + arch/powerpc/kernel/misc_32.S | 39 - + arch/powerpc/kernel/misc_64.S | 22 - + arch/powerpc/kernel/module.c | 23 +- + arch/powerpc/kernel/optprobes.c | 24 +- + arch/powerpc/kernel/optprobes_head.S | 65 +- + arch/powerpc/kernel/process.c | 25 +- + arch/powerpc/kernel/prom.c | 21 +- + arch/powerpc/kernel/prom_init.c | 2 +- + arch/powerpc/kernel/ptrace/ptrace-view.c | 51 +- + arch/powerpc/kernel/ptrace/ptrace.c | 4 - + arch/powerpc/kernel/ptrace/ptrace32.c | 4 - + arch/powerpc/kernel/rtas-proc.c | 15 +- + arch/powerpc/kernel/rtas.c | 34 +- + arch/powerpc/kernel/security.c | 263 ++++- + arch/powerpc/kernel/setup-common.c | 3 +- + arch/powerpc/kernel/setup_32.c | 2 +- + arch/powerpc/kernel/setup_64.c | 282 +---- + arch/powerpc/kernel/signal.h | 55 + + arch/powerpc/kernel/signal_32.c | 254 +++-- + arch/powerpc/kernel/signal_64.c | 319 +++--- + arch/powerpc/kernel/smp.c | 68 +- + arch/powerpc/kernel/stacktrace.c | 108 +- + arch/powerpc/kernel/syscalls.c | 12 +- + arch/powerpc/kernel/syscalls/Makefile | 33 +- + arch/powerpc/kernel/syscalls/syscallhdr.sh | 36 - + arch/powerpc/kernel/syscalls/syscalltbl.sh | 36 - + arch/powerpc/kernel/systbl.S | 5 +- + arch/powerpc/kernel/trace/ftrace.c | 22 +- + arch/powerpc/kernel/traps.c | 40 +- + arch/powerpc/kernel/uprobes.c | 7 + + arch/powerpc/kernel/vdso.c | 138 ++- + arch/powerpc/kernel/vdso32/vdso32.lds.S | 2 +- + arch/powerpc/kernel/vdso64/vdso64.lds.S | 2 +- + arch/powerpc/kernel/vector.S | 2 - + arch/powerpc/kexec/crash.c | 3 +- + arch/powerpc/kvm/book3s_64_mmu_host.c | 2 + + arch/powerpc/kvm/book3s_hv.c | 85 +- + arch/powerpc/kvm/book3s_hv_builtin.c | 3 + + arch/powerpc/kvm/book3s_hv_nested.c | 37 +- + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 3 +- + arch/powerpc/lib/Makefile | 2 +- + arch/powerpc/lib/checksum_wrappers.c | 15 +- + arch/powerpc/lib/code-patching.c | 13 +- + arch/powerpc/lib/inst.c | 73 -- + arch/powerpc/lib/sstep.c | 13 - + arch/powerpc/math-emu/math.c | 4 +- + arch/powerpc/mm/Makefile | 3 +- + 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 | 9 +- + arch/powerpc/mm/book3s64/hash_pgtable.c | 130 ++- + arch/powerpc/mm/book3s64/hash_utils.c | 35 +- + arch/powerpc/mm/book3s64/mmu_context.c | 2 +- + arch/powerpc/mm/book3s64/pkeys.c | 20 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 10 +- + arch/powerpc/mm/cacheflush.c | 234 +++++ + arch/powerpc/mm/fault.c | 60 +- + arch/powerpc/mm/init_32.c | 3 + + arch/powerpc/mm/maccess.c | 21 + + arch/powerpc/mm/mem.c | 283 +---- + arch/powerpc/mm/mmu_context.c | 24 +- + arch/powerpc/mm/mmu_decl.h | 5 + + arch/powerpc/mm/nohash/8xx.c | 4 +- + arch/powerpc/net/Makefile | 6 +- + arch/powerpc/net/bpf_jit.h | 64 ++ + arch/powerpc/net/bpf_jit32.h | 139 --- + arch/powerpc/net/bpf_jit64.h | 21 +- + arch/powerpc/net/bpf_jit_asm.S | 226 ---- + arch/powerpc/net/bpf_jit_comp.c | 782 ++++---------- + arch/powerpc/net/bpf_jit_comp32.c | 1100 ++++++++++++++++++++ + arch/powerpc/net/bpf_jit_comp64.c | 295 +----- + arch/powerpc/perf/core-book3s.c | 20 +- + arch/powerpc/perf/hv-24x7.c | 10 +- + arch/powerpc/perf/isa207-common.c | 115 +- + arch/powerpc/perf/isa207-common.h | 9 +- + arch/powerpc/perf/power10-events-list.h | 4 +- + arch/powerpc/perf/power10-pmu.c | 13 + + arch/powerpc/perf/power9-pmu.c | 13 + + arch/powerpc/platforms/44x/Kconfig | 2 +- + arch/powerpc/platforms/52xx/lite5200_sleep.S | 2 +- + arch/powerpc/platforms/Kconfig.cputype | 5 +- + arch/powerpc/platforms/cell/iommu.c | 3 +- + arch/powerpc/platforms/cell/spu_callbacks.c | 2 +- + arch/powerpc/platforms/chrp/pci.c | 3 +- + arch/powerpc/platforms/embedded6xx/Kconfig | 5 - + arch/powerpc/platforms/maple/pci.c | 2 +- + arch/powerpc/platforms/pasemi/iommu.c | 4 +- + arch/powerpc/platforms/powernv/memtrace.c | 18 +- + arch/powerpc/platforms/powernv/opal-core.c | 2 +- + arch/powerpc/platforms/powernv/opal-prd.c | 5 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 15 +- + arch/powerpc/platforms/powernv/setup.c | 2 +- + arch/powerpc/platforms/pseries/dlpar.c | 14 + + arch/powerpc/platforms/pseries/hotplug-cpu.c | 27 +- + arch/powerpc/platforms/pseries/hvCall_inst.c | 2 +- + arch/powerpc/platforms/pseries/iommu.c | 49 +- + arch/powerpc/platforms/pseries/lpar.c | 6 +- + arch/powerpc/platforms/pseries/lparcfg.c | 2 + + arch/powerpc/platforms/pseries/papr_scm.c | 39 + + arch/powerpc/platforms/pseries/pci_dlpar.c | 4 +- + arch/powerpc/platforms/pseries/pmem.c | 2 +- + arch/powerpc/platforms/pseries/pseries.h | 5 +- + arch/powerpc/platforms/pseries/ras.c | 2 +- + arch/powerpc/platforms/pseries/rtas-fadump.c | 2 +- + arch/powerpc/platforms/pseries/setup.c | 8 + + arch/powerpc/platforms/pseries/vio.c | 20 + + arch/powerpc/purgatory/trampoline_64.S | 1 - + arch/powerpc/sysdev/dart_iommu.c | 3 +- + arch/powerpc/sysdev/fsl_pci.c | 2 +- + arch/powerpc/sysdev/xive/common.c | 213 ++-- + arch/powerpc/sysdev/xive/native.c | 6 + + arch/powerpc/sysdev/xive/spapr.c | 2 +- + arch/powerpc/sysdev/xive/xive-internal.h | 3 +- + arch/powerpc/xmon/xmon.c | 76 +- + arch/s390/include/asm/vdso/gettimeofday.h | 3 +- + arch/x86/include/asm/vdso/gettimeofday.h | 3 +- + drivers/i2c/busses/Kconfig | 2 +- + drivers/macintosh/via-pmu.c | 4 +- + drivers/macintosh/windfarm_core.c | 2 +- + drivers/macintosh/windfarm_pm121.c | 2 +- + drivers/macintosh/windfarm_smu_controls.c | 2 +- + include/linux/compat.h | 35 + + include/linux/uaccess.h | 1 + + lib/vdso/gettimeofday.c | 31 +- + .../powerpc/alignment/alignment_handler.c | 11 +- + tools/testing/selftests/powerpc/mm/Makefile | 1 + + .../selftests/powerpc/mm/stress_code_patching.sh | 49 + + .../testing/selftests/powerpc/nx-gzip/gzfht_test.c | 2 +- + tools/testing/selftests/powerpc/ptrace/.gitignore | 1 + + tools/testing/selftests/powerpc/ptrace/Makefile | 2 +- + .../selftests/powerpc/ptrace/perf-hwbreak.c | 635 ++++++++++- + .../selftests/powerpc/ptrace/ptrace-hwbreak.c | 79 ++ + .../selftests/powerpc/ptrace/ptrace-perf-hwbreak.c | 659 ++++++++++++ + tools/testing/selftests/powerpc/security/Makefile | 3 +- + .../selftests/powerpc/security/entry_flush.c | 2 +- + .../selftests/powerpc/security/flush_utils.c | 13 + + .../selftests/powerpc/security/flush_utils.h | 7 + + .../testing/selftests/powerpc/security/rfi_flush.c | 2 +- + .../selftests/powerpc/security/uaccess_flush.c | 158 +++ + tools/testing/selftests/powerpc/tm/tm-trap.c | 4 +- + tools/testing/selftests/timens/gettime_perf.c | 8 + + 234 files changed, 6859 insertions(+), 5596 deletions(-) + create mode 100644 arch/powerpc/include/asm/kfence.h + delete mode 100644 arch/powerpc/kernel/syscalls/syscallhdr.sh + delete mode 100644 arch/powerpc/kernel/syscalls/syscalltbl.sh + delete mode 100644 arch/powerpc/lib/inst.c + create mode 100644 arch/powerpc/mm/book3s32/kuep.c + create mode 100644 arch/powerpc/mm/cacheflush.c + delete mode 100644 arch/powerpc/net/bpf_jit32.h + delete mode 100644 arch/powerpc/net/bpf_jit_asm.S + create mode 100644 arch/powerpc/net/bpf_jit_comp32.c + create mode 100755 tools/testing/selftests/powerpc/mm/stress_code_patching.sh + create mode 100644 tools/testing/selftests/powerpc/ptrace/ptrace-perf-hwbreak.c + create mode 100644 tools/testing/selftests/powerpc/security/uaccess_flush.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 (242b0b398ccd soc: fsl: enable acpi support in RCPM driver) +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (df29598aaf5c MAINTAINERS: add microchip polarfire soc support) +$ git merge risc-v/for-next +Auto-merging scripts/recordmcount.pl +Auto-merging arch/riscv/mm/kasan_init.c +CONFLICT (content): Merge conflict in arch/riscv/mm/kasan_init.c +Auto-merging arch/riscv/mm/fault.c +Auto-merging arch/riscv/kernel/traps.c +Auto-merging arch/riscv/kernel/time.c +Auto-merging arch/riscv/kernel/setup.c +CONFLICT (content): Merge conflict in arch/riscv/kernel/setup.c +Auto-merging arch/riscv/kernel/sbi.c +Auto-merging arch/riscv/kernel/probes/kprobes.c +Auto-merging arch/riscv/kernel/entry.S +Auto-merging arch/riscv/kernel/Makefile +Auto-merging arch/riscv/include/asm/sbi.h +Auto-merging arch/riscv/Kconfig.socs +Auto-merging arch/riscv/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'arch/riscv/kernel/setup.c' using previous resolution. +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 a14e0b3ad412] Merge remote-tracking branch 'risc-v/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 2 +- + .../devicetree/bindings/riscv/microchip.yaml | 27 ++ + Documentation/riscv/index.rst | 1 + + Documentation/riscv/vm-layout.rst | 63 ++++ + MAINTAINERS | 8 + + arch/riscv/Kconfig | 90 +++++- + arch/riscv/Kconfig.erratas | 44 +++ + arch/riscv/Kconfig.socs | 8 + + arch/riscv/Makefile | 9 +- + arch/riscv/boot/Makefile | 13 + + arch/riscv/boot/dts/Makefile | 1 + + arch/riscv/boot/dts/microchip/Makefile | 2 + + .../dts/microchip/microchip-mpfs-icicle-kit.dts | 72 +++++ + arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi | 329 ++++++++++++++++++++ + arch/riscv/boot/loader.lds.S | 3 +- + arch/riscv/configs/defconfig | 4 + + arch/riscv/errata/Makefile | 2 + + arch/riscv/errata/alternative.c | 74 +++++ + arch/riscv/errata/sifive/Makefile | 2 + + arch/riscv/errata/sifive/errata.c | 106 +++++++ + arch/riscv/errata/sifive/errata_cip_453.S | 38 +++ + arch/riscv/include/asm/alternative-macros.h | 142 +++++++++ + arch/riscv/include/asm/alternative.h | 39 +++ + arch/riscv/include/asm/asm.h | 1 + + arch/riscv/include/asm/csr.h | 3 + + arch/riscv/include/asm/elf.h | 6 + + arch/riscv/include/asm/errata_list.h | 39 +++ + arch/riscv/include/asm/ftrace.h | 14 +- + arch/riscv/include/asm/kexec.h | 56 ++++ + arch/riscv/include/asm/page.h | 47 ++- + arch/riscv/include/asm/pgtable.h | 62 +++- + arch/riscv/include/asm/sbi.h | 3 + + arch/riscv/include/asm/sections.h | 1 + + arch/riscv/include/asm/set_memory.h | 1 + + arch/riscv/include/asm/smp.h | 4 +- + arch/riscv/include/asm/string.h | 5 + + arch/riscv/include/asm/syscall.h | 2 +- + arch/riscv/include/asm/tlbflush.h | 3 +- + arch/riscv/include/asm/vendorid_list.h | 10 + + arch/riscv/kernel/Makefile | 6 + + arch/riscv/kernel/crash_dump.c | 46 +++ + arch/riscv/kernel/crash_save_regs.S | 56 ++++ + arch/riscv/kernel/entry.S | 6 +- + arch/riscv/kernel/head.S | 49 ++- + arch/riscv/kernel/head.h | 3 + + arch/riscv/kernel/kexec_relocate.S | 223 ++++++++++++++ + arch/riscv/kernel/machine_kexec.c | 193 ++++++++++++ + arch/riscv/kernel/mcount.S | 10 +- + arch/riscv/kernel/module.c | 8 +- + arch/riscv/kernel/probes/kprobes.c | 12 +- + arch/riscv/kernel/sbi.c | 31 +- + arch/riscv/kernel/setup.c | 130 +++++--- + arch/riscv/kernel/smp.c | 22 +- + arch/riscv/kernel/smpboot.c | 4 + + arch/riscv/kernel/syscall_table.c | 2 +- + arch/riscv/kernel/time.c | 2 +- + arch/riscv/kernel/traps.c | 2 +- + arch/riscv/kernel/vdso.c | 4 +- + arch/riscv/kernel/vdso/Makefile | 16 +- + arch/riscv/kernel/vmlinux-xip.lds.S | 133 ++++++++ + arch/riscv/kernel/vmlinux.lds.S | 16 +- + arch/riscv/mm/fault.c | 13 + + arch/riscv/mm/init.c | 337 +++++++++++++++++++-- + arch/riscv/mm/kasan_init.c | 72 ++--- + arch/riscv/mm/physaddr.c | 2 +- + arch/riscv/mm/ptdump.c | 75 ++++- + arch/riscv/net/bpf_jit_comp64.c | 13 - + arch/riscv/net/bpf_jit_core.c | 14 + + include/uapi/linux/kexec.h | 1 + + samples/kprobes/kprobe_example.c | 8 + + scripts/package/buildtar | 8 + + scripts/recordmcount.pl | 2 +- + 72 files changed, 2640 insertions(+), 215 deletions(-) + create mode 100644 Documentation/devicetree/bindings/riscv/microchip.yaml + create mode 100644 Documentation/riscv/vm-layout.rst + create mode 100644 arch/riscv/Kconfig.erratas + create mode 100644 arch/riscv/boot/dts/microchip/Makefile + create mode 100644 arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts + create mode 100644 arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi + create mode 100644 arch/riscv/errata/Makefile + create mode 100644 arch/riscv/errata/alternative.c + create mode 100644 arch/riscv/errata/sifive/Makefile + create mode 100644 arch/riscv/errata/sifive/errata.c + create mode 100644 arch/riscv/errata/sifive/errata_cip_453.S + create mode 100644 arch/riscv/include/asm/alternative-macros.h + create mode 100644 arch/riscv/include/asm/alternative.h + create mode 100644 arch/riscv/include/asm/errata_list.h + create mode 100644 arch/riscv/include/asm/kexec.h + create mode 100644 arch/riscv/include/asm/vendorid_list.h + create mode 100644 arch/riscv/kernel/crash_dump.c + create mode 100644 arch/riscv/kernel/crash_save_regs.S + create mode 100644 arch/riscv/kernel/kexec_relocate.S + create mode 100644 arch/riscv/kernel/machine_kexec.c + create mode 100644 arch/riscv/kernel/vmlinux-xip.lds.S +Merging s390/for-next (246f3bc6ded3 Merge branch 'features' into for-next) +$ git merge s390/for-next +Auto-merging drivers/s390/scsi/zfcp_qdio.c +Auto-merging drivers/s390/char/con3215.c +Removing arch/s390/kernel/pgm_check.S +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-pci | 11 +- + Documentation/s390/pci.rst | 14 +- + arch/s390/Kconfig.debug | 8 + + arch/s390/configs/debug_defconfig | 2 +- + arch/s390/configs/defconfig | 1 - + arch/s390/crypto/arch_random.c | 4 + + arch/s390/crypto/crc32be-vx.S | 4 +- + arch/s390/include/asm/atomic.h | 98 ++++++---- + arch/s390/include/asm/atomic_ops.h | 76 +++++++- + arch/s390/include/asm/bitops.h | 93 ++++----- + arch/s390/include/asm/ccwdev.h | 3 - + arch/s390/include/asm/cmpxchg.h | 168 ++++++++++++++-- + arch/s390/include/asm/entry-common.h | 4 - + arch/s390/include/asm/pci.h | 10 +- + arch/s390/include/asm/qdio.h | 22 +-- + arch/s390/include/asm/spinlock.h | 2 +- + arch/s390/include/asm/spinlock_types.h | 2 +- + arch/s390/kernel/Makefile | 2 +- + arch/s390/kernel/dis.c | 2 +- + arch/s390/kernel/entry.h | 25 +-- + arch/s390/kernel/ipl.c | 4 +- + arch/s390/kernel/os_info.c | 2 +- + arch/s390/kernel/perf_event.c | 21 -- + arch/s390/kernel/pgm_check.S | 147 -------------- + arch/s390/kernel/traps.c | 76 +++++++- + arch/s390/kernel/uv.c | 47 ++++- + arch/s390/lib/test_unwind.c | 19 +- + arch/s390/mm/fault.c | 18 +- + arch/s390/mm/page-states.c | 8 +- + arch/s390/pci/pci.c | 132 ++++++++----- + arch/s390/pci/pci_bus.c | 331 +++++++++++++++++++++++--------- + arch/s390/pci/pci_bus.h | 6 + + arch/s390/pci/pci_event.c | 96 ++++----- + arch/s390/pci/pci_sysfs.c | 44 +++++ + drivers/pci/hotplug/s390_pci_hpc.c | 59 +----- + 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/chp.c | 3 +- + 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/crypto/zcrypt_card.c | 1 + + drivers/s390/crypto/zcrypt_queue.c | 1 + + drivers/s390/net/qeth_core.h | 3 +- + drivers/s390/net/qeth_core_main.c | 102 +++++----- + drivers/s390/scsi/zfcp_qdio.c | 7 +- + 58 files changed, 1458 insertions(+), 964 deletions(-) + delete mode 100644 arch/s390/kernel/pgm_check.S + 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 (ed102bf2afed um: Fix W=1 missing-include-dirs warnings) +$ git merge uml/linux-next +Removing arch/um/kernel/gmon_syms.c +Merge made by the 'recursive' strategy. + arch/um/Kconfig.debug | 1 + + arch/um/drivers/hostaudio_kern.c | 4 +--- + arch/um/drivers/vector_kern.c | 1 - + arch/um/include/asm/pgtable.h | 2 +- + arch/um/include/uapi/asm/Kbuild | 1 + + arch/um/kernel/Makefile | 1 - + arch/um/kernel/dyn.lds.S | 6 ++++++ + arch/um/kernel/gmon_syms.c | 16 ---------------- + arch/um/kernel/mem.c | 3 +-- + arch/um/kernel/uml.lds.S | 6 ++++++ + arch/x86/um/Makefile | 1 + + arch/x86/um/asm/elf.h | 2 +- + arch/x86/um/shared/sysdep/stub_32.h | 2 +- + 13 files changed, 20 insertions(+), 26 deletions(-) + create mode 100644 arch/um/include/uapi/asm/Kbuild + delete mode 100644 arch/um/kernel/gmon_syms.c +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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging fscrypt/master (a14d0b676491 fscrypt: allow deleting files with unsupported encryption policy) +$ git merge fscrypt/master +Already up to date. +Merging fscache/fscache-next (3003bbd0697b afs: Use the netfs_write_begin() helper) +$ git merge fscache/fscache-next +Already up to date. +Merging afs/afs-next (7af08140979a Revert "gcov: clang: fix clang-11+ build") +$ git merge afs/afs-next +Already up to date. +Merging btrfs/for-next (8a03ef87ec7e Merge branch 'for-next-next-v5.13-20210420' into for-next-20210420) +$ git merge btrfs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ceph/master (c59c36dc9572 Merge commit 'ed94f87c2b123241ae5644cf82327e2da653adb6' into testing) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/Kconfig | 1 + + fs/ceph/addr.c | 626 +++++++++++++++++++++------------------------------ + fs/ceph/cache.c | 125 ---------- + fs/ceph/cache.h | 101 ++------- + fs/ceph/caps.c | 27 +-- + fs/ceph/debugfs.c | 12 +- + fs/ceph/dir.c | 34 ++- + fs/ceph/export.c | 12 +- + fs/ceph/file.c | 52 ++--- + fs/ceph/inode.c | 36 +-- + fs/ceph/io.c | 2 +- + fs/ceph/mds_client.c | 20 +- + fs/ceph/mds_client.h | 1 + + fs/ceph/metric.c | 62 +++-- + fs/ceph/metric.h | 56 ++++- + fs/ceph/snap.c | 2 +- + fs/ceph/super.h | 32 ++- + fs/ceph/xattr.c | 7 + + net/ceph/auth.c | 36 +-- + net/ceph/auth_x.c | 2 +- + 20 files changed, 549 insertions(+), 697 deletions(-) +Merging cifs/for-next (a8a6082d4ae2 cifs: update internal version number) +$ git merge cifs/for-next +Already up to date. +Merging cifsd/cifsd-for-next (7e6448ce1c08 Merge pull request #41 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 | 67 + + fs/cifsd/Makefile | 17 + + fs/cifsd/asn1.c | 352 ++ + 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 | 411 ++ + fs/cifsd/connection.h | 208 + + fs/cifsd/crypto_ctx.c | 286 ++ + fs/cifsd/crypto_ctx.h | 77 + + fs/cifsd/glob.h | 64 + + fs/cifsd/ksmbd_server.h | 283 ++ + fs/cifsd/ksmbd_work.c | 93 + + fs/cifsd/ksmbd_work.h | 110 + + fs/cifsd/mgmt/ksmbd_ida.c | 48 + + fs/cifsd/mgmt/ksmbd_ida.h | 34 + + fs/cifsd/mgmt/share_config.c | 239 + + fs/cifsd/mgmt/share_config.h | 81 + + fs/cifsd/mgmt/tree_connect.c | 122 + + 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 | 328 ++ + fs/cifsd/mgmt/user_session.h | 103 + + fs/cifsd/misc.c | 340 ++ + fs/cifsd/misc.h | 44 + + fs/cifsd/ndr.c | 347 ++ + fs/cifsd/ndr.h | 21 + + fs/cifsd/nterr.h | 545 ++ + fs/cifsd/ntlmssp.h | 169 + + fs/cifsd/oplock.c | 1667 ++++++ + fs/cifsd/oplock.h | 133 + + fs/cifsd/server.c | 631 +++ + fs/cifsd/server.h | 60 + + fs/cifsd/smb2misc.c | 435 ++ + fs/cifsd/smb2ops.c | 300 ++ + fs/cifsd/smb2pdu.c | 8069 ++++++++++++++++++++++++++++++ + fs/cifsd/smb2pdu.h | 1646 ++++++ + fs/cifsd/smb_common.c | 652 +++ + fs/cifsd/smb_common.h | 544 ++ + fs/cifsd/smbacl.c | 1317 +++++ + fs/cifsd/smbacl.h | 201 + + fs/cifsd/smbfsctl.h | 90 + + fs/cifsd/smbstatus.h | 1822 +++++++ + fs/cifsd/spnego_negtokeninit.asn1 | 43 + + fs/cifsd/spnego_negtokentarg.asn1 | 19 + + fs/cifsd/transport_ipc.c | 881 ++++ + 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 | 1995 ++++++++ + fs/cifsd/vfs.h | 273 + + fs/cifsd/vfs_cache.c | 683 +++ + fs/cifsd/vfs_cache.h | 185 + + 67 files changed, 31916 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/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/smbfsctl.h + create mode 100644 fs/cifsd/smbstatus.h + create mode 100644 fs/cifsd/spnego_negtokeninit.asn1 + create mode 100644 fs/cifsd/spnego_negtokentarg.asn1 + 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 (9046625511ad ecryptfs: fix kernel panic with null dev_name) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/inode.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 25 ++++++++++++------------- + fs/ecryptfs/debug.c | 4 ++-- + fs/ecryptfs/dentry.c | 2 +- + fs/ecryptfs/ecryptfs_kernel.h | 14 +------------- + fs/ecryptfs/file.c | 4 ++-- + fs/ecryptfs/inode.c | 11 +++++------ + fs/ecryptfs/keystore.c | 15 ++++++++------- + fs/ecryptfs/kthread.c | 3 ++- + fs/ecryptfs/main.c | 30 ++++++++++++++++++------------ + fs/ecryptfs/messaging.c | 14 +++++++------- + fs/ecryptfs/miscdev.c | 3 ++- + fs/ecryptfs/mmap.c | 11 ++++++----- + fs/ecryptfs/read_write.c | 4 +++- + fs/ecryptfs/super.c | 8 ++++---- + 14 files changed, 73 insertions(+), 75 deletions(-) +Merging erofs/dev (8e6c8fa9f2e9 erofs: enable big pcluster feature) +$ git merge erofs/dev +Already up to date. +Merging exfat/dev (c6e2f52e3051 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 (bf7ea7068a02 Pull reiserfs cleanup.) +$ git merge ext3/for_next +Auto-merging include/linux/user_namespace.h +Auto-merging fs/zonefs/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext2/namei.c +Auto-merging fs/ext2/ext2.h +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 | 7 +- + fs/ext4/super.c | 5 +- + 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 ++++++- + fs/reiserfs/journal.c | 6 +- + fs/zonefs/super.c | 5 +- + include/linux/fanotify.h | 36 ++++- + include/linux/fsnotify_backend.h | 29 ++-- + include/linux/sched/user.h | 3 - + include/linux/statfs.h | 8 + + 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 + + mm/shmem.c | 3 + + 47 files changed, 640 insertions(+), 223 deletions(-) +Merging ext4/dev (6c0912739699 ext4: wipe ext4_dir_entry2 upon file deletion) +$ git merge ext4/dev +Auto-merging fs/ext4/verity.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/ext4/ioctl.c +Auto-merging fs/ext4/ialloc.c +Auto-merging fs/ext4/file.c +Auto-merging fs/ext4/ext4.h +Merge made by the 'recursive' strategy. + Documentation/filesystems/ext4/directory.rst | 27 ++ + fs/ext4/balloc.c | 2 +- + fs/ext4/dir.c | 41 +- + fs/ext4/ext4.h | 107 ++++- + fs/ext4/fast_commit.c | 8 +- + fs/ext4/file.c | 25 +- + fs/ext4/hash.c | 25 +- + fs/ext4/ialloc.c | 51 ++- + fs/ext4/indirect.c | 2 +- + fs/ext4/inline.c | 27 +- + fs/ext4/inode.c | 8 +- + fs/ext4/ioctl.c | 6 + + fs/ext4/mballoc.c | 592 +++++++++++++++++++++++++-- + fs/ext4/mballoc.h | 24 +- + fs/ext4/migrate.c | 6 +- + fs/ext4/mmp.c | 2 +- + fs/ext4/namei.c | 245 ++++++++--- + fs/ext4/super.c | 116 ++++-- + fs/ext4/sysfs.c | 8 + + fs/ext4/verity.c | 10 +- + fs/ext4/xattr.c | 2 +- + fs/jbd2/recovery.c | 5 +- + fs/jbd2/transaction.c | 15 +- + include/linux/jbd2.h | 33 +- + include/trace/events/ext4.h | 176 -------- + 25 files changed, 1136 insertions(+), 427 deletions(-) +Merging f2fs/dev (955772787667 f2fs: drop inplace IO if fs status is abnormal) +$ git merge f2fs/dev +Auto-merging fs/f2fs/verity.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/segment.h +Auto-merging fs/f2fs/segment.c +Auto-merging fs/f2fs/namei.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/f2fs.h +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 | 14 +++ + fs/f2fs/Kconfig | 16 ++- + fs/f2fs/acl.c | 1 + + fs/f2fs/checkpoint.c | 9 +- + fs/f2fs/compress.c | 15 +-- + fs/f2fs/compress.h | 0 + fs/f2fs/data.c | 125 ++++++++++++++++++---- + fs/f2fs/debug.c | 3 + + fs/f2fs/dir.c | 1 + + fs/f2fs/f2fs.h | 55 ++++++---- + fs/f2fs/file.c | 51 +++++---- + fs/f2fs/gc.c | 95 +++++++++++++---- + fs/f2fs/gc.h | 6 ++ + fs/f2fs/inline.c | 3 +- + fs/f2fs/inode.c | 3 +- + fs/f2fs/namei.c | 3 + + fs/f2fs/node.c | 19 +++- + fs/f2fs/node.h | 1 + + fs/f2fs/recovery.c | 3 +- + fs/f2fs/segment.c | 184 +++++++++++++++++++++++--------- + fs/f2fs/segment.h | 16 ++- + fs/f2fs/super.c | 102 +++++++++++++----- + fs/f2fs/sysfs.c | 47 ++++++++ + fs/f2fs/verity.c | 75 +++++++++---- + fs/f2fs/xattr.c | 1 + + include/linux/f2fs_fs.h | 2 +- + 27 files changed, 660 insertions(+), 221 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 (3c9c14338c12 cuse: simplify refcount) +$ git merge fuse/for-next +Auto-merging fs/fuse/inode.c +Auto-merging fs/fuse/fuse_i.h +Auto-merging fs/fuse/file.c +Merge made by the 'recursive' strategy. + fs/fuse/acl.c | 7 ++++- + fs/fuse/cuse.c | 12 ++++---- + fs/fuse/dev.c | 7 ++--- + fs/fuse/file.c | 71 +++++++++++++++++++++++++++++------------------ + fs/fuse/fuse_i.h | 13 +++++++-- + fs/fuse/inode.c | 7 +++-- + fs/fuse/virtio_fs.c | 28 +++++++++++++------ + fs/fuse/xattr.c | 9 ++++-- + include/uapi/linux/fuse.h | 14 ++++++++++ + 9 files changed, 111 insertions(+), 57 deletions(-) +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 (d99f2487e1de NFS: The 'fattr_valid' field in struct nfs_server should be unsigned int) +$ git merge nfs/linux-next +Auto-merging include/trace/events/sunrpc.h +Auto-merging include/linux/nfs_fs_sb.h +Auto-merging fs/nfs/super.c +Auto-merging fs/nfs/internal.h +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfs/fs_context.c +Merge made by the 'recursive' strategy. + fs/nfs/callback_proc.c | 17 +- + fs/nfs/client.c | 20 +- + fs/nfs/delegation.c | 29 ++- + fs/nfs/delegation.h | 3 +- + fs/nfs/dir.c | 29 ++- + fs/nfs/export.c | 15 +- + fs/nfs/file.c | 2 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 2 +- + fs/nfs/fs_context.c | 66 ++++-- + fs/nfs/inode.c | 418 +++++++++++++++++++++------------ + fs/nfs/internal.h | 2 +- + fs/nfs/io.c | 2 +- + fs/nfs/mount_clnt.c | 14 +- + fs/nfs/nfs3acl.c | 2 +- + fs/nfs/nfs3xdr.c | 5 +- + fs/nfs/nfs42proc.c | 77 ++++-- + fs/nfs/nfs42xattr.c | 2 +- + fs/nfs/nfs4proc.c | 258 +++++++++++--------- + fs/nfs/nfs4state.c | 2 +- + fs/nfs/nfs4trace.h | 47 +++- + fs/nfs/nfs4xdr.c | 60 ++++- + fs/nfs/nfstrace.c | 1 + + fs/nfs/nfstrace.h | 22 +- + fs/nfs/pagelist.c | 4 +- + fs/nfs/pnfs.c | 11 +- + fs/nfs/proc.c | 1 + + fs/nfs/super.c | 2 +- + fs/nfs/write.c | 7 +- + include/linux/nfs4.h | 9 + + include/linux/nfs_fs.h | 6 +- + include/linux/nfs_fs_sb.h | 13 +- + include/linux/nfs_xdr.h | 13 +- + include/linux/sunrpc/xprt.h | 1 + + include/trace/events/sunrpc.h | 41 +++- + net/sunrpc/clnt.c | 1 - + net/sunrpc/rpcb_clnt.c | 7 +- + net/sunrpc/xprt.c | 18 +- + net/sunrpc/xprtrdma/transport.c | 6 +- + net/sunrpc/xprtsock.c | 9 +- + 39 files changed, 829 insertions(+), 415 deletions(-) +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 (b9f83ffaa0c0 SUNRPC: Fix null pointer dereference in svc_rqst_free()) +$ git merge cel/for-next +Auto-merging fs/locks.c +Merge made by the 'recursive' strategy. + fs/locks.c | 3 + + fs/nfsd/nfs4state.c | 415 ++++++++++++++++++++-------------- + fs/nfsd/nfsctl.c | 1 + + fs/nfsd/nfssvc.c | 8 +- + fs/nfsd/state.h | 3 +- + net/sunrpc/svc.c | 3 +- + net/sunrpc/svcsock.c | 2 +- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 36 +-- + 8 files changed, 280 insertions(+), 191 deletions(-) +Merging orangefs/for-next (c1048828c3db orangefs: add splice file operations) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (5e717c6fa41f ovl: add debug print to ovl_do_getxattr()) +$ git merge overlayfs/overlayfs-next +Auto-merging fs/overlayfs/readdir.c +Auto-merging fs/overlayfs/overlayfs.h +Auto-merging fs/overlayfs/namei.c +Auto-merging fs/overlayfs/inode.c +Auto-merging fs/overlayfs/file.c +CONFLICT (content): Merge conflict in fs/overlayfs/file.c +Resolved 'fs/overlayfs/file.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 18347628eb82] Merge remote-tracking branch 'overlayfs/overlayfs-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/overlayfs.rst | 26 ++++++------- + fs/overlayfs/copy_up.c | 3 +- + fs/overlayfs/file.c | 21 +++++++++++ + fs/overlayfs/inode.c | 18 ++++----- + fs/overlayfs/namei.c | 1 + + fs/overlayfs/overlayfs.h | 37 ++++++++++++++++-- + fs/overlayfs/readdir.c | 12 ------ + fs/overlayfs/super.c | 66 +++++++++++++++++++++++++-------- + fs/overlayfs/util.c | 33 +++++------------ + 9 files changed, 136 insertions(+), 81 deletions(-) +Merging ubifs/next (9a29f7f020e0 ubi: Remove unnecessary struct declaration) +$ git merge ubifs/next +Auto-merging fs/ubifs/replay.c +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/build.c | 1 + + drivers/mtd/ubi/ubi.h | 2 -- + fs/jffs2/file.c | 1 + + fs/jffs2/scan.c | 2 +- + fs/jffs2/summary.h | 16 ++++++++-------- + fs/ubifs/replay.c | 3 ++- + fs/ubifs/sb.c | 3 +++ + fs/ubifs/super.c | 6 ++++-- + 8 files changed, 20 insertions(+), 14 deletions(-) +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 (76adf92a30f3 xfs: remove xfs_quiesce_attr declaration) +$ git merge xfs/for-next +Auto-merging fs/xfs/xfs_symlink.c +Auto-merging fs/xfs/xfs_iops.c +Auto-merging fs/xfs/xfs_ioctl.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_ioctl.c +Auto-merging fs/xfs/xfs_inode.c +Auto-merging fs/xfs/libxfs/xfs_fs.h +Resolved 'fs/xfs/xfs_ioctl.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 93623365bd4e] Merge remote-tracking branch 'xfs/for-next' +$ git diff -M --stat --summary HEAD^.. + 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_attr.c | 54 +++++--- + fs/xfs/libxfs/xfs_attr.h | 1 + + fs/xfs/libxfs/xfs_attr_leaf.c | 35 +++-- + fs/xfs/libxfs/xfs_bmap.c | 229 +++++++++++++-------------------- + fs/xfs/libxfs/xfs_bmap.h | 2 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 6 +- + fs/xfs/libxfs/xfs_btree_staging.c | 1 - + fs/xfs/libxfs/xfs_da_btree.c | 4 +- + fs/xfs/libxfs/xfs_dir2.c | 14 +- + fs/xfs/libxfs/xfs_dir2_block.c | 12 +- + fs/xfs/libxfs/xfs_dir2_data.c | 2 +- + fs/xfs/libxfs/xfs_dir2_leaf.c | 12 +- + fs/xfs/libxfs/xfs_dir2_node.c | 4 +- + fs/xfs/libxfs/xfs_dir2_priv.h | 3 +- + fs/xfs/libxfs/xfs_dir2_sf.c | 58 ++++----- + fs/xfs/libxfs/xfs_errortag.h | 4 +- + fs/xfs/libxfs/xfs_format.h | 5 +- + fs/xfs/libxfs/xfs_fs.h | 2 +- + fs/xfs/libxfs/xfs_ialloc.c | 4 +- + fs/xfs/libxfs/xfs_iext_tree.c | 2 +- + fs/xfs/libxfs/xfs_inode_buf.c | 81 +++++------- + fs/xfs/libxfs/xfs_inode_buf.h | 33 +---- + fs/xfs/libxfs/xfs_inode_fork.c | 48 +++---- + fs/xfs/libxfs/xfs_inode_fork.h | 20 +-- + fs/xfs/libxfs/xfs_rtbitmap.c | 4 +- + fs/xfs/libxfs/xfs_shared.h | 4 + + fs/xfs/libxfs/xfs_trans_inode.c | 7 +- + fs/xfs/libxfs/xfs_types.c | 18 +-- + fs/xfs/scrub/agheader.c | 33 ++--- + fs/xfs/scrub/alloc.c | 5 +- + fs/xfs/scrub/attr.c | 5 +- + fs/xfs/scrub/bmap.c | 20 +-- + fs/xfs/scrub/btree.c | 30 ++++- + fs/xfs/scrub/common.c | 38 +++--- + fs/xfs/scrub/common.h | 58 ++++----- + fs/xfs/scrub/dir.c | 20 +-- + fs/xfs/scrub/fscounters.c | 3 +- + fs/xfs/scrub/health.c | 3 +- + fs/xfs/scrub/ialloc.c | 8 +- + fs/xfs/scrub/inode.c | 5 +- + fs/xfs/scrub/parent.c | 7 +- + fs/xfs/scrub/quota.c | 11 +- + fs/xfs/scrub/refcount.c | 5 +- + fs/xfs/scrub/repair.c | 11 +- + fs/xfs/scrub/repair.h | 6 +- + fs/xfs/scrub/rmap.c | 5 +- + fs/xfs/scrub/rtbitmap.c | 7 +- + fs/xfs/scrub/scrub.c | 42 +++--- + fs/xfs/scrub/scrub.h | 14 +- + fs/xfs/scrub/symlink.c | 9 +- + fs/xfs/scrub/xfs_scrub.h | 4 +- + fs/xfs/xfs_aops.c | 138 +++----------------- + fs/xfs/xfs_attr_list.c | 2 +- + fs/xfs/xfs_bmap_util.c | 209 ++++++++++++++++-------------- + fs/xfs/xfs_buf_item.c | 141 +++++++++++++++----- + fs/xfs/xfs_dir2_readdir.c | 12 +- + fs/xfs/xfs_dquot.c | 10 +- + fs/xfs/xfs_error.c | 5 + + fs/xfs/xfs_file.c | 12 +- + fs/xfs/xfs_filestream.h | 2 +- + fs/xfs/xfs_fsmap.c | 14 +- + fs/xfs/xfs_fsops.c | 199 ++++++++++++++++++----------- + fs/xfs/xfs_icache.c | 35 ++--- + fs/xfs/xfs_inode.c | 262 ++++++++++++++++++++------------------ + fs/xfs/xfs_inode.h | 42 ++++-- + fs/xfs/xfs_inode_item.c | 56 +++++--- + fs/xfs/xfs_ioctl.c | 69 +++++----- + fs/xfs/xfs_iomap.c | 27 ++-- + fs/xfs/xfs_iops.c | 65 +++++++--- + fs/xfs/xfs_itable.c | 19 ++- + fs/xfs/xfs_linux.h | 2 +- + fs/xfs/xfs_log_recover.c | 13 +- + fs/xfs/xfs_mount.c | 14 +- + fs/xfs/xfs_mount.h | 2 +- + fs/xfs/xfs_pnfs.c | 2 +- + fs/xfs/xfs_qm.c | 22 ++-- + fs/xfs/xfs_qm_bhv.c | 2 +- + fs/xfs/xfs_qm_syscalls.c | 2 +- + fs/xfs/xfs_quotaops.c | 2 +- + fs/xfs/xfs_reflink.c | 22 ++-- + fs/xfs/xfs_rtalloc.c | 16 +-- + fs/xfs/xfs_super.c | 132 ++++++++++--------- + fs/xfs/xfs_super.h | 1 - + fs/xfs/xfs_symlink.c | 28 ++-- + fs/xfs/xfs_trace.h | 16 +-- + fs/xfs/xfs_trans.c | 14 +- + fs/xfs/xfs_xattr.c | 2 + + 92 files changed, 1459 insertions(+), 1303 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 +Already up to date. +Merging djw-vfs/vfs-for-next (9b8523423b23 vfs: move __sb_{start,end}_write* to fs.h) +$ git merge djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (cbe6fc4e0142 fs/locks: remove useless assignment in fcntl_getlk) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (e8727aec724e Merge branch 'work.misc' into for-next) +$ git merge vfs/for-next +Auto-merging kernel/seccomp.c +Auto-merging fs/hostfs/hostfs_kern.c +Auto-merging fs/fuse/inode.c +Auto-merging fs/file.c +Auto-merging fs/f2fs/namei.c +CONFLICT (content): Merge conflict in fs/f2fs/namei.c +Auto-merging fs/f2fs/dir.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/ext2/namei.c +Auto-merging fs/ecryptfs/inode.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Auto-merging fs/cifs/file.c +Auto-merging arch/csky/lib/usercopy.c +Auto-merging arch/csky/include/asm/uaccess.h +CONFLICT (content): Merge conflict in arch/csky/include/asm/uaccess.h +Resolved 'arch/csky/include/asm/uaccess.h' using previous resolution. +Resolved 'fs/f2fs/namei.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ff7b654ff6e8] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/csky/lib/usercopy.c | 2 +- + arch/nds32/include/asm/uaccess.h | 1 - + arch/nios2/include/asm/uaccess.h | 1 - + arch/riscv/include/asm/uaccess.h | 1 - + drivers/infiniband/hw/qib/qib_fs.c | 68 ++-------------- + fs/autofs/autofs_i.h | 1 + + fs/autofs/expire.c | 2 +- + fs/autofs/waitq.c | 72 ++++------------ + fs/buffer.c | 6 +- + fs/d_path.c | 10 +-- + fs/dcache.c | 2 + + fs/ecryptfs/ecryptfs_kernel.h | 5 +- + fs/ecryptfs/inode.c | 163 +++++++++++++++++-------------------- + fs/ext2/namei.c | 3 +- + fs/ext4/namei.c | 3 +- + fs/f2fs/dir.c | 4 +- + fs/f2fs/namei.c | 3 +- + fs/file.c | 39 +++++---- + fs/fuse/inode.c | 3 +- + fs/hostfs/hostfs_kern.c | 2 +- + fs/nilfs2/namei.c | 3 +- + fs/udf/namei.c | 3 +- + fs/ufs/super.c | 3 +- + include/linux/dcache.h | 5 +- + include/linux/file.h | 11 +-- + kernel/seccomp.c | 17 ++-- + security/apparmor/mount.c | 4 +- + 27 files changed, 156 insertions(+), 281 deletions(-) +Merging printk/for-next (a386d19acc30 Merge branch 'for-5.13' into for-next) +$ git merge printk/for-next +Auto-merging mm/slub.c +Auto-merging drivers/hv/vmbus_drv.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 | 78 ++++- + mm/slub.c | 13 +- + 16 files changed, 502 insertions(+), 340 deletions(-) +Merging pci/next (e4e573c9a390 Merge branch 'remotes/lorenzo/pci/misc') +$ git merge pci/next +Auto-merging include/linux/pci_ids.h +Auto-merging include/linux/pci.h +Auto-merging drivers/reset/Kconfig +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/controller/pci-hyperv.c +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/sifive,fu740-pcie.yaml | 113 +++++++ + .../devicetree/bindings/pci/ti,j721e-pci-ep.yaml | 9 +- + .../devicetree/bindings/pci/ti,j721e-pci-host.yaml | 20 +- + .../devicetree/bindings/pci/xilinx-nwl-pcie.txt | 2 + + MAINTAINERS | 9 +- + arch/arm/mach-iop32x/n2100.c | 8 +- + drivers/ata/ahci_brcm.c | 46 +-- + drivers/clk/sifive/Kconfig | 2 + + drivers/clk/sifive/fu740-prci.c | 11 + + drivers/clk/sifive/fu740-prci.h | 2 +- + drivers/clk/sifive/sifive-prci.c | 54 ++++ + drivers/clk/sifive/sifive-prci.h | 13 + + 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 | 12 +- + drivers/pci/controller/dwc/Makefile | 8 +- + drivers/pci/controller/dwc/pci-keystone.c | 14 +- + drivers/pci/controller/dwc/pci-layerscape-ep.c | 2 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 2 + + drivers/pci/controller/dwc/pcie-designware-host.c | 1 + + drivers/pci/controller/dwc/pcie-designware.c | 11 +- + drivers/pci/controller/dwc/pcie-designware.h | 1 + + drivers/pci/controller/dwc/pcie-fu740.c | 308 ++++++++++++++++++ + drivers/pci/controller/dwc/pcie-tegra194.c | 6 +- + 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-altera-msi.c | 4 +- + drivers/pci/controller/pcie-brcmstb.c | 20 +- + drivers/pci/controller/pcie-iproc-msi.c | 2 +- + drivers/pci/controller/pcie-mediatek.c | 7 +- + drivers/pci/controller/pcie-microchip-host.c | 12 +- + drivers/pci/controller/pcie-rcar-host.c | 355 ++++++++++----------- + drivers/pci/controller/pcie-xilinx-nwl.c | 7 + + 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 | 22 +- + drivers/pci/endpoint/pci-epc-core.c | 2 + + drivers/pci/endpoint/pci-epf-core.c | 2 +- + drivers/pci/hotplug/acpi_pcihp.c | 2 +- + drivers/pci/hotplug/acpiphp_glue.c | 1 + + 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 +--------- + drivers/reset/Kconfig | 1 + + include/dt-bindings/clock/sifive-fu740-prci.h | 1 + + include/linux/msi.h | 17 +- + include/linux/pci.h | 5 +- + 67 files changed, 1344 insertions(+), 916 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pci/hisilicon-pcie.txt + create mode 100644 Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml + create mode 100644 drivers/pci/controller/dwc/pcie-fu740.c +Merging pstore/for-next/pstore (9d843e8fafc7 pstore: Add mem_type property DT parsing support) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (2b84a0f6c2c2 Merge branch 'for-5.13/wacom' into for-next) +$ git merge hid/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 14 + + drivers/hid/Kconfig | 20 +- + drivers/hid/Makefile | 6 +- + drivers/hid/hid-alps.c | 2 +- + drivers/hid/hid-core.c | 2 +- + drivers/hid/hid-debug.c | 1 + + drivers/hid/hid-elan.c | 17 +- + drivers/hid/hid-ft260.c | 1054 ++++++++++++++++++++++++++ + drivers/hid/hid-ids.h | 14 +- + drivers/hid/hid-input.c | 22 +- + drivers/hid/hid-kye.c | 2 +- + drivers/hid/hid-lenovo.c | 147 +++- + drivers/hid/hid-lg.c | 24 - + drivers/hid/hid-logitech-dj.c | 131 +++- + drivers/hid/hid-logitech-hidpp.c | 7 +- + drivers/hid/hid-magicmouse.c | 158 +++- + drivers/hid/hid-picolcd_core.c | 5 +- + drivers/hid/hid-plantronics.c | 60 +- + drivers/hid/hid-quirks.c | 5 +- + drivers/hid/hid-sensor-custom.c | 5 +- + drivers/hid/hid-sensor-hub.c | 4 +- + drivers/hid/hid-thrustmaster.c | 371 +++++++++ + drivers/hid/hid-uclogic-params.c | 8 +- + drivers/hid/hid-uclogic-rdesc.c | 2 +- + drivers/hid/i2c-hid/i2c-hid-acpi.c | 52 +- + drivers/hid/intel-ish-hid/ipc/ipc.c | 2 +- + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 3 +- + drivers/hid/intel-ish-hid/ishtp-fw-loader.c | 49 +- + drivers/hid/intel-ish-hid/ishtp-hid-client.c | 15 +- + drivers/hid/intel-ish-hid/ishtp-hid.c | 2 +- + drivers/hid/intel-ish-hid/ishtp-hid.h | 9 +- + drivers/hid/intel-ish-hid/ishtp/bus.c | 24 +- + drivers/hid/intel-ish-hid/ishtp/client.c | 5 +- + drivers/hid/intel-ish-hid/ishtp/hbm.c | 10 +- + drivers/hid/intel-ish-hid/ishtp/hbm.h | 1 + + drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h | 4 +- + 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/hid-pidff.c | 4 +- + drivers/hid/usbhid/hiddev.c | 6 +- + drivers/hid/usbhid/usbkbd.c | 18 +- + drivers/hid/wacom_sys.c | 2 +- + drivers/hid/wacom_wac.c | 50 +- + drivers/hid/wacom_wac.h | 1 + + drivers/platform/chrome/cros_ec_ishtp.c | 4 +- + include/linux/hid.h | 5 + + include/linux/intel-ish-client-if.h | 10 +- + 51 files changed, 3016 insertions(+), 292 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 +Merging i2c/i2c/for-next (f9743e4d0a62 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 +Removing Documentation/devicetree/bindings/i2c/i2c-mpc.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/i2c/i2c-mpc.txt | 62 --- + Documentation/devicetree/bindings/i2c/i2c-mpc.yaml | 91 ++++ + MAINTAINERS | 19 + + arch/arm/mach-davinci/board-da830-evm.c | 6 +- + arch/arm/mach-davinci/board-dm365-evm.c | 6 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 6 +- + arch/arm/mach-davinci/board-dm646x-evm.c | 6 +- + arch/arm/mach-davinci/board-mityomapl138.c | 6 +- + arch/arm/mach-davinci/board-sffsdr.c | 6 +- + arch/arm/mach-omap1/board-osk.c | 6 +- + arch/arm/mach-pxa/stargate2.c | 6 +- + arch/arm/mach-s3c/mach-mini2440.c | 6 +- + drivers/i2c/busses/Kconfig | 20 + + drivers/i2c/busses/Makefile | 2 + + drivers/i2c/busses/i2c-amd8111.c | 268 +++++----- + drivers/i2c/busses/i2c-brcmstb.c | 1 - + drivers/i2c/busses/i2c-cadence.c | 9 +- + drivers/i2c/busses/i2c-cht-wc.c | 6 +- + 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 | 155 +++++- + drivers/i2c/busses/i2c-designware-pcidrv.c | 61 +++ + drivers/i2c/busses/i2c-emev2.c | 5 +- + drivers/i2c/busses/i2c-hisi.c | 504 ++++++++++++++++++ + drivers/i2c/busses/i2c-i801.c | 4 + + drivers/i2c/busses/i2c-icy.c | 32 +- + drivers/i2c/busses/i2c-img-scb.c | 4 +- + drivers/i2c/busses/i2c-imx-lpi2c.c | 2 +- + drivers/i2c/busses/i2c-imx.c | 6 +- + drivers/i2c/busses/i2c-iop3xx.c | 28 +- + drivers/i2c/busses/i2c-jz4780.c | 5 +- + drivers/i2c/busses/i2c-mlxbf.c | 16 +- + drivers/i2c/busses/i2c-mpc.c | 579 +++++++++++---------- + drivers/i2c/busses/i2c-mt65xx.c | 17 +- + drivers/i2c/busses/i2c-nomadik.c | 4 +- + drivers/i2c/busses/i2c-nvidia-gpu.c | 6 +- + drivers/i2c/busses/i2c-omap.c | 8 +- + drivers/i2c/busses/i2c-powermac.c | 5 - + drivers/i2c/busses/i2c-qcom-cci.c | 4 +- + drivers/i2c/busses/i2c-rcar.c | 89 +++- + drivers/i2c/busses/i2c-s3c2410.c | 9 +- + drivers/i2c/busses/i2c-scmi.c | 2 - + drivers/i2c/busses/i2c-sh7760.c | 5 +- + drivers/i2c/busses/i2c-sprd.c | 5 +- + drivers/i2c/busses/i2c-stm32f7.c | 82 +-- + drivers/i2c/busses/i2c-tegra-bpmp.c | 79 ++- + drivers/i2c/busses/i2c-xgene-slimpro.c | 1 - + drivers/i2c/busses/i2c-xiic.c | 4 +- + drivers/i2c/i2c-boardinfo.c | 11 - + drivers/i2c/i2c-core-base.c | 114 ++-- + drivers/i2c/i2c-dev.c | 9 +- + drivers/input/mouse/elantech.c | 6 +- + drivers/platform/chrome/chromeos_laptop.c | 100 ++-- + drivers/platform/x86/intel_cht_int33fe_microb.c | 6 +- + include/linux/i2c.h | 13 +- + 56 files changed, 2082 insertions(+), 771 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-mpc.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mpc.yaml + create mode 100644 drivers/i2c/busses/i2c-cp2615.c + create mode 100644 drivers/i2c/busses/i2c-hisi.c +Merging i3c/i3c/next (0d95f41ebde4 Revert "i3c master: fix missing destroy_workqueue() on error in i3c_master_register") +$ git merge i3c/i3c/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml | 2 +- + drivers/i3c/master.c | 5 +---- + drivers/i3c/master/svc-i3c-master.c | 1 - + 3 files changed, 2 insertions(+), 6 deletions(-) +Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved) +$ git merge dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (9049572fb145 hwmon: Remove amd_energy driver) +$ git merge hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (80342d484afc kernel-doc: Add support for __deprecated) +$ git merge jc_docs/docs-next +Merge made by the 'recursive' strategy. + scripts/kernel-doc | 1 + + 1 file changed, 1 insertion(+) +Merging v4l-dvb/master (0b276e470a4d media: coda: fix macroblocks count control usage) +$ 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 +Removing drivers/media/rc/zx-irdec.c +Auto-merging drivers/media/rc/keymaps/Makefile +Auto-merging drivers/media/rc/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/zx-irdec.txt +Removing Documentation/devicetree/bindings/media/renesas,drif.txt +Auto-merging Documentation/devicetree/bindings/media/rc.yaml +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 293f0ae4ca1b] 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/allwinner,sun4i-a10-ir.yaml | 16 +- + .../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 | 1 + + .../devicetree/bindings/media/renesas,drif.txt | 177 -- + .../devicetree/bindings/media/renesas,drif.yaml | 279 +++ + .../devicetree/bindings/media/zx-irdec.txt | 14 - + 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 | 30 +- + 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/b2c2/flexcop.h | 6 +- + 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 | 38 +- + drivers/media/dvb-frontends/m88ds3103.c | 4 +- + drivers/media/dvb-frontends/mxl692.c | 2 +- + drivers/media/i2c/adv748x/adv748x.h | 10 +- + drivers/media/i2c/adv7511-v4l2.c | 72 +- + drivers/media/i2c/adv7604.c | 118 +- + drivers/media/i2c/adv7842.c | 108 +- + 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/rdacm21.c | 2 +- + drivers/media/i2c/s5k5baf.c | 2 +- + drivers/media/i2c/s5k6aa.c | 2 +- + drivers/media/i2c/tc358743.c | 2 +- + drivers/media/i2c/tda1997x.c | 2 +- + drivers/media/i2c/tvp514x_regs.h | 6 +- + drivers/media/mc/mc-entity.c | 1 + + drivers/media/pci/b2c2/flexcop-pci.c | 6 +- + drivers/media/pci/bt8xx/bttv-cards.c | 20 +- + drivers/media/pci/cobalt/cobalt-driver.c | 12 +- + 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/cx25821/cx25821.h | 1 - + 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 | 21 +- + drivers/media/platform/Makefile | 1 + + drivers/media/platform/allegro-dvt/nal-h264.h | 10 +- + drivers/media/platform/allegro-dvt/nal-hevc.h | 6 +- + 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 | 2126 ++++++++++++++++++++ + drivers/media/platform/imx-jpeg/mxc-jpeg.h | 180 ++ + drivers/media/platform/imx-pxp.c | 9 +- + drivers/media/platform/meson/ge2d/ge2d.c | 4 +- + 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 | 127 +- + 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 | 52 +- + 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_msgs.c | 20 +- + drivers/media/platform/qcom/venus/hfi_parser.c | 12 +- + .../media/platform/qcom/venus/hfi_plat_bufs_v6.c | 32 +- + .../media/platform/qcom/venus/hfi_platform_v6.c | 138 +- + drivers/media/platform/qcom/venus/hfi_venus.c | 167 +- + drivers/media/platform/qcom/venus/hfi_venus_io.h | 118 +- + drivers/media/platform/qcom/venus/pm_helpers.c | 143 +- + 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-debug.c | 2 +- + 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/sunxi/sun8i-di/sun8i-di.c | 2 +- + 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/Kconfig | 11 - + drivers/media/rc/Makefile | 1 - + drivers/media/rc/img-ir/img-ir-hw.c | 2 +- + drivers/media/rc/ir-hix5hd2.c | 2 +- + drivers/media/rc/ite-cir.c | 351 +--- + drivers/media/rc/ite-cir.h | 51 +- + drivers/media/rc/keymaps/Makefile | 4 + + drivers/media/rc/keymaps/rc-mecool-kii-pro.c | 91 + + drivers/media/rc/keymaps/rc-mecool-kiii-pro.c | 88 + + drivers/media/rc/keymaps/rc-minix-neo.c | 55 + + drivers/media/rc/keymaps/rc-xbox-360.c | 83 + + drivers/media/rc/zx-irdec.c | 181 -- + 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 | 9 +- + 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 | 90 +- + drivers/media/usb/dvb-usb/dvb-usb.h | 91 +- + 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/gspca.c | 2 + + drivers/media/usb/gspca/gspca.h | 1 + + drivers/media/usb/gspca/sq905.c | 2 +- + drivers/media/usb/gspca/stv06xx/stv06xx.c | 9 + + 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 | 307 ++- + 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 | 36 +- + drivers/staging/media/ipu3/ipu3.h | 5 - + .../staging/media/meson/vdec/codec_hevc_common.h | 4 +- + drivers/staging/media/meson/vdec/vdec.c | 8 +- + drivers/staging/media/omap4iss/iss.c | 11 +- + 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_regs.h | 17 +- + drivers/staging/media/sunxi/cedrus/cedrus_vp8.c | 113 +- + drivers/staging/media/tegra-video/csi.h | 2 +- + drivers/staging/media/zoran/zoran_device.c | 48 +- + 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 | 4 + + include/media/v4l2-async.h | 12 +- + include/media/v4l2-ctrls.h | 21 +- + 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 +- + 482 files changed, 16968 insertions(+), 7405 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 + delete mode 100644 Documentation/devicetree/bindings/media/zx-irdec.txt + 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-mecool-kii-pro.c + create mode 100644 drivers/media/rc/keymaps/rc-mecool-kiii-pro.c + 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 drivers/media/rc/zx-irdec.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 (bf05bf16c76b Linux 5.12-rc8) +$ 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 (3c44d15e5ffd Merge branch 'pm-sleep' into linux-next) +$ git merge pm/linux-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging cpufreq-arm/cpufreq/arm/linux-next (dbbd49bade05 cpufreq: armada-37xx: Fix module unloading) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (a38fd8748464 Linux 5.12-rc2) +$ git merge cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (0a7dc8318c28 PM / devfreq: imx8m-ddrc: Remove unneeded of_match_ptr()) +$ git merge devfreq/devfreq-next +Already up to date. +Merging opp/opp/linux-next (a8bb0e872bfb memory: samsung: exynos5422-dmc: Convert to use resource-managed OPP API) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (c310e546164d thermal/drivers/mtk_thermal: Remove redundant initializations of several variables) +$ git merge thermal/thermal/linux-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/thermal/brcm,ns-thermal.txt +Merge made by the 'recursive' strategy. + .../bindings/thermal/brcm,ns-thermal.txt | 37 ---- + .../bindings/thermal/brcm,ns-thermal.yaml | 60 ++++++ + .../devicetree/bindings/thermal/qcom-tsens.yaml | 59 +++++- + .../bindings/thermal/rcar-gen3-thermal.yaml | 43 +++- + .../bindings/thermal/thermal-sensor.yaml | 3 + + Documentation/driver-api/thermal/sysfs-api.rst | 12 +- + MAINTAINERS | 3 +- + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 4 +- + drivers/thermal/amlogic_thermal.c | 4 +- + drivers/thermal/broadcom/bcm2835_thermal.c | 1 - + drivers/thermal/cpufreq_cooling.c | 49 ++--- + drivers/thermal/cpuidle_cooling.c | 37 ++-- + drivers/thermal/devfreq_cooling.c | 25 +-- + drivers/thermal/gov_fair_share.c | 11 +- + drivers/thermal/gov_power_allocator.c | 32 ++- + drivers/thermal/hisi_thermal.c | 10 +- + drivers/thermal/intel/Kconfig | 11 + + drivers/thermal/intel/Makefile | 1 + + drivers/thermal/intel/intel_tcc_cooling.c | 129 +++++++++++ + drivers/thermal/mtk_thermal.c | 12 +- + drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 91 +++++--- + drivers/thermal/qcom/tsens-8960.c | 235 ++++++++++----------- + drivers/thermal/qcom/tsens-v0_1.c | 98 ++++++++- + drivers/thermal/qcom/tsens-v1.c | 4 +- + drivers/thermal/qcom/tsens.c | 165 ++++++++++++--- + drivers/thermal/qcom/tsens.h | 6 +- + drivers/thermal/rcar_gen3_thermal.c | 3 +- + drivers/thermal/sun8i_thermal.c | 4 +- + drivers/thermal/tegra/soctherm.c | 15 +- + drivers/thermal/thermal_core.c | 57 ++--- + drivers/thermal/thermal_core.h | 1 + + drivers/thermal/thermal_helpers.c | 27 ++- + drivers/thermal/thermal_mmio.c | 5 +- + drivers/thermal/thermal_of.c | 7 +- + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 37 ++-- + include/linux/thermal.h | 7 +- + include/uapi/linux/thermal.h | 2 +- + 38 files changed, 863 insertions(+), 446 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/thermal/brcm,ns-thermal.txt + create mode 100644 Documentation/devicetree/bindings/thermal/brcm,ns-thermal.yaml + create mode 100644 drivers/thermal/intel/intel_tcc_cooling.c +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 (95b079d8215b swiotlb: Fix the type of index) +$ git merge swiotlb/linux-next +Auto-merging include/xen/swiotlb-xen.h +Auto-merging drivers/iommu/dma-iommu.c +Auto-merging arch/arm/xen/mm.c +Auto-merging arch/arm/mm/init.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 | 518 ++++++++++----------------- + 14 files changed, 354 insertions(+), 478 deletions(-) +Merging rdma/for-next (6cc9e215eb27 RDMA/nldev: Add copy-on-fork attribute to get sys command) +$ git merge rdma/for-next +Auto-merging include/linux/pci.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging drivers/pci/pci.h +Auto-merging drivers/pci/pci-sysfs.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/eq.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c +Auto-merging drivers/infiniband/ulp/rtrs/rtrs-clt.c +Auto-merging drivers/infiniband/hw/qedr/verbs.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/hfi1/netdev_rx.c +Auto-merging drivers/infiniband/hw/hfi1/init.c +Auto-merging drivers/infiniband/hw/hfi1/hfi.h +CONFLICT (content): Merge conflict in drivers/infiniband/hw/hfi1/hfi.h +Auto-merging drivers/infiniband/hw/hfi1/affinity.c +Auto-merging drivers/infiniband/hw/cxgb4/cm.c +Auto-merging MAINTAINERS +Auto-merging Documentation/ABI/testing/sysfs-bus-pci +Resolved 'drivers/infiniband/hw/hfi1/hfi.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master dda776f0369f] Merge remote-tracking branch 'rdma/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-pci | 29 + + Documentation/ABI/testing/sysfs-class-rtrs-client | 12 + + .../bindings/infiniband/hisilicon-hns-roce.txt | 2 +- + MAINTAINERS | 5 +- + drivers/infiniband/core/cache.c | 87 +- + drivers/infiniband/core/cm.c | 58 +- + drivers/infiniband/core/cm_msgs.h | 4 +- + drivers/infiniband/core/cma.c | 116 +- + drivers/infiniband/core/cma_configfs.c | 8 +- + drivers/infiniband/core/cma_priv.h | 10 +- + drivers/infiniband/core/core_priv.h | 28 +- + drivers/infiniband/core/counters.c | 62 +- + drivers/infiniband/core/device.c | 37 +- + drivers/infiniband/core/iwpm_msg.c | 3 +- + drivers/infiniband/core/mad.c | 79 +- + drivers/infiniband/core/mad_rmpp.c | 10 +- + drivers/infiniband/core/multicast.c | 8 +- + drivers/infiniband/core/nldev.c | 176 +- + drivers/infiniband/core/opa_smi.h | 4 +- + drivers/infiniband/core/rdma_core.c | 4 +- + drivers/infiniband/core/restrack.c | 3 + + 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 | 29 +- + drivers/infiniband/core/ucma.c | 8 +- + drivers/infiniband/core/umem.c | 8 +- + drivers/infiniband/core/umem_dmabuf.c | 4 + + drivers/infiniband/core/user_mad.c | 34 +- + drivers/infiniband/core/uverbs_cmd.c | 25 +- + drivers/infiniband/core/uverbs_ioctl.c | 32 +- + drivers/infiniband/core/verbs.c | 43 +- + drivers/infiniband/hw/bnxt_re/Kconfig | 4 +- + 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 | 63 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 1 + + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 4 + + drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 2 + + drivers/infiniband/hw/bnxt_re/qplib_res.c | 1 + + 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/resource.c | 2 +- + 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/affinity.c | 8 +- + drivers/infiniband/hw/hfi1/chip.c | 10 +- + 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/firmware.c | 1 + + drivers/infiniband/hw/hfi1/hfi.h | 20 +- + drivers/infiniband/hw/hfi1/init.c | 7 +- + drivers/infiniband/hw/hfi1/iowait.h | 2 +- + drivers/infiniband/hw/hfi1/ipoib.h | 15 +- + drivers/infiniband/hw/hfi1/ipoib_main.c | 13 +- + drivers/infiniband/hw/hfi1/ipoib_tx.c | 71 +- + drivers/infiniband/hw/hfi1/mad.c | 128 +- + drivers/infiniband/hw/hfi1/mad.h | 2 +- + drivers/infiniband/hw/hfi1/mmu_rb.c | 2 +- + drivers/infiniband/hw/hfi1/msix.c | 12 +- + drivers/infiniband/hw/hfi1/netdev.h | 39 +- + drivers/infiniband/hw/hfi1/netdev_rx.c | 172 +- + drivers/infiniband/hw/hfi1/sdma.c | 2 +- + drivers/infiniband/hw/hfi1/sdma.h | 18 - + drivers/infiniband/hw/hfi1/sysfs.c | 2 +- + drivers/infiniband/hw/hfi1/trace_tx.h | 179 ++ + drivers/infiniband/hw/hfi1/user_sdma.c | 12 +- + drivers/infiniband/hw/hfi1/user_sdma.h | 1 + + 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 | 114 +- + drivers/infiniband/hw/hns/hns_roce_common.h | 25 +- + drivers/infiniband/hw/hns/hns_roce_cq.c | 92 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 91 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 55 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 2267 +++++++++++--------- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 578 ++--- + 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 | 124 +- + 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 | 5 +- + drivers/infiniband/hw/i40iw/i40iw_osdep.h | 22 - + drivers/infiniband/hw/i40iw/i40iw_pble.c | 6 +- + 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/mlx4/qp.c | 3 - + drivers/infiniband/hw/mlx5/Makefile | 1 + + drivers/infiniband/hw/mlx5/cmd.c | 101 - + drivers/infiniband/hw/mlx5/cmd.h | 3 - + 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/dm.c | 587 +++++ + drivers/infiniband/hw/mlx5/dm.h | 68 + + drivers/infiniband/hw/mlx5/fs.c | 11 +- + drivers/infiniband/hw/mlx5/ib_rep.c | 9 +- + 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 | 346 +-- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 182 +- + drivers/infiniband/hw/mlx5/mr.c | 163 +- + drivers/infiniband/hw/mlx5/odp.c | 185 +- + drivers/infiniband/hw/mlx5/qp.c | 17 +- + drivers/infiniband/hw/mlx5/std_types.c | 173 ++ + 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/qedr_iw_cm.c | 4 +- + 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 | 26 +- + 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_av.c | 2 +- + drivers/infiniband/sw/rxe/rxe_comp.c | 5 +- + 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 | 52 +- + 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.c | 4 +- + 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 | 6 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 6 +- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 26 +- + drivers/infiniband/ulp/iser/iscsi_iser.h | 1 - + drivers/infiniband/ulp/isert/ib_isert.c | 16 +- + drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 48 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 122 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.h | 1 + + drivers/infiniband/ulp/rtrs/rtrs-pri.h | 3 + + drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 20 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 36 +- + drivers/infiniband/ulp/rtrs/rtrs.c | 35 +- + drivers/infiniband/ulp/rtrs/rtrs.h | 3 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 - + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 - + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 1 + + .../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 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 2 +- + 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/lib/gid.c | 4 +- + 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 | 8 +- + include/linux/mlx5/eswitch.h | 5 +- + include/linux/mlx5/mlx5_ifc.h | 74 +- + include/linux/pci.h | 8 + + include/rdma/ib_cache.h | 18 +- + include/rdma/ib_mad.h | 2 +- + include/rdma/ib_sa.h | 15 +- + include/rdma/ib_verbs.h | 199 +- + include/rdma/iw_cm.h | 1 + + include/rdma/rdma_cm.h | 4 +- + include/rdma/rdma_counter.h | 16 +- + include/rdma/rdma_vt.h | 18 +- + include/rdma/restrack.h | 4 + + include/rdma/rw.h | 18 +- + include/rdma/uverbs_ioctl.h | 81 +- + include/rdma/uverbs_named_ioctl.h | 2 +- + include/uapi/rdma/hns-abi.h | 2 + + include/uapi/rdma/mlx5_user_ioctl_cmds.h | 29 + + include/uapi/rdma/mlx5_user_ioctl_verbs.h | 25 + + include/uapi/rdma/rdma_netlink.h | 16 + + net/rds/ib_cm.c | 35 +- + net/rds/rdma_transport.c | 1 + + 242 files changed, 5688 insertions(+), 4097 deletions(-) + create mode 100644 drivers/infiniband/hw/mlx5/dm.c + create mode 100644 drivers/infiniband/hw/mlx5/dm.h +Merging net-next/master (99ba0ea616aa sfc: adjust efx->xdp_tx_queue_count with the real number of initialized queues) +$ git merge net-next/master +Auto-merging tools/testing/selftests/net/mptcp/mptcp_connect.sh +CONFLICT (content): Merge conflict in tools/testing/selftests/net/mptcp/mptcp_connect.sh +Removing tools/testing/selftests/drivers/net/mlxsw/spectrum-2/q_in_vni_veto.sh +Auto-merging tools/testing/selftests/bpf/Makefile +Auto-merging tools/scripts/Makefile.include +Removing tools/lib/bpf/libbpf_util.h +Removing tools/bpf/Makefile.helpers +Auto-merging scripts/link-vmlinux.sh +Auto-merging net/wireless/nl80211.c +Auto-merging net/wireless/core.c +Auto-merging net/tipc/name_table.c +Auto-merging net/rds/send.c +Auto-merging net/nfc/nci/uart.c +CONFLICT (content): Merge conflict in net/nfc/nci/uart.c +Removing net/netfilter/nf_log_netdev.c +Removing net/netfilter/nf_log_common.c +Removing net/ipv6/netfilter/nf_log_ipv6.c +Auto-merging net/ipv6/esp6.c +Removing net/ipv4/netfilter/nf_log_ipv4.c +Removing net/ipv4/netfilter/nf_log_arp.c +Auto-merging net/ipv4/esp4.c +Removing net/decnet/TODO +Removing net/bridge/netfilter/nf_log_bridge.c +Auto-merging net/bluetooth/smp.c +Auto-merging net/bluetooth/hci_request.c +Removing net/ax25/TODO +Auto-merging kernel/sysctl.c +Auto-merging kernel/bpf/bpf_lsm.c +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/virtio_ids.h +Removing include/net/netns/dccp.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging include/linux/mlx5/driver.h +Auto-merging include/linux/bpf.h +Removing include/linux/atm_suni.h +Auto-merging fs/proc/proc_sysctl.c +Removing fs/jffs2/TODO +Removing fs/befs/TODO +Auto-merging drivers/staging/octeon/ethernet.c +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 +Auto-merging drivers/staging/Makefile +Auto-merging drivers/staging/Kconfig +Removing drivers/scsi/aacraid/TODO +Auto-merging drivers/s390/net/qeth_core_main.c +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/net/ethernet/realtek/r8169_main.c +Auto-merging drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/lib/gid.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c +Auto-merging drivers/net/ethernet/dlink/sundance.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.h +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c +Auto-merging arch/x86/net/bpf_jit_comp.c +Auto-merging arch/arm64/boot/dts/rockchip/rk3328.dtsi +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/net/wireless/mediatek,mt76.txt +Removing Documentation/devicetree/bindings/net/wireless/ieee80211.txt +Removing Documentation/devicetree/bindings/net/rockchip-dwmac.txt +Removing Documentation/devicetree/bindings/net/broadcom-bluetooth.txt +Auto-merging Documentation/admin-guide/sysctl/net.rst +Resolved 'net/nfc/nci/uart.c' using previous resolution. +Resolved 'tools/testing/selftests/net/mptcp/mptcp_connect.sh' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 425d4d43ce0a] 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/bpf_devel_QA.rst | 30 +- + 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/broadcom-bluetooth.txt | 56 - + .../bindings/net/broadcom-bluetooth.yaml | 118 + + .../devicetree/bindings/net/can/rcar_can.txt | 5 +- + Documentation/devicetree/bindings/net/dsa/dsa.yaml | 9 + + .../devicetree/bindings/net/dsa/lantiq-gswip.txt | 4 + + .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 2 + + .../devicetree/bindings/net/fsl-enetc.txt | 15 + + .../devicetree/bindings/net/idt,3243x-emac.yaml | 73 + + .../bindings/net/intel,ixp4xx-ethernet.yaml | 102 + + .../devicetree/bindings/net/mdio-gpio.txt | 1 + + .../devicetree/bindings/net/qcom,ipa.yaml | 26 +- + .../devicetree/bindings/net/renesas,etheravb.yaml | 11 +- + .../devicetree/bindings/net/rockchip-dwmac.txt | 76 - + .../devicetree/bindings/net/rockchip-dwmac.yaml | 120 + + .../devicetree/bindings/net/snps,dwmac.yaml | 13 +- + .../devicetree/bindings/net/wireless/ieee80211.txt | 24 - + .../bindings/net/wireless/ieee80211.yaml | 45 + + .../bindings/net/wireless/mediatek,mt76.txt | 78 - + .../bindings/net/wireless/mediatek,mt76.yaml | 228 ++ + .../devicetree/bindings/net/xilinx_axienet.txt | 25 +- + .../devicetree/bindings/serial/ingenic,uart.yaml | 2 +- + Documentation/networking/can.rst | 2 + + .../device_drivers/ethernet/mellanox/mlx5.rst | 34 + + .../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 | 269 +- + 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/statistics.rst | 46 +- + Documentation/networking/switchdev.rst | 200 +- + Documentation/networking/timestamping.rst | 63 +- + 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 | 30 +- + arch/arm/mach-mvebu/kirkwood.c | 3 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 6 + + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 4 +- + arch/mips/rb532/devices.c | 25 +- + arch/powerpc/boot/dts/fsl/bsc9131si-post.dtsi | 4 - + arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi | 4 - + arch/powerpc/boot/dts/fsl/c293si-post.dtsi | 4 - + arch/powerpc/boot/dts/fsl/p1010si-post.dtsi | 21 - + arch/powerpc/sysdev/tsi108_dev.c | 5 +- + 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/idt77252.c | 6 - + drivers/atm/iphase.c | 2 +- + drivers/atm/suni.c | 1 - + drivers/bcma/driver_mips.c | 7 - + 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 ++ + 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 | 3 + + drivers/net/Makefile | 3 +- + drivers/net/Space.c | 3 - + 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/Kconfig | 10 + + drivers/net/can/usb/Makefile | 1 + + drivers/net/can/usb/ems_usb.c | 2 +- + drivers/net/can/usb/esd_usb2.c | 4 +- + drivers/net/can/usb/etas_es58x/Makefile | 3 + + drivers/net/can/usb/etas_es58x/es581_4.c | 507 +++ + drivers/net/can/usb/etas_es58x/es581_4.h | 207 ++ + drivers/net/can/usb/etas_es58x/es58x_core.c | 2301 ++++++++++++ + drivers/net/can/usb/etas_es58x/es58x_core.h | 700 ++++ + drivers/net/can/usb/etas_es58x/es58x_fd.c | 562 +++ + drivers/net/can/usb/etas_es58x/es58x_fd.h | 243 ++ + 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 | 106 +- + drivers/net/can/usb/peak_usb/pcan_usb_core.c | 64 +- + drivers/net/can/usb/peak_usb/pcan_usb_core.h | 9 +- + drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 50 +- + drivers/net/can/usb/peak_usb/pcan_usb_pro.c | 52 +- + drivers/net/can/usb/peak_usb/pcan_usb_pro.h | 82 +- + 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/hirschmann/hellcreek_hwtstamp.c | 28 +- + drivers/net/dsa/hirschmann/hellcreek_hwtstamp.h | 4 +- + drivers/net/dsa/lantiq_gswip.c | 162 +- + drivers/net/dsa/microchip/Kconfig | 10 +- + drivers/net/dsa/microchip/Makefile | 1 + + drivers/net/dsa/microchip/ksz8.h | 69 + + drivers/net/dsa/microchip/ksz8795.c | 884 +++-- + drivers/net/dsa/microchip/ksz8795_reg.h | 125 +- + drivers/net/dsa/microchip/ksz8795_spi.c | 46 +- + drivers/net/dsa/microchip/ksz8863_smi.c | 213 ++ + drivers/net/dsa/microchip/ksz_common.h | 3 +- + drivers/net/dsa/mt7530.c | 196 +- + drivers/net/dsa/mt7530.h | 15 +- + drivers/net/dsa/mv88e6xxx/chip.c | 599 ++- + drivers/net/dsa/mv88e6xxx/chip.h | 44 +- + drivers/net/dsa/mv88e6xxx/devlink.c | 58 +- + drivers/net/dsa/mv88e6xxx/global1.c | 19 +- + drivers/net/dsa/mv88e6xxx/global1.h | 2 + + drivers/net/dsa/mv88e6xxx/global2.c | 17 + + drivers/net/dsa/mv88e6xxx/global2.h | 12 +- + drivers/net/dsa/mv88e6xxx/global2_scratch.c | 6 +- + drivers/net/dsa/mv88e6xxx/hwtstamp.c | 26 +- + drivers/net/dsa/mv88e6xxx/hwtstamp.h | 10 +- + drivers/net/dsa/mv88e6xxx/port.c | 418 ++- + drivers/net/dsa/mv88e6xxx/port.h | 50 + + drivers/net/dsa/mv88e6xxx/serdes.c | 344 +- + drivers/net/dsa/mv88e6xxx/serdes.h | 98 +- + drivers/net/dsa/ocelot/felix.c | 23 +- + drivers/net/dsa/ocelot/felix_vsc9959.c | 12 +- + drivers/net/dsa/sja1105/sja1105_flower.c | 9 +- + drivers/net/dsa/sja1105/sja1105_main.c | 18 +- + drivers/net/dsa/sja1105/sja1105_ptp.c | 16 +- + drivers/net/dsa/sja1105/sja1105_ptp.h | 4 +- + drivers/net/ethernet/3com/3c509.c | 1 + + drivers/net/ethernet/Kconfig | 5 +- + drivers/net/ethernet/Makefile | 2 + + 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/aeroflex/greth.c | 6 +- + drivers/net/ethernet/allwinner/sun4i-emac.c | 10 +- + drivers/net/ethernet/altera/altera_tse_main.c | 7 +- + 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/amd/pcnet32.c | 3 +- + drivers/net/ethernet/arc/emac_main.c | 8 +- + drivers/net/ethernet/atheros/Kconfig | 1 + + drivers/net/ethernet/atheros/ag71xx.c | 31 +- + drivers/net/ethernet/atheros/atl1c/atl1c.h | 2 + + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 74 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 24 +- + drivers/net/ethernet/broadcom/bcm4908_enet.c | 143 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 7 +- + drivers/net/ethernet/broadcom/bgmac-bcma.c | 10 +- + drivers/net/ethernet/broadcom/bgmac-platform.c | 11 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 254 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 32 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 154 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 74 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 122 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h | 12 + + 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 | 59 +- + .../net/ethernet/cavium/liquidio/cn23xx_pf_regs.h | 2 +- + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 8 +- + drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 2 +- + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 5 +- + drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c | 3 +- + drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c | 3 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c | 3 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 24 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c | 11 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c | 8 +- + .../chelsio/inline_crypto/ch_ktls/chcr_ktls.c | 10 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 13 +- + drivers/net/ethernet/davicom/dm9000.c | 11 +- + 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/ethoc.c | 6 +- + drivers/net/ethernet/ezchip/nps_enet.c | 7 +- + drivers/net/ethernet/faraday/ftmac100.c | 13 +- + drivers/net/ethernet/fealnx.c | 13 +- + drivers/net/ethernet/freescale/Kconfig | 1 + + drivers/net/ethernet/freescale/Makefile | 4 +- + 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 +- + .../ethernet/freescale/dpaa2/dpaa2-switch-flower.c | 492 +++ + .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 3394 +++++++++++++++++ + .../net/ethernet/freescale/dpaa2/dpaa2-switch.h | 246 ++ + 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 | 219 +- + .../ethsw => net/ethernet/freescale/dpaa2}/dpsw.c | 781 ++-- + drivers/net/ethernet/freescale/dpaa2/dpsw.h | 755 ++++ + drivers/net/ethernet/freescale/enetc/Kconfig | 9 + + drivers/net/ethernet/freescale/enetc/Makefile | 3 + + drivers/net/ethernet/freescale/enetc/enetc.c | 1418 +++++-- + drivers/net/ethernet/freescale/enetc/enetc.h | 129 +- + drivers/net/ethernet/freescale/enetc/enetc_cbdr.c | 82 +- + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 40 +- + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 16 + + drivers/net/ethernet/freescale/enetc/enetc_ierb.c | 155 + + drivers/net/ethernet/freescale/enetc/enetc_ierb.h | 20 + + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 229 +- + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 21 +- + drivers/net/ethernet/freescale/enetc/enetc_vf.c | 8 + + drivers/net/ethernet/freescale/fec_main.c | 17 +- + drivers/net/ethernet/freescale/fec_mpc52xx.c | 7 +- + drivers/net/ethernet/freescale/fman/mac.c | 9 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 5 +- + drivers/net/ethernet/freescale/gianfar.c | 178 +- + drivers/net/ethernet/freescale/gianfar.h | 17 - + drivers/net/ethernet/freescale/ucc_geth.c | 5 +- + drivers/net/ethernet/google/gve/gve_ethtool.c | 8 +- + drivers/net/ethernet/hisilicon/hisi_femac.c | 7 +- + drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 7 +- + 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/hclge_mbx.h | 3 + + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 17 +- + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 5 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 210 +- + 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 | 2263 +++++++----- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 64 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 38 +- + .../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 | 101 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 6 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c | 6 + + 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/ehea/ehea_main.c | 1 + + drivers/net/ethernet/ibm/ibmvnic.c | 124 +- + drivers/net/ethernet/ibm/ibmvnic.h | 94 - + drivers/net/ethernet/intel/Kconfig | 1 + + 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.h | 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 | 33 +- + 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_virtchnl_pf.c | 108 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 13 +- + drivers/net/ethernet/intel/iavf/Makefile | 3 +- + drivers/net/ethernet/intel/iavf/iavf.h | 22 + + drivers/net/ethernet/intel/iavf/iavf_adv_rss.c | 218 ++ + drivers/net/ethernet/intel/iavf/iavf_adv_rss.h | 95 + + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 883 ++++- + drivers/net/ethernet/intel/iavf/iavf_fdir.c | 779 ++++ + drivers/net/ethernet/intel/iavf/iavf_fdir.h | 118 + + drivers/net/ethernet/intel/iavf/iavf_main.c | 62 +- + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 17 +- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 360 +- + drivers/net/ethernet/intel/ice/Makefile | 3 +- + drivers/net/ethernet/intel/ice/ice.h | 111 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 24 +- + drivers/net/ethernet/intel/ice/ice_arfs.c | 6 +- + drivers/net/ethernet/intel/ice/ice_base.c | 48 +- + drivers/net/ethernet/intel/ice/ice_common.c | 197 +- + drivers/net/ethernet/intel/ice/ice_common.h | 10 +- + drivers/net/ethernet/intel/ice/ice_controlq.c | 8 +- + drivers/net/ethernet/intel/ice/ice_controlq.h | 5 +- + drivers/net/ethernet/intel/ice/ice_dcb.c | 10 +- + drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 2 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 373 +- + drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c | 6 +- + 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 | 571 ++- + 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 | 835 ++++- + drivers/net/ethernet/intel/ice/ice_flow.h | 166 +- + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 19 + + drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 22 + + drivers/net/ethernet/intel/ice/ice_lib.c | 443 ++- + drivers/net/ethernet/intel/ice/ice_lib.h | 7 +- + drivers/net/ethernet/intel/ice/ice_main.c | 784 ++-- + drivers/net/ethernet/intel/ice/ice_nvm.c | 1 + + drivers/net/ethernet/intel/ice/ice_protocol_type.h | 10 + + drivers/net/ethernet/intel/ice/ice_sched.c | 133 +- + drivers/net/ethernet/intel/ice/ice_sriov.c | 400 +- + drivers/net/ethernet/intel/ice/ice_sriov.h | 20 +- + drivers/net/ethernet/intel/ice/ice_switch.c | 2 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 338 +- + drivers/net/ethernet/intel/ice/ice_txrx.h | 45 +- + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 1 + + drivers/net/ethernet/intel/ice/ice_type.h | 117 +- + .../ethernet/intel/ice/ice_virtchnl_allowlist.c | 171 + + .../ethernet/intel/ice/ice_virtchnl_allowlist.h | 13 + + 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 | 774 +++- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 21 + + drivers/net/ethernet/intel/ice/ice_xsk.c | 21 +- + drivers/net/ethernet/intel/igb/e1000_defines.h | 8 +- + drivers/net/ethernet/intel/igb/e1000_mac.c | 27 + + 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 | 25 +- + drivers/net/ethernet/intel/igb/igb_ptp.c | 1 + + drivers/net/ethernet/intel/igc/Makefile | 2 +- + drivers/net/ethernet/intel/igc/igc.h | 31 +- + drivers/net/ethernet/intel/igc/igc_defines.h | 68 +- + drivers/net/ethernet/intel/igc/igc_ethtool.c | 2 + + drivers/net/ethernet/intel/igc/igc_i225.c | 6 +- + drivers/net/ethernet/intel/igc/igc_main.c | 539 ++- + drivers/net/ethernet/intel/igc/igc_ptp.c | 320 +- + drivers/net/ethernet/intel/igc/igc_regs.h | 10 + + 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_dcb_nl.c | 2 +- + 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 | 8 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 5 +- + 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/intel/ixgbevf/vf.h | 3 - + drivers/net/ethernet/korina.c | 617 +++- + drivers/net/ethernet/lantiq_xrx200.c | 11 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 11 +- + drivers/net/ethernet/marvell/mvneta.c | 31 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 13 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 107 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.h | 3 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 60 +- + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 89 +- + drivers/net/ethernet/marvell/octeontx2/af/npc.h | 7 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 17 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cpt.c | 192 +- + .../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/af/rvu_reg.h | 21 + + .../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 ++++ + .../net/ethernet/marvell/prestera/prestera_main.c | 11 +- + .../net/ethernet/marvell/prestera/prestera_pci.c | 1 + + .../ethernet/marvell/prestera/prestera_switchdev.c | 2 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 9 +- + drivers/net/ethernet/marvell/skge.c | 9 +- + drivers/net/ethernet/marvell/sky2.c | 19 +- + drivers/net/ethernet/mediatek/Kconfig | 2 + + drivers/net/ethernet/mediatek/Makefile | 2 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 315 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 73 +- + drivers/net/ethernet/mediatek/mtk_ppe.c | 509 +++ + drivers/net/ethernet/mediatek/mtk_ppe.h | 288 ++ + drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c | 217 ++ + drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 495 +++ + drivers/net/ethernet/mediatek/mtk_ppe_regs.h | 144 + + drivers/net/ethernet/mellanox/mlx4/cmd.c | 69 +- + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 12 + + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 12 +- + 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 | 72 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.h | 1 + + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 57 +- + .../net/ethernet/mellanox/mlx5/core/en/devlink.c | 43 +- + .../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 | 548 ++- + .../net/ethernet/mellanox/mlx5/core/en/params.h | 53 +- + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 399 +- + 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 | 183 +- + .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 27 +- + 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/en_accel.h | 7 +- + .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 4 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls.h | 11 + + .../ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c | 131 +- + .../mellanox/mlx5/core/en_accel/ktls_txrx.h | 20 + + .../mellanox/mlx5/core/en_accel/tls_rxtx.c | 9 - + .../mellanox/mlx5/core/en_accel/tls_rxtx.h | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 99 +- + .../net/ethernet/mellanox/mlx5/core/en_common.c | 27 +- + drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 34 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 434 ++- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 147 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1149 ++---- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 306 +- + 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 | 292 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 15 + + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 225 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 13 +- + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 5 + + .../mellanox/mlx5/core/esw/acl/egress_lgcy.c | 2 +- + .../mellanox/mlx5/core/esw/acl/egress_ofld.c | 4 +- + .../ethernet/mellanox/mlx5/core/esw/acl/helper.c | 8 +- + .../ethernet/mellanox/mlx5/core/esw/acl/helper.h | 2 +- + .../mellanox/mlx5/core/esw/acl/ingress_lgcy.c | 2 +- + .../mellanox/mlx5/core/esw/acl/ingress_ofld.c | 4 +- + .../ethernet/mellanox/mlx5/core/esw/devlink_port.c | 9 +- + .../ethernet/mellanox/mlx5/core/esw/indir_table.h | 6 +- + .../net/ethernet/mellanox/mlx5/core/esw/legacy.c | 510 +++ + .../net/ethernet/mellanox/mlx5/core/esw/legacy.h | 22 + + .../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 | 979 ++--- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 277 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 690 ++-- + .../mellanox/mlx5/core/eswitch_offloads_termtbl.c | 14 +- + .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 102 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 7 + + .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 16 +- + 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 | 38 +- + .../ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/lag.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 25 +- + .../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/pci_irq.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/port.c | 110 +- + drivers/net/ethernet/mellanox/mlx5/core/rdma.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/rl.c | 139 +- + .../net/ethernet/mellanox/mlx5/core/sf/dev/dev.c | 12 +- + .../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 | 43 +- + .../net/ethernet/mellanox/mlx5/core/sf/hw_table.c | 269 +- + drivers/net/ethernet/mellanox/mlx5/core/sf/priv.h | 9 +- + .../mellanox/mlx5/core/steering/dr_action.c | 242 +- + .../ethernet/mellanox/mlx5/core/steering/dr_cmd.c | 70 +- + .../mellanox/mlx5/core/steering/dr_matcher.c | 256 +- + .../ethernet/mellanox/mlx5/core/steering/dr_rule.c | 11 + + .../ethernet/mellanox/mlx5/core/steering/dr_send.c | 65 +- + .../ethernet/mellanox/mlx5/core/steering/dr_ste.c | 145 +- + .../ethernet/mellanox/mlx5/core/steering/dr_ste.h | 31 +- + .../mellanox/mlx5/core/steering/dr_ste_v0.c | 368 +- + .../mellanox/mlx5/core/steering/dr_ste_v1.c | 289 +- + .../mellanox/mlx5/core/steering/dr_table.c | 4 +- + .../mellanox/mlx5/core/steering/dr_types.h | 205 +- + .../mellanox/mlx5/core/steering/mlx5_ifc_dr.h | 16 +- + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 14 - + 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_ethtool.c | 129 + + .../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 | 453 ++- + .../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 | 79 +- + .../net/ethernet/mellanox/mlxsw/spectrum_trap.c | 213 +- + drivers/net/ethernet/micrel/ks8851_common.c | 7 +- + drivers/net/ethernet/microchip/encx24j600.c | 15 +- + drivers/net/ethernet/microchip/lan743x_ethtool.c | 4 +- + drivers/net/ethernet/microchip/lan743x_main.c | 7 +- + drivers/net/ethernet/microsoft/Kconfig | 29 + + drivers/net/ethernet/microsoft/Makefile | 5 + + drivers/net/ethernet/microsoft/mana/Makefile | 6 + + drivers/net/ethernet/microsoft/mana/gdma.h | 673 ++++ + drivers/net/ethernet/microsoft/mana/gdma_main.c | 1415 +++++++ + drivers/net/ethernet/microsoft/mana/hw_channel.c | 843 +++++ + drivers/net/ethernet/microsoft/mana/hw_channel.h | 190 + + drivers/net/ethernet/microsoft/mana/mana.h | 533 +++ + drivers/net/ethernet/microsoft/mana/mana_en.c | 1895 ++++++++++ + drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 250 ++ + drivers/net/ethernet/microsoft/mana/shm_channel.c | 291 ++ + drivers/net/ethernet/microsoft/mana/shm_channel.h | 21 + + drivers/net/ethernet/moxa/moxart_ether.c | 1 - + drivers/net/ethernet/mscc/Kconfig | 3 +- + drivers/net/ethernet/mscc/ocelot.c | 188 +- + drivers/net/ethernet/mscc/ocelot_flower.c | 5 + + drivers/net/ethernet/mscc/ocelot_mrp.c | 225 +- + drivers/net/ethernet/mscc/ocelot_net.c | 234 +- + 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/neterion/vxge/vxge-main.h | 14 +- + 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 | 13 +- + 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 | 536 ++- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 104 +- + drivers/net/ethernet/pensando/ionic/ionic_main.c | 43 +- + drivers/net/ethernet/pensando/ionic/ionic_phc.c | 615 ++++ + .../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 | 871 +++-- + 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 - + drivers/net/ethernet/qualcomm/emac/emac-mac.c | 4 +- + drivers/net/ethernet/qualcomm/qca_spi.c | 10 +- + drivers/net/ethernet/qualcomm/qca_uart.c | 9 +- + .../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 | 68 +- + drivers/net/ethernet/renesas/ravb.h | 1 + + drivers/net/ethernet/renesas/ravb_main.c | 27 +- + drivers/net/ethernet/renesas/sh_eth.c | 15 +- + drivers/net/ethernet/renesas/sh_eth.h | 114 +- + drivers/net/ethernet/rocker/rocker_main.c | 4 +- + .../net/ethernet/samsung/sxgbe/sxgbe_platform.c | 13 +- + drivers/net/ethernet/sfc/ef10.c | 17 + + drivers/net/ethernet/sfc/efx_channels.c | 2 + + drivers/net/ethernet/sfc/enum.h | 1 - + drivers/net/ethernet/sfc/ethtool.c | 10 + + drivers/net/ethernet/sfc/falcon/net_driver.h | 2 +- + drivers/net/ethernet/sfc/net_driver.h | 3 + + 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/socionext/sni_ave.c | 10 +- + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + + drivers/net/ethernet/stmicro/stmmac/common.h | 37 + + .../net/ethernet/stmicro/stmmac/dwmac-anarion.c | 2 +- + .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-generic.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 62 +- + .../net/ethernet/stmicro/stmmac/dwmac-intel-plat.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 410 ++- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.h | 1 + + .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 4 +- + .../net/ethernet/stmicro/stmmac/dwmac-lpc18xx.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-mediatek.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c | 2 +- + .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 3 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 26 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-visconti.c | 2 +- + .../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 | 22 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h | 25 +- + 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 | 24 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 92 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 124 +- + .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 50 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2903 ++++++++++++--- + 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 | 44 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.h | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 75 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h | 24 + + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 124 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.c | 135 + + drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.h | 15 + + drivers/net/ethernet/sun/cassini.c | 1 + + drivers/net/ethernet/sun/sungem.c | 4 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 19 +- + drivers/net/ethernet/ti/am65-cpsw-switchdev.c | 4 +- + drivers/net/ethernet/ti/cpsw.c | 21 +- + drivers/net/ethernet/ti/cpsw_new.c | 21 +- + drivers/net/ethernet/ti/cpsw_priv.c | 11 +- + drivers/net/ethernet/ti/cpsw_switchdev.c | 4 +- + drivers/net/ethernet/ti/davinci_emac.c | 8 +- + drivers/net/ethernet/ti/netcp_core.c | 7 +- + 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/wiznet/w5100-spi.c | 8 +- + drivers/net/ethernet/wiznet/w5100.c | 2 +- + drivers/net/ethernet/xilinx/Kconfig | 3 + + drivers/net/ethernet/xilinx/ll_temac_main.c | 8 +- + drivers/net/ethernet/xilinx/xilinx_axienet.h | 8 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 50 +- + drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 4 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 8 +- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 - + drivers/net/ethernet/xscale/Kconfig | 1 + + drivers/net/ethernet/xscale/ixp4xx_eth.c | 210 +- + 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/smc.h | 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 | 65 +- + drivers/net/ieee802154/mac802154_hwsim.c | 2 +- + drivers/net/ipa/Kconfig | 5 +- + drivers/net/ipa/Makefile | 6 +- + drivers/net/ipa/gsi.c | 106 +- + 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 | 13 +- + 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} | 229 +- + drivers/net/ipa/ipa_data-v4.11.c | 382 ++ + .../net/ipa/{ipa_data-sc7180.c => ipa_data-v4.2.c} | 158 +- + drivers/net/ipa/ipa_data-v4.5.c | 437 +++ + drivers/net/ipa/ipa_data-v4.9.c | 430 +++ + drivers/net/ipa/ipa_data.h | 131 +- + drivers/net/ipa/ipa_endpoint.c | 82 +- + drivers/net/ipa/ipa_endpoint.h | 32 +- + drivers/net/ipa/ipa_interrupt.c | 54 +- + drivers/net/ipa/ipa_interrupt.h | 1 + + drivers/net/ipa/ipa_main.c | 330 +- + drivers/net/ipa/ipa_mem.c | 15 +- + drivers/net/ipa/ipa_mem.h | 21 +- + drivers/net/ipa/ipa_modem.c | 34 +- + 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 | 176 + + drivers/net/ipa/ipa_resource.h | 23 + + drivers/net/ipa/ipa_smp2p.h | 2 +- + drivers/net/ipa/ipa_table.c | 117 +- + drivers/net/ipa/ipa_table.h | 27 +- + drivers/net/ipa/ipa_uc.c | 5 +- + drivers/net/ipa/ipa_version.h | 29 +- + drivers/net/macvlan.c | 64 +- + 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 | 12 +- + drivers/net/mdio/mdio-cavium.c | 2 +- + drivers/net/mdio/mdio-gpio.c | 18 +- + 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 | 265 ++ + drivers/net/pcs/pcs-xpcs.c | 257 +- + drivers/net/phy/Kconfig | 12 + + drivers/net/phy/Makefile | 2 + + drivers/net/phy/at803x.c | 100 +- + drivers/net/phy/broadcom.c | 76 +- + drivers/net/phy/marvell-88x2222.c | 621 ++++ + drivers/net/phy/marvell.c | 505 ++- + drivers/net/phy/marvell10g.c | 386 +- + 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/nxp-c45-tja11xx.c | 621 ++++ + drivers/net/phy/phy-c45.c | 51 + + drivers/net/phy/phy.c | 3 +- + drivers/net/phy/phy_device.c | 52 +- + drivers/net/phy/phylink.c | 5 +- + drivers/net/phy/sfp-bus.c | 20 + + drivers/net/phy/sfp.c | 25 + + drivers/net/phy/sfp.h | 3 + + 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/hso.c | 2 +- + drivers/net/usb/lan78xx.c | 1 - + drivers/net/usb/mcs7830.c | 4 +- + drivers/net/usb/r8152.c | 3853 +++++++++++++++++--- + 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 | 199 +- + drivers/net/virtio_net.c | 190 +- + 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/ath/ath10k/htc.c | 2 +- + drivers/net/wireless/ath/ath10k/snoc.c | 29 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 3 + + 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 | 103 +- + drivers/net/wireless/ath/ath11k/mac.h | 2 + + drivers/net/wireless/ath/ath11k/mhi.c | 125 +- + 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/ath/ath9k/htc_drv_init.c | 2 +- + drivers/net/wireless/ath/ath9k/hw.c | 2 +- + drivers/net/wireless/ath/ath9k/init.c | 5 +- + drivers/net/wireless/ath/carl9170/carl9170.h | 7 +- + drivers/net/wireless/ath/carl9170/tx.c | 2 +- + drivers/net/wireless/ath/wil6210/wmi.c | 2 +- + drivers/net/wireless/broadcom/b43/main.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/main.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/debug.h | 1 - + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.h | 2 +- + drivers/net/wireless/cisco/airo.c | 117 +- + drivers/net/wireless/intel/ipw2x00/libipw_wx.c | 6 +- + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 2 - + drivers/net/wireless/intel/iwlegacy/common.c | 2 - + drivers/net/wireless/intel/iwlegacy/common.h | 2 +- + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 72 +- + drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 78 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 13 +- + .../net/wireless/intel/iwlwifi/fw/api/location.h | 173 +- + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 20 +- + drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 22 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 30 - + drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 8 + + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 3 + + drivers/net/wireless/intel/iwlwifi/fw/img.h | 5 +- + drivers/net/wireless/intel/iwlwifi/fw/init.c | 59 + + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 12 +- + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 3 + + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 5 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 14 +- + drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 91 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 11 + + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 2 + + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 10 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 85 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-responder.c | 27 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 232 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 59 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 12 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 20 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 58 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 128 + + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 38 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 27 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 18 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 80 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 5 + + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 68 +- + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 8 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 29 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 80 +- + drivers/net/wireless/intel/iwlwifi/queue/tx.c | 41 +- + drivers/net/wireless/intel/iwlwifi/queue/tx.h | 3 +- + drivers/net/wireless/mac80211_hwsim.c | 24 +- + drivers/net/wireless/marvell/libertas/decl.h | 1 - + drivers/net/wireless/marvell/libertas/mesh.h | 12 +- + .../net/wireless/marvell/libertas_tf/libertas_tf.h | 1 - + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 11 +- + drivers/net/wireless/marvell/mwifiex/scan.c | 3 +- + drivers/net/wireless/marvell/mwl8k.c | 1 + + drivers/net/wireless/mediatek/mt76/agg-rx.c | 19 +- + drivers/net/wireless/mediatek/mt76/debugfs.c | 28 + + drivers/net/wireless/mediatek/mt76/dma.c | 65 +- + drivers/net/wireless/mediatek/mt76/dma.h | 1 + + drivers/net/wireless/mediatek/mt76/eeprom.c | 240 +- + drivers/net/wireless/mediatek/mt76/mac80211.c | 77 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 99 +- + drivers/net/wireless/mediatek/mt76/mt7603/dma.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7603/init.c | 3 + + drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 35 +- + drivers/net/wireless/mediatek/mt76/mt7603/mcu.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/pci.c | 2 +- + .../net/wireless/mediatek/mt76/mt7615/debugfs.c | 61 +- + drivers/net/wireless/mediatek/mt76/mt7615/dma.c | 71 +- + drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7615/init.c | 42 +- + drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 424 +-- + drivers/net/wireless/mediatek/mt76/mt7615/mac.h | 8 + + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 209 +- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 299 +- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.h | 34 +- + drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 27 +- + drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 31 +- + drivers/net/wireless/mediatek/mt76/mt7615/pci.c | 6 +- + .../net/wireless/mediatek/mt76/mt7615/pci_init.c | 17 +- + .../net/wireless/mediatek/mt76/mt7615/pci_mac.c | 183 +- + drivers/net/wireless/mediatek/mt76/mt7615/regs.h | 20 +- + .../net/wireless/mediatek/mt76/mt7615/sdio_txrx.c | 11 +- + drivers/net/wireless/mediatek/mt76/mt7615/soc.c | 4 +- + .../net/wireless/mediatek/mt76/mt7615/usb_sdio.c | 7 +- + drivers/net/wireless/mediatek/mt76/mt76_connac.h | 59 +- + .../net/wireless/mediatek/mt76/mt76_connac_mac.c | 23 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 272 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 81 +- + drivers/net/wireless/mediatek/mt76/mt76x0/pci.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt76x0/usb.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 4 + + drivers/net/wireless/mediatek/mt76/mt76x2/pci.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt7915/Makefile | 2 +- + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 116 +- + drivers/net/wireless/mediatek/mt76/mt7915/dma.c | 112 +- + drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c | 184 +- + drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h | 51 +- + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 220 +- + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 258 +- + drivers/net/wireless/mediatek/mt76/mt7915/mac.h | 15 + + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 132 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 437 ++- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 16 +- + drivers/net/wireless/mediatek/mt76/mt7915/mmio.c | 152 + + drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 106 +- + drivers/net/wireless/mediatek/mt76/mt7915/pci.c | 37 +- + drivers/net/wireless/mediatek/mt76/mt7915/regs.h | 18 + + .../net/wireless/mediatek/mt76/mt7915/testmode.c | 22 +- + drivers/net/wireless/mediatek/mt76/mt7921/Makefile | 4 +- + .../net/wireless/mediatek/mt76/mt7921/debugfs.c | 168 +- + drivers/net/wireless/mediatek/mt76/mt7921/dma.c | 242 +- + drivers/net/wireless/mediatek/mt76/mt7921/init.c | 48 +- + drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 525 ++- + drivers/net/wireless/mediatek/mt76/mt7921/mac.h | 10 +- + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 236 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 210 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.h | 60 +- + drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 83 +- + .../wireless/mediatek/mt76/mt7921/mt7921_trace.h | 51 + + drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 54 +- + drivers/net/wireless/mediatek/mt76/mt7921/regs.h | 54 +- + drivers/net/wireless/mediatek/mt76/mt7921/trace.c | 12 + + drivers/net/wireless/mediatek/mt76/sdio.c | 3 + + drivers/net/wireless/mediatek/mt76/testmode.c | 159 +- + drivers/net/wireless/mediatek/mt76/testmode.h | 2 +- + drivers/net/wireless/mediatek/mt76/tx.c | 94 +- + drivers/net/wireless/mediatek/mt7601u/eeprom.c | 2 +- + drivers/net/wireless/mediatek/mt7601u/init.c | 1 + + drivers/net/wireless/microchip/wilc1000/Kconfig | 1 + + drivers/net/wireless/microchip/wilc1000/netdev.c | 39 +- + drivers/net/wireless/microchip/wilc1000/sdio.c | 2 +- + drivers/net/wireless/microchip/wilc1000/spi.c | 298 +- + drivers/net/wireless/microchip/wilc1000/wlan.c | 56 +- + drivers/net/wireless/microchip/wilc1000/wlan.h | 7 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 27 +- + drivers/net/wireless/quantenna/qtnfmac/commands.c | 67 - + drivers/net/wireless/quantenna/qtnfmac/event.c | 6 +- + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 6 +- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 1 - + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 19 +- + drivers/net/wireless/realtek/rtlwifi/base.c | 15 +- + drivers/net/wireless/realtek/rtlwifi/core.c | 38 +- + drivers/net/wireless/realtek/rtlwifi/core.h | 1 + + .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 2 - + .../net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 10 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/table.c | 500 ++- + drivers/net/wireless/realtek/rtlwifi/usb.c | 4 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 9 +- + drivers/net/wireless/realtek/rtw88/coex.c | 13 +- + drivers/net/wireless/realtek/rtw88/coex.h | 9 + + drivers/net/wireless/realtek/rtw88/debug.c | 134 +- + drivers/net/wireless/realtek/rtw88/debug.h | 1 + + drivers/net/wireless/realtek/rtw88/fw.c | 27 + + drivers/net/wireless/realtek/rtw88/fw.h | 18 + + drivers/net/wireless/realtek/rtw88/hci.h | 16 + + drivers/net/wireless/realtek/rtw88/mac.c | 19 + + drivers/net/wireless/realtek/rtw88/mac.h | 4 + + drivers/net/wireless/realtek/rtw88/mac80211.c | 2 + + drivers/net/wireless/realtek/rtw88/main.c | 104 +- + drivers/net/wireless/realtek/rtw88/main.h | 57 + + drivers/net/wireless/realtek/rtw88/pci.c | 98 +- + drivers/net/wireless/realtek/rtw88/pci.h | 1 + + drivers/net/wireless/realtek/rtw88/phy.c | 95 +- + drivers/net/wireless/realtek/rtw88/phy.h | 3 + + drivers/net/wireless/realtek/rtw88/reg.h | 15 + + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 3 +- + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 892 ++++- + drivers/net/wireless/realtek/rtw88/rtw8822c.h | 339 +- + .../net/wireless/realtek/rtw88/rtw8822c_table.c | 686 ++-- + drivers/net/wireless/rsi/rsi_91x_ps.c | 1 - + drivers/net/wireless/rsi/rsi_91x_sdio.c | 2 +- + drivers/net/wireless/rsi/rsi_boot_params.h | 2 +- + drivers/net/wireless/rsi/rsi_coex.h | 2 +- + drivers/net/wireless/rsi/rsi_common.h | 2 +- + drivers/net/wireless/rsi/rsi_debugfs.h | 2 +- + drivers/net/wireless/rsi/rsi_hal.h | 2 +- + drivers/net/wireless/rsi/rsi_main.h | 2 +- + drivers/net/wireless/rsi/rsi_mgmt.h | 2 +- + drivers/net/wireless/rsi/rsi_ps.h | 2 +- + drivers/net/wireless/rsi/rsi_sdio.h | 2 +- + drivers/net/wireless/rsi/rsi_usb.h | 2 +- + drivers/net/wireless/st/cw1200/bh.c | 3 - + drivers/net/wireless/st/cw1200/wsm.h | 12 - + drivers/net/wireless/ti/wlcore/boot.c | 13 +- + drivers/net/wireless/ti/wlcore/debugfs.h | 7 +- + drivers/net/wireless/wl3501.h | 49 +- + drivers/net/wireless/wl3501_cs.c | 54 +- + drivers/net/wwan/Kconfig | 37 + + drivers/net/wwan/Makefile | 9 + + drivers/net/wwan/mhi_wwan_ctrl.c | 284 ++ + drivers/net/wwan/wwan_core.c | 554 +++ + drivers/net/xen-netfront.c | 18 +- + drivers/nfc/fdp/fdp.c | 49 +- + drivers/nfc/pn533/i2c.c | 8 +- + drivers/nfc/pn533/pn533.c | 20 +- + drivers/nfc/s3fwrn5/core.c | 12 +- + drivers/nfc/st-nci/spi.c | 7 +- + drivers/of/of_net.c | 88 +- + 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 - + drivers/staging/octeon/ethernet.c | 10 +- + drivers/staging/wfx/main.c | 7 +- + 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 | 303 ++ + include/linux/bpf-cgroup.h | 58 +- + include/linux/bpf.h | 175 +- + include/linux/bpf_local_storage.h | 3 +- + include/linux/bpf_lsm.h | 22 - + include/linux/bpf_types.h | 8 +- + include/linux/bpf_verifier.h | 12 + + 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/dsa/sja1105.h | 3 +- + include/linux/etherdevice.h | 4 +- + include/linux/ethtool.h | 189 +- + include/linux/filter.h | 44 +- + include/linux/ieee80211.h | 33 +- + include/linux/if_bridge.h | 40 + + include/linux/if_rmnet.h | 65 +- + include/linux/marvell_phy.h | 8 +- + include/linux/mdio-bitbang.h | 3 + + include/linux/mlx5/device.h | 9 +- + include/linux/mlx5/driver.h | 16 +- + include/linux/mlx5/eswitch.h | 23 +- + include/linux/mlx5/mlx5_ifc.h | 93 +- + include/linux/mlx5/port.h | 12 + + include/linux/mlx5/vport.h | 8 - + include/linux/netdevice.h | 138 +- + include/linux/netfilter/ipset/ip_set.h | 2 - + include/linux/netfilter/nfnetlink.h | 62 +- + include/linux/netfilter/x_tables.h | 16 +- + include/linux/netfilter_arp/arp_tables.h | 8 +- + include/linux/netfilter_bridge/ebtables.h | 9 +- + include/linux/netfilter_ipv4/ip_tables.h | 11 +- + include/linux/netfilter_ipv6/ip6_tables.h | 11 +- + include/linux/netlink.h | 12 +- + include/linux/of_net.h | 6 +- + include/linux/pcs/pcs-xpcs.h | 5 + + include/linux/phy.h | 6 + + include/linux/phylink.h | 2 + + include/linux/platform_data/eth_ixp4xx.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/qed/qed_ll2_if.h | 1 - + include/linux/sched.h | 5 + + include/linux/sfp.h | 10 + + include/linux/skbuff.h | 33 +- + include/linux/skmsg.h | 162 +- + include/linux/socket.h | 2 +- + include/linux/stmmac.h | 46 + + include/linux/sysctl.h | 2 + + include/linux/udp.h | 22 +- + include/linux/usb/usbnet.h | 11 +- + include/linux/wwan.h | 111 + + include/net/addrconf.h | 1 - + 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/net/bpf_sk_storage.h | 1 - + include/net/cfg80211.h | 24 +- + include/net/devlink.h | 5 +- + include/net/dsa.h | 43 +- + include/net/flow.h | 3 - + 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/mac80211.h | 12 +- + include/net/mld.h | 3 + + include/net/mptcp.h | 48 +- + include/net/net_namespace.h | 14 - + include/net/netfilter/ipv4/nf_defrag_ipv4.h | 3 +- + include/net/netfilter/ipv6/nf_conntrack_ipv6.h | 3 - + include/net/netfilter/ipv6/nf_defrag_ipv6.h | 9 +- + include/net/netfilter/nf_conntrack.h | 15 + + include/net/netfilter/nf_conntrack_ecache.h | 33 +- + include/net/netfilter/nf_flow_table.h | 67 +- + include/net/netfilter/nf_log.h | 25 - + include/net/netfilter/nf_nat.h | 2 - + include/net/netfilter/nf_tables.h | 40 +- + include/net/netfilter/nf_tables_offload.h | 13 +- + include/net/netns/conntrack.h | 27 +- + include/net/netns/dccp.h | 12 - + include/net/netns/ipv4.h | 143 +- + include/net/netns/ipv6.h | 37 +- + include/net/netns/mib.h | 30 +- + include/net/netns/netfilter.h | 6 - + include/net/netns/nftables.h | 7 - + include/net/netns/x_tables.h | 9 - + include/net/nexthop.h | 76 +- + include/net/pkt_sched.h | 9 + + include/net/psample.h | 21 +- + include/net/sch_generic.h | 14 + + include/net/selftests.h | 12 + + include/net/sock.h | 6 + + include/net/switchdev.h | 2 + + 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 | 46 +- + include/soc/mscc/ocelot_ptp.h | 2 - + include/trace/events/mptcp.h | 173 + + include/trace/events/xdp.h | 62 +- + include/uapi/linux/bpf.h | 834 ++++- + include/uapi/linux/btf.h | 5 +- + include/uapi/linux/ethtool.h | 55 +- + include/uapi/linux/ethtool_netlink.h | 187 + + include/uapi/linux/icmp.h | 42 + + include/uapi/linux/icmpv6.h | 3 + + include/uapi/linux/if_fddi.h | 2 +- + include/uapi/linux/if_link.h | 1 + + include/uapi/linux/mdio.h | 2 + + include/uapi/linux/mptcp.h | 11 + + include/uapi/linux/netfilter/nf_tables.h | 6 + + include/uapi/linux/nexthop.h | 47 +- + include/uapi/linux/nl80211.h | 22 + + include/uapi/linux/pkt_cls.h | 2 + + include/uapi/linux/psample.h | 7 + + include/uapi/linux/rtnetlink.h | 8 + + include/uapi/linux/virtio_bt.h | 31 + + include/uapi/linux/virtio_ids.h | 1 + + 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 | 54 +- + kernel/bpf/cpumap.c | 9 +- + kernel/bpf/devmap.c | 47 +- + kernel/bpf/disasm.c | 13 +- + kernel/bpf/hashtab.c | 67 +- + kernel/bpf/helpers.c | 323 +- + kernel/bpf/inode.c | 2 - + kernel/bpf/local_storage.c | 5 +- + kernel/bpf/lpm_trie.c | 3 + + kernel/bpf/syscall.c | 8 +- + kernel/bpf/verifier.c | 812 ++++- + kernel/fork.c | 5 + + kernel/sysctl.c | 65 + + kernel/trace/bpf_trace.c | 379 +- + 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 | 18 +- + net/ax25/TODO | 20 - + net/ax25/af_ax25.c | 1 + + net/batman-adv/bat_iv_ogm.c | 2 +- + net/batman-adv/bridge_loop_avoidance.c | 6 +- + net/batman-adv/multicast.c | 6 +- + net/batman-adv/types.h | 10 +- + 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 +- + 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.c | 61 +- + net/bridge/br_multicast_eht.c | 141 +- + net/bridge/br_netlink.c | 4 +- + net/bridge/br_private.h | 23 +- + net/bridge/br_stp.c | 27 + + net/bridge/br_switchdev.c | 44 +- + net/bridge/br_sysfs_br.c | 8 +- + 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/ebt_limit.c | 4 +- + net/bridge/netfilter/ebt_mark.c | 4 +- + net/bridge/netfilter/ebt_mark_m.c | 4 +- + net/bridge/netfilter/ebtable_broute.c | 10 +- + net/bridge/netfilter/ebtable_filter.c | 26 +- + net/bridge/netfilter/ebtable_nat.c | 27 +- + net/bridge/netfilter/ebtables.c | 96 +- + net/bridge/netfilter/nf_log_bridge.c | 79 - + net/can/proc.c | 6 +- + net/ceph/osdmap.c | 2 +- + net/core/Makefile | 7 +- + net/core/bpf_sk_storage.c | 2 +- + net/core/dev.c | 396 +- + net/core/dev_addr_lists.c | 4 +- + net/core/devlink.c | 11 +- + net/core/drop_monitor.c | 2 +- + net/core/filter.c | 276 +- + net/core/flow_dissector.c | 47 +- + net/core/net-procfs.c | 3 - + net/core/net-sysfs.c | 177 +- + net/core/netevent.c | 2 +- + net/core/rtnetlink.c | 15 +- + net/core/scm.c | 23 +- + net/core/selftests.c | 400 ++ + net/core/skbuff.c | 55 +- + net/core/skmsg.c | 383 +- + net/core/sock.c | 2 +- + net/core/sock_map.c | 194 +- + net/core/sysctl_net_core.c | 10 + + net/dccp/ipv4.c | 24 +- + net/dccp/ipv6.c | 24 +- + net/decnet/TODO | 40 - + net/decnet/dn_nsp_in.c | 2 +- + net/decnet/dn_route.c | 49 +- + net/dsa/Kconfig | 20 +- + net/dsa/dsa2.c | 105 +- + net/dsa/dsa_priv.h | 23 +- + net/dsa/port.c | 199 +- + net/dsa/slave.c | 95 +- + net/dsa/switch.c | 25 +- + net/dsa/tag_brcm.c | 107 +- + net/dsa/tag_mtk.c | 14 +- + net/dsa/tag_ocelot.c | 35 +- + net/dsa/tag_ocelot_8021q.c | 41 +- + net/dsa/tag_rtl4_a.c | 2 +- + net/ethernet/eth.c | 24 +- + net/ethtool/Makefile | 2 +- + net/ethtool/common.h | 5 + + net/ethtool/eeprom.c | 246 ++ + net/ethtool/fec.c | 310 ++ + net/ethtool/ioctl.c | 37 +- + net/ethtool/netlink.c | 40 + + net/ethtool/netlink.h | 14 + + net/ethtool/pause.c | 6 - + net/ethtool/stats.c | 413 +++ + net/ethtool/strset.c | 25 + + 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 | 6 +- + net/ipv4/icmp.c | 139 +- + net/ipv4/ip_output.c | 4 +- + net/ipv4/netfilter.c | 2 + + net/ipv4/netfilter/Kconfig | 10 +- + net/ipv4/netfilter/Makefile | 4 - + net/ipv4/netfilter/arp_tables.c | 73 +- + net/ipv4/netfilter/arptable_filter.c | 17 +- + net/ipv4/netfilter/ip_tables.c | 86 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 8 +- + net/ipv4/netfilter/iptable_filter.c | 17 +- + net/ipv4/netfilter/iptable_mangle.c | 23 +- + net/ipv4/netfilter/iptable_nat.c | 59 +- + net/ipv4/netfilter/iptable_raw.c | 17 +- + net/ipv4/netfilter/iptable_security.c | 17 +- + net/ipv4/netfilter/nf_defrag_ipv4.c | 46 +- + net/ipv4/netfilter/nf_log_arp.c | 172 - + net/ipv4/netfilter/nf_log_ipv4.c | 395 -- + net/ipv4/nexthop.c | 1570 +++++++- + net/ipv4/ping.c | 4 +- + net/ipv4/route.c | 183 +- + net/ipv4/sysctl_net_ipv4.c | 249 +- + net/ipv4/tcp.c | 12 + + net/ipv4/tcp_bpf.c | 139 +- + 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 | 76 +- + net/ipv4/udp_offload.c | 27 +- + net/ipv6/addrconf.c | 13 +- + net/ipv6/addrconf_core.c | 9 +- + net/ipv6/af_inet6.c | 4 +- + net/ipv6/ah6.c | 2 +- + net/ipv6/esp6.c | 2 +- + net/ipv6/esp6_offload.c | 2 +- + net/ipv6/exthdrs.c | 5 +- + net/ipv6/icmp.c | 20 +- + net/ipv6/ip6_gre.c | 7 +- + net/ipv6/ip6_tunnel.c | 5 +- + net/ipv6/ip6_vti.c | 3 +- + net/ipv6/mcast.c | 1103 +++--- + net/ipv6/mcast_snoop.c | 12 +- + net/ipv6/netfilter.c | 2 + + net/ipv6/netfilter/Kconfig | 5 +- + net/ipv6/netfilter/Makefile | 3 - + net/ipv6/netfilter/ip6_tables.c | 84 +- + net/ipv6/netfilter/ip6table_filter.c | 17 +- + net/ipv6/netfilter/ip6table_mangle.c | 24 +- + net/ipv6/netfilter/ip6table_nat.c | 58 +- + net/ipv6/netfilter/ip6table_raw.c | 17 +- + net/ipv6/netfilter/ip6table_security.c | 17 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 68 +- + net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 40 +- + net/ipv6/netfilter/nf_log_ipv6.c | 427 --- + net/ipv6/route.c | 33 +- + net/ipv6/seg6_local.c | 13 +- + 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 | 12 +- + 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/llc/llc_station.c | 2 - + net/mac80211/aes_cmac.c | 11 +- + net/mac80211/cfg.c | 2 +- + net/mac80211/debugfs.c | 1 + + net/mac80211/debugfs_sta.c | 37 +- + net/mac80211/ieee80211_i.h | 2 + + net/mac80211/iface.c | 3 +- + net/mac80211/main.c | 16 +- + net/mac80211/mlme.c | 16 +- + net/mac80211/rc80211_minstrel_ht.c | 4 +- + net/mac80211/tx.c | 58 +- + net/mac80211/util.c | 10 +- + net/mpls/af_mpls.c | 1 - + net/mptcp/Kconfig | 2 +- + net/mptcp/Makefile | 4 +- + net/mptcp/crypto.c | 2 +- + net/mptcp/mib.c | 3 + + net/mptcp/mib.h | 3 + + net/mptcp/options.c | 298 +- + net/mptcp/pm.c | 64 +- + net/mptcp/pm_netlink.c | 328 +- + net/mptcp/protocol.c | 356 +- + net/mptcp/protocol.h | 117 +- + net/mptcp/sockopt.c | 756 ++++ + net/mptcp/subflow.c | 58 +- + net/mptcp/token.c | 2 +- + net/ncsi/internal.h | 2 +- + net/netfilter/Kconfig | 30 +- + net/netfilter/Makefile | 6 +- + net/netfilter/ipset/ip_set_core.c | 182 +- + 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 | 53 +- + net/netfilter/nf_conntrack_ecache.c | 31 +- + net/netfilter/nf_conntrack_expect.c | 22 +- + net/netfilter/nf_conntrack_helper.c | 15 +- + net/netfilter/nf_conntrack_netlink.c | 384 +- + net/netfilter/nf_conntrack_proto.c | 8 +- + net/netfilter/nf_conntrack_proto_dccp.c | 1 + + net/netfilter/nf_conntrack_proto_tcp.c | 34 +- + net/netfilter/nf_conntrack_standalone.c | 86 +- + net/netfilter/nf_flow_table_core.c | 146 +- + net/netfilter/nf_flow_table_ip.c | 453 ++- + net/netfilter/nf_flow_table_offload.c | 275 +- + 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 | 1090 ++++++ + net/netfilter/nf_nat_core.c | 37 - + net/netfilter/nf_nat_proto.c | 38 + + net/netfilter/nf_tables_api.c | 1800 +++++---- + net/netfilter/nf_tables_offload.c | 116 +- + net/netfilter/nf_tables_trace.c | 9 +- + net/netfilter/nfnetlink.c | 115 +- + net/netfilter/nfnetlink_acct.c | 94 +- + net/netfilter/nfnetlink_cthelper.c | 68 +- + net/netfilter/nfnetlink_cttimeout.c | 203 +- + net/netfilter/nfnetlink_log.c | 53 +- + net/netfilter/nfnetlink_osf.c | 21 +- + net/netfilter/nfnetlink_queue.c | 98 +- + net/netfilter/nft_chain_filter.c | 8 +- + net/netfilter/nft_cmp.c | 41 +- + net/netfilter/nft_compat.c | 44 +- + net/netfilter/nft_counter.c | 29 + + net/netfilter/nft_ct.c | 1 + + net/netfilter/nft_dynset.c | 3 +- + net/netfilter/nft_flow_offload.c | 211 +- + net/netfilter/nft_log.c | 20 +- + net/netfilter/nft_lookup.c | 12 +- + net/netfilter/nft_objref.c | 11 +- + net/netfilter/nft_payload.c | 13 +- + net/netfilter/nft_set_hash.c | 6 + + net/netfilter/nft_set_pipapo.c | 6 +- + net/netfilter/nft_set_rbtree.c | 6 + + net/netfilter/nft_socket.c | 49 + + net/netfilter/nft_tproxy.c | 24 + + net/netfilter/x_tables.c | 80 +- + net/netfilter/xt_LOG.c | 1 + + net/netfilter/xt_NFLOG.c | 1 + + net/netfilter/xt_TPROXY.c | 13 + + net/netfilter/xt_TRACE.c | 1 + + net/netfilter/xt_limit.c | 6 +- + net/netfilter/xt_socket.c | 14 + + net/netlabel/netlabel_mgmt.c | 2 +- + net/nfc/digital_core.c | 2 +- + net/nfc/digital_dep.c | 4 +- + 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 | 17 +- + net/packet/internal.h | 2 +- + net/psample/psample.c | 45 +- + net/qrtr/qrtr.c | 42 +- + net/rds/ib_send.c | 1 - + net/rds/recv.c | 4 - + net/rds/send.c | 2 +- + net/rfkill/input.c | 4 +- + net/rose/rose_route.c | 2 + + net/rxrpc/rxkad.c | 2 - + net/sched/act_ct.c | 6 +- + 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 | 4 +- + net/sctp/sm_statefuns.c | 10 +- + net/sctp/socket.c | 2 +- + net/smc/af_smc.c | 1 - + net/smc/smc_core.h | 1 - + net/socket.c | 2 +- + net/sysctl_net.c | 48 + + 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 | 4 +- + net/tls/tls_sw.c | 4 +- + net/vmw_vsock/af_vsock.c | 2 +- + net/wireless/core.c | 7 +- + net/wireless/nl80211.c | 8 +- + net/wireless/pmsr.c | 12 +- + net/wireless/reg.c | 12 +- + net/wireless/scan.c | 4 +- + net/wireless/util.c | 2 +- + net/x25/af_x25.c | 2 +- + net/xdp/xsk.c | 116 +- + net/xdp/xsk_queue.h | 30 +- + net/xdp/xskmap.c | 17 +- + net/xfrm/xfrm_ipcomp.c | 25 +- + net/xfrm/xfrm_policy.c | 44 +- + net/xfrm/xfrm_user.c | 12 +- + samples/bpf/do_hbm_test.sh | 2 +- + samples/bpf/sampleip_kern.c | 1 - + samples/bpf/trace_event_kern.c | 1 - + samples/bpf/tracex1_kern.c | 4 +- + 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 +- + scripts/link-vmlinux.sh | 7 +- + 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 | 41 +- + 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/net.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 | 850 ++++- + tools/include/uapi/linux/btf.h | 5 +- + tools/lib/bpf/Build | 2 +- + tools/lib/bpf/Makefile | 3 +- + tools/lib/bpf/bpf_helpers.h | 40 +- + tools/lib/bpf/bpf_tracing.h | 58 +- + tools/lib/bpf/btf.c | 768 ++-- + tools/lib/bpf/btf.h | 9 + + tools/lib/bpf/btf_dump.c | 12 +- + tools/lib/bpf/libbpf.c | 899 +++-- + tools/lib/bpf/libbpf.h | 20 +- + tools/lib/bpf/libbpf.map | 12 + + tools/lib/bpf/libbpf_internal.h | 85 +- + tools/lib/bpf/libbpf_util.h | 47 - + tools/lib/bpf/linker.c | 2883 +++++++++++++++ + 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/scripts/Makefile.include | 12 +- + tools/testing/selftests/bpf/.gitignore | 2 + + tools/testing/selftests/bpf/Makefile | 77 +- + tools/testing/selftests/bpf/Makefile.docs | 82 + + tools/testing/selftests/bpf/README.rst | 71 + + tools/testing/selftests/bpf/bpf_tcp_helpers.h | 29 +- + tools/testing/selftests/bpf/btf_helpers.c | 4 + + tools/testing/selftests/bpf/config | 2 + + 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 +- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 1 + + .../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 + + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 58 +- + .../testing/selftests/bpf/prog_tests/fexit_sleep.c | 4 +- + tools/testing/selftests/bpf/prog_tests/for_each.c | 130 + + .../testing/selftests/bpf/prog_tests/kfunc_call.c | 59 + + .../selftests/bpf/prog_tests/linked_funcs.c | 42 + + .../testing/selftests/bpf/prog_tests/linked_maps.c | 30 + + .../testing/selftests/bpf/prog_tests/linked_vars.c | 43 + + tools/testing/selftests/bpf/prog_tests/map_ptr.c | 15 +- + tools/testing/selftests/bpf/prog_tests/mmap.c | 24 +- + .../selftests/bpf/prog_tests/ns_current_pid_tgid.c | 4 +- + .../selftests/bpf/prog_tests/prog_run_xattr.c | 51 +- + tools/testing/selftests/bpf/prog_tests/ringbuf.c | 17 +- + .../selftests/bpf/prog_tests/ringbuf_multi.c | 37 +- + tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 83 +- + tools/testing/selftests/bpf/prog_tests/snprintf.c | 125 + + .../selftests/bpf/prog_tests/sockmap_basic.c | 40 + + .../selftests/bpf/prog_tests/sockmap_listen.c | 144 +- + .../testing/selftests/bpf/prog_tests/sockopt_sk.c | 65 +- + .../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 +- + .../selftests/bpf/progs/bpf_iter_task_stack.c | 27 + + .../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/linked_funcs1.c | 73 + + tools/testing/selftests/bpf/progs/linked_funcs2.c | 73 + + tools/testing/selftests/bpf/progs/linked_maps1.c | 82 + + tools/testing/selftests/bpf/progs/linked_maps2.c | 76 + + tools/testing/selftests/bpf/progs/linked_vars1.c | 54 + + tools/testing/selftests/bpf/progs/linked_vars2.c | 55 + + tools/testing/selftests/bpf/progs/loop6.c | 99 + + tools/testing/selftests/bpf/progs/map_ptr_kern.c | 4 +- + tools/testing/selftests/bpf/progs/skb_pkt_end.c | 1 - + .../selftests/bpf/progs/sockmap_tcp_msg_prog.c | 12 - + tools/testing/selftests/bpf/progs/sockopt_sk.c | 11 +- + .../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_mmap.c | 2 - + tools/testing/selftests/bpf/progs/test_ringbuf.c | 1 - + .../selftests/bpf/progs/test_ringbuf_multi.c | 12 +- + tools/testing/selftests/bpf/progs/test_sk_lookup.c | 62 +- + tools/testing/selftests/bpf/progs/test_snprintf.c | 73 + + .../selftests/bpf/progs/test_snprintf_single.c | 20 + + .../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 +- + .../testing/selftests/bpf/progs/test_tunnel_kern.c | 2 +- + 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 | 13 +- + 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 +- + .../testing/selftests/bpf/verifier/bpf_get_stack.c | 43 + + 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 + + .../drivers/net/mlxsw/mirror_gre_scale.sh | 3 +- + .../selftests/drivers/net/mlxsw/port_scale.sh | 6 +- + .../selftests/drivers/net/mlxsw/rtnetlink.sh | 82 + + .../selftests/drivers/net/mlxsw/sch_red_core.sh | 4 +- + .../selftests/drivers/net/mlxsw/sch_red_ets.sh | 7 + + .../drivers/net/mlxsw/spectrum-2/q_in_vni_veto.sh | 77 - + .../drivers/net/mlxsw/spectrum-2/resource_scale.sh | 4 +- + .../drivers/net/mlxsw/spectrum/resource_scale.sh | 4 +- + .../selftests/drivers/net/mlxsw/tc_flower_scale.sh | 6 +- + .../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/lib.mk | 4 + + tools/testing/selftests/net/Makefile | 4 + + tools/testing/selftests/net/fib_nexthops.sh | 564 ++- + tools/testing/selftests/net/fib_tests.sh | 152 +- + .../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/mirror_gre_vlan_bridge_1q.sh | 2 +- + .../testing/selftests/net/forwarding/mirror_lib.sh | 19 +- + .../net/forwarding/router_mpath_nh_res.sh | 400 ++ + .../testing/selftests/net/forwarding/tc_police.sh | 56 + + tools/testing/selftests/net/mptcp/Makefile | 2 +- + tools/testing/selftests/net/mptcp/diag.sh | 55 +- + tools/testing/selftests/net/mptcp/mptcp_connect.c | 77 +- + tools/testing/selftests/net/mptcp/mptcp_connect.sh | 51 +- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 248 +- + tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 276 ++ + 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/settings | 1 + + 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/net/veth.sh | 177 + + tools/testing/selftests/netfilter/nft_flowtable.sh | 82 + + .../tc-testing/tc-tests/actions/police.json | 48 + + .../tc-testing/tc-tests/actions/simple.json | 83 + + 1844 files changed, 120528 insertions(+), 35078 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/actions,owl-emac.yaml + create mode 100644 Documentation/devicetree/bindings/net/brcm,bcm6368-mdio-mux.yaml + delete mode 100644 Documentation/devicetree/bindings/net/broadcom-bluetooth.txt + create mode 100644 Documentation/devicetree/bindings/net/broadcom-bluetooth.yaml + create mode 100644 Documentation/devicetree/bindings/net/idt,3243x-emac.yaml + create mode 100644 Documentation/devicetree/bindings/net/intel,ixp4xx-ethernet.yaml + delete mode 100644 Documentation/devicetree/bindings/net/rockchip-dwmac.txt + create mode 100644 Documentation/devicetree/bindings/net/rockchip-dwmac.yaml + delete mode 100644 Documentation/devicetree/bindings/net/wireless/ieee80211.txt + create mode 100644 Documentation/devicetree/bindings/net/wireless/ieee80211.yaml + delete mode 100644 Documentation/devicetree/bindings/net/wireless/mediatek,mt76.txt + create mode 100644 Documentation/devicetree/bindings/net/wireless/mediatek,mt76.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/bluetooth/virtio_bt.c + 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/can/usb/etas_es58x/Makefile + create mode 100644 drivers/net/can/usb/etas_es58x/es581_4.c + create mode 100644 drivers/net/can/usb/etas_es58x/es581_4.h + create mode 100644 drivers/net/can/usb/etas_es58x/es58x_core.c + create mode 100644 drivers/net/can/usb/etas_es58x/es58x_core.h + create mode 100644 drivers/net/can/usb/etas_es58x/es58x_fd.c + create mode 100644 drivers/net/can/usb/etas_es58x/es58x_fd.h + create mode 100644 drivers/net/dsa/microchip/ksz8.h + create mode 100644 drivers/net/dsa/microchip/ksz8863_smi.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-flower.c + 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 (64%) + rename drivers/{staging/fsl-dpaa2/ethsw => net/ethernet/freescale/dpaa2}/dpsw.c (62%) + create mode 100644 drivers/net/ethernet/freescale/dpaa2/dpsw.h + create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_ierb.c + create mode 100644 drivers/net/ethernet/freescale/enetc/enetc_ierb.h + create mode 100644 drivers/net/ethernet/intel/iavf/iavf_adv_rss.c + create mode 100644 drivers/net/ethernet/intel/iavf/iavf_adv_rss.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_allowlist.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_virtchnl_allowlist.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/legacy.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.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/microsoft/Kconfig + create mode 100644 drivers/net/ethernet/microsoft/Makefile + create mode 100644 drivers/net/ethernet/microsoft/mana/Makefile + create mode 100644 drivers/net/ethernet/microsoft/mana/gdma.h + create mode 100644 drivers/net/ethernet/microsoft/mana/gdma_main.c + create mode 100644 drivers/net/ethernet/microsoft/mana/hw_channel.c + create mode 100644 drivers/net/ethernet/microsoft/mana/hw_channel.h + create mode 100644 drivers/net/ethernet/microsoft/mana/mana.h + create mode 100644 drivers/net/ethernet/microsoft/mana/mana_en.c + create mode 100644 drivers/net/ethernet/microsoft/mana/mana_ethtool.c + create mode 100644 drivers/net/ethernet/microsoft/mana/shm_channel.c + create mode 100644 drivers/net/ethernet/microsoft/mana/shm_channel.h + 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%) + create mode 100644 drivers/net/ipa/ipa_data-v4.11.c + rename drivers/net/ipa/{ipa_data-sc7180.c => ipa_data-v4.2.c} (60%) + create mode 100644 drivers/net/ipa/ipa_data-v4.5.c + create mode 100644 drivers/net/ipa/ipa_data-v4.9.c + 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 + create mode 100644 drivers/net/phy/nxp-c45-tja11xx.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7915/mmio.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/mt7921_trace.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/trace.c + create mode 100644 drivers/net/wwan/Kconfig + create mode 100644 drivers/net/wwan/Makefile + create mode 100644 drivers/net/wwan/mhi_wwan_ctrl.c + create mode 100644 drivers/net/wwan/wwan_core.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 + create mode 100644 include/linux/wwan.h + delete mode 100644 include/net/netns/dccp.h + create mode 100644 include/net/selftests.h + create mode 100644 include/trace/events/mptcp.h + create mode 100644 include/uapi/linux/virtio_bt.h + delete mode 100644 net/ax25/TODO + create mode 100644 net/bluetooth/aosp.c + create mode 100644 net/bluetooth/aosp.h + delete mode 100644 net/bridge/netfilter/nf_log_bridge.c + create mode 100644 net/core/selftests.c + delete mode 100644 net/decnet/TODO + create mode 100644 net/ethtool/eeprom.c + create mode 100644 net/ethtool/fec.c + create mode 100644 net/ethtool/stats.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 + create mode 100644 net/mptcp/sockopt.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/linked_funcs.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/linked_maps.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/linked_vars.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/snprintf.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/linked_funcs1.c + create mode 100644 tools/testing/selftests/bpf/progs/linked_funcs2.c + create mode 100644 tools/testing/selftests/bpf/progs/linked_maps1.c + create mode 100644 tools/testing/selftests/bpf/progs/linked_maps2.c + create mode 100644 tools/testing/selftests/bpf/progs/linked_vars1.c + create mode 100644 tools/testing/selftests/bpf/progs/linked_vars2.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_snprintf.c + create mode 100644 tools/testing/selftests/bpf/progs/test_snprintf_single.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/mptcp/mptcp_sockopt.sh + create mode 100644 tools/testing/selftests/net/settings + create mode 100755 tools/testing/selftests/net/udpgro_fwd.sh + create mode 100755 tools/testing/selftests/net/veth.sh +Merging bpf-next/for-next (3733bfbbdd28 bpf, selftests: Update array map tests for per-cpu batched ops) +$ git merge bpf-next/for-next +Removing tools/testing/selftests/bpf/progs/btf__core_reloc_existence___err_wrong_struct_type.c +Removing tools/testing/selftests/bpf/progs/btf__core_reloc_existence___err_wrong_int_type.c +Removing tools/testing/selftests/bpf/progs/btf__core_reloc_existence___err_wrong_int_sz.c +Removing tools/testing/selftests/bpf/progs/btf__core_reloc_existence___err_wrong_int_kind.c +Removing tools/testing/selftests/bpf/progs/btf__core_reloc_existence___err_wrong_arr_value_type.c +Removing tools/testing/selftests/bpf/progs/btf__core_reloc_existence___err_wrong_arr_kind.c +Auto-merging init/Kconfig +Auto-merging include/linux/bpf.h +Merge made by the 'recursive' strategy. + Documentation/networking/filter.rst | 2 +- + fs/seq_file.c | 18 ++ + include/linux/bpf.h | 22 +-- + include/linux/seq_file.h | 4 + + init/Kconfig | 1 + + kernel/bpf/arraymap.c | 2 + + kernel/bpf/cpumap.c | 18 +- + kernel/bpf/helpers.c | 188 +++++++++++---------- + kernel/bpf/syscall.c | 23 ++- + kernel/bpf/trampoline.c | 4 +- + kernel/bpf/verifier.c | 10 +- + kernel/trace/bpf_trace.c | 36 ++-- + tools/lib/bpf/bpf_core_read.h | 16 +- + tools/lib/bpf/libbpf.c | 6 +- + .../selftests/bpf/map_tests/array_map_batch_ops.c | 104 ++++++++---- + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 2 +- + .../testing/selftests/bpf/prog_tests/btf_endian.c | 4 +- + .../testing/selftests/bpf/prog_tests/cgroup_link.c | 2 +- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 51 +++--- + .../testing/selftests/bpf/prog_tests/fentry_test.c | 52 ++++-- + .../testing/selftests/bpf/prog_tests/fexit_test.c | 52 ++++-- + tools/testing/selftests/bpf/prog_tests/kfree_skb.c | 2 +- + .../selftests/bpf/prog_tests/module_attach.c | 23 +++ + .../selftests/bpf/prog_tests/resolve_btfids.c | 7 +- + .../selftests/bpf/prog_tests/snprintf_btf.c | 4 +- + tools/testing/selftests/bpf/prog_tests/test_lsm.c | 61 ++++--- + ...tf__core_reloc_existence___err_wrong_arr_kind.c | 3 - + ...re_reloc_existence___err_wrong_arr_value_type.c | 3 - + ...tf__core_reloc_existence___err_wrong_int_kind.c | 3 - + .../btf__core_reloc_existence___err_wrong_int_sz.c | 3 - + ...tf__core_reloc_existence___err_wrong_int_type.c | 3 - + ..._core_reloc_existence___err_wrong_struct_type.c | 3 - + .../btf__core_reloc_existence___wrong_field_defs.c | 3 + + .../testing/selftests/bpf/progs/core_reloc_types.h | 20 +-- + tools/testing/selftests/bpf/test_progs.h | 50 +++++- + .../testing/selftests/bpf/verifier/array_access.c | 2 +- + 36 files changed, 494 insertions(+), 313 deletions(-) + delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_existence___err_wrong_arr_kind.c + delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_existence___err_wrong_arr_value_type.c + delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_existence___err_wrong_int_kind.c + delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_existence___err_wrong_int_sz.c + delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_existence___err_wrong_int_type.c + delete mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_existence___err_wrong_struct_type.c + create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_existence___wrong_field_defs.c +Merging ipsec-next/master (747b67088f8d xfrm: ipcomp: remove unnecessary get_cpu()) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (63f9c44bca5e net/mlx5: Add MEMIC operations related bits) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (99ba0ea616aa sfc: adjust efx->xdp_tx_queue_count with the real number of initialized queues) +$ git merge netfilter-next/master +Already up to date. +Merging ipvs-next/master (e9377a911d77 ethtool: add missing EEPROM to list of messages) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (9382531ec63f Merge tag 'mt76-for-kvalo-2021-04-21' of https://github.com/nbd168/wireless) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (1c55c39f8232 Bluetooth: cmtp: fix file refcount when cmtp_attach_device fails) +$ git merge bluetooth/master +Auto-merging drivers/bluetooth/btusb.c +Merge made by the 'recursive' strategy. + drivers/bluetooth/btusb.c | 15 ++++++++++----- + drivers/bluetooth/virtio_bt.c | 3 +++ + include/net/bluetooth/hci_core.h | 2 +- + include/net/bluetooth/mgmt.h | 1 + + net/bluetooth/6lowpan.c | 2 +- + net/bluetooth/cmtp/core.c | 5 +++++ + net/bluetooth/hci_event.c | 8 ++++---- + net/bluetooth/l2cap_core.c | 2 +- + net/bluetooth/mgmt.c | 6 +++++- + net/bluetooth/msft.c | 6 +++--- + 10 files changed, 34 insertions(+), 16 deletions(-) +Merging mac80211-next/master (5d869070569a net: phy: marvell: don't use empty switch default case) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (e5966cf20f0c gfs2: Fix fall-through warnings for Clang) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/lops.c +Auto-merging fs/gfs2/log.c +Auto-merging fs/gfs2/inode.h +Auto-merging fs/gfs2/inode.c +Auto-merging fs/gfs2/glops.c +Auto-merging fs/gfs2/glock.c +Auto-merging fs/gfs2/file.c +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 5 +- + fs/gfs2/bmap.c | 153 ++++++++++++++++++++++++++------------------------- + fs/gfs2/bmap.h | 13 +++-- + fs/gfs2/dir.c | 52 +++++++++-------- + fs/gfs2/file.c | 12 ++-- + fs/gfs2/glock.c | 12 ++-- + fs/gfs2/glops.c | 16 ++---- + fs/gfs2/incore.h | 3 +- + fs/gfs2/inode.c | 32 +++++------ + fs/gfs2/inode.h | 1 - + fs/gfs2/lock_dlm.c | 37 +++++++------ + fs/gfs2/log.c | 23 ++++---- + fs/gfs2/lops.c | 13 +++-- + fs/gfs2/meta_io.c | 20 ++++--- + fs/gfs2/meta_io.h | 6 +- + fs/gfs2/ops_fstype.c | 8 +-- + fs/gfs2/quota.c | 6 +- + fs/gfs2/recovery.c | 8 ++- + fs/gfs2/rgrp.c | 8 ++- + fs/gfs2/super.c | 12 ++-- + fs/gfs2/sys.c | 67 ++++++++++++++++++++++ + fs/gfs2/util.c | 19 ++++--- + fs/gfs2/xattr.c | 29 +++------- + 23 files changed, 312 insertions(+), 243 deletions(-) +Merging mtd/mtd/next (a881537dfaf2 Revert "mtd: rawnand: bbt: Skip bad blocks when searching for the BBT in NAND") +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (32cbc7cb70b0 mtd: rawnand: qcom: Use dma_mapping_error() for error check) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (46094049a49b Revert "mtd: spi-nor: macronix: Add support for mx25l51245g") +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (e3a606f2c544 fsverity: relax build time dependency on CRYPTO_SHA256) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (a1a1ca70deb3 Merge tag 'drm-misc-next-fixes-2021-04-22' of git://anongit.freedesktop.org/drm/drm-misc 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 drivers/media/v4l2-core/v4l2-ioctl.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_mob.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_mob.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/radeon/radeon_cs.c +Auto-merging drivers/gpu/drm/panfrost/panfrost_devfreq.h +Auto-merging drivers/gpu/drm/panfrost/panfrost_devfreq.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_ttm.c +Removing drivers/gpu/drm/msm/dsi/pll/dsi_pll_7nm.c +Removing drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm_8960.c +Removing drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c +Removing drivers/gpu/drm/msm/dsi/pll/dsi_pll_14nm.c +Removing drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c +Removing drivers/gpu/drm/msm/dsi/pll/dsi_pll.h +Removing drivers/gpu/drm/msm/dsi/pll/dsi_pll.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/selftests/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_user.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/vlv_dsi.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp_link_training.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/drm_modes.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/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +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/ttm/ttm_bo.c' using previous resolution. +Resolved 'drivers/gpu/drm/vmwgfx/vmwgfx_drv.h' using previous resolution. +Resolved 'drivers/gpu/drm/vmwgfx/vmwgfx_mob.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 942ea4f831b6] 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/clk/clk-mux.c | 35 + + drivers/dma-buf/dma-fence.c | 27 +- + 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 | 21 +- + drivers/gpu/drm/amd/amdgpu/aldebaran.c | 407 + + drivers/gpu/drm/amd/amdgpu/aldebaran.h | 32 + + drivers/gpu/drm/amd/amdgpu/aldebaran_reg_init.c | 54 + + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 20 +- + 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 | 196 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 12 - + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 73 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 + + 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 | 555 +- + 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 | 193 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 101 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 54 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 189 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 40 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 6 +- + 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 | 54 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 143 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 136 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 146 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 423 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 51 +- + 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_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_sdma.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 498 +- + 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_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.c | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 28 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 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/cik_sdma.c | 5 +- + 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 | 4 +- + .../gpu/drm/amd/amdgpu/dimgrey_cavefish_reg_init.c | 0 + 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 | 15 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 224 +- + 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 | 1297 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h | 35 + + 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 | 9 +- + 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 | 186 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 3 + + 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 | 67 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.h | 1 + + 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 | 1333 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.h | 29 + + 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 | 64 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h | 1 + + drivers/gpu/drm/amd/amdgpu/nv.c | 251 +- + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 26 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 8 +- + 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_v2_4.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 185 +- + 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_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 9 +- + drivers/gpu/drm/amd/amdgpu/si.c | 111 + + drivers/gpu/drm/amd/amdgpu/si_dma.c | 5 +- + 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 | 376 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 12 + + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 63 +- + drivers/gpu/drm/amd/amdgpu/ta_secureDisplay_if.h | 1 + + 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 | 103 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.h | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 167 +- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 32 +- + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 55 +- + 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 | 122 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 17 +- + drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 27 +- + .../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 | 14 +- + 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 | 29 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 174 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 2 +- + 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 | 934 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 81 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 295 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 37 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 696 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h | 5 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 6 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 54 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 185 +- + .../amd/display/amdgpu_dm/amdgpu_dm_irq_params.h | 9 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 17 +- + .../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 | 3 +- + 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 | 195 +- + .../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/calcs/dce_calcs.c | 1154 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 137 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 2 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 13 + + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 11 +- + .../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 | 347 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 48 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 5 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 193 +- + .../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 | 50 + + drivers/gpu/drm/amd/display/dc/core/dc_stat.c | 64 + + drivers/gpu/drm/amd/display/dc/dc.h | 28 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 9 +- + 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 | 38 +- + drivers/gpu/drm/amd/display/dc/dc_stat.h | 42 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 15 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 19 +- + drivers/gpu/drm/amd/display/dc/dce/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 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 | 90 +- + 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 | 32 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 100 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 2 + + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 16 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 324 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 15 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 16 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 5 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 2 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 15 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 3 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 140 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h | 3 - + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 38 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 4 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 15 +- + .../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 | 4 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 26 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 23 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.h | 1 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 4 +- + .../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 + + .../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 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 2 +- + .../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 | 11 +- + .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 28 +- + 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 | 42 + + 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/clk_mgr.h | 10 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 21 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 1 + + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 13 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 12 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 12 +- + drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 86 + + 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 | 63 +- + .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 63 +- + .../amd/display/dc/irq/dcn302/irq_service_dcn302.c | 60 + + 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 | 1471 +- + .../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 | 182 +- + .../gpu/drm/amd/display/dmub/src/dmub_srv_stat.c | 105 + + 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 | 69 +- + 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 | 10 +- + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 12 +- + 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_10_3_0_offset.h | 6 + + .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 9 + + .../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/atombios.h | 4 +- + drivers/gpu/drm/amd/include/atomfirmware.h | 167 +- + .../drm/amd/include/ivsrcid/dcn/irqsrcs_dcn_1_0.h | 4 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 141 +- + 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 | 236 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 1130 +- + drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h | 127 + + drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h | 2 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 141 +- + 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 | 519 + + drivers/gpu/drm/amd/pm/inc/smu_types.h | 29 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 19 +- + drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 275 + + 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 | 45 +- + .../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 | 6 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 6 +- + 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 | 717 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 19 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 646 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 62 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 27 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 63 +- + 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 | 1826 + + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.h | 72 + + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 1839 ++ + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 50 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 5 + + 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 - + drivers/gpu/drm/arm/display/include/malidp_utils.h | 3 - + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 6 +- + .../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 + + .../gpu/drm/arm/display/komeda/komeda_pipeline.c | 16 +- + .../drm/arm/display/komeda/komeda_pipeline_state.c | 19 +- + 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 | 33 +- + drivers/gpu/drm/bridge/Makefile | 2 + + drivers/gpu/drm/bridge/analogix/Kconfig | 1 + + 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 | 768 + + 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 | 51 +- + 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_helper.c | 24 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 99 +- + 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_internal.h | 1 - + drivers/gpu/drm/drm_ioc32.c | 15 +- + drivers/gpu/drm/drm_mipi_dbi.c | 5 +- + drivers/gpu/drm/drm_modes.c | 3 + + 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 | 37 +- + drivers/gpu/drm/drm_sysfs.c | 9 +- + drivers/gpu/drm/drm_vblank.c | 28 +- + 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/power.c | 3 +- + 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 | 10 +- + drivers/gpu/drm/i915/TODO.txt | 41 + + 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 | 196 +- + drivers/gpu/drm/i915/display/i9xx_plane.h | 4 + + drivers/gpu/drm/i915/display/icl_dsi.c | 42 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 9 +- + drivers/gpu/drm/i915/display/intel_audio.c | 48 +- + drivers/gpu/drm/i915/display/intel_bios.c | 1248 +- + drivers/gpu/drm/i915/display/intel_bios.h | 19 +- + drivers/gpu/drm/i915/display/intel_bw.c | 32 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 88 +- + drivers/gpu/drm/i915/display/intel_color.c | 32 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 31 +- + drivers/gpu/drm/i915/display/intel_crt.c | 18 +- + drivers/gpu/drm/i915/display/intel_crt.h | 1 - + drivers/gpu/drm/i915/display/intel_crtc.c | 290 +- + drivers/gpu/drm/i915/display/intel_csr.c | 16 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 29 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 2789 +- + 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 | 4514 +-- + drivers/gpu/drm/i915/display/intel_display.h | 56 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 209 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 283 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 32 + + drivers/gpu/drm/i915/display/intel_display_types.h | 179 +- + drivers/gpu/drm/i915/display/intel_dp.c | 1802 +- + 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 | 115 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 52 +- + .../gpu/drm/i915/display/intel_dp_link_training.h | 3 + + drivers/gpu/drm/i915/display/intel_dp_mst.c | 23 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 519 +- + drivers/gpu/drm/i915/display/intel_dpll.h | 18 + + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 117 +- + 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 | 6 +- + 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 | 68 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 4 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 144 +- + drivers/gpu/drm/i915/display/intel_fdi.h | 3 + + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 8 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 2 + + drivers/gpu/drm/i915/display/intel_gmbus.c | 4 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 54 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 714 +- + drivers/gpu/drm/i915/display/intel_hdmi.h | 3 - + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 5 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 12 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 6 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 48 +- + drivers/gpu/drm/i915/display/intel_panel.c | 22 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 16 +- + drivers/gpu/drm/i915/display/intel_pps.c | 8 +- + drivers/gpu/drm/i915/display/intel_psr.c | 654 +- + 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 | 10 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 1792 +- + drivers/gpu/drm/i915/display/intel_sprite.h | 8 - + drivers/gpu/drm/i915/display/intel_tc.c | 8 +- + drivers/gpu/drm/i915/display/intel_tv.c | 8 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 27 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 12 +- + drivers/gpu/drm/i915/display/intel_vga.c | 12 +- + drivers/gpu/drm/i915/display/intel_vrr.h | 1 - + 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 | 2218 ++ + drivers/gpu/drm/i915/display/skl_universal_plane.h | 35 + + 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 | 15 +- + 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 | 102 +- + 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 | 105 +- + 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 | 22 +- + drivers/gpu/drm/i915/i915_drv.c | 95 +- + drivers/gpu/drm/i915/i915_drv.h | 204 +- + 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 | 168 +- + 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 | 23 +- + 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/i915_vma_types.h | 12 +- + drivers/gpu/drm/i915/intel_device_info.c | 13 +- + drivers/gpu/drm/i915/intel_device_info.h | 12 +- + 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 | 542 +- + drivers/gpu/drm/i915/intel_pm.h | 5 + + drivers/gpu/drm/i915/intel_runtime_pm.c | 4 +- + drivers/gpu/drm/i915/intel_step.c | 106 + + drivers/gpu/drm/i915/intel_step.h | 40 + + 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/i915_vma.c | 219 +- + 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/Kconfig | 9 +- + drivers/gpu/drm/msm/Makefile | 9 - + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 12 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3 + + drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 1 - + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 96 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 30 + + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 11 + + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 1 + + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 26 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 195 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 10 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 27 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 3 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 793 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h | 5 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 12 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.h | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 11 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 54 +- + 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_cmd_encoder.c | 19 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 57 +- + drivers/gpu/drm/msm/dp/dp_debug.c | 33 +- + drivers/gpu/drm/msm/dp/dp_hpd.c | 4 +- + drivers/gpu/drm/msm/dp/dp_power.c | 2 +- + drivers/gpu/drm/msm/dsi/dsi.h | 60 +- + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 6 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 6 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 30 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 161 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 41 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 747 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 939 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 16 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 654 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 479 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 774 +- + drivers/gpu/drm/msm/dsi/pll/dsi_pll.c | 184 - + drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 132 - + drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 881 - + drivers/gpu/drm/msm/dsi/pll/dsi_pll_14nm.c | 1096 - + drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c | 643 - + drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm_8960.c | 526 - + drivers/gpu/drm/msm/dsi/pll/dsi_pll_7nm.c | 913 - + drivers/gpu/drm/msm/msm_atomic.c | 4 +- + drivers/gpu/drm/msm/msm_debugfs.c | 14 +- + drivers/gpu/drm/msm/msm_drv.c | 23 +- + drivers/gpu/drm/msm/msm_drv.h | 29 +- + drivers/gpu/drm/msm/msm_fb.c | 3 +- + drivers/gpu/drm/msm/msm_gem.c | 212 +- + drivers/gpu/drm/msm/msm_gem.h | 126 +- + drivers/gpu/drm/msm/msm_gem_shrinker.c | 166 +- + drivers/gpu/drm/msm/msm_gpu.c | 2 + + drivers/gpu/drm/msm/msm_gpu.h | 2 + + drivers/gpu/drm/msm/msm_gpu_trace.h | 13 + + 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/panel/panel-tpo-td043mtea1.c | 4 +- + 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 | 29 +- + drivers/gpu/drm/radeon/r600_cs.c | 6 +- + 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 | 23 +- + 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 | 12 +- + drivers/gpu/drm/radeon/radeon_pm.c | 68 +- + drivers/gpu/drm/radeon/radeon_ring.c | 80 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 135 +- + 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 | 125 +- + 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/dpaux.c | 11 +- + 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 | 429 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 40 +- + 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 | 114 +- + 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 | 74 +- + 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 | 11 +- + 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_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/xlnx/zynqmp_dp.c | 2 +- + 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 | 55 +- + 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_hdcp.h | 5 +- + include/drm/drm_modeset_helper_vtables.h | 31 +- + include/drm/drm_plane.h | 25 +- + include/drm/drm_print.h | 20 +- + include/drm/drm_simple_kms_helper.h | 29 +- + include/drm/drm_vblank.h | 1 - + include/drm/gpu_scheduler.h | 27 +- + 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/clk-provider.h | 30 + + include/linux/dma-fence.h | 1 + + include/linux/dma-heap.h | 9 + + include/linux/fb.h | 3 - + include/linux/hdmi.h | 2 +- + 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/drm/msm_drm.h | 1 + + include/uapi/linux/kfd_ioctl.h | 4 +- + lib/test_printf.c | 18 + + lib/vsprintf.c | 39 + + scripts/checkpatch.pl | 6 +- + 1144 files changed, 182621 insertions(+), 31931 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.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran.h + 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 + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.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/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/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/dc/inc/link_enc_cfg.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/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_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/intel_fb.c + create mode 100644 drivers/gpu/drm/i915/display/intel_fb.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/i915/intel_step.c + create mode 100644 drivers/gpu/drm/i915/intel_step.h + delete mode 100644 drivers/gpu/drm/msm/dsi/pll/dsi_pll.c + delete mode 100644 drivers/gpu/drm/msm/dsi/pll/dsi_pll.h + delete mode 100644 drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c + delete mode 100644 drivers/gpu/drm/msm/dsi/pll/dsi_pll_14nm.c + delete mode 100644 drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c + delete mode 100644 drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm_8960.c + delete mode 100644 drivers/gpu/drm/msm/dsi/pll/dsi_pll_7nm.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 f72fabf300c9] Merge remote-tracking branch 'drm/drm-next' + Date: Wed Apr 28 10:25:25 2021 +1000 +Merging drm-misc/for-linux-next (74deef03a44a efifb: Check efifb_pci_dev before using it) +$ git merge drm-misc/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/ttm/ttm_device.c | 2 +- + drivers/gpu/drm/ttm/ttm_tt.c | 2 ++ + drivers/gpu/drm/vmwgfx/ttm_memory.c | 2 +- + drivers/video/fbdev/efifb.c | 6 ++++-- + 4 files changed, 8 insertions(+), 4 deletions(-) +Merging amdgpu/drm-next (2d571da89389 drm/amdgpu/display: add documentation for dmcub_trace_event_en) +$ git merge amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master fda30eefeaa5] Merge remote-tracking branch 'amdgpu/drm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 159 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 13 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 169 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 86 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 72 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 95 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 99 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 129 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 207 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 16 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 407 ++- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h | 1 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 32 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 30 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 3 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 11 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 128 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 125 + + drivers/gpu/drm/amd/amdgpu/nv.c | 14 +- + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 11 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_4.c | 35 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 28 + + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 32 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 10 +- + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 7 + + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 1 + + drivers/gpu/drm/amd/amdgpu/vi.c | 193 +- + drivers/gpu/drm/amd/amdkfd/Kconfig | 13 + + drivers/gpu/drm/amd/amdkfd/Makefile | 5 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 80 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 749 ++++- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 13 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 6 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 13 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 4 + + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 129 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 931 ++++++ + drivers/gpu/drm/amd/amdkfd/kfd_migrate.h | 65 + + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 58 +- + .../gpu/drm/amd/amdkfd/kfd_pm4_headers_aldebaran.h | 93 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 39 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 145 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 3002 ++++++++++++++++++++ + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 206 ++ + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 6 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 10 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 44 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 8 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 35 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 8 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 25 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 12 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 58 +- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 4 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 37 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 87 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 71 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 4 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 33 +- + drivers/gpu/drm/amd/display/dc/dc.h | 13 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 1 - + drivers/gpu/drm/amd/display/dc/dc_stream.h | 1 - + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 2 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 10 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 15 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 7 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 2 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 2 + + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 8 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 31 +- + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 2 - + .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 2 - + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 2 + + .../drm/amd/include/asic_reg/gc/gc_9_4_1_sh_mask.h | 16 + + drivers/gpu/drm/amd/include/atomfirmware.h | 41 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 4 +- + .../gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.h | 40 +- + drivers/gpu/drm/amd/pm/inc/smu_types.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v12_0.h | 2 + + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 382 ++- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 - + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 123 + + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 55 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 2 - + drivers/gpu/drm/radeon/cik.c | 4 - + drivers/gpu/drm/radeon/radeon.h | 3 + + drivers/gpu/drm/radeon/radeon_audio.c | 92 + + drivers/gpu/drm/radeon/radeon_device.c | 3 +- + drivers/gpu/drm/radeon/si.c | 2 +- + drivers/usb/host/xhci-pci.c | 3 + + include/uapi/drm/amdgpu_drm.h | 2 - + include/uapi/linux/kfd_ioctl.h | 171 +- + 129 files changed, 8476 insertions(+), 963 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_migrate.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_migrate.h + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_aldebaran.h + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_svm.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_svm.h +Merging drm-intel/for-linux-next (270e3cc5aa38 drm/i915: Fix docbook descriptions for i915_gem_shrinker) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/gvt/cmd_parser.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp_link_training.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_display.c | 3 ++- + drivers/gpu/drm/i915/display/intel_dp_link_training.c | 2 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 4 +++- + drivers/gpu/drm/i915/display/intel_psr.c | 3 +-- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 1 + + drivers/gpu/drm/i915/gvt/cmd_parser.c | 5 ----- + drivers/gpu/drm/i915/gvt/gtt.c | 6 ------ + drivers/gpu/drm/i915/gvt/gvt.c | 8 ++++---- + drivers/gpu/drm/i915/i915_request.c | 3 ++- + 10 files changed, 15 insertions(+), 22 deletions(-) +Merging drm-tegra/drm/tegra/for-next (c79184a9c029 drm/tegra: Fix shift overflow in tegra_shared_plane_atomic_update) +$ 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/sor.c | 41 ++++--- + drivers/gpu/drm/tegra/vic.c | 4 +- + drivers/gpu/host1x/bus.c | 61 +++++++++- + 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 | 48 ++++++-- + 28 files changed, 531 insertions(+), 180 deletions(-) +Merging drm-msm/msm-next (a29c8c024165 drm/msm/disp/dpu1: fix display underruns during modeset.) +$ git merge drm-msm/msm-next +Already up to date. +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 8b863cc9d9b9] 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 +Already up to date. +Merging sound/for-next (e861431303d2 ALSA: virtio: fix kernel-doc) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (ffc9841d5200 Merge remote-tracking branch 'asoc/for-5.13' into asoc-next) +$ git merge sound-asoc/for-next +Already up to date. +Merging modules/modules-next (33121347fb1c module: treat exit sections the same as init sections when !CONFIG_MODULE_UNLOAD) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Merge made by the 'recursive' strategy. + kernel/module.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) +Merging input/next (d12b64b9764e MAINTAINERS: repair reference in HYCON HY46XX TOUCHSCREEN SUPPORT) +$ git merge input/next +Auto-merging drivers/input/touchscreen/elants_i2c.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/input/touchscreen/mms114.txt +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/hycon,hy46xx.yaml | 119 ++ + .../bindings/input/touchscreen/ilitek_ts_i2c.yaml | 73 + + .../bindings/input/touchscreen/iqs5xx.txt | 80 - + .../bindings/input/touchscreen/melfas,mms114.yaml | 87 + + .../bindings/input/touchscreen/mms114.txt | 42 - + .../bindings/input/touchscreen/mstar,msg2638.yaml | 69 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/input/devices/rotary-encoder.rst | 8 +- + MAINTAINERS | 7 + + drivers/input/Makefile | 1 + + drivers/input/keyboard/gpio_keys.c | 105 +- + 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 +- + drivers/input/serio/apbps2.c | 3 +- + .../of_touchscreen.c => touchscreen.c} | 13 +- + drivers/input/touchscreen/Kconfig | 39 +- + drivers/input/touchscreen/Makefile | 4 +- + 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 | 39 +- + drivers/input/touchscreen/cyttsp_core.h | 1 - + drivers/input/touchscreen/elants_i2c.c | 44 +- + drivers/input/touchscreen/exc3000.c | 253 +-- + drivers/input/touchscreen/hycon-hy46xx.c | 591 +++++++ + drivers/input/touchscreen/ilitek_ts_i2c.c | 690 ++++++++ + 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 | 26 +- + drivers/input/touchscreen/msg2638.c | 337 ++++ + drivers/input/touchscreen/silead.c | 46 +- + 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 + + 51 files changed, 5466 insertions(+), 536 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/iqs626a.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/azoteq,iqs5xx.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/hycon,hy46xx.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/ilitek_ts_i2c.yaml + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/iqs5xx.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/melfas,mms114.yaml + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/mms114.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/mstar,msg2638.yaml + create mode 100644 drivers/input/misc/iqs626a.c + rename drivers/input/{touchscreen/of_touchscreen.c => touchscreen.c} (93%) + create mode 100644 drivers/input/touchscreen/hycon-hy46xx.c + create mode 100644 drivers/input/touchscreen/ilitek_ts_i2c.c + create mode 100644 drivers/input/touchscreen/msg2638.c + create mode 100644 include/dt-bindings/input/atmel-maxtouch.h +Merging block/for-next (3e867c7a5cdf Merge branch 'for-5.13/drivers-post-merge' into for-next) +$ git merge block/for-next +Auto-merging kernel/fork.c +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/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/advansys.c +Auto-merging drivers/scsi/BusLogic.c +Auto-merging drivers/nvme/host/core.c +Auto-merging drivers/infiniband/ulp/rtrs/rtrs.h +Auto-merging drivers/infiniband/ulp/rtrs/rtrs-srv.c +Auto-merging drivers/infiniband/ulp/rtrs/rtrs-pri.h +Auto-merging drivers/infiniband/ulp/rtrs/rtrs-clt.h +Auto-merging drivers/infiniband/ulp/rtrs/rtrs-clt.c +Removing drivers/block/xsysace.c +Auto-merging drivers/block/xen-blkfront.c +Removing drivers/block/umem.h +Removing drivers/block/umem.c +Auto-merging drivers/ata/libata-eh.c +Auto-merging block/blk-mq.c +Auto-merging arch/mips/configs/maltaup_xpa_defconfig +Auto-merging arch/mips/configs/malta_kvm_defconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/filesystems/locking.rst +Removing Documentation/devicetree/bindings/ata/nvidia,tegra124-ahci.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-block-rnbd | 18 + + Documentation/ABI/testing/sysfs-class-rnbd-client | 13 + + 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 | 5 +- + 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 - + arch/x86/include/asm/floppy.h | 1 - + block/bfq-cgroup.c | 2 + + block/bfq-iosched.c | 398 ++- + block/bfq-iosched.h | 15 + + block/bfq-wf2q.c | 8 + + block/bio-integrity.c | 3 +- + block/bio.c | 43 +- + block/blk-core.c | 6 +- + block/blk-iocost.c | 4 - + block/blk-map.c | 119 +- + block/blk-mq-debugfs.c | 8 + + block/blk-mq-tag.c | 8 +- + block/blk-mq.c | 3 +- + block/blk-settings.c | 53 +- + block/blk-sysfs.c | 9 +- + block/blk-zoned.c | 8 - + block/blk.h | 18 +- + block/bounce.c | 138 +- + block/elevator.c | 3 +- + block/genhd.c | 183 +- + block/ioprio.c | 11 +- + block/mq-deadline.c | 7 +- + block/partitions/core.c | 54 +- + block/scsi_ioctl.c | 6 +- + crypto/async_tx/async_xor.c | 1 + + drivers/ata/ahci.c | 5 + + drivers/ata/ahci.h | 1 + + drivers/ata/ahci_ceva.c | 41 +- + drivers/ata/ahci_tegra.c | 66 +- + 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-eh.c | 1 + + 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 | 8 +- + 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/ataflop.c | 16 +- + drivers/block/brd.c | 19 +- + 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 | 27 +- + drivers/block/drbd/drbd_req.c | 1 + + drivers/block/drbd/drbd_state.c | 7 +- + drivers/block/floppy.c | 159 +- + drivers/block/mtip32xx/mtip32xx.c | 13 +- + drivers/block/null_blk/main.c | 126 +- + drivers/block/null_blk/null_blk.h | 6 + + drivers/block/null_blk/zoned.c | 1 + + drivers/block/paride/pd.c | 11 - + drivers/block/pktcdvd.c | 36 + + drivers/block/rnbd/rnbd-clt-sysfs.c | 84 +- + drivers/block/rnbd/rnbd-clt.c | 171 +- + drivers/block/rnbd/rnbd-clt.h | 6 +- + drivers/block/rnbd/rnbd-srv-sysfs.c | 5 +- + drivers/block/rnbd/rnbd-srv.c | 69 +- + drivers/block/rnbd/rnbd-srv.h | 3 +- + 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/infiniband/ulp/rtrs/rtrs-clt.c | 75 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.h | 1 - + drivers/infiniband/ulp/rtrs/rtrs-pri.h | 1 + + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 4 +- + drivers/infiniband/ulp/rtrs/rtrs.h | 13 +- + drivers/lightnvm/Kconfig | 4 +- + drivers/lightnvm/core.c | 4 +- + drivers/md/bcache/alloc.c | 5 +- + drivers/md/bcache/bcache.h | 11 +- + drivers/md/bcache/btree.c | 4 +- + drivers/md/bcache/debug.c | 2 +- + drivers/md/bcache/extents.c | 4 +- + drivers/md/bcache/features.c | 2 +- + drivers/md/bcache/io.c | 4 +- + drivers/md/bcache/journal.c | 6 +- + drivers/md/bcache/super.c | 25 +- + drivers/md/bcache/util.h | 2 +- + drivers/md/bcache/writeback.c | 11 +- + drivers/md/md-bitmap.c | 2 + + drivers/md/md.c | 206 +- + drivers/md/md.h | 2 + + drivers/md/raid0.c | 14 +- + drivers/md/raid1.c | 2 + + drivers/md/raid10.c | 434 +++- + drivers/md/raid10.h | 1 + + drivers/nvme/host/Makefile | 2 +- + drivers/nvme/host/core.c | 1076 ++++---- + drivers/nvme/host/fabrics.c | 4 +- + drivers/nvme/host/fc.c | 14 +- + drivers/nvme/host/ioctl.c | 481 ++++ + drivers/nvme/host/lightnvm.c | 12 +- + drivers/nvme/host/multipath.c | 114 +- + drivers/nvme/host/nvme.h | 64 +- + drivers/nvme/host/pci.c | 30 +- + drivers/nvme/host/rdma.c | 7 +- + drivers/nvme/host/tcp.c | 16 +- + drivers/nvme/host/zns.c | 4 +- + drivers/nvme/target/admin-cmd.c | 14 +- + 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 | 78 +- + drivers/nvme/target/loop.c | 6 +- + drivers/nvme/target/nvmet.h | 8 +- + drivers/nvme/target/tcp.c | 79 +- + 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_genhd.c | 3 +- + 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 | 19 +- + fs/io-wq.c | 336 ++- + fs/io-wq.h | 1 + + fs/io_uring.c | 2612 +++++++++++--------- + include/linux/bio.h | 8 +- + include/linux/blkdev.h | 47 +- + include/linux/genhd.h | 21 +- + include/linux/io_uring.h | 12 +- + include/linux/lightnvm.h | 2 - + 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/trace/events/kyber.h | 6 +- + include/uapi/linux/fd.h | 46 +- + include/uapi/linux/io_uring.h | 40 + + include/uapi/linux/lightnvm.h | 1 - + kernel/fork.c | 3 +- + kernel/task_work.c | 35 +- + mm/Kconfig | 9 +- + 205 files changed, 5340 insertions(+), 6949 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 + create mode 100644 drivers/nvme/host/ioctl.c +Merging device-mapper/for-next (f99a8e4373ee dm raid: fix inconclusive reshape layout on fast raid4/5/6 table reload sequences) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-cache-target.c | 2 +- + drivers/md/dm-clone-metadata.c | 6 - + drivers/md/dm-ebs-target.c | 6 +- + drivers/md/dm-integrity.c | 22 +- + drivers/md/dm-ioctl.c | 294 ++++++++++++++--------- + drivers/md/dm-raid.c | 35 ++- + drivers/md/dm-snap-persistent.c | 6 +- + drivers/md/dm-snap.c | 5 +- + drivers/md/dm-table.c | 30 +-- + 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 | 6 +- + drivers/md/persistent-data/dm-btree-spine.c | 8 +- + drivers/md/persistent-data/dm-space-map-common.c | 2 + + drivers/md/persistent-data/dm-space-map-common.h | 8 +- + drivers/md/persistent-data/dm-space-map-disk.c | 9 - + include/linux/device-mapper.h | 5 - + include/uapi/linux/dm-ioctl.h | 18 +- + 20 files changed, 333 insertions(+), 236 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 (97fce126e279 mmc: block: Issue a cache flush only when it's enabled) +$ git merge mmc/next +Auto-merging drivers/mmc/host/sdhci-msm.c +Removing Documentation/devicetree/bindings/mmc/sdhci-of-dwcmshc.txt +Removing Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/brcm,iproc-sdhci.yaml | 63 +++++ + .../devicetree/bindings/mmc/brcm,sdhci-iproc.txt | 37 --- + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 20 ++ + .../devicetree/bindings/mmc/mmc-spi-slot.txt | 6 +- + 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/memstick/host/r592.c | 6 +- + drivers/mmc/core/block.c | 76 +++-- + drivers/mmc/core/core.c | 186 +----------- + drivers/mmc/core/core.h | 17 +- + drivers/mmc/core/host.c | 90 ++++-- + drivers/mmc/core/mmc.c | 29 +- + drivers/mmc/core/mmc_ops.c | 59 ++-- + drivers/mmc/core/mmc_ops.h | 4 +- + 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/Makefile | 2 - + drivers/mmc/host/cavium.c | 3 +- + drivers/mmc/host/dw_mmc-k3.c | 2 +- + drivers/mmc/host/dw_mmc-rockchip.c | 2 +- + drivers/mmc/host/dw_mmc.c | 16 +- + drivers/mmc/host/mmc_spi.c | 8 +- + drivers/mmc/host/moxart-mmc.c | 10 +- + drivers/mmc/host/of_mmc_spi.c | 18 +- + drivers/mmc/host/owl-mmc.c | 1 - + drivers/mmc/host/renesas_sdhi.h | 2 + + drivers/mmc/host/renesas_sdhi_core.c | 38 ++- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 4 +- + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 8 +- + drivers/mmc/host/sdhci-acpi.c | 2 + + drivers/mmc/host/sdhci-brcmstb.c | 1 - + drivers/mmc/host/sdhci-esdhc-imx.c | 26 +- + drivers/mmc/host/sdhci-esdhc-mcf.c | 8 +- + drivers/mmc/host/sdhci-msm.c | 8 +- + drivers/mmc/host/sdhci-of-aspeed.c | 2 +- + drivers/mmc/host/sdhci-of-dwcmshc.c | 313 +++++++++++++++++++-- + drivers/mmc/host/sdhci-of-esdhc.c | 2 +- + drivers/mmc/host/sdhci-pci-core.c | 31 +- + drivers/mmc/host/sdhci-pci-gli.c | 46 ++- + drivers/mmc/host/sdhci-pci-o2micro.c | 8 + + drivers/mmc/host/sdhci-pci.h | 2 + + drivers/mmc/host/sdhci-s3c.c | 22 +- + drivers/mmc/host/sdhci-st.c | 23 +- + drivers/mmc/host/sdhci-tegra.c | 66 +++-- + 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 | 61 ++-- + drivers/mmc/host/uniphier-sd.c | 5 +- + drivers/mmc/host/via-sdmmc.c | 3 +- + include/linux/mmc/host.h | 7 +- + include/linux/mmc/sdio.h | 2 +- + include/linux/spi/mmc_spi.h | 9 - + 59 files changed, 1010 insertions(+), 642 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/brcm,iproc-sdhci.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt + 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 (f9386c91574f mfd: intel-m10-bmc: Add support for MAX10 BMC Secure Updates) +$ git merge mfd/for-mfd-next +Removing include/linux/platform_data/i2c-designware.h +Removing include/linux/mfd/ab3100.h +Auto-merging drivers/regulator/Makefile +Auto-merging drivers/regulator/Kconfig +Auto-merging drivers/pwm/Makefile +Auto-merging drivers/pwm/Kconfig +Auto-merging drivers/mfd/intel_quark_i2c_gpio.c +Auto-merging drivers/mfd/intel-m10-bmc.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 +Removing Documentation/devicetree/bindings/mfd/qcom-pm8xxx.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/qcom-pm8xxx.txt | 99 --- + .../devicetree/bindings/mfd/qcom-pm8xxx.yaml | 54 ++ + .../devicetree/bindings/mfd/ricoh,rn5t618.yaml | 111 +++ + Documentation/devicetree/bindings/mfd/rn5t618.txt | 52 -- + .../devicetree/bindings/mfd/rohm,bd71815-pmic.yaml | 201 +++++ + .../devicetree/bindings/mfd/rohm,bd71828-pmic.yaml | 6 + + .../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 + + .../bindings/regulator/rohm,bd71815-regulator.yaml | 116 +++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 71 +- + drivers/clk/clk-bd718x7.c | 9 +- + drivers/gpio/Kconfig | 10 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-bd71815.c | 185 ++++ + drivers/i2c/busses/i2c-designware-platdrv.c | 7 +- + drivers/input/misc/Kconfig | 11 + + drivers/input/misc/Makefile | 2 +- + drivers/input/misc/atc260x-onkey.c | 305 +++++++ + drivers/mfd/Kconfig | 82 +- + 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-irq.c | 2 +- + 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_quark_i2c_gpio.c | 112 +-- + drivers/mfd/lm3533-core.c | 2 +- + drivers/mfd/lpc_sch.c | 32 +- + drivers/mfd/max8997.c | 4 +- + drivers/mfd/mfd-core.c | 29 +- + drivers/mfd/ntxec.c | 271 ++++++ + drivers/mfd/rn5t618.c | 3 + + drivers/mfd/rohm-bd71828.c | 486 ++++++++--- + drivers/mfd/rohm-bd718x7.c | 43 +- + drivers/mfd/rohm-bd9576.c | 189 +++++ + drivers/mfd/sec-core.c | 14 +- + drivers/mfd/stm32-timers.c | 7 +- + drivers/mfd/stmpe.c | 14 +- + 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/regulator/Kconfig | 11 + + drivers/regulator/Makefile | 1 + + drivers/regulator/bd71815-regulator.c | 652 +++++++++++++++ + drivers/regulator/bd71828-regulator.c | 51 +- + drivers/regulator/bd718x7-regulator.c | 60 +- + drivers/regulator/rohm-regulator.c | 23 +- + drivers/rtc/Kconfig | 14 +- + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-bd70528.c | 104 ++- + 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 | 92 +- + include/linux/mfd/lp87565.h | 3 - + include/linux/mfd/max8997.h | 8 +- + include/linux/mfd/ntxec.h | 38 + + include/linux/mfd/rn5t618.h | 1 + + include/linux/mfd/rohm-bd71815.h | 562 +++++++++++++ + include/linux/mfd/rohm-bd71828.h | 3 + + include/linux/mfd/rohm-bd718x7.h | 13 - + include/linux/mfd/rohm-bd957x.h | 140 ++++ + include/linux/mfd/rohm-generic.h | 17 +- + include/linux/mfd/twl.h | 2 - + include/linux/platform_data/i2c-designware.h | 13 - + 99 files changed, 6211 insertions(+), 2382 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/actions,atc260x.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/netronix,ntxec.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/qcom-pm8xxx.txt + create mode 100644 Documentation/devicetree/bindings/mfd/qcom-pm8xxx.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,bd71815-pmic.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/rohm,bd9576-pmic.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/rohm,bd71815-regulator.yaml + create mode 100644 drivers/gpio/gpio-bd71815.c + 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/regulator/bd71815-regulator.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-bd71815.h + create mode 100644 include/linux/mfd/rohm-bd957x.h + delete mode 100644 include/linux/platform_data/i2c-designware.h +Merging backlight/for-backlight-next (04758386757c backlight: journada720: Fix Wmisleading-indentation warning) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + .../bindings/leds/backlight/kinetic,ktd253.yaml | 9 +++-- + .../bindings/leds/backlight/qcom-wled.yaml | 1 + + drivers/video/backlight/jornada720_bl.c | 44 +++++++++++----------- + drivers/video/backlight/ktd253-backlight.c | 1 + + drivers/video/backlight/qcom-wled.c | 41 +++++++++++++------- + 5 files changed, 57 insertions(+), 39 deletions(-) +Merging battery/for-next (d0a43c12ee9f power: supply: cpcap-battery: fix invalid usage of list cursor) +$ git merge battery/for-next +Auto-merging include/linux/power_supply.h +Auto-merging drivers/power/supply/sbs-battery.c +Auto-merging drivers/power/supply/axp20x_usb_power.c +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in 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 +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 72a832aef423] Merge remote-tracking branch 'battery/for-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-class-power-surface | 15 + + .../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 | 17 +- + drivers/power/reset/Makefile | 2 +- + drivers/power/reset/at91-reset.c | 4 +- + drivers/power/reset/hisi-reboot.c | 5 +- + drivers/power/reset/ltc2952-poweroff.c | 8 + + drivers/power/reset/restart-poweroff.c | 1 + + drivers/power/reset/vexpress-poweroff.c | 2 +- + drivers/power/supply/88pm860x_battery.c | 4 +- + drivers/power/supply/Kconfig | 38 +- + drivers/power/supply/Makefile | 2 + + drivers/power/supply/act8945a_charger.c | 2 +- + drivers/power/supply/axp20x_usb_power.c | 4 +- + drivers/power/supply/bq256xx_charger.c | 2 + + 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-battery.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/generic-adc-battery.c | 2 +- + drivers/power/supply/lp8788-charger.c | 2 +- + drivers/power/supply/max14577_charger.c | 2 +- + drivers/power/supply/max17040_battery.c | 12 +- + 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 | 21 +- + 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/surface_battery.c | 865 +++++++++++++++++++++ + drivers/power/supply/surface_charger.c | 282 +++++++ + 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 +- + 130 files changed, 4354 insertions(+), 1740 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-power-surface + 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 + create mode 100644 drivers/power/supply/surface_battery.c + create mode 100644 drivers/power/supply/surface_charger.c +Merging regulator/for-next (4dd1c9530698 Merge remote-tracking branch 'regulator/for-5.13' into regulator-next) +$ git merge regulator/for-next +Already up to date. +Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) +$ git merge security/next-testing +Auto-merging security/smack/smack_lsm.c +Auto-merging security/smack/smack.h +Auto-merging security/selinux/ss/services.c +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging kernel/sys_ni.c +Auto-merging include/uapi/asm-generic/unistd.h +CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging 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 0fdbe578d8a2] Merge remote-tracking branch 'security/next-testing' +$ git diff -M --stat --summary HEAD^.. + Documentation/security/index.rst | 1 + + Documentation/security/landlock.rst | 85 + + Documentation/userspace-api/index.rst | 1 + + Documentation/userspace-api/landlock.rst | 311 +++ + 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 | 137 ++ + 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/commoncap.c | 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 | 692 ++++++ + security/landlock/fs.h | 70 + + 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 | 451 ++++ + 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 | 266 +++ + tools/testing/selftests/landlock/common.h | 183 ++ + tools/testing/selftests/landlock/config | 7 + + tools/testing/selftests/landlock/fs_test.c | 2791 ++++++++++++++++++++++++ + tools/testing/selftests/landlock/ptrace_test.c | 337 +++ + tools/testing/selftests/landlock/true.c | 5 + + 73 files changed, 6987 insertions(+), 78 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 (781a57394899 ima: ensure IMA_APPRAISE_MODSIG has necessary dependencies) +$ git merge integrity/next-integrity +Auto-merging security/integrity/ima/ima_main.c +Auto-merging init/Kconfig +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 +Auto-merging Makefile +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 36e404ba04c7] Merge remote-tracking branch 'integrity/next-integrity' +$ git diff -M --stat --summary HEAD^.. + Makefile | 6 +++--- + certs/Kconfig | 2 +- + certs/Makefile | 10 ++++++++++ + certs/system_certificates.S | 14 +++++++++++++- + certs/system_keyring.c | 26 ++++++++++++++++++++++++-- + include/keys/system_keyring.h | 7 +++++++ + init/Kconfig | 6 +++--- + security/integrity/digsig.c | 2 ++ + security/integrity/iint.c | 2 +- + security/integrity/ima/ima_main.c | 9 ++++++++- + security/integrity/ima/ima_policy.c | 2 ++ + security/integrity/ima/ima_template.c | 4 ++-- + 12 files changed, 76 insertions(+), 14 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 7c41c2f81733] Merge remote-tracking branch 'keys/keys-next' +$ git diff -M --stat --summary HEAD^.. +Merging safesetid/safesetid-next (1ca86ac1ec8d LSM: SafeSetID: Fix code specification by scripts/checkpatch.pl) +$ git merge safesetid/safesetid-next +Merge made by the 'recursive' strategy. + security/safesetid/lsm.c | 3 --- + 1 file changed, 3 deletions(-) +Merging selinux/next (e4c82eafb609 selinux: add proper NULL termination to the secclass_map permissions) +$ git merge selinux/next +Already up to date. +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 +Already up to date. +Merging tpmdd/next (aec00aa04b11 KEYS: trusted: Fix missing null return from kzalloc call) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (bf05bf16c76b Linux 5.12-rc8) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (2d471b20c55e iommu: Streamline registration interface) +$ git merge iommu/next +Auto-merging include/linux/cpuhotplug.h +Auto-merging drivers/vhost/vdpa.c +Auto-merging drivers/soc/fsl/qbman/qman_portal.c +Auto-merging drivers/misc/uacce/uacce.c +Auto-merging drivers/iommu/intel/irq_remapping.c +Auto-merging drivers/iommu/dma-iommu.c +Auto-merging drivers/gpu/drm/msm/adreno/adreno_gpu.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_iommu.c +Auto-merging arch/x86/events/amd/iommu.h +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 15 +- + .../devicetree/bindings/iommu/arm,smmu.yaml | 1 + + .../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 | 59 +- + drivers/iommu/amd/iommu.c | 201 ++---- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 247 +++++--- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 18 +- + drivers/iommu/arm/arm-smmu/arm-smmu.c | 117 +--- + drivers/iommu/arm/arm-smmu/arm-smmu.h | 2 +- + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 5 +- + drivers/iommu/dma-iommu.c | 23 +- + drivers/iommu/exynos-iommu.c | 7 +- + drivers/iommu/fsl_pamu.c | 293 +-------- + drivers/iommu/fsl_pamu.h | 12 +- + drivers/iommu/fsl_pamu_domain.c | 693 ++------------------- + drivers/iommu/fsl_pamu_domain.h | 46 -- + drivers/iommu/intel/dmar.c | 72 ++- + drivers/iommu/intel/iommu.c | 233 +++---- + drivers/iommu/intel/irq_remapping.c | 2 +- + drivers/iommu/intel/pasid.c | 75 ++- + 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 | 161 +++-- + drivers/iommu/iova.c | 96 ++- + drivers/iommu/ipmmu-vmsa.c | 6 +- + drivers/iommu/msm_iommu.c | 5 +- + drivers/iommu/mtk_iommu.c | 41 +- + drivers/iommu/mtk_iommu_v1.c | 98 +-- + drivers/iommu/of_iommu.c | 5 - + drivers/iommu/omap-iommu.c | 5 +- + drivers/iommu/rockchip-iommu.c | 5 +- + drivers/iommu/s390-iommu.c | 4 +- + drivers/iommu/sprd-iommu.c | 575 +++++++++++++++++ + drivers/iommu/sun50i-iommu.c | 5 +- + drivers/iommu/tegra-gart.c | 5 +- + drivers/iommu/tegra-smmu.c | 5 +- + drivers/iommu/virtio-iommu.c | 6 +- + 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 | 141 ++--- + include/linux/iova.h | 6 +- + include/trace/events/intel_iommu.h | 120 ---- + include/uapi/linux/iommu.h | 3 +- + 63 files changed, 2117 insertions(+), 2242 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 +Already up to date. +Merging devicetree/for-next (031cc263c037 powerpc: If kexec_build_elf_info() fails return immediately from elf64_load()) +$ git merge devicetree/for-next +Auto-merging scripts/checkpatch.pl +Auto-merging scripts/Makefile.lib +Auto-merging drivers/of/property.c +CONFLICT (content): Merge conflict in drivers/of/property.c +Auto-merging drivers/of/overlay.c +Auto-merging drivers/of/of_net.c +CONFLICT (content): Merge conflict in drivers/of/of_net.c +Auto-merging drivers/of/fdt.c +Auto-merging drivers/of/address.c +Auto-merging arch/x86/kernel/machine_kexec_64.c +Auto-merging arch/x86/kernel/crash.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 +Auto-merging Documentation/devicetree/bindings/serial/serial.yaml +Auto-merging Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.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/cpus.yaml +Auto-merging Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml +Auto-merging Documentation/devicetree/bindings/Makefile +Resolved 'drivers/of/of_net.c' using previous resolution. +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 8ba8658d76ac] Merge remote-tracking branch 'devicetree/for-next' +$ git diff -M --stat --summary HEAD^.. + 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 | 109 +++++ + .../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 | 32 +- + 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 | 8 +- + 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 | 72 ++-- + 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 | 74 ++-- + scripts/Makefile.lib | 34 +- + scripts/checkpatch.pl | 2 +- + security/integrity/ima/ima.h | 4 - + security/integrity/ima/ima_kexec.c | 9 +- + 101 files changed, 1668 insertions(+), 1457 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 (2335f556b3af dt-bindings: mailbox: qcom-ipcc: Add compatible for SC7280) +$ git merge mailbox/mailbox-for-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/mailbox/ti,secure-proxy.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mailbox/qcom-ipcc.yaml | 2 + + .../devicetree/bindings/mailbox/sprd-mailbox.yaml | 13 +- + .../bindings/mailbox/ti,secure-proxy.txt | 50 ------- + .../bindings/mailbox/ti,secure-proxy.yaml | 79 +++++++++++ + MAINTAINERS | 1 + + drivers/mailbox/Kconfig | 2 +- + drivers/mailbox/arm_mhu_db.c | 4 +- + drivers/mailbox/bcm-flexrm-mailbox.c | 4 +- + drivers/mailbox/mailbox-xgene-slimpro.c | 6 +- + drivers/mailbox/mailbox.h | 2 +- + drivers/mailbox/pcc.c | 3 +- + drivers/mailbox/pl320-ipc.c | 2 +- + drivers/mailbox/sprd-mailbox.c | 147 +++++++++++++++------ + drivers/mailbox/ti-msgmgr.c | 2 +- + 14 files changed, 212 insertions(+), 105 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mailbox/ti,secure-proxy.txt + create mode 100644 Documentation/devicetree/bindings/mailbox/ti,secure-proxy.yaml +Merging spi/for-next (cc4e1ea50bba Merge remote-tracking branch 'spi/for-5.13' into spi-linus) +$ git merge spi/for-next +Already up to date. +Merging tip/auto-latest (eb4fae8d3b9e Merge tag 'v5.12') +$ git merge tip/auto-latest +Auto-merging net/mac80211/iface.c +Auto-merging net/core/skbuff.c +Auto-merging mm/slub.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sysctl.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 kernel/kthread.c +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/lockdep.h +Auto-merging include/linux/compat.h +Auto-merging fs/debugfs/file.c +Auto-merging arch/x86/net/bpf_jit_comp.c +Auto-merging arch/x86/hyperv/mmu.c +Auto-merging arch/x86/events/amd/iommu.c +Auto-merging arch/x86/Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/kernel-parameters.rst +Merge made by the 'recursive' strategy. + Documentation/RCU/RTFP.txt | 2 +- + Documentation/admin-guide/kernel-parameters.rst | 7 + + Documentation/admin-guide/kernel-parameters.txt | 28 +- + Documentation/dev-tools/kcsan.rst | 3 + + Documentation/scheduler/sched-domains.rst | 10 +- + MAINTAINERS | 1 + + arch/arm/include/asm/spinlock.h | 2 +- + arch/m68k/kernel/signal.c | 3 + + arch/x86/Kconfig | 7 +- + arch/x86/Makefile | 8 + + arch/x86/boot/compressed/sev-es.c | 11 +- + arch/x86/crypto/Makefile | 2 - + arch/x86/crypto/aesni-intel_avx-x86_64.S | 28 +- + arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 5 +- + arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 7 +- + arch/x86/crypto/sha1_avx2_x86_64_asm.S | 8 +- + arch/x86/crypto/sha1_ni_asm.S | 8 +- + arch/x86/crypto/sha256-avx2-asm.S | 13 +- + arch/x86/crypto/sha512-avx-asm.S | 41 +- + arch/x86/crypto/sha512-avx2-asm.S | 42 +- + arch/x86/crypto/sha512-ssse3-asm.S | 41 +- + arch/x86/entry/entry_32.S | 95 +-- + arch/x86/events/amd/iommu.c | 6 +- + arch/x86/events/amd/uncore.c | 6 +- + arch/x86/events/core.c | 332 +++++++--- + arch/x86/events/intel/Makefile | 2 +- + arch/x86/events/intel/core.c | 689 ++++++++++++++++++--- + arch/x86/events/intel/cstate.c | 39 +- + arch/x86/events/intel/ds.c | 43 +- + arch/x86/events/intel/lbr.c | 19 +- + arch/x86/events/intel/p4.c | 16 +- + arch/x86/events/intel/uncore.c | 207 ++++++- + arch/x86/events/intel/uncore.h | 20 +- + arch/x86/events/intel/uncore_discovery.c | 622 +++++++++++++++++++ + arch/x86/events/intel/uncore_discovery.h | 131 ++++ + arch/x86/events/intel/uncore_snb.c | 131 ++++ + arch/x86/events/intel/uncore_snbep.c | 60 +- + arch/x86/events/msr.c | 2 + + arch/x86/events/perf_event.h | 119 +++- + arch/x86/events/rapl.c | 2 + + arch/x86/hyperv/mmu.c | 10 +- + arch/x86/include/asm/alternative.h | 17 +- + arch/x86/include/asm/asm-prototypes.h | 13 +- + arch/x86/include/asm/cpu.h | 6 + + arch/x86/include/asm/cpufeatures.h | 3 +- + arch/x86/include/asm/inat.h | 2 +- + arch/x86/include/asm/insn-eval.h | 4 +- + arch/x86/include/asm/insn.h | 46 +- + arch/x86/include/asm/intel-family.h | 52 +- + arch/x86/include/asm/jump_label.h | 16 +- + arch/x86/include/asm/kprobes.h | 21 +- + arch/x86/include/asm/msr-index.h | 3 + + arch/x86/include/asm/nops.h | 176 ++---- + arch/x86/include/asm/nospec-branch.h | 6 +- + arch/x86/include/asm/paravirt.h | 6 +- + arch/x86/include/asm/paravirt_types.h | 4 +- + arch/x86/include/asm/processor.h | 15 +- + arch/x86/include/asm/ptrace.h | 5 +- + arch/x86/include/asm/segment.h | 30 +- + 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/tlbflush.h | 48 +- + arch/x86/include/asm/trace/hyperv.h | 2 +- + arch/x86/kernel/alternative.c | 255 ++------ + arch/x86/kernel/asm-offsets_32.c | 5 - + arch/x86/kernel/cpu/amd.c | 5 - + arch/x86/kernel/cpu/common.c | 5 +- + arch/x86/kernel/cpu/hygon.c | 4 +- + arch/x86/kernel/cpu/intel.c | 16 + + arch/x86/kernel/cpu/mce/intel.c | 1 + + arch/x86/kernel/cpu/mce/severity.c | 12 +- + arch/x86/kernel/doublefault_32.c | 4 +- + arch/x86/kernel/ftrace.c | 4 +- + arch/x86/kernel/head_32.S | 18 +- + arch/x86/kernel/jump_label.c | 32 +- + arch/x86/kernel/kprobes/core.c | 596 +++++++++++------- + arch/x86/kernel/kprobes/opt.c | 9 +- + arch/x86/kernel/kvm.c | 11 +- + arch/x86/kernel/paravirt.c | 2 +- + arch/x86/kernel/setup.c | 1 - + arch/x86/kernel/setup_percpu.c | 1 - + arch/x86/kernel/sev-es.c | 63 +- + arch/x86/kernel/signal_compat.c | 5 +- + arch/x86/kernel/smpboot.c | 90 +-- + arch/x86/kernel/static_call.c | 4 +- + arch/x86/kernel/tls.c | 8 +- + arch/x86/kernel/traps.c | 10 +- + arch/x86/kernel/umip.c | 2 +- + arch/x86/kernel/uprobes.c | 8 +- + arch/x86/lib/inat.c | 2 +- + arch/x86/lib/insn-eval.c | 44 +- + arch/x86/lib/insn.c | 230 +++++-- + arch/x86/lib/retpoline.S | 65 +- + arch/x86/mm/init.c | 2 +- + arch/x86/mm/tlb.c | 176 +++--- + arch/x86/net/bpf_jit_comp.c | 10 +- + arch/x86/platform/pvh/head.S | 14 - + arch/x86/power/cpu.c | 6 +- + arch/x86/tools/insn_decoder_test.c | 10 +- + arch/x86/tools/insn_sanity.c | 8 +- + arch/x86/xen/enlighten_pv.c | 1 - + arch/x86/xen/mmu_pv.c | 11 +- + drivers/net/wireless/ath/ath10k/mac.c | 2 + + drivers/usb/usbip/usbip_common.h | 1 + + fs/debugfs/file.c | 91 +++ + fs/signalfd.c | 4 + + include/linux/compat.h | 2 + + include/linux/cpumask.h | 123 +++- + include/linux/debugfs.h | 17 + + include/linux/kcov.h | 1 + + include/linux/kcsan-checks.h | 6 + + include/linux/kcsan.h | 7 + + include/linux/lockdep.h | 20 +- + include/linux/mm.h | 4 + + include/linux/mutex.h | 4 +- + include/linux/perf_event.h | 78 ++- + include/linux/psi.h | 1 - + include/linux/psi_types.h | 3 +- + include/linux/rcu_segcblist.h | 7 +- + include/linux/rculist_nulls.h | 2 +- + include/linux/rcupdate.h | 2 +- + include/linux/rcutiny.h | 7 +- + include/linux/rcutree.h | 2 + + include/linux/rtmutex.h | 35 +- + include/linux/rwsem.h | 2 +- + include/linux/sched.h | 4 +- + include/linux/sched/sysctl.h | 9 +- + include/linux/signal.h | 2 + + include/linux/slab.h | 2 + + include/linux/smp.h | 50 +- + include/linux/static_call.h | 4 +- + include/linux/vmalloc.h | 2 +- + include/linux/ww_mutex.h | 17 +- + include/trace/events/rcu.h | 28 + + include/trace/events/xen.h | 2 +- + include/uapi/asm-generic/siginfo.h | 6 +- + include/uapi/linux/perf_event.h | 28 +- + include/uapi/linux/ptrace.h | 10 + + include/uapi/linux/signalfd.h | 4 +- + kernel/cpu.c | 210 ++++--- + kernel/events/core.c | 345 ++++++++--- + kernel/events/ring_buffer.c | 43 +- + kernel/exit.c | 1 + + kernel/fork.c | 3 +- + kernel/futex.c | 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/kthread.c | 33 +- + kernel/locking/Makefile | 2 - + kernel/locking/lockdep.c | 19 +- + 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/rcu/rcu_segcblist.c | 3 +- + kernel/rcu/rcuscale.c | 15 +- + kernel/rcu/rcutorture.c | 93 ++- + kernel/rcu/tasks.h | 40 +- + kernel/rcu/tiny.c | 40 ++ + kernel/rcu/tree.c | 169 +++-- + kernel/rcu/tree_exp.h | 1 + + kernel/rcu/tree_plugin.h | 252 +++++--- + kernel/rcu/tree_stall.h | 2 + + kernel/rseq.c | 29 +- + kernel/sched/clock.c | 2 +- + kernel/sched/core.c | 235 +++---- + kernel/sched/cpuacct.c | 2 +- + kernel/sched/cpufreq_schedutil.c | 2 +- + kernel/sched/cpupri.c | 4 +- + kernel/sched/cputime.c | 2 +- + kernel/sched/deadline.c | 12 +- + kernel/sched/debug.c | 435 +++++++------ + kernel/sched/fair.c | 380 ++++++------ + kernel/sched/features.h | 7 +- + kernel/sched/idle.c | 10 +- + kernel/sched/loadavg.c | 2 +- + kernel/sched/pelt.c | 2 +- + kernel/sched/pelt.h | 2 +- + kernel/sched/psi.c | 164 ++--- + kernel/sched/rt.c | 6 +- + kernel/sched/sched.h | 59 +- + kernel/sched/stats.c | 2 +- + kernel/sched/stats.h | 37 +- + kernel/sched/topology.c | 113 ++-- + kernel/signal.c | 72 ++- + kernel/smp.c | 464 ++++++++++---- + kernel/softirq.c | 2 +- + kernel/static_call.c | 4 +- + kernel/stop_machine.c | 1 + + kernel/sysctl.c | 94 --- + kernel/torture.c | 6 +- + kernel/up.c | 38 +- + lib/Kconfig.debug | 1 - + lib/Kconfig.kcsan | 5 +- + lib/bitmap.c | 49 +- + lib/test_bitmap.c | 46 +- + mm/slab.c | 2 + + mm/slab.h | 2 + + mm/slab_common.c | 4 + + mm/slob.c | 2 + + mm/slub.c | 2 + + mm/util.c | 3 + + mm/vmalloc.c | 2 + + 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 | 46 +- + tools/arch/x86/include/asm/nops.h | 81 +++ + tools/arch/x86/lib/inat.c | 2 +- + tools/arch/x86/lib/insn.c | 230 +++++-- + tools/include/linux/kconfig.h | 73 +++ + .../memory-model/Documentation/access-marking.txt | 479 ++++++++++++++ + tools/memory-model/Documentation/simple.txt | 1 - + tools/objtool/arch/x86/decode.c | 424 +++++++++---- + tools/objtool/arch/x86/include/arch/cfi_regs.h | 12 +- + tools/objtool/arch/x86/include/arch/special.h | 2 +- + tools/objtool/builtin-check.c | 43 +- + tools/objtool/builtin-orc.c | 5 +- + tools/objtool/check.c | 236 +++---- + tools/objtool/elf.c | 289 ++++++--- + tools/objtool/include/objtool/arch.h | 5 +- + tools/objtool/include/objtool/builtin.h | 5 +- + tools/objtool/include/objtool/check.h | 3 +- + tools/objtool/include/objtool/elf.h | 13 +- + tools/objtool/include/objtool/objtool.h | 1 + + tools/objtool/objtool.c | 65 ++ + tools/objtool/orc_gen.c | 33 +- + tools/objtool/special.c | 12 +- + 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/arch/x86/util/intel-pt.c | 6 + + tools/perf/check-headers.sh | 15 +- + .../util/intel-pt-decoder/intel-pt-insn-decoder.c | 17 +- + tools/testing/selftests/perf_events/.gitignore | 3 + + tools/testing/selftests/perf_events/Makefile | 6 + + tools/testing/selftests/perf_events/config | 1 + + .../testing/selftests/perf_events/remove_on_exec.c | 260 ++++++++ + tools/testing/selftests/perf_events/settings | 1 + + .../selftests/perf_events/sigtrap_threads.c | 210 +++++++ + 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 | 199 ++++++ + .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +- + .../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 | 98 +-- + tools/testing/selftests/rcutorture/bin/torture.sh | 2 +- + .../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 +- + .../rcutorture/configs/rcuscale/ver_functions.sh | 2 +- + .../rcutorture/configs/refscale/ver_functions.sh | 2 +- + 281 files changed, 9465 insertions(+), 4556 deletions(-) + create mode 100644 arch/x86/events/intel/uncore_discovery.c + create mode 100644 arch/x86/events/intel/uncore_discovery.h + rename kernel/kcsan/{kcsan-test.c => kcsan_test.c} (94%) + 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/include/linux/kconfig.h + create mode 100644 tools/memory-model/Documentation/access-marking.txt + create mode 100644 tools/testing/selftests/perf_events/.gitignore + create mode 100644 tools/testing/selftests/perf_events/Makefile + create mode 100644 tools/testing/selftests/perf_events/config + create mode 100644 tools/testing/selftests/perf_events/remove_on_exec.c + create mode 100644 tools/testing/selftests/perf_events/settings + create mode 100644 tools/testing/selftests/perf_events/sigtrap_threads.c + 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-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 clockevents/timers/drivers/next (8120891105ba dt-bindings: timer: nuvoton,npcm7xx: Add wpcm450-timer) +$ git merge clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (faf042d15093 Merge branch 'edac-amd64' into edac-for-next) +$ git merge edac/edac-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging irqchip/irq/irqchip-next (debf69cfd4c6 irqchip/xilinx: Expose Kconfig option for Zynq/ZynqMP) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (e1db6338d6fa ftrace: Reuse the output of the function tracer for func_repeats) +$ git merge ftrace/for-next +Auto-merging scripts/recordmcount.pl +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/trace/bpf_trace.c +CONFLICT (content): Merge conflict in kernel/trace/bpf_trace.c +Auto-merging init/main.c +Auto-merging include/trace/events/rcu.h +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. +Recorded preimage for 'kernel/trace/bpf_trace.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'kernel/trace/bpf_trace.c'. +[master 0792ad354834] 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/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 | 297 +++++++++++++++++++++++++++--- + kernel/trace/trace.h | 35 +++- + kernel/trace/trace_entries.h | 22 +++ + 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.c | 223 +++++++++++++++++++--- + kernel/trace/trace_functions_graph.c | 2 +- + kernel/trace/trace_hwlat.c | 4 +- + kernel/trace/trace_kprobe.c | 2 +- + kernel/trace/trace_output.c | 93 ++++++++-- + 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 +- + 42 files changed, 1142 insertions(+), 257 deletions(-) +Merging rcu/rcu/next (7982b0dd319f Merge branch 'clocksource.2021.04.25a' into HEAD) +$ git merge rcu/rcu/next +Auto-merging kernel/time/clocksource.c +Auto-merging include/linux/clocksource.h +Auto-merging arch/x86/kernel/tsc.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 48 +++++ + arch/x86/kernel/tsc.c | 4 +- + include/linux/clocksource.h | 7 +- + kernel/time/clocksource.c | 233 +++++++++++++++++++++++- + 4 files changed, 282 insertions(+), 10 deletions(-) +Merging kvm/next (3bf0fcd75434 KVM: selftests: Speed up set_memory_region_test) +$ git merge kvm/next +Auto-merging tools/testing/selftests/kvm/Makefile +Auto-merging kernel/time/timekeeping.c +Auto-merging kernel/time/clocksource.c +Auto-merging kernel/events/core.c +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/perf_event.h +Auto-merging include/linux/perf_event.h +Auto-merging include/linux/clocksource.h +Auto-merging drivers/irqchip/irq-gic-v3-its.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/firmware/psci/psci.c +Auto-merging drivers/crypto/ccp/sev-dev.c +Auto-merging drivers/clocksource/arm_arch_timer.c +Auto-merging arch/x86/mm/mem_encrypt_identity.c +Auto-merging arch/x86/mm/mem_encrypt.c +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/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/kvm/emulate.c +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/kernel/kvm.c +CONFLICT (content): Merge conflict in arch/x86/kernel/kvm.c +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/include/asm/cpufeatures.h +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/include/asm/kvm_ppc.h +Auto-merging arch/powerpc/include/asm/kvm_book3s.h +Auto-merging arch/mips/kvm/vz.c +CONFLICT (modify/delete): arch/mips/kvm/trap_emul.c deleted in HEAD and modified in kvm/next. Version kvm/next of arch/mips/kvm/trap_emul.c left in tree. +Auto-merging arch/mips/kvm/mmu.c +Auto-merging arch/mips/kvm/mips.c +Auto-merging arch/mips/include/asm/kvm_host.h +Auto-merging arch/arm64/mm/init.c +Auto-merging arch/arm64/kvm/vgic/vgic-mmio-v3.c +Auto-merging arch/arm64/kvm/vgic/vgic-its.c +Auto-merging arch/arm64/kvm/hyp/nvhe/Makefile +Auto-merging arch/arm64/kernel/asm-offsets.c +Auto-merging arch/arm64/include/asm/sysreg.h +Auto-merging arch/arm64/include/asm/pgtable-prot.h +Auto-merging arch/arm64/include/asm/fpsimd.h +Auto-merging arch/arm64/include/asm/el2_setup.h +Auto-merging arch/arm64/include/asm/barrier.h +Auto-merging arch/arm64/include/asm/assembler.h +Auto-merging MAINTAINERS +Auto-merging Documentation/virt/kvm/api.rst +Resolved 'arch/x86/kernel/kvm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/mips/kvm/trap_emul.c +rm 'arch/mips/kvm/trap_emul.c' +$ git commit --no-edit -v -a +[master 72621939dd4d] Merge remote-tracking branch 'kvm/next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-bus-coresight-devices-trbe | 14 + + Documentation/admin-guide/cgroup-v1/index.rst | 1 + + Documentation/admin-guide/cgroup-v1/misc.rst | 4 + + Documentation/admin-guide/cgroup-v2.rst | 73 +- + Documentation/devicetree/bindings/arm/ete.yaml | 75 ++ + Documentation/devicetree/bindings/arm/trbe.yaml | 49 + + Documentation/trace/coresight/coresight-trbe.rst | 38 + + Documentation/virt/kvm/amd-memory-encryption.rst | 143 +++ + Documentation/virt/kvm/api.rst | 214 +++- + 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 +- + Documentation/virt/kvm/locking.rst | 49 +- + Documentation/virt/kvm/s390-diag.rst | 33 + + MAINTAINERS | 6 +- + arch/arm/include/asm/hypervisor.h | 3 + + 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 | 55 +- + 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 | 59 +- + 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 | 220 +++- + arch/arm64/kvm/debug.c | 118 +- + arch/arm64/kvm/fpsimd.c | 26 +- + arch/arm64/kvm/guest.c | 11 +- + 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 | 51 + + 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 | 254 +++-- + arch/arm64/kvm/perf.c | 7 +- + arch/arm64/kvm/pmu-emul.c | 2 +- + arch/arm64/kvm/pmu.c | 8 +- + arch/arm64/kvm/reset.c | 51 +- + arch/arm64/kvm/sys_regs.c | 16 + + arch/arm64/kvm/trace_arm.h | 66 -- + 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 | 7 +- + 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 + + arch/mips/include/asm/kvm_host.h | 17 +- + arch/mips/kvm/mips.c | 21 +- + arch/mips/kvm/mmu.c | 100 +- + arch/mips/kvm/vz.c | 19 +- + arch/powerpc/include/asm/kvm_book3s.h | 12 +- + arch/powerpc/include/asm/kvm_host.h | 7 - + arch/powerpc/include/asm/kvm_ppc.h | 9 +- + arch/powerpc/kvm/book3s.c | 18 +- + arch/powerpc/kvm/book3s.h | 10 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 98 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 25 +- + arch/powerpc/kvm/book3s_hv.c | 12 +- + arch/powerpc/kvm/book3s_pr.c | 56 +- + arch/powerpc/kvm/e500_mmu_host.c | 29 +- + arch/powerpc/kvm/trace_booke.h | 15 - + arch/s390/include/asm/kvm_host.h | 5 + + 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 | 15 +- + arch/s390/kvm/kvm-s390.h | 8 + + arch/s390/kvm/vsie.c | 109 +- + arch/sh/kernel/perf_event.c | 18 - + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/kvm_host.h | 67 +- + arch/x86/include/asm/mem_encrypt.h | 1 - + arch/x86/include/asm/svm.h | 4 +- + arch/x86/include/asm/vmx.h | 1 + + arch/x86/include/uapi/asm/vmx.h | 1 + + arch/x86/kernel/kvm.c | 128 +-- + arch/x86/kvm/Makefile | 2 + + arch/x86/kvm/cpuid.c | 98 +- + arch/x86/kvm/cpuid.h | 155 +-- + arch/x86/kvm/emulate.c | 80 +- + arch/x86/kvm/kvm_cache_regs.h | 19 +- + arch/x86/kvm/lapic.c | 8 +- + arch/x86/kvm/mmu.h | 23 +- + arch/x86/kvm/mmu/mmu.c | 637 ++++++----- + arch/x86/kvm/mmu/mmu_audit.c | 2 +- + arch/x86/kvm/mmu/mmu_internal.h | 44 +- + 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 | 740 +++++++------ + arch/x86/kvm/mmu/tdp_mmu.h | 51 +- + arch/x86/kvm/reverse_cpuid.h | 186 ++++ + arch/x86/kvm/svm/avic.c | 24 +- + arch/x86/kvm/svm/nested.c | 573 ++++++---- + arch/x86/kvm/svm/sev.c | 990 +++++++++++++---- + arch/x86/kvm/svm/svm.c | 1107 +++++++++---------- + arch/x86/kvm/svm/svm.h | 92 +- + arch/x86/kvm/svm/vmenter.S | 47 +- + arch/x86/kvm/vmx/nested.c | 83 +- + arch/x86/kvm/vmx/nested.h | 5 + + arch/x86/kvm/vmx/sgx.c | 502 +++++++++ + arch/x86/kvm/vmx/sgx.h | 34 + + arch/x86/kvm/vmx/vmcs12.c | 1 + + arch/x86/kvm/vmx/vmcs12.h | 4 +- + arch/x86/kvm/vmx/vmx.c | 432 ++++---- + arch/x86/kvm/vmx/vmx.h | 39 +- + arch/x86/kvm/vmx/vmx_ops.h | 4 + + arch/x86/kvm/x86.c | 214 +++- + arch/x86/kvm/x86.h | 18 +- + arch/x86/mm/mem_encrypt.c | 10 +- + arch/x86/mm/mem_encrypt_identity.c | 1 - + drivers/clocksource/arm_arch_timer.c | 36 + + drivers/crypto/ccp/sev-dev.c | 193 ++-- + drivers/crypto/ccp/sev-dev.h | 4 +- + 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/perf/arm_pmu.c | 30 - + drivers/ptp/Kconfig | 2 +- + drivers/ptp/Makefile | 2 + + drivers/ptp/ptp_kvm_arm.c | 28 + + drivers/ptp/{ptp_kvm.c => ptp_kvm_common.c} | 85 +- + drivers/ptp/ptp_kvm_x86.c | 97 ++ + include/kvm/arm_pmu.h | 4 + + include/kvm/arm_vgic.h | 1 + + include/linux/arm-smccc.h | 41 + + include/linux/bug.h | 10 + + include/linux/cgroup_subsys.h | 4 + + include/linux/clocksource.h | 6 + + include/linux/clocksource_ids.h | 12 + + include/linux/coresight.h | 13 + + include/linux/kvm_host.h | 24 +- + include/linux/misc_cgroup.h | 132 +++ + include/linux/perf_event.h | 2 - + include/linux/psp-sev.h | 18 +- + include/linux/ptp_kvm.h | 19 + + include/linux/timekeeping.h | 12 +- + include/trace/events/kvm.h | 90 +- + include/uapi/linux/kvm.h | 45 + + include/uapi/linux/perf_event.h | 13 +- + init/Kconfig | 14 + + kernel/cgroup/Makefile | 1 + + kernel/cgroup/misc.c | 407 +++++++ + kernel/events/core.c | 5 - + kernel/time/clocksource.c | 2 + + kernel/time/timekeeping.c | 1 + + lib/bug.c | 54 +- + tools/include/asm-generic/hugetlb_encode.h | 3 + + tools/testing/selftests/kvm/.gitignore | 2 + + tools/testing/selftests/kvm/Makefile | 4 + + tools/testing/selftests/kvm/aarch64/vgic_init.c | 551 ++++++++++ + tools/testing/selftests/kvm/dirty_log_test.c | 69 +- + tools/testing/selftests/kvm/include/kvm_util.h | 13 +- + tools/testing/selftests/kvm/include/test_util.h | 21 +- + tools/testing/selftests/kvm/kvm_page_table_test.c | 506 +++++++++ + tools/testing/selftests/kvm/lib/assert.c | 4 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 138 ++- + tools/testing/selftests/kvm/lib/test_util.c | 163 ++- + .../testing/selftests/kvm/set_memory_region_test.c | 61 +- + .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 2 +- + virt/kvm/coalesced_mmio.c | 19 +- + virt/kvm/kvm_main.c | 303 +++-- + 224 files changed, 13141 insertions(+), 4033 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-coresight-devices-trbe + create mode 100644 Documentation/admin-guide/cgroup-v1/misc.rst + 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 arch/x86/kvm/reverse_cpuid.h + create mode 100644 arch/x86/kvm/vmx/sgx.c + create mode 100644 arch/x86/kvm/vmx/sgx.h + 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/misc_cgroup.h + create mode 100644 include/linux/ptp_kvm.h + create mode 100644 kernel/cgroup/misc.c + create mode 100644 tools/testing/selftests/kvm/aarch64/vgic_init.c + create mode 100644 tools/testing/selftests/kvm/kvm_page_table_test.c +Merging kvm-arm/next (9a8aae605b80 Merge branch 'kvm-arm64/kill_oprofile_dependency' into kvmarm-master/next) +$ git merge kvm-arm/next +Already up to date. +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 (44bada282190 KVM: s390: fix guarded storage control register handling) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (f5079a9a2a31 xen/arm: introduce XENFEAT_direct_mapped and XENFEAT_not_direct_mapped) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (bd0d09ebd4f8 Merge branch 'for-5.12-fixes' 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 (e7882cd7aebe platform/x86: gigabyte-wmi: add support for B550M AORUS PRO-P) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (d61b3f9b91be platform/chrome: cros_ec_lpc: Use DEFINE_MUTEX() for mutex lock) +$ git merge chrome-platform/for-next +Auto-merging include/linux/platform_data/cros_ec_commands.h +Merge made by the 'recursive' strategy. + drivers/platform/chrome/cros_ec_lpc_mec.c | 3 +- + drivers/platform/chrome/cros_ec_typec.c | 47 +++++++++++++++++++------- + drivers/platform/chrome/cros_usbpd_notify.c | 3 +- + drivers/platform/chrome/wilco_ec/telemetry.c | 2 +- + include/linux/platform_data/cros_ec_commands.h | 1 + + 5 files changed, 39 insertions(+), 17 deletions(-) +Merging hsi/for-next (5c08b0f75575 HSI: core: fix resource leaks in hsi_add_client_from_dt()) +$ git merge hsi/for-next +Merge made by the 'recursive' strategy. + drivers/hsi/hsi_core.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging leds/for-next (23a700455a1b leds: pca9532: Assign gpio base dynamically) +$ git merge leds/for-next +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2efd870256d3] Merge remote-tracking branch 'leds/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/leds/leds-rt4505.yaml | 57 +++ + drivers/leds/Kconfig | 7 +- + drivers/leds/Makefile | 2 +- + drivers/leds/blink/Kconfig | 33 +- + drivers/leds/blink/Makefile | 2 +- + drivers/leds/blink/leds-lgm-sso.c | 2 +- + drivers/leds/flash/Kconfig | 11 + + drivers/leds/flash/Makefile | 1 + + drivers/leds/flash/leds-rt4505.c | 430 +++++++++++++++++++++ + drivers/leds/leds-lm3642.c | 4 +- + drivers/leds/leds-pca9532.c | 2 + + drivers/leds/trigger/ledtrig-pattern.c | 2 +- + 12 files changed, 525 insertions(+), 28 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 (4a0225c3d208 Merge tag 'spi-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (4a0225c3d208 Merge tag 'spi-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge usb/usb-next +Already up to date. +Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (039b81d50a48 USB: cdc-acm: add more Maxlinear/Exar models to ignore list) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/for-usb-next (10076de33b5e usb: cdnsp: Fixes issue with Configure Endpoint command) +$ git merge usb-chipidea-next/for-usb-next +Already up to date. +Merging tty/tty-next (4a0225c3d208 Merge tag 'spi-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (8e3a3249502d Merge tag 'char-misc-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (7b1222b224af extcon: qcom-spmi: Add support for VBUS detection) +$ git merge extcon/extcon-next +Already up to date. +Merging phy-next/next (8a6b85b14f08 phy: Revert "phy: ti: j721e-wiz: add missing of_node_put") +$ git merge phy-next/next +Merge made by the 'recursive' strategy. +Merging soundwire/next (14968dd36a50 soundwire: intel_init: test link->cdns) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (6f3badead6a0 thunderbolt: Hide authorized attribute if router does not support PCIe tunnels) +$ git merge thunderbolt/next +Already up to date. +Merging vfio/next (adaeb718d46f vfio/gvt: fix DRM_I915_GVT dependency on VFIO_MDEV) +$ git merge vfio/next +Auto-merging drivers/vfio/vfio_iommu_type1.c +Removing drivers/vfio/pci/vfio_pci_nvlink2.c +Auto-merging drivers/vfio/pci/vfio_pci.c +Auto-merging drivers/s390/crypto/vfio_ap_ops.c +Auto-merging drivers/gpu/drm/i915/gvt/kvmgt.c +Auto-merging drivers/gpu/drm/i915/gvt/gvt.h +Auto-merging drivers/gpu/drm/i915/gvt/gvt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/gvt.c +Resolved 'drivers/gpu/drm/i915/gvt/gvt.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 15faf5b22df8] Merge remote-tracking branch 'vfio/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/driver-api/vfio-mediated-device.rst | 9 +- + Documentation/driver-api/vfio.rst | 48 +- + drivers/gpu/drm/i915/Kconfig | 1 + + drivers/gpu/drm/i915/gvt/gvt.c | 41 +- + drivers/gpu/drm/i915/gvt/gvt.h | 4 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 7 +- + drivers/s390/cio/vfio_ccw_ops.c | 17 +- + drivers/s390/crypto/vfio_ap_ops.c | 14 +- + drivers/vfio/fsl-mc/vfio_fsl_mc.c | 127 ++++-- + drivers/vfio/fsl-mc/vfio_fsl_mc_private.h | 1 + + drivers/vfio/mdev/mdev_core.c | 174 +++----- + drivers/vfio/mdev/mdev_driver.c | 19 +- + drivers/vfio/mdev/mdev_private.h | 39 +- + drivers/vfio/mdev/mdev_sysfs.c | 59 ++- + drivers/vfio/mdev/vfio_mdev.c | 80 ++-- + 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 | 40 +- + include/linux/mdev.h | 80 +++- + include/linux/vfio.h | 37 +- + include/uapi/linux/vfio.h | 38 +- + samples/vfio-mdev/mbochs.c | 55 ++- + samples/vfio-mdev/mdpy.c | 56 ++- + samples/vfio-mdev/mtty.c | 66 +-- + 35 files changed, 793 insertions(+), 1361 deletions(-) + delete mode 100644 drivers/vfio/pci/vfio_pci_nvlink2.c +Merging staging/staging-next (4a0225c3d208 Merge tag 'spi-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge staging/staging-next +Already up to date. +Merging iio/togreg (6470a8206a10 Merge tag 'iio-for-5.13b-take2' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next) +$ git merge iio/togreg +Already up to date. +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 (c1de07884f2b Merge branch 'icc-sm8350' into icc-next) +$ git merge icc/icc-next +Already up to date. +Merging dmaengine/next (0bde4444ec44 dmaengine: idxd: Enable IDXD performance monitor support) +$ git merge dmaengine/next +Auto-merging include/linux/pci.h +Auto-merging include/linux/cpuhotplug.h +Auto-merging drivers/pci/pci.c +Auto-merging drivers/dma/Kconfig +Auto-merging Documentation/devicetree/bindings/dma/qcom,gpi.yaml +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-event_source-devices-dsa | 30 + + .../devicetree/bindings/dma/qcom,gpi.yaml | 1 + + drivers/dma/Kconfig | 12 + + drivers/dma/at_xdmac.c | 11 - + 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/idxd/Makefile | 2 + + drivers/dma/idxd/cdev.c | 132 ++-- + drivers/dma/idxd/device.c | 283 +++++++- + drivers/dma/idxd/dma.c | 77 +- + drivers/dma/idxd/idxd.h | 168 ++++- + drivers/dma/idxd/init.c | 485 +++++++++---- + drivers/dma/idxd/irq.c | 29 +- + drivers/dma/idxd/perfmon.c | 662 ++++++++++++++++++ + drivers/dma/idxd/perfmon.h | 119 ++++ + drivers/dma/idxd/registers.h | 120 +++- + drivers/dma/idxd/submit.c | 42 +- + drivers/dma/idxd/sysfs.c | 776 +++++++++------------ + drivers/dma/k3dma.c | 4 +- + drivers/dma/qcom/gpi.c | 1 + + drivers/dma/qcom/hidma.c | 6 - + drivers/dma/xilinx/xilinx_dma.c | 8 + + drivers/pci/pci.c | 30 + + include/linux/cpuhotplug.h | 1 + + include/linux/pci.h | 1 + + 31 files changed, 3030 insertions(+), 1136 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-event_source-devices-dsa + create mode 100644 drivers/dma/idxd/perfmon.c + create mode 100644 drivers/dma/idxd/perfmon.h +Merging cgroup/for-next (ffeee417d97f cgroup: use tsk->in_iowait instead of delayacct_is_task_waiting_on_io()) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. + include/linux/misc_cgroup.h | 2 +- + kernel/cgroup/cgroup-v1.c | 2 +- + kernel/cgroup/cpuset.c | 6 +++--- + 3 files changed, 5 insertions(+), 5 deletions(-) +Merging scsi/for-next (755e78ccbb07 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Merge made by the 'recursive' strategy. + drivers/target/iscsi/iscsi_target.c | 1 - + 1 file changed, 1 deletion(-) +Merging scsi-mkp/for-next (85367040511f scsi: blk-mq: Fix build warning when making htmldocs) +$ git merge scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (8a5c3eb99b23 virtio_net: move txq wakeups under tx q lock) +$ git merge vhost/linux-next +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/Makefile +Merge made by the 'recursive' strategy. + drivers/Makefile | 1 + + drivers/block/virtio_blk.c | 76 ++++++- + drivers/net/virtio_net.c | 35 ++- + drivers/vdpa/Kconfig | 7 + + drivers/vdpa/Makefile | 1 + + drivers/vdpa/mlx5/net/mlx5_vnet.c | 79 ++++++- + drivers/vdpa/vdpa.c | 12 +- + drivers/vdpa/virtio_pci/Makefile | 2 + + drivers/vdpa/virtio_pci/vp_vdpa.c | 458 ++++++++++++++++++++++++++++++++++++++ + drivers/virtio/virtio_balloon.c | 2 +- + drivers/virtio/virtio_ring.c | 26 ++- + include/linux/vdpa.h | 38 ++-- + include/uapi/linux/virtio_blk.h | 11 + + 13 files changed, 706 insertions(+), 42 deletions(-) + create mode 100644 drivers/vdpa/virtio_pci/Makefile + create mode 100644 drivers/vdpa/virtio_pci/vp_vdpa.c +Merging rpmsg/for-next (dc0e14fa833b Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Removing drivers/hwspinlock/sirf_hwspinlock.c +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,adsp.txt | 4 + + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 15 + + .../bindings/remoteproc/qcom,wcnss-pil.txt | 6 + + .../bindings/remoteproc/st,stm32-rproc.yaml | 11 +- + drivers/hwspinlock/Kconfig | 11 - + drivers/hwspinlock/Makefile | 1 - + drivers/hwspinlock/sirf_hwspinlock.c | 105 ---- + drivers/remoteproc/Kconfig | 7 +- + drivers/remoteproc/imx_rproc.c | 322 ++++++++++- + 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 | 47 +- + drivers/remoteproc/qcom_q6v5_adsp.c | 2 +- + drivers/remoteproc/qcom_q6v5_mss.c | 26 +- + drivers/remoteproc/qcom_q6v5_pas.c | 19 +- + drivers/remoteproc/qcom_q6v5_wcss.c | 599 +++++++++++++++++++-- + 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 | 205 +++---- + 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, 1678 insertions(+), 452 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 (edc510855d96 gpio: sim: Fix dereference of free'd pointer config) +$ git merge gpio-brgl/gpio/for-next +Auto-merging lib/bitmap.c +Auto-merging kernel/irq/irqdomain.c +Auto-merging include/linux/irqdomain.h +Auto-merging drivers/gpio/gpio-omap.c +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Removing Documentation/devicetree/bindings/gpio/gpio-74x164.txt +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/fairchild,74hc595.yaml | 77 ++ + .../devicetree/bindings/gpio/gpio-74x164.txt | 27 - + .../bindings/gpio/realtek,otto-gpio.yaml | 78 ++ + .../bindings/gpio/rockchip,gpio-bank.yaml | 82 ++ + .../bindings/pinctrl/rockchip,pinctrl.txt | 58 +- + Documentation/driver-api/gpio/consumer.rst | 2 +- + Documentation/driver-api/gpio/drivers-on-gpio.rst | 6 + + Documentation/filesystems/configfs.rst | 6 +- + drivers/gpio/Kconfig | 32 +- + drivers/gpio/Makefile | 2 + + drivers/gpio/gpio-104-dio-48e.c | 50 +- + drivers/gpio/gpio-aggregator.c | 39 +- + drivers/gpio/gpio-ich.c | 2 - + drivers/gpio/gpio-it87.c | 8 - + drivers/gpio/gpio-mockup.c | 9 +- + drivers/gpio/gpio-mpc8xxx.c | 47 +- + drivers/gpio/gpio-mxs.c | 5 - + drivers/gpio/gpio-omap.c | 5 +- + drivers/gpio/gpio-realtek-otto.c | 325 ++++++++ + drivers/gpio/gpio-sch.c | 198 ++++- + drivers/gpio/gpio-sim.c | 877 +++++++++++++++++++++ + drivers/gpio/gpiolib-acpi.c | 21 + + 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 ++++++ + 46 files changed, 2781 insertions(+), 372 deletions(-) + create mode 100644 Documentation/admin-guide/gpio/gpio-sim.rst + create mode 100644 Documentation/devicetree/bindings/gpio/fairchild,74hc595.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-74x164.txt + create mode 100644 Documentation/devicetree/bindings/gpio/realtek,otto-gpio.yaml + create mode 100644 Documentation/devicetree/bindings/gpio/rockchip,gpio-bank.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 +Already up to date. +Merging pinctrl/for-next (835109266494 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Auto-merging include/linux/gpio/driver.h +Auto-merging include/linux/firmware/xlnx-zynqmp.h +Auto-merging drivers/soc/tegra/pmc.c +Auto-merging drivers/firmware/xilinx/zynqmp.c +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt +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 +++ + .../bindings/pinctrl/ingenic,pinctrl.yaml | 23 +- + .../bindings/pinctrl/pinctrl-mt8195.yaml | 151 ++ + .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 14 + + .../bindings/pinctrl/rockchip,pinctrl.txt | 1 + + .../bindings/pinctrl/xlnx,zynqmp-pinctrl.yaml | 336 ++++ + Documentation/driver-api/gpio/legacy.rst | 2 +- + Documentation/driver-api/index.rst | 2 +- + .../driver-api/{pinctl.rst => pin-control.rst} | 39 +- + MAINTAINERS | 2 +- + arch/arm64/Kconfig.platforms | 2 - + drivers/firmware/xilinx/zynqmp.c | 114 ++ + drivers/gpio/gpio-regmap.c | 5 + + drivers/pinctrl/Kconfig | 21 +- + drivers/pinctrl/Makefile | 1 + + 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 | 39 +- + drivers/pinctrl/freescale/pinctrl-imx1.c | 1 + + drivers/pinctrl/freescale/pinctrl-imx25.c | 3 +- + drivers/pinctrl/freescale/pinctrl-imx27.c | 3 +- + drivers/pinctrl/freescale/pinctrl-imx35.c | 1 + + drivers/pinctrl/freescale/pinctrl-imx50.c | 3 +- + drivers/pinctrl/freescale/pinctrl-imx51.c | 1 + + drivers/pinctrl/freescale/pinctrl-imx53.c | 1 + + drivers/pinctrl/freescale/pinctrl-imx6dl.c | 1 + + drivers/pinctrl/freescale/pinctrl-imx6q.c | 1 + + drivers/pinctrl/freescale/pinctrl-imx6sl.c | 1 + + drivers/pinctrl/freescale/pinctrl-imx6sll.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx6sx.c | 3 +- + drivers/pinctrl/freescale/pinctrl-imx6ul.c | 3 +- + drivers/pinctrl/freescale/pinctrl-imx7d.c | 3 +- + drivers/pinctrl/freescale/pinctrl-imx7ulp.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx8dxl.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx8mm.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx8mn.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx8mp.c | 3 +- + drivers/pinctrl/freescale/pinctrl-imx8mq.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx8qm.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx8qxp.c | 2 +- + drivers/pinctrl/freescale/pinctrl-vf610.c | 1 + + drivers/pinctrl/intel/pinctrl-intel.c | 5 +- + drivers/pinctrl/mediatek/Kconfig | 6 + + drivers/pinctrl/mediatek/Makefile | 1 + + drivers/pinctrl/mediatek/pinctrl-moore.c | 2 + + drivers/pinctrl/mediatek/pinctrl-mt8195.c | 850 ++++++++++ + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 19 + + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h | 7 + + drivers/pinctrl/mediatek/pinctrl-mtk-mt8195.h | 1669 ++++++++++++++++++++ + drivers/pinctrl/mediatek/pinctrl-paris.c | 2 + + drivers/pinctrl/mvebu/pinctrl-armada-cp110.c | 4 +- + drivers/pinctrl/pinconf-generic.c | 6 +- + drivers/pinctrl/pinconf.c | 4 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 8 +- + drivers/pinctrl/pinctrl-equilibrium.c | 16 +- + drivers/pinctrl/pinctrl-ingenic.c | 1649 +++++++++++++++++-- + drivers/pinctrl/pinctrl-k210.c | 1 - + drivers/pinctrl/pinctrl-lpc18xx.c | 4 +- + drivers/pinctrl/pinctrl-rockchip.c | 956 +++++------ + drivers/pinctrl/pinctrl-single.c | 71 +- + drivers/pinctrl/pinctrl-zynq.c | 4 +- + drivers/pinctrl/pinctrl-zynqmp.c | 906 +++++++++++ + drivers/pinctrl/pinmux.c | 106 +- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 4 +- + drivers/pinctrl/qcom/Kconfig | 4 +- + 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 | 7 + + 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/samsung/pinctrl-exynos.c | 10 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 18 +- + drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 7 +- + drivers/soc/tegra/pmc.c | 4 +- + include/dt-bindings/pinctrl/mt8195-pinfunc.h | 962 +++++++++++ + include/dt-bindings/pinctrl/pinctrl-zynqmp.h | 19 + + include/linux/firmware/xlnx-zynqmp.h | 90 ++ + include/linux/gpio/driver.h | 9 + + include/linux/gpio/regmap.h | 4 + + include/linux/pinctrl/pinconf-generic.h | 10 +- + kernel/irq/generic-chip.c | 1 + + 121 files changed, 13667 insertions(+), 1076 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 + create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-mt8195.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/xlnx,zynqmp-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 + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt8195.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt8195.h + create mode 100644 drivers/pinctrl/pinctrl-zynqmp.c + create mode 100644 include/dt-bindings/pinctrl/mt8195-pinfunc.h + create mode 100644 include/dt-bindings/pinctrl/pinctrl-zynqmp.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 (a6efb35019d0 pwm: Reword docs about pwm_apply_state()) +$ git merge pwm/for-next +Auto-merging drivers/pwm/Makefile +Auto-merging drivers/pwm/Kconfig +Auto-merging arch/arm64/boot/dts/rockchip/rk3399.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk3368.dtsi +Removing Documentation/devicetree/bindings/pwm/pwm-rockchip.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/pwm-rockchip.txt | 27 -- + .../devicetree/bindings/pwm/pwm-rockchip.yaml | 100 +++++++ + .../bindings/pwm/toshiba,pwm-visconti.yaml | 43 +++ + Documentation/driver-api/pwm.rst | 6 +- + arch/arm/boot/dts/rk3036.dtsi | 4 - + arch/arm/boot/dts/rk3288.dtsi | 4 - + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 4 - + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 - + drivers/pwm/Kconfig | 9 + + drivers/pwm/Makefile | 1 + + 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 | 30 +- + drivers/pwm/pwm-bcm-iproc.c | 5 +- + drivers/pwm/pwm-bcm-kona.c | 8 +- + drivers/pwm/pwm-bcm2835.c | 40 ++- + 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 | 5 +- + drivers/pwm/pwm-lpc32xx.c | 5 - + drivers/pwm/pwm-lpss.c | 7 - + drivers/pwm/pwm-mediatek.c | 7 - + 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 | 303 +++++++++------------ + 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 | 7 +- + 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-visconti.c | 190 +++++++++++++ + drivers/pwm/pwm-vt8500.c | 1 - + include/linux/pwm.h | 7 +- + 67 files changed, 619 insertions(+), 395 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-rockchip.txt + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-rockchip.yaml + create mode 100644 Documentation/devicetree/bindings/pwm/toshiba,pwm-visconti.yaml + create mode 100644 drivers/pwm/pwm-visconti.c +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 +Auto-merging tools/testing/selftests/lib.mk +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 (9b9310445f5a rtc: ds1511: remove unused function) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml | 62 ++++++++++ + drivers/rtc/Kconfig | 3 +- + drivers/rtc/rtc-ab-eoz9.c | 135 ++++++++++++++++++++- + drivers/rtc/rtc-ds1511.c | 6 - + drivers/rtc/rtc-fsl-ftm-alarm.c | 1 + + drivers/rtc/rtc-imxdi.c | 4 +- + drivers/rtc/rtc-m48t59.c | 2 +- + drivers/rtc/rtc-mxc.c | 2 +- + drivers/rtc/rtc-pcf85063.c | 7 +- + drivers/rtc/rtc-pm8xxx.c | 11 ++ + drivers/rtc/rtc-rv3028.c | 4 +- + drivers/rtc/rtc-rx6110.c | 7 ++ + drivers/rtc/rtc-spear.c | 6 +- + drivers/rtc/rtc-tps65910.c | 1 + + 14 files changed, 229 insertions(+), 22 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml +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 +Already up to date. +Merging kspp/for-next/kspp (f4648c741299 Merge branch 'for-next/overflow' into for-next/kspp) +$ git merge kspp/for-next/kspp +Already up to date! +Merge made by the 'recursive' strategy. +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 674d70815622] 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 (e8405ad55f4c nvmem: sprd: Add missing MODULE_DEVICE_TABLE) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. + drivers/nvmem/sprd-efuse.c | 1 + + 1 file changed, 1 insertion(+) +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 (753ed9c95c37 drivers: hv: Create a consistent pattern for checking Hyper-V hypercall status) +$ git merge hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (701454bce906 auxdisplay: Remove in_interrupt() usage.) +$ git merge auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (83fa2d13d628 kdb: Refactor env variables get/set code) +$ 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 | 588 +++++++++++++++++++++++------------------ + kernel/debug/kdb/kdb_private.h | 5 +- + kernel/debug/kdb/kdb_support.c | 18 -- + 5 files changed, 381 insertions(+), 309 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 +Already up to date. +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 +Already up to date. +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 (a503d1628c9c bus: mhi: fix typo in comments for struct mhi_channel_config) +$ git merge mhi/mhi-next +Already up to date. +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 (ac8b8400620a 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 (fef0214731cc rust: allow printing in the kernel crate) +$ git merge rust/rust-next +Auto-merging scripts/kconfig/confdata.c +Auto-merging scripts/Makefile.lib +Auto-merging scripts/Makefile.build +Auto-merging samples/Makefile +Auto-merging samples/Kconfig +Auto-merging lib/Kconfig.debug +Auto-merging kernel/printk/printk.c +CONFLICT (content): Merge conflict in kernel/printk/printk.c +Auto-merging kernel/kallsyms.c +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/android/binder.h +CONFLICT (content): Merge conflict in include/uapi/linux/android/binder.h +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. +Resolved 'include/uapi/linux/android/binder.h' using previous resolution. +Resolved 'kernel/printk/printk.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master cb1dc41a4b9e] Merge remote-tracking branch 'rust/rust-next' +$ git diff -M --stat --summary HEAD^.. + .gitignore | 5 + + .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 | 32 ++ + Documentation/rust/coding.rst | 92 ++++ + Documentation/rust/docs.rst | 109 ++++ + Documentation/rust/index.rst | 20 + + Documentation/rust/quick-start.rst | 220 ++++++++ + Documentation/rust/rust-project.json | 35 ++ + MAINTAINERS | 14 + + Makefile | 147 ++++- + arch/arm/rust/target.json | 28 + + arch/arm64/rust/target.json | 40 ++ + arch/powerpc/rust/target.json | 30 ++ + arch/x86/rust/target.json | 42 ++ + drivers/android/Kconfig | 7 + + drivers/android/Makefile | 2 + + drivers/android/allocation.rs | 252 +++++++++ + drivers/android/context.rs | 80 +++ + drivers/android/defs.rs | 92 ++++ + drivers/android/node.rs | 479 +++++++++++++++++ + drivers/android/process.rs | 950 +++++++++++++++++++++++++++++++++ + drivers/android/range_alloc.rs | 191 +++++++ + drivers/android/rust_binder.rs | 128 +++++ + drivers/android/thread.rs | 821 ++++++++++++++++++++++++++++ + drivers/android/transaction.rs | 206 +++++++ + include/linux/kallsyms.h | 2 +- + include/linux/spinlock.h | 17 +- + include/uapi/linux/android/binder.h | 28 +- + init/Kconfig | 27 + + kernel/kallsyms.c | 7 + + kernel/livepatch/core.c | 4 +- + kernel/printk/printk.c | 1 + + lib/Kconfig.debug | 106 ++++ + rust/.gitignore | 5 + + rust/Makefile | 152 ++++++ + rust/compiler_builtins.rs | 156 ++++++ + rust/exports.c | 16 + + rust/helpers.c | 94 ++++ + rust/kernel/allocator.rs | 68 +++ + rust/kernel/bindings.rs | 22 + + rust/kernel/bindings_helper.h | 18 + + rust/kernel/buffer.rs | 39 ++ + rust/kernel/c_types.rs | 133 +++++ + rust/kernel/chrdev.rs | 162 ++++++ + rust/kernel/error.rs | 106 ++++ + rust/kernel/file_operations.rs | 674 +++++++++++++++++++++++ + rust/kernel/lib.rs | 204 +++++++ + rust/kernel/linked_list.rs | 245 +++++++++ + rust/kernel/miscdev.rs | 109 ++++ + rust/kernel/module_param.rs | 497 +++++++++++++++++ + rust/kernel/pages.rs | 173 ++++++ + rust/kernel/prelude.rs | 22 + + rust/kernel/print.rs | 463 ++++++++++++++++ + rust/kernel/random.rs | 50 ++ + rust/kernel/raw_list.rs | 361 +++++++++++++ + rust/kernel/static_assert.rs | 38 ++ + rust/kernel/sync/arc.rs | 184 +++++++ + rust/kernel/sync/condvar.rs | 136 +++++ + rust/kernel/sync/guard.rs | 82 +++ + rust/kernel/sync/locked_by.rs | 112 ++++ + rust/kernel/sync/mod.rs | 85 +++ + 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 | 282 ++++++++++ + rust/module.rs | 764 ++++++++++++++++++++++++++ + samples/Kconfig | 2 + + samples/Makefile | 1 + + samples/rust/Kconfig | 113 ++++ + samples/rust/Makefile | 12 + + samples/rust/rust_chrdev.rs | 55 ++ + samples/rust/rust_minimal.rs | 40 ++ + samples/rust/rust_miscdev.rs | 145 +++++ + samples/rust/rust_module_parameters.rs | 72 +++ + samples/rust/rust_print.rs | 58 ++ + samples/rust/rust_random.rs | 60 +++ + samples/rust/rust_semaphore.rs | 176 ++++++ + samples/rust/rust_semaphore_c.c | 212 ++++++++ + samples/rust/rust_stack_probing.rs | 42 ++ + samples/rust/rust_sync.rs | 84 +++ + scripts/Makefile.build | 19 + + scripts/Makefile.lib | 12 + + scripts/dummy-tools/elfedit | 1 + + 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 +- + 95 files changed, 11357 insertions(+), 48 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 Documentation/rust/rust-project.json + create mode 100644 arch/arm/rust/target.json + 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/android/allocation.rs + create mode 100644 drivers/android/context.rs + create mode 100644 drivers/android/defs.rs + create mode 100644 drivers/android/node.rs + create mode 100644 drivers/android/process.rs + create mode 100644 drivers/android/range_alloc.rs + create mode 100644 drivers/android/rust_binder.rs + create mode 100644 drivers/android/thread.rs + create mode 100644 drivers/android/transaction.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/linked_list.rs + create mode 100644 rust/kernel/miscdev.rs + create mode 100644 rust/kernel/module_param.rs + create mode 100644 rust/kernel/pages.rs + create mode 100644 rust/kernel/prelude.rs + create mode 100644 rust/kernel/print.rs + create mode 100644 rust/kernel/random.rs + create mode 100644 rust/kernel/raw_list.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 100644 samples/rust/Kconfig + create mode 100644 samples/rust/Makefile + create mode 100644 samples/rust/rust_chrdev.rs + create mode 100644 samples/rust/rust_minimal.rs + create mode 100644 samples/rust/rust_miscdev.rs + create mode 100644 samples/rust/rust_module_parameters.rs + create mode 100644 samples/rust/rust_print.rs + create mode 100644 samples/rust/rust_random.rs + create mode 100644 samples/rust/rust_semaphore.rs + create mode 100644 samples/rust/rust_semaphore_c.c + create mode 100644 samples/rust/rust_stack_probing.rs + create mode 100644 samples/rust/rust_sync.rs + create mode 120000 scripts/dummy-tools/elfedit + create mode 100755 scripts/rust-version.sh +Merging cxl/next (e49d033bddf5 Linux 5.12-rc6) +$ git merge cxl/next +Already up to date. +Merging tpmdd-jejb/tpmdd-for-next (69977d1aeeca Merge branch 'tpmdd-fixes' into tpmdd-for-next) +$ git merge tpmdd-jejb/tpmdd-for-next +Merge made by the 'recursive' strategy. +Merging akpm-current/current (e0f4bf8e11f8 ipc/sem.c: mundane typo fixes) +$ git merge --no-ff akpm-current/current +Auto-merging tools/scripts/Makefile.include +Auto-merging scripts/checkpatch.pl +Auto-merging samples/vfio-mdev/mdpy.c +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/shmem.c +Auto-merging mm/page_alloc.c +Auto-merging mm/mmap.c +Auto-merging mm/memory.c +Auto-merging mm/kasan/kasan.h +Auto-merging mm/internal.h +Auto-merging mm/filemap.c +Auto-merging mm/Kconfig +Auto-merging lib/test_kasan.c +CONFLICT (content): Merge conflict in lib/test_kasan.c +Auto-merging lib/list_sort.c +Auto-merging lib/iov_iter.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/task_work.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging init/main.c +Auto-merging 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/kasan.h +Auto-merging include/linux/io.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/cred.h +Auto-merging include/linux/compat.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/ocfs2/namei.c +Auto-merging fs/nilfs2/ioctl.c +Auto-merging fs/inode.c +Auto-merging fs/hfsplus/dir.c +Auto-merging fs/gfs2/glock.c +Auto-merging fs/eventpoll.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 fs/Kconfig +Auto-merging drivers/scsi/esas2r/esas2r_main.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/md/bcache/super.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 drivers/gpu/drm/i915/Kconfig +Auto-merging drivers/block/brd.c +Auto-merging block/blk-settings.c +CONFLICT (content): Merge conflict in block/blk-settings.c +Auto-merging arch/xtensa/Kconfig +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/um/kernel/mem.c +Auto-merging arch/riscv/mm/init.c +Auto-merging arch/riscv/Kconfig +Auto-merging arch/powerpc/sysdev/xive/common.c +Auto-merging arch/powerpc/platforms/Kconfig.cputype +Auto-merging arch/powerpc/mm/mem.c +Auto-merging arch/powerpc/mm/book3s64/radix_pgtable.c +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/mips/loongson64/numa.c +Auto-merging arch/mips/Kconfig +Auto-merging arch/microblaze/mm/init.c +Removing arch/ia64/kernel/ia64_ksyms.c +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/mm/init.c +Auto-merging arch/arm64/include/asm/mte-kasan.h +Auto-merging arch/arm64/include/asm/memory.h +Auto-merging arch/arm64/Kconfig +CONFLICT (content): Merge conflict in arch/arm64/Kconfig +Auto-merging arch/arm/mm/init.c +Auto-merging arch/arm/Kconfig +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/filesystems/proc.rst +Auto-merging Documentation/dev-tools/kasan.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +CONFLICT (content): Merge conflict in Documentation/admin-guide/kernel-parameters.txt +Resolved 'Documentation/admin-guide/kernel-parameters.txt' using previous resolution. +Resolved 'arch/arm64/Kconfig' using previous resolution. +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. +Resolved 'lib/test_kasan.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 +[master b8e5f984fe55] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-kernel-mm-cma | 25 + + Documentation/admin-guide/kdump/kdump.rst | 3 +- + Documentation/admin-guide/kernel-parameters.txt | 42 ++ + 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 +++++---- + Documentation/filesystems/proc.rst | 37 +- + Documentation/vm/page_owner.rst | 2 +- + Documentation/vm/transhuge.rst | 5 - + MAINTAINERS | 17 + + arch/Kconfig | 31 + + arch/alpha/kernel/pc873xx.c | 4 +- + arch/alpha/mm/init.c | 1 - + arch/arc/Kconfig | 9 +- + arch/arc/mm/init.c | 1 - + arch/arm/Kconfig | 11 +- + 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 | 31 +- + arch/arm64/include/asm/memory.h | 4 +- + arch/arm64/include/asm/mte-kasan.h | 39 +- + arch/arm64/include/asm/vmalloc.h | 24 + + 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/include/asm/bitops.h | 8 +- + arch/h8300/mm/init.c | 2 - + arch/hexagon/mm/init.c | 1 - + arch/ia64/Kconfig | 37 +- + arch/ia64/configs/bigsur_defconfig | 1 - + arch/ia64/include/asm/meminit.h | 11 - + arch/ia64/include/asm/module.h | 6 +- + arch/ia64/include/asm/page.h | 25 +- + arch/ia64/include/asm/pgtable.h | 7 +- + arch/ia64/kernel/Makefile | 2 +- + 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/ia64_ksyms.c | 12 - + arch/ia64/kernel/machine_kexec.c | 2 +- + arch/ia64/kernel/mca.c | 4 +- + arch/ia64/kernel/module.c | 29 +- + arch/ia64/kernel/pal.S | 6 +- + arch/ia64/mm/Makefile | 1 - + arch/ia64/mm/contig.c | 4 - + arch/ia64/mm/discontig.c | 21 - + arch/ia64/mm/fault.c | 15 - + arch/ia64/mm/hugetlbpage.c | 3 +- + arch/ia64/mm/init.c | 221 +----- + arch/m68k/include/asm/bitops.h | 6 +- + arch/m68k/mm/init.c | 1 - + arch/microblaze/mm/init.c | 1 - + arch/mips/Kconfig | 7 +- + 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/init.c | 1 - + arch/nios2/mm/cacheflush.c | 1 + + arch/nios2/mm/init.c | 1 - + arch/openrisc/mm/init.c | 2 - + arch/parisc/Kconfig | 5 +- + arch/parisc/mm/hugetlbpage.c | 2 +- + arch/parisc/mm/init.c | 2 - + arch/powerpc/Kconfig | 18 +- + arch/powerpc/include/asm/vmalloc.h | 20 + + arch/powerpc/kernel/isa-bridge.c | 4 +- + 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/platforms/Kconfig.cputype | 16 +- + arch/powerpc/sysdev/xive/common.c | 4 - + arch/riscv/Kconfig | 5 +- + arch/riscv/mm/init.c | 1 - + arch/s390/Kconfig | 12 +- + arch/s390/mm/hugetlbpage.c | 2 +- + arch/s390/mm/init.c | 2 - + arch/sh/Kconfig | 7 +- + arch/sh/include/asm/bitops.h | 5 +- + arch/sh/include/asm/tlb.h | 10 +- + arch/sh/mm/Kconfig | 8 - + 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 | 30 +- + arch/x86/include/asm/vmalloc.h | 20 + + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 2 +- + arch/x86/mm/init_32.c | 2 - + arch/x86/mm/init_64.c | 208 ++++-- + arch/x86/mm/ioremap.c | 19 - + arch/x86/mm/pat/set_memory.c | 8 + + arch/x86/mm/pgtable.c | 13 - + arch/xtensa/Kconfig | 1 + + 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 | 101 ++- + drivers/block/brd.c | 1 + + drivers/block/loop.c | 1 + + 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/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 + + fs/Kconfig | 5 +- + 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/eventpoll.c | 6 + + fs/fs_parser.c | 2 +- + 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/hpfs/hpfs.h | 3 +- + fs/hugetlbfs/inode.c | 9 +- + fs/inode.c | 2 +- + fs/iomap/direct-io.c | 24 +- + fs/isofs/rock.c | 1 + + fs/nilfs2/cpfile.c | 2 +- + fs/nilfs2/ioctl.c | 4 +- + fs/nilfs2/segment.c | 4 +- + fs/nilfs2/the_nilfs.c | 2 +- + fs/ocfs2/blockcheck.c | 2 +- + fs/ocfs2/dlm/dlmrecovery.c | 7 - + 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/linux/align.h | 15 + + 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/delayacct.h | 20 +- + 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 | 51 +- + include/linux/kernel.h | 9 +- + include/linux/memcontrol.h | 294 ++++---- + include/linux/memory.h | 8 +- + include/linux/memory_hotplug.h | 15 +- + include/linux/memremap.h | 8 +- + include/linux/migrate.h | 7 +- + include/linux/mm.h | 76 +- + include/linux/mmzone.h | 20 +- + 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/profile.h | 3 - + include/linux/sched.h | 14 +- + include/linux/sched/mm.h | 27 +- + 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 | 36 +- + 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 | 276 +------ + kernel/gcov/fs.c | 110 +++ + kernel/gcov/gcc_4_7.c | 173 +---- + kernel/gcov/gcov.h | 14 +- + kernel/hung_task.c | 44 ++ + kernel/irq_work.c | 7 +- + kernel/kexec_core.c | 4 +- + kernel/kexec_file.c | 4 +- + kernel/kmod.c | 2 +- + kernel/resource.c | 194 ++--- + kernel/sysctl.c | 10 +- + kernel/task_work.c | 3 + + kernel/umh.c | 2 + + kernel/watchdog.c | 88 +-- + lib/Kconfig.debug | 20 +- + lib/Kconfig.kfence | 1 + + 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/parser.c | 61 +- + lib/percpu_counter.c | 2 +- + lib/stackdepot.c | 6 +- + lib/test_kasan.c | 63 +- + lib/test_slub.c | 124 ++++ + lib/test_vmalloc.c | 128 ++-- + mm/Kconfig | 32 +- + mm/Makefile | 7 +- + mm/cma.c | 62 +- + mm/cma.h | 25 +- + mm/cma_debug.c | 8 +- + mm/cma_sysfs.c | 112 +++ + mm/compaction.c | 107 ++- + mm/debug_vm_pgtable.c | 4 +- + mm/dmapool.c | 2 +- + mm/filemap.c | 85 ++- + mm/frontswap.c | 12 +- + mm/gup.c | 319 +++++---- + mm/gup_test.c | 29 +- + mm/gup_test.h | 3 +- + mm/highmem.c | 11 +- + mm/huge_memory.c | 324 +++++++-- + mm/hugetlb.c | 779 +++++++++++++------- + mm/hugetlb_cgroup.c | 9 +- + mm/internal.h | 35 +- + mm/interval_tree.c | 2 +- + mm/io-mapping.c | 29 + + mm/ioremap.c | 225 +----- + mm/kasan/common.c | 45 +- + mm/kasan/generic.c | 12 +- + mm/kasan/kasan.h | 24 +- + mm/kasan/report_generic.c | 2 +- + mm/kasan/shadow.c | 10 +- + mm/kasan/sw_tags.c | 12 +- + mm/kfence/core.c | 59 +- + mm/khugepaged.c | 63 +- + mm/kmemleak.c | 2 +- + mm/ksm.c | 17 +- + mm/list_lru.c | 6 +- + mm/memcontrol.c | 793 +++++++++------------ + mm/memory-failure.c | 2 +- + mm/memory.c | 199 ++++-- + mm/memory_hotplug.c | 216 +++++- + 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 | 445 +++++++++--- + mm/page_counter.c | 8 +- + mm/page_owner.c | 68 +- + mm/page_poison.c | 6 +- + mm/percpu-vm.c | 7 +- + mm/process_vm_access.c | 1 - + mm/shmem.c | 2 +- + mm/slab.c | 43 +- + mm/slab.h | 24 +- + mm/slab_common.c | 10 +- + mm/slub.c | 213 +++--- + mm/sparse.c | 5 +- + mm/swap.c | 69 +- + mm/swap_state.c | 17 +- + mm/swapfile.c | 4 +- + mm/truncate.c | 19 +- + mm/userfaultfd.c | 39 +- + mm/util.c | 36 +- + mm/vmalloc.c | 652 +++++++++++++---- + 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/checkdeclares.pl | 53 ++ + scripts/checkpatch.pl | 15 +- + scripts/gdb/linux/cpus.py | 23 +- + scripts/gdb/linux/symbols.py | 3 +- + scripts/spelling.txt | 26 +- + tools/include/asm-generic/bitops/find.h | 85 ++- + tools/include/asm-generic/bitsperlong.h | 3 + + tools/include/linux/bitmap.h | 18 +- + tools/lib/bitmap.c | 4 +- + tools/lib/find_bit.c | 56 +- + tools/scripts/Makefile.include | 1 + + tools/testing/selftests/cgroup/test_kmem.c | 22 +- + .../filesystems/epoll/epoll_wakeup_test.c | 44 ++ + 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/proc/read.c | 4 +- + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 1 + + tools/testing/selftests/vm/gup_test.c | 36 +- + tools/testing/selftests/vm/mremap_dontunmap.c | 52 ++ + tools/testing/selftests/vm/split_huge_page_test.c | 390 ++++++++++ + tools/testing/selftests/vm/test_vmalloc.sh | 21 +- + tools/testing/selftests/vm/userfaultfd.c | 164 ++++- + 379 files changed, 8071 insertions(+), 5124 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cma + delete mode 100644 arch/ia64/kernel/ia64_ksyms.c + 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 scripts/checkdeclares.pl + create mode 100644 tools/testing/selftests/proc/proc-subset-pid.c + create mode 100644 tools/testing/selftests/vm/split_huge_page_test.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +Rebasing (1/32)
Rebasing (2/32)
Rebasing (3/32)
Rebasing (4/32)
Rebasing (5/32)
Rebasing (6/32)
Rebasing (7/32)
Rebasing (8/32)
Rebasing (9/32)
Rebasing (10/32)
Rebasing (11/32)
Rebasing (12/32)
Rebasing (13/32)
Rebasing (14/32)
Rebasing (15/32)
Rebasing (16/32)
Rebasing (17/32)
Rebasing (18/32)
Rebasing (19/32)
Rebasing (20/32)
Rebasing (21/32)
Rebasing (22/32)
Rebasing (23/32)
Rebasing (24/32)
Rebasing (25/32)
Rebasing (26/32)
Rebasing (27/32)
Rebasing (28/32)
Rebasing (29/32)
Rebasing (30/32)
Rebasing (31/32)
Rebasing (32/32)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 8d720838880f...cf4f16d39746 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (cf4f16d39746 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/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/gfp.h | 2 +- + include/linux/mm.h | 2 +- + include/linux/mmzone.h | 2 +- + include/linux/pgtable.h | 10 +- + include/linux/secretmem.h | 54 ++++ + 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 | 14 +- + 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 | 10 +- + mm/mempolicy.c | 6 +- + 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 | 16 +- + mm/page_owner.c | 2 +- + mm/page_vma_mapped.c | 2 +- + mm/percpu-internal.h | 2 +- + mm/percpu.c | 2 +- + mm/pgalloc-track.h | 6 +- + mm/rmap.c | 2 +- + mm/secretmem.c | 251 +++++++++++++++++ + mm/slab.c | 8 +- + mm/slub.c | 2 +- + mm/swap.c | 4 +- + mm/swap_slots.c | 2 +- + mm/swap_state.c | 2 +- + mm/vmalloc.c | 129 +-------- + mm/vmstat.c | 2 +- + mm/z3fold.c | 2 +- + mm/zpool.c | 2 +- + mm/zsmalloc.c | 6 +- + 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 - + 283 files changed, 984 insertions(+), 1256 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..8338418c059b --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20210428 |