diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-05-10 11:32:16 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-05-10 11:32:16 +1000 |
| commit | e6f67ebd93efb1234126d4d1e71bc9ec03e600fe (patch) | |
| tree | 7b05344d4ef4681049e283a3dc03e0fe50c7bf23 | |
| parent | e1f4c60066b64960318ffac339753cdcd81319a8 (diff) | |
Add linux-next specific files for 20210510next-20210510
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 343 | ||||
| -rw-r--r-- | Next/Trees | 345 | ||||
| -rw-r--r-- | Next/merge.log | 3048 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 3737 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..2b7076dcc65d --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,343 @@ +Name SHA1 +---- ---- +origin 6efb943b8616ec53a5e444193dccf1af9ad627b5 +fixes e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +kbuild-current b741596468b010af2846b75f5e75a842ce344a6e +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 a48b0872e69428d3d02994dcfad3519f01def7fa +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current d19d8d345eecd9247cbe6cbf27aef271bd88aba7 +net b741596468b010af2846b75f5e75a842ce344a6e +bpf 31379397dcc364a59ce764fabb131b645c43e340 +ipsec b515d2637276a3810d6595e10ab02c13bfd0b63a +netfilter 55bc1af3d9115d669570aa633e5428d6e2302e8f +ipvs bbd6f0a948139970f4a615dff189d9a503681a39 +wireless-drivers e7020bb068d8be50a92f48e36b236a1a1ef9282e +mac80211 a6f8ee58a8e35f7e4380a5efce312e2a5bc27497 +rdma-fixes d434405aaab7d0ebc516b68a8fc4100922d7f5ef +sound-current c1b55029493879f5bd585ff79f326e71f0bc05e3 +sound-asoc-fixes 03f2880ae8a8fa488c77382590968071f68064ce +regmap-fixes 78d889705732ba856feee4d7bfa74a12fe48c480 +regulator-fixes 0bbefa641a324b5416a88189069ff5a30975970c +spi-fixes eb43e665d243d0d789b28ef0f995a232ed3c5012 +pci-current cf673bd0cc973b25961d41355990beaed710068f +driver-core.current dd860052c99b1e088352bdd4fb7aef46f8d2ef47 +tty.current dd860052c99b1e088352bdd4fb7aef46f8d2ef47 +usb.current dd860052c99b1e088352bdd4fb7aef46f8d2ef47 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes 0d02ec6b3136c73c09e7859f0d0e4e2c4c07b49b +usb-chipidea-fixes c1d8a521dbd765bbcd8cda74527f87a8f60104cc +phy da848f9a0e139bd0ad21afbdd425214d9f3d3b91 +staging.current dd860052c99b1e088352bdd4fb7aef46f8d2ef47 +iio-fixes ca7cb955f315d7f386378dc5b2e5605d7dc5cf78 +char-misc.current dd860052c99b1e088352bdd4fb7aef46f8d2ef47 +soundwire-fixes fde5d7f27108a444aa288ab9dfaa0a0c25e80b6d +thunderbolt-fixes 9f4ad9e425a1d3b6a34617b8ea226d56a119a717 +input-current 05665cef4b745cb46b1d1b8e96deaa25464092d3 +crypto-current e3a606f2c544b231f6079c8c5fea451e772e1139 +ide 6800cd8cbc6e35989f8d1aa20fac58031231b90f +vfio-fixes cc35518d29bc8e38902866b74874b4a3f1ad3617 +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 2e4f4de38d26624d72ef36547ed5a47f1509d596 +vfs-fixes 173e84953eaaf17864a707efa2b8cd4c233b3129 +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes a3790a8a94fc0234c5d38013b48e74ef221ec84c +samsung-krzk-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +pinctrl-samsung-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +devicetree-fixes 6799e3f281e962628be531e8331bacd05b866134 +scsi-fixes 35ffbb60bdad652d461aa8e97fa094faa9eb46ec +drm-fixes aca38735ae624b93c71c055b68d5802b8f356ea5 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 9f4ad9e425a1d3b6a34617b8ea226d56a119a717 +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 dd860052c99b1e088352bdd4fb7aef46f8d2ef47 +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 b741596468b010af2846b75f5e75a842ce344a6e +compiler-attributes 19c329f6808995b142b3966301f217c831e7cf31 +dma-mapping a7f3d3d3600c8ed119eb0d2483de0062ce2e3707 +asm-generic 38489db09b109c22eedf6cd3846ef742bceb45fe +arc def9d2780727cec3313ed3522d0123158d87224d +arm d3506d256d941816fc9c5e40263a93b1ce625499 +arm64 c76fba33467b96b8234a1bbef852cd257c0dca69 +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 79053496a28d0c0bc9156dd6157a2fb9c61a9697 +stm32 6ed9269265e10669d62280a869652dbe26f43ecb +sunxi 9fa021aa01fdc9576f4b523543210017af22fbb8 +tegra 93b9ea9ca307789ed41c641235207b35e68effe9 +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new 112e5934ff3a7505e583365213a27f990922b76b +xilinx fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +clk 3ba2d41dca14e1afbea0c41ba8164064df407c8b +clk-imx 054ef44ea3ef2883e0f63c9a54c91c07f321a0b4 +clk-renesas f2fb4fe62390b293bc6edc04cc7002940c441359 +clk-samsung a38fd8748464831584a19438cbb3082b5a2dab15 +csky 1294d89b48b04093833192ad49ac1859b002acfc +h8300 6e5e55227c959716103945e7140614c4c2faf439 +m68k 34e5269bf987aff9a33ad3ab4f5d65c02913cbc1 +m68knommu 6b3788e5fb8041211ac2fa7c818ca9010e976a74 +microblaze 47de4477a8e6bfd202640567ce4bf17cc1de60be +mips 7e9be673cb1b0be0f4279a960c2ecb28a147c327 +nds32 40e0dd851e7b7afe219820fb270b09016e41d4fc +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 1683f7de65dbf0a2c6a7d639173fe92430a28930 +parisc-hd 9f4ad9e425a1d3b6a34617b8ea226d56a119a717 +powerpc f96271cefe6dfd1cb04195b76f4a33e185cd7f92 +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl 242b0b398ccd34f73772120bd27a87a1bf00e30b +risc-v beaf5ae15a13d835a01e30c282c8325ce0f1eb7e +s390 a48b0872e69428d3d02994dcfad3519f01def7fa +sh 2882b7626f4903a8e9250b328cdf7396a6deecac +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml ed102bf2afed226703eaf85a704755bdbea34583 +xtensa 6a8eb99e130f3f7658de2776934374fe1c41279e +pidfd 8fac44cbbaa2c7501c1819aa358abdc3874089b6 +fscrypt a14d0b6764917b21ee6fdfd2a8a4c2920fbefcce +fscache 3003bbd0697b659944237f3459489cb596ba196c +afs 7af08140979a6e7e12b78c93b8625c8d25b084e2 +btrfs 8a03ef87ec7e34635963c93326b1d87bb717b3f2 +ceph 0e1c1526416f1d4e181ad517f555ec2e87fd3496 +cifs e87dbd1cec70a32e670647f0bfb07e57cf974288 +cifsd c309fbcfa4c0d910d72d20dd956e31d2a5b5e056 +configfs 14fbbc8297728e880070f7b077b3301a8c698ef9 +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs 8e6c8fa9f2e95c88a642521a5da19a8e31748846 +exfat b741596468b010af2846b75f5e75a842ce344a6e +ext3 bf7ea7068a022e8cacacb80186d4b1d1fc0a41bc +ext4 6c0912739699d8e4b6a87086401bf3ad3c59502d +f2fs d665ea6ea86c785760ee4bad4543dab3267ad074 +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 3c9c14338c12fb6f8d3aea7e7a1b7f93ce9e84b0 +jfs b462cecfa32315cd5acbbaa0968a7deabb4e29af +nfs 9e895cd9649abe4392c59d14e31b0f5667d082d2 +nfs-anna 4f8be1f53bf615102d103c0509ffa9596f65b718 +nfsd c3213d260a23e263ef85ba21ac68c9e7578020b5 +cel b9f83ffaa0c096b4c832a43964fe6bff3acffe10 +orangefs 211f9f2e0503efa4023a46920e7ad07377b4ec58 +overlayfs 5e717c6fa41ff9b9b0c1e5959ccf5d8ef42f804b +ubifs 9a29f7f020e06f14eb126bcb84a7f0d166415824 +v9fs f8b139e2f24112f4e21f1eb02c7fc7600fea4b8d +xfs 8e9800f9f2b89e1efe2a5993361fae4d618a6c26 +zonefs 6980d29ce4da223ad7f0751c7f1d61d3c6b54ab3 +iomap 6e552494fb90acae005d74ce6a2ee102d965184b +djw-vfs 9b8523423b23ee3dfd88e32f5b7207be56a4e782 +file-locks cbe6fc4e01421c890d74422cdd04c6b1c8f62dda +vfs e8727aec724e4a8dd8b0fab1816fc71e32a9f0ce +printk a386d19acc30bf3ca929e9146924f2c69ab3682f +pci 882862aaacefcb9f723b0f7817ddafc154465d8f +pstore 9d843e8fafc7c0b15d8f511d146c0c3d7c816634 +hid adfd5f216d25ca681961e7160008b1d06f1352d3 +i2c f9743e4d0a62adce1356b351a3d8a586097220c3 +i3c 0d95f41ebde40d552bb4fea64b1d618607915fd6 +dmi 3cb4d29a2633170208c96240c7e85148679ceee3 +hwmon-staging 9049572fb145746725b198a19e27fa2671b80448 +jc_docs 7fc4607899e87259bb751ccdbe53628aa467ec22 +v4l-dvb 0b276e470a4d43e1365d3eb53c608a3d208cabd4 +v4l-dvb-next bf05bf16c76bb44ab5156223e1e58e26dfe30a88 +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 1f348871f80e24c62f1119ceb3e97eafd3f57143 +cpufreq-arm dbbd49bade0548db87ceb1943951dea456af2e22 +cpupower a38fd8748464831584a19438cbb3082b5a2dab15 +devfreq 0a7dc8318c2817fb33dc50946f7ca6e0ff28f036 +opp a8bb0e872bfb962de4653ce8f8723c0e1f712ce3 +thermal c310e546164d5cca4c12faf9582b75989b030b68 +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm 2fd8db2dd05d895961c7c7b9fa02d72f385560e4 +swiotlb dfc06b389a4f54e78c03abecd5b42ab6ea8d492a +rdma 6da7bda36388ae00822f732c11febfe2ebbb5544 +net-next b741596468b010af2846b75f5e75a842ce344a6e +bpf-next 9d31d2338950293ec19d9b095fbaa9030899dcb4 +ipsec-next 747b67088f8d34b3ec64d31447a1044be92dd348 +mlx5-next 63f9c44bca5e10fb1fd86aee7e38039ed98f95cc +netfilter-next 9d31d2338950293ec19d9b095fbaa9030899dcb4 +ipvs-next 99ba0ea616aabdc8e26259fd722503e012199a76 +wireless-drivers-next 9382531ec63fc123d1d6ff07b0558b6af4ea724b +bluetooth da68ad722e54ce86fa6f87829cf60d12201cdfaa +mac80211-next 9d31d2338950293ec19d9b095fbaa9030899dcb4 +gfs2 f2c80837e27e67e91ad93f41f0849be28b808b14 +mtd a881537dfaf281bfcb94313d69dcf9ef8fc89afe +nand 32cbc7cb70b07041e82f897f96b3035358470b14 +spi-nor 46094049a49be777f12a9589798f7c70b90cd03f +crypto e3a606f2c544b231f6079c8c5fea451e772e1139 +drm 0844708ac3d2dbdace70f4a6020669d56958697f +drm-misc b9d79e4ca4ff23543d6b33c736ba07c1f0a9dcb1 +amdgpu 85021fe9d80007336b6aa7e617e20ec85134c0df +drm-intel c7b397e9ca4d6828e3e3f504c80bcb1fe535c348 +drm-tegra c79184a9c029dbbc0b37279c9cb7a6ac57461654 +drm-msm f2f46b878777e0d3f885c7ddad48f477b4dea247 +imx-drm 74181df8c6db48e4737237186989fdcb1414e0f3 +etnaviv 4bfdd2aa67fbfba09d7c32a4c7fd4c5eb1052bce +regmap ccac12acc0c0d66b26ce7834e2dcf54ae159e63a +sound c1b55029493879f5bd585ff79f326e71f0bc05e3 +sound-asoc 03f2880ae8a8fa488c77382590968071f68064ce +modules 33121347fb1c359bd6e3e680b9f2c6ced5734a81 +input d12b64b9764ea17554fb230784ebf91287ed807e +block 3c2ed5a8158c03d2703306080e4f9cfc4130fc47 +device-mapper ca4a4e9a55beeb138bb06e3867f5e486da896d44 +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 a48b0872e69428d3d02994dcfad3519f01def7fa +tpmdd 9ccce092fc64d19504fa54de4fd659e279cc92e7 +watchdog bf05bf16c76bb44ab5156223e1e58e26dfe30a88 +iommu 2d471b20c55e13c98d1dba413bf2de618e89cdac +audit b75d8f38bcc9599af42635530c00268c71911f11 +devicetree 031cc263c037a95e5d1249cbd3d55b77021f1eb8 +mailbox 2335f556b3afadbee6548456f543f53ac3d1af42 +spi eb43e665d243d0d789b28ef0f995a232ed3c5012 +tip a95f54035376a5f67187bb9d0bc11134cedfa032 +clockevents 8120891105ba32b45bc35f7dc07e6d87a8314556 +edac faf042d15093164879f1a5d9b9805190ac6f7d40 +irqchip 33aa3698bac9748ff40575ec342322c04c19b750 +ftrace 8c9af478c06bb1ab1422f90d8ecbc53defd44bc3 +rcu 35c0c1d51208c59fa4527ec67aa6374d28e1d83d +kvm ce7ea0cfdc2e9ff31d12da31c3226deddb9644f5 +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 d72cd4ad4174cfd2257c426ad51e4f53bcfde9c9 +driver-core dd860052c99b1e088352bdd4fb7aef46f8d2ef47 +usb dd860052c99b1e088352bdd4fb7aef46f8d2ef47 +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 039b81d50a4822edfc07a7c2e6963823e993b2f0 +usb-chipidea-next b85a512e023c0bd150874c96da0bc2ee02dd6487 +tty dd860052c99b1e088352bdd4fb7aef46f8d2ef47 +char-misc dd860052c99b1e088352bdd4fb7aef46f8d2ef47 +extcon 7b1222b224aff41739319ae81cd266825464ad8f +phy-next 8a6b85b14f082d266b0312562f7372e1a8f5dfb3 +soundwire 14968dd36a507866be0edfc2a05d48c997da5d99 +thunderbolt 6f3badead6a078cf3c71f381f9d84ac922984a00 +vfio adaeb718d46f6b42a3fc1dffd4f946f26b33779a +staging dd860052c99b1e088352bdd4fb7aef46f8d2ef47 +iio 6470a8206a10cae1f18a3e5a95dde2b364a06e10 +mux 3516bd729358a2a9b090c1905bd2a3fa926e24c6 +icc c1de07884f2bafa11ad3780cf08b234c88c2cc9d +dmaengine 0bde4444ec44b8e64bbd4af72fcaef58bcdbd4ce +cgroup ffeee417d97f9171bce9f43c22c9f477e4c84f54 +scsi 3c58f1e2d0155720ee9d54c07d15b7ed5a87264f +scsi-mkp 85367040511f8402d7e4054d8c17b053c75e33ff +vhost 7ff6e99e021caa41b2fa183d9ca9b9da3a86e2e5 +rpmsg dc0e14fa833b084315015b9fcc45b11793885a08 +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl 444952956f34a5de935159561d56a34276ffffd6 +gpio-intel 058459043e71b5c1703194ea71aab576c0ff4f4d +pinctrl 835109266494b5b5661676a53efa5ea8f77a8c70 +pinctrl-intel 5b613df3f499e305f3aecd58090a71ec0d92930d +pinctrl-renesas 61232cd6efca6e4d2705993850d014343ba604c4 +pinctrl-samsung a38fd8748464831584a19438cbb3082b5a2dab15 +pwm a6efb35019d00f483a0e5f188747723371d659fe +userns ef566ba2d7d97f6952ffa950e9aec30d9cd40f85 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +random ab9a7e27044b87ff2be47b8f8e095400e7fccc44 +kselftest e75074781f1735c1976bc551e29ccf2ba9a4b17f +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching c150bbbb1731c5b6c0b232320c450dcd3b5c9fde +coresight 1efbcec2ef8c037f1e801c76e4b9434ee2400be7 +rtc 4d0185e67806a233c423c1668e87e137fbda192c +nvdimm 30c10d32152dd09c2158e9cab8a6c7adaa09278e +at24 fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +ntb 5c8fe583cce542aa0b84adc939ce85293de36e5e +seccomp a3fc712c5b37aec802438fe0de095d7f6f3827a3 +kspp f4648c7412997680ccb3778459932483607b386c +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss 994adcbd37148acfa593c9ec2880a81ef97c7041 +fsi 4a851d714eadeabd65c7e321a2e7830f77d945c4 +slimbus 0320ed0a82364b3b175ab83ad11c7e4d9ad828a9 +nvmem e8405ad55f4c955b4961772cada4078c6b10909c +xarray 2c7e57a02708a69d0194f9ef2a7b7e54f5a0484a +hyperv 20a40e4da6a65ba0192412f404b361e27872dabe +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 588a8e4a3500005a11a5b5f8633803274a543db9 +akpm 076f4112bf610fb6a818644e7fe349aa357734a7 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..e2099e382b63 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,345 @@ +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 +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +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..00471c1ee0d1 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3048 @@ +$ date -R +Mon, 10 May 2021 08:12:24 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at e48661230cc3 Merge tag 's390-5.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux +Merging origin/master (6efb943b8616 Linux 5.13-rc1) +$ git merge origin/master +Updating e48661230cc3..6efb943b8616 +Fast-forward + .gitignore | 8 +- + CREDITS | 5 + + Documentation/ABI/testing/sysfs-class-net-qmi | 16 + + .../ABI/testing/sysfs-driver-input-exc3000 | 9 + + Documentation/admin-guide/devices.txt | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 14 + + Documentation/arm64/booting.rst | 33 +- + Documentation/arm64/elf_hwcaps.rst | 2 +- + Documentation/arm64/tagged-address-abi.rst | 6 + + Documentation/dev-tools/gdb-kernel-debugging.rst | 2 +- + Documentation/devicetree/bindings/.gitignore | 4 +- + .../bindings/i3c/silvaco,i3c-master.yaml | 2 +- + .../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 +- + Documentation/scheduler/sched-domains.rst | 2 +- + MAINTAINERS | 40 +- + Makefile | 46 +- + arch/.gitignore | 4 +- + arch/alpha/include/asm/io.h | 5 - + arch/alpha/kernel/pc873xx.c | 4 +- + arch/alpha/lib/csum_partial_copy.c | 1 + + arch/arm/boot/compressed/Makefile | 7 - + 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/Kconfig | 11 +- + arch/arm64/include/asm/daifflags.h | 3 + + 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 | 5 +- + arch/arm64/kernel/cpufeature.c | 5 +- + arch/arm64/kernel/cpuidle.c | 2 +- + arch/arm64/kernel/entry-common.c | 17 - + arch/arm64/kernel/entry.S | 21 +- + arch/arm64/kernel/process.c | 9 +- + arch/arm64/kernel/stacktrace.c | 10 +- + arch/arm64/kernel/vdso/vdso.lds.S | 8 +- + arch/arm64/kernel/vdso32/Makefile | 8 - + arch/arm64/mm/init.c | 8 +- + arch/arm64/mm/mmu.c | 2 - + arch/arm64/mm/ptdump.c | 2 - + arch/h8300/include/asm/bitops.h | 8 +- + 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/Makefile | 2 +- + arch/m68k/atari/time.c | 7 - + arch/m68k/configs/amcore_defconfig | 1 - + arch/m68k/include/asm/bitops.h | 6 +- + arch/m68k/include/asm/io_mm.h | 5 - + arch/mips/Makefile | 2 +- + arch/mips/include/asm/io.h | 5 - + arch/openrisc/configs/or1ksim_defconfig | 1 - + arch/parisc/Makefile | 2 +- + arch/parisc/include/asm/io.h | 5 - + arch/parisc/include/asm/pdc_chassis.h | 1 - + arch/powerpc/Kconfig | 37 +- + arch/powerpc/boot/wrapper | 2 +- + arch/powerpc/include/asm/io.h | 5 - + arch/powerpc/include/asm/kvm_book3s.h | 2 +- + arch/powerpc/include/asm/opal.h | 3 - + arch/powerpc/include/asm/pci-bridge.h | 1 - + arch/powerpc/include/asm/pci.h | 7 - + arch/powerpc/kernel/module.c | 18 +- + arch/powerpc/kexec/file_load_64.c | 92 + + arch/powerpc/kvm/book3s_64_mmu_hv.c | 46 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 5 +- + arch/powerpc/lib/Makefile | 3 + + arch/powerpc/platforms/powernv/Makefile | 2 +- + arch/powerpc/platforms/powernv/memtrace.c | 4 +- + arch/powerpc/platforms/powernv/npu-dma.c | 705 -------- + arch/powerpc/platforms/powernv/opal-call.c | 2 - + arch/powerpc/platforms/powernv/pci-ioda.c | 185 +- + arch/powerpc/platforms/powernv/pci.c | 11 - + arch/powerpc/platforms/powernv/pci.h | 17 +- + arch/powerpc/platforms/pseries/pci.c | 23 - + arch/riscv/Kconfig.erratas | 4 +- + arch/riscv/include/asm/set_memory.h | 7 +- + arch/riscv/kernel/setup.c | 2 - + arch/riscv/kernel/traps.c | 2 - + arch/riscv/mm/init.c | 11 +- + arch/s390/include/asm/io.h | 5 - + arch/sh/Makefile | 2 +- + 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/bitops.h | 5 +- + arch/sh/include/asm/io.h | 5 - + arch/sh/kernel/syscalls/Makefile | 14 +- + arch/sh/kernel/syscalls/syscallhdr.sh | 36 - + arch/sh/kernel/syscalls/syscalltbl.sh | 32 - + arch/sparc/configs/sparc64_defconfig | 1 - + arch/sparc/include/asm/Kbuild | 1 - + arch/sparc/include/asm/io_64.h | 5 - + arch/sparc/kernel/syscalls/Makefile | 30 +- + arch/sparc/kernel/syscalls/syscallhdr.sh | 36 - + arch/sparc/kernel/syscalls/syscalltbl.sh | 36 - + arch/sparc/kernel/systbls_32.S | 4 +- + arch/sparc/kernel/systbls_64.S | 8 +- + arch/um/drivers/cow.h | 7 - + arch/x86/events/amd/iommu.c | 47 +- + arch/x86/include/asm/bug.h | 9 - + arch/x86/include/asm/idtentry.h | 15 + + arch/x86/include/asm/msr.h | 4 - + arch/x86/include/asm/page_64.h | 33 + + arch/x86/include/asm/page_64_types.h | 23 +- + arch/x86/kernel/cpu/common.c | 4 +- + arch/x86/kernel/cpu/resctrl/monitor.c | 2 +- + arch/x86/kernel/nmi.c | 10 + + arch/x86/kernel/process.c | 19 +- + arch/x86/kernel/smpboot.c | 3 - + arch/x86/kvm/svm/svm.c | 39 +- + arch/x86/kvm/vmx/vmx.c | 55 +- + arch/x86/kvm/x86.c | 9 + + arch/x86/kvm/x86.h | 45 + + arch/xtensa/Makefile | 6 +- + arch/xtensa/configs/xip_kc705_defconfig | 1 - + block/blk-settings.c | 1 + + certs/.gitignore | 4 +- + drivers/acpi/arm64/gtdt.c | 10 +- + drivers/acpi/irq.c | 6 +- + drivers/atm/firestream.c | 1 + + drivers/auxdisplay/panel.c | 7 - + drivers/base/firmware_loader/main.c | 2 + + drivers/block/brd.c | 1 + + drivers/block/loop.c | 1 + + drivers/block/rnbd/rnbd-clt.c | 46 +- + drivers/block/rnbd/rnbd-clt.h | 2 +- + drivers/block/rnbd/rnbd-srv.c | 2 +- + drivers/char/Kconfig | 10 - + drivers/char/mem.c | 231 --- + drivers/firmware/psci/psci.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 184 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 1 + + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 4 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 68 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 2 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 10 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 5 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 4 +- + drivers/gpu/drm/i915/display/intel_dp.c | 13 +- + drivers/gpu/drm/i915/gvt/handlers.c | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 10 - + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 16 - + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 6 - + drivers/gpu/drm/qxl/qxl_drv.c | 1 - + drivers/gpu/drm/radeon/radeon_atombios.c | 26 +- + drivers/i3c/master.c | 5 +- + drivers/i3c/master/svc-i3c-master.c | 1 - + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 3 +- + drivers/input/Makefile | 1 + + drivers/input/joystick/xpad.c | 2 + + 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/ili210x.c | 2 +- + 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 +- + drivers/isdn/capi/kcapi_proc.c | 1 + + drivers/md/bcache/super.c | 1 + + drivers/media/usb/pwc/pwc-uncompress.c | 3 - + drivers/memory/.gitignore | 2 +- + drivers/net/can/m_can/m_can.c | 3 +- + drivers/net/can/spi/mcp251x.c | 35 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 8 +- + drivers/net/dsa/microchip/ksz8795_spi.c | 3 + + drivers/net/dsa/microchip/ksz8863_smi.c | 5 +- + drivers/net/ethernet/adaptec/starfire.c | 8 - + drivers/net/ethernet/amd/atarilance.c | 8 - + drivers/net/ethernet/amd/pcnet32.c | 7 - + drivers/net/ethernet/atheros/alx/main.c | 2 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 1 - + drivers/net/ethernet/brocade/bna/bnad.c | 2 +- + drivers/net/ethernet/cadence/macb_main.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 16 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 7 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 12 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 3 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h | 3 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 6 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 2 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 2 + + drivers/net/ethernet/intel/i40e/i40e.h | 1 - + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 6 +- + drivers/net/ethernet/intel/i40e/i40e_client.c | 1 + + drivers/net/ethernet/intel/i40e/i40e_common.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 8 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 42 - + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 8 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 7 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.c | 30 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 1 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 7 +- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 1 - + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 15 +- + drivers/net/ipa/gsi.c | 4 +- + drivers/net/ipa/gsi_reg.h | 18 +- + drivers/net/phy/marvell.c | 62 +- + drivers/net/wan/hdlc_fr.c | 5 +- + drivers/net/wireless/intersil/hostap/hostap_proc.c | 1 + + .../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/nvdimm/btt.c | 1 + + drivers/nvdimm/pmem.c | 1 + + drivers/nvme/host/core.c | 98 +- + drivers/nvme/host/fabrics.c | 57 - + drivers/nvme/host/fabrics.h | 13 - + drivers/nvme/host/fc.c | 4 +- + drivers/nvme/host/ioctl.c | 65 +- + drivers/nvme/host/multipath.c | 3 + + drivers/nvme/host/nvme.h | 16 +- + drivers/nvme/host/pci.c | 3 + + drivers/nvme/host/rdma.c | 4 +- + drivers/nvme/host/tcp.c | 4 +- + drivers/nvme/target/admin-cmd.c | 6 +- + drivers/nvme/target/loop.c | 4 +- + drivers/parport/parport_ip32.c | 12 - + drivers/pinctrl/pinctrl-ingenic.c | 3 + + 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 +- + drivers/platform/x86/dell/dell_rbu.c | 3 - + drivers/s390/block/dasd_eckd.h | 8 +- + drivers/scsi/53c700.c | 1 - + drivers/scsi/53c700.h | 1 - + drivers/scsi/ch.c | 6 - + drivers/scsi/esas2r/esas2r_main.c | 1 + + drivers/scsi/fnic/fnic_scsi.c | 828 ++++----- + drivers/scsi/ips.c | 20 - + drivers/scsi/ips.h | 20 - + drivers/scsi/lasi700.c | 1 - + drivers/scsi/lpfc/lpfc_bsg.c | 2 +- + drivers/scsi/lpfc/lpfc_init.c | 12 +- + drivers/scsi/lpfc/lpfc_sli.c | 26 +- + 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/qla2xxx/qla_init.c | 3 + + drivers/scsi/qla2xxx/qla_os.c | 1 + + drivers/scsi/scsi_debug.c | 24 +- + drivers/scsi/scsicam.c | 1 + + drivers/scsi/sni_53c710.c | 1 - + drivers/scsi/ufs/ufs-sysfs.c | 12 +- + drivers/scsi/ufs/ufshcd.c | 7 +- + drivers/target/target_core_user.c | 4 +- + drivers/tty/vt/.gitignore | 6 +- + drivers/video/fbdev/core/fbmem.c | 2 +- + drivers/video/fbdev/matrox/matroxfb_base.c | 9 - + drivers/video/fbdev/vga16fb.c | 10 - + fs/9p/v9fs.c | 2 +- + fs/9p/vfs_file.c | 4 +- + fs/Kconfig | 4 +- + fs/block_dev.c | 20 +- + fs/cifs/fs_context.c | 3 + + fs/cifs/sess.c | 6 + + fs/cifs/smb2pdu.c | 5 + + 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/eventpoll.c | 6 + + fs/fat/fatent.c | 2 +- + fs/hpfs/hpfs.h | 3 +- + fs/io_uring.c | 69 +- + fs/iomap/buffered-io.c | 7 +- + fs/isofs/rock.c | 1 + + 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 | 36 +- + 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/nfs4file.c | 4 - + fs/nfs/nfs4proc.c | 264 +-- + fs/nfs/nfs4renewd.c | 6 - + fs/nfs/nfs4state.c | 8 +- + fs/nfs/nfs4trace.h | 47 +- + fs/nfs/nfs4xdr.c | 66 +- + 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 | 6 +- + fs/nfs/write.c | 7 +- + fs/nfsd/Kconfig | 2 +- + fs/nfsd/nfs4proc.c | 6 - + fs/nfsd/nfs4xdr.c | 6 - + fs/nfsd/xdr4.h | 6 - + fs/nilfs2/cpfile.c | 2 +- + fs/nilfs2/ioctl.c | 4 +- + fs/nilfs2/segment.c | 4 +- + fs/nilfs2/the_nilfs.c | 2 +- + 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/proc/generic.c | 13 +- + fs/proc/inode.c | 18 +- + fs/proc/proc_sysctl.c | 2 +- + fs/reiserfs/procfs.c | 10 - + fs/unicode/.gitignore | 4 +- + fs/xfs/libxfs/xfs_ag_resv.c | 34 +- + fs/xfs/libxfs/xfs_alloc.c | 17 +- + fs/xfs/libxfs/xfs_alloc_btree.c | 4 +- + fs/xfs/libxfs/xfs_log_format.h | 12 +- + fs/xfs/libxfs/xfs_rmap_btree.c | 2 - + fs/xfs/libxfs/xfs_sb.c | 16 +- + fs/xfs/scrub/agheader.c | 7 +- + fs/xfs/scrub/fscounters.c | 40 +- + fs/xfs/xfs_aops.c | 2 +- + fs/xfs/xfs_fsops.c | 2 - + fs/xfs/xfs_inode_item.c | 8 +- + fs/xfs/xfs_inode_item_recover.c | 6 +- + fs/xfs/xfs_log.c | 10 +- + fs/xfs/xfs_mount.c | 15 +- + fs/xfs/xfs_mount.h | 6 + + fs/xfs/xfs_ondisk.h | 4 +- + fs/xfs/xfs_reflink.c | 3 +- + fs/xfs/xfs_trans.c | 10 +- + fs/xfs/xfs_trans.h | 15 - + include/asm-generic/bitops/find.h | 108 +- + include/asm-generic/bitops/le.h | 38 +- + include/asm-generic/bitsperlong.h | 12 + + include/asm-generic/io.h | 11 - + include/dt-bindings/input/atmel-maxtouch.h | 10 + + include/linux/align.h | 15 + + include/linux/async.h | 1 - + include/linux/bitmap.h | 11 +- + include/linux/bitops.h | 12 - + include/linux/blk-mq.h | 8 +- + include/linux/blkdev.h | 1 - + include/linux/bpf_verifier.h | 5 +- + include/linux/compat.h | 1 - + include/linux/configfs.h | 4 +- + include/linux/context_tracking.h | 92 +- + include/linux/crc8.h | 2 +- + include/linux/cred.h | 1 - + include/linux/delayacct.h | 20 +- + 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/init_task.h | 1 - + include/linux/initrd.h | 2 + + include/linux/iomap.h | 5 +- + include/linux/kconfig.h | 6 - + include/linux/kernel.h | 11 +- + include/linux/kvm_host.h | 45 + + include/linux/mm.h | 2 +- + include/linux/mmzone.h | 2 +- + include/linux/netfilter_arp/arp_tables.h | 3 +- + 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/pgtable.h | 10 +- + include/linux/platform_data/cros_ec_commands.h | 1 + + include/linux/proc_fs.h | 1 + + include/linux/profile.h | 3 - + include/linux/smp.h | 10 +- + include/linux/sunrpc/xprt.h | 1 + + include/linux/swap.h | 1 + + include/linux/vmalloc.h | 7 +- + include/linux/vtime.h | 108 +- + include/net/sctp/command.h | 1 - + include/trace/events/rpcrdma.h | 146 +- + include/trace/events/sunrpc.h | 41 +- + include/uapi/linux/if_bonding.h | 11 - + include/uapi/linux/netfilter/xt_SECMARK.h | 6 + + include/uapi/linux/nfs4.h | 6 - + include/uapi/linux/seg6_local.h | 30 + + include/xen/interface/elfnote.h | 10 - + include/xen/interface/hvm/hvm_vcpu.h | 10 - + include/xen/interface/io/xenbus.h | 10 - + init/Kconfig | 12 + + init/initramfs.c | 38 +- + init/main.c | 1 + + ipc/sem.c | 12 +- + kernel/.gitignore | 5 +- + kernel/Makefile | 9 +- + kernel/async.c | 66 +- + kernel/bpf/verifier.c | 33 +- + kernel/configs/android-base.config | 1 - + kernel/cred.c | 2 +- + kernel/exit.c | 67 +- + kernel/fork.c | 23 +- + kernel/futex.c | 82 +- + 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/kexec_core.c | 4 +- + kernel/kexec_file.c | 4 +- + kernel/kmod.c | 2 +- + kernel/locking/qrwlock.c | 6 +- + kernel/resource.c | 194 ++- + kernel/sched/core.c | 2 +- + kernel/sched/fair.c | 12 +- + kernel/sched/psi.c | 36 +- + kernel/smp.c | 26 +- + kernel/sys.c | 14 +- + kernel/umh.c | 8 +- + kernel/up.c | 4 +- + kernel/user_namespace.c | 6 +- + lib/.gitignore | 10 +- + lib/bch.c | 2 +- + lib/crc8.c | 2 +- + lib/decompress_unlzma.c | 2 +- + lib/find_bit.c | 68 +- + lib/genalloc.c | 7 +- + lib/list_sort.c | 2 +- + lib/nlattr.c | 2 +- + lib/parser.c | 61 +- + lib/percpu_counter.c | 2 +- + lib/stackdepot.c | 6 +- + mm/balloon_compaction.c | 4 +- + mm/compaction.c | 4 +- + mm/filemap.c | 2 +- + mm/gup.c | 2 +- + mm/highmem.c | 2 +- + mm/huge_memory.c | 6 +- + mm/hugetlb.c | 6 +- + mm/internal.h | 2 +- + 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 | 18 +- + mm/mempolicy.c | 6 +- + mm/migrate.c | 8 +- + mm/mmap.c | 4 +- + 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/slab.c | 8 +- + mm/slub.c | 2 +- + mm/swap.c | 4 +- + mm/swap_slots.c | 2 +- + mm/swap_state.c | 2 +- + mm/vmalloc.c | 124 +- + mm/vmstat.c | 2 +- + mm/z3fold.c | 2 +- + mm/zpool.c | 2 +- + mm/zsmalloc.c | 6 +- + net/bridge/br_netlink.c | 5 +- + net/ethtool/netlink.c | 3 +- + net/hsr/hsr_forward.c | 4 + + net/ipv4/netfilter/arp_tables.c | 5 +- + net/ipv4/netfilter/arptable_filter.c | 2 +- + net/ipv4/tcp.c | 1 + + net/ipv4/tcp_cong.c | 4 + + net/ipv6/seg6.c | 3 - + net/ipv6/seg6_local.c | 198 ++- + net/mptcp/subflow.c | 3 +- + net/netfilter/nf_conntrack_ftp.c | 5 +- + net/netfilter/nf_conntrack_h323_main.c | 3 +- + net/netfilter/nf_conntrack_irc.c | 5 +- + net/netfilter/nf_conntrack_pptp.c | 4 +- + net/netfilter/nf_conntrack_proto_tcp.c | 6 +- + net/netfilter/nf_conntrack_sane.c | 5 +- + net/netfilter/nf_tables_api.c | 11 +- + net/netfilter/nfnetlink.c | 1 + + net/netfilter/nfnetlink_osf.c | 2 + + net/netfilter/nft_set_hash.c | 20 +- + net/netfilter/xt_SECMARK.c | 88 +- + net/nfc/llcp_sock.c | 4 + + net/openvswitch/actions.c | 8 +- + net/sched/sch_frag.c | 8 +- + net/sctp/sm_make_chunk.c | 6 +- + net/sctp/sm_sideeffect.c | 26 - + net/sctp/sm_statefuns.c | 47 +- + net/sctp/socket.c | 38 +- + net/smc/af_smc.c | 4 +- + net/sunrpc/clnt.c | 12 +- + net/sunrpc/rpcb_clnt.c | 7 +- + net/sunrpc/xprt.c | 18 +- + net/sunrpc/xprtrdma/backchannel.c | 4 +- + net/sunrpc/xprtrdma/frwr_ops.c | 209 +-- + net/sunrpc/xprtrdma/rpc_rdma.c | 39 +- + net/sunrpc/xprtrdma/transport.c | 6 +- + net/sunrpc/xprtrdma/verbs.c | 131 +- + net/sunrpc/xprtrdma/xprt_rdma.h | 29 +- + net/sunrpc/xprtsock.c | 9 +- + net/vmw_vsock/vmci_transport.c | 2 - + net/xdp/xsk_queue.h | 7 +- + samples/auxdisplay/.gitignore | 2 +- + samples/binderfs/.gitignore | 3 +- + samples/configfs/configfs_sample.c | 2 - + 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/Makefile.build | 2 +- + scripts/Makefile.lib | 57 +- + scripts/basic/.gitignore | 2 +- + scripts/checkpatch.pl | 15 +- + scripts/dtc/.gitignore | 4 +- + scripts/gcc-plugins/.gitignore | 2 +- + scripts/gdb/linux/cpus.py | 23 +- + scripts/gdb/linux/symbols.py | 3 +- + scripts/genksyms/.gitignore | 2 +- + scripts/genksyms/Makefile | 2 +- + scripts/link-vmlinux.sh | 14 - + scripts/mod/.gitignore | 8 +- + scripts/nsdeps | 2 +- + scripts/recordmcount.pl | 2 +- + scripts/remove-stale-files | 31 + + scripts/setlocalversion | 2 +- + scripts/spelling.txt | 3 + + scripts/tags.sh | 2 +- + sound/pci/hda/hda_generic.c | 16 +- + sound/pci/hda/patch_realtek.c | 90 +- + sound/usb/mixer_maps.c | 12 + + 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/bpf/ringbuf.c | 30 +- + tools/lib/find_bit.c | 56 +- + tools/scripts/Makefile.include | 1 + + tools/testing/selftests/bpf/prog_tests/snprintf.c | 2 + + tools/testing/selftests/bpf/progs/test_snprintf.c | 5 + + .../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/net/mptcp/mptcp_connect.sh | 2 +- + 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/usb/hcd-tests.sh | 2 - + usr/.gitignore | 4 +- + usr/gen_initramfs.sh | 2 +- + usr/include/.gitignore | 4 +- + 733 files changed, 10800 insertions(+), 6307 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 + delete mode 100644 arch/powerpc/platforms/powernv/npu-dma.c + delete mode 100644 arch/sh/kernel/syscalls/syscallhdr.sh + delete mode 100644 arch/sh/kernel/syscalls/syscalltbl.sh + delete mode 100644 arch/sparc/kernel/syscalls/syscallhdr.sh + delete mode 100644 arch/sparc/kernel/syscalls/syscalltbl.sh + 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 + create mode 100644 include/linux/align.h + create mode 100755 scripts/remove-stale-files + create mode 100644 tools/testing/selftests/proc/proc-subset-pid.c +Merging fixes/fixes (e71ba9452f0b Linux 5.11-rc2) +$ git merge fixes/fixes +Already up to date. +Merging kbuild-current/fixes (b741596468b0 Merge tag 'riscv-for-linus-5.13-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ 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 (a48b0872e694 Merge branch 'akpm' (patches from Andrew)) +$ 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 (b741596468b0 Merge tag 'riscv-for-linus-5.13-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge net/master +Already up to date. +Merging bpf/master (31379397dcc3 bpf: Forbid trampoline attach for functions with variable arguments) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + kernel/bpf/btf.c | 12 ++++++++++++ + samples/bpf/xdpsock_user.c | 2 +- + tools/lib/bpf/libbpf.c | 3 +++ + 3 files changed, 16 insertions(+), 1 deletion(-) +Merging ipsec/master (b515d2637276 xfrm: xfrm_state_mtu should return at least 1280 for ipv6) +$ git merge ipsec/master +Auto-merging net/ipv6/esp6.c +Auto-merging net/ipv4/esp4.c +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 (55bc1af3d911 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (bbd6f0a94813 bnxt_en: Fix RX consumer index logic in the error path.) +$ 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 (a6f8ee58a8e3 tcp: Specify cmsgbuf is user pointer for receive zerocopy.) +$ 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 (c1b550294938 ALSA: hda: fixup headset for ASUS GU502 laptop) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/patch_realtek.c | 67 ++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 66 insertions(+), 1 deletion(-) +Merging sound-asoc-fixes/for-linus (03f2880ae8a8 Merge remote-tracking branch 'asoc/for-5.13' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/amd/raven/acp3x-pcm-dma.c | 10 ---------- + sound/soc/amd/raven/acp3x.h | 1 + + sound/soc/amd/raven/pci-acp3x.c | 15 +++++++++++++++ + sound/soc/codecs/da7219.c | 5 +---- + sound/soc/codecs/max98088.c | 13 +++++++++++-- + sound/soc/stm/stm32_sai_sub.c | 5 +---- + 6 files changed, 29 insertions(+), 20 deletions(-) +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 (eb43e665d243 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/Kconfig | 2 +- + drivers/spi/spi-zynq-qspi.c | 9 ++++----- + drivers/spi/spi.c | 26 +++++++++++++++++--------- + 3 files changed, 22 insertions(+), 15 deletions(-) +Merging pci-current/for-linus (cf673bd0cc97 PCI: switchtec: Fix Spectre v1 vulnerability) +$ git merge pci-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 ++-- + drivers/pci/switch/switchtec.c | 9 ++++++--- + 2 files changed, 8 insertions(+), 5 deletions(-) +Merging driver-core.current/driver-core-linus (dd860052c99b Merge tag 'tag-chrome-platform-for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (dd860052c99b Merge tag 'tag-chrome-platform-for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (dd860052c99b Merge tag 'tag-chrome-platform-for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux) +$ 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 385fe5d0fb9b] Merge remote-tracking branch 'phy/fixes' +$ git diff -M --stat --summary HEAD^.. +Merging staging.current/staging-linus (dd860052c99b Merge tag 'tag-chrome-platform-for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux) +$ git merge staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (ca7cb955f315 iio: tsl2583: Fix division by a zero lux_val) +$ git merge iio-fixes/fixes-togreg +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 | 9 +-------- + drivers/iio/light/Kconfig | 2 -- + drivers/iio/light/gp2ap002.c | 5 +++-- + drivers/iio/light/tsl2583.c | 8 ++++++++ + 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 - + 14 files changed, 25 insertions(+), 22 deletions(-) +Merging char-misc.current/char-misc-linus (dd860052c99b Merge tag 'tag-chrome-platform-for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux) +$ 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 (05665cef4b74 Input: xpad - add support for Amazon Game Controller) +$ 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 (cc35518d29bc docs: vfio: fix typo) +$ 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 +Auto-merging drivers/media/platform/coda/coda-common.c +Merge made by the 'recursive' strategy. +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 (2e4f4de38d26 Merge branch 'misc-5.13' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Auto-merging fs/btrfs/tree-log.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/ctree.h +Merge made by the 'recursive' strategy. + fs/btrfs/ctree.h | 2 +- + fs/btrfs/extent-tree.c | 6 +++++- + fs/btrfs/file.c | 35 +++++++++++++++++++++++++---------- + fs/btrfs/free-space-cache.c | 2 +- + fs/btrfs/inode.c | 4 ++-- + fs/btrfs/ioctl.c | 2 +- + fs/btrfs/ordered-data.c | 2 +- + fs/btrfs/qgroup.c | 16 ++++++++++------ + fs/btrfs/send.c | 4 ++-- + fs/btrfs/tree-log.c | 3 ++- + fs/btrfs/zoned.c | 17 +++++++++++++++++ + 11 files changed, 67 insertions(+), 26 deletions(-) +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. +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 (6799e3f281e9 dt-bindings: net: renesas,etheravb: Fix optional second clock name) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (35ffbb60bdad scsi: fnic: Use scsi_host_busy_iter() to traverse commands) +$ git merge scsi-fixes/fixes +Already up to date. +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 (9f4ad9e425a1 Linux 5.12) +$ 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 +Auto-merging fs/file.c +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 (dd860052c99b Merge tag 'tag-chrome-platform-for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux) +$ 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 +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_bo.c +Resolved 'drivers/gpu/drm/ttm/ttm_bo.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1da19d8b4599] Merge remote-tracking branch 'drm-misc-fixes/for-linux-next-fixes' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/vc4/vc4_vec.c | 6 ------ + 1 file changed, 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 (b741596468b0 Merge tag 'riscv-for-linus-5.13-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge kbuild/for-next +Already up to date. +Merging compiler-attributes/compiler-attributes (19c329f68089 Linux 5.11-rc4) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (a7f3d3d3600c dma-mapping: add unlikely hint to error path in dma_mapping_error) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (38489db09b10 Merge branch 'asm-generic-fixes' into asm-generic) +$ git merge asm-generic/master +Already up to date! +Merge made by the 'recursive' strategy. +Merging arc/for-next (def9d2780727 Linux 5.5-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (d3506d256d94 Merge branch 'misc' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (c76fba33467b arm64: kernel: Update the stale comment) +$ git merge arm64/for-next/core +Already up to date. +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 35cb7964cabb] 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 +Auto-merging Documentation/devicetree/bindings/media/rc.yaml +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 f2682bf249ba] 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 d48ab30b688a] 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 +Already up to date! +Merge made by the 'recursive' strategy. +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 (79053496a28d Merge tag 'scmi-fixes-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge scmi/for-linux-next +Merge made by the 'recursive' strategy. + drivers/firmware/arm_scmi/notify.h | 2 -- + drivers/firmware/arm_scpi.c | 4 +++- + 2 files changed, 3 insertions(+), 3 deletions(-) +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 cb9362e0396c] Merge remote-tracking branch 'sunxi/sunxi/for-next' +$ git diff -M --stat --summary HEAD^.. +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 (3ba2d41dca14 Merge branch 'clk-ralink' into clk-next) +$ git merge clk/clk-next +Already up to date. +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 (1294d89b48b0 csky: Fixup 610 bootup failed) +$ git merge csky/linux-next +Merge made by the 'recursive' strategy. + arch/csky/Kconfig | 4 +++- + arch/csky/mm/syscache.c | 12 +++++++----- + 2 files changed, 10 insertions(+), 6 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 +Already up to date. +Merging microblaze/next (47de4477a8e6 microblaze: add 'fallthrough' to memcpy/memset/memmove) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (7e9be673cb1b MIPS: BCM63XX: Use BUG_ON instead of condition followed by BUG.) +$ git merge mips/mips-next +Already up to date. +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 (9f4ad9e425a1 Linux 5.12) +$ git merge parisc-hd/for-next +Already up to date. +Merging powerpc/next (f96271cefe6d Merge branch 'master' into next) +$ git merge powerpc/next +Already up to date. +Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (242b0b398ccd soc: fsl: enable acpi support in RCPM driver) +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (beaf5ae15a13 riscv: remove unused handle_exception symbol) +$ git merge risc-v/for-next +Already up to date. +Merging s390/for-next (a48b0872e694 Merge branch 'akpm' (patches from Andrew)) +$ git merge s390/for-next +Already up to date. +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 +Already up to date. +Merging xtensa/xtensa-for-next (6a8eb99e130f xtensa: ISS: add GDBIO implementation to semihosting interface) +$ git merge xtensa/xtensa-for-next +Already up to date. +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 (0e1c1526416f Merge commit 'ed94f87c2b123241ae5644cf82327e2da653adb6') +$ git merge ceph/master +Auto-merging fs/ceph/dir.c +Merge made by the 'recursive' strategy. + fs/ceph/dir.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging cifs/for-next (e87dbd1cec70 Fix kernel oops when CONFIG_DEBUG_ATOMIC_SLEEP is enabled.) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsfs.c | 2 +- + fs/cifs/cifsglob.h | 3 +-- + fs/cifs/file.c | 27 ++++++++++++--------------- + fs/cifs/misc.c | 9 +++++++++ + 4 files changed, 23 insertions(+), 18 deletions(-) +Merging cifsd/cifsd-for-next (c309fbcfa4c0 Merge pull request #43 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 | 164 + + Documentation/filesystems/cifs/index.rst | 10 + + Documentation/filesystems/index.rst | 2 +- + MAINTAINERS | 12 +- + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/cifsd/Kconfig | 66 + + fs/cifsd/Makefile | 13 + + fs/cifsd/asn1.c | 702 +++ + fs/cifsd/asn1.h | 29 + + fs/cifsd/auth.c | 1344 +++++ + 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 | 8109 ++++++++++++++++++++++++++++++ + fs/cifsd/smb2pdu.h | 1656 ++++++ + 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/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 + + 65 files changed, 32282 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/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 (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs) +$ git merge ecryptfs/next +Already up to date. +Merging erofs/dev (8e6c8fa9f2e9 erofs: enable big pcluster feature) +$ git merge erofs/dev +Already up to date. +Merging exfat/dev (b741596468b0 Merge tag 'riscv-for-linus-5.13-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge exfat/dev +Already up to date. +Merging ext3/for_next (bf7ea7068a02 Pull reiserfs cleanup.) +$ git merge ext3/for_next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ext4/dev (6c0912739699 ext4: wipe ext4_dir_entry2 upon file deletion) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (d665ea6ea86c Merge tag 'for-linus-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml) +$ git merge f2fs/dev +Already up to date. +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 +Already up to date. +Merging jfs/jfs-next (b462cecfa323 fs: Fix typo issue) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/jfs_dmap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nfs/linux-next (9e895cd9649a xprtrdma: Fix a NULL dereference in frwr_unmap_sync()) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (4f8be1f53bf6 nfs: we don't support removing system.nfs4_acl) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (c3213d260a23 SUNRPC: Fix oops in the rpc_xdr_buf event class) +$ git merge nfsd/nfsd-next +Already up to date. +Merging cel/for-next (b9f83ffaa0c0 SUNRPC: Fix null pointer dereference in svc_rqst_free()) +$ git merge cel/for-next +Already up to date. +Merging orangefs/for-next (211f9f2e0503 orangefs: leave files in the page cache for a few micro seconds at least) +$ 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 +Already up to date. +Merging ubifs/next (9a29f7f020e0 ubi: Remove unnecessary struct declaration) +$ git merge ubifs/next +Already up to date. +Merging v9fs/9p-next (f8b139e2f241 fs: 9p: fix v9fs_file_open writeback fid error check) +$ git merge v9fs/9p-next +Already up to date. +Merging xfs/for-next (8e9800f9f2b8 xfs: don't allow log writes if the data device is readonly) +$ git merge xfs/for-next +Already up to date. +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 (6e552494fb90 iomap: remove unused private field from ioend) +$ 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 fs/cifs/file.c +Merge made by the 'recursive' strategy. +Merging printk/for-next (a386d19acc30 Merge branch 'for-5.13' into for-next) +$ git merge printk/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci/next (882862aaacef Merge branch 'pci/tegra') +$ git merge pci/next +Already up to date. +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 (adfd5f216d25 Merge branch 'for-5.13/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 19 +++- + drivers/hid/Makefile | 1 + + drivers/hid/hid-a4tech.c | 2 + + drivers/hid/hid-asus.c | 12 ++- + drivers/hid/hid-core.c | 13 ++- + drivers/hid/hid-debug.c | 3 + + drivers/hid/hid-ft260.c | 5 +- + drivers/hid/hid-google-hammer.c | 10 ++ + drivers/hid/hid-ids.h | 10 +- + drivers/hid/hid-input.c | 9 +- + drivers/hid/hid-ite.c | 1 + + drivers/hid/hid-lg-g15.c | 141 ++++++++++++++++++--------- + drivers/hid/hid-logitech-dj.c | 8 ++ + drivers/hid/hid-logitech-hidpp.c | 12 +++ + drivers/hid/hid-multitouch.c | 18 ++-- + drivers/hid/hid-quirks.c | 4 + + drivers/hid/hid-semitek.c | 40 ++++++++ + drivers/hid/hid-sensor-hub.c | 13 ++- + drivers/hid/hid-thrustmaster.c | 2 +- + drivers/hid/i2c-hid/i2c-hid-core.c | 9 +- + 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/surface_hid_core.c | 6 +- + drivers/hid/usbhid/hid-core.c | 2 +- + drivers/platform/chrome/cros_ec_ishtp.c | 4 +- + include/linux/hid.h | 3 +- + include/linux/intel-ish-client-if.h | 10 +- + include/uapi/linux/input-event-codes.h | 1 + + 37 files changed, 332 insertions(+), 150 deletions(-) + create mode 100644 drivers/hid/hid-semitek.c +Merging i2c/i2c/for-next (f9743e4d0a62 Merge branch 'i2c/for-5.13' into i2c/for-next) +$ git merge i2c/i2c/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging i3c/i3c/next (0d95f41ebde4 Revert "i3c master: fix missing destroy_workqueue() on error in i3c_master_register") +$ git merge i3c/i3c/next +Already up to date. +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 (7fc4607899e8 Enlisted oprofile version line removed) +$ git merge jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (0b276e470a4d media: coda: fix macroblocks count control usage) +$ git merge v4l-dvb/master +Already up to date. +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 (1f348871f80e Merge branch 'acpi-pm' 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 +Already up to date. +Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1) +$ git merge thermal-rzhang/next +Already up to date. +Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor) +$ git merge thermal-soc/next +Already up to date. +Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid') +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/net.c +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 2 -- + 1 file changed, 2 deletions(-) +Merging dlm/next (2fd8db2dd05d fs: dlm: fix missing unlock on error in accept_from_sock()) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (dfc06b389a4f swiotlb: don't override user specified size in swiotlb_adjust_size) +$ git merge swiotlb/linux-next +Already up to date. +Merging rdma/for-next (6da7bda36388 IB/qib: Remove redundant assignment to ret) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (b741596468b0 Merge tag 'riscv-for-linus-5.13-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge net-next/master +Already up to date. +Merging bpf-next/for-next (9d31d2338950 Merge tag 'net-next-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge bpf-next/for-next +Already up to date. +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 (9d31d2338950 Merge tag 'net-next-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge netfilter-next/master +Already up to date. +Merging ipvs-next/master (99ba0ea616aa sfc: adjust efx->xdp_tx_queue_count with the real number of initialized queues) +$ 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 (da68ad722e54 Bluetooth: btqca: Don't modify firmware contents in-place) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/btqca.c | 27 ++++++++++++++++++------- + drivers/bluetooth/btusb.c | 34 ++++++++++++++++++++++++++----- + drivers/bluetooth/hci_qca.c | 4 ++-- + drivers/bluetooth/virtio_bt.c | 3 +++ + include/net/bluetooth/hci.h | 1 + + include/net/bluetooth/hci_core.h | 3 ++- + include/net/bluetooth/mgmt.h | 1 + + net/bluetooth/6lowpan.c | 38 +---------------------------------- + net/bluetooth/cmtp/core.c | 5 +++++ + net/bluetooth/hci_core.c | 22 ++++++++++++++++++++ + net/bluetooth/hci_event.c | 43 ++++++++++++++++++++++++---------------- + net/bluetooth/l2cap_core.c | 2 +- + net/bluetooth/mgmt.c | 9 ++++++++- + net/bluetooth/msft.c | 6 +++--- + 14 files changed, 124 insertions(+), 74 deletions(-) +Merging mac80211-next/master (9d31d2338950 Merge tag 'net-next-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (f2c80837e27e Merge tag 'gfs2-for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2) +$ git merge gfs2/for-next +Already up to date. +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 (0844708ac3d2 Merge tag 'amd-drm-fixes-5.13-2021-05-05' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) +$ git merge drm/drm-next +Already up to date. +$ 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 feb295ceca83] Merge remote-tracking branch 'bluetooth/master' + Date: Mon May 10 08:39:33 2021 +1000 +Merging drm-misc/for-linux-next (b9d79e4ca4ff fbmem: Mark proc_fb_seq_ops as __maybe_unused) +$ git merge drm-misc/for-linux-next +Already up to date. +Merging amdgpu/drm-next (e42491343712 Revert "drm/radeon/si_dpm: Replace one-element array with flexible-array in struct SISLANDS_SMC_SWSTATE") +$ git merge amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/pm/amdgpu_pm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 +- + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 26 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 98 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 18 +- + 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 | 61 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 169 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c | 69 + + drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 28 +- + 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_psp.c | 42 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 99 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 124 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 231 +- + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 6 +- + drivers/gpu/drm/amd/amdgpu/atom.c | 158 + + drivers/gpu/drm/amd/amdgpu/atom.h | 11 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 628 +++- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h | 1 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 11 + + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 31 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.h | 1 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 6 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 5 + + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 1 - + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 35 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 40 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 8 + + drivers/gpu/drm/amd/amdgpu/smuio_v13_0.c | 18 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 6 +- + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 7 + + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 1 + + 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 | 750 ++++- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 19 +- + .../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 | 1 - + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 937 ++++++ + drivers/gpu/drm/amd/amdkfd/kfd_migrate.h | 65 + + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 12 +- + 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 | 124 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 3081 ++++++++++++++++++++ + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 206 ++ + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 76 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 10 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 259 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 22 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 106 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 13 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 27 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 1 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 3 + + drivers/gpu/drm/amd/display/dc/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 2 + + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 58 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 16 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 40 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 5 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 28 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 7 +- + drivers/gpu/drm/amd/display/dc/dc.h | 6 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 2 +- + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 5 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 3 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 19 + + drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 3 + + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 30 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 155 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 5 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 6 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 2 +- + .../display/dc/dcn30/dcn30_dio_stream_encoder.h | 4 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 2 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 9 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 128 +- + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 43 - + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h | 2 - + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 1 + + .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 18 +- + drivers/gpu/drm/amd/display/dc/irq_types.h | 2 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 37 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 88 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 4 + + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 1 - + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 5 + + .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 5 + + drivers/gpu/drm/amd/include/atomfirmware.h | 16 +- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 1 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 66 +- + drivers/gpu/drm/amd/pm/inc/smu_types.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 21 + + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 8 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 21 + + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 - + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.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_dpm.c | 5 +- + drivers/gpu/drm/radeon/sislands_smc.h | 10 +- + drivers/usb/host/xhci-pci.c | 3 + + include/uapi/drm/amdgpu_drm.h | 17 +- + include/uapi/linux/kfd_ioctl.h | 171 +- + 143 files changed, 8361 insertions(+), 1205 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c + 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 +$ git reset --hard HEAD^ +HEAD is now at feb295ceca83 Merge remote-tracking branch 'bluetooth/master' +Merging next-20210504 version of amdgpu +$ git merge -m next-20210504/amdgpu 85021fe9d80007336b6aa7e617e20ec85134c0df +Auto-merging drivers/gpu/drm/amd/pm/amdgpu_pm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 26 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 98 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +- + 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 | 48 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 6 +- + 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_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 28 +- + 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_psp.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 42 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 99 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 123 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 231 +- + drivers/gpu/drm/amd/amdgpu/atom.c | 158 + + drivers/gpu/drm/amd/amdgpu/atom.h | 11 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 628 +++- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h | 1 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 6 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 5 + + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 1 - + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 35 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 28 + + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 8 + + drivers/gpu/drm/amd/amdgpu/smuio_v13_0.c | 18 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +- + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 7 + + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 1 + + 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 | 17 +- + .../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 | 1 - + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 937 ++++++ + drivers/gpu/drm/amd/amdkfd/kfd_migrate.h | 65 + + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 12 +- + 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 | 124 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 3078 ++++++++++++++++++++ + 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 | 9 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 5 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 20 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 3 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 2 + + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 10 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 15 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 22 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 +- + drivers/gpu/drm/amd/display/dc/dc.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 5 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 30 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 2 +- + .../display/dc/dcn30/dcn30_dio_stream_encoder.h | 4 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 2 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 113 +- + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 43 - + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h | 2 - + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 88 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 1 - + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 5 + + .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 5 + + drivers/gpu/drm/amd/include/atomfirmware.h | 16 +- + drivers/gpu/drm/amd/pm/inc/smu_types.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 8 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 - + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.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/usb/host/xhci-pci.c | 3 + + include/uapi/drm/amdgpu_drm.h | 17 +- + include/uapi/linux/kfd_ioctl.h | 171 +- + 104 files changed, 7579 insertions(+), 771 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 (c7b397e9ca4d Merge tag 'gvt-next-fixes-2021-04-29' of https://github.com/intel/gvt-linux into drm-intel-next-fixes) +$ git merge drm-intel/for-linux-next +Already up to date. +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/hub.c | 2 +- + drivers/gpu/drm/tegra/sor.c | 41 +++++++++++++++++++++++------------------ + drivers/gpu/host1x/bus.c | 30 ++++++++++++++++++++++++------ + include/linux/host1x.h | 30 ++++++++++++++++++++++++------ + 4 files changed, 72 insertions(+), 31 deletions(-) +Merging drm-msm/msm-next (f2f46b878777 drm/msm/dp: initialize audio_comp when audio starts) +$ git merge drm-msm/msm-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 9 +++++---- + drivers/gpu/drm/msm/dp/dp_audio.c | 1 + + drivers/gpu/drm/msm/dp/dp_display.c | 26 ++++++++++++++++--------- + drivers/gpu/drm/msm/dp/dp_display.h | 1 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 4 ++++ + drivers/gpu/drm/msm/msm_drv.c | 2 +- + drivers/gpu/drm/msm/msm_gem.c | 16 ++++++++++++++- + drivers/gpu/drm/msm/msm_gem.h | 4 ++-- + 9 files changed, 47 insertions(+), 18 deletions(-) +Merging imx-drm/imx-drm/next (74181df8c6db drm/imx: ipuv3-plane: Remove two unnecessary export symbols) +$ git merge imx-drm/imx-drm/next +Auto-merging drivers/gpu/drm/imx/ipuv3-plane.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/imx/ipuv3-plane.c +Auto-merging drivers/gpu/drm/imx/imx-ldb.c +Auto-merging drivers/gpu/drm/imx/imx-drm-core.c +Resolved 'drivers/gpu/drm/imx/ipuv3-plane.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6b47bfb0f999] 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 (4bfdd2aa67fb drm/etnaviv: rework linear window offset calculation) +$ 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_gem_submit.c | 12 ++--- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 68 ++++++++++++++++------------ + include/uapi/drm/etnaviv_drm.h | 3 ++ + 5 files changed, 51 insertions(+), 43 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 (c1b550294938 ALSA: hda: fixup headset for ASUS GU502 laptop) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (03f2880ae8a8 Merge remote-tracking branch 'asoc/for-5.13' into asoc-linus) +$ 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 +Already up to date. +Merging input/next (d12b64b9764e MAINTAINERS: repair reference in HYCON HY46XX TOUCHSCREEN SUPPORT) +$ git merge input/next +Already up to date. +Merging block/for-next (3c2ed5a8158c Merge branch 'block-5.13' into for-next) +$ git merge block/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging device-mapper/for-next (ca4a4e9a55be dm raid: remove unnecessary discard limits for raid0 and raid10) +$ git merge device-mapper/for-next +Already up to date. +Merging pcmcia/pcmcia-next (e9d503fef7da pcmcia: rsrc_nonstatic: Fix call-back function as reference formatting) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (97fce126e279 mmc: block: Issue a cache flush only when it's enabled) +$ git merge mmc/next +Already up to date. +Merging mfd/for-mfd-next (f9386c91574f mfd: intel-m10-bmc: Add support for MAX10 BMC Secure Updates) +$ git merge mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (04758386757c backlight: journada720: Fix Wmisleading-indentation warning) +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (d0a43c12ee9f power: supply: cpcap-battery: fix invalid usage of list cursor) +$ git merge battery/for-next +Already up to date. +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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check) +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/policy_unpack.c +Auto-merging security/apparmor/policy.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/label.c +Auto-merging security/apparmor/include/label.h +Auto-merging security/apparmor/include/file.h +Auto-merging security/apparmor/apparmorfs.c +Merge made by the 'recursive' strategy. + security/apparmor/apparmorfs.c | 4 +-- + security/apparmor/include/file.h | 2 +- + security/apparmor/include/label.h | 1 + + security/apparmor/include/policy.h | 6 ++-- + security/apparmor/label.c | 4 +-- + security/apparmor/lsm.c | 22 +++++++------- + security/apparmor/path.c | 2 +- + security/apparmor/policy.c | 59 ++++++++++++++++++++++++++++++++------ + security/apparmor/policy_unpack.c | 2 +- + 9 files changed, 73 insertions(+), 29 deletions(-) +Merging integrity/next-integrity (781a57394899 ima: ensure IMA_APPRAISE_MODSIG has necessary dependencies) +$ git merge integrity/next-integrity +Already up to date. +Merging keys/keys-next (e377c31f788f integrity: Load mokx variables into the blacklist keyring) +$ git merge keys/keys-next +Auto-merging scripts/Makefile +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 c71ea499082d] 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 +Already up to date. +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 (a48b0872e694 Merge branch 'akpm' (patches from Andrew)) +$ git merge tomoyo/master +Already up to date. +Merging tpmdd/next (9ccce092fc64 Merge tag 'for-linus-5.13-ofs-1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux) +$ 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 +Already up to date. +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 +Already up to date. +Merging mailbox/mailbox-for-next (2335f556b3af dt-bindings: mailbox: qcom-ipcc: Add compatible for SC7280) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (eb43e665d243 Merge remote-tracking branch 'spi/for-5.13' into spi-linus) +$ git merge spi/for-next +Already up to date. +Merging tip/auto-latest (a95f54035376 Merge branch 'locking/urgent') +$ git merge tip/auto-latest +Already up to date! +Merge made by the 'recursive' strategy. +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 (33aa3698bac9 ARM: PXA: Fix cplds irqdesc allocation when using legacy mode) +$ git merge irqchip/irq/irqchip-next +Merge made by the 'recursive' strategy. + arch/arm/mach-pxa/pxa_cplds_irqs.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) +Merging ftrace/for-next (8c9af478c06b ftrace: Handle commands when closing set_ftrace_filter file) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (35c0c1d51208 Merge branch 'clocksource.2021.05.02a' into HEAD) +$ git merge rcu/rcu/next +Auto-merging lib/Kconfig.debug +Auto-merging kernel/time/jiffies.c +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 | 22 +++ + arch/x86/kernel/tsc.c | 4 +- + include/linux/clocksource.h | 8 +- + kernel/time/Makefile | 1 + + kernel/time/clocksource-wdtest.c | 202 ++++++++++++++++++++++ + kernel/time/clocksource.c | 218 +++++++++++++++++++++++- + kernel/time/jiffies.c | 15 +- + lib/Kconfig.debug | 12 ++ + 8 files changed, 464 insertions(+), 18 deletions(-) + create mode 100644 kernel/time/clocksource-wdtest.c +Merging kvm/next (ce7ea0cfdc2e KVM: SVM: Move GHCB unmapping to fix RCU warning) +$ git merge kvm/next +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/svm/svm.c +Merge made by the 'recursive' strategy. + Documentation/virt/kvm/api.rst | 4 +- + arch/x86/include/asm/kvm_host.h | 15 +- + arch/x86/include/asm/kvm_para.h | 10 +- + arch/x86/include/uapi/asm/kvm.h | 2 + + arch/x86/kernel/kvm.c | 129 ++++++++----- + arch/x86/kernel/kvmclock.c | 26 +-- + arch/x86/kvm/cpuid.c | 20 +- + arch/x86/kvm/emulate.c | 2 +- + arch/x86/kvm/kvm_emulate.h | 1 + + arch/x86/kvm/lapic.c | 2 +- + arch/x86/kvm/mmu/mmu.c | 20 +- + arch/x86/kvm/mmu/tdp_mmu.c | 17 +- + arch/x86/kvm/svm/nested.c | 23 ++- + arch/x86/kvm/svm/sev.c | 32 ++-- + arch/x86/kvm/svm/svm.c | 62 +++--- + arch/x86/kvm/svm/svm.h | 1 + + arch/x86/kvm/vmx/capabilities.h | 3 + + arch/x86/kvm/vmx/nested.c | 29 ++- + arch/x86/kvm/vmx/vmx.c | 220 +++++++++++----------- + arch/x86/kvm/vmx/vmx.h | 12 +- + arch/x86/kvm/x86.c | 153 +++++++++++---- + tools/kvm/kvm_stat/kvm_stat.txt | 2 +- + tools/testing/selftests/kvm/lib/x86_64/handlers.S | 4 +- + tools/testing/selftests/kvm/x86_64/evmcs_test.c | 88 +++++++-- + virt/kvm/kvm_main.c | 7 +- + 25 files changed, 542 insertions(+), 342 deletions(-) +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 +Already up to date. +Merging hsi/for-next (5c08b0f75575 HSI: core: fix resource leaks in hsi_add_client_from_dt()) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (23a700455a1b leds: pca9532: Assign gpio base dynamically) +$ git merge leds/for-next +Already up to date. +Merging ipmi/for-next (d72cd4ad4174 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (dd860052c99b Merge tag 'tag-chrome-platform-for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (dd860052c99b Merge tag 'tag-chrome-platform-for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux) +$ 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 (b85a512e023c usb: cdnsp: Useless condition has been removed) +$ git merge usb-chipidea-next/for-usb-next +Auto-merging drivers/usb/cdns3/cdns3-gadget.c +Merge made by the 'recursive' strategy. + drivers/usb/cdns3/cdns3-gadget.c | 2 +- + drivers/usb/cdns3/cdnsp-mem.c | 5 ++--- + 2 files changed, 3 insertions(+), 4 deletions(-) +Merging tty/tty-next (dd860052c99b Merge tag 'tag-chrome-platform-for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (dd860052c99b Merge tag 'tag-chrome-platform-for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux) +$ 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 +Already up to date. +Merging staging/staging-next (dd860052c99b Merge tag 'tag-chrome-platform-for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux) +$ 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 +Already up to date. +Merging cgroup/for-next (ffeee417d97f cgroup: use tsk->in_iowait instead of delayacct_is_task_waiting_on_io()) +$ git merge cgroup/for-next +Already up to date. +Merging scsi/for-next (3c58f1e2d015 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 (7ff6e99e021c virtio_net: disable cb aggressively) +$ git merge vhost/linux-next +Auto-merging drivers/net/virtio_net.c +Merge made by the 'recursive' strategy. + drivers/net/virtio_net.c | 35 +++++++++++++++++++++++++++++------ + drivers/virtio/virtio_ring.c | 26 +++++++++++++++++++++++++- + 2 files changed, 54 insertions(+), 7 deletions(-) +Merging rpmsg/for-next (dc0e14fa833b Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) +$ git merge gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (444952956f34 dt-bindings: gpio: add YAML description for rockchip,gpio-bank) +$ git merge gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (058459043e71 gpio: ich: Switch to be dependent on LPC_ICH) +$ git merge gpio-intel/for-next +Auto-merging drivers/gpio/gpiolib-acpi.c +Auto-merging drivers/gpio/Kconfig +Merge made by the 'recursive' strategy. +Merging pinctrl/for-next (835109266494 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 +Already up to date. +Merging userns/for-next (ef566ba2d7d9 signal: Remove the last few si_perf references) +$ git merge userns/for-next +Auto-merging kernel/signal.c +Auto-merging kernel/events/core.c +Auto-merging include/uapi/linux/perf_event.h +Auto-merging include/linux/signal.h +Auto-merging include/linux/compat.h +Merge made by the 'recursive' strategy. + arch/alpha/include/uapi/asm/siginfo.h | 2 - + arch/alpha/kernel/osf_sys.c | 2 +- + arch/alpha/kernel/signal.c | 4 +- + arch/alpha/kernel/traps.c | 24 ++--- + arch/alpha/mm/fault.c | 4 +- + arch/arm/kernel/signal.c | 39 +++++++ + arch/arm64/kernel/signal.c | 39 +++++++ + arch/arm64/kernel/signal32.c | 39 +++++++ + arch/m68k/kernel/signal.c | 3 +- + arch/mips/include/uapi/asm/siginfo.h | 2 - + arch/sparc/include/uapi/asm/siginfo.h | 3 - + arch/sparc/kernel/process_64.c | 2 +- + arch/sparc/kernel/signal32.c | 37 +++++++ + arch/sparc/kernel/signal_64.c | 36 +++++++ + arch/sparc/kernel/sys_sparc_32.c | 2 +- + arch/sparc/kernel/sys_sparc_64.c | 2 +- + arch/sparc/kernel/traps_32.c | 22 ++-- + arch/sparc/kernel/traps_64.c | 44 ++++---- + arch/sparc/kernel/unaligned_32.c | 2 +- + arch/sparc/mm/fault_32.c | 2 +- + arch/sparc/mm/fault_64.c | 2 +- + arch/x86/kernel/signal_compat.c | 15 ++- + fs/signalfd.c | 23 ++--- + include/linux/compat.h | 10 +- + include/linux/sched/signal.h | 13 +-- + include/linux/signal.h | 3 +- + include/uapi/asm-generic/siginfo.h | 20 ++-- + include/uapi/linux/perf_event.h | 2 +- + include/uapi/linux/signalfd.h | 4 +- + kernel/events/core.c | 11 +- + kernel/signal.c | 113 +++++++++++++-------- + .../selftests/perf_events/sigtrap_threads.c | 14 +-- + 32 files changed, 377 insertions(+), 163 deletions(-) +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 +Already up to date. +Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC") +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (c150bbbb1731 Merge branch 'for-5.13/signal' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (1efbcec2ef8c coresight: cti: Reduce scope for the variable “cs_fwnode” in cti_plat_create_connection()) +$ git merge coresight/next +Merge made by the 'recursive' strategy. +Merging rtc/rtc-next (4d0185e67806 rtc: sysfs: check features instead of ops) +$ git merge rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (30c10d32152d Merge branch 'for-5.12/cxl' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at24/at24/for-next (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (5c8fe583cce5 Linux 5.11-rc1) +$ git merge ntb/ntb-next +Already up to date. +Merging seccomp/for-next/seccomp (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 cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge cisco/for-next +Already up to date. +Merging gnss/gnss-next (994adcbd3714 gnss: drop stray semicolons) +$ git merge gnss/gnss-next +Merge made by the 'recursive' strategy. + drivers/gnss/mtk.c | 2 +- + drivers/gnss/serial.c | 2 +- + drivers/gnss/sirf.c | 2 +- + drivers/gnss/ubx.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +Merging fsi/next (4a851d714ead fsi: aspeed: Support CFAM reset GPIO) +$ git merge fsi/next +Already up to date. +Merging slimbus/for-next (0320ed0a8236 drivers: slimbus: Fix word resposible -> responsible in slimbus.h) +$ git merge slimbus/for-next +Auto-merging drivers/of/platform.c +Auto-merging drivers/nvmem/Makefile +CONFLICT (content): Merge conflict in drivers/nvmem/Makefile +Auto-merging drivers/nvmem/Kconfig +CONFLICT (content): Merge conflict in drivers/nvmem/Kconfig +Resolved 'drivers/nvmem/Kconfig' using previous resolution. +Resolved 'drivers/nvmem/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 849f3082d627] 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 (20a40e4da6a6 hv_balloon: Remove redundant assignment to region_start) +$ git merge hyperv/hyperv-next +Auto-merging drivers/hv/hv_balloon.c +Merge made by the 'recursive' strategy. + drivers/hv/hv_balloon.c | 1 - + 1 file changed, 1 deletion(-) +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 +Already up to date. +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 +Already up to date. +Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge trivial/for-next +Already up to date. +Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7) +$ git merge zx2c4/for-next +Already up to date. +Merging mhi/mhi-next (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/nommu.c +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 tools/lib/perf/include/perf/event.h +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/process/changes.rst +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 3def12e1a715] 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 (588a8e4a3500 aio: simplify read_events()) +$ git merge --no-ff akpm-current/current +Auto-merging lib/Kconfig.debug +Auto-merging fs/buffer.c +Auto-merging arch/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kdump/kdump.rst | 3 +- + Documentation/admin-guide/kernel-parameters.txt | 6 ++ + Documentation/filesystems/proc.rst | 37 +++++-- + arch/Kconfig | 20 ++++ + fs/aio.c | 9 +- + fs/buffer.c | 56 ++++++++++- + fs/hfsplus/catalog.c | 16 +-- + fs/hfsplus/dir.c | 4 +- + fs/hfsplus/hfsplus_raw.h | 12 ++- + fs/hfsplus/xattr.c | 18 ++-- + fs/ocfs2/namei.c | 17 +++- + fs/proc/base.c | 4 +- + fs/proc/fd.c | 20 +++- + fs/proc/page.c | 40 ++++---- + include/linux/highmem.h | 28 +++--- + include/linux/memremap.h | 6 ++ + include/linux/sched.h | 8 ++ + include/linux/slab.h | 2 + + include/linux/slub_def.h | 2 + + include/linux/wait.h | 4 +- + kernel/crash_core.c | 7 ++ + kernel/hung_task.c | 44 +++++++++ + kernel/sysctl.c | 8 +- + lib/Kconfig.debug | 11 +++ + lib/Makefile | 1 + + lib/test_slub.c | 124 +++++++++++++++++++++++ + mm/memremap.c | 20 ++++ + mm/page_alloc.c | 2 +- + mm/slab.h | 7 +- + mm/slab_common.c | 2 +- + mm/slub.c | 126 ++++++++---------------- + 31 files changed, 491 insertions(+), 173 deletions(-) + create mode 100644 lib/test_slub.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/13)
Rebasing (2/13)
Rebasing (3/13)
Rebasing (4/13)
Rebasing (5/13)
Rebasing (6/13)
Rebasing (7/13)
Rebasing (8/13)
Rebasing (9/13)
Rebasing (10/13)
Rebasing (11/13)
Rebasing (12/13)
Rebasing (13/13)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + b6bf2776a623...076f4112bf61 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (076f4112bf61 memfd_secret: use unsigned int rather than long as syscall flags type) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + 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/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/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 +- + include/linux/secretmem.h | 54 ++++++ + include/linux/set_memory.h | 16 +- + include/linux/syscalls.h | 1 + + include/uapi/asm-generic/unistd.h | 6 +- + include/uapi/linux/magic.h | 1 + + kernel/power/hibernate.c | 5 +- + kernel/power/snapshot.c | 4 +- + kernel/sys_ni.c | 2 + + mm/Kconfig | 3 + + mm/Makefile | 1 + + mm/gup.c | 12 ++ + mm/internal.h | 3 + + mm/mlock.c | 3 +- + mm/mmap.c | 5 +- + mm/secretmem.c | 251 +++++++++++++++++++++++++ + mm/vmalloc.c | 5 +- + scripts/checksyscalls.sh | 4 + + 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 ++ + 37 files changed, 735 insertions(+), 46 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..4b909af43f3a --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20210510 |