summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2021-09-07 15:04:59 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2021-09-07 15:04:59 +1000
commitb2bb710d34d5965358777d5b3b17764fa7bc2a8a (patch)
treeb331d7230044231b0cbb2928d9cce0fb8a509e37
parent77d52d92ec7e64c45e1652349172cb10e72231b0 (diff)
downloadlinux-next-b2bb710d34d5965358777d5b3b17764fa7bc2a8a.tar.gz
Add linux-next specific files for 20210907next-20210907
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r--Next/SHA1s335
-rw-r--r--Next/Trees337
-rw-r--r--Next/merge.log3937
-rw-r--r--localversion-next1
4 files changed, 4610 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 000000000000..cc0035e0fcf8
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,335 @@
+Name SHA1
+---- ----
+origin 4b93c544e90e2b28326182d31ee008eb80e02074
+fixes a9c9a6f741cdaa2fa9ba24a790db8d07295761e3
+kbuild-current 36a21d51725af2ce0700c6ebcb6b9594aac658a6
+arc-current 7c60610d476766e128cc4284bb6349732cbd6606
+arm-current 463dbba4d189750c2f576449d0bbb11c5413712e
+arm64-fixes 3eb9cdffb39701743973382860f214026f4d7825
+arm-soc-fixes 6c35ca06974105d929f25f487c6ae7a47fffa128
+drivers-memory-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3
+m68k-current 87d93029fe83e326d5b906e12e95600b157d2c0d
+powerpc-fixes 787c70f2f9990b5a197320152d2fc32cd8a6ad1a
+s390-fixes c7a5238ef68b98130fe36716bb3fa44502f56001
+sparc 05a59d79793d482f628a31753c671f2e92178a21
+fscrypt-current d19d8d345eecd9247cbe6cbf27aef271bd88aba7
+net b539c44df067ac116ec1b58b956efda51b6a7fc1
+bpf 49ca6153208f6efc409c1deb82dd5bcbb519d7e1
+ipsec d12e1c4649883e8ca5e8ff341e1948b3b6313259
+netfilter ecbd690b52dc11e3ef96139d4cfce53b1191b8a7
+ipvs e3245a7b7b34bd2e97f744fd79463add6e9d41f4
+wireless-drivers e4457a45b41c1c2ec7fb392dc60f4e2386b48a90
+mac80211 57f780f1c43362b86fd23d20bd940e2468237716
+rdma-fixes cc4f596cf85e97ca6606e1bd10b3b9851ef52ddf
+sound-current c8b177b6e3a005bd8fb0395a4bc5db3470301c28
+sound-asoc-fixes bf342ee5e443dcfcf25692597671774152cd93cf
+regmap-fixes e22ce8eb631bdc47a4a4ea7ecf4e4ba499db4f93
+regulator-fixes 7cb623f775d5c2f211ac9612a15ee9d1fef8e2c4
+spi-fixes 34014d01dd27f5d7b59ee46d2414ccd752c8bc77
+pci-current 045a9277b5615846c7b662ffaba84e781f08a172
+driver-core.current 27151f177827d478508e756c7657273261aaf8a9
+tty.current 49624efa65ac9889f4e7c7b2452b2e6ce42ba37d
+usb.current 27151f177827d478508e756c7657273261aaf8a9
+usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120
+usb-serial-fixes dcf097e7d21fbdfbf20e473ac155f4d154018374
+usb-chipidea-fixes 5df09c15bab98463203c83ecab88b9321466e626
+phy e73f0f0ee7541171d89f2e2491130c7771ba58d3
+staging.current 27151f177827d478508e756c7657273261aaf8a9
+iio-fixes ce9e3d5989e549721115cd2cdac51e1826219097
+char-misc.current ba1dc7f273c73b93e0e1dd9707b239ed69eebd70
+soundwire-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3
+thunderbolt-fixes 7d2a07b769330c34b4deabeed939325c77a7ec2f
+input-current 146ea9b679c9f3e235f20456be477ccd109ac9bd
+crypto-current 6ae51ffe5e768d9e25a7f4298e2e7a058472bcc3
+vfio-fixes dc51ff91cf2d1e9a2d941da483602f71d4a51472
+kselftest-fixes 567c39047dbee341244fe3bf79fea24ee0897ff9
+modules-fixes 055f23b74b20f2824ce33047b4cf2e2aa856bf3b
+dmaengine-fixes 7199ddede9f0f2f68d41e6928e1c6c4bca9c39c0
+backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15
+mtd-fixes b48027083a78b13356695555a05b0e085e378687
+mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6
+v4l-dvb-fixes 132c88614f2b3548cd3c8979a434609019db4151
+reset-fixes ed104ca4bd9c405b41e968ad4ece51f6462e90b6
+mips-fixes 6aa32467299e9e12280a6aec9dbc21bf2db830b0
+at91-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5
+omap-fixes e879f855e590b40fe3c79f2fbd8f65ca3c724120
+kvm-fixes 7d2a07b769330c34b4deabeed939325c77a7ec2f
+kvms390-fixes cd4220d23bf3f43cf720e82bdee681f383433ae2
+hwmon-fixes 15d4ec3b12b54ff069016f15c8e66aa727f6d890
+nvdimm-fixes 32b2397c1e56f33b0b1881def965bb89bd12f448
+cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28
+btrfs-fixes 01e9fcf19c1329a46a924d7bf4b45968efa163b3
+vfs-fixes 173e84953eaaf17864a707efa2b8cd4c233b3129
+dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c
+i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8
+drivers-x86-fixes 1e35b8a7780a0c043cc5389420f069b69343f5d9
+samsung-krzk-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3
+pinctrl-samsung-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3
+devicetree-fixes 50d8d7e19c4398da74d028f367754e73547b078b
+scsi-fixes 02c6dcd543f8f051973ee18bfbc4dc3bd595c558
+drm-fixes 7d2a07b769330c34b4deabeed939325c77a7ec2f
+amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01
+drm-intel-fixes 7d2a07b769330c34b4deabeed939325c77a7ec2f
+mmc-fixes b81bede4d138ce62f7342e27bf55ac93c8071818
+rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d
+gnss-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3
+hyperv-fixes f1940d4e9cbe6208e7e77e433c587af108152a17
+soc-fsl-fixes c1e64c0aec8cb0499e61af7ea086b59abba97945
+risc-v-fixes 7d2a07b769330c34b4deabeed939325c77a7ec2f
+pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d
+fpga-fixes 1d345c3e59412bd7d732dcc6b1a22f0665263680
+spdx 49624efa65ac9889f4e7c7b2452b2e6ce42ba37d
+gpio-brgl-fixes 9b87f43537acfa24b95c236beba0f45901356eb2
+gpio-intel-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3
+pinctrl-intel-fixes 2f658f7a3953f6d70bab90e117aff8d0ad44e200
+erofs-fixes 0852b6ca941ef3ff75076e85738877bd3271e1cd
+integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf
+kunit-fixes 2734d6c1b1a089fb593ef6a23d4b70903526fe0c
+ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06
+memblock-fixes 024591f9a6e0164ec23301784d1e6d8f6cacbe59
+cel-fixes 9f4ad9e425a1d3b6a34617b8ea226d56a119a717
+irqchip-fixes 0ddc5e55e6f1da1286fb2646f4248bf7da31a601
+renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609
+drm-misc-fixes fa0b1ef5f7a694f48e00804a391245f3471aa155
+kspp-gustavo 7bc04ce6b914a06d5823509d1de237787c58e649
+kbuild 5a1f175c9acaa36c56894db2b30125e072db6a8c
+compiler-attributes 7ed012969bbcdbd7aef5778a061681e6cbc4b402
+dma-mapping a61cb6017df0a9be072a35259e6e9ae7aa0ef6b3
+asm-generic 8f76f9c46952659dd925c21c3f62a0d05a3f3e71
+arc 56809a28d45fcad94b28cfd614600568c0d46545
+arm 1c9b5911f53bf7af53eb66a97dd4c51742e6a7e5
+arm64 65266a7c6abfa1ad915a362c41bf38576607f1f9
+arm-perf fd264b310579efc14436b2ec86defa5d4c31332e
+arm-soc 5e115b419d2b931203f3531c4f284ae153cfa1ca
+actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6
+amlogic 6285af2a2821573b26d246b801b63e9057d695e1
+aspeed 0f32f00af3443b9199790d340942273fd8ce436f
+at91 b102356e5bc1e99afc0d733015a3096440dacfdb
+drivers-memory c28b584deb1bc81f8a2454b43c82cdda17ed29f6
+imx-mxs 2cb411d8967664aa09ecffd781cb2181b7a40e77
+keystone cb293d3b430e35dbc1e8425869f27624355ff10a
+mediatek 69862ae4e37890fa4313d55ad51dcd5927457e7e
+mvebu 930af8dda7509ce6c79cb44401b79f876599faac
+omap 7911f95d1713e1e7e0a2b3ee4c1624ad9cc85847
+qcom e0f999d1bfc1baa9b82bc893451630928e68241f
+raspberrypi 9f5289ec6f1cb1580b17d666abee2b65886129b5
+renesas 59d7f78144a8a34a290ba84931721eaf11e66ca9
+reset 09f3824342f665d222fb7ac17c91f8334779630b
+rockchip d46148623f264317ef86e6bba32316ff6c3aae38
+samsung-krzk 90861bf54255ebe721c25390bd101544ba408c69
+scmi 7c414a7d93c6d979d4936fde25a42365f08718bf
+stm32 1e6bc5987a5252948e3411e5a2dbb434fd1ea107
+sunxi 3f1c53207cf051d9aec85e9139bd35ada6184143
+tegra cc701ccede61227107787cf8373cee12d89b6cbb
+ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53
+ti-k3-new c1fa5ac6c2f475b5140e6323801ed93c24e7e5cf
+xilinx 4d7e3c8de98ec0e5adda2df9cc50aa4195eb0238
+clk 2cfa946be843834d937e0914552d4967ffd421fc
+clk-imx 86842d255b45fc2103da1cd202f5064397ed41f8
+clk-renesas e8425dd55abb12881694875972465f40bb0fe41b
+clk-samsung a38fd8748464831584a19438cbb3082b5a2dab15
+csky 90dc8c0e664efcb14e2f133309d84bfdcb0b3d24
+h8300 1ec10274d436fbe77b821fbdf095b45d0888e46d
+m68k 87d93029fe83e326d5b906e12e95600b157d2c0d
+m68knommu db87db65c1059f3be04506d122f8ec9b2fa3b05e
+microblaze 315511166469a641c1b838eaca6bdd3af5c362c4
+mips bea6a94a279bcbe6b2cde348782b28baf12255a5
+nds32 40e0dd851e7b7afe219820fb270b09016e41d4fc
+nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae
+openrisc 1955d843efc3b5cf3ab4878986a87ad4972ff4e1
+parisc-hd e9e7d5744de7626dbe0e1ea5b370ab4dadd9709f
+powerpc a3314262eede9c909a0c797f16f25f941d12c78d
+soc-fsl 242b0b398ccd34f73772120bd27a87a1bf00e30b
+risc-v 063df71a574b88e94391a3a719cf66d1b46df884
+s390 e166f652ff5b02562e9000ace7662ab700811153
+sh 2882b7626f4903a8e9250b328cdf7396a6deecac
+sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5
+uml adf9ae0d159d3dc94f58d788fc4757c8749ac0df
+xtensa 7b7cec477fc3cd42ce565dfc3e53f144504fc95c
+pidfd f4dd02cd86310749b53061767382cd9c9d2e2cf4
+fscrypt 38ef66b05cfa3560323344a0b3e09e583f1eb974
+fscache 20ec197bfa13c5b799fc9527790ea7b5374fc8f2
+afs 7af08140979a6e7e12b78c93b8625c8d25b084e2
+btrfs 1efc6199e6b9efeaec17e32c0ce1c4c75cba0b79
+ceph 4b0b8836ebba254088b96911ee60706018a3247f
+cifs 9c849ce86e0fa93a218614eac562ace44053d7ce
+cifsd 303fff2b8c77a85c62dbde3b27c24b084144c04c
+configfs c42dd069be8dfc9b2239a5c89e73bbd08ab35de0
+ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f
+erofs 1266b4a7ecb679587dc4d098abe56ea53313d569
+exfat 50be9417e23af5a8ac860d998e1e3f06b8fd79d7
+ext3 ed518dd035fa07633912f259b90a256f4780395e
+ext4 baaae979b112642a41b71c71c599d875c067d257
+f2fs 1dbe7e386f505bdae30f7436c41769149c7dcf32
+fsverity 07c99001312cbf90a357d4877a358f796eede65b
+fuse a9667ac88e2b20f6426e09945e9dbf555fb86ff0
+gfs2 08d736667185dca2751cf47eabb0830cecdeb160
+jfs 5d299f44d7658f4423e33a0b9915bc8d81687511
+nfs 2734d6c1b1a089fb593ef6a23d4b70903526fe0c
+nfs-anna 8cfb9015280d49f9d92d5b0f88cedf5f0856c0fd
+nfsd e22ce8eb631bdc47a4a4ea7ecf4e4ba499db4f93
+cel 0c217d5066c84f67cd672cf03ec8f682e5d013c2
+ntfs3 2e3a51b59ea26544303e168de8a0479915f09aa3
+orangefs 0fdec1b3c9fbb5e856a40db5993c9eaf91c74a83
+overlayfs 332f606b32b6291a944c8cf23b91f53a6e676525
+ubifs a801fcfeef96702fa3f9b22ad56c5eb1989d9221
+v9fs 9c4d94dc9a64426d2fa0255097a3a84f6ff2eebe
+xfs f38a032b165d812b0ba8378a5cd237c0888ff65f
+zonefs 95b115332a835fb0cbd36dfabacf1c57d915e705
+iomap 03b8df8d43ecc3c5724e6bfb80bc0b9ea2aa2612
+djw-vfs d03ef4daf33a33da8d7c397102fff8ae87d04a93
+file-locks b91db6a0b52e019b6bdabea3f1dbe36d85c7e52c
+vfs 8e222b83dec206cff83f6ec50bf976240041906e
+printk c5734343117072faffd0b188e4fbc0a53ad165b5
+pci 742a4c49a82a8fe1369e4ec2af4a9bf69123cb88
+pstore c5d4fb2539cad2e62c5a3f0d8237613c394f297e
+hid 4bc44ba4871f1991ff30f013812fa48ea88e2c7d
+i2c cc1dbdeb17dd40277ca1cfc5005b59c02d9d2287
+i3c e73f0f0ee7541171d89f2e2491130c7771ba58d3
+dmi f97a2103f1a75ca70f23deadb4d96a16c4d85e7d
+hwmon-staging 15d4ec3b12b54ff069016f15c8e66aa727f6d890
+jc_docs 7c5c18bdb656057cb76fabfa1a74b793ac49da35
+v4l-dvb 9c3a0f285248899dfa81585bc5d5bc9ebdb8fead
+v4l-dvb-next d62cd4d277cc711f781a7bdec4109c6148529b25
+pm 6f65d2319f21868fed3a3a424e6e4005611f1488
+cpufreq-arm 4855e26bcf4d28956f3e33231b961610a0d4a72d
+cpupower 5499f2b80b562c07b5aee157dee51d083083ab97
+devfreq e73f0f0ee7541171d89f2e2491130c7771ba58d3
+opp 94274f20f6bf5eb0099bbf7e133aac1f5cd087e8
+thermal da6deb655a58a5d15507e1107d156fb45c8929de
+ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3
+dlm ecd95673142ef80169a6c003b569b8a86d1e6329
+swiotlb f3c4b1341e8320e63f197a554fc5a25686a11d22
+rdma 6a217437f9f5482a3f6f2dc5fcd27cf0f62409ac
+net-next 27151f177827d478508e756c7657273261aaf8a9
+bpf-next 27151f177827d478508e756c7657273261aaf8a9
+ipsec-next 9e9fb7655ed585da8f468e29221f0ba194a5f613
+mlx5-next 598fe77df855feeeca9dfda2ffe622ac7724e5c3
+netfilter-next 9e9fb7655ed585da8f468e29221f0ba194a5f613
+ipvs-next 7bc416f1471686faa8030cd5338f6a5370e01b25
+wireless-drivers-next eaf2aaec0be4623b1d19f5c6ef770a78a91cf460
+bluetooth 49d8a5606428ca0962d09050a5af81461ff90fbb
+mac80211-next 464a57281f29afc202905b456b0cb8bc729b383a
+mtd c1fe77e42440d2cad76055df6fb58caabf622d51
+nand 6b430c7595e4eb95fae8fb54adc3c3ce002e75ae
+spi-nor 2734d6c1b1a089fb593ef6a23d4b70903526fe0c
+crypto 6ae51ffe5e768d9e25a7f4298e2e7a058472bcc3
+drm 1645cca9da91a85167394a34fcfe1cb5dd336d7f
+drm-misc c4f3a3460a5daebc772d9263500e4099b11e7300
+amdgpu 968ee03d1d01869c96dc6c66012c5538ab2c2a98
+drm-intel fb43ebc83e069625cfeeb2490efc3ffa0013bfa4
+drm-tegra fed0289394173509b3150617e17739d0094ce88e
+drm-msm cb0927ab80d224c9074f53d1a55b087d12ec5a85
+imx-drm 20fbfc81e390180db738c414c1b7ac85d31e24b3
+etnaviv 81fd23e2b3ccf71c807e671444e8accaba98ca53
+regmap ca5537c9be13c205492e704c5a3016f54b2fefec
+sound c8b177b6e3a005bd8fb0395a4bc5db3470301c28
+sound-asoc bf342ee5e443dcfcf25692597671774152cd93cf
+modules ced75a2f5da71de5775fda44250e27d7b8024355
+input daf87bffd02e35387a62c77eb32337c934cf631a
+block db3d77ce1c494ff1da21d9ab0d33233d17014ba5
+device-mapper d3703ef331297b6daa97f5228cbe2a657d0cfd21
+pcmcia e39cdacf2f664b09029e7c1eb354c91a20c367af
+mmc b81bede4d138ce62f7342e27bf55ac93c8071818
+mfd 90b122d0ad1651208bb872429453343a7ac7e825
+backlight 79fad92f2e596f5a8dd085788a24f540263ef887
+battery c9398455b046fc7a44b6dd53d9d6fe4b11c21700
+regulator 7cb623f775d5c2f211ac9612a15ee9d1fef8e2c4
+security 047843bdb3160e8fb225f3752616ac7257033fe4
+apparmor d108370c644b153382632b3e5511ade575c91c86
+integrity cb181da161963eddc9de0000de6ab2c7942be219
+keys e377c31f788fc98815e1ab90b5a35704ce35843a
+safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5
+selinux 893c47d1964f5c9b00c5468f2cd1a1e9351fbb6a
+smack bfc3cac0c76126995737f1b858d2cdb476be5b1d
+tomoyo 7d2a07b769330c34b4deabeed939325c77a7ec2f
+tpmdd f985911b7bc75d5c98ed24d8aaa8b94c590f7c6a
+watchdog 41e73feb1024929e75eaf2f7cd93f35a3feb331b
+iommu d8768d7eb9c21ef928adb93402d9348bcc4a6915
+audit 67d69e9d1a6c889d98951c1d74b19332ce0565af
+devicetree b1e202503508d5b66bf1532bea36b5776b00d869
+mailbox 85dfdbfc13ea9614a2168ce4a7d2cd089d84cb64
+spi 34014d01dd27f5d7b59ee46d2414ccd752c8bc77
+tip ee0f507188b804b76d45078abd4e967a40642009
+clockevents f196ae282070d798c9144771db65577910d58566
+edac cf4e6d52f58399c777276172ec250502e19d5e63
+irqchip 6e3b473ee06445d4eae2f8b1e143db70ed66f519
+ftrace 4420f5b1be7b117330526f3eabd13d840f510b15
+rcu 38babc43f45e08a6ea613b1f890d6f1837b16bfd
+kvm 109bbba5066b42431399b40e947243f049d8dc8d
+kvm-arm 419025b3b4190ee867ef4fc48fb3bd7da2e67a0c
+kvm-ppc 72476aaa469179222b92c380de60c76b4cb9a318
+kvms390 a3e03bc1368c1bc16e19b001fc96dc7430573cc8
+xen-tip 58e636039b512697554b579c2bb23774061877f5
+percpu a81a52b325ec886eb004ca28b943480dae0353c7
+workqueues bdb0a6548d2233dada752109a71bcf4c9b8ae6d6
+drivers-x86 0487d4fc42d7f31a56cfd9e2237f9ebd889e6112
+chrome-platform 4665584888ad2175831c972c004115741ec799e9
+hsi e73f0f0ee7541171d89f2e2491130c7771ba58d3
+leds 239f32b4f161c1584cd4b386d6ab8766432a6ede
+ipmi bf064c7bec3bfe7e28889774dc9e0ca4f7236775
+driver-core 27151f177827d478508e756c7657273261aaf8a9
+usb 27151f177827d478508e756c7657273261aaf8a9
+usb-gadget e49d033bddf5b565044e2abe4241353959bc9120
+usb-serial a65ab973c1669d3edc27719527bb3906f7b09918
+usb-chipidea-next e5d6a7c6cfae9e714a0e8ff64facd1ac68a784c6
+tty 49624efa65ac9889f4e7c7b2452b2e6ce42ba37d
+char-misc 4cd67adc44a3ccdb3b8526c9f932f905284e028f
+extcon 07de34f5ce1e76811d8567b41ccfff244d78874c
+phy-next 152a810eae03f16e982444ffe3b0eca933a750cd
+soundwire 2564a2d4418bac166a9db2d6ca2f8b99953b1df5
+thunderbolt 42716425ad7e1b6529ec61c260c11176841f4b5f
+vfio ea870730d83fc13a5fa2bd0e175176d7ac8a400a
+staging 27151f177827d478508e756c7657273261aaf8a9
+iio d484c21bacfa8bd2fa9fc26393ec59108f508c4c
+mux 3516bd729358a2a9b090c1905bd2a3fa926e24c6
+icc 8bf5d31c4f06d806ae24a3ba998a2f4eaccfa7c1
+dmaengine 11a427be2c4749954e8b868ef5301dc65ca5a14b
+cgroup 96aff80dde1b7ccd1f335eff4f5cd9bae37e74c2
+scsi 27f681116fdf776a05d643dee4de318ec0f368a4
+scsi-mkp 9b5ac8ab4e8bf5636d1d425aee68ddf45af12057
+vhost 7bc7f61897b66bef78bb5952e3d1e9f3aaf9ccca
+rpmsg c93ca5f21d9362aac84438e06b5280460a038319
+gpio 7ac554888233468a9fd7c4f28721396952dd9959
+gpio-brgl 889a1b3f35db6ba5ba6a0c23a3a55594570b6a17
+gpio-intel 5111c2b6b0194b509f47e6338c4deeeb4497bda8
+pinctrl 04853352952b7dd17f355ed54bd81305b341af55
+pinctrl-intel 2f658f7a3953f6d70bab90e117aff8d0ad44e200
+pinctrl-renesas c4c4637eb57f2a25c445421aadeb689a2538b20b
+pinctrl-samsung cdd3d945dcec0d0dab845175dc9400ab54512aa6
+pwm 3f2b16734914fa7c53ef7f8a10a63828890dbd37
+userns a3be01837fc9f2c0f9f7356adec7222c0e199af8
+ktest 170f4869e66275f498ae4736106fb54c0fdcd036
+kselftest 67d6d80d90fb27b3cc7659f464fa3b87fd67bc14
+livepatching cd2d68f2d6b2e5cee0b49c13cef052baca8c0b76
+coresight 1efbcec2ef8c037f1e801c76e4b9434ee2400be7
+rtc 8158da6a33f2656c2a98c30eb9185a44e215a6b6
+nvdimm bdd3c50d83bf7f6acc869b48d02670d19030ae03
+at24 658ae44345c1b9b9e055c2e40464dc0260878462
+ntb f96cb827ce49627543b4aabe8d54d8ea9740ae4e
+seccomp b4d8a58f8dcfcc890f296696cadb76e77be44b5f
+kspp 3103f67eb4400355fb03e98a61224a32b06f4f48
+cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b
+gnss 0f79ce970e79ffb771733f9634d5918d0eb3e30a
+fsi 9ab1428dfe2c66b51e0b41337cd0164da0ab6080
+slimbus e5c578adcdd974f73380f0e5a5595354fcab0d60
+nvmem 74f671aed9e7f624308e0238b582b490b1180150
+xarray 2c7e57a02708a69d0194f9ef2a7b7e54f5a0484a
+hyperv 9d68cd9120e4e3af38f843e165631c323b86b4e4
+auxdisplay 24ebc044c72ee6e88dc902a0041bac672f012537
+kgdb f8416aa29185468e0d914ba4b2a330fd53ee263f
+hmm 79fbd3e1241cea83dded06db2b8bcd5893d877d7
+fpga 4f45f3404960109843eaa92c8a4a850d6bdd9981
+kunit e73f0f0ee7541171d89f2e2491130c7771ba58d3
+cfi ff1176468d368232b684f75e82563369208bc371
+kunit-next acd8e8407b8fcc3229d6d8558cac338bea801aed
+trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529
+mhi 813272ed5238b37c81e448b302048e8008570121
+memblock e888fa7bb882a1f305526d8f49d7016a7bc5f5ca
+init 38b082236e77d403fed23ac2d30d570598744ec3
+counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62
+rust 5d3986cf8ed63ff8d86270e578649e71143112d6
+cxl 00ca683e618065e2375b49c91002384735c76d41
+folio 1a90e9dae32ce26de43c1c5eddb3ecce27f2a640
+akpm-current ec14ea3dfa1415b11ded126b8aa3d95f4b15d01f
+akpm b99a71cb1a494273196ff0bc972e06237a4a434e
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 000000000000..27f06675e963
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,337 @@
+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
+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
+irqchip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-fixes
+renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes
+drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes
+kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp
+kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next
+compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes
+dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next
+asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master
+arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next
+arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next
+arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core
+arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf
+arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next
+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/amlogic/linux.git#for-next
+aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.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
+renesas 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
+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
+gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.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
+ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master
+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
+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
+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
+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.kernel.org/pub/scm/linux/kernel/git/djakov/icc.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
+kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next
+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
+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
+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
+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
+folio git git://git.infradead.org/users/willy/pagecache.git#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..31c2565795de
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,3937 @@
+$ date -R
+Tue, 07 Sep 2021 08:11:20 +1000
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 27151f177827 Merge tag 'perf-tools-for-v5.15-2021-09-04' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux
+Merging origin/master (4b93c544e90e thunderbolt: test: split up test cases in tb_test_credit_alloc_all)
+$ git merge origin/master
+Updating 27151f177827..4b93c544e90e
+Fast-forward
+ MAINTAINERS | 3 +-
+ block/bfq-iosched.c | 16 +-
+ block/bio.c | 2 +-
+ block/mq-deadline.c | 12 +-
+ drivers/ata/libata-core.c | 34 +++
+ drivers/block/loop.c | 75 +++--
+ drivers/block/loop.h | 1 +
+ drivers/net/wireless/intel/iwlwifi/fw/uefi.c | 4 +-
+ drivers/thunderbolt/test.c | 98 +++++--
+ fs/io-wq.c | 424 ++++++++++++++++-----------
+ fs/io_uring.c | 76 ++++-
+ include/linux/libata.h | 1 +
+ include/trace/events/io_uring.h | 6 +-
+ lib/test_scanf.c | 79 ++++-
+ scripts/checksyscalls.sh | 2 +-
+ 15 files changed, 584 insertions(+), 249 deletions(-)
+Merging fixes/fixes (a9c9a6f741cd Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
+$ git merge fixes/fixes
+Already up to date.
+Merging kbuild-current/fixes (36a21d51725a Linux 5.14-rc5)
+$ git merge kbuild-current/fixes
+Already up to date.
+Merging arc-current/for-curr (7c60610d4767 Linux 5.14-rc6)
+$ git merge arc-current/for-curr
+Already up to date.
+Merging arm-current/fixes (463dbba4d189 ARM: 9104/2: Fix Keystone 2 kernel mapping regression)
+$ git merge arm-current/fixes
+Already up to date.
+Merging arm64-fixes/for-next/fixes (3eb9cdffb397 Partially revert "arm64/mm: drop HAVE_ARCH_PFN_VALID")
+$ git merge arm64-fixes/for-next/fixes
+Already up to date.
+Merging arm-soc-fixes/arm/fixes (6c35ca069741 Merge tag 'reset-fixes-for-v5.14' of git://git.pengutronix.de/pza/linux into arm/fixes)
+$ git merge arm-soc-fixes/arm/fixes
+Already up to date.
+Merging drivers-memory-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1)
+$ git merge drivers-memory-fixes/fixes
+Already up to date.
+Merging m68k-current/for-linus (87d93029fe83 m68k: Fix asm register constraints for atomic ops)
+$ git merge m68k-current/for-linus
+Already up to date.
+Merging powerpc-fixes/fixes (787c70f2f999 powerpc/64s: Fix scv implicit soft-mask table for relocated kernels)
+$ git merge powerpc-fixes/fixes
+Already up to date.
+Merging s390-fixes/fixes (c7a5238ef68b Merge tag 's390-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
+$ 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 (b539c44df067 net: wwan: iosm: Unify IO accessors used in the driver)
+$ git merge net/master
+Auto-merging drivers/net/usb/hso.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/networking/nf_conntrack-sysctl.rst | 13 +-
+ MAINTAINERS | 20 +-
+ drivers/net/bonding/bond_main.c | 17 +-
+ drivers/net/dsa/b53/b53_common.c | 34 ++-
+ drivers/net/dsa/b53/b53_priv.h | 1 +
+ drivers/net/dsa/lantiq_gswip.c | 3 +-
+ drivers/net/ethernet/3com/3c59x.c | 2 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 67 +++---
+ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 37 ++--
+ drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 51 +++--
+ drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h | 4 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.c | 14 +-
+ drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 1 +
+ drivers/net/ethernet/cirrus/Kconfig | 2 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 2 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 2 +-
+ drivers/net/ethernet/i825xx/sun3_82586.c | 2 +-
+ drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 8 +-
+ drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 17 +-
+ drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 1 +
+ drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 42 ++--
+ .../ethernet/marvell/octeontx2/nic/otx2_common.c | 5 -
+ .../ethernet/marvell/octeontx2/nic/otx2_common.h | 28 +--
+ .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 4 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 12 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 2 -
+ .../net/ethernet/pensando/ionic/ionic_ethtool.c | 5 +
+ drivers/net/ethernet/pensando/ionic/ionic_lif.c | 12 +-
+ .../net/ethernet/pensando/ionic/ionic_rx_filter.c | 2 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 1 -
+ drivers/net/ethernet/qualcomm/emac/emac-ethtool.c | 2 +-
+ drivers/net/ethernet/smsc/smc911x.c | 12 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 10 +-
+ drivers/net/ethernet/xscale/ptp_ixp46x.c | 1 -
+ drivers/net/usb/cdc_mbim.c | 5 +
+ drivers/net/usb/hso.c | 11 +-
+ drivers/net/usb/qmi_wwan.c | 1 +
+ drivers/net/wwan/iosm/iosm_ipc_mmio.c | 30 +--
+ include/linux/etherdevice.h | 12 ++
+ include/linux/netdevice.h | 18 ++
+ include/linux/netfilter/nf_conntrack_common.h | 1 +
+ include/linux/soc/marvell/octeontx2/asm.h | 11 +-
+ include/net/flow.h | 4 +-
+ include/uapi/linux/netfilter/nfnetlink_conntrack.h | 1 +
+ include/uapi/linux/pkt_sched.h | 2 +
+ net/bridge/br_multicast.c | 4 +-
+ net/core/pktgen.c | 1 -
+ net/core/skbuff.c | 2 +-
+ net/dsa/tag_rtl4_a.c | 7 +-
+ net/ipv4/cipso_ipv4.c | 18 +-
+ net/ipv4/ip_gre.c | 9 +-
+ net/ipv4/nexthop.c | 2 +
+ net/ipv6/addrconf.c | 28 ++-
+ net/ipv6/ip6_gre.c | 2 -
+ net/ipv6/mcast.c | 10 +-
+ net/ipv6/netfilter/nf_socket_ipv6.c | 4 +-
+ net/ipv6/seg6_iptunnel.c | 2 +-
+ net/mptcp/pm_netlink.c | 10 +-
+ net/mptcp/protocol.c | 97 ++++-----
+ net/mptcp/protocol.h | 3 +-
+ net/ncsi/internal.h | 3 +
+ net/ncsi/ncsi-manage.c | 25 ++-
+ net/ncsi/ncsi-pkt.h | 6 +
+ net/ncsi/ncsi-rsp.c | 42 ++++
+ net/netfilter/nf_conntrack_core.c | 103 +++++----
+ net/netfilter/nf_conntrack_expect.c | 25 ++-
+ net/netfilter/nf_conntrack_netlink.c | 4 +-
+ net/netfilter/nf_conntrack_standalone.c | 4 +-
+ net/netfilter/nf_nat_core.c | 18 +-
+ net/netfilter/nft_ct.c | 9 +-
+ net/qrtr/qrtr.c | 2 +-
+ net/sched/sch_fq_codel.c | 12 +-
+ net/tipc/socket.c | 2 +-
+ .../testing/selftests/bpf/prog_tests/xdp_bonding.c | 74 ++++++-
+ tools/testing/selftests/net/Makefile | 1 +
+ tools/testing/selftests/net/gre_gso.sh | 236 +++++++++++++++++++++
+ tools/testing/selftests/net/mptcp/simult_flows.sh | 4 +-
+ 78 files changed, 945 insertions(+), 360 deletions(-)
+ create mode 100755 tools/testing/selftests/net/gre_gso.sh
+Merging bpf/master (49ca6153208f bpf: Relicense disassembler as GPL-2.0-only OR BSD-2-Clause)
+$ git merge bpf/master
+Merge made by the 'recursive' strategy.
+ kernel/bpf/disasm.c | 2 +-
+ kernel/bpf/disasm.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging ipsec/master (d12e1c464988 net: dsa: b53: Set correct number of ports in the DSA struct)
+$ git merge ipsec/master
+Already up to date.
+Merging netfilter/master (ecbd690b52dc octeontx2-af: Fix some memory leaks in the error handling path of 'cgx_lmac_init()')
+$ git merge netfilter/master
+Already up to date.
+Merging ipvs/master (e3245a7b7b34 netfilter: nft_ct: protect nft_ct_pcpu_template_refcnt with mutex)
+$ git merge ipvs/master
+Already up to date.
+Merging wireless-drivers/master (e4457a45b41c iwlwifi: fix printk format warnings in uefi.c)
+$ git merge wireless-drivers/master
+Merge made by the 'recursive' strategy.
+ drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 2 +-
+ drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 6 +++++-
+ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 1 +
+ 3 files changed, 7 insertions(+), 2 deletions(-)
+Merging mac80211/master (57f780f1c433 atlantic: Fix driver resume flow.)
+$ git merge mac80211/master
+Already up to date.
+Merging rdma-fixes/for-rc (cc4f596cf85e RDMA/rxe: Zero out index member of struct rxe_queue)
+$ git merge rdma-fixes/for-rc
+Already up to date.
+Merging sound-current/for-linus (c8b177b6e3a0 ALSA: usb-audio: Add registration quirk for JBL Quantum 800)
+$ git merge sound-current/for-linus
+Merge made by the 'recursive' strategy.
+ sound/usb/quirks.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging sound-asoc-fixes/for-linus (bf342ee5e443 Merge remote-tracking branch 'asoc/for-5.15' into asoc-linus)
+$ git merge sound-asoc-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/sound/fsl,rpmsg.yaml | 1 +
+ .../devicetree/bindings/sound/mt8195-afe-pcm.yaml | 40 ++++++++++------------
+ sound/soc/codecs/rt5682.c | 3 --
+ sound/soc/generic/audio-graph-card.c | 6 ++++
+ sound/soc/intel/boards/Kconfig | 2 +-
+ sound/soc/mediatek/Kconfig | 3 +-
+ .../mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c | 22 ++++++------
+ sound/soc/rockchip/rockchip_i2s.c | 7 ++++
+ sound/soc/samsung/s3c24xx_simtec.c | 2 +-
+ 9 files changed, 47 insertions(+), 39 deletions(-)
+Merging regmap-fixes/for-linus (e22ce8eb631b Linux 5.14-rc7)
+$ git merge regmap-fixes/for-linus
+Already up to date.
+Merging regulator-fixes/for-linus (7cb623f775d5 Merge remote-tracking branch 'regulator/for-5.15' into regulator-linus)
+$ git merge regulator-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/regulator/qcom-rpmh-regulator.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging spi-fixes/for-linus (34014d01dd27 Merge remote-tracking branch 'spi/for-5.15' into spi-linus)
+$ git merge spi-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/spi/spi-rockchip.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+Merging pci-current/for-linus (045a9277b561 PCI/sysfs: Use correct variable for the legacy_mem sysfs object)
+$ git merge pci-current/for-linus
+Already up to date.
+Merging driver-core.current/driver-core-linus (27151f177827 Merge tag 'perf-tools-for-v5.15-2021-09-04' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux)
+$ git merge driver-core.current/driver-core-linus
+Already up to date.
+Merging tty.current/tty-linus (49624efa65ac Merge tag 'denywrite-for-5.15' of git://github.com/davidhildenbrand/linux)
+$ git merge tty.current/tty-linus
+Already up to date.
+Merging usb.current/usb-linus (27151f177827 Merge tag 'perf-tools-for-v5.15-2021-09-04' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/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 (dcf097e7d21f USB: serial: pl2303: fix GL type detection)
+$ git merge usb-serial-fixes/usb-linus
+Already up to date.
+Merging usb-chipidea-fixes/for-usb-fixes (5df09c15bab9 usb: cdnsp: Fix the IMAN_IE_SET and IMAN_IE_CLEAR macro)
+$ git merge usb-chipidea-fixes/for-usb-fixes
+Already up to date.
+Merging phy/fixes (e73f0f0ee754 Linux 5.14-rc1)
+$ git merge phy/fixes
+Already up to date.
+Merging staging.current/staging-linus (27151f177827 Merge tag 'perf-tools-for-v5.15-2021-09-04' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux)
+$ git merge staging.current/staging-linus
+Already up to date.
+Merging iio-fixes/fixes-togreg (ce9e3d5989e5 iio: adc128s052: Fix the error handling path of 'adc128_probe()')
+$ git merge iio-fixes/fixes-togreg
+Merge made by the 'recursive' strategy.
+ drivers/iio/accel/fxls8962af-core.c | 2 +-
+ drivers/iio/adc/rzg2l_adc.c | 2 +-
+ drivers/iio/adc/ti-adc128s052.c | 6 ++++++
+ drivers/iio/dac/ti-dac5571.c | 1 +
+ 4 files changed, 9 insertions(+), 2 deletions(-)
+Merging char-misc.current/char-misc-linus (ba1dc7f273c7 Merge tag 'char-misc-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc)
+$ git merge char-misc.current/char-misc-linus
+Already up to date.
+Merging soundwire-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1)
+$ git merge soundwire-fixes/fixes
+Already up to date.
+Merging thunderbolt-fixes/fixes (7d2a07b76933 Linux 5.14)
+$ git merge thunderbolt-fixes/fixes
+Already up to date.
+Merging input-current/for-linus (146ea9b679c9 Input: edt-ft5x06 - added case for EDT EP0110M09)
+$ git merge input-current/for-linus
+Removing drivers/input/misc/sirfsoc-onkey.c
+Removing drivers/input/misc/ixp4xx-beeper.c
+Auto-merging drivers/input/keyboard/Kconfig
+Removing Documentation/devicetree/bindings/power/reset/qcom,pon.txt
+Removing Documentation/devicetree/bindings/input/touchscreen/tsc2005.txt
+Removing Documentation/devicetree/bindings/input/touchscreen/pixcir_i2c_ts.txt
+Removing Documentation/devicetree/bindings/input/touchscreen/chipone_icn8318.txt
+Removing Documentation/devicetree/bindings/input/regulator-haptic.txt
+Removing Documentation/devicetree/bindings/input/qcom,pm8941-pwrkey.txt
+Merge made by the 'recursive' strategy.
+ .../input/allwinner,sun4i-a10-lradc-keys.yaml | 2 +
+ .../bindings/input/qcom,pm8941-pwrkey.txt | 55 ------
+ .../bindings/input/qcom,pm8941-pwrkey.yaml | 51 +++++
+ .../devicetree/bindings/input/regulator-haptic.txt | 21 ---
+ .../bindings/input/regulator-haptic.yaml | 43 +++++
+ .../input/touchscreen/chipone,icn8318.yaml | 62 ++++++
+ .../bindings/input/touchscreen/chipone_icn8318.txt | 44 -----
+ .../input/touchscreen/pixcir,pixcir_ts.yaml | 68 +++++++
+ .../bindings/input/touchscreen/pixcir_i2c_ts.txt | 31 ---
+ .../bindings/input/touchscreen/ti,tsc2005.yaml | 128 +++++++++++++
+ .../bindings/input/touchscreen/tsc2005.txt | 64 -------
+ .../devicetree/bindings/power/reset/qcom,pon.txt | 49 -----
+ .../devicetree/bindings/power/reset/qcom,pon.yaml | 80 ++++++++
+ .../bindings/power/reset/reboot-mode.yaml | 2 +-
+ drivers/input/keyboard/Kconfig | 2 +-
+ drivers/input/keyboard/adc-keys.c | 2 +-
+ drivers/input/keyboard/adp5588-keys.c | 2 +-
+ drivers/input/keyboard/adp5589-keys.c | 2 +-
+ drivers/input/keyboard/ep93xx_keypad.c | 4 +-
+ drivers/input/misc/Kconfig | 22 ---
+ drivers/input/misc/Makefile | 2 -
+ drivers/input/misc/ixp4xx-beeper.c | 183 ------------------
+ drivers/input/misc/pm8941-pwrkey.c | 2 +-
+ drivers/input/misc/sirfsoc-onkey.c | 207 ---------------------
+ drivers/input/serio/parkbd.c | 14 +-
+ drivers/input/touchscreen/Kconfig | 2 +-
+ drivers/input/touchscreen/edt-ft5x06.c | 1 +
+ 27 files changed, 445 insertions(+), 700 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/input/qcom,pm8941-pwrkey.txt
+ create mode 100644 Documentation/devicetree/bindings/input/qcom,pm8941-pwrkey.yaml
+ delete mode 100644 Documentation/devicetree/bindings/input/regulator-haptic.txt
+ create mode 100644 Documentation/devicetree/bindings/input/regulator-haptic.yaml
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/chipone,icn8318.yaml
+ delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/chipone_icn8318.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/pixcir,pixcir_ts.yaml
+ delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/pixcir_i2c_ts.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/ti,tsc2005.yaml
+ delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/tsc2005.txt
+ delete mode 100644 Documentation/devicetree/bindings/power/reset/qcom,pon.txt
+ create mode 100644 Documentation/devicetree/bindings/power/reset/qcom,pon.yaml
+ delete mode 100644 drivers/input/misc/ixp4xx-beeper.c
+ delete mode 100644 drivers/input/misc/sirfsoc-onkey.c
+Merging crypto-current/master (6ae51ffe5e76 crypto: sha512 - remove imaginary and mystifying clearing of variables)
+$ git merge crypto-current/master
+Already up to date.
+Merging vfio-fixes/for-linus (dc51ff91cf2d vfio/platform: fix module_put call in error flow)
+$ git merge vfio-fixes/for-linus
+Already up to date.
+Merging kselftest-fixes/fixes (567c39047dbe selftests/sgx: Fix Q1 and Q2 calculation in sigstruct.c)
+$ git merge kselftest-fixes/fixes
+Already up to date.
+Merging modules-fixes/modules-linus (055f23b74b20 module: check for exit sections in layout_sections() instead of module_init_section())
+$ git merge modules-fixes/modules-linus
+Already up to date.
+Merging dmaengine-fixes/fixes (7199ddede9f0 dmaengine: imx-dma: configure the generic DMA type to make it work)
+$ 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 (b48027083a78 mtd: rawnand: Fix probe failure due to of_get_nand_secure_regions())
+$ 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 (132c88614f2b media: cedrus: Fix SUNXI tile size calculation)
+$ git merge v4l-dvb-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/staging/media/hantro/hantro_drv.c | 2 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_video.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging reset-fixes/reset/fixes (ed104ca4bd9c reset: reset-zynqmp: Fixed the argument data type)
+$ git merge reset-fixes/reset/fixes
+Already up to date.
+Merging mips-fixes/mips-fixes (6aa32467299e MIPS: check return value of pgtable_pmd_page_ctor)
+$ git merge mips-fixes/mips-fixes
+Already up to date.
+Merging at91-fixes/at91-fixes (6efb943b8616 Linux 5.13-rc1)
+$ git merge at91-fixes/at91-fixes
+Already up to date.
+Merging omap-fixes/fixes (e879f855e590 bus: ti-sysc: Add break in switch statement in sysc_init_soc())
+$ git merge omap-fixes/fixes
+Auto-merging drivers/bus/ti-sysc.c
+Merge made by the 'recursive' strategy.
+ drivers/bus/ti-sysc.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging kvm-fixes/master (7d2a07b76933 Linux 5.14)
+$ git merge kvm-fixes/master
+Already up to date.
+Merging kvms390-fixes/master (cd4220d23bf3 KVM: selftests: do not require 64GB in set_memory_region_test)
+$ git merge kvms390-fixes/master
+Already up to date.
+Merging hwmon-fixes/hwmon (15d4ec3b12b5 hwmon: (k10temp) Remove residues of current and voltage)
+$ git merge hwmon-fixes/hwmon
+Merge made by the 'recursive' strategy.
+ Documentation/hwmon/k10temp.rst | 17 -----------------
+ drivers/hwmon/k10temp.c | 6 ------
+ 2 files changed, 23 deletions(-)
+Merging nvdimm-fixes/libnvdimm-fixes (32b2397c1e56 libnvdimm/pmem: Fix crash triggered when I/O in-flight during unbind)
+$ git merge nvdimm-fixes/libnvdimm-fixes
+Merge made by the 'recursive' strategy.
+ drivers/nvdimm/pmem.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+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 (01e9fcf19c13 Merge branch 'misc-5.14' into next-fixes)
+$ git merge btrfs-fixes/next-fixes
+Already up to date.
+Merge made by the 'recursive' strategy.
+Merging vfs-fixes/fixes (173e84953eaa fs: fix reporting supported extra file attributes for statx())
+$ git merge vfs-fixes/fixes
+Auto-merging fs/stat.c
+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 (1e35b8a7780a platform/x86: gigabyte-wmi: add support for B450M S2H V2)
+$ git merge drivers-x86-fixes/fixes
+Already up to date.
+Merging samsung-krzk-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1)
+$ git merge samsung-krzk-fixes/fixes
+Already up to date.
+Merging pinctrl-samsung-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1)
+$ git merge pinctrl-samsung-fixes/fixes
+Already up to date.
+Merging devicetree-fixes/dt/linus (50d8d7e19c43 dt-bindings: display: renesas,du: Make resets optional on R-Car H1)
+$ git merge devicetree-fixes/dt/linus
+Already up to date.
+Merging scsi-fixes/fixes (02c6dcd543f8 scsi: core: Fix hang of freezing queue between blocking and running device)
+$ git merge scsi-fixes/fixes
+Already up to date.
+Merging drm-fixes/drm-fixes (7d2a07b76933 Linux 5.14)
+$ 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 (7d2a07b76933 Linux 5.14)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Already up to date.
+Merging mmc-fixes/fixes (b81bede4d138 mmc: renesas_sdhi: fix regression with hard reset on old SDHIs)
+$ git merge mmc-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/mmc/host/dw_mmc.c | 15 ++++++++++++---
+ drivers/mmc/host/renesas_sdhi_core.c | 2 ++
+ 2 files changed, 14 insertions(+), 3 deletions(-)
+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 (e73f0f0ee754 Linux 5.14-rc1)
+$ git merge gnss-fixes/gnss-linus
+Already up to date.
+Merging hyperv-fixes/hyperv-fixes (f1940d4e9cbe Drivers: hv: vmbus: Fix kernel crash upon unbinding a device from uio_hv_generic driver)
+$ git merge hyperv-fixes/hyperv-fixes
+Merge made by the 'recursive' strategy.
+ drivers/hv/ring_buffer.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging soc-fsl-fixes/fix (c1e64c0aec8c soc: fsl: qe: fix static checker warning)
+$ git merge soc-fsl-fixes/fix
+Already up to date.
+Merging risc-v-fixes/fixes (7d2a07b76933 Linux 5.14)
+$ 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
+Already up to date.
+Merging fpga-fixes/fixes (1d345c3e5941 fpga: machxo2-spi: Fix missing error code in machxo2_write_complete())
+$ git merge fpga-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/fpga/machxo2-spi.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+Merging spdx/spdx-linus (49624efa65ac Merge tag 'denywrite-for-5.15' of git://github.com/davidhildenbrand/linux)
+$ git merge spdx/spdx-linus
+Already up to date.
+Merging gpio-brgl-fixes/gpio/for-current (9b87f43537ac gpio: tqmx86: really make IRQ optional)
+$ git merge gpio-brgl-fixes/gpio/for-current
+Already up to date.
+Merging gpio-intel-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1)
+$ git merge gpio-intel-fixes/fixes
+Already up to date.
+Merging pinctrl-intel-fixes/fixes (2f658f7a3953 pinctrl: tigerlake: Fix GPIO mapping for newer version of software)
+$ git merge pinctrl-intel-fixes/fixes
+Already up to date.
+Merging erofs-fixes/fixes (0852b6ca941e erofs: fix 1 lcluster-sized pcluster for big pcluster)
+$ 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 (2734d6c1b1a0 Linux 5.14-rc2)
+$ 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 (024591f9a6e0 arm: ioremap: don't abuse pfn_valid() to check if pfn is in RAM)
+$ 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 irqchip-fixes/irq/irqchip-fixes (0ddc5e55e6f1 Documentation: Fix irq-domain.rst build warning)
+$ git merge irqchip-fixes/irq/irqchip-fixes
+Merge made by the 'recursive' strategy.
+ Documentation/core-api/irq/irq-domain.rst | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles)
+$ git merge renesas-fixes/fixes
+Already up to date.
+Merging drm-misc-fixes/for-linux-next-fixes (fa0b1ef5f7a6 drm: Copy drm_wait_vblank to user before returning)
+$ git merge drm-misc-fixes/for-linux-next-fixes
+Already up to date.
+Merging kspp-gustavo/for-next/kspp (7bc04ce6b914 Makefile: Enable -Wimplicit-fallthrough for Clang)
+$ git merge kspp-gustavo/for-next/kspp
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ Makefile | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+Merging kbuild/for-next (5a1f175c9aca isystem: delete global -isystem compile option)
+$ git merge kbuild/for-next
+Auto-merging crypto/Makefile
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ Makefile | 2 +-
+ arch/arm64/lib/Makefile | 2 ++
+ arch/nds32/Makefile | 2 ++
+ arch/powerpc/lib/Makefile | 2 ++
+ crypto/Makefile | 2 ++
+ lib/raid6/Makefile | 4 ++++
+ 6 files changed, 13 insertions(+), 1 deletion(-)
+$ git am -3 ../patches/0001-drm-i915-use-linux-stddef.h-due-to-isystem-trim-fixu.patch
+Applying: drm/i915: use linux/stddef.h due to "isystem: trim/fixup stdarg.h and other headers"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/gpu/drm/i915/gt/intel_gt_requests.h
+$ git add -A .
+$ git commit -v -a --amend
+[master f2d3254eda32] Merge remote-tracking branch 'kbuild/for-next'
+ Date: Tue Sep 7 08:35:45 2021 +1000
+Merging compiler-attributes/compiler-attributes (7ed012969bbc Compiler Attributes: fix __has_attribute(__no_sanitize_coverage__) for GCC 4)
+$ git merge compiler-attributes/compiler-attributes
+Auto-merging include/linux/compiler_attributes.h
+CONFLICT (content): Merge conflict in include/linux/compiler_attributes.h
+Resolved 'include/linux/compiler_attributes.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 89acd96543ab] Merge remote-tracking branch 'compiler-attributes/compiler-attributes'
+$ git diff -M --stat --summary HEAD^..
+ include/linux/compiler_attributes.h | 1 +
+ 1 file changed, 1 insertion(+)
+Merging dma-mapping/for-next (a61cb6017df0 dma-mapping: fix the kerneldoc for dma_map_sg_attrs)
+$ git merge dma-mapping/for-next
+Merge made by the 'recursive' strategy.
+ kernel/dma/mapping.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+Merging asm-generic/master (8f76f9c46952 bitops/non-atomic: make @nr unsigned to avoid any DIV)
+$ git merge asm-generic/master
+Already up to date.
+Merging arc/for-next (56809a28d45f ARC: mm: vmalloc sync from kernel to user table to update PMD ...)
+$ git merge arc/for-next
+Already up to date.
+Merging arm/for-next (1c9b5911f53b Merge branches 'fixes' and 'misc' into for-next)
+$ git merge arm/for-next
+Auto-merging ipc/sem.c
+CONFLICT (content): Merge conflict in ipc/sem.c
+Auto-merging include/linux/syscalls.h
+Auto-merging arch/arm/tools/syscall.tbl
+Auto-merging arch/arm/kernel/signal.c
+Auto-merging arch/arm/kernel/ptrace.c
+Auto-merging arch/arm/kernel/process.c
+Auto-merging arch/arm/kernel/asm-offsets.c
+Auto-merging arch/arm/include/asm/thread_info.h
+Auto-merging arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Resolved 'ipc/sem.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 1f0ce9bb8e69] Merge remote-tracking branch 'arm/for-next'
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 56 +++++-----
+ arch/arm/Kconfig | 1 -
+ arch/arm/Makefile | 3 +-
+ arch/arm/boot/Makefile | 14 +--
+ arch/arm/boot/compressed/Makefile | 2 +
+ arch/arm/include/asm/div64.h | 11 --
+ arch/arm/include/asm/gpio.h | 4 -
+ arch/arm/include/asm/ptrace.h | 1 -
+ arch/arm/include/asm/syscall.h | 16 ++-
+ arch/arm/include/asm/thread_info.h | 6 +-
+ arch/arm/include/asm/uaccess-asm.h | 6 --
+ arch/arm/include/asm/uaccess.h | 169 +++++++++++++++--------------
+ arch/arm/include/asm/unified.h | 4 -
+ arch/arm/include/uapi/asm/unistd.h | 1 +
+ arch/arm/kernel/asm-offsets.c | 3 +-
+ arch/arm/kernel/entry-common.S | 20 ++--
+ arch/arm/kernel/process.c | 7 +-
+ arch/arm/kernel/ptrace.c | 14 +--
+ arch/arm/kernel/signal.c | 8 --
+ arch/arm/kernel/sys_oabi-compat.c | 216 +++++++++++++++++++++----------------
+ arch/arm/kernel/traps.c | 47 +++-----
+ arch/arm/lib/copy_from_user.S | 3 +-
+ arch/arm/lib/copy_to_user.S | 3 +-
+ arch/arm/tools/syscall.tbl | 2 +-
+ fs/eventpoll.c | 5 +-
+ include/asm-generic/div64.h | 14 +--
+ include/linux/eventpoll.h | 18 ++++
+ include/linux/syscalls.h | 3 +
+ ipc/sem.c | 85 +++++++++------
+ mm/maccess.c | 28 +++--
+ 30 files changed, 399 insertions(+), 371 deletions(-)
+Merging arm64/for-next/core (65266a7c6abf Merge remote-tracking branch 'tip/sched/arm64' into for-next/core)
+$ git merge arm64/for-next/core
+Already up to date.
+Merging arm-perf/for-next/perf (fd264b310579 arm64/perf: Replace '0xf' instances with ID_AA64DFR0_PMUVER_IMP_DEF)
+$ git merge arm-perf/for-next/perf
+Already up to date.
+Merging arm-soc/for-next (5e115b419d2b soc: document merges)
+$ git merge arm-soc/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/rockchip.yaml | 48 +-
+ .../devicetree/bindings/arm/rockchip/pmu.yaml | 2 +
+ Documentation/devicetree/bindings/arm/xilinx.yaml | 1 +
+ arch/arm/arm-soc-for-next-contents.txt | 150 ++++
+ arch/arm64/boot/dts/rockchip/Makefile | 6 +
+ arch/arm64/boot/dts/rockchip/px30.dtsi | 73 ++
+ arch/arm64/boot/dts/rockchip/rk3308.dtsi | 37 +
+ arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts | 3 -
+ arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 16 +
+ arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts | 110 +++
+ arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3328.dtsi | 7 +-
+ arch/arm64/boot/dts/rockchip/rk3368.dtsi | 5 -
+ .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 176 ++++
+ .../boot/dts/rockchip/rk3399-gru-scarlet-dumo.dts | 41 +
+ .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 180 ++++
+ arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 2 +-
+ .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 36 +
+ .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 6 +-
+ .../arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts | 218 +++++
+ arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 54 ++
+ .../boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts | 14 +
+ .../boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts | 47 ++
+ arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 29 +
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 46 +-
+ arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 497 +++++++++++
+ arch/arm64/boot/dts/rockchip/rk3566.dtsi | 20 +
+ arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 313 +++++++
+ arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi | 9 +
+ arch/arm64/boot/dts/rockchip/rk3568.dtsi | 644 ++------------
+ arch/arm64/boot/dts/rockchip/rk356x.dtsi | 931 +++++++++++++++++++++
+ arch/arm64/boot/dts/xilinx/Makefile | 1 +
+ arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 13 +-
+ arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts | 16 +-
+ arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts | 16 +-
+ arch/arm64/boot/dts/xilinx/zynqmp-zc1275-revA.dts | 18 +-
+ .../boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 298 ++++++-
+ .../boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 342 +++++++-
+ .../boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts | 49 +-
+ .../boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts | 24 +-
+ .../boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts | 330 +++++++-
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 264 +++++-
+ .../arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts | 15 +
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 320 ++++++-
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts | 3 +-
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 292 ++++++-
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 250 +++++-
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 340 +++++++-
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 274 +++++-
+ arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 93 +-
+ 50 files changed, 5984 insertions(+), 697 deletions(-)
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-dumo.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3566.dtsi
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk356x.dtsi
+ create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts
+Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC)
+$ git merge actions/for-next
+Auto-merging arch/arm/boot/dts/owl-s500-roseapplepi.dts
+Merge made by the 'recursive' strategy.
+Merging amlogic/for-next (6285af2a2821 Merge tags 'amlogic-arm-configs-for-v5.15', 'amlogic-arm64-dt-for-v5.15' and 'amlogic-arm-dt-for-v5.15' into for-next)
+$ git merge amlogic/for-next
+Already up to date.
+Merge made by the 'recursive' strategy.
+Merging aspeed/for-next (0f32f00af344 Merge branches 'dt-for-v5.15', 'soc-for-v5.15' and 'defconfig-for-v5.15' into for-next)
+$ git merge aspeed/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging at91/at91-next (b102356e5bc1 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 (c28b584deb1b Merge branch 'for-v5.15/omap-gpmc' into for-next)
+$ git merge drivers-memory/for-next
+Already up to date.
+Merging imx-mxs/for-next (2cb411d89676 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 (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next)
+$ git merge keystone/next
+Already up to date.
+Merge made by the 'recursive' strategy.
+Merging mediatek/for-next (69862ae4e378 Merge branch 'v5.14-next/soc' into for-next)
+$ git merge mediatek/for-next
+Already up to date.
+Merge made by the 'recursive' strategy.
+Merging mvebu/for-next (930af8dda750 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 (7911f95d1713 Merge branch 'fixes' into for-next)
+$ git merge omap/for-next
+Already up to date.
+Merge made by the 'recursive' strategy.
+Merging qcom/for-next (e0f999d1bfc1 Merge branches 'arm64-for-5.16', 'drivers-for-5.16' and 'dts-for-5.16' into for-next)
+$ git merge qcom/for-next
+Auto-merging arch/arm/boot/dts/qcom-apq8064.dtsi
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/cpus.yaml | 3 +-
+ Documentation/devicetree/bindings/arm/qcom.yaml | 6 ++
+ .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 +
+ .../bindings/soc/qcom/qcom,aoss-qmp.yaml | 1 +
+ arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 8 ++-
+ arch/arm/boot/dts/qcom-apq8064.dtsi | 7 +--
+ arch/arm/mach-qcom/platsmp.c | 71 ++++++++++++++++++++++
+ arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 +-
+ drivers/soc/qcom/llcc-qcom.c | 16 +++++
+ drivers/soc/qcom/rpmhpd.c | 16 +++++
+ drivers/soc/qcom/socinfo.c | 2 +-
+ include/dt-bindings/power/qcom-rpmpd.h | 8 +++
+ 12 files changed, 134 insertions(+), 9 deletions(-)
+Merging raspberrypi/for-next (9f5289ec6f1c ARM: dts: bcm2711-rpi-4-b: Fix usb's unit address)
+$ git merge raspberrypi/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/bcm/bcm2835.yaml | 1 +
+ .../bindings/display/brcm,bcm2835-dsi0.yaml | 3 +
+ .../bindings/display/brcm,bcm2835-hdmi.yaml | 3 +
+ .../bindings/display/brcm,bcm2835-v3d.yaml | 3 +
+ .../bindings/display/brcm,bcm2835-vec.yaml | 3 +
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 49 +++-----
+ arch/arm/boot/dts/bcm2711-rpi-cm4-io.dts | 138 +++++++++++++++++++++
+ arch/arm/boot/dts/bcm2711-rpi-cm4.dtsi | 113 +++++++++++++++++
+ arch/arm/boot/dts/bcm2711.dtsi | 12 +-
+ arch/arm/boot/dts/bcm2835-common.dtsi | 8 ++
+ arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 31 ++---
+ arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 36 ++----
+ arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 36 ++----
+ arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 36 ++----
+ arch/arm/boot/dts/bcm283x-rpi-wifi-bt.dtsi | 34 +++++
+ arch/arm/boot/dts/bcm283x.dtsi | 8 --
+ arch/arm64/boot/dts/broadcom/Makefile | 1 +
+ .../arm64/boot/dts/broadcom/bcm2711-rpi-cm4-io.dts | 2 +
+ 19 files changed, 366 insertions(+), 152 deletions(-)
+ create mode 100644 arch/arm/boot/dts/bcm2711-rpi-cm4-io.dts
+ create mode 100644 arch/arm/boot/dts/bcm2711-rpi-cm4.dtsi
+ create mode 100644 arch/arm/boot/dts/bcm283x-rpi-wifi-bt.dtsi
+ create mode 100644 arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4-io.dts
+Merging renesas/next (59d7f78144a8 Merge branches 'renesas-arm-dt-for-v5.15' and 'renesas-drivers-for-v5.15' into renesas-next)
+$ git merge renesas/next
+Auto-merging arch/arm64/configs/defconfig
+Merge made by the 'recursive' strategy.
+ arch/arm64/configs/defconfig | 1 +
+ 1 file changed, 1 insertion(+)
+Merging reset/reset/next (09f3824342f6 reset: simple: remove ZTE details in Kconfig help)
+$ git merge reset/reset/next
+Already up to date.
+Merging rockchip/for-next (d46148623f26 Merge branch 'v5.15-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 (90861bf54255 Merge branch 'next/dt64' into for-next)
+$ git merge samsung-krzk/for-next
+Merge made by the 'recursive' strategy.
+Merging scmi/for-linux-next (7c414a7d93c6 Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
+$ git merge scmi/for-linux-next
+Merge made by the 'recursive' strategy.
+ arch/arm64/boot/dts/arm/fvp-base-revc.dts | 12 ------------
+ drivers/firmware/arm_scmi/Kconfig | 2 +-
+ 2 files changed, 1 insertion(+), 13 deletions(-)
+Merging stm32/stm32-next (1e6bc5987a52 ARM: dts: stm32: Update AV96 adv7513 node per dtbs_check)
+$ git merge stm32/stm32-next
+Already up to date.
+Merging sunxi/sunxi/for-next (3f1c53207cf0 Merge branches 'sunxi/dt-for-5.14' and 'sunxi/fixes-for-5.13' into sunxi/for-next)
+$ git merge sunxi/sunxi/for-next
+Already up to date.
+Merge made by the 'recursive' strategy.
+Merging tegra/for-next (cc701ccede61 Merge branch for-5.15/arm64/dt into for-next)
+$ git merge tegra/for-next
+Already up to date.
+Merge made by the 'recursive' strategy.
+Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next)
+$ git merge ti-k3/ti-k3-next
+Already up to date.
+Merge made by the 'recursive' strategy.
+Merging ti-k3-new/ti-k3-next (c1fa5ac6c2f4 arm64: dts: ti: k3-am642-sk: Add pwm nodes)
+$ git merge ti-k3-new/ti-k3-next
+Already up to date.
+Merging xilinx/for-next (4d7e3c8de98e Merge branch 'zynqmp/dt' of https://github.com/Xilinx/linux-xlnx into for-next)
+$ git merge xilinx/for-next
+Already up to date.
+Merge made by the 'recursive' strategy.
+Merging clk/clk-next (2cfa946be843 clk: qcom: gcc-sm6350: Remove unused variable)
+$ git merge clk/clk-next
+Merge made by the 'recursive' strategy.
+ drivers/clk/qcom/gcc-sm6350.c | 4 ----
+ 1 file changed, 4 deletions(-)
+Merging clk-imx/for-next (86842d255b45 clk: imx8mn: Add M7 core clock)
+$ git merge clk-imx/for-next
+Already up to date.
+Merging clk-renesas/renesas-clk (e8425dd55abb clk: renesas: Make CLK_R9A06G032 invisible)
+$ 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 (90dc8c0e664e csky: Kconfig: Remove unused selects)
+$ git merge csky/linux-next
+Already up to date.
+Merging h8300/h8300-next (1ec10274d436 h8300: don't implement set_fs)
+$ git merge h8300/h8300-next
+Auto-merging drivers/tty/serial/sh-sci.c
+Auto-merging drivers/net/ethernet/smsc/smc91x.c
+Auto-merging drivers/net/ethernet/smsc/Kconfig
+Removing arch/h8300/mm/memory.c
+Auto-merging arch/h8300/mm/init.c
+Auto-merging arch/h8300/kernel/setup.c
+Removing arch/h8300/include/asm/segment.h
+Auto-merging arch/h8300/Kconfig.cpu
+Merge made by the 'recursive' strategy.
+ arch/h8300/Kconfig | 1 -
+ 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/include/asm/processor.h | 1 -
+ arch/h8300/include/asm/segment.h | 40 --------------------
+ arch/h8300/include/asm/thread_info.h | 3 --
+ arch/h8300/kernel/entry.S | 1 -
+ arch/h8300/kernel/head_ram.S | 1 -
+ arch/h8300/kernel/setup.c | 2 +-
+ arch/h8300/lib/memset.S | 17 +++++----
+ arch/h8300/mm/Makefile | 2 +-
+ arch/h8300/mm/init.c | 6 ---
+ arch/h8300/mm/memory.c | 53 --------------------------
+ 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 +--
+ 24 files changed, 124 insertions(+), 169 deletions(-)
+ delete mode 100644 arch/h8300/include/asm/segment.h
+ delete mode 100644 arch/h8300/mm/memory.c
+Merging m68k/for-next (87d93029fe83 m68k: Fix asm register constraints for atomic ops)
+$ git merge m68k/for-next
+Already up to date.
+Merging m68knommu/for-next (db87db65c105 m68knommu: only set CONFIG_ISA_DMA_API for ColdFire sub-arch)
+$ git merge m68knommu/for-next
+Already up to date.
+Merging microblaze/next (315511166469 microblaze: move core-y in arch/microblaze/Makefile to arch/microblaze/Kbuild)
+$ git merge microblaze/next
+Merge made by the 'recursive' strategy.
+ arch/microblaze/Kbuild | 4 ++++
+ arch/microblaze/Makefile | 5 -----
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+Merging mips/mips-next (bea6a94a279b MIPS: Malta: fix alignment of the devicetree buffer)
+$ 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 (1955d843efc3 openrisc/litex: Update defconfig)
+$ git merge openrisc/for-next
+Already up to date.
+Merging parisc-hd/for-next (e9e7d5744de7 parisc: Drop useless debug info from signal.c)
+$ git merge parisc-hd/for-next
+Auto-merging arch/parisc/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/parisc/Kconfig | 1 -
+ arch/parisc/boot/compressed/Makefile | 18 +++++++++---------
+ arch/parisc/include/asm/uaccess.h | 5 ++---
+ arch/parisc/kernel/parisc_ksyms.c | 1 -
+ arch/parisc/kernel/signal.c | 27 +++++++++------------------
+ arch/parisc/lib/lusercopy.S | 34 ----------------------------------
+ 6 files changed, 20 insertions(+), 66 deletions(-)
+Merging powerpc/next (a3314262eede Merge branch 'fixes' into next)
+$ git merge powerpc/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 (063df71a574b Merge tag 'riscv-for-linus-5.15-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
+$ git merge risc-v/for-next
+Already up to date.
+Merging s390/for-next (e166f652ff5b s390/cpum_cf: move array from header to C file)
+$ git merge s390/for-next
+Auto-merging drivers/s390/cio/device.c
+Auto-merging arch/s390/kernel/setup.c
+Merge made by the 'recursive' strategy.
+ arch/s390/configs/debug_defconfig | 1 +
+ arch/s390/include/asm/cpu_mcf.h | 7 -------
+ arch/s390/include/asm/smp.h | 1 +
+ arch/s390/include/asm/stacktrace.h | 20 ++++++++++----------
+ arch/s390/include/asm/unwind.h | 8 ++++----
+ arch/s390/kernel/entry.S | 4 ++--
+ arch/s390/kernel/perf_cpum_cf.c | 8 ++++++++
+ arch/s390/kernel/setup.c | 10 +++++++---
+ arch/s390/kernel/smp.c | 9 +++++++--
+ arch/s390/kernel/topology.c | 13 +++++++------
+ arch/s390/mm/gmap.c | 11 +++++------
+ arch/s390/mm/pgtable.c | 4 ++--
+ drivers/s390/cio/blacklist.c | 5 ++++-
+ drivers/s390/cio/device.c | 21 ++++-----------------
+ 14 files changed, 62 insertions(+), 60 deletions(-)
+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_32.c | 8 ++++----
+ arch/sh/math-emu/math.c | 4 ++--
+ arch/sh/mm/nommu.c | 4 ++--
+ drivers/sh/maple/maple.c | 5 ++++-
+ 17 files changed, 49 insertions(+), 45 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 (adf9ae0d159d um: fix stub location calculation)
+$ git merge uml/linux-next
+Auto-merging arch/um/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/um/Kconfig | 1 +
+ arch/um/drivers/virt-pci.c | 108 ++++++++++++++++++++++++++----------
+ arch/um/drivers/virtio_uml.c | 5 +-
+ arch/um/kernel/skas/clone.c | 3 +-
+ arch/x86/um/shared/sysdep/stub_32.h | 12 ++++
+ arch/x86/um/shared/sysdep/stub_64.h | 12 ++++
+ arch/x86/um/stub_segv.c | 3 +-
+ fs/hostfs/hostfs_kern.c | 1 +
+ include/uapi/linux/virtio_pcidev.h | 5 +-
+ lib/logic_iomem.c | 16 +++---
+ 10 files changed, 124 insertions(+), 42 deletions(-)
+Merging xtensa/xtensa-for-next (7b7cec477fc3 xtensa: move core-y in arch/xtensa/Makefile to arch/xtensa/Kbuild)
+$ git merge xtensa/xtensa-for-next
+Already up to date.
+Merging pidfd/for-next (f4dd02cd8631 Merge branch 'kernel.sys' into for-next)
+$ git merge pidfd/for-next
+Already up to date.
+Merge made by the 'recursive' strategy.
+Merging fscrypt/master (38ef66b05cfa fscrypt: document struct fscrypt_operations)
+$ git merge fscrypt/master
+Already up to date.
+Merging fscache/fscache-next (20ec197bfa13 fscache: Use refcount_t for the cookie refcount instead of atomic_t)
+$ 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 (1efc6199e6b9 Merge branch 'for-next-current-v5.14-20210830' into for-next-20210830)
+$ git merge btrfs/for-next
+Already up to date.
+Merge made by the 'recursive' strategy.
+Merging ceph/master (4b0b8836ebba ceph: fix off by one bugs in unsafe_request_wait())
+$ git merge ceph/master
+Auto-merging fs/ceph/super.h
+Auto-merging fs/ceph/file.c
+Auto-merging fs/ceph/addr.c
+Merge made by the 'recursive' strategy.
+ fs/ceph/addr.c | 2 +-
+ fs/ceph/cache.h | 6 -
+ fs/ceph/caps.c | 266 ++++++++++++++++++++++++++++---------------
+ fs/ceph/file.c | 32 +++---
+ fs/ceph/inode.c | 11 +-
+ fs/ceph/mds_client.c | 218 +++++++++++++++++++++++++----------
+ fs/ceph/mds_client.h | 5 +
+ fs/ceph/mdsmap.c | 12 +-
+ fs/ceph/metric.c | 4 +-
+ fs/ceph/snap.c | 59 ++++++----
+ fs/ceph/strings.c | 1 +
+ fs/ceph/super.h | 9 +-
+ fs/ceph/xattr.c | 19 ++++
+ include/linux/ceph/ceph_fs.h | 1 +
+ 14 files changed, 438 insertions(+), 207 deletions(-)
+Merging cifs/for-next (9c849ce86e0f Merge tag '5.15-rc-smb3-fixes-part1' of git://git.samba.org/sfrench/cifs-2.6)
+$ git merge cifs/for-next
+Already up to date.
+Merging cifsd/cifsd-for-next (303fff2b8c77 ksmbd: add validation for ndr read/write functions)
+$ git merge cifsd/cifsd-for-next
+Merge made by the 'recursive' strategy.
+ fs/ksmbd/ndr.c | 383 +++++++++++++++++++++++++++++++++-------------
+ fs/ksmbd/oplock.c | 6 +-
+ fs/ksmbd/smb2pdu.c | 67 ++++----
+ fs/ksmbd/smb_common.c | 4 +-
+ fs/ksmbd/smb_common.h | 1 -
+ fs/ksmbd/smbacl.c | 71 ++++++---
+ fs/ksmbd/smbacl.h | 25 +++
+ fs/ksmbd/transport_rdma.c | 2 +-
+ fs/ksmbd/vfs.c | 47 +++---
+ fs/ksmbd/vfs.h | 3 +-
+ fs/ksmbd/vfs_cache.c | 16 --
+ fs/ksmbd/vfs_cache.h | 1 -
+ 12 files changed, 410 insertions(+), 216 deletions(-)
+Merging configfs/for-next (c42dd069be8d configfs: fix a race in configfs_lookup())
+$ 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 (1266b4a7ecb6 erofs: fix double free of 'copied')
+$ git merge erofs/dev
+Already up to date.
+Merging exfat/dev (50be9417e23a Merge tag 'io_uring-5.14-2021-07-09' of git://git.kernel.dk/linux-block)
+$ git merge exfat/dev
+Already up to date.
+Merging ext3/for_next (ed518dd035fa Pull udf xattr sanity checks.)
+$ git merge ext3/for_next
+Already up to date.
+Merge made by the 'recursive' strategy.
+Merging ext4/dev (baaae979b112 ext4: make the updating inode data procedure atomic)
+$ git merge ext4/dev
+Already up to date.
+Merging f2fs/dev (1dbe7e386f50 Merge tag 'block-5.15-2021-09-05' of git://git.kernel.dk/linux-block)
+$ 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 (a9667ac88e2b fuse: remove unused arg in fuse_write_file_get())
+$ git merge fuse/for-next
+Auto-merging fs/fuse/inode.c
+Auto-merging fs/fuse/fuse_i.h
+Auto-merging fs/fuse/file.c
+Merge made by the 'recursive' strategy.
+ fs/fuse/control.c | 10 +--
+ fs/fuse/dev.c | 4 +-
+ fs/fuse/file.c | 45 ++++++++----
+ fs/fuse/fuse_i.h | 20 ++++++
+ fs/fuse/inode.c | 203 ++++++++++++++++++++++++++++++++++++++--------------
+ fs/fuse/virtio_fs.c | 12 ++--
+ 6 files changed, 214 insertions(+), 80 deletions(-)
+Merging gfs2/for-next (08d736667185 gfs2: Remove redundant check from gfs2_glock_dq)
+$ git merge gfs2/for-next
+Already up to date.
+Merging jfs/jfs-next (5d299f44d765 jfs: Avoid field-overflowing memcpy())
+$ git merge jfs/jfs-next
+Already up to date.
+Merging nfs/linux-next (2734d6c1b1a0 Linux 5.14-rc2)
+$ git merge nfs/linux-next
+Already up to date.
+Merging nfs-anna/linux-next (8cfb9015280d NFS: Always provide aligned buffers to the RPC read layers)
+$ git merge nfs-anna/linux-next
+Already up to date.
+Merging nfsd/nfsd-next (e22ce8eb631b Linux 5.14-rc7)
+$ git merge nfsd/nfsd-next
+Already up to date.
+Merging cel/for-next (0c217d5066c8 SUNRPC: improve error response to over-size gss credential)
+$ git merge cel/for-next
+Auto-merging net/sunrpc/svc_xprt.c
+Auto-merging net/sunrpc/auth_gss/svcauth_gss.c
+Merge made by the 'recursive' strategy.
+ net/sunrpc/auth_gss/svcauth_gss.c | 2 ++
+ net/sunrpc/cache.c | 2 +-
+ net/sunrpc/svc_xprt.c | 13 +++++++------
+ 3 files changed, 10 insertions(+), 7 deletions(-)
+Merging ntfs3/master (2e3a51b59ea2 fs/ntfs3: Change how module init/info messages are displayed)
+$ git merge ntfs3/master
+Already up to date.
+Merging orangefs/for-next (0fdec1b3c9fb orangefs: fix orangefs df output.)
+$ git merge orangefs/for-next
+Already up to date.
+Merging overlayfs/overlayfs-next (332f606b32b6 ovl: enable RCU'd ->get_acl())
+$ git merge overlayfs/overlayfs-next
+Already up to date.
+Merging ubifs/next (a801fcfeef96 ubifs: Set/Clear I_LINKABLE under i_lock for whiteout inode)
+$ git merge ubifs/next
+Already up to date.
+Merging v9fs/9p-next (9c4d94dc9a64 net/9p: increase default msize to 128k)
+$ git merge v9fs/9p-next
+Merge made by the 'recursive' strategy.
+ net/9p/client.c | 6 ++++--
+ net/9p/trans_fd.c | 2 +-
+ net/9p/trans_virtio.c | 4 +++-
+ net/9p/trans_xen.c | 4 ++--
+ 4 files changed, 10 insertions(+), 6 deletions(-)
+Merging xfs/for-next (f38a032b165d xfs: fix I_DONTCACHE)
+$ git merge xfs/for-next
+Already up to date.
+Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check)
+$ git merge zonefs/for-next
+Auto-merging fs/zonefs/super.c
+Merge made by the 'recursive' strategy.
+Merging iomap/iomap-for-next (03b8df8d43ec iomap: standardize tracepoint formatting and storage)
+$ git merge iomap/iomap-for-next
+Already up to date.
+Merging djw-vfs/vfs-for-next (d03ef4daf33a fs: forbid invalid project ID)
+$ git merge djw-vfs/vfs-for-next
+Already up to date.
+Merging file-locks/locks-next (b91db6a0b52e Merge tag 'for-5.15/io_uring-vfs-2021-08-30' of git://git.kernel.dk/linux-block)
+$ git merge file-locks/locks-next
+Already up to date.
+Merging vfs/for-next (8e222b83dec2 Merge branch 'work.iov_iter' into for-next)
+$ git merge vfs/for-next
+Auto-merging init/do_mounts.c
+Auto-merging include/linux/fs.h
+Auto-merging fs/io_uring.c
+Merge made by the 'recursive' strategy.
+ fs/attr.c | 50 ++++++++++++++++++-----------
+ fs/filesystems.c | 27 ++++++++++------
+ fs/gfs2/inode.c | 4 +--
+ fs/io_uring.c | 2 ++
+ include/linux/fs.h | 4 ++-
+ include/linux/uio.h | 6 +++-
+ init/do_mounts.c | 90 ++++++++++++++++++++++++++++++++++++++---------------
+ 7 files changed, 125 insertions(+), 58 deletions(-)
+Merging printk/for-next (c57343431170 Merge branch 'for-5.15-printk-index' into for-next)
+$ git merge printk/for-next
+Merge made by the 'recursive' strategy.
+Merging pci/next (742a4c49a82a Merge branch 'remotes/lorenzo/pci/tools')
+$ git merge pci/next
+Auto-merging include/linux/pci_ids.h
+Auto-merging include/linux/pci.h
+Auto-merging include/linux/pci-epf.h
+Auto-merging drivers/scsi/cxlflash/main.c
+Auto-merging drivers/pci/quirks.c
+Auto-merging drivers/pci/proc.c
+Auto-merging drivers/pci/pcie/ptm.c
+Auto-merging drivers/pci/pci.h
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/pci/pci-sysfs.c
+Auto-merging drivers/pci/endpoint/pci-epf-core.c
+Auto-merging drivers/net/ethernet/sfc/falcon/efx.c
+Auto-merging drivers/net/ethernet/sfc/efx.c
+Auto-merging drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
+Auto-merging drivers/net/ethernet/broadcom/tg3.c
+Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c
+CONFLICT (content): Merge conflict in drivers/net/ethernet/broadcom/bnxt/bnxt.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2.c
+CONFLICT (content): Merge conflict in drivers/net/ethernet/broadcom/bnx2.c
+Auto-merging drivers/misc/pci_endpoint_test.c
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Resolved 'MAINTAINERS' using previous resolution.
+Resolved 'drivers/net/ethernet/broadcom/bnx2.c' using previous resolution.
+Resolved 'drivers/net/ethernet/broadcom/bnxt/bnxt.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 1984fbb6b324] Merge remote-tracking branch 'pci/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-bus-pci | 17 +
+ Documentation/PCI/endpoint/pci-endpoint-cfs.rst | 12 +-
+ .../bindings/pci/intel,keembay-pcie-ep.yaml | 69 +++
+ .../bindings/pci/intel,keembay-pcie.yaml | 97 ++++
+ .../devicetree/bindings/pci/mediatek-pcie-cfg.yaml | 39 ++
+ .../devicetree/bindings/pci/mediatek-pcie.txt | 206 +++++----
+ Documentation/devicetree/bindings/pci/pci-ep.yaml | 7 +
+ .../devicetree/bindings/pci/xilinx-nwl-pcie.txt | 1 +
+ MAINTAINERS | 9 +
+ arch/arm64/kernel/pci.c | 29 +-
+ arch/x86/pci/numachip.c | 1 +
+ arch/x86/pci/sta2x11-fixup.c | 3 +-
+ drivers/crypto/cavium/nitrox/nitrox_main.c | 4 +-
+ drivers/misc/pci_endpoint_test.c | 9 +
+ drivers/net/ethernet/broadcom/bnx2.c | 33 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 1 -
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 91 +---
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 55 +--
+ drivers/net/ethernet/broadcom/tg3.c | 115 ++---
+ drivers/net/ethernet/broadcom/tg3.h | 1 -
+ drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2 -
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 85 ++--
+ drivers/net/ethernet/sfc/efx.c | 78 +---
+ drivers/net/ethernet/sfc/falcon/efx.c | 79 +---
+ drivers/pci/ats.c | 2 +-
+ drivers/pci/controller/Kconfig | 1 +
+ drivers/pci/controller/cadence/pci-j721e.c | 61 ++-
+ drivers/pci/controller/cadence/pcie-cadence-ep.c | 200 ++++++---
+ drivers/pci/controller/cadence/pcie-cadence-host.c | 3 +
+ drivers/pci/controller/cadence/pcie-cadence.c | 16 +
+ drivers/pci/controller/cadence/pcie-cadence.h | 29 +-
+ drivers/pci/controller/dwc/Kconfig | 48 ++
+ drivers/pci/controller/dwc/Makefile | 3 +
+ drivers/pci/controller/dwc/pci-dra7xx.c | 16 +-
+ drivers/pci/controller/dwc/pci-keystone.c | 14 +-
+ drivers/pci/controller/dwc/pcie-artpec6.c | 7 +-
+ drivers/pci/controller/dwc/pcie-designware-ep.c | 36 +-
+ drivers/pci/controller/dwc/pcie-designware-host.c | 9 +-
+ drivers/pci/controller/dwc/pcie-designware-plat.c | 1 -
+ drivers/pci/controller/dwc/pcie-dw-rockchip.c | 279 ++++++++++++
+ drivers/pci/controller/dwc/pcie-keembay.c | 460 +++++++++++++++++++
+ drivers/pci/controller/dwc/pcie-tegra194.c | 54 ++-
+ drivers/pci/controller/dwc/pcie-uniphier.c | 8 +-
+ drivers/pci/controller/dwc/pcie-visconti.c | 332 ++++++++++++++
+ .../pci/controller/mobiveil/pcie-mobiveil-host.c | 15 +-
+ drivers/pci/controller/pci-aardvark.c | 334 +++++++++++++-
+ drivers/pci/controller/pci-ftpci100.c | 2 +-
+ drivers/pci/controller/pci-hyperv.c | 153 +++++--
+ drivers/pci/controller/pci-tegra.c | 38 +-
+ drivers/pci/controller/pci-xgene-msi.c | 10 +-
+ drivers/pci/controller/pcie-altera-msi.c | 10 +-
+ drivers/pci/controller/pcie-altera.c | 10 +-
+ drivers/pci/controller/pcie-brcmstb.c | 9 +-
+ drivers/pci/controller/pcie-iproc-bcma.c | 16 +-
+ drivers/pci/controller/pcie-iproc-msi.c | 4 +-
+ drivers/pci/controller/pcie-mediatek-gen3.c | 13 +-
+ drivers/pci/controller/pcie-mediatek.c | 64 ++-
+ drivers/pci/controller/pcie-microchip-host.c | 18 +-
+ drivers/pci/controller/pcie-rcar-ep.c | 23 +-
+ drivers/pci/controller/pcie-rcar-host.c | 94 +++-
+ drivers/pci/controller/pcie-rcar.h | 7 +
+ drivers/pci/controller/pcie-rockchip-ep.c | 18 +-
+ drivers/pci/controller/pcie-rockchip-host.c | 8 +-
+ drivers/pci/controller/pcie-xilinx-cpm.c | 4 +-
+ drivers/pci/controller/pcie-xilinx-nwl.c | 25 +-
+ drivers/pci/controller/pcie-xilinx.c | 9 +-
+ drivers/pci/endpoint/functions/pci-epf-ntb.c | 89 ++--
+ drivers/pci/endpoint/functions/pci-epf-test.c | 74 ++--
+ drivers/pci/endpoint/pci-ep-cfs.c | 24 +
+ drivers/pci/endpoint/pci-epc-core.c | 134 ++++--
+ drivers/pci/endpoint/pci-epf-core.c | 146 +++++-
+ drivers/pci/hotplug/TODO | 3 -
+ drivers/pci/hotplug/ibmphp_ebda.c | 5 +-
+ drivers/pci/hotplug/pciehp.h | 2 +-
+ drivers/pci/hotplug/pciehp_hpc.c | 2 +-
+ drivers/pci/hotplug/pnv_php.c | 2 +-
+ drivers/pci/of.c | 2 +-
+ drivers/pci/pci-acpi.c | 85 ++--
+ drivers/pci/pci-bridge-emul.h | 2 +-
+ drivers/pci/pci-sysfs.c | 3 +-
+ drivers/pci/pci.c | 331 ++++++++++----
+ drivers/pci/pci.h | 47 +-
+ drivers/pci/pcie/aer.c | 12 +-
+ drivers/pci/pcie/portdrv_core.c | 9 +-
+ drivers/pci/pcie/ptm.c | 4 +-
+ drivers/pci/probe.c | 29 +-
+ drivers/pci/proc.c | 1 +
+ drivers/pci/quirks.c | 128 +++++-
+ drivers/pci/remove.c | 1 -
+ drivers/pci/syscall.c | 7 +-
+ drivers/pci/vpd.c | 490 +++++++++++----------
+ drivers/scsi/cxlflash/main.c | 34 +-
+ include/asm-generic/pci_iomap.h | 2 +-
+ include/linux/pci-epc.h | 57 +--
+ include/linux/pci-epf.h | 16 +-
+ include/linux/pci.h | 159 +++----
+ include/linux/pci_hotplug.h | 2 +-
+ include/linux/pci_ids.h | 3 +-
+ tools/pci/pcitest.c | 2 +-
+ 100 files changed, 3860 insertions(+), 1555 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pci/intel,keembay-pcie-ep.yaml
+ create mode 100644 Documentation/devicetree/bindings/pci/intel,keembay-pcie.yaml
+ create mode 100644 Documentation/devicetree/bindings/pci/mediatek-pcie-cfg.yaml
+ create mode 100644 drivers/pci/controller/dwc/pcie-dw-rockchip.c
+ create mode 100644 drivers/pci/controller/dwc/pcie-keembay.c
+ create mode 100644 drivers/pci/controller/dwc/pcie-visconti.c
+Merging pstore/for-next/pstore (c5d4fb2539ca pstore/blk: Use "%lu" to format unsigned long)
+$ git merge pstore/for-next/pstore
+Merge made by the 'recursive' strategy.
+ fs/pstore/blk.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging hid/for-next (4bc44ba4871f Merge branch 'for-5.15/core' into for-next)
+$ git merge hid/for-next
+Already up to date.
+Merge made by the 'recursive' strategy.
+Merging i2c/i2c/for-next (cc1dbdeb17dd Merge branch 'i2c/for-mergewindow' into i2c/for-next)
+$ git merge i2c/i2c/for-next
+Already up to date.
+Merge made by the 'recursive' strategy.
+Merging i3c/i3c/next (e73f0f0ee754 Linux 5.14-rc1)
+$ git merge i3c/i3c/next
+Already up to date.
+Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias)
+$ git merge dmi/dmi-for-next
+Merge made by the 'recursive' strategy.
+ drivers/firmware/dmi-id.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+Merging hwmon-staging/hwmon-next (15d4ec3b12b5 hwmon: (k10temp) Remove residues of current and voltage)
+$ git merge hwmon-staging/hwmon-next
+Already up to date.
+Merging jc_docs/docs-next (7c5c18bdb656 docs: pdfdocs: Fix typo in CJK-language specific font settings)
+$ git merge jc_docs/docs-next
+Auto-merging Documentation/translations/zh_CN/core-api/cachetlb.rst
+Merge made by the 'recursive' strategy.
+ Documentation/arm/marvell.rst | 1 +
+ Documentation/block/blk-mq.rst | 2 +-
+ Documentation/conf.py | 4 +-
+ .../features/vm/huge-vmap/arch-support.txt | 2 +-
+ Documentation/kernel-hacking/hacking.rst | 4 +-
+ Documentation/kernel-hacking/locking.rst | 12 +-
+ Documentation/locking/futex-requeue-pi.rst | 2 +-
+ Documentation/locking/ww-mutex-design.rst | 2 +-
+ Documentation/process/applying-patches.rst | 2 +-
+ Documentation/process/kernel-docs.rst | 14 +-
+ Documentation/process/maintainer-pgp-guide.rst | 14 +-
+ .../translations/it_IT/kernel-hacking/hacking.rst | 2 +-
+ .../translations/it_IT/kernel-hacking/locking.rst | 4 +-
+ .../translations/zh_CN/core-api/cachetlb.rst | 2 +-
+ .../translations/zh_CN/core-api/index.rst | 8 +-
+ .../translations/zh_CN/core-api/irq/concepts.rst | 8 +-
+ .../translations/zh_CN/core-api/irq/index.rst | 7 +-
+ .../zh_CN/core-api/irq/irq-affinity.rst | 8 +-
+ .../translations/zh_CN/core-api/irq/irq-domain.rst | 8 +-
+ .../zh_CN/core-api/irq/irqflags-tracing.rst | 8 +-
+ .../translations/zh_CN/core-api/kernel-api.rst | 6 +-
+ .../translations/zh_CN/core-api/kobject.rst | 5 +-
+ .../translations/zh_CN/core-api/local_ops.rst | 6 +-
+ .../translations/zh_CN/core-api/padata.rst | 5 +-
+ .../translations/zh_CN/core-api/printk-basics.rst | 6 +-
+ .../translations/zh_CN/core-api/printk-formats.rst | 6 +-
+ .../zh_CN/core-api/refcount-vs-atomic.rst | 6 +-
+ .../zh_CN/core-api/symbol-namespaces.rst | 6 +-
+ .../translations/zh_CN/core-api/workqueue.rst | 6 +-
+ Documentation/translations/zh_CN/cpu-freq/core.rst | 8 +-
+ .../translations/zh_CN/cpu-freq/cpu-drivers.rst | 8 +-
+ .../translations/zh_CN/cpu-freq/cpufreq-stats.rst | 8 +-
+ .../translations/zh_CN/cpu-freq/index.rst | 8 +-
+ .../translations/zh_CN/filesystems/debugfs.rst | 2 +-
+ .../translations/zh_CN/iio/ep93xx_adc.rst | 8 +-
+ .../translations/zh_CN/iio/iio_configfs.rst | 8 +-
+ Documentation/translations/zh_CN/iio/index.rst | 8 +-
+ .../translations/zh_CN/kernel-hacking/hacking.rst | 2 +-
+ Documentation/translations/zh_CN/mips/booting.rst | 7 +-
+ Documentation/translations/zh_CN/mips/features.rst | 7 +-
+ Documentation/translations/zh_CN/mips/index.rst | 7 +-
+ .../translations/zh_CN/mips/ingenic-tcu.rst | 7 +-
+ .../translations/zh_CN/openrisc/index.rst | 8 +-
+ .../translations/zh_CN/openrisc/openrisc_port.rst | 7 +-
+ Documentation/translations/zh_CN/openrisc/todo.rst | 7 +-
+ .../translations/zh_CN/parisc/debugging.rst | 5 +-
+ Documentation/translations/zh_CN/parisc/index.rst | 5 +-
+ .../translations/zh_CN/parisc/registers.rst | 5 +-
+ .../translations/zh_CN/riscv/boot-image-header.rst | 8 +-
+ Documentation/translations/zh_CN/riscv/index.rst | 8 +-
+ .../translations/zh_CN/riscv/patch-acceptance.rst | 8 +-
+ Documentation/translations/zh_CN/riscv/pmu.rst | 8 +-
+ Documentation/translations/zh_TW/arm64/amu.rst | 104 ++++++
+ Documentation/translations/zh_TW/arm64/booting.txt | 251 ++++++++++++++
+ .../translations/zh_TW/arm64/elf_hwcaps.rst | 244 +++++++++++++
+ .../translations/zh_TW/arm64/hugetlbpage.rst | 49 +++
+ Documentation/translations/zh_TW/arm64/index.rst | 23 ++
+ .../zh_TW/arm64/legacy_instructions.txt | 77 +++++
+ Documentation/translations/zh_TW/arm64/memory.txt | 119 +++++++
+ Documentation/translations/zh_TW/arm64/perf.rst | 88 +++++
+ .../translations/zh_TW/arm64/silicon-errata.txt | 79 +++++
+ .../translations/zh_TW/arm64/tagged-pointers.txt | 57 ++++
+ Documentation/translations/zh_TW/cpu-freq/core.rst | 108 ++++++
+ .../translations/zh_TW/cpu-freq/cpu-drivers.rst | 256 ++++++++++++++
+ .../translations/zh_TW/cpu-freq/cpufreq-stats.rst | 132 ++++++++
+ .../translations/zh_TW/cpu-freq/index.rst | 47 +++
+ .../translations/zh_TW/filesystems/debugfs.rst | 224 ++++++++++++
+ .../translations/zh_TW/filesystems/index.rst | 31 ++
+ .../translations/zh_TW/filesystems/sysfs.txt | 377 +++++++++++++++++++++
+ .../translations/zh_TW/filesystems/tmpfs.rst | 148 ++++++++
+ .../translations/zh_TW/filesystems/virtiofs.rst | 61 ++++
+ Documentation/translations/zh_TW/index.rst | 13 +-
+ Documentation/x86/x86_64/mm.rst | 4 -
+ 73 files changed, 2686 insertions(+), 129 deletions(-)
+ create mode 100644 Documentation/translations/zh_TW/arm64/amu.rst
+ create mode 100644 Documentation/translations/zh_TW/arm64/booting.txt
+ create mode 100644 Documentation/translations/zh_TW/arm64/elf_hwcaps.rst
+ create mode 100644 Documentation/translations/zh_TW/arm64/hugetlbpage.rst
+ create mode 100644 Documentation/translations/zh_TW/arm64/index.rst
+ create mode 100644 Documentation/translations/zh_TW/arm64/legacy_instructions.txt
+ create mode 100644 Documentation/translations/zh_TW/arm64/memory.txt
+ create mode 100644 Documentation/translations/zh_TW/arm64/perf.rst
+ create mode 100644 Documentation/translations/zh_TW/arm64/silicon-errata.txt
+ create mode 100644 Documentation/translations/zh_TW/arm64/tagged-pointers.txt
+ create mode 100644 Documentation/translations/zh_TW/cpu-freq/core.rst
+ create mode 100644 Documentation/translations/zh_TW/cpu-freq/cpu-drivers.rst
+ create mode 100644 Documentation/translations/zh_TW/cpu-freq/cpufreq-stats.rst
+ create mode 100644 Documentation/translations/zh_TW/cpu-freq/index.rst
+ create mode 100644 Documentation/translations/zh_TW/filesystems/debugfs.rst
+ create mode 100644 Documentation/translations/zh_TW/filesystems/index.rst
+ create mode 100644 Documentation/translations/zh_TW/filesystems/sysfs.txt
+ create mode 100644 Documentation/translations/zh_TW/filesystems/tmpfs.rst
+ create mode 100644 Documentation/translations/zh_TW/filesystems/virtiofs.rst
+Merging v4l-dvb/master (9c3a0f285248 Merge tag 'v5.14-rc4' into media_tree)
+$ git merge v4l-dvb/master
+Already up to date.
+Merging v4l-dvb-next/master (d62cd4d277cc media: uvcvideo: Remove unused including <linux/version.h>)
+$ git merge v4l-dvb-next/master
+Auto-merging drivers/staging/media/sunxi/cedrus/cedrus_video.c
+Auto-merging drivers/staging/media/hantro/hantro_drv.c
+Auto-merging drivers/media/platform/atmel/atmel-isc-base.c
+Auto-merging drivers/media/common/videobuf2/videobuf2-core.c
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/media/renesas,imr.txt
+Removing Documentation/devicetree/bindings/media/i2c/mt9p031.txt
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/media/ipu3.rst | 14 +-
+ Documentation/admin-guide/media/ivtv.rst | 2 +-
+ .../bindings/media/i2c/aptina,mt9p031.yaml | 108 ++
+ .../devicetree/bindings/media/i2c/mt9p031.txt | 40 -
+ .../devicetree/bindings/media/mediatek-vcodec.txt | 2 +
+ .../devicetree/bindings/media/renesas,csi2.yaml | 1 +
+ .../devicetree/bindings/media/renesas,imr.txt | 31 -
+ .../devicetree/bindings/media/renesas,imr.yaml | 67 +
+ .../devicetree/bindings/media/rockchip-isp1.yaml | 114 +-
+ Documentation/driver-api/media/drivers/rkisp1.rst | 43 +
+ Documentation/driver-api/media/v4l2-subdev.rst | 14 +-
+ .../userspace-api/media/drivers/cx2341x-uapi.rst | 8 +-
+ .../userspace-api/media/v4l/ext-ctrls-codec.rst | 57 +
+ .../media/v4l/ext-ctrls-image-source.rst | 20 +
+ .../userspace-api/media/v4l/pixfmt-reserved.rst | 29 +-
+ .../userspace-api/media/v4l/pixfmt-yuv-planar.rst | 50 +-
+ .../userspace-api/media/v4l/vidioc-queryctrl.rst | 6 +
+ .../userspace-api/media/videodev2.h.rst.exceptions | 2 +
+ MAINTAINERS | 8 +
+ drivers/media/common/siano/smscoreapi.c | 7 +-
+ drivers/media/common/videobuf2/videobuf2-core.c | 23 +-
+ drivers/media/dvb-frontends/cxd2820r_priv.h | 2 +-
+ drivers/media/i2c/Kconfig | 11 +
+ drivers/media/i2c/Makefile | 1 +
+ drivers/media/i2c/imx258.c | 12 +-
+ drivers/media/i2c/max9286.c | 17 +-
+ drivers/media/i2c/mt9p031.c | 80 +-
+ drivers/media/i2c/ov13b10.c | 1491 ++++++++++++++++++++
+ drivers/media/i2c/ov8856.c | 83 +-
+ drivers/media/i2c/st-mipid02.c | 22 +-
+ drivers/media/i2c/tda1997x.c | 4 +-
+ drivers/media/pci/cx18/cx18-ioctl.c | 4 +-
+ drivers/media/pci/cx18/cx18-streams.c | 8 +-
+ drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 264 ++--
+ drivers/media/pci/intel/ipu3/ipu3-cio2.h | 4 +
+ drivers/media/pci/ivtv/ivtv-ioctl.c | 8 +-
+ drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 27 +-
+ drivers/media/platform/Kconfig | 3 +
+ drivers/media/platform/am437x/am437x-vpfe.c | 19 +-
+ drivers/media/platform/atmel/atmel-isc-base.c | 4 +-
+ drivers/media/platform/atmel/atmel-isi.c | 17 +-
+ drivers/media/platform/atmel/atmel-sama5d2-isc.c | 15 +-
+ drivers/media/platform/atmel/atmel-sama7g5-isc.c | 15 +-
+ drivers/media/platform/cadence/cdns-csi2rx.c | 14 +-
+ drivers/media/platform/davinci/vpif_capture.c | 21 +-
+ drivers/media/platform/exynos4-is/media-dev.c | 20 +-
+ drivers/media/platform/marvell-ccic/cafe-driver.c | 9 +-
+ drivers/media/platform/marvell-ccic/mcam-core.c | 10 +-
+ drivers/media/platform/marvell-ccic/mmp-driver.c | 6 +-
+ drivers/media/platform/meson/ge2d/ge2d.c | 6 +-
+ drivers/media/platform/mtk-vcodec/Makefile | 3 +
+ drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 820 ++---------
+ drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h | 27 +-
+ .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 65 +-
+ .../platform/mtk-vcodec/mtk_vcodec_dec_stateful.c | 628 +++++++++
+ .../platform/mtk-vcodec/mtk_vcodec_dec_stateless.c | 360 +++++
+ drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 59 +-
+ drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 140 +-
+ .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 69 +-
+ .../platform/mtk-vcodec/vdec/vdec_h264_req_if.c | 774 ++++++++++
+ drivers/media/platform/mtk-vcodec/vdec_drv_if.c | 3 +
+ drivers/media/platform/mtk-vcodec/vdec_drv_if.h | 1 +
+ drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h | 23 +-
+ drivers/media/platform/mtk-vcodec/vdec_vpu_if.c | 43 +-
+ drivers/media/platform/mtk-vcodec/vdec_vpu_if.h | 5 +
+ drivers/media/platform/omap3isp/isp.c | 21 +-
+ drivers/media/platform/pxa_camera.c | 26 +-
+ drivers/media/platform/qcom/camss/camss-vfe-170.c | 9 +-
+ drivers/media/platform/qcom/camss/camss-vfe-4-1.c | 8 +-
+ drivers/media/platform/qcom/camss/camss-vfe-4-7.c | 8 +-
+ drivers/media/platform/qcom/camss/camss-vfe-4-8.c | 8 +-
+ drivers/media/platform/qcom/camss/camss-vfe.c | 3 +-
+ drivers/media/platform/qcom/camss/camss-vfe.h | 2 +-
+ drivers/media/platform/qcom/camss/camss.c | 18 +-
+ drivers/media/platform/rcar-vin/rcar-core.c | 1077 +++++++-------
+ drivers/media/platform/rcar-vin/rcar-csi2.c | 210 ++-
+ drivers/media/platform/rcar-vin/rcar-dma.c | 22 +-
+ drivers/media/platform/rcar-vin/rcar-vin.h | 25 +-
+ drivers/media/platform/rcar_drif.c | 14 +-
+ drivers/media/platform/renesas-ceu.c | 29 +-
+ .../platform/rockchip/rkisp1/rkisp1-capture.c | 9 +-
+ .../media/platform/rockchip/rkisp1/rkisp1-common.h | 44 +-
+ .../media/platform/rockchip/rkisp1/rkisp1-dev.c | 98 +-
+ .../media/platform/rockchip/rkisp1/rkisp1-isp.c | 29 +-
+ .../media/platform/rockchip/rkisp1/rkisp1-params.c | 557 ++++++--
+ .../media/platform/rockchip/rkisp1/rkisp1-regs.h | 406 ++++--
+ .../media/platform/rockchip/rkisp1/rkisp1-stats.c | 107 +-
+ .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 1 -
+ .../media/platform/sti/c8sectpfe/c8sectpfe-dvb.c | 1 -
+ drivers/media/platform/stm32/stm32-dcmi.c | 37 +-
+ drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 12 +-
+ drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 29 +-
+ drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h | 2 +-
+ .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 2 +-
+ drivers/media/platform/ti-vpe/cal.c | 16 +-
+ drivers/media/platform/video-mux.c | 17 +-
+ drivers/media/platform/xilinx/xilinx-vipp.c | 17 +-
+ drivers/media/rc/imon.c | 2 +
+ drivers/media/rc/ir_toy.c | 34 +-
+ drivers/media/rc/mceusb.c | 1 +
+ drivers/media/rc/streamzap.c | 1 +
+ drivers/media/spi/cxd2880-spi.c | 2 +-
+ drivers/media/test-drivers/vivid/vivid-core.c | 14 +-
+ drivers/media/tuners/mxl5007t.c | 9 -
+ drivers/media/usb/dvb-usb/az6027.c | 1 +
+ drivers/media/usb/em28xx/em28xx-cards.c | 5 +-
+ drivers/media/usb/gspca/m5602/m5602_ov7660.h | 1 -
+ drivers/media/usb/gspca/sn9c20x.c | 22 +-
+ drivers/media/usb/ttusb-dec/ttusb_dec.c | 10 +-
+ drivers/media/usb/uvc/uvc_driver.c | 1 -
+ drivers/media/v4l2-core/v4l2-async.c | 168 ++-
+ drivers/media/v4l2-core/v4l2-common.c | 3 +
+ drivers/media/v4l2-core/v4l2-ctrls-core.c | 6 +
+ drivers/media/v4l2-core/v4l2-ctrls-defs.c | 5 +
+ drivers/media/v4l2-core/v4l2-fwnode.c | 83 +-
+ drivers/media/v4l2-core/v4l2-ioctl.c | 6 +-
+ drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 37 +-
+ .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 2 +
+ .../pci/hive_isp_css_common/host/input_system.c | 2 +
+ drivers/staging/media/hantro/hantro_drv.c | 8 +-
+ drivers/staging/media/hantro/hantro_g2_hevc_dec.c | 52 +
+ drivers/staging/media/hantro/hantro_hevc.c | 21 +
+ drivers/staging/media/hantro/hantro_hw.h | 4 +
+ drivers/staging/media/imx/imx-media-csi.c | 17 +-
+ drivers/staging/media/imx/imx-media-dev-common.c | 7 +-
+ drivers/staging/media/imx/imx-media-dev.c | 6 +-
+ drivers/staging/media/imx/imx-media-of.c | 6 +-
+ drivers/staging/media/imx/imx6-mipi-csi2.c | 17 +-
+ drivers/staging/media/imx/imx7-media-csi.c | 24 +-
+ drivers/staging/media/imx/imx7-mipi-csis.c | 16 +-
+ drivers/staging/media/imx/imx8mq-mipi-csi2.c | 16 +-
+ .../staging/media/ipu3/include/uapi/intel-ipu3.h | 7 +-
+ drivers/staging/media/ipu3/ipu3-css-fw.c | 7 +-
+ drivers/staging/media/ipu3/ipu3-css-fw.h | 2 +-
+ drivers/staging/media/sunxi/cedrus/cedrus.c | 8 +-
+ drivers/staging/media/sunxi/cedrus/cedrus.h | 1 +
+ drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 2 +
+ drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 70 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 2 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_regs.h | 2 +
+ drivers/staging/media/sunxi/cedrus/cedrus_video.c | 6 +-
+ drivers/staging/media/tegra-video/vi.c | 17 +-
+ include/media/hevc-ctrls.h | 11 +
+ include/media/i2c/mt9p031.h | 1 +
+ include/media/v4l2-async.h | 105 +-
+ include/media/v4l2-fwnode.h | 12 +-
+ include/uapi/linux/v4l2-controls.h | 1 +
+ include/uapi/linux/videodev2.h | 20 +-
+ 148 files changed, 7146 insertions(+), 2464 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/media/i2c/aptina,mt9p031.yaml
+ delete mode 100644 Documentation/devicetree/bindings/media/i2c/mt9p031.txt
+ delete mode 100644 Documentation/devicetree/bindings/media/renesas,imr.txt
+ create mode 100644 Documentation/devicetree/bindings/media/renesas,imr.yaml
+ create mode 100644 Documentation/driver-api/media/drivers/rkisp1.rst
+ create mode 100644 drivers/media/i2c/ov13b10.c
+ create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c
+ create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c
+ create mode 100644 drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c
+Merging pm/linux-next (6f65d2319f21 Merge branches 'acpi-pci', 'acpi-pm' and 'acpi-docs' into linux-next)
+$ git merge pm/linux-next
+Auto-merging drivers/pci/pci-acpi.c
+Auto-merging Documentation/translations/zh_CN/cpu-freq/cpu-drivers.rst
+Removing Documentation/devicetree/bindings/opp/opp.txt
+Auto-merging Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/acpi/ssdt-overlays.rst | 49 +-
+ Documentation/cpu-freq/cpu-drivers.rst | 3 -
+ .../devicetree/bindings/cpufreq/cpufreq-dt.txt | 2 +-
+ .../bindings/cpufreq/cpufreq-mediatek.txt | 2 +-
+ .../devicetree/bindings/cpufreq/cpufreq-st.txt | 6 +-
+ .../bindings/cpufreq/nvidia,tegra20-cpufreq.txt | 2 +-
+ .../devicetree/bindings/devfreq/rk3399_dmc.txt | 2 +-
+ .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 2 +-
+ .../devicetree/bindings/gpu/arm,mali-midgard.yaml | 2 +-
+ .../bindings/interconnect/fsl,imx8m-noc.yaml | 4 +-
+ .../opp/allwinner,sun50i-h6-operating-points.yaml | 4 +
+ Documentation/devicetree/bindings/opp/opp-v1.yaml | 51 ++
+ .../devicetree/bindings/opp/opp-v2-base.yaml | 214 +++++++
+ Documentation/devicetree/bindings/opp/opp-v2.yaml | 475 ++++++++++++++++
+ Documentation/devicetree/bindings/opp/opp.txt | 622 ---------------------
+ Documentation/devicetree/bindings/opp/qcom-opp.txt | 2 +-
+ .../bindings/opp/ti-omap5-opp-supply.txt | 2 +-
+ .../devicetree/bindings/power/power-domain.yaml | 2 +-
+ .../translations/zh_CN/cpu-freq/cpu-drivers.rst | 2 -
+ arch/arm/boot/dts/omap34xx.dtsi | 1 -
+ arch/arm/boot/dts/omap36xx.dtsi | 1 -
+ drivers/acpi/x86/s2idle.c | 67 ++-
+ drivers/base/arch_topology.c | 2 +
+ drivers/cpufreq/acpi-cpufreq.c | 14 +-
+ drivers/cpufreq/cpufreq-dt-platdev.c | 4 +
+ drivers/cpufreq/cpufreq-dt.c | 3 +-
+ drivers/cpufreq/cpufreq.c | 17 +-
+ drivers/cpufreq/imx6q-cpufreq.c | 2 +-
+ drivers/cpufreq/mediatek-cpufreq.c | 3 +-
+ drivers/cpufreq/omap-cpufreq.c | 2 +-
+ drivers/cpufreq/qcom-cpufreq-hw.c | 151 ++++-
+ drivers/cpufreq/scmi-cpufreq.c | 65 ++-
+ drivers/cpufreq/scpi-cpufreq.c | 3 +-
+ drivers/cpufreq/sh-cpufreq.c | 11 -
+ drivers/cpufreq/vexpress-spc-cpufreq.c | 25 +-
+ drivers/pci/controller/vmd.c | 55 ++
+ drivers/pci/host-bridge.c | 1 +
+ drivers/pci/pci-acpi.c | 74 +++
+ include/linux/cpufreq.h | 17 +-
+ include/linux/pci-acpi.h | 3 +
+ 40 files changed, 1190 insertions(+), 779 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/opp/opp-v1.yaml
+ create mode 100644 Documentation/devicetree/bindings/opp/opp-v2-base.yaml
+ create mode 100644 Documentation/devicetree/bindings/opp/opp-v2.yaml
+ delete mode 100644 Documentation/devicetree/bindings/opp/opp.txt
+Merging cpufreq-arm/cpufreq/arm/linux-next (4855e26bcf4d cpufreq: mediatek-hw: Add support for CPUFREQ HW)
+$ git merge cpufreq-arm/cpufreq/arm/linux-next
+Auto-merging include/linux/cpufreq.h
+Merge made by the 'recursive' strategy.
+ .../bindings/cpufreq/cpufreq-mediatek-hw.yaml | 70 +++++
+ drivers/cpufreq/Kconfig.arm | 12 +
+ drivers/cpufreq/Makefile | 1 +
+ drivers/cpufreq/mediatek-cpufreq-hw.c | 308 +++++++++++++++++++++
+ include/linux/cpufreq.h | 58 +++-
+ 5 files changed, 448 insertions(+), 1 deletion(-)
+ create mode 100644 Documentation/devicetree/bindings/cpufreq/cpufreq-mediatek-hw.yaml
+ create mode 100644 drivers/cpufreq/mediatek-cpufreq-hw.c
+Merging cpupower/cpupower (5499f2b80b56 tools: cpupower: fix typo in cpupower-idle-set(1) manpage)
+$ git merge cpupower/cpupower
+Merge made by the 'recursive' strategy.
+ tools/power/cpupower/man/cpupower-idle-set.1 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging devfreq/devfreq-next (e73f0f0ee754 Linux 5.14-rc1)
+$ git merge devfreq/devfreq-next
+Already up to date.
+Merging opp/opp/linux-next (94274f20f6bf dt-bindings: opp: Convert to DT schema)
+$ git merge opp/opp/linux-next
+Already up to date.
+Merging thermal/thermal/linux-next (da6deb655a58 thermal/drivers/qcom/spmi-adc-tm5: Don't abort probing if a sensor is not used)
+$ git merge thermal/thermal/linux-next
+Auto-merging drivers/firmware/qcom_scm.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/thermal/qcom-lmh.yaml | 82 +++
+ .../devicetree/bindings/thermal/thermal-zones.yaml | 2 +-
+ MAINTAINERS | 1 +
+ drivers/firmware/qcom_scm.c | 58 ++
+ drivers/firmware/qcom_scm.h | 4 +
+ .../intel/int340x_thermal/int3400_thermal.c | 14 +-
+ drivers/thermal/intel/intel_powerclamp.c | 4 +-
+ drivers/thermal/intel/intel_tcc_cooling.c | 2 +
+ drivers/thermal/qcom/Kconfig | 10 +
+ drivers/thermal/qcom/Makefile | 1 +
+ drivers/thermal/qcom/lmh.c | 232 +++++++
+ drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 6 +
+ drivers/thermal/rcar_gen3_thermal.c | 110 +++-
+ drivers/thermal/samsung/exynos_tmu.c | 1 +
+ drivers/thermal/tegra/Kconfig | 9 +-
+ drivers/thermal/tegra/Makefile | 1 +
+ drivers/thermal/tegra/soctherm.c | 4 +-
+ drivers/thermal/tegra/tegra30-tsensor.c | 673 +++++++++++++++++++++
+ include/linux/qcom_scm.h | 14 +
+ include/linux/thermal.h | 7 +-
+ tools/thermal/tmon/Makefile | 10 +-
+ 21 files changed, 1221 insertions(+), 24 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/thermal/qcom-lmh.yaml
+ create mode 100644 drivers/thermal/qcom/lmh.c
+ create mode 100644 drivers/thermal/tegra/tegra30-tsensor.c
+Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API)
+$ git merge ieee1394/for-next
+Merge made by the 'recursive' strategy.
+ drivers/firewire/net.c | 4 ----
+ 1 file changed, 4 deletions(-)
+Merging dlm/next (ecd95673142e fs: dlm: avoid comms shutdown delay in release_lockspace)
+$ git merge dlm/next
+Already up to date.
+Merging swiotlb/linux-next (f3c4b1341e83 swiotlb: use depends on for DMA_RESTRICTED_POOL)
+$ git merge swiotlb/linux-next
+Already up to date.
+Merging rdma/for-next (6a217437f9f5 Merge branch 'sg_nents' into rdma.git for-next)
+$ git merge rdma/for-next
+Already up to date.
+Merging net-next/master (27151f177827 Merge tag 'perf-tools-for-v5.15-2021-09-04' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux)
+$ git merge net-next/master
+Already up to date.
+Merging bpf-next/for-next (27151f177827 Merge tag 'perf-tools-for-v5.15-2021-09-04' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux)
+$ git merge bpf-next/for-next
+Already up to date.
+Merging ipsec-next/master (9e9fb7655ed5 Merge tag 'net-next-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
+$ git merge ipsec-next/master
+Already up to date.
+Merging mlx5-next/mlx5-next (598fe77df855 net/mlx5: Lag, Create shared FDB when in switchdev mode)
+$ git merge mlx5-next/mlx5-next
+Already up to date.
+Merging netfilter-next/master (9e9fb7655ed5 Merge tag 'net-next-5.15' 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 (7bc416f14716 netfilter: x_tables: handle xt_register_template() returning an error value)
+$ git merge ipvs-next/master
+Already up to date.
+Merging wireless-drivers-next/master (eaf2aaec0be4 Merge tag 'wireless-drivers-next-2021-08-29' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next)
+$ git merge wireless-drivers-next/master
+Already up to date.
+Merging bluetooth/master (49d8a5606428 Bluetooth: fix init and cleanup of sco_conn.timeout_work)
+$ git merge bluetooth/master
+Merge made by the 'recursive' strategy.
+ drivers/bluetooth/btintel.c | 146 +++++++++++-----
+ drivers/bluetooth/btintel.h | 6 +
+ drivers/bluetooth/btusb.c | 24 +++
+ include/net/bluetooth/hci.h | 1 +
+ include/net/bluetooth/hci_core.h | 7 +-
+ net/bluetooth/hci_conn.c | 33 ++--
+ net/bluetooth/hci_core.c | 9 -
+ net/bluetooth/hci_event.c | 80 +++++----
+ net/bluetooth/hci_sock.c | 50 +++---
+ net/bluetooth/l2cap_core.c | 2 +-
+ net/bluetooth/l2cap_sock.c | 10 +-
+ net/bluetooth/mgmt.c | 358 +++++++++++++++++++++++++++------------
+ net/bluetooth/sco.c | 36 ++--
+ 13 files changed, 508 insertions(+), 254 deletions(-)
+Merging mac80211-next/master (464a57281f29 net/mlxbf_gige: Make use of devm_platform_ioremap_resourcexxx())
+$ git merge mac80211-next/master
+Already up to date.
+Merging mtd/mtd/next (c1fe77e42440 Merge tag 'nand/for-5.15' into mtd/next)
+$ git merge mtd/mtd/next
+Already up to date.
+Merging nand/nand/next (6b430c7595e4 mtd: rawnand: cafe: Fix a resource leak in the error handling path of 'cafe_nand_probe()')
+$ git merge nand/nand/next
+Already up to date.
+Merging spi-nor/spi-nor/next (2734d6c1b1a0 Linux 5.14-rc2)
+$ git merge spi-nor/spi-nor/next
+Already up to date.
+Merging crypto/master (6ae51ffe5e76 crypto: sha512 - remove imaginary and mystifying clearing of variables)
+$ git merge crypto/master
+Already up to date.
+Merging drm/drm-next (1645cca9da91 drm/i915: use linux/stddef.h due to "isystem: trim/fixup stdarg.h and other headers")
+$ git merge drm/drm-next
+Merge made by the 'recursive' strategy.
+Merging drm-misc/for-linux-next (c4f3a3460a5d dma-buf: DMABUF_MOVE_NOTIFY should depend on DMA_SHARED_BUFFER)
+$ git merge drm-misc/for-linux-next
+Merge made by the 'recursive' strategy.
+ Documentation/gpu/drm-mm.rst | 2 +-
+ drivers/dma-buf/Kconfig | 1 +
+ drivers/gpu/drm/mgag200/mgag200_pll.c | 1 +
+ drivers/gpu/drm/panfrost/panfrost_mmu.c | 31 +++++++++++--------------------
+ drivers/gpu/drm/panfrost/panfrost_regs.h | 2 ++
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 7 +++----
+ drivers/gpu/drm/ttm/ttm_tt.c | 1 -
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
+ include/drm/ttm/ttm_tt.h | 3 ++-
+ 9 files changed, 22 insertions(+), 28 deletions(-)
+Merging amdgpu/drm-next (968ee03d1d01 drm/sched: fix the bug of time out calculation(v4))
+$ git merge amdgpu/drm-next
+Auto-merging drivers/gpu/drm/ttm/ttm_device.c
+Auto-merging drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
+Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master fa70ffa4e2cb] Merge remote-tracking branch 'amdgpu/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/gpu/drm/Kconfig | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 50 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 143 ++-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 152 +++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h | 1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 8 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 23 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 168 +--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 31 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 9 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 44 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_umr.h | 51 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 14 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 14 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 30 +-
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/vi.c | 9 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 18 +
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 84 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 1 +
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 201 +++-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 40 +
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 43 +
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 +-
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 10 +
+ .../gpu/drm/amd/display/dc/bios/command_table2.c | 10 +
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 18 +
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c | 468 +++++++-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 1177 +++++++++++++++++++-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 315 +++++-
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 118 ++
+ drivers/gpu/drm/amd/display/dc/dc.h | 29 +-
+ drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 222 ++++
+ drivers/gpu/drm/amd/display/dc/dc_link.h | 7 +
+ drivers/gpu/drm/amd/display/dc/dc_types.h | 21 +
+ drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 16 +
+ .../amd/display/dc/dce110/dce110_hw_sequencer.c | 99 +-
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 65 ++
+ .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 9 +
+ .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 10 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 26 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 8 +-
+ .../amd/display/dc/dcn30/dcn30_dio_link_encoder.c | 4 +
+ .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2 +-
+ .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.h | 7 +
+ .../drm/amd/display/dc/dcn302/dcn302_resource.c | 2 +-
+ .../drm/amd/display/dc/dcn303/dcn303_resource.c | 8 +-
+ drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 3 +-
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c | 173 +++
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.h | 115 ++
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 162 +++
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 18 +
+ .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 4 +
+ .../display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 616 ++++++++++
+ .../display/dc/dcn31/dcn31_hpo_dp_link_encoder.h | 222 ++++
+ .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 747 +++++++++++++
+ .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h | 241 ++++
+ .../drm/amd/display/dc/dcn31/dcn31_panel_cntl.c | 4 +-
+ .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 246 +++-
+ drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 1 +
+ drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 +
+ .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 2 +-
+ .../drm/amd/display/dc/dml/display_mode_enums.h | 4 +-
+ drivers/gpu/drm/amd/display/dc/inc/core_types.h | 12 +
+ drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 22 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 23 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 4 +
+ .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 91 ++
+ .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 81 ++
+ .../drm/amd/display/dc/inc/hw/timing_generator.h | 3 +
+ .../drm/amd/display/dc/inc/hw_sequencer_private.h | 3 +
+ drivers/gpu/drm/amd/display/dc/inc/resource.h | 18 +
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 31 +-
+ .../drm/amd/display/include/bios_parser_types.h | 8 +
+ drivers/gpu/drm/amd/display/include/dpcd_defs.h | 16 +
+ .../gpu/drm/amd/display/include/grph_object_defs.h | 12 +
+ .../gpu/drm/amd/display/include/grph_object_id.h | 8 +
+ .../drm/amd/display/include/link_service_types.h | 41 +-
+ drivers/gpu/drm/amd/display/include/logger_types.h | 6 +
+ drivers/gpu/drm/amd/include/atomfirmware.h | 4 +
+ drivers/gpu/drm/amd/pm/amdgpu_pm.c | 8 +-
+ drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 24 +
+ 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/smu7_hwmgr.c | 17 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 6 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 22 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 6 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 -
+ drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 2 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 5 +-
+ .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 2 +-
+ drivers/gpu/drm/radeon/radeon.h | 3 +
+ drivers/gpu/drm/radeon/radeon_audio.c | 95 ++
+ drivers/gpu/drm/scheduler/sched_main.c | 26 +-
+ drivers/gpu/drm/ttm/ttm_bo.c | 18 +-
+ drivers/gpu/drm/ttm/ttm_device.c | 48 +
+ include/drm/ttm/ttm_device.h | 2 +
+ 123 files changed, 6689 insertions(+), 444 deletions(-)
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_umr.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h
+Merging drm-intel/for-linux-next (fb43ebc83e06 drm/i915/selftest: Fix use of err in igt_reset_{fail, nop}_engine())
+$ git merge drm-intel/for-linux-next
+Already up to date.
+Merging drm-tegra/drm/tegra/for-next (fed028939417 gpu: host1x: debug: Dump DMASTART and DMAEND register)
+$ git merge drm-tegra/drm/tegra/for-next
+Already up to date.
+Merging drm-msm/msm-next (cb0927ab80d2 drm/msi/mdp4: populate priv->kms in mdp4_kms_init)
+$ git merge drm-msm/msm-next
+Already up to date.
+Merging imx-drm/imx-drm/next (20fbfc81e390 drm/imx: imx-tve: Make use of the helper function devm_platform_ioremap_resource())
+$ git merge imx-drm/imx-drm/next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/imx/imx-tve.c | 4 +---
+ drivers/gpu/ipu-v3/ipu-image-convert.c | 9 +++------
+ 2 files changed, 4 insertions(+), 9 deletions(-)
+Merging etnaviv/etnaviv/next (81fd23e2b3cc drm/etnaviv: Implement mmap as GEM object function)
+$ git merge etnaviv/etnaviv/next
+Already up to date.
+Merging regmap/for-next (ca5537c9be13 Merge remote-tracking branch 'regmap/for-5.15' into regmap-next)
+$ git merge regmap/for-next
+Already up to date.
+Merging sound/for-next (c8b177b6e3a0 ALSA: usb-audio: Add registration quirk for JBL Quantum 800)
+$ git merge sound/for-next
+Already up to date.
+Merging sound-asoc/for-next (bf342ee5e443 Merge remote-tracking branch 'asoc/for-5.15' into asoc-linus)
+$ git merge sound-asoc/for-next
+Already up to date.
+Merging modules/modules-next (ced75a2f5da7 MAINTAINERS: Add Luis Chamberlain as modules maintainer)
+$ git merge modules/modules-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 1 +
+ scripts/module.lds.S | 1 +
+ 2 files changed, 2 insertions(+)
+Merging input/next (daf87bffd02e Input: palmas-pwrbutton - handle return value of platform_get_irq())
+$ git merge input/next
+Merge made by the 'recursive' strategy.
+ drivers/input/misc/cpcap-pwrbutton.c | 6 +++-
+ drivers/input/misc/palmas-pwrbutton.c | 5 +++
+ drivers/input/touchscreen/raydium_i2c_ts.c | 50 +++++++++++++++++++++++++-----
+ 3 files changed, 53 insertions(+), 8 deletions(-)
+Merging block/for-next (db3d77ce1c49 Merge branch 'misc-5.15' into for-next)
+$ git merge block/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 7 -------
+ 1 file changed, 7 deletions(-)
+Merging device-mapper/for-next (d3703ef33129 dm crypt: use in_hardirq() instead of deprecated in_irq())
+$ git merge device-mapper/for-next
+Already up to date.
+Merging pcmcia/pcmcia-next (e39cdacf2f66 pcmcia: i82092: fix a null pointer dereference bug)
+$ git merge pcmcia/pcmcia-next
+Already up to date.
+Merging mmc/next (b81bede4d138 mmc: renesas_sdhi: fix regression with hard reset on old SDHIs)
+$ git merge mmc/next
+Already up to date.
+Merging mfd/for-mfd-next (90b122d0ad16 mfd: syscon: Use of_iomap() instead of ioremap())
+$ git merge mfd/for-mfd-next
+Auto-merging drivers/mfd/db8500-prcmu.c
+Auto-merging drivers/mfd/Makefile
+Auto-merging drivers/mfd/Kconfig
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/mfd/tps65086.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mfd/axp20x.txt | 3 +-
+ .../devicetree/bindings/mfd/brcm,cru.yaml | 86 +++
+ .../devicetree/bindings/mfd/qcom,pm8008.yaml | 13 +-
+ Documentation/devicetree/bindings/mfd/syscon.yaml | 3 +
+ .../devicetree/bindings/mfd/ti,tps65086.yaml | 124 ++++
+ Documentation/devicetree/bindings/mfd/tps65086.txt | 54 --
+ MAINTAINERS | 1 -
+ drivers/clk/ux500/u8500_of_clk.c | 3 +-
+ drivers/cpuidle/cpuidle-ux500.c | 2 +-
+ drivers/mfd/Kconfig | 28 +
+ drivers/mfd/Makefile | 5 +
+ drivers/mfd/ab8500-core.c | 2 +-
+ drivers/mfd/axp20x.c | 16 +-
+ .../{dbx500-prcmu-regs.h => db8500-prcmu-regs.h} | 0
+ drivers/mfd/db8500-prcmu.c | 25 +-
+ drivers/mfd/intel-lpss-acpi.c | 18 +
+ drivers/mfd/intel-m10-bmc.c | 12 +-
+ drivers/mfd/lpc_ich.c | 1 +
+ drivers/mfd/mt6360-core.c | 8 +-
+ drivers/mfd/rsmu.h | 16 +
+ drivers/mfd/rsmu_core.c | 88 +++
+ drivers/mfd/rsmu_i2c.c | 203 ++++++
+ drivers/mfd/rsmu_spi.c | 273 ++++++++
+ drivers/mfd/simple-mfd-i2c.c | 41 +-
+ drivers/mfd/simple-mfd-i2c.h | 32 +
+ drivers/mfd/stmpe.c | 4 +-
+ drivers/mfd/syscon.c | 2 +-
+ drivers/mfd/tc3589x.c | 2 +-
+ drivers/mfd/ti_am335x_tscadc.c | 5 +-
+ drivers/mfd/tps65086.c | 22 +-
+ drivers/mfd/tqmx86.c | 48 +-
+ drivers/mfd/wm8994-irq.c | 2 +-
+ include/linux/mfd/dbx500-prcmu.h | 3 +-
+ include/linux/mfd/idt82p33_reg.h | 112 ++++
+ include/linux/mfd/idt8a340_reg.h | 729 +++++++++++++++++++++
+ include/linux/mfd/rsmu.h | 36 +
+ 36 files changed, 1904 insertions(+), 118 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mfd/brcm,cru.yaml
+ create mode 100644 Documentation/devicetree/bindings/mfd/ti,tps65086.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mfd/tps65086.txt
+ rename drivers/mfd/{dbx500-prcmu-regs.h => db8500-prcmu-regs.h} (100%)
+ create mode 100644 drivers/mfd/rsmu.h
+ create mode 100644 drivers/mfd/rsmu_core.c
+ create mode 100644 drivers/mfd/rsmu_i2c.c
+ create mode 100644 drivers/mfd/rsmu_spi.c
+ create mode 100644 drivers/mfd/simple-mfd-i2c.h
+ create mode 100644 include/linux/mfd/idt82p33_reg.h
+ create mode 100644 include/linux/mfd/idt8a340_reg.h
+ create mode 100644 include/linux/mfd/rsmu.h
+Merging backlight/for-backlight-next (79fad92f2e59 backlight: pwm_bl: Improve bootloader/kernel device handover)
+$ git merge backlight/for-backlight-next
+Merge made by the 'recursive' strategy.
+ drivers/video/backlight/ktd253-backlight.c | 75 ++++++++++++++++++++++--------
+ drivers/video/backlight/pwm_bl.c | 54 ++++++++++-----------
+ 2 files changed, 83 insertions(+), 46 deletions(-)
+Merging battery/for-next (c9398455b046 power: supply: core: Fix parsing of battery chemistry/technology)
+$ git merge battery/for-next
+Already up to date.
+Merging regulator/for-next (7cb623f775d5 Merge remote-tracking branch 'regulator/for-5.15' into regulator-linus)
+$ 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 (cb181da16196 IMA: reject unknown hash algorithms in ima_get_hash_algo)
+$ 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 b7d93915e4be] Merge remote-tracking branch 'keys/keys-next'
+$ git diff -M --stat --summary HEAD^..
+Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata)
+$ git merge safesetid/safesetid-next
+Already up to date.
+Merging selinux/next (893c47d1964f selinux: return early for possible NULL audit buffers)
+$ git merge selinux/next
+Already up to date.
+Merging smack/next (bfc3cac0c761 smack: mark 'smack_enabled' global variable as __initdata)
+$ git merge smack/next
+Already up to date.
+Merging tomoyo/master (7d2a07b76933 Linux 5.14)
+$ git merge tomoyo/master
+Already up to date.
+Merging tpmdd/next (f985911b7bc7 crypto: public_key: fix overflow during implicit conversion)
+$ git merge tpmdd/next
+Already up to date.
+Merging watchdog/master (41e73feb1024 dt-bindings: watchdog: Add compatible for Mediatek MT7986)
+$ git merge watchdog/master
+Removing drivers/watchdog/bd70528_wdt.c
+Auto-merging drivers/watchdog/Kconfig
+Merge made by the 'recursive' strategy.
+ .../bindings/watchdog/maxim,max63xx.yaml | 44 ++++
+ .../devicetree/bindings/watchdog/mtk-wdt.txt | 1 +
+ drivers/watchdog/Kconfig | 12 -
+ drivers/watchdog/Makefile | 1 -
+ drivers/watchdog/bcm2835_wdt.c | 10 +-
+ drivers/watchdog/bd70528_wdt.c | 291 ---------------------
+ drivers/watchdog/iTCO_wdt.c | 2 +-
+ drivers/watchdog/imx2_wdt.c | 1 +
+ drivers/watchdog/max63xx_wdt.c | 24 +-
+ drivers/watchdog/mpc8xxx_wdt.c | 2 +-
+ drivers/watchdog/mtk_wdt.c | 6 +
+ drivers/watchdog/sl28cpld_wdt.c | 2 +-
+ drivers/watchdog/tqmx86_wdt.c | 2 +-
+ drivers/watchdog/watchdog_core.c | 37 +++
+ drivers/watchdog/watchdog_dev.c | 57 +++-
+ include/dt-bindings/reset/mt8195-resets.h | 29 ++
+ include/linux/watchdog.h | 10 +
+ 17 files changed, 213 insertions(+), 318 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml
+ delete mode 100644 drivers/watchdog/bd70528_wdt.c
+ create mode 100644 include/dt-bindings/reset/mt8195-resets.h
+Merging iommu/next (d8768d7eb9c2 Merge branches 'apple/dart', 'arm/smmu', 'iommu/fixes', 'x86/amd', 'x86/vt-d' and 'core' into next)
+$ git merge iommu/next
+Already up to date.
+Merging audit/next (67d69e9d1a6c audit: move put_tree() to avoid trim_trees refcount underflow and UAF)
+$ git merge audit/next
+Already up to date.
+Merging devicetree/for-next (b1e202503508 dt-bindings: display: remove zte,vou.txt binding doc)
+$ git merge devicetree/for-next
+Already up to date.
+Merging mailbox/mailbox-for-next (85dfdbfc13ea mailbox: cmdq: add multi-gce clocks support for mt8195)
+$ git merge mailbox/mailbox-for-next
+Already up to date.
+Merging spi/for-next (34014d01dd27 Merge remote-tracking branch 'spi/for-5.15' into spi-linus)
+$ git merge spi/for-next
+Already up to date.
+Merging tip/auto-latest (ee0f507188b8 Merge branch 'x86/urgent')
+$ git merge tip/auto-latest
+Auto-merging arch/x86/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arm64/kernel/cacheinfo.c | 7 +-
+ arch/mips/kernel/cacheinfo.c | 7 +-
+ arch/riscv/kernel/cacheinfo.c | 7 +-
+ arch/x86/Kconfig | 5 +
+ arch/x86/events/intel/uncore_discovery.h | 2 +-
+ arch/x86/events/intel/uncore_snbep.c | 16 ++-
+ arch/x86/kernel/cpu/cacheinfo.c | 7 +-
+ arch/x86/mm/pat/memtype.c | 7 +-
+ include/linux/cacheinfo.h | 18 ---
+ include/linux/rwsem.h | 12 +-
+ kernel/futex.c | 187 ++++++++++++++++++-------------
+ kernel/locking/rwsem.c | 10 +-
+ 12 files changed, 152 insertions(+), 133 deletions(-)
+Merging clockevents/timers/drivers/next (f196ae282070 dt-bindings: timer: Add ABIs for new Ingenic SoCs)
+$ git merge clockevents/timers/drivers/next
+Already up to date.
+Merging edac/edac-for-next (cf4e6d52f583 EDAC/i10nm: Retrieve and print retry_rd_err_log registers)
+$ git merge edac/edac-for-next
+Already up to date.
+Merging irqchip/irq/irqchip-next (6e3b473ee064 Merge branch irq/qcom-pdc-nowake-cleanup into irq/irqchip-next)
+$ git merge irqchip/irq/irqchip-next
+Already up to date.
+Merging ftrace/for-next (4420f5b1be7b tracing/doc: Fix table format in histogram code)
+$ git merge ftrace/for-next
+Already up to date.
+Merging rcu/rcu/next (38babc43f45e rcutorture: Avoid problematic critical section nesting on PREEMPT_RT)
+$ git merge rcu/rcu/next
+Auto-merging kernel/time/tick-internal.h
+CONFLICT (content): Merge conflict in kernel/time/tick-internal.h
+Auto-merging kernel/time/clocksource.c
+Auto-merging kernel/time/clocksource-wdtest.c
+Resolved 'kernel/time/tick-internal.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master e37104c57d4a] Merge remote-tracking branch 'rcu/rcu/next'
+$ git diff -M --stat --summary HEAD^..
+ .../Memory-Ordering/Tree-RCU-Memory-Ordering.rst | 69 +++--
+ Documentation/RCU/stallwarn.rst | 10 +
+ .../litmus-tests/locking/DCL-broken.litmus | 55 ++++
+ .../litmus-tests/locking/DCL-fixed.litmus | 56 ++++
+ .../litmus-tests/locking/RM-broken.litmus | 42 +++
+ Documentation/litmus-tests/locking/RM-fixed.litmus | 42 +++
+ arch/sh/configs/sdk7786_defconfig | 1 -
+ arch/xtensa/configs/nommu_kc705_defconfig | 1 -
+ include/linux/kcsan-checks.h | 3 +
+ include/linux/rcupdate_trace.h | 5 +-
+ include/linux/torture.h | 8 +
+ kernel/kcsan/core.c | 75 ++---
+ kernel/kcsan/kcsan.h | 8 +-
+ kernel/kcsan/kcsan_test.c | 62 ++--
+ kernel/kcsan/report.c | 77 ++++-
+ kernel/kcsan/selftest.c | 72 ++---
+ kernel/locking/locktorture.c | 14 +-
+ kernel/rcu/rcuscale.c | 10 +-
+ kernel/rcu/rcutorture.c | 86 ++++--
+ kernel/rcu/refscale.c | 6 +-
+ kernel/rcu/tasks.h | 87 +++---
+ kernel/rcu/tree.c | 34 +--
+ kernel/rcu/tree_exp.h | 3 +-
+ kernel/rcu/tree_nocb.h | 2 +-
+ kernel/rcu/update.c | 8 +-
+ kernel/scftorture.c | 43 +--
+ kernel/time/clocksource-wdtest.c | 5 +-
+ kernel/time/clocksource.c | 31 +-
+ tools/memory-model/Documentation/locking.txt | 320 +++++++++++++++++++++
+ tools/memory-model/litmus-tests/.gitignore | 2 +-
+ tools/memory-model/scripts/README | 16 +-
+ tools/memory-model/scripts/checkalllitmus.sh | 29 +-
+ tools/memory-model/scripts/checkghlitmus.sh | 11 +-
+ tools/memory-model/scripts/checklitmus.sh | 25 +-
+ tools/memory-model/scripts/checklitmushist.sh | 2 +-
+ tools/memory-model/scripts/checktheselitmus.sh | 43 +++
+ tools/memory-model/scripts/cmplitmushist.sh | 49 +++-
+ tools/memory-model/scripts/hwfnseg.sh | 20 ++
+ tools/memory-model/scripts/initlitmushist.sh | 2 +-
+ tools/memory-model/scripts/judgelitmus.sh | 120 ++++++--
+ tools/memory-model/scripts/newlitmushist.sh | 4 +-
+ tools/memory-model/scripts/parseargs.sh | 21 +-
+ tools/memory-model/scripts/runlitmus.sh | 80 ++++++
+ tools/memory-model/scripts/runlitmushist.sh | 29 +-
+ tools/memory-model/scripts/simpletest.sh | 35 +++
+ tools/rcu/extract-stall.sh | 33 +++
+ .../testing/selftests/rcutorture/bin/kvm-remote.sh | 1 +
+ tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +-
+ tools/testing/selftests/rcutorture/bin/torture.sh | 11 +-
+ 49 files changed, 1376 insertions(+), 394 deletions(-)
+ create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus
+ create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus
+ create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus
+ create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus
+ create mode 100644 tools/memory-model/Documentation/locking.txt
+ create mode 100755 tools/memory-model/scripts/checktheselitmus.sh
+ create mode 100755 tools/memory-model/scripts/hwfnseg.sh
+ create mode 100755 tools/memory-model/scripts/runlitmus.sh
+ create mode 100755 tools/memory-model/scripts/simpletest.sh
+ create mode 100644 tools/rcu/extract-stall.sh
+Merging kvm/next (109bbba5066b KVM: Drop unused kvm_dirty_gfn_invalid())
+$ git merge kvm/next
+Auto-merging arch/x86/kvm/vmx/nested.c
+Auto-merging arch/x86/kvm/svm/svm.c
+Auto-merging arch/x86/kvm/svm/nested.c
+Auto-merging arch/x86/kvm/hyperv.c
+Auto-merging arch/s390/kvm/kvm-s390.c
+Auto-merging arch/s390/include/asm/kvm_host.h
+Auto-merging arch/powerpc/kvm/book3s_hv.c
+Auto-merging arch/powerpc/kvm/book3s_64_vio_hv.c
+Auto-merging arch/powerpc/include/asm/kvm_host.h
+Auto-merging arch/arm64/kernel/cpufeature.c
+Auto-merging arch/arm64/include/asm/sysreg.h
+Auto-merging arch/arm64/include/asm/cpufeature.h
+Auto-merging Documentation/virt/kvm/api.rst
+Merge made by the 'recursive' strategy.
+ Documentation/virt/kvm/api.rst | 36 +-
+ Documentation/virt/kvm/locking.rst | 6 +
+ arch/arm64/include/asm/cpufeature.h | 18 +-
+ arch/arm64/include/asm/kvm_arm.h | 54 ++-
+ arch/arm64/include/asm/kvm_asm.h | 7 +-
+ arch/arm64/include/asm/kvm_host.h | 17 +-
+ arch/arm64/include/asm/kvm_hyp.h | 2 +-
+ arch/arm64/include/asm/kvm_mmu.h | 17 +-
+ arch/arm64/include/asm/kvm_pgtable.h | 168 +++++--
+ arch/arm64/include/asm/sysreg.h | 26 +-
+ arch/arm64/kernel/cpufeature.c | 8 +-
+ arch/arm64/kernel/vmlinux.lds.S | 4 +-
+ arch/arm64/kvm/Kconfig | 10 +
+ arch/arm64/kvm/arm.c | 161 +++----
+ arch/arm64/kvm/debug.c | 2 +-
+ arch/arm64/kvm/guest.c | 9 +-
+ arch/arm64/kvm/handle_exit.c | 43 +-
+ arch/arm64/kvm/hyp/include/hyp/switch.h | 6 +-
+ arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 35 +-
+ arch/arm64/kvm/hyp/include/nvhe/mm.h | 3 +-
+ arch/arm64/kvm/hyp/include/nvhe/spinlock.h | 25 +
+ arch/arm64/kvm/hyp/nvhe/debug-sr.c | 2 +-
+ arch/arm64/kvm/hyp/nvhe/host.S | 21 +-
+ arch/arm64/kvm/hyp/nvhe/hyp-main.c | 20 +-
+ arch/arm64/kvm/hyp/nvhe/mem_protect.c | 244 ++++++++--
+ arch/arm64/kvm/hyp/nvhe/mm.c | 22 +-
+ arch/arm64/kvm/hyp/nvhe/setup.c | 82 +++-
+ arch/arm64/kvm/hyp/nvhe/switch.c | 17 +-
+ arch/arm64/kvm/hyp/nvhe/tlb.c | 4 +-
+ arch/arm64/kvm/hyp/pgtable.c | 247 +++++-----
+ arch/arm64/kvm/hyp/vhe/debug-sr.c | 2 +-
+ arch/arm64/kvm/hyp/vhe/switch.c | 18 +-
+ arch/arm64/kvm/hyp/vhe/sysreg-sr.c | 2 +-
+ arch/arm64/kvm/hyp/vhe/tlb.c | 4 +-
+ arch/arm64/kvm/mmu.c | 76 ++-
+ arch/arm64/kvm/perf.c | 2 +-
+ arch/arm64/kvm/pmu-emul.c | 14 +-
+ arch/arm64/kvm/psci.c | 15 +-
+ arch/arm64/kvm/reset.c | 43 +-
+ arch/arm64/kvm/sys_regs.c | 134 +++---
+ arch/arm64/kvm/sys_regs.h | 31 ++
+ arch/arm64/kvm/trace_handle_exit.h | 10 +-
+ arch/arm64/kvm/vgic/vgic-mmio-v2.c | 4 +-
+ arch/arm64/kvm/vgic/vgic-v2.c | 36 +-
+ arch/arm64/kvm/vgic/vgic-v3.c | 36 +-
+ arch/arm64/kvm/vgic/vgic.c | 39 +-
+ arch/arm64/kvm/vgic/vgic.h | 2 +
+ arch/mips/kvm/mips.c | 4 -
+ arch/mips/kvm/vz.c | 3 +-
+ arch/powerpc/include/asm/kvm_host.h | 1 -
+ arch/powerpc/kvm/book3s.c | 5 -
+ arch/powerpc/kvm/book3s_64_vio.c | 2 +-
+ arch/powerpc/kvm/book3s_64_vio_hv.c | 2 +-
+ arch/powerpc/kvm/book3s_hv.c | 18 +-
+ arch/powerpc/kvm/booke.c | 5 -
+ arch/s390/include/asm/kvm_host.h | 2 +
+ arch/s390/kvm/interrupt.c | 12 +-
+ arch/s390/kvm/kvm-s390.c | 12 +-
+ arch/s390/kvm/kvm-s390.h | 2 +-
+ arch/s390/kvm/vsie.c | 2 +
+ arch/x86/include/asm/kvm-x86-ops.h | 1 -
+ arch/x86/include/asm/kvm_host.h | 96 ++--
+ arch/x86/include/uapi/asm/kvm.h | 1 +
+ arch/x86/kernel/kvm.c | 5 +-
+ arch/x86/kvm/debugfs.c | 111 +++++
+ arch/x86/kvm/hyperv.c | 32 +-
+ arch/x86/kvm/i8254.c | 3 +-
+ arch/x86/kvm/ioapic.h | 4 -
+ arch/x86/kvm/lapic.c | 26 +-
+ arch/x86/kvm/mmu.h | 25 +
+ arch/x86/kvm/mmu/mmu.c | 524 +++++++++++++--------
+ arch/x86/kvm/mmu/mmu_audit.c | 4 +-
+ arch/x86/kvm/mmu/mmu_internal.h | 18 +-
+ arch/x86/kvm/mmu/mmutrace.h | 6 +
+ arch/x86/kvm/mmu/page_track.c | 1 +
+ arch/x86/kvm/mmu/paging_tmpl.h | 6 +-
+ arch/x86/kvm/mmu/tdp_mmu.c | 139 ++++--
+ arch/x86/kvm/mmu/tdp_mmu.h | 29 +-
+ arch/x86/kvm/pmu.c | 5 +-
+ arch/x86/kvm/pmu.h | 2 +-
+ arch/x86/kvm/svm/avic.c | 49 +-
+ arch/x86/kvm/svm/nested.c | 5 -
+ arch/x86/kvm/svm/sev.c | 3 +-
+ arch/x86/kvm/svm/svm.c | 97 ++--
+ arch/x86/kvm/svm/svm.h | 8 -
+ arch/x86/kvm/svm/svm_ops.h | 2 +-
+ arch/x86/kvm/vmx/evmcs.c | 1 -
+ arch/x86/kvm/vmx/evmcs.h | 4 -
+ arch/x86/kvm/vmx/nested.c | 56 ++-
+ arch/x86/kvm/vmx/pmu_intel.c | 4 +-
+ arch/x86/kvm/vmx/vmcs.h | 2 +
+ arch/x86/kvm/vmx/vmcs12.c | 1 -
+ arch/x86/kvm/vmx/vmcs12.h | 4 -
+ arch/x86/kvm/vmx/vmx.c | 333 +++++++------
+ arch/x86/kvm/vmx/vmx.h | 38 +-
+ arch/x86/kvm/vmx/vmx_ops.h | 4 +-
+ arch/x86/kvm/x86.c | 189 +++++---
+ arch/x86/kvm/x86.h | 2 +
+ arch/x86/kvm/xen.c | 23 +-
+ arch/x86/kvm/xen.h | 5 +
+ include/linux/entry-kvm.h | 6 +-
+ include/linux/kvm_host.h | 236 ++++++++--
+ include/linux/kvm_types.h | 7 +
+ include/linux/page-flags.h | 37 --
+ include/uapi/linux/kvm.h | 11 +-
+ tools/testing/selftests/kvm/.gitignore | 1 +
+ tools/testing/selftests/kvm/Makefile | 1 +
+ .../selftests/kvm/aarch64/psci_cpu_on_test.c | 121 +++++
+ .../selftests/kvm/access_tracking_perf_test.c | 4 +-
+ tools/testing/selftests/kvm/demand_paging_test.c | 3 +-
+ tools/testing/selftests/kvm/dirty_log_perf_test.c | 77 ++-
+ .../selftests/kvm/include/aarch64/processor.h | 3 +
+ .../testing/selftests/kvm/include/perf_test_util.h | 2 +-
+ .../testing/selftests/kvm/kvm_binary_stats_test.c | 12 +
+ tools/testing/selftests/kvm/lib/perf_test_util.c | 22 +-
+ .../kvm/memslot_modification_stress_test.c | 3 +-
+ tools/testing/selftests/kvm/x86_64/debug_regs.c | 24 +-
+ virt/kvm/binary_stats.c | 2 -
+ virt/kvm/dirty_ring.c | 5 -
+ virt/kvm/kvm_main.c | 197 ++++++--
+ 120 files changed, 2891 insertions(+), 1605 deletions(-)
+ create mode 100644 tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c
+Merging kvm-arm/next (419025b3b419 Merge branch kvm-arm64/misc-5.15 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 (a3e03bc1368c KVM: s390: index kvm->arch.idle_mask by vcpu_idx)
+$ git merge kvms390/next
+Already up to date.
+Merging xen-tip/linux-next (58e636039b51 xen: remove stray preempt_disable() from PV AP startup code)
+$ git merge xen-tip/linux-next
+Already up to date.
+Merging percpu/for-next (a81a52b325ec Merge branch 'for-5.14-fixes' into for-next)
+$ git merge percpu/for-next
+Already up to date.
+Merge made by the 'recursive' strategy.
+Merging workqueues/for-next (bdb0a6548d22 workqueue: Remove unused WORK_NO_COLOR)
+$ git merge workqueues/for-next
+Already up to date.
+Merging drivers-x86/for-next (0487d4fc42d7 platform/x86: dell-smbios-wmi: Add missing kfree in error-exit from run_smbios_call)
+$ git merge drivers-x86/for-next
+Already up to date.
+Merging chrome-platform/for-next (4665584888ad platform/chrome: cros_ec_trace: Fix format warnings)
+$ git merge chrome-platform/for-next
+Merge made by the 'recursive' strategy.
+ drivers/platform/chrome/Makefile | 2 +-
+ drivers/platform/chrome/cros_ec_proto.c | 9 +++
+ drivers/platform/chrome/cros_ec_sensorhub_ring.c | 14 ++++
+ drivers/platform/chrome/cros_ec_trace.h | 94 ++++++++++++++++++++++++
+ drivers/platform/chrome/cros_ec_typec.c | 27 ++-----
+ 5 files changed, 123 insertions(+), 23 deletions(-)
+Merging hsi/for-next (e73f0f0ee754 Linux 5.14-rc1)
+$ git merge hsi/for-next
+Already up to date.
+Merging leds/for-next (239f32b4f161 leds: pca955x: Switch to i2c probe_new)
+$ git merge leds/for-next
+Already up to date.
+Merging ipmi/for-next (bf064c7bec3b char: ipmi: use DEVICE_ATTR helper macro)
+$ git merge ipmi/for-next
+Auto-merging drivers/char/ipmi/ipmi_si_intf.c
+Merge made by the 'recursive' strategy.
+ drivers/char/ipmi/ipmi_si_intf.c | 23 +++++++++++------------
+ 1 file changed, 11 insertions(+), 12 deletions(-)
+Merging driver-core/driver-core-next (27151f177827 Merge tag 'perf-tools-for-v5.15-2021-09-04' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux)
+$ git merge driver-core/driver-core-next
+Already up to date.
+Merging usb/usb-next (27151f177827 Merge tag 'perf-tools-for-v5.15-2021-09-04' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/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 (a65ab973c166 USB: serial: replace symbolic permissions by octal permissions)
+$ git merge usb-serial/usb-next
+Already up to date.
+Merging usb-chipidea-next/for-usb-next (e5d6a7c6cfae usb: chipidea: host: fix port index underflow and UBSAN complains)
+$ git merge usb-chipidea-next/for-usb-next
+Already up to date.
+Merging tty/tty-next (49624efa65ac Merge tag 'denywrite-for-5.15' of git://github.com/davidhildenbrand/linux)
+$ git merge tty/tty-next
+Already up to date.
+Merging char-misc/char-misc-next (4cd67adc44a3 Merge tag 'misc-habanalabs-next-2021-09-01' of https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux into char-misc-next)
+$ git merge char-misc/char-misc-next
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/debugfs-driver-habanalabs | 19 +
+ drivers/misc/habanalabs/common/Makefile | 3 +-
+ drivers/misc/habanalabs/common/command_buffer.c | 4 +-
+ .../misc/habanalabs/common/command_submission.c | 1387 +++++++++++++++-----
+ drivers/misc/habanalabs/common/context.c | 146 ++-
+ drivers/misc/habanalabs/common/debugfs.c | 184 ++-
+ drivers/misc/habanalabs/common/device.c | 163 +--
+ drivers/misc/habanalabs/common/firmware_if.c | 56 +-
+ drivers/misc/habanalabs/common/habanalabs.h | 421 +++++-
+ drivers/misc/habanalabs/common/habanalabs_drv.c | 13 +-
+ drivers/misc/habanalabs/common/habanalabs_ioctl.c | 2 +
+ drivers/misc/habanalabs/common/hw_queue.c | 198 ++-
+ drivers/misc/habanalabs/common/memory.c | 169 ++-
+ drivers/misc/habanalabs/common/mmu/mmu_v1.c | 12 +-
+ drivers/misc/habanalabs/common/pci/pci.c | 2 +
+ drivers/misc/habanalabs/common/state_dump.c | 718 ++++++++++
+ drivers/misc/habanalabs/common/sysfs.c | 20 +-
+ drivers/misc/habanalabs/gaudi/gaudi.c | 716 ++++++++--
+ drivers/misc/habanalabs/gaudi/gaudiP.h | 19 +-
+ drivers/misc/habanalabs/gaudi/gaudi_coresight.c | 5 -
+ drivers/misc/habanalabs/gaudi/gaudi_security.c | 8 +
+ drivers/misc/habanalabs/goya/goya.c | 102 +-
+ drivers/misc/habanalabs/include/common/cpucp_if.h | 115 +-
+ .../misc/habanalabs/include/common/hl_boot_if.h | 62 +-
+ .../habanalabs/include/gaudi/asic_reg/gaudi_regs.h | 3 +
+ .../misc/habanalabs/include/gaudi/gaudi_masks.h | 17 +
+ .../misc/habanalabs/include/gaudi/gaudi_reg_map.h | 2 -
+ include/uapi/misc/habanalabs.h | 186 ++-
+ 28 files changed, 3918 insertions(+), 834 deletions(-)
+ create mode 100644 drivers/misc/habanalabs/common/state_dump.c
+Merging extcon/extcon-next (07de34f5ce1e extcon: max3355: Drop unused include)
+$ git merge extcon/extcon-next
+Merge made by the 'recursive' strategy.
+ drivers/extcon/extcon-max3355.c | 1 -
+ drivers/extcon/extcon-usb-gpio.c | 3 +--
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+Merging phy-next/next (152a810eae03 phy: qcom-qmp: Add support for SM6115 UFS phy)
+$ git merge phy-next/next
+Already up to date.
+Merging soundwire/next (2564a2d4418b soundwire: cadence: do not extend reset delay)
+$ git merge soundwire/next
+Already up to date.
+Merging thunderbolt/next (42716425ad7e thunderbolt: Fix port linking by checking all adapters)
+$ git merge thunderbolt/next
+Already up to date.
+Merging vfio/next (ea870730d83f Merge branches 'v5.15/vfio/spdx-license-cleanups', 'v5.15/vfio/dma-valid-waited-v3', 'v5.15/vfio/vfio-pci-core-v5' and 'v5.15/vfio/vfio-ap' into v5.15/vfio/next)
+$ git merge vfio/next
+Already up to date.
+Merging staging/staging-next (27151f177827 Merge tag 'perf-tools-for-v5.15-2021-09-04' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux)
+$ git merge staging/staging-next
+Already up to date.
+Merging iio/togreg (d484c21bacfa iio: adc: Add driver for Renesas RZ/G2L A/D converter)
+$ 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 (8bf5d31c4f06 interconnect: qcom: osm-l3: Use driver-specific naming)
+$ git merge icc/icc-next
+Already up to date.
+Merging dmaengine/next (11a427be2c47 dmaengine: sh: fix some NULL dereferences)
+$ git merge dmaengine/next
+Auto-merging MAINTAINERS
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/stable/sysfs-driver-dma-idxd | 9 +
+ Documentation/admin-guide/kernel-parameters.txt | 5 +
+ .../devicetree/bindings/dma/altr,msgdma.yaml | 4 +-
+ .../devicetree/bindings/dma/renesas,rz-dmac.yaml | 130 +++
+ .../devicetree/bindings/dma/st,stm32-dma.yaml | 7 +
+ MAINTAINERS | 6 +
+ drivers/dma/Kconfig | 28 +-
+ drivers/dma/Makefile | 3 +-
+ drivers/dma/acpi-dma.c | 18 +-
+ drivers/dma/altera-msgdma.c | 37 +-
+ drivers/dma/at_xdmac.c | 8 +-
+ drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 56 +-
+ drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 4 +
+ drivers/dma/dw/idma32.c | 138 ++-
+ drivers/dma/dw/internal.h | 16 +
+ drivers/dma/dw/of.c | 49 +-
+ drivers/dma/dw/pci.c | 6 +-
+ drivers/dma/dw/platform.c | 6 +-
+ drivers/dma/ep93xx_dma.c | 6 +-
+ drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c | 10 +-
+ drivers/dma/hisi_dma.c | 10 +-
+ drivers/dma/idxd/Makefile | 8 +
+ drivers/dma/idxd/bus.c | 91 ++
+ drivers/dma/idxd/cdev.c | 73 +-
+ drivers/dma/idxd/compat.c | 107 +++
+ drivers/dma/idxd/device.c | 382 ++++++--
+ drivers/dma/idxd/dma.c | 96 +-
+ drivers/dma/idxd/idxd.h | 167 +++-
+ drivers/dma/idxd/init.c | 148 ++--
+ drivers/dma/idxd/irq.c | 190 +---
+ drivers/dma/idxd/registers.h | 6 +
+ drivers/dma/idxd/submit.c | 43 +-
+ drivers/dma/idxd/sysfs.c | 601 +++----------
+ drivers/dma/ppc4xx/adma.c | 12 +-
+ drivers/dma/ptdma/Kconfig | 13 +
+ drivers/dma/ptdma/Makefile | 10 +
+ drivers/dma/ptdma/ptdma-debugfs.c | 106 +++
+ drivers/dma/ptdma/ptdma-dev.c | 305 +++++++
+ drivers/dma/ptdma/ptdma-dmaengine.c | 389 +++++++++
+ drivers/dma/ptdma/ptdma-pci.c | 243 ++++++
+ drivers/dma/ptdma/ptdma.h | 324 +++++++
+ drivers/dma/sh/Kconfig | 9 +
+ drivers/dma/sh/Makefile | 1 +
+ drivers/dma/sh/rz-dmac.c | 969 +++++++++++++++++++++
+ drivers/dma/sh/usb-dmac.c | 2 +-
+ drivers/dma/sprd-dma.c | 1 +
+ drivers/dma/stm32-dma.c | 8 +-
+ drivers/dma/tegra210-adma.c | 7 +-
+ drivers/dma/ti/k3-psil-j721e.c | 73 ++
+ drivers/dma/xilinx/xilinx_dma.c | 17 +-
+ drivers/dma/xilinx/zynqmp_dma.c | 3 +-
+ include/linux/dmaengine.h | 3 +-
+ include/linux/platform_data/dma-dw.h | 21 +-
+ include/uapi/linux/idxd.h | 24 +
+ 54 files changed, 4080 insertions(+), 928 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dma/renesas,rz-dmac.yaml
+ create mode 100644 drivers/dma/idxd/bus.c
+ create mode 100644 drivers/dma/idxd/compat.c
+ create mode 100644 drivers/dma/ptdma/Kconfig
+ create mode 100644 drivers/dma/ptdma/Makefile
+ create mode 100644 drivers/dma/ptdma/ptdma-debugfs.c
+ create mode 100644 drivers/dma/ptdma/ptdma-dev.c
+ create mode 100644 drivers/dma/ptdma/ptdma-dmaengine.c
+ create mode 100644 drivers/dma/ptdma/ptdma-pci.c
+ create mode 100644 drivers/dma/ptdma/ptdma.h
+ create mode 100644 drivers/dma/sh/rz-dmac.c
+Merging cgroup/for-next (96aff80dde1b Merge branch 'for-5.15' into for-next)
+$ git merge cgroup/for-next
+Already up to date.
+Merge made by the 'recursive' strategy.
+Merging scsi/for-next (27f681116fdf Merge branch 'misc' into for-next)
+$ git merge scsi/for-next
+Already up to date.
+Merge made by the 'recursive' strategy.
+Merging scsi-mkp/for-next (9b5ac8ab4e8b scsi: ufs: Fix ufshcd_request_sense_async() for Samsung KLUFG8RHDA-B2D1)
+$ git merge scsi-mkp/for-next
+Already up to date.
+Merging vhost/linux-next (7bc7f61897b6 Documentation: Add documentation for VDUSE)
+$ git merge vhost/linux-next
+Auto-merging include/uapi/linux/virtio_ids.h
+CONFLICT (content): Merge conflict in include/uapi/linux/virtio_ids.h
+Auto-merging fs/file.c
+Auto-merging fs/eventfd.c
+CONFLICT (content): Merge conflict in fs/eventfd.c
+Auto-merging drivers/virtio/virtio.c
+CONFLICT (content): Merge conflict in drivers/virtio/virtio.c
+Auto-merging drivers/vdpa/vdpa.c
+Auto-merging drivers/vdpa/mlx5/net/mlx5_vnet.c
+Auto-merging drivers/iommu/iova.c
+Auto-merging drivers/block/virtio_blk.c
+Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst
+Resolved 'drivers/virtio/virtio.c' using previous resolution.
+Resolved 'fs/eventfd.c' using previous resolution.
+Resolved 'include/uapi/linux/virtio_ids.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master c6c335d10420] Merge remote-tracking branch 'vhost/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/gpio/gpio-virtio.yaml | 59 +
+ .../devicetree/bindings/i2c/i2c-virtio.yaml | 51 +
+ Documentation/devicetree/bindings/virtio/mmio.yaml | 3 +-
+ .../devicetree/bindings/virtio/virtio-device.yaml | 41 +
+ Documentation/userspace-api/index.rst | 1 +
+ Documentation/userspace-api/ioctl/ioctl-number.rst | 1 +
+ Documentation/userspace-api/vduse.rst | 233 +++
+ drivers/block/virtio_blk.c | 4 +-
+ drivers/iommu/iova.c | 2 +
+ drivers/vdpa/Kconfig | 11 +
+ drivers/vdpa/Makefile | 1 +
+ drivers/vdpa/ifcvf/ifcvf_base.c | 8 +-
+ drivers/vdpa/ifcvf/ifcvf_base.h | 25 +-
+ drivers/vdpa/ifcvf/ifcvf_main.c | 249 ++-
+ drivers/vdpa/mlx5/core/mlx5_vdpa.h | 26 +-
+ drivers/vdpa/mlx5/core/mr.c | 81 +-
+ drivers/vdpa/mlx5/core/resources.c | 35 +
+ drivers/vdpa/mlx5/net/mlx5_vnet.c | 555 ++++++-
+ drivers/vdpa/vdpa.c | 9 +-
+ drivers/vdpa/vdpa_sim/vdpa_sim.c | 29 +-
+ drivers/vdpa/vdpa_user/Makefile | 5 +
+ drivers/vdpa/vdpa_user/iova_domain.c | 545 +++++++
+ drivers/vdpa/vdpa_user/iova_domain.h | 73 +
+ drivers/vdpa/vdpa_user/vduse_dev.c | 1641 ++++++++++++++++++++
+ drivers/vdpa/virtio_pci/vp_vdpa.c | 17 +-
+ drivers/vhost/iotlb.c | 20 +-
+ drivers/vhost/scsi.c | 14 +-
+ drivers/vhost/vdpa.c | 188 ++-
+ drivers/vhost/vsock.c | 28 +-
+ drivers/virtio/virtio.c | 56 +-
+ drivers/virtio/virtio_balloon.c | 4 +-
+ fs/file.c | 6 +
+ include/linux/file.h | 7 +-
+ include/linux/vdpa.h | 62 +-
+ include/linux/vhost_iotlb.h | 3 +
+ include/uapi/linux/vduse.h | 306 ++++
+ include/uapi/linux/virtio_ids.h | 12 +-
+ include/uapi/linux/virtio_vsock.h | 3 +-
+ net/vmw_vsock/af_vsock.c | 10 +-
+ net/vmw_vsock/virtio_transport_common.c | 23 +-
+ tools/testing/vsock/vsock_test.c | 8 +-
+ 41 files changed, 4129 insertions(+), 326 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-virtio.yaml
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-virtio.yaml
+ create mode 100644 Documentation/devicetree/bindings/virtio/virtio-device.yaml
+ create mode 100644 Documentation/userspace-api/vduse.rst
+ create mode 100644 drivers/vdpa/vdpa_user/Makefile
+ create mode 100644 drivers/vdpa/vdpa_user/iova_domain.c
+ create mode 100644 drivers/vdpa/vdpa_user/iova_domain.h
+ create mode 100644 drivers/vdpa/vdpa_user/vduse_dev.c
+ create mode 100644 include/uapi/linux/vduse.h
+$ git am -3 ../patches/0001-fix-up-for-eventfd-Make-signal-recursion-protection-.patch
+Applying: fix up for "eventfd: Make signal recursion protection a task bit"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/vdpa/vdpa_user/vduse_dev.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 684bffa5349f] Merge remote-tracking branch 'vhost/linux-next'
+ Date: Tue Sep 7 11:37:08 2021 +1000
+Merging rpmsg/for-next (c93ca5f21d93 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
+$ git merge rpmsg/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 1 +
+ drivers/remoteproc/qcom_q6v5_pas.c | 1 +
+ drivers/remoteproc/qcom_wcnss.c | 49 +++------
+ drivers/remoteproc/qcom_wcnss.h | 4 +-
+ drivers/remoteproc/qcom_wcnss_iris.c | 120 +++++++++++++--------
+ drivers/remoteproc/remoteproc_core.c | 4 +-
+ drivers/remoteproc/remoteproc_elf_helpers.h | 2 +-
+ include/linux/remoteproc.h | 5 +-
+ 8 files changed, 96 insertions(+), 90 deletions(-)
+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 (889a1b3f35db gpio: mpc8xxx: Use 'devm_gpiochip_add_data()' to simplify the code and avoid a leak)
+$ git merge gpio-brgl/gpio/for-next
+Auto-merging include/uapi/linux/virtio_ids.h
+Removing include/linux/platform_data/gpio-dwapb.h
+Auto-merging include/linux/of.h
+Auto-merging drivers/gpio/gpio-tegra186.c
+Auto-merging drivers/gpio/gpio-rcar.c
+Auto-merging drivers/gpio/gpio-mt7621.c
+Auto-merging drivers/gpio/gpio-mpc8xxx.c
+Removing drivers/gpio/gpio-mc9s08dz60.c
+Auto-merging drivers/gpio/gpio-brcmstb.c
+Auto-merging drivers/gpio/gpio-aspeed-sgpio.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/driver-api/gpio/consumer.rst | 10 +-
+ Documentation/driver-api/gpio/driver.rst | 11 +-
+ MAINTAINERS | 11 +-
+ drivers/gpio/Kconfig | 15 +-
+ drivers/gpio/Makefile | 2 +-
+ drivers/gpio/gpio-aspeed-sgpio.c | 178 ++++++++------
+ drivers/gpio/gpio-brcmstb.c | 45 +---
+ drivers/gpio/gpio-dwapb.c | 56 +++--
+ drivers/gpio/gpio-mc9s08dz60.c | 112 ---------
+ drivers/gpio/gpio-ml-ioh.c | 49 +---
+ drivers/gpio/gpio-mlxbf2.c | 43 +---
+ drivers/gpio/gpio-mpc8xxx.c | 13 +-
+ drivers/gpio/gpio-mt7621.c | 1 +
+ drivers/gpio/gpio-rcar.c | 4 +-
+ drivers/gpio/gpio-tegra186.c | 30 ++-
+ drivers/gpio/gpio-viperboard.c | 14 +-
+ drivers/gpio/gpio-virtio.c | 374 +++++++++++++++++++++++++++++
+ drivers/gpio/gpiolib-devres.c | 2 +-
+ drivers/gpio/gpiolib-of.c | 16 +-
+ drivers/gpio/gpiolib.c | 32 ++-
+ drivers/mfd/intel_quark_i2c_gpio.c | 71 +++---
+ include/linux/gpio/consumer.h | 14 +-
+ include/linux/gpio/driver.h | 4 +
+ include/linux/of.h | 2 +-
+ include/linux/of_gpio.h | 15 +-
+ include/linux/platform_data/gpio-dwapb.h | 25 --
+ include/linux/spi/max7301.h | 2 +-
+ include/uapi/linux/virtio_gpio.h | 47 ++++
+ 28 files changed, 751 insertions(+), 447 deletions(-)
+ delete mode 100644 drivers/gpio/gpio-mc9s08dz60.c
+ create mode 100644 drivers/gpio/gpio-virtio.c
+ delete mode 100644 include/linux/platform_data/gpio-dwapb.h
+ create mode 100644 include/uapi/linux/virtio_gpio.h
+Merging gpio-intel/for-next (5111c2b6b019 gpio: dwapb: Get rid of legacy platform data)
+$ git merge gpio-intel/for-next
+Already up to date.
+Merging pinctrl/for-next (04853352952b Merge tag 'samsung-pinctrl-5.15' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung into devel)
+$ git merge pinctrl/for-next
+Already up to date.
+Merging pinctrl-intel/for-next (2f658f7a3953 pinctrl: tigerlake: Fix GPIO mapping for newer version of software)
+$ git merge pinctrl-intel/for-next
+Already up to date.
+Merging pinctrl-renesas/renesas-pinctrl (c4c4637eb57f pinctrl: renesas: Add RZ/G2L pin and gpio controller driver)
+$ git merge pinctrl-renesas/renesas-pinctrl
+Already up to date.
+Merging pinctrl-samsung/for-next (cdd3d945dcec pinctrl: samsung: Add Exynos850 SoC specific data)
+$ git merge pinctrl-samsung/for-next
+Already up to date.
+Merging pwm/for-next (3f2b16734914 pwm: mtk-disp: Implement atomic API .get_state())
+$ git merge pwm/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/pwm/pwm-rockchip.yaml | 1 +
+ drivers/pwm/Kconfig | 5 +-
+ drivers/pwm/core.c | 4 +-
+ drivers/pwm/pwm-ab8500.c | 35 ++---
+ drivers/pwm/pwm-atmel-hlcdc.c | 5 +-
+ drivers/pwm/pwm-atmel-tcb.c | 5 +-
+ drivers/pwm/pwm-atmel.c | 102 +++++++++---
+ drivers/pwm/pwm-bcm-kona.c | 12 +-
+ drivers/pwm/pwm-brcmstb.c | 5 +-
+ drivers/pwm/pwm-cros-ec.c | 4 +-
+ drivers/pwm/pwm-ep93xx.c | 11 +-
+ drivers/pwm/pwm-fsl-ftm.c | 10 +-
+ drivers/pwm/pwm-hibvt.c | 4 +-
+ drivers/pwm/pwm-img.c | 20 +--
+ drivers/pwm/pwm-imx-tpm.c | 5 +-
+ drivers/pwm/pwm-imx27.c | 14 +-
+ drivers/pwm/pwm-intel-lgm.c | 12 +-
+ drivers/pwm/pwm-iqs620a.c | 16 +-
+ drivers/pwm/pwm-jz4740.c | 12 +-
+ drivers/pwm/pwm-keembay.c | 12 +-
+ drivers/pwm/pwm-lp3943.c | 12 +-
+ drivers/pwm/pwm-lpc32xx.c | 22 +--
+ drivers/pwm/pwm-mediatek.c | 12 +-
+ drivers/pwm/pwm-mtk-disp.c | 174 ++++++++++++---------
+ drivers/pwm/pwm-mxs.c | 25 +--
+ drivers/pwm/pwm-ntxec.c | 14 +-
+ drivers/pwm/pwm-omap-dmtimer.c | 5 +-
+ drivers/pwm/pwm-pca9685.c | 5 +-
+ drivers/pwm/pwm-pxa.c | 13 +-
+ drivers/pwm/pwm-raspberrypi-poe.c | 12 +-
+ drivers/pwm/pwm-rcar.c | 5 +-
+ drivers/pwm/pwm-renesas-tpu.c | 5 +-
+ drivers/pwm/pwm-rockchip.c | 16 +-
+ drivers/pwm/pwm-samsung.c | 5 +-
+ drivers/pwm/pwm-sifive.c | 6 +-
+ drivers/pwm/pwm-sl28cpld.c | 12 +-
+ drivers/pwm/pwm-stm32-lp.c | 12 +-
+ drivers/pwm/pwm-sun4i.c | 5 +-
+ drivers/pwm/pwm-tiecap.c | 6 +-
+ drivers/pwm/pwm-tiehrpwm.c | 4 +-
+ drivers/pwm/pwm-twl-led.c | 17 +-
+ drivers/pwm/pwm-twl.c | 17 +-
+ include/linux/pwm.h | 2 +-
+ 43 files changed, 260 insertions(+), 440 deletions(-)
+Merging userns/for-next (a3be01837fc9 Merge of ucount-fixes-for-5.14, siginfo-si_trapno-for-v5.15, and exit-cleanups-for-v5.15 for testing in linux-next)
+$ git merge userns/for-next
+Auto-merging include/linux/sched/signal.h
+CONFLICT (content): Merge conflict in include/linux/sched/signal.h
+Resolved 'include/linux/sched/signal.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 6bcb18c369bd] Merge remote-tracking branch 'userns/for-next'
+$ git diff -M --stat --summary HEAD^..
+ include/linux/sched/signal.h | 1 +
+ 1 file changed, 1 insertion(+)
+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 kselftest/next (67d6d80d90fb selftests/cpufreq: Rename DEBUG_PI_LIST to DEBUG_PLIST)
+$ git merge kselftest/next
+Already up to date.
+Merging livepatching/for-next (cd2d68f2d6b2 Merge branch 'for-5.15/cpu-hotplug' 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 (8158da6a33f2 dt-bindings: rtc: add Epson RX-8025 and RX-8035)
+$ git merge rtc/rtc-next
+Auto-merging drivers/rtc/rtc-cmos.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/rtc/trivial-rtc.yaml | 3 +
+ drivers/rtc/Kconfig | 9 ++
+ drivers/rtc/Makefile | 2 +
+ drivers/rtc/lib.c | 107 +++++++++++++++------
+ drivers/rtc/lib_test.c | 81 ++++++++++++++++
+ drivers/rtc/rtc-cmos.c | 8 +-
+ drivers/rtc/rtc-rx8025.c | 46 ++++++++-
+ drivers/rtc/rtc-s5m.c | 48 ++++-----
+ drivers/rtc/rtc-tps65910.c | 2 +-
+ 9 files changed, 242 insertions(+), 64 deletions(-)
+ create mode 100644 drivers/rtc/lib_test.c
+Merging nvdimm/libnvdimm-for-next (bdd3c50d83bf dax: remove bdev_dax_supported)
+$ git merge nvdimm/libnvdimm-for-next
+Auto-merging fs/xfs/xfs_super.c
+Auto-merging fs/ext4/super.c
+Auto-merging fs/ext2/super.c
+Auto-merging fs/Kconfig
+Auto-merging drivers/md/dm.c
+Auto-merging drivers/md/dm-table.c
+Merge made by the 'recursive' strategy.
+ drivers/dax/super.c | 191 +++++++++++++++++++-------------------------------
+ drivers/md/dm-table.c | 9 +--
+ drivers/md/dm.c | 2 +-
+ fs/Kconfig | 21 +++++-
+ fs/ext2/super.c | 3 +-
+ fs/ext4/super.c | 3 +-
+ fs/xfs/xfs_super.c | 16 +++--
+ include/linux/dax.h | 41 ++---------
+ 8 files changed, 117 insertions(+), 169 deletions(-)
+$ git am -3 ../patches/0001-fixup-for-dax-remove-bdev_dax_supported.patch
+Applying: fixup for "dax: remove bdev_dax_supported"
+$ git reset HEAD^
+Unstaged changes after reset:
+M fs/erofs/super.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 2f2aaeb2d0c1] Merge remote-tracking branch 'nvdimm/libnvdimm-for-next'
+ Date: Tue Sep 7 12:14:56 2021 +1000
+Merging at24/at24/for-next (658ae44345c1 dt-bindings: at24: add ON Semi CAT24C04 and CAT24C05)
+$ git merge at24/at24/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/eeprom/at24.yaml | 6 ++++++
+ 1 file changed, 6 insertions(+)
+Merging ntb/ntb-next (f96cb827ce49 ntb: ntb_pingpong: remove redundant initialization of variables msg_data and spad_data)
+$ git merge ntb/ntb-next
+Merge made by the 'recursive' strategy.
+ drivers/ntb/hw/intel/ntb_hw_intel.h | 3 ---
+ drivers/ntb/test/ntb_msi_test.c | 4 +++-
+ drivers/ntb/test/ntb_perf.c | 1 +
+ drivers/ntb/test/ntb_pingpong.c | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+Merging seccomp/for-next/seccomp (b4d8a58f8dcf seccomp: Fix setting loaded filter count during TSYNC)
+$ git merge seccomp/for-next/seccomp
+Already up to date.
+Merging kspp/for-next/kspp (3103f67eb440 Merge branch 'for-next/overflow' into for-next/kspp)
+$ git merge kspp/for-next/kspp
+Auto-merging scripts/kernel-doc
+Auto-merging net/xfrm/xfrm_user.c
+Auto-merging net/xfrm/xfrm_policy.c
+Auto-merging lib/string_helpers.c
+Auto-merging lib/string.c
+Auto-merging lib/Kconfig.debug
+Auto-merging include/linux/string.h
+Auto-merging include/linux/ieee80211.h
+Auto-merging include/linux/filter.h
+Auto-merging drivers/staging/rtl8723bs/include/ieee80211.h
+Auto-merging drivers/staging/r8188eu/include/ieee80211.h
+Auto-merging drivers/scsi/ibmvscsi/ibmvscsi.c
+Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c
+Auto-merging drivers/net/can/usb/etas_es58x/es58x_fd.h
+Auto-merging drivers/net/can/flexcan.c
+Auto-merging drivers/iommu/amd/init.c
+Auto-merging Makefile
+CONFLICT (content): Merge conflict in Makefile
+Auto-merging MAINTAINERS
+Resolved 'Makefile' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master d5eadcceea2d] Merge remote-tracking branch 'kspp/for-next/kspp'
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 9 +
+ Makefile | 2 -
+ arch/arm/boot/compressed/string.c | 1 +
+ arch/s390/lib/string.c | 3 +
+ arch/x86/boot/compressed/misc.h | 2 +
+ arch/x86/boot/compressed/pgtable_64.c | 2 +
+ arch/x86/lib/string_32.c | 1 +
+ drivers/char/pcmcia/cm4000_cs.c | 9 +-
+ drivers/crypto/chelsio/chcr_crypto.h | 14 +-
+ drivers/cxl/cxl.h | 61 ++---
+ drivers/gpu/drm/mga/mga_ioc32.c | 27 +-
+ drivers/hid/hid-cp2112.c | 14 +-
+ drivers/hid/hid-roccat-kone.c | 2 +-
+ drivers/hid/hid-roccat-kone.h | 12 +-
+ drivers/iommu/amd/init.c | 9 +-
+ drivers/macintosh/smu.c | 3 +-
+ drivers/net/can/flexcan.c | 68 ++---
+ drivers/net/can/usb/etas_es58x/es581_4.h | 2 +-
+ drivers/net/can/usb/etas_es58x/es58x_fd.h | 2 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 4 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h | 14 +-
+ drivers/net/wireless/ath/ath10k/bmi.h | 10 +-
+ drivers/net/wireless/ath/ath10k/htt.h | 7 +-
+ drivers/net/wireless/intel/iwlegacy/commands.h | 6 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/commands.h | 6 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 12 +-
+ drivers/scsi/aic94xx/aic94xx_sds.c | 6 +-
+ drivers/scsi/ibmvscsi/ibmvscsi.c | 3 +-
+ drivers/scsi/qla4xxx/ql4_def.h | 4 +-
+ drivers/staging/r8188eu/include/ieee80211.h | 6 +-
+ drivers/staging/rtl8712/ieee80211.h | 4 +-
+ drivers/staging/rtl8723bs/include/ieee80211.h | 6 +-
+ fs/btrfs/root-tree.c | 6 +-
+ fs/hpfs/hpfs.h | 8 +-
+ include/linux/compiler-gcc.h | 2 -
+ include/linux/compiler_types.h | 4 -
+ include/linux/filter.h | 6 +-
+ include/linux/fortify-string.h | 77 ++++--
+ include/linux/ieee80211.h | 30 +--
+ include/linux/stddef.h | 65 ++++-
+ include/linux/string.h | 44 +++-
+ include/linux/thread_info.h | 2 +-
+ include/scsi/sas.h | 12 +-
+ include/uapi/drm/mga_drm.h | 22 +-
+ include/uapi/linux/dlm_device.h | 4 +-
+ include/uapi/linux/stddef.h | 37 +++
+ include/uapi/rdma/rdma_user_rxe.h | 4 +-
+ include/uapi/sound/asoc.h | 4 +-
+ lib/.gitignore | 2 +
+ lib/Kconfig.debug | 11 +
+ lib/Makefile | 34 +++
+ lib/memcpy_kunit.c | 289 ++++++++++++++++++++++
+ lib/string.c | 210 +---------------
+ lib/string_helpers.c | 195 +++++++++++++++
+ lib/test_fortify/read_overflow-memchr.c | 5 +
+ lib/test_fortify/read_overflow-memchr_inv.c | 5 +
+ lib/test_fortify/read_overflow-memcmp.c | 5 +
+ lib/test_fortify/read_overflow-memscan.c | 5 +
+ lib/test_fortify/read_overflow2-memcmp.c | 5 +
+ lib/test_fortify/read_overflow2-memcpy.c | 5 +
+ lib/test_fortify/read_overflow2-memmove.c | 5 +
+ lib/test_fortify/test_fortify.h | 35 +++
+ lib/test_fortify/write_overflow-memcpy.c | 5 +
+ lib/test_fortify/write_overflow-memmove.c | 5 +
+ lib/test_fortify/write_overflow-memset.c | 5 +
+ lib/test_fortify/write_overflow-strcpy-lit.c | 5 +
+ lib/test_fortify/write_overflow-strcpy.c | 5 +
+ lib/test_fortify/write_overflow-strlcpy-src.c | 5 +
+ lib/test_fortify/write_overflow-strlcpy.c | 5 +
+ lib/test_fortify/write_overflow-strncpy-src.c | 5 +
+ lib/test_fortify/write_overflow-strncpy.c | 5 +
+ lib/test_fortify/write_overflow-strscpy.c | 5 +
+ net/xfrm/xfrm_policy.c | 4 +-
+ net/xfrm/xfrm_user.c | 2 +-
+ scripts/kernel-doc | 9 +
+ scripts/test_fortify.sh | 59 +++++
+ security/Kconfig | 3 +
+ 77 files changed, 1149 insertions(+), 447 deletions(-)
+ create mode 100644 lib/memcpy_kunit.c
+ create mode 100644 lib/test_fortify/read_overflow-memchr.c
+ create mode 100644 lib/test_fortify/read_overflow-memchr_inv.c
+ create mode 100644 lib/test_fortify/read_overflow-memcmp.c
+ create mode 100644 lib/test_fortify/read_overflow-memscan.c
+ create mode 100644 lib/test_fortify/read_overflow2-memcmp.c
+ create mode 100644 lib/test_fortify/read_overflow2-memcpy.c
+ create mode 100644 lib/test_fortify/read_overflow2-memmove.c
+ create mode 100644 lib/test_fortify/test_fortify.h
+ create mode 100644 lib/test_fortify/write_overflow-memcpy.c
+ create mode 100644 lib/test_fortify/write_overflow-memmove.c
+ create mode 100644 lib/test_fortify/write_overflow-memset.c
+ create mode 100644 lib/test_fortify/write_overflow-strcpy-lit.c
+ create mode 100644 lib/test_fortify/write_overflow-strcpy.c
+ create mode 100644 lib/test_fortify/write_overflow-strlcpy-src.c
+ create mode 100644 lib/test_fortify/write_overflow-strlcpy.c
+ create mode 100644 lib/test_fortify/write_overflow-strncpy-src.c
+ create mode 100644 lib/test_fortify/write_overflow-strncpy.c
+ create mode 100644 lib/test_fortify/write_overflow-strscpy.c
+ create mode 100644 scripts/test_fortify.sh
+$ git am -3 ../patches/0001-Revert-Makefile-Enable-Warray-bounds.patch
+Applying: Revert "Makefile: Enable -Warray-bounds"
+$ git reset HEAD^
+Unstaged changes after reset:
+M Makefile
+$ git add -A .
+$ git commit -v -a --amend
+[master 5f921a47d76a] Merge remote-tracking branch 'kspp/for-next/kspp'
+ Date: Tue Sep 7 12:20:57 2021 +1000
+Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
+$ git merge cisco/for-next
+Already up to date.
+Merging gnss/gnss-next (0f79ce970e79 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 (9ab1428dfe2c fsi/sbefifo: Fix reset timeout)
+$ git merge fsi/next
+Already up to date.
+Merging slimbus/for-next (e5c578adcdd9 slimbus: ngd: reset dma setup during runtime pm)
+$ git merge slimbus/for-next
+Merge made by the 'recursive' strategy.
+Merging nvmem/for-next (74f671aed9e7 nvmem: core: Add stubs for nvmem_cell_read_variable_le_u32/64 if !CONFIG_NVMEM)
+$ git merge nvmem/for-next
+Merge made by the 'recursive' strategy.
+ include/linux/nvmem-consumer.h | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+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 (9d68cd9120e4 hv_utils: Set the maximum packet size for VSS driver to the length of the receive buffer)
+$ git merge hyperv/hyperv-next
+Already up to date.
+Merging auxdisplay/auxdisplay (24ebc044c72e auxdisplay: Replace symbolic permissions with octal permissions)
+$ git merge auxdisplay/auxdisplay
+Merge made by the 'recursive' strategy.
+ .../bindings/auxdisplay/hit,hd44780.yaml | 31 +++++++++++++++++++++-
+ drivers/auxdisplay/cfag12864b.c | 2 +-
+ drivers/auxdisplay/charlcd.c | 4 +--
+ drivers/auxdisplay/hd44780.c | 2 +-
+ drivers/auxdisplay/ks0108.c | 18 +++----------
+ 5 files changed, 36 insertions(+), 21 deletions(-)
+Merging kgdb/kgdb/for-next (f8416aa29185 kernel: debug: Convert to SPDX identifier)
+$ git merge kgdb/kgdb/for-next
+Auto-merging kernel/debug/kdb/kdb_support.c
+Merge made by the 'recursive' strategy.
+ include/linux/kdb.h | 27 +-
+ kernel/debug/debug_core.c | 5 +-
+ kernel/debug/gdbstub.c | 5 +-
+ kernel/debug/kdb/kdb_bp.c | 72 ++---
+ kernel/debug/kdb/kdb_debugger.c | 1 -
+ kernel/debug/kdb/kdb_main.c | 626 ++++++++++++++++++----------------------
+ kernel/debug/kdb/kdb_private.h | 18 --
+ kernel/debug/kdb/kdb_support.c | 329 ++-------------------
+ kernel/trace/trace_kdb.c | 12 +-
+ samples/kdb/kdb_hello.c | 20 +-
+ 10 files changed, 387 insertions(+), 728 deletions(-)
+Merging hmm/hmm (79fbd3e1241c RDMA: Use the sg_table directly and remove the opencoded version from umem)
+$ git merge hmm/hmm
+Already up to date.
+Merging fpga/for-next (4f45f3404960 spi: spi-altera-dfl: support n5010 feature revision)
+$ git merge fpga/for-next
+Already up to date.
+Merging kunit/test (e73f0f0ee754 Linux 5.14-rc1)
+$ git merge kunit/test
+Already up to date.
+Merging cfi/cfi/next (ff1176468d36 Linux 5.14-rc3)
+$ git merge cfi/cfi/next
+Already up to date.
+Merging kunit-next/kunit (acd8e8407b8f kunit: Print test statistics on failure)
+$ 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 mhi/mhi-next (813272ed5238 Merge 5.14-rc5 into char-misc-next)
+$ git merge mhi/mhi-next
+Already up to date.
+Merging memblock/for-next (e888fa7bb882 memblock: Check memory add/cap ordering)
+$ 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 rust/rust-next (5d3986cf8ed6 MAINTAINERS: Rust)
+$ git merge rust/rust-next
+Auto-merging scripts/Makefile.lib
+Auto-merging scripts/Makefile.build
+Auto-merging samples/Kconfig
+Auto-merging lib/vsprintf.c
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/printk/printk.c
+Auto-merging kernel/kallsyms.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/spinlock.h
+Auto-merging include/linux/kallsyms.h
+CONFLICT (content): Merge conflict in include/linux/kallsyms.h
+Auto-merging arch/riscv/Makefile
+Auto-merging Makefile
+CONFLICT (content): Merge conflict in Makefile
+Auto-merging MAINTAINERS
+Resolved 'Makefile' using previous resolution.
+Resolved 'include/linux/kallsyms.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master ca25d2879fc5] 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 | 13 +
+ Documentation/rust/arch-support.rst | 35 +
+ Documentation/rust/assets/favicon-16x16.png | Bin 0 -> 798 bytes
+ Documentation/rust/assets/favicon-32x32.png | Bin 0 -> 2076 bytes
+ Documentation/rust/assets/rust-logo.png | Bin 0 -> 53976 bytes
+ Documentation/rust/coding.rst | 92 +
+ Documentation/rust/docs.rst | 110 +
+ Documentation/rust/index.rst | 20 +
+ Documentation/rust/quick-start.rst | 222 ++
+ MAINTAINERS | 14 +
+ Makefile | 174 +-
+ arch/arm/rust/target.json | 28 +
+ arch/arm64/rust/target.json | 35 +
+ arch/powerpc/rust/target.json | 30 +
+ arch/riscv/Makefile | 1 +
+ arch/riscv/rust/rv32ima.json | 37 +
+ arch/riscv/rust/rv32imac.json | 37 +
+ arch/riscv/rust/rv64ima.json | 37 +
+ arch/riscv/rust/rv64imac.json | 37 +
+ arch/x86/rust/target.json | 37 +
+ include/linux/kallsyms.h | 2 +-
+ include/linux/spinlock.h | 17 +-
+ init/Kconfig | 28 +
+ kernel/kallsyms.c | 7 +
+ kernel/livepatch/core.c | 4 +-
+ kernel/printk/printk.c | 5 +-
+ lib/Kconfig.debug | 144 ++
+ lib/vsprintf.c | 12 +
+ rust/.gitignore | 6 +
+ rust/Makefile | 316 +++
+ rust/alloc/README.md | 32 +
+ rust/alloc/alloc.rs | 425 ++++
+ rust/alloc/borrow.rs | 493 ++++
+ rust/alloc/boxed.rs | 1728 ++++++++++++++
+ rust/alloc/collections/mod.rs | 116 +
+ rust/alloc/fmt.rs | 587 +++++
+ rust/alloc/lib.rs | 197 ++
+ rust/alloc/macros.rs | 128 ++
+ rust/alloc/prelude/mod.rs | 17 +
+ rust/alloc/prelude/v1.rs | 16 +
+ rust/alloc/raw_vec.rs | 612 +++++
+ rust/alloc/rc.rs | 2539 +++++++++++++++++++++
+ rust/alloc/slice.rs | 1271 +++++++++++
+ rust/alloc/str.rs | 614 +++++
+ rust/alloc/string.rs | 2847 +++++++++++++++++++++++
+ rust/alloc/sync.rs | 2631 ++++++++++++++++++++++
+ rust/alloc/vec/drain.rs | 157 ++
+ rust/alloc/vec/drain_filter.rs | 145 ++
+ rust/alloc/vec/into_iter.rs | 296 +++
+ rust/alloc/vec/is_zero.rs | 106 +
+ rust/alloc/vec/mod.rs | 3255 +++++++++++++++++++++++++++
+ rust/alloc/vec/partial_eq.rs | 49 +
+ rust/alloc/vec/set_len_on_drop.rs | 30 +
+ rust/alloc/vec/spec_extend.rs | 170 ++
+ rust/bindgen_parameters | 13 +
+ rust/build_error.rs | 33 +
+ rust/compiler_builtins.rs | 146 ++
+ rust/exports.c | 16 +
+ rust/helpers.c | 235 ++
+ rust/kernel/allocator.rs | 63 +
+ rust/kernel/bindings.rs | 28 +
+ rust/kernel/bindings_helper.h | 24 +
+ rust/kernel/buffer.rs | 39 +
+ rust/kernel/build_assert.rs | 80 +
+ rust/kernel/c_types.rs | 119 +
+ rust/kernel/chrdev.rs | 212 ++
+ rust/kernel/error.rs | 272 +++
+ rust/kernel/file.rs | 130 ++
+ rust/kernel/file_operations.rs | 698 ++++++
+ rust/kernel/io_buffer.rs | 153 ++
+ rust/kernel/iov_iter.rs | 95 +
+ rust/kernel/lib.rs | 220 ++
+ rust/kernel/linked_list.rs | 245 ++
+ rust/kernel/miscdev.rs | 113 +
+ rust/kernel/module_param.rs | 497 ++++
+ rust/kernel/of.rs | 101 +
+ rust/kernel/pages.rs | 176 ++
+ rust/kernel/platdev.rs | 166 ++
+ rust/kernel/prelude.rs | 28 +
+ rust/kernel/print.rs | 412 ++++
+ rust/kernel/random.rs | 50 +
+ rust/kernel/raw_list.rs | 361 +++
+ rust/kernel/rbtree.rs | 570 +++++
+ rust/kernel/security.rs | 79 +
+ rust/kernel/static_assert.rs | 39 +
+ rust/kernel/str.rs | 259 +++
+ rust/kernel/sync/arc.rs | 227 ++
+ rust/kernel/sync/condvar.rs | 136 ++
+ rust/kernel/sync/guard.rs | 82 +
+ rust/kernel/sync/locked_by.rs | 112 +
+ rust/kernel/sync/mod.rs | 84 +
+ rust/kernel/sync/mutex.rs | 101 +
+ rust/kernel/sync/spinlock.rs | 109 +
+ rust/kernel/sysctl.rs | 198 ++
+ rust/kernel/task.rs | 193 ++
+ rust/kernel/traits.rs | 26 +
+ rust/kernel/types.rs | 249 ++
+ rust/kernel/user_ptr.rs | 191 ++
+ rust/macros/lib.rs | 127 ++
+ rust/macros/module.rs | 754 +++++++
+ samples/Kconfig | 2 +
+ samples/Makefile | 1 +
+ samples/rust/Kconfig | 113 +
+ samples/rust/Makefile | 12 +
+ samples/rust/rust_chrdev.rs | 51 +
+ samples/rust/rust_minimal.rs | 38 +
+ samples/rust/rust_miscdev.rs | 150 ++
+ samples/rust/rust_module_parameters.rs | 72 +
+ samples/rust/rust_print.rs | 57 +
+ samples/rust/rust_random.rs | 61 +
+ samples/rust/rust_semaphore.rs | 177 ++
+ samples/rust/rust_semaphore_c.c | 212 ++
+ samples/rust/rust_stack_probing.rs | 40 +
+ samples/rust/rust_sync.rs | 81 +
+ scripts/Makefile.build | 22 +
+ scripts/Makefile.lib | 12 +
+ scripts/generate_rust_analyzer.py | 143 ++
+ 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 +-
+ 129 files changed, 29604 insertions(+), 26 deletions(-)
+ create mode 100644 .rustfmt.toml
+ create mode 100644 Documentation/rust/arch-support.rst
+ create mode 100644 Documentation/rust/assets/favicon-16x16.png
+ create mode 100644 Documentation/rust/assets/favicon-32x32.png
+ create mode 100644 Documentation/rust/assets/rust-logo.png
+ create mode 100644 Documentation/rust/coding.rst
+ create mode 100644 Documentation/rust/docs.rst
+ create mode 100644 Documentation/rust/index.rst
+ create mode 100644 Documentation/rust/quick-start.rst
+ create mode 100644 arch/arm/rust/target.json
+ create mode 100644 arch/arm64/rust/target.json
+ create mode 100644 arch/powerpc/rust/target.json
+ create mode 100644 arch/riscv/rust/rv32ima.json
+ create mode 100644 arch/riscv/rust/rv32imac.json
+ create mode 100644 arch/riscv/rust/rv64ima.json
+ create mode 100644 arch/riscv/rust/rv64imac.json
+ create mode 100644 arch/x86/rust/target.json
+ create mode 100644 rust/.gitignore
+ create mode 100644 rust/Makefile
+ create mode 100644 rust/alloc/README.md
+ create mode 100644 rust/alloc/alloc.rs
+ create mode 100644 rust/alloc/borrow.rs
+ create mode 100644 rust/alloc/boxed.rs
+ create mode 100644 rust/alloc/collections/mod.rs
+ create mode 100644 rust/alloc/fmt.rs
+ create mode 100644 rust/alloc/lib.rs
+ create mode 100644 rust/alloc/macros.rs
+ create mode 100644 rust/alloc/prelude/mod.rs
+ create mode 100644 rust/alloc/prelude/v1.rs
+ create mode 100644 rust/alloc/raw_vec.rs
+ create mode 100644 rust/alloc/rc.rs
+ create mode 100644 rust/alloc/slice.rs
+ create mode 100644 rust/alloc/str.rs
+ create mode 100644 rust/alloc/string.rs
+ create mode 100644 rust/alloc/sync.rs
+ create mode 100644 rust/alloc/vec/drain.rs
+ create mode 100644 rust/alloc/vec/drain_filter.rs
+ create mode 100644 rust/alloc/vec/into_iter.rs
+ create mode 100644 rust/alloc/vec/is_zero.rs
+ create mode 100644 rust/alloc/vec/mod.rs
+ create mode 100644 rust/alloc/vec/partial_eq.rs
+ create mode 100644 rust/alloc/vec/set_len_on_drop.rs
+ create mode 100644 rust/alloc/vec/spec_extend.rs
+ create mode 100644 rust/bindgen_parameters
+ create mode 100644 rust/build_error.rs
+ 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/build_assert.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.rs
+ create mode 100644 rust/kernel/file_operations.rs
+ create mode 100644 rust/kernel/io_buffer.rs
+ create mode 100644 rust/kernel/iov_iter.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/of.rs
+ create mode 100644 rust/kernel/pages.rs
+ create mode 100644 rust/kernel/platdev.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/rbtree.rs
+ create mode 100644 rust/kernel/security.rs
+ create mode 100644 rust/kernel/static_assert.rs
+ create mode 100644 rust/kernel/str.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/task.rs
+ create mode 100644 rust/kernel/traits.rs
+ create mode 100644 rust/kernel/types.rs
+ create mode 100644 rust/kernel/user_ptr.rs
+ create mode 100644 rust/macros/lib.rs
+ create mode 100644 rust/macros/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 100755 scripts/generate_rust_analyzer.py
+ create mode 100755 scripts/rust-version.sh
+$ git am -3 ../patches/0001-fixup-for-rust-integration-with-Makefile.clang-creat.patch
+Applying: fixup for rust integration with Makefile.clang creation
+$ git reset HEAD^
+Unstaged changes after reset:
+M Makefile
+M scripts/Makefile.clang
+$ git add -A .
+$ git commit -v -a --amend
+[master 2b2e31dc1c9d] Merge remote-tracking branch 'rust/rust-next'
+ Date: Tue Sep 7 12:44:07 2021 +1000
+Merging cxl/next (00ca683e6180 libnvdimm/labels: Introduce the concept of multi-range namespace labels)
+$ git merge cxl/next
+Auto-merging drivers/nvdimm/namespace_devs.c
+Auto-merging drivers/cxl/cxl.h
+Auto-merging drivers/cxl/core/bus.c
+Merge made by the 'recursive' strategy.
+ Documentation/driver-api/cxl/memory-devices.rst | 8 +-
+ drivers/cxl/Makefile | 4 +-
+ drivers/cxl/core/Makefile | 8 +
+ drivers/cxl/{core.c => core/bus.c} | 464 ++----------------------
+ drivers/cxl/core/core.h | 20 +
+ drivers/cxl/core/memdev.c | 246 +++++++++++++
+ drivers/cxl/core/pmem.c | 204 +++++++++++
+ drivers/cxl/core/regs.c | 236 ++++++++++++
+ drivers/cxl/cxl.h | 1 -
+ drivers/cxl/{mem.h => cxlmem.h} | 35 +-
+ drivers/cxl/pci.c | 433 ++++++++--------------
+ drivers/cxl/pci.h | 1 +
+ drivers/cxl/pmem.c | 2 +-
+ drivers/nvdimm/btt.c | 11 +-
+ drivers/nvdimm/btt_devs.c | 14 +-
+ drivers/nvdimm/core.c | 40 +-
+ drivers/nvdimm/label.c | 341 +++++++++++------
+ drivers/nvdimm/label.h | 1 -
+ drivers/nvdimm/namespace_devs.c | 204 +++++------
+ drivers/nvdimm/nd-core.h | 5 +-
+ drivers/nvdimm/nd.h | 210 ++++++++++-
+ drivers/nvdimm/pfn_devs.c | 2 +-
+ include/linux/nd.h | 4 +-
+ 23 files changed, 1496 insertions(+), 998 deletions(-)
+ create mode 100644 drivers/cxl/core/Makefile
+ rename drivers/cxl/{core.c => core/bus.c} (58%)
+ create mode 100644 drivers/cxl/core/core.h
+ create mode 100644 drivers/cxl/core/memdev.c
+ create mode 100644 drivers/cxl/core/pmem.c
+ create mode 100644 drivers/cxl/core/regs.c
+ rename drivers/cxl/{mem.h => cxlmem.h} (71%)
+$ git am -3 ../patches/0001-cxl-mark-unused-function-as-such.patch
+Applying: cxl: mark unused function as such
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/nvdimm/label.c
+$ git add -A .
+$ git commit -v -a --amend
+[master bff29a414ad6] Merge remote-tracking branch 'cxl/next'
+ Date: Tue Sep 7 12:59:28 2021 +1000
+Merging folio/for-next (1a90e9dae32c mm/writeback: Add folio_write_one)
+$ git merge folio/for-next
+Auto-merging mm/vmscan.c
+Auto-merging mm/util.c
+CONFLICT (content): Merge conflict in mm/util.c
+Auto-merging mm/userfaultfd.c
+Auto-merging mm/swapfile.c
+Auto-merging mm/swap_state.c
+Auto-merging mm/swap.c
+Auto-merging mm/shmem.c
+Auto-merging mm/rmap.c
+CONFLICT (content): Merge conflict in mm/rmap.c
+Auto-merging mm/page_alloc.c
+Auto-merging mm/page-writeback.c
+CONFLICT (content): Merge conflict in mm/page-writeback.c
+Auto-merging mm/migrate.c
+Auto-merging mm/mempolicy.c
+Auto-merging mm/memory.c
+Auto-merging mm/memory-failure.c
+Auto-merging mm/memcontrol.c
+CONFLICT (content): Merge conflict in mm/memcontrol.c
+Auto-merging mm/ksm.c
+Auto-merging mm/khugepaged.c
+Auto-merging mm/internal.h
+Auto-merging mm/hugetlb.c
+Auto-merging mm/huge_memory.c
+Auto-merging mm/filemap.c
+CONFLICT (content): Merge conflict in mm/filemap.c
+Auto-merging mm/compaction.c
+Auto-merging kernel/bpf/verifier.c
+Auto-merging include/linux/writeback.h
+Auto-merging include/linux/swap.h
+Auto-merging include/linux/pagemap.h
+Auto-merging include/linux/page-flags.h
+Auto-merging include/linux/netfs.h
+Auto-merging include/linux/mm_types.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/migrate.h
+Auto-merging include/linux/memcontrol.h
+CONFLICT (content): Merge conflict in include/linux/memcontrol.h
+Auto-merging include/linux/highmem.h
+Auto-merging include/linux/backing-dev.h
+Auto-merging fs/io_uring.c
+Auto-merging fs/afs/write.c
+Auto-merging arch/sh/include/asm/cacheflush.h
+Auto-merging arch/parisc/include/asm/cacheflush.h
+Auto-merging arch/nds32/include/asm/cacheflush.h
+Auto-merging arch/mips/include/asm/cacheflush.h
+Auto-merging arch/arm/include/asm/cacheflush.h
+Auto-merging Documentation/core-api/cachetlb.rst
+Resolved 'include/linux/memcontrol.h' using previous resolution.
+Resolved 'mm/filemap.c' using previous resolution.
+Resolved 'mm/memcontrol.c' using previous resolution.
+Resolved 'mm/page-writeback.c' using previous resolution.
+Resolved 'mm/rmap.c' using previous resolution.
+Resolved 'mm/util.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 876af5298b76] Merge remote-tracking branch 'folio/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/core-api/cachetlb.rst | 6 +
+ Documentation/core-api/mm-api.rst | 5 +
+ Documentation/filesystems/netfs_library.rst | 2 +
+ arch/arc/include/asm/cacheflush.h | 1 +
+ arch/arm/include/asm/cacheflush.h | 1 +
+ arch/mips/include/asm/cacheflush.h | 2 +
+ arch/nds32/include/asm/cacheflush.h | 1 +
+ arch/nios2/include/asm/cacheflush.h | 3 +-
+ arch/parisc/include/asm/cacheflush.h | 3 +-
+ arch/sh/include/asm/cacheflush.h | 3 +-
+ arch/xtensa/include/asm/cacheflush.h | 3 +-
+ fs/afs/write.c | 9 +-
+ fs/cachefiles/rdwr.c | 16 +-
+ fs/io_uring.c | 2 +-
+ fs/jfs/jfs_metapage.c | 1 +
+ include/asm-generic/cacheflush.h | 6 +
+ include/linux/backing-dev.h | 6 +-
+ include/linux/flex_proportions.h | 9 +-
+ include/linux/gfp.h | 22 +-
+ include/linux/highmem-internal.h | 11 +
+ include/linux/highmem.h | 37 ++
+ include/linux/huge_mm.h | 15 -
+ include/linux/ksm.h | 4 +-
+ include/linux/memcontrol.h | 242 +++++++-----
+ include/linux/migrate.h | 4 +
+ include/linux/mm.h | 239 +++++++++---
+ include/linux/mm_inline.h | 103 +++--
+ include/linux/mm_types.h | 77 ++++
+ include/linux/mmdebug.h | 20 +
+ include/linux/netfs.h | 77 ++--
+ include/linux/page-flags.h | 267 +++++++++----
+ include/linux/page_idle.h | 99 +++--
+ include/linux/page_owner.h | 8 +-
+ include/linux/page_ref.h | 158 +++++++-
+ include/linux/pagemap.h | 585 ++++++++++++++++++----------
+ include/linux/rmap.h | 10 +-
+ include/linux/swap.h | 17 +-
+ include/linux/vmstat.h | 113 +++++-
+ include/linux/writeback.h | 9 +-
+ include/trace/events/pagemap.h | 46 ++-
+ include/trace/events/writeback.h | 28 +-
+ kernel/bpf/verifier.c | 2 +-
+ kernel/events/uprobes.c | 3 +-
+ lib/flex_proportions.c | 28 +-
+ mm/Makefile | 2 +-
+ mm/compaction.c | 4 +-
+ mm/filemap.c | 567 +++++++++++++--------------
+ mm/folio-compat.c | 142 +++++++
+ mm/huge_memory.c | 7 +-
+ mm/hugetlb.c | 2 +-
+ mm/internal.h | 36 +-
+ mm/khugepaged.c | 8 +-
+ mm/ksm.c | 34 +-
+ mm/memcontrol.c | 358 +++++++++--------
+ mm/memory-failure.c | 2 +-
+ mm/memory.c | 20 +-
+ mm/mempolicy.c | 10 +
+ mm/memremap.c | 2 +-
+ mm/migrate.c | 189 +++++----
+ mm/mlock.c | 3 +-
+ mm/page-writeback.c | 476 ++++++++++++----------
+ mm/page_alloc.c | 14 +-
+ mm/page_io.c | 4 +-
+ mm/page_owner.c | 10 +-
+ mm/rmap.c | 14 +-
+ mm/shmem.c | 7 +-
+ mm/swap.c | 197 +++++-----
+ mm/swap_state.c | 2 +-
+ mm/swapfile.c | 8 +-
+ mm/userfaultfd.c | 2 +-
+ mm/util.c | 111 +++---
+ mm/vmscan.c | 8 +-
+ mm/workingset.c | 52 +--
+ 73 files changed, 2900 insertions(+), 1694 deletions(-)
+ create mode 100644 mm/folio-compat.c
+Merging akpm-current/current (ec14ea3dfa14 ipc: replace costly bailout check in sysvipc_find_ipc())
+$ git merge --no-ff akpm-current/current
+Auto-merging tools/testing/selftests/kvm/dirty_log_perf_test.c
+Auto-merging tools/perf/util/header.c
+Auto-merging tools/perf/builtin-record.c
+Auto-merging tools/perf/builtin-c2c.c
+Removing tools/include/asm-generic/bitops/find.h
+Auto-merging net/ncsi/ncsi-manage.c
+Auto-merging mm/workingset.c
+Auto-merging mm/vmstat.c
+Auto-merging mm/vmscan.c
+Auto-merging mm/truncate.c
+Auto-merging mm/rmap.c
+Auto-merging mm/page_owner.c
+Auto-merging mm/page_alloc.c
+Auto-merging mm/memremap.c
+Auto-merging mm/mempolicy.c
+Auto-merging mm/memory.c
+Auto-merging mm/kfence/report.c
+Auto-merging mm/filemap.c
+Auto-merging mm/compaction.c
+Auto-merging mm/Makefile
+Auto-merging lib/vsprintf.c
+Auto-merging lib/test_printf.c
+Auto-merging lib/test_bitmap.c
+Auto-merging lib/string.c
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/Kconfig
+Auto-merging kernel/time/clocksource.c
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/sys.c
+Auto-merging kernel/sched/sched.h
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/exit.c
+Auto-merging kernel/cpu.c
+Auto-merging init/main.c
+Auto-merging include/trace/events/mmflags.h
+Auto-merging include/linux/units.h
+CONFLICT (content): Merge conflict in include/linux/units.h
+Auto-merging include/linux/sched.h
+CONFLICT (content): Merge conflict in include/linux/sched.h
+Auto-merging include/linux/rmap.h
+Auto-merging include/linux/pagemap.h
+Auto-merging include/linux/page_idle.h
+Auto-merging include/linux/page-flags.h
+Auto-merging include/linux/mm_types.h
+Auto-merging include/linux/highmem.h
+Auto-merging include/linux/highmem-internal.h
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/cpumask.h
+Auto-merging include/linux/bitops.h
+Auto-merging include/linux/bitmap.h
+Auto-merging fs/internal.h
+Auto-merging fs/inode.c
+Auto-merging fs/f2fs/segment.c
+Auto-merging fs/exec.c
+Auto-merging fs/eventpoll.c
+Auto-merging fs/buffer.c
+Auto-merging drivers/scsi/lpfc/lpfc_sli.c
+Auto-merging drivers/pci/controller/dwc/pci-dra7xx.c
+Auto-merging drivers/net/virtio_net.c
+Auto-merging drivers/mtd/nand/raw/intel-nand-controller.c
+Auto-merging drivers/mmc/host/renesas_sdhi_core.c
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+Auto-merging drivers/block/rnbd/rnbd-clt.c
+Auto-merging drivers/base/node.c
+Auto-merging block/blk-mq.c
+Auto-merging arch/x86/kernel/apic/vector.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/s390/mm/init.c
+Auto-merging arch/s390/kvm/kvm-s390.c
+Auto-merging arch/s390/kernel/setup.c
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/powerpc/platforms/pseries/hotplug-memory.c
+Auto-merging arch/powerpc/mm/book3s64/radix_tlb.c
+Auto-merging arch/powerpc/kernel/traps.c
+Auto-merging arch/powerpc/kernel/smp.c
+Auto-merging arch/powerpc/include/asm/bitops.h
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm/mach-rpc/ecard.c
+Auto-merging arch/arm/kernel/traps.c
+Auto-merging arch/arc/include/asm/bitops.h
+Auto-merging arch/arc/Kconfig
+Auto-merging arch/Kconfig
+Auto-merging MAINTAINERS
+Resolved 'include/linux/sched.h' using previous resolution.
+Resolved 'include/linux/units.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 1c6be48a987b] Merge branch 'akpm-current/current'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/mm/damon/index.rst | 15 +
+ Documentation/admin-guide/mm/damon/start.rst | 114 +++
+ Documentation/admin-guide/mm/damon/usage.rst | 112 +++
+ Documentation/admin-guide/mm/index.rst | 1 +
+ Documentation/admin-guide/mm/memory-hotplug.rst | 800 +++++++++++---------
+ Documentation/dev-tools/kfence.rst | 98 +--
+ Documentation/vm/damon/api.rst | 20 +
+ Documentation/vm/damon/design.rst | 166 ++++
+ Documentation/vm/damon/faq.rst | 51 ++
+ Documentation/vm/damon/index.rst | 30 +
+ Documentation/vm/index.rst | 1 +
+ MAINTAINERS | 15 +-
+ arch/Kconfig | 30 +-
+ arch/alpha/include/asm/agp.h | 4 +-
+ arch/alpha/include/asm/bitops.h | 2 -
+ arch/alpha/kernel/pci-sysfs.c | 12 +-
+ arch/arc/Kconfig | 1 -
+ arch/arc/include/asm/bitops.h | 1 -
+ arch/arc/kernel/traps.c | 5 -
+ arch/arm/configs/dove_defconfig | 1 -
+ arch/arm/configs/pxa_defconfig | 1 -
+ arch/arm/include/asm/bitops.h | 1 -
+ arch/arm/kernel/traps.c | 5 -
+ arch/arm/mach-rpc/ecard.c | 2 +-
+ arch/arm64/Kconfig | 1 -
+ arch/arm64/include/asm/bitops.h | 1 -
+ arch/arm64/mm/mmu.c | 3 +-
+ arch/csky/include/asm/bitops.h | 1 -
+ arch/h8300/include/asm/bitops.h | 1 -
+ arch/h8300/kernel/traps.c | 4 -
+ arch/hexagon/include/asm/bitops.h | 1 -
+ arch/hexagon/kernel/traps.c | 4 -
+ arch/ia64/include/asm/bitops.h | 2 -
+ arch/ia64/mm/init.c | 3 +-
+ arch/m68k/include/asm/bitops.h | 2 -
+ arch/mips/Kconfig | 1 -
+ arch/mips/configs/lemote2f_defconfig | 1 -
+ arch/mips/configs/pic32mzda_defconfig | 1 -
+ arch/mips/configs/rt305x_defconfig | 1 -
+ arch/mips/configs/xway_defconfig | 1 -
+ arch/mips/include/asm/bitops.h | 1 -
+ arch/nds32/kernel/traps.c | 5 -
+ arch/nios2/kernel/traps.c | 5 -
+ arch/openrisc/include/asm/bitops.h | 1 -
+ arch/openrisc/kernel/traps.c | 5 -
+ arch/parisc/configs/generic-32bit_defconfig | 1 -
+ arch/parisc/include/asm/bitops.h | 2 -
+ arch/parisc/kernel/traps.c | 4 -
+ arch/powerpc/Kconfig | 1 +
+ arch/powerpc/include/asm/bitops.h | 2 -
+ arch/powerpc/include/asm/cputhreads.h | 2 +-
+ arch/powerpc/kernel/smp.c | 2 +-
+ arch/powerpc/kernel/traps.c | 5 -
+ arch/powerpc/mm/book3s64/radix_tlb.c | 4 +-
+ arch/powerpc/mm/mem.c | 3 +-
+ arch/powerpc/platforms/pasemi/dma_lib.c | 4 +-
+ arch/powerpc/platforms/pseries/hotplug-memory.c | 9 +-
+ arch/riscv/include/asm/bitops.h | 1 -
+ arch/riscv/kernel/traps.c | 5 -
+ arch/s390/Kconfig | 1 -
+ arch/s390/include/asm/bitops.h | 1 -
+ arch/s390/kernel/setup.c | 1 -
+ arch/s390/kvm/kvm-s390.c | 2 +-
+ arch/s390/mm/init.c | 3 +-
+ arch/sh/include/asm/bitops.h | 1 -
+ arch/sh/mm/init.c | 3 +-
+ arch/sparc/include/asm/bitops_32.h | 1 -
+ arch/sparc/include/asm/bitops_64.h | 2 -
+ arch/um/kernel/trap.c | 4 -
+ arch/x86/Kconfig | 1 -
+ arch/x86/configs/i386_defconfig | 1 -
+ arch/x86/configs/x86_64_defconfig | 1 -
+ arch/x86/include/asm/bitops.h | 2 -
+ arch/x86/kernel/apic/vector.c | 4 +-
+ arch/x86/mm/init_32.c | 3 +-
+ arch/x86/mm/init_64.c | 3 +-
+ arch/x86/um/Kconfig | 1 -
+ arch/xtensa/include/asm/bitops.h | 1 -
+ block/blk-mq.c | 2 +-
+ drivers/acpi/acpi_memhotplug.c | 46 +-
+ drivers/base/memory.c | 225 +++++-
+ drivers/base/node.c | 2 -
+ drivers/block/rnbd/rnbd-clt.c | 2 +-
+ drivers/dax/kmem.c | 43 +-
+ drivers/devfreq/devfreq.c | 2 +-
+ drivers/dma/ti/edma.c | 2 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 4 +-
+ drivers/hwmon/ltc2992.c | 3 +-
+ drivers/hwmon/mr75203.c | 2 +-
+ drivers/iio/adc/ad7124.c | 2 +-
+ .../iio/common/hid-sensors/hid-sensor-attributes.c | 3 +-
+ drivers/iio/light/as73211.c | 3 +-
+ drivers/infiniband/hw/irdma/hw.c | 16 +-
+ drivers/media/cec/core/cec-core.c | 2 +-
+ drivers/media/i2c/ov02a10.c | 2 +-
+ drivers/media/mc/mc-devnode.c | 2 +-
+ drivers/mmc/host/renesas_sdhi_core.c | 2 +-
+ drivers/mtd/nand/raw/intel-nand-controller.c | 2 +-
+ drivers/net/virtio_net.c | 2 +-
+ drivers/pci/controller/dwc/pci-dra7xx.c | 2 +-
+ drivers/phy/st/phy-stm32-usbphyc.c | 2 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 10 +-
+ drivers/soc/fsl/qbman/bman_portal.c | 2 +-
+ drivers/soc/fsl/qbman/qman_portal.c | 2 +-
+ drivers/soc/ti/k3-ringacc.c | 4 +-
+ drivers/thermal/devfreq_cooling.c | 2 +-
+ drivers/tty/n_tty.c | 2 +-
+ drivers/virt/acrn/ioreq.c | 3 +-
+ drivers/virtio/virtio_mem.c | 26 +-
+ fs/buffer.c | 56 +-
+ fs/coredump.c | 15 +-
+ fs/eventpoll.c | 18 +-
+ fs/exec.c | 4 +-
+ fs/f2fs/segment.c | 8 +-
+ fs/hfsplus/catalog.c | 16 +-
+ fs/hfsplus/dir.c | 4 +-
+ fs/hfsplus/hfsplus_raw.h | 12 +-
+ fs/hfsplus/xattr.c | 18 +-
+ fs/inode.c | 46 +-
+ fs/internal.h | 1 -
+ fs/nilfs2/sysfs.c | 26 +-
+ fs/ocfs2/cluster/heartbeat.c | 2 +-
+ fs/ocfs2/dlm/dlmdomain.c | 4 +-
+ fs/ocfs2/dlm/dlmmaster.c | 18 +-
+ fs/ocfs2/dlm/dlmrecovery.c | 2 +-
+ fs/ocfs2/dlm/dlmthread.c | 2 +-
+ fs/ocfs2/namei.c | 49 +-
+ fs/ocfs2/namei.h | 2 +
+ fs/ocfs2/refcounttree.c | 15 +-
+ fs/ocfs2/xattr.c | 12 +-
+ fs/ocfs2/xattr.h | 1 +
+ fs/proc/array.c | 18 +-
+ fs/proc/base.c | 5 +-
+ fs/proc/fd.c | 23 +-
+ fs/proc/kcore.c | 73 ++
+ fs/proc/page.c | 40 +-
+ fs/ramfs/inode.c | 4 +
+ include/asm-generic/bitops.h | 1 -
+ include/asm-generic/bitops/le.h | 64 --
+ include/linux/bitmap.h | 34 +-
+ include/linux/bitops.h | 34 -
+ include/linux/cpumask.h | 46 +-
+ include/linux/damon.h | 268 +++++++
+ include/linux/find.h | 372 +++++++++
+ include/linux/fs.h | 1 +
+ include/linux/highmem-internal.h | 27 +-
+ include/linux/highmem.h | 28 +-
+ include/linux/memory.h | 55 +-
+ include/linux/memory_hotplug.h | 34 +-
+ include/linux/mempolicy.h | 5 +-
+ include/linux/memremap.h | 6 +
+ include/linux/mm_types.h | 2 +
+ include/linux/mm_types_task.h | 5 +
+ include/linux/mmzone.h | 19 +-
+ include/linux/once.h | 2 +-
+ include/linux/page-flags.h | 17 +-
+ include/linux/page_ext.h | 2 +-
+ include/linux/page_idle.h | 6 +-
+ include/linux/pagemap.h | 57 +-
+ include/linux/rmap.h | 8 +-
+ include/linux/sched.h | 8 +
+ include/linux/sched/mm.h | 21 +
+ include/linux/sched/user.h | 3 +-
+ include/linux/slub_def.h | 6 +
+ include/linux/threads.h | 2 +-
+ include/linux/units.h | 10 +-
+ include/trace/events/damon.h | 43 ++
+ include/trace/events/mmflags.h | 2 +-
+ include/trace/events/page_ref.h | 4 +-
+ init/initramfs.c | 2 +
+ init/main.c | 28 +-
+ init/noinitramfs.c | 2 +
+ ipc/util.c | 16 +-
+ kernel/acct.c | 2 +-
+ kernel/cpu.c | 2 +-
+ kernel/exit.c | 2 +-
+ kernel/fork.c | 53 +-
+ kernel/hung_task.c | 44 ++
+ kernel/kthread.c | 21 +-
+ kernel/sched/core.c | 35 +-
+ kernel/sched/sched.h | 4 +-
+ kernel/sys.c | 7 -
+ kernel/sysctl.c | 8 +-
+ kernel/time/clocksource.c | 4 +-
+ kernel/user.c | 25 +
+ lib/Kconfig | 3 -
+ lib/Kconfig.debug | 15 +-
+ lib/dump_stack.c | 3 +-
+ lib/find_bit.c | 21 +
+ lib/find_bit_benchmark.c | 21 +
+ lib/genalloc.c | 2 +-
+ lib/iov_iter.c | 8 +-
+ lib/math/Kconfig | 2 +-
+ lib/math/rational.c | 3 +
+ lib/string.c | 130 +++-
+ lib/test_bitmap.c | 37 +
+ lib/test_printf.c | 2 +-
+ lib/test_sort.c | 40 +-
+ lib/vsprintf.c | 26 +-
+ mm/Kconfig | 17 +-
+ mm/Makefile | 1 +
+ mm/compaction.c | 20 +-
+ mm/damon/Kconfig | 68 ++
+ mm/damon/Makefile | 5 +
+ mm/damon/core-test.h | 253 +++++++
+ mm/damon/core.c | 720 ++++++++++++++++++
+ mm/damon/dbgfs-test.h | 126 ++++
+ mm/damon/dbgfs.c | 623 +++++++++++++++
+ mm/damon/vaddr-test.h | 329 ++++++++
+ mm/damon/vaddr.c | 614 +++++++++++++++
+ mm/filemap.c | 9 +-
+ mm/highmem.c | 2 +-
+ mm/kfence/core.c | 3 +
+ mm/kfence/kfence.h | 2 +
+ mm/kfence/report.c | 19 +-
+ mm/kmemleak.c | 2 +-
+ mm/memory.c | 2 +-
+ mm/memory_hotplug.c | 380 +++++++++-
+ mm/mempolicy.c | 12 +-
+ mm/memremap.c | 25 +-
+ mm/mremap.c | 50 +-
+ mm/oom_kill.c | 7 +-
+ mm/page_alloc.c | 27 +-
+ mm/page_ext.c | 12 +-
+ mm/page_idle.c | 10 -
+ mm/page_isolation.c | 7 +-
+ mm/page_owner.c | 14 +-
+ mm/percpu.c | 36 +-
+ mm/rmap.c | 20 +-
+ mm/secretmem.c | 9 +-
+ mm/slab_common.c | 2 +
+ mm/slub.c | 837 ++++++++++++++-------
+ mm/truncate.c | 19 +-
+ mm/vmscan.c | 7 +
+ mm/vmstat.c | 48 ++
+ mm/workingset.c | 10 +
+ mm/zsmalloc.c | 10 +-
+ net/ncsi/ncsi-manage.c | 4 +-
+ scripts/checkpatch.pl | 93 ++-
+ tools/include/asm-generic/bitops.h | 1 -
+ tools/include/asm-generic/bitops/find.h | 145 ----
+ tools/include/linux/bitmap.h | 11 +-
+ .../bitops => tools/include/linux}/find.h | 54 +-
+ tools/lib/find_bit.c | 20 +
+ tools/perf/bench/find-bit-bench.c | 2 +-
+ tools/perf/builtin-c2c.c | 6 +-
+ tools/perf/builtin-record.c | 2 +-
+ tools/perf/tests/bitmap.c | 2 +-
+ tools/perf/tests/mem2node.c | 2 +-
+ tools/perf/util/affinity.c | 4 +-
+ tools/perf/util/header.c | 4 +-
+ tools/perf/util/metricgroup.c | 2 +-
+ tools/perf/util/mmap.c | 4 +-
+ tools/testing/selftests/damon/Makefile | 7 +
+ tools/testing/selftests/damon/_chk_dependency.sh | 28 +
+ tools/testing/selftests/damon/debugfs_attrs.sh | 75 ++
+ tools/testing/selftests/kvm/dirty_log_perf_test.c | 2 +-
+ tools/testing/selftests/kvm/dirty_log_test.c | 4 +-
+ .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 2 +-
+ tools/testing/selftests/memfd/memfd_test.c | 2 +-
+ 260 files changed, 7304 insertions(+), 1821 deletions(-)
+ create mode 100644 Documentation/admin-guide/mm/damon/index.rst
+ create mode 100644 Documentation/admin-guide/mm/damon/start.rst
+ create mode 100644 Documentation/admin-guide/mm/damon/usage.rst
+ create mode 100644 Documentation/vm/damon/api.rst
+ create mode 100644 Documentation/vm/damon/design.rst
+ create mode 100644 Documentation/vm/damon/faq.rst
+ create mode 100644 Documentation/vm/damon/index.rst
+ create mode 100644 include/linux/damon.h
+ create mode 100644 include/linux/find.h
+ create mode 100644 include/trace/events/damon.h
+ create mode 100644 mm/damon/Kconfig
+ create mode 100644 mm/damon/Makefile
+ create mode 100644 mm/damon/core-test.h
+ create mode 100644 mm/damon/core.c
+ create mode 100644 mm/damon/dbgfs-test.h
+ create mode 100644 mm/damon/dbgfs.c
+ create mode 100644 mm/damon/vaddr-test.h
+ create mode 100644 mm/damon/vaddr.c
+ delete mode 100644 tools/include/asm-generic/bitops/find.h
+ rename {include/asm-generic/bitops => tools/include/linux}/find.h (83%)
+ create mode 100644 tools/testing/selftests/damon/Makefile
+ create mode 100644 tools/testing/selftests/damon/_chk_dependency.sh
+ create mode 100644 tools/testing/selftests/damon/debugfs_attrs.sh
+$ 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/24) Rebasing (2/24) Rebasing (3/24) Rebasing (4/24) Rebasing (5/24) Rebasing (6/24) Rebasing (7/24) Rebasing (8/24) Rebasing (9/24) Rebasing (10/24) Rebasing (11/24) Rebasing (12/24) Rebasing (13/24) Rebasing (14/24) Rebasing (15/24) Rebasing (16/24) Rebasing (17/24) Rebasing (18/24) Rebasing (19/24) Rebasing (20/24) Rebasing (21/24) Rebasing (22/24) Rebasing (23/24) Rebasing (24/24) Successfully rebased and updated refs/heads/akpm.
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + bca1885638ea...b99a71cb1a49 akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (b99a71cb1a49 arch: remove compat_alloc_user_space)
+$ git merge --no-ff akpm/master
+Removing arch/arm64/lib/copy_in_user.S
+Merge made by the 'recursive' strategy.
+ Makefile | 15 +++
+ arch/arm64/include/asm/compat.h | 5 -
+ arch/arm64/include/asm/uaccess.h | 11 --
+ arch/arm64/include/asm/unistd32.h | 10 +-
+ arch/arm64/lib/Makefile | 2 +-
+ arch/arm64/lib/copy_in_user.S | 77 ------------
+ arch/mips/cavium-octeon/octeon-memcpy.S | 2 -
+ arch/mips/include/asm/compat.h | 8 --
+ arch/mips/include/asm/uaccess.h | 26 ----
+ arch/mips/kernel/syscalls/syscall_n32.tbl | 10 +-
+ arch/mips/kernel/syscalls/syscall_o32.tbl | 10 +-
+ arch/mips/lib/memcpy.S | 11 --
+ arch/parisc/include/asm/compat.h | 6 -
+ arch/parisc/include/asm/uaccess.h | 2 -
+ arch/parisc/kernel/syscalls/syscall.tbl | 8 +-
+ arch/parisc/lib/memcpy.c | 9 --
+ arch/powerpc/include/asm/compat.h | 16 ---
+ arch/powerpc/kernel/syscalls/syscall.tbl | 10 +-
+ arch/s390/include/asm/compat.h | 10 --
+ arch/s390/include/asm/uaccess.h | 3 -
+ arch/s390/kernel/syscalls/syscall.tbl | 10 +-
+ arch/s390/lib/uaccess.c | 63 ----------
+ arch/sparc/include/asm/compat.h | 19 ---
+ arch/sparc/kernel/process_64.c | 2 +-
+ arch/sparc/kernel/signal32.c | 12 +-
+ arch/sparc/kernel/signal_64.c | 8 +-
+ arch/sparc/kernel/syscalls/syscall.tbl | 10 +-
+ arch/x86/entry/syscalls/syscall_32.tbl | 4 +-
+ arch/x86/entry/syscalls/syscall_64.tbl | 2 +-
+ arch/x86/include/asm/compat.h | 13 --
+ arch/x86/include/asm/uaccess_64.h | 7 --
+ drivers/of/kexec.c | 1 +
+ include/linux/compat.h | 39 ++----
+ include/linux/compiler_attributes.h | 6 +
+ include/linux/gfp.h | 2 +
+ include/linux/mm.h | 34 ------
+ include/linux/percpu.h | 3 +
+ include/linux/slab.h | 118 +++++++++++++-----
+ include/linux/uaccess.h | 10 --
+ include/linux/vmalloc.h | 11 ++
+ include/uapi/asm-generic/unistd.h | 10 +-
+ kernel/compat.c | 21 ----
+ kernel/kexec.c | 103 ++++++----------
+ kernel/sys_ni.c | 5 -
+ mm/memcontrol.c | 4 -
+ mm/mempolicy.c | 197 +++++++-----------------------
+ mm/migrate.c | 67 +++++-----
+ mm/workingset.c | 2 +-
+ scripts/check_extable.sh | 2 +-
+ scripts/checkpatch.pl | 3 +-
+ 50 files changed, 309 insertions(+), 730 deletions(-)
+ delete mode 100644 arch/arm64/lib/copy_in_user.S
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 000000000000..d28b3fdd5131
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20210907