diff options
| author | Mark Brown <broonie@kernel.org> | 2019-09-25 19:19:57 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-25 19:19:57 -0700 |
| commit | d47175169c28eedd2cc2ab8c01f38764cb0269cc (patch) | |
| tree | fffb5f2e8c28ab2beb1c84026307f5d3be731083 | |
| parent | d7cbb84776c3262b8c2bf3a731b34f63caedbe1c (diff) | |
| download | linux-next-d47175169c28eedd2cc2ab8c01f38764cb0269cc.tar.gz | |
Add linux-next specific files for 20190925next-20190925
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | Next/SHA1s | 389 | ||||
| -rw-r--r-- | Next/Trees | 314 | ||||
| -rw-r--r-- | Next/merge.log | 4705 | ||||
| -rw-r--r-- | Next/quilt-import.log | 14 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5423 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..ae6e35afc388 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,389 @@ +Name SHA1 +---- ---- +origin 351c8a09b00b5c51c8f58b016fffe51f87e2d820 +fixes 609488bc979f99f805f34e9a32c1e3b71179d10b +kbuild-current f97c81dc6ca5996560b3944064f63fc87eb18d00 +arc-current 089cf7f6ecb266b6a4164919a2e69bd2f938374a +arm-current 5b3efa4f1479c91cb8361acef55f9c6662feba57 +arm-soc-fixes b74d957f6317e60924d0d3c0c01750814c24611b +arm64-fixes 799c85105233514309b201a2d2d7a7934458c999 +m68k-current 0f1979b402df5f0dd86425830ddaa191d70f3655 +powerpc-fixes faa6d21153fd11e139dd880044521389b34a24f2 +s390-fixes d45331b00ddb179e291766617259261c112db872 +sparc 038029c03e21be3bab44ff9d8005b51b597a5bf2 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 9f5c44cf61a7cf29d85d2c0d2065ab2d62764a41 +bpf 733ef7f056a5e23b66e8e7bb3508ca882db388f0 +ipsec 00b368502d18f790ab715e055869fd4bb7484a9b +netfilter 9b05b6e11d5e93a3a517cadc12b9836e0470c255 +ipvs 58e8b37069ff2609c4c972c2f127a73a0855c6aa +wireless-drivers 2b481835cf4e7384b80d7762074b32a45b792d99 +mac80211 f794dc2304d83ab998c2eee5bab0549aff5c53a2 +rdma-fixes 531a64e4c35bb9844b0cf813a6c9a87e00be05ff +sound-current f41f900568d9ffd896cc941db7021eb14bd55910 +sound-asoc-fixes c077f737949feed37691751ef6d10a468f6da276 +regmap-fixes 0161b8716465a93db726147e12f2514ba356c271 +regulator-fixes f9a60abc26d98d3058a4c71e21eaeec8460cb699 +spi-fixes 55eaa28551e17b80a6eb5366e65671ee17678f04 +pci-current 5184d449600f501a8688069f35c138c6b3bf8b94 +driver-core.current 351c8a09b00b5c51c8f58b016fffe51f87e2d820 +tty.current 351c8a09b00b5c51c8f58b016fffe51f87e2d820 +usb.current 351c8a09b00b5c51c8f58b016fffe51f87e2d820 +usb-gadget-fixes 4a56a478a525d6427be90753451c40e1327caa1a +usb-serial-fixes d1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1 +usb-chipidea-fixes 16009db47c51d4ef61270f22a2f1bb385233c34f +phy 609488bc979f99f805f34e9a32c1e3b71179d10b +staging.current 351c8a09b00b5c51c8f58b016fffe51f87e2d820 +char-misc.current 38c7a30a9d5ff8dd0c7a9ab1441aa5a96cf60afa +soundwire-fixes d1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1 +thunderbolt-fixes 4d856f72c10ecb060868ed10ff1b1453943fc6c8 +input-current 0898782247ae533d1f4e47a06bc5d4870931b284 +crypto-current bf6a7a5ad6fa69e48b735be75eeb90569d9584bb +ide baf6722aa0cbc5381f11520eb661be71b3ac379e +vfio-fixes 5715c4dd66a315515eedef3fc4cbe1bf4620f009 +kselftest-fixes fbb01c52471c8fb4ec2422c0ab26c134bd90bbff +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +slave-dma-fixes cf24aac38698bfa1d021afd3883df3c4c65143a4 +backlight-fixes e93c9c99a629c61837d5a7fc2120cd2b6c70dbdd +mtd-fixes dc9cfd2692225a2164f4f20b7deaf38ca8645de3 +mfd-fixes 4d82fa67dd6b0e2635ae9dad44fbf3d747eca9ed +v4l-dvb-fixes 63ad05e36ec5afc92c6b787c2e419d1ae3d0c8e6 +reset-fixes a71dcd3757e29cc8b43383ff18595d707cf08345 +mips-fixes 74034a09267c1f48d5ce7ae4c4a317fac7d43418 +at91-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +omap-fixes 1d70ded8567ccf70353ff97e3b13f267c889f934 +kvm-fixes 90a48843a18663a25aa70c6d717d38a4443e5e29 +kvms390-fixes 53936b5bf35e140ae27e4bbf0447a61063f400da +hwmon-fixes 98d1a3c245e4beb450867bcc7798c85a09aa0095 +nvdimm-fixes 4c806b897d6075bfa5067e524fb058c57ab64e7b +btrfs-fixes a529cd1cfcbc60ed4abfcd78780c2625464106b6 +vfs-fixes d4f4de5e5ef8efde85febb6876cd3c8ab1631999 +erofs-fixes 89b038ccec69c35e0d36b9d076c4184d2159b30f +dma-mapping-fixes 33dcb37cef741294b481f4d889a465b8091f11bf +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes 4d856f72c10ecb060868ed10ff1b1453943fc6c8 +samsung-krzk-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +pinctrl-samsung-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +devicetree-fixes 83f82d7a42583e93d0f0dde3d61ed10f75c0f4d8 +scsi-fixes 0aabb6b699f72dca96988d3f428e222f932dc889 +drm-fixes e6bb711600db23eef2fa0c16a2d361e17b45bb28 +amdgpu-fixes e16a7cbced7110866dcde84e504909ea85099bbd +drm-intel-fixes 4d856f72c10ecb060868ed10ff1b1453943fc6c8 +mmc-fixes f2be48b43e34a13be143c8a88eda8e40efa17066 +rtc-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +gnss-fixes f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a +hyperv-fixes e395071a12f9df7d22ca6657614e93453b69f72a +soc-fsl-fixes 5674a92ca4b7e5a6a19231edd10298d30324cd27 +kbuild-current f97c81dc6ca5996560b3944064f63fc87eb18d00 +arc-current 089cf7f6ecb266b6a4164919a2e69bd2f938374a +arm-current 5b3efa4f1479c91cb8361acef55f9c6662feba57 +arm-soc-fixes b74d957f6317e60924d0d3c0c01750814c24611b +arm64-fixes 799c85105233514309b201a2d2d7a7934458c999 +m68k-current 0f1979b402df5f0dd86425830ddaa191d70f3655 +powerpc-fixes faa6d21153fd11e139dd880044521389b34a24f2 +s390-fixes d45331b00ddb179e291766617259261c112db872 +sparc 038029c03e21be3bab44ff9d8005b51b597a5bf2 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 9f5c44cf61a7cf29d85d2c0d2065ab2d62764a41 +bpf 733ef7f056a5e23b66e8e7bb3508ca882db388f0 +ipsec 00b368502d18f790ab715e055869fd4bb7484a9b +netfilter 9b05b6e11d5e93a3a517cadc12b9836e0470c255 +ipvs 58e8b37069ff2609c4c972c2f127a73a0855c6aa +wireless-drivers 2b481835cf4e7384b80d7762074b32a45b792d99 +mac80211 f794dc2304d83ab998c2eee5bab0549aff5c53a2 +rdma-fixes 531a64e4c35bb9844b0cf813a6c9a87e00be05ff +sound-current f41f900568d9ffd896cc941db7021eb14bd55910 +sound-asoc-fixes c077f737949feed37691751ef6d10a468f6da276 +regmap-fixes 0161b8716465a93db726147e12f2514ba356c271 +regulator-fixes f9a60abc26d98d3058a4c71e21eaeec8460cb699 +spi-fixes 55eaa28551e17b80a6eb5366e65671ee17678f04 +pci-current 5184d449600f501a8688069f35c138c6b3bf8b94 +driver-core.current 351c8a09b00b5c51c8f58b016fffe51f87e2d820 +tty.current 351c8a09b00b5c51c8f58b016fffe51f87e2d820 +usb.current 351c8a09b00b5c51c8f58b016fffe51f87e2d820 +usb-gadget-fixes 4a56a478a525d6427be90753451c40e1327caa1a +usb-serial-fixes d1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1 +usb-chipidea-fixes 16009db47c51d4ef61270f22a2f1bb385233c34f +phy 609488bc979f99f805f34e9a32c1e3b71179d10b +staging.current 351c8a09b00b5c51c8f58b016fffe51f87e2d820 +char-misc.current 38c7a30a9d5ff8dd0c7a9ab1441aa5a96cf60afa +soundwire-fixes d1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1 +thunderbolt-fixes 4d856f72c10ecb060868ed10ff1b1453943fc6c8 +input-current 0898782247ae533d1f4e47a06bc5d4870931b284 +crypto-current bf6a7a5ad6fa69e48b735be75eeb90569d9584bb +ide baf6722aa0cbc5381f11520eb661be71b3ac379e +vfio-fixes 5715c4dd66a315515eedef3fc4cbe1bf4620f009 +kselftest-fixes fbb01c52471c8fb4ec2422c0ab26c134bd90bbff +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +slave-dma-fixes cf24aac38698bfa1d021afd3883df3c4c65143a4 +backlight-fixes e93c9c99a629c61837d5a7fc2120cd2b6c70dbdd +mtd-fixes dc9cfd2692225a2164f4f20b7deaf38ca8645de3 +mfd-fixes 4d82fa67dd6b0e2635ae9dad44fbf3d747eca9ed +v4l-dvb-fixes 63ad05e36ec5afc92c6b787c2e419d1ae3d0c8e6 +reset-fixes a71dcd3757e29cc8b43383ff18595d707cf08345 +mips-fixes 74034a09267c1f48d5ce7ae4c4a317fac7d43418 +at91-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +omap-fixes 1d70ded8567ccf70353ff97e3b13f267c889f934 +kvm-fixes 90a48843a18663a25aa70c6d717d38a4443e5e29 +kvms390-fixes 53936b5bf35e140ae27e4bbf0447a61063f400da +hwmon-fixes 98d1a3c245e4beb450867bcc7798c85a09aa0095 +nvdimm-fixes 4c806b897d6075bfa5067e524fb058c57ab64e7b +btrfs-fixes a529cd1cfcbc60ed4abfcd78780c2625464106b6 +vfs-fixes d4f4de5e5ef8efde85febb6876cd3c8ab1631999 +erofs-fixes 89b038ccec69c35e0d36b9d076c4184d2159b30f +dma-mapping-fixes 33dcb37cef741294b481f4d889a465b8091f11bf +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes 4d856f72c10ecb060868ed10ff1b1453943fc6c8 +samsung-krzk-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +pinctrl-samsung-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +devicetree-fixes 83f82d7a42583e93d0f0dde3d61ed10f75c0f4d8 +scsi-fixes 0aabb6b699f72dca96988d3f428e222f932dc889 +drm-fixes e6bb711600db23eef2fa0c16a2d361e17b45bb28 +amdgpu-fixes e16a7cbced7110866dcde84e504909ea85099bbd +drm-intel-fixes 4d856f72c10ecb060868ed10ff1b1453943fc6c8 +mmc-fixes f2be48b43e34a13be143c8a88eda8e40efa17066 +rtc-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +gnss-fixes f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a +hyperv-fixes e395071a12f9df7d22ca6657614e93453b69f72a +soc-fsl-fixes 5674a92ca4b7e5a6a19231edd10298d30324cd27 +risc-v-fixes c82dd6d078a2bb29d41eda032bb96d05699a524d +pidfd-fixes 28f59b04707dfe62223b95c1a73eb9c7f4f32def +fpga-fixes dec43da46f63eb71f519d963ba6832838e4262a3 +spdx 619e17cf75dd58905aa67ccd494a6ba5f19d6cc6 +gpio-intel-fixes 5f9e832c137075045d15cd6899ab0505cfb2ca4b +pinctrl-intel-fixes 4d856f72c10ecb060868ed10ff1b1453943fc6c8 +drm-misc-fixes b1066a123538044117f0a78ba8c6a50cf5a04c86 +kspp-gustavo 609488bc979f99f805f34e9a32c1e3b71179d10b +kbuild 337bf824b735ccf501179702aff8872105b139d0 +compiler-attributes 32ee8230b2b06c50f583e14fcd174d7d2edb52f5 +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping c7d9eccb3c1e802c5cbb2a764eb0eb9807d9f12e +asm-generic 9b87647c665dbf93173ca2f43986902b59dfbbba +arc 6fbc7275c7a9ba97877050335f290341a1fd8dbf +arm 3a6d5fc4376059d0f4047b58170325df9bd90e18 +arm64 e376897f424a1c807779a2635f62eb02d7e382f9 +arm-perf 3724e186fead350d1446d5202cd92fa6250bffda +arm-soc cc01ccf8045fac2f44e2170736eb2ab61c3583ee +actions fb9c1c1deb5ece57810afdbd743358d02e632d2c +amlogic 83405c3ff5e14778316045e0cb594250997eeaba +aspeed ba0fdbb07d0511384e736e3b0b9b10c8c9e275fd +at91 1069a5a3f3d88f0236cca790ba27069a3db62a1a +bcm2835 c165c01bb6f7873a31ddcc338ed6df2a3aa94cb1 +imx-mxs d26d83e3e1fc7c7d21f1406cbd842fa612079828 +keystone 78145dbeaea103586940696d4acbf2b1d62cf14e +mediatek 4ae1ce88e9a010b6227f0345b0abea0eebd38599 +mvebu 153e97d3bdf3549705d352ae49ce9d8fea2262c8 +omap 75e66cd99933cdcd8c89cb1a31f207370a91243d +qcom 63e5846442478bbd493377aee59ed817226c6475 +renesas ae688e1720fd387de34f2140a735917411672bf1 +renesas-geert e180e8bda8292eb2ed3f396f44487ef6e4dc26b9 +reset 2d94bccca49ff6b9c6795bf5206cf56f56718a57 +rockchip 155cb7cd4cd417d54b57b731cc2331bf9e545156 +samsung-krzk 2f776c5a7270d5c8f45d7115042655767535f3df +scmi a561f1ecaee0b5d8ce26081d52934f338514c94f +sunxi 15ea63583bfb82c93bc9d6b21321b4133c0b8482 +tegra 6290ae1fb7e26c04b4eddc8aa4c99d1af3dbc556 +clk ebd47c8434064687ab6641e837144e0a3ea3872d +clk-samsung a188339ca5a396acc588e5851ed7e19f66b0ebd9 +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky 4ad35c1f56386c8e7019c921bba1af109fde9693 +h8300 a5de8865cb3edc9c5b719dc45651b38226805f9e +ia64 0d3d343560bad8e1b7879fe94251cfe731a2dd13 +m68k 0f1979b402df5f0dd86425830ddaa191d70f3655 +m68knommu 372ea263b3d9cdeb70f8cffa025b2e0875e51b62 +microblaze 7cca9b8b7c5bcc56d627851550840586a25aaa1b +mips 05d013a0366d50f4f0dbebf8c1b22b42020bf49a +nds32 932296120543149e3397af252e7daee7af37eb05 +nios2 91d99a724e9c60e14332c26ab2284bf696b94c8e +openrisc f3b17320db25b4cdd50f0396b096644455357dac +parisc-hd 13859539bc0ec34bb956645e6f3b4fd4c8381aca +powerpc 45824fc0da6e46cc5d563105e1eaaf3098a686f9 +fsl 63d86876f32440a45b6f9d42ab2fb7f68b3a8bf7 +soc-fsl eadf0b17b43db4e73a6bdde1ad745d3b582a71c5 +risc-v 9ce06497c2722a0f9109e4cc3ce35b7a69617886 +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 ab5758848039de9a4b249d46e4ab591197eebaf2 +sh baf58858e8b6d853a7a8308901fcdd438e92a522 +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +uml 73625ed66389d4c620520058d828f43a93ab4d0c +xtensa 9c2ec7545cbd21199b1cdee2da195cabf4839ad7 +fscrypt 0642ea2409f3bfa105570e12854b8e2628db6835 +afs a0753c29004f4983e303abce019f29e183b1ee48 +btrfs 29dcea88779c856c7dc92040a0c01233263101d4 +btrfs-kdave feee7d2306b24cb361f278587ce78790f4c94717 +ceph 3ee5a7015c8b7cb4de21f7345f8381946f2fce55 +cifs fe64cdfd40e38c84e449ca3b6095fb4e6e12255a +configfs e9c03af21cc7e5723d4f1e90fe45d2cdccb70dc7 +ecryptfs b4a81b87a4cfe2bb26a4a943b748d96a43ef20e8 +ext3 0f7dbaee76f40c0089b573f56b262ce3be92a24a +ext4 040823b5372b445d1d9483811e85a24d71314d33 +f2fs 619e17cf75dd58905aa67ccd494a6ba5f19d6cc6 +fsverity 95ae251fe82838b85c6d37e5a1775006e2a42ae0 +fuse b7c8525a97d7735266f78d0dcfbda2cf9b14fd95 +jfs a5fdd713d256887b5f012608701149fa939e5645 +nfs 4d856f72c10ecb060868ed10ff1b1453943fc6c8 +nfs-anna a8fd0feeca35cb8f9ddd950191f4aeb777f52f89 +nfsd e41f9efb85d38d95744b9f35b9903109032b93d4 +orangefs e6b998ab62be29eb244fdb0fa41dcb5a8ad065f2 +overlayfs 5c2e9f346b815841f9bed6029ebcb06415caf640 +ubifs 6a379f67454a3c740671ed6c7793b76ffecef50b +v9fs aafee43b72863f1f70aeaf1332d049916e8df239 +xfs 88d32d3983e72f2a7de72a49b701e2529c48e9c1 +iomap 838c4f3d7515efe9d0e32c846fb5d102b6d8a29d +djw-vfs dc617f29dbe5ef0c8ced65ce62c464af1daaab3d +file-locks b41dae061bbd722b9d7fa828f35d22035b218e18 +vfs 3e501af8dd7b581240b476a1aa623f97dc1666ef +printk c38822ab9bd624e6f99bbc2576aa04151bff93f4 +pci 5184d449600f501a8688069f35c138c6b3bf8b94 +pstore 609488bc979f99f805f34e9a32c1e3b71179d10b +hid 8c97be0a0aa0844b7972358318a230ab2deb6b41 +i2c 5ae7657f46b2b78e7c4e4e176187b210ffa0ead2 +i3c 6030f42d20cedc04df019891851320f3e257038b +dmi 57361846b52bc686112da6ca5368d11210796804 +hwmon-staging 4e19e72f45d360975c59df8272f98bff59f6b748 +jc_docs fe013f8bc160d79c6e33bb66d9bb0cd24949274c +v4l-dvb 6f51fdfd8229d5358c2d6e272cf73478866e8ddc +v4l-dvb-next 5f9e832c137075045d15cd6899ab0505cfb2ca4b +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 315ea754a4c4b180c262041dbba6c8c9808d53c5 +cpufreq-arm f75d2accca7785657311653c125bb22f342dc5d9 +cpupower 87ce243206944a57383309dcbcdcc5750e6c905b +opp 071afa50609d46f2f760851b90696f9a09714d24 +thermal 0ca7ab5b009299d18e6f78b683294d96d6853469 +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 812cd88749e098ad976b6a1c149984dfd6c0f195 +dlm a48f9721e6db74dfbeb8d4a2cd616b20017f4b78 +swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c +rdma 3eca7fc2d8d1275d9cf0c709f0937becbfcf6d96 +net-next b41dae061bbd722b9d7fa828f35d22035b218e18 +bpf-next b41dae061bbd722b9d7fa828f35d22035b218e18 +ipsec-next 990925fad5c227269c3fcb76c7c46811b1e86c73 +mlx5-next fc603294267f890b34684588f6980ea8c7b72ecf +netfilter-next 67e80b99a5546b26561c7848f9fc1cf73d707792 +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next 1b0b807dd7469e36b761f5bb4ee40b61331aeee8 +wireless-drivers-next aa2eaa8c272a3211dec07ce9c6c863a7e355c10e +bluetooth b41dae061bbd722b9d7fa828f35d22035b218e18 +mac80211-next c1d3ad84eae35414b6b334790048406bd6301b12 +gfs2 f0b444b349e33ae0d3dd93e25ca365482a5d17d4 +mtd 2cfcfadb8e1380938d6631cffa4fa567b13f52b2 +nand f480b969448ee3896f55ef6d037ad4a2df3914bf +spi-nor 9607af6f857ff062b29562fc1fe36d22b16b9d27 +crypto 9575d1a5c0780ea26ff8dd29c94a32be32ce3c85 +drm 945b584c94f8c665b2df3834a8a6a8faf256cd5f +amdgpu 9c9284f9cee9052da4cad575da8dc5f2bbb31065 +drm-intel 458863e08e13ecf22b9ba1ee6d4baba0ce9990ea +drm-tegra 2a6fc3cb5cb68597f1072bfeef28d2ca02310220 +drm-misc 65e51e30d8625c82ddfe405da46124e9bbffaa71 +drm-msm 9f614197c744002f9968e82c649fdf7fe778e1e7 +hdlcd d664b851eb2bcdf84a3c063cf59457bb15bc6120 +mali-dp 4cf643a39221af24a151ad2cff4e3f95f12f368e +imx-drm 4d24376370fbfc87231d54434a683f2913abcce4 +etnaviv dbcc574a4bfad810ce6e118f3cf327c7b6e7c897 +regmap 1bd4584626a9715634d2cb91ae2ed0364c070b01 +sound f41f900568d9ffd896cc941db7021eb14bd55910 +sound-asoc c077f737949feed37691751ef6d10a468f6da276 +modules 2e6fcfeb9df6048a63fe0d5f7dfa39274bacbb71 +input 410f25de467ee94c1a577c6ee7370c37b376c17c +block 7fb33b99d62a9dff497d44b320187e23c5289d94 +device-mapper afa179eb603847494aa5061d4f501224a30dd187 +pcmcia 95691e3eddc41da2d1cd3cca51fecdfb46bd85bc +mmc f2be48b43e34a13be143c8a88eda8e40efa17066 +kgdb 3bd67b37e35069b43cc5de8d138727360c503e8f +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd 8391c6cb2414d9a75bbe247a838d28cb0cee77ee +backlight c0b64faf0fe6ca2574a00faed1ae833130db4e08 +battery 7f7378618b4103c083db7de5017df958f8ada070 +regulator f9a60abc26d98d3058a4c71e21eaeec8460cb699 +security 45893a0abee6b5fd52994a3a1095735aeaec472b +apparmor 136db994852a9b405ac1074de0e7a1c4c840b8ee +integrity 2a7f0e53daf29ca6dc9fbe2a27158f13474ec1b5 +keys 1f96e0f129eb2bea15a00c154eee8b85aa181d1a +selinux 15322a0d90b6fd62ae8f22e5b87f735c3fdfeff7 +smack 92604e825304ce170955df44b00973843054dcd5 +tpmdd e13cd21ffd50a07b55dcc4d8c38cedf27f28eaa1 +watchdog ca2fc5efffde5a3827adfb0ab6a51b6f1c64d5ff +iommu e95adb9add75affb98570a518c902f50e5fcce1b +vfio e6c5d727db0a86a3ff21aca6824aae87f3bc055f +audit 5f9e832c137075045d15cd6899ab0505cfb2ca4b +devicetree 59e9fcf8772bd97b6d681706fb8c9a972500c524 +mailbox 556a0964e28c4441dcdd50fb07596fd042246bd5 +spi 4c34e7629326a0dbccf54bd12cc2eafa7f66c2b2 +tip e3c5706691fb5924b1e1a1328060921e9b988739 +clockevents befd04abfbe4b933515dddb5659d0744be9dba6a +edac 3e443eb353eda6f4b4796e07f2599683fa752f1d +irqchip bb0fed1c60cccbe4063b455a7228818395dac86e +ftrace b78b94b82122208902c0f83805e614e1239f9893 +rcu 049b405029c00f3fd9e4ffa269bdd29b429c4672 +kvm 90a48843a18663a25aa70c6d717d38a4443e5e29 +kvm-arm aac60f1a867773de9eb164013d89c99f3ea1f009 +kvm-ppc ff42df49e75f053a8a6b4c2533100cdcc23afe69 +kvms390 0af2889f89bbb8bdab463862c59ceb5586f290eb +xen-tip a4098bc6eed5e31e0391bcc068e61804c98138df +percpu 69f98a60cdbb22aeb565044b858eee4930502a7c +workqueues 30ae2fc0a75eb5f1a38bbee7355d8e3bc823a6e1 +drivers-x86 24a8d78a9affb63e5ced313ccde6888fe96edc6e +chrome-platform 4c1fde5077dcad1a2a10a6a0883c8f94326c4971 +hsi c1030cd456198a2c58f718c3c4b215698d635553 +leds 6d4faf3b6b6eb3c8a750b2e6659a5b1ff3dd9e75 +ipmi c9acc3c4f8e42ae538aea7f418fddc16f257ba75 +driver-core 351c8a09b00b5c51c8f58b016fffe51f87e2d820 +usb 351c8a09b00b5c51c8f58b016fffe51f87e2d820 +usb-gadget 18a93cd38be3e69ac5b067c570a78a369b79e31d +usb-serial 7a786b84790789eff5bad49e3f6c15f75b7bf691 +usb-chipidea-next ecd55e367f3d706788632e176ec6b94e1a72a07c +phy-next 5af67635c36ed92ef172c7bbf4d711364bc3bdf7 +tty 351c8a09b00b5c51c8f58b016fffe51f87e2d820 +char-misc 351c8a09b00b5c51c8f58b016fffe51f87e2d820 +extcon f25379de41238ccf59f53202b38fdcc0a2dbf2f5 +soundwire dfcff3f8a5f18a0cfa233522b5647c2e6035fcb5 +thunderbolt dfda204198848b47bdb98ab83b94dbb7c7692b55 +staging 351c8a09b00b5c51c8f58b016fffe51f87e2d820 +mux 05fb8284a41719d5f827af2f383dd7592d8dcfda +icc 6311b6521bcc804e4d2fd45a5640562a7b8b5241 +slave-dma c5c6faaee6e0c374c7dfaf053aa23750f5a68e20 +cgroup 275278e1525a43d19ae50dbf20e597dd5ca3a5e3 +scsi ae7ccd015ece524fce522bd3bd54efda9167e5ea +scsi-mkp 4f38b20f40c2c0b2b6f21d5320001254aad46a22 +vhost 0d4a3f2abbef73b9e5bb5f12213c275565473588 +rpmsg 741dc0aa4122c5e1ec8c6b576503284281e29960 +gpio 367677d498390067a7b2769862185787077da412 +gpio-brgl b630cea7bee7c72382cbd106179ee4503838960a +gpio-intel 85af79659f455ddbdc5b6b6e2a888a430cb58948 +pinctrl cb0438e4436085d89706b5ccfce4d5da531253de +pinctrl-intel 55dac43747be98516a337285428806d177afaa3a +pinctrl-samsung 10971e2ab6eb86c490fea92eb67549a8f46f0ae9 +pwm 028bc338e5849a6f4068593b946ae6d870fc3a80 +userns 318759b4737c3b3789e2fd64d539f437d52386f5 +ktest aecea57f84b0586b62c010bea946468d77f6bf0f +random 58be0106c5306b939b07b4b8bf00669a20593f4b +kselftest 721cb3c8bc8890e824b7be53bf951960ff7811f9 +y2038 870e0167cd9cff1246746bd163db90df60d1dd61 +livepatching 1cfe141e17159a9b9488ff2a5fb1a2c0a87548d9 +coresight c165d8947bc41ebd3b0de3f520490cffb627af90 +rtc b99a3120f9a30e1429d8d634e18da8dff93340c6 +nvdimm 4c806b897d6075bfa5067e524fb058c57ab64e7b +at24 10742fee98eb3b3e8453ef27a33dee314b15f7bd +ntb e58aa8d1e578506ad6a649fb9e742c556fc36bb4 +kspp 6f88ed285e67555e31e2601f0e8c5fb25501c366 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a +fsi 799e064cc79e7a9e6be2d4721c882d4fb92aad65 +siox 1e4b044d22517cae7047c99038abb444423243ca +slimbus 0a43bffb7e21345444cd09302808b75cd8b6f9d5 +nvmem ad732da57bded90c99c3d9f9e63bfae1f9783e33 +xarray 91abab83839aa2eba073e4a63c729832fdb27ea1 +hyperv d8bd2d442bb2688b428ac7164e5dc6d95d4fa65b +auxdisplay 4d856f72c10ecb060868ed10ff1b1453943fc6c8 +kgdb-dt d8a050f5a3e8242242df6430d5980c142350e461 +pidfd 590ef0128b4277eaa9cb74d7ba878d48b261950c +devfreq d2f5fccd1ac9363247888de40f2d05b6a1593e9f +hmm 62974fc389b364d8af70e044836362222bd3ae53 +fpga e56476897448a0cc6f748535a199d2b68ad47d55 +akpm-current 2f9b49ccdf29d5cdfc8787e9eb6bd6aa8bbc3329 +akpm-current 2f9b49ccdf29d5cdfc8787e9eb6bd6aa8bbc3329 +akpm-current 2f9b49ccdf29d5cdfc8787e9eb6bd6aa8bbc3329 +akpm-current 2f9b49ccdf29d5cdfc8787e9eb6bd6aa8bbc3329 +akpm-current 2f9b49ccdf29d5cdfc8787e9eb6bd6aa8bbc3329 +akpm-current 2f9b49ccdf29d5cdfc8787e9eb6bd6aa8bbc3329 +akpm acfbae9c4b53b7f2140cdcf0c2c8660f9bab9a47 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..70e42ca224f7 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,314 @@ +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#master +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 +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/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/davem/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#ci-for-usb-stable +phy git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-linus +slave-dma-fixes git git://git.infradead.org/users/vkoul/slave-dma.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#master +drivers-x86-fixes git git://git.infradead.org/linux-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#pinctrl-fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +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 +leaks git https://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git#leaks-next +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/afaerber/linux-actions.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux-at91.git#at91-next +bcm2835 git git://github.com/anholt/linux.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.infradead.org/linux-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 +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +renesas-geert git git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +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 +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +sifive git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sh git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#sh-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +btrfs-kdave git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +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.infradead.org/ubifs-2.6.git#linux-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 +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/pmladek/printk.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 quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +fbdev git git://github.com/bzolnier/linux.git#fbdev-for-next +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +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/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#master +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 +nfc-next git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +amdgpu git git://people.freedesktop.org/~agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd +mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp +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 +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-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 +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#for-next +tpmdd git git://git.infradead.org/users/jjs/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 +vfio git git://github.com/awilliam/linux-vfio.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#clockevents/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.infradead.org/linux-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/j.anaszewski/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#ci-for-usb-next +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +icc git git://git.linaro.org/people/georgi.djakov/linux.git#icc-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.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://github.com/andersson/remoteproc.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +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 +siox git https://git.pengutronix.de/git/ukl/linux#siox/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/linux-dax.git#xarray +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-dt git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git#for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next +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..193c817e23b3 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4705 @@ +$ date -R +Wed, 25 Sep 2019 09:52:36 -0700 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 4c07e2ddab5b6 Merge tag 'mfd-next-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd +Merging origin/master (351c8a09b00b5 Merge branch 'i2c/for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge origin/master +Updating 4c07e2ddab5b6..351c8a09b00b5 +Fast-forward + Documentation/ABI/testing/sysfs-kernel-slab | 13 +- + Documentation/admin-guide/cgroup-v1/memory.rst | 4 +- + Documentation/admin-guide/kernel-parameters.txt | 2 + + .../devicetree/bindings/i2c/brcm,bcm2835-i2c.txt | 4 +- + .../bindings/i2c/{i2c-rcar.txt => renesas,i2c.txt} | 0 + .../i2c/{i2c-emev2.txt => renesas,iic-emev2.txt} | 0 + .../i2c/{i2c-sh_mobile.txt => renesas,iic.txt} | 0 + .../i2c/{i2c-riic.txt => renesas,riic.txt} | 0 + MAINTAINERS | 14 +- + arch/Kconfig | 11 + + arch/alpha/include/asm/pgalloc.h | 2 - + arch/alpha/include/asm/pgtable.h | 5 - + arch/arc/include/asm/pgalloc.h | 1 - + arch/arc/include/asm/pgtable.h | 5 - + arch/arm/Kconfig | 1 + + arch/arm/include/asm/pgalloc.h | 2 - + arch/arm/include/asm/pgtable-nommu.h | 5 - + arch/arm/include/asm/pgtable.h | 2 - + arch/arm/include/asm/processor.h | 2 - + arch/arm/kernel/process.c | 5 - + arch/arm/mm/flush.c | 7 +- + arch/arm/mm/mmap.c | 52 --- + arch/arm64/Kconfig | 2 +- + arch/arm64/include/asm/pgalloc.h | 2 - + arch/arm64/include/asm/pgtable.h | 2 - + arch/arm64/include/asm/processor.h | 2 - + arch/arm64/kernel/process.c | 8 - + arch/arm64/mm/flush.c | 3 +- + arch/arm64/mm/mmap.c | 72 --- + arch/arm64/mm/pgd.c | 2 +- + arch/c6x/include/asm/pgtable.h | 5 - + arch/csky/include/asm/pgalloc.h | 2 - + arch/csky/include/asm/pgtable.h | 5 - + arch/h8300/include/asm/pgtable.h | 6 - + arch/hexagon/include/asm/pgalloc.h | 2 - + arch/hexagon/include/asm/pgtable.h | 3 - + arch/hexagon/mm/Makefile | 2 +- + arch/hexagon/mm/pgalloc.c | 10 - + arch/ia64/Kconfig | 4 - + arch/ia64/include/asm/pgalloc.h | 52 +-- + arch/ia64/include/asm/pgtable.h | 5 - + arch/ia64/kernel/irq_ia64.c | 1 + + arch/ia64/mm/contig.c | 1 - + arch/ia64/mm/discontig.c | 2 +- + arch/ia64/mm/init.c | 2 +- + arch/m68k/include/asm/pgtable_mm.h | 7 - + arch/m68k/include/asm/pgtable_no.h | 7 - + arch/microblaze/Kconfig | 3 + + arch/microblaze/boot/dts/system.dts | 16 +- + arch/microblaze/configs/mmu_defconfig | 22 +- + arch/microblaze/configs/nommu_defconfig | 25 +- + arch/microblaze/include/asm/io.h | 1 - + arch/microblaze/include/asm/pgalloc.h | 122 +---- + arch/microblaze/include/asm/pgtable.h | 7 - + arch/microblaze/include/asm/uaccess.h | 42 +- + arch/microblaze/kernel/reset.c | 87 +--- + arch/microblaze/mm/consistent.c | 221 ++------- + arch/microblaze/mm/pgtable.c | 4 - + arch/mips/Kconfig | 2 +- + arch/mips/include/asm/pgalloc.h | 2 - + arch/mips/include/asm/pgtable.h | 5 - + arch/mips/include/asm/processor.h | 5 - + arch/mips/mm/mmap.c | 84 ---- + arch/nds32/include/asm/pgalloc.h | 2 - + arch/nds32/include/asm/pgtable.h | 2 - + arch/nios2/include/asm/pgalloc.h | 2 - + arch/nios2/include/asm/pgtable.h | 2 - + arch/openrisc/include/asm/pgalloc.h | 2 - + arch/openrisc/include/asm/pgtable.h | 5 - + arch/parisc/include/asm/pgalloc.h | 2 - + arch/parisc/include/asm/pgtable.h | 2 - + arch/powerpc/include/asm/pgalloc.h | 2 - + arch/powerpc/include/asm/pgtable.h | 1 - + arch/powerpc/mm/book3s64/hash_utils.c | 2 +- + arch/powerpc/mm/book3s64/iommu_api.c | 7 +- + arch/powerpc/mm/hugetlbpage.c | 2 +- + arch/powerpc/platforms/cell/spufs/inode.c | 207 +++++---- + arch/riscv/Kconfig | 12 + + arch/riscv/include/asm/pgalloc.h | 4 - + arch/riscv/include/asm/pgtable.h | 5 - + arch/s390/hypfs/inode.c | 137 +++--- + arch/s390/include/asm/pgtable.h | 6 - + arch/sh/include/asm/pgalloc.h | 44 +- + arch/sh/include/asm/pgtable.h | 5 - + arch/sh/mm/Kconfig | 3 - + arch/sh/mm/nommu.c | 4 - + arch/sparc/include/asm/pgalloc_32.h | 2 - + arch/sparc/include/asm/pgalloc_64.h | 2 - + arch/sparc/include/asm/pgtable_32.h | 5 - + arch/sparc/include/asm/pgtable_64.h | 1 - + arch/sparc/mm/init_32.c | 1 - + arch/um/include/asm/pgalloc.h | 2 - + arch/um/include/asm/pgtable.h | 2 - + arch/unicore32/include/asm/pgalloc.h | 2 - + arch/unicore32/include/asm/pgtable.h | 2 - + arch/x86/include/asm/pgtable_32.h | 2 - + arch/x86/include/asm/pgtable_64.h | 3 - + arch/x86/mm/pgtable.c | 6 +- + arch/xtensa/include/asm/pgtable.h | 1 - + arch/xtensa/include/asm/tlbflush.h | 3 - + block/bfq-iosched.c | 35 +- + block/blk-core.c | 7 + + block/blk-integrity.c | 11 + + block/blk-mq.c | 6 + + block/bsg-lib.c | 10 +- + block/t10-pi.c | 169 +++---- + drivers/acpi/acpi_apd.c | 7 + + drivers/ata/libahci_platform.c | 9 +- + drivers/base/memory.c | 44 +- + drivers/base/node.c | 55 ++- + drivers/block/nbd.c | 108 +++-- + drivers/block/pktcdvd.c | 1 - + drivers/crypto/chelsio/chtls/chtls_io.c | 5 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 18 +- + drivers/gpu/drm/via/via_dmablit.c | 10 +- + drivers/hid/hid-hyperv.c | 4 +- + drivers/hv/channel_mgmt.c | 161 ++++++- + drivers/hv/connection.c | 8 +- + drivers/hv/hv.c | 66 +-- + drivers/hv/hv_balloon.c | 143 +++--- + drivers/hv/hyperv_vmbus.h | 30 ++ + drivers/hv/vmbus_drv.c | 265 +++++++++++ + drivers/i2c/busses/Kconfig | 17 +- + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-axxia.c | 152 ++++++- + drivers/i2c/busses/i2c-bcm-iproc.c | 6 +- + drivers/i2c/busses/i2c-bcm2835.c | 11 +- + drivers/i2c/busses/i2c-cht-wc.c | 49 +- + drivers/i2c/busses/i2c-designware-master.c | 14 +- + drivers/i2c/busses/i2c-designware-pcidrv.c | 41 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 22 +- + drivers/i2c/busses/i2c-exynos5.c | 4 +- + drivers/i2c/busses/i2c-fsi.c | 4 +- + drivers/i2c/busses/i2c-hix5hd2.c | 3 +- + drivers/i2c/busses/i2c-i801.c | 145 +++--- + drivers/i2c/busses/i2c-icy.c | 230 ++++++++++ + drivers/i2c/busses/i2c-imx-lpi2c.c | 4 +- + drivers/i2c/busses/i2c-imx.c | 17 +- + drivers/i2c/busses/i2c-ismt.c | 2 - + drivers/i2c/busses/i2c-mxs.c | 4 +- + drivers/i2c/busses/i2c-ocores.c | 5 +- + drivers/i2c/busses/i2c-piix4.c | 34 +- + drivers/i2c/busses/i2c-sprd.c | 25 +- + drivers/i2c/busses/i2c-stm32f7.c | 2 +- + drivers/i2c/busses/i2c-synquacer.c | 2 +- + drivers/i2c/busses/i2c-taos-evm.c | 2 +- + drivers/i2c/busses/i2c-tegra.c | 56 ++- + drivers/i2c/busses/i2c-uniphier-f.c | 26 +- + drivers/i2c/busses/i2c-uniphier.c | 22 +- + drivers/i2c/i2c-core-base.c | 20 +- + drivers/i2c/i2c-slave-eeprom.c | 42 +- + drivers/infiniband/core/umem.c | 5 +- + drivers/infiniband/hw/hfi1/user_pages.c | 5 +- + drivers/infiniband/hw/qib/qib_user_pages.c | 5 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 5 +- + drivers/infiniband/sw/siw/siw_mem.c | 10 +- + drivers/md/dm-integrity.c | 10 + + drivers/media/i2c/adv748x/adv748x-core.c | 6 +- + drivers/media/i2c/adv7604.c | 22 +- + drivers/misc/eeprom/at24.c | 1 - + drivers/nvme/host/core.c | 9 - + drivers/platform/x86/Kconfig | 1 + + drivers/platform/x86/i2c-multi-instantiate.c | 2 +- + drivers/platform/x86/pmc_atom.c | 7 + + drivers/scsi/sd.c | 8 - + drivers/staging/android/ion/ion_system_heap.c | 4 +- + drivers/target/tcm_fc/tfc_io.c | 3 +- + drivers/usb/gadget/function/f_fs.c | 233 +++++----- + drivers/vfio/vfio_iommu_spapr_tce.c | 8 +- + drivers/watchdog/iTCO_wdt.c | 26 +- + fs/binfmt_elf.c | 20 - + fs/fat/dir.c | 13 +- + fs/fat/fatent.c | 3 + + fs/gfs2/incore.h | 8 +- + fs/gfs2/ops_fstype.c | 495 ++++++++++++++++----- + fs/gfs2/super.c | 333 +------------- + fs/gfs2/super.h | 3 +- + fs/inode.c | 3 + + fs/io_uring.c | 243 ++++++++-- + fs/jbd2/journal.c | 2 - + fs/jbd2/transaction.c | 12 - + fs/ocfs2/alloc.c | 20 +- + fs/ocfs2/aops.c | 13 +- + fs/ocfs2/blockcheck.c | 26 +- + fs/ocfs2/cluster/heartbeat.c | 103 ++--- + fs/ocfs2/dir.c | 3 +- + fs/ocfs2/dlm/dlmcommon.h | 1 - + fs/ocfs2/dlm/dlmdebug.c | 55 +-- + fs/ocfs2/dlm/dlmdebug.h | 16 +- + fs/ocfs2/dlm/dlmdomain.c | 7 +- + fs/ocfs2/dlm/dlmunlock.c | 23 +- + fs/ocfs2/dlmglue.c | 27 +- + fs/ocfs2/extent_map.c | 3 +- + fs/ocfs2/file.c | 13 +- + fs/ocfs2/inode.c | 2 +- + fs/ocfs2/journal.h | 42 +- + fs/ocfs2/namei.c | 2 - + fs/ocfs2/ocfs2.h | 3 - + fs/ocfs2/super.c | 10 +- + fs/open.c | 8 + + fs/proc/meminfo.c | 8 +- + fs/proc/task_mmu.c | 6 +- + include/asm-generic/pgalloc.h | 5 - + include/asm-generic/pgtable.h | 7 +- + include/linux/blkdev.h | 4 + + include/linux/compaction.h | 22 +- + include/linux/fs.h | 32 ++ + include/linux/huge_mm.h | 9 + + include/linux/hugetlb.h | 2 +- + include/linux/hyperv.h | 16 +- + include/linux/i2c.h | 2 +- + include/linux/jbd2.h | 2 - + include/linux/khugepaged.h | 12 + + include/linux/memcontrol.h | 23 +- + include/linux/memory.h | 7 +- + include/linux/mm.h | 37 +- + include/linux/mm_types.h | 1 + + include/linux/mmzone.h | 14 +- + include/linux/page_ext.h | 1 + + include/linux/pagemap.h | 10 + + include/linux/quicklist.h | 94 ---- + include/linux/shrinker.h | 7 +- + include/linux/slab.h | 62 --- + include/linux/t10-pi.h | 14 - + include/linux/vmalloc.h | 20 +- + include/linux/zpool.h | 3 + + include/uapi/linux/io_uring.h | 2 + + init/main.c | 6 +- + kernel/bpf/inode.c | 92 ++-- + kernel/events/uprobes.c | 81 +++- + kernel/resource.c | 4 +- + kernel/sched/idle.c | 1 - + kernel/sysctl.c | 6 +- + lib/Kconfig.debug | 15 +- + lib/Kconfig.kasan | 8 + + lib/iov_iter.c | 2 +- + lib/show_mem.c | 5 - + lib/test_kasan.c | 41 ++ + mm/Kconfig | 16 +- + mm/Kconfig.debug | 4 +- + mm/Makefile | 4 +- + mm/compaction.c | 50 +-- + mm/filemap.c | 168 +++---- + mm/gup.c | 125 +++--- + mm/huge_memory.c | 123 +++-- + mm/hugetlb.c | 89 +++- + mm/hugetlb_cgroup.c | 2 +- + mm/init-mm.c | 2 +- + mm/kasan/common.c | 32 +- + mm/kasan/kasan.h | 14 +- + mm/kasan/report.c | 44 +- + mm/kasan/tags_report.c | 24 + + mm/khugepaged.c | 366 ++++++++++++--- + mm/kmemleak.c | 326 ++++---------- + mm/ksm.c | 18 - + mm/madvise.c | 52 +-- + mm/memcontrol.c | 188 +++++++- + mm/memfd.c | 2 + + mm/memory.c | 13 +- + mm/memory_hotplug.c | 103 ++--- + mm/mempolicy.c | 4 - + mm/migrate.c | 13 +- + mm/mmap.c | 12 +- + mm/mmu_gather.c | 2 - + mm/nommu.c | 2 +- + mm/oom_kill.c | 24 +- + mm/page_alloc.c | 27 +- + mm/page_owner.c | 123 +++-- + mm/page_poison.c | 2 +- + mm/page_vma_mapped.c | 3 +- + mm/quicklist.c | 103 ----- + mm/rmap.c | 25 +- + mm/shmem.c | 12 +- + mm/slab.h | 64 +++ + mm/slab_common.c | 37 ++ + mm/slob.c | 2 +- + mm/slub.c | 22 +- + mm/sparse.c | 25 +- + mm/swap.c | 16 +- + mm/swap_state.c | 6 +- + mm/util.c | 122 ++++- + mm/vmalloc.c | 84 ++-- + mm/vmscan.c | 149 +++---- + mm/vmstat.c | 2 + + mm/z3fold.c | 154 ++----- + mm/zpool.c | 16 + + mm/zsmalloc.c | 23 +- + mm/zswap.c | 15 +- + net/xdp/xdp_umem.c | 9 +- + net/xdp/xsk.c | 2 +- + sound/firewire/dice/dice-alesis.c | 2 +- + sound/pci/hda/hda_intel.c | 3 +- + sound/pci/hda/patch_analog.c | 1 + + sound/pci/hda/patch_realtek.c | 28 ++ + sound/soc/atmel/atmel_ssc_dai.c | 12 +- + sound/soc/atmel/atmel_ssc_dai.h | 1 - + sound/soc/codecs/pcm3168a.c | 3 +- + sound/soc/fsl/fsl_sai.c | 15 + + sound/soc/fsl/fsl_sai.h | 1 + + sound/soc/sh/rcar/ssi.c | 10 +- + sound/soc/soc-core.c | 2 +- + sound/soc/ti/Kconfig | 11 +- + sound/usb/quirks.c | 2 + + tools/hv/Build | 3 + + tools/hv/Makefile | 51 ++- + tools/power/x86/intel-speed-select/isst-config.c | 122 ++++- + tools/power/x86/intel-speed-select/isst-core.c | 25 ++ + tools/power/x86/intel-speed-select/isst-display.c | 71 +++ + tools/power/x86/intel-speed-select/isst.h | 10 +- + usr/Makefile | 3 + + 310 files changed, 5269 insertions(+), 4159 deletions(-) + rename Documentation/devicetree/bindings/i2c/{i2c-rcar.txt => renesas,i2c.txt} (100%) + rename Documentation/devicetree/bindings/i2c/{i2c-emev2.txt => renesas,iic-emev2.txt} (100%) + rename Documentation/devicetree/bindings/i2c/{i2c-sh_mobile.txt => renesas,iic.txt} (100%) + rename Documentation/devicetree/bindings/i2c/{i2c-riic.txt => renesas,riic.txt} (100%) + delete mode 100644 arch/hexagon/mm/pgalloc.c + create mode 100644 drivers/i2c/busses/i2c-icy.c + delete mode 100644 include/linux/quicklist.h + delete mode 100644 mm/quicklist.c + create mode 100644 tools/hv/Build +Merging fixes/master (609488bc979f9 Linux 5.3-rc2) +$ git merge fixes/master +Already up to date. +Merging kbuild-current/fixes (f97c81dc6ca59 Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (089cf7f6ecb26 Linux 5.3-rc7) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (5b3efa4f1479c ARM: 8901/1: add a criteria for pfn_valid of arm) +$ git merge arm-current/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (b74d957f6317e ARM: aspeed: ast2500 is ARMv6K) +$ git merge arm-soc-fixes/arm/fixes +Auto-merging arch/arm/mach-aspeed/Kconfig +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1249 and retry the command. +Merge made by the 'recursive' strategy. + arch/arm/mach-aspeed/Kconfig | 1 - + 1 file changed, 1 deletion(-) +Merging arm64-fixes/for-next/fixes (799c851052335 arm64: Fix reference to docs for ARM64_TAGGED_ADDR_ABI) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging m68k-current/for-linus (0f1979b402df5 m68k: Remove ioremap_fullcache()) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (faa6d21153fd1 powerpc/nvdimm: use H_SCM_QUERY hcall on H_OVERLAP error) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/cputable.h | 5 +- + arch/powerpc/include/asm/kvm_ppc.h | 100 +++- + arch/powerpc/include/asm/reg.h | 9 +- + arch/powerpc/kernel/cpu_setup_power.S | 6 + + arch/powerpc/kernel/dbell.c | 6 +- + arch/powerpc/kernel/dt_cpu_ftrs.c | 35 +- + arch/powerpc/kvm/book3s_hv.c | 11 +- + arch/powerpc/kvm/book3s_hv_nested.c | 6 +- + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 42 +- + arch/powerpc/kvm/book3s_hv_rm_xics.c | 2 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 10 +- + arch/powerpc/mm/book3s64/hash_native.c | 31 +- + arch/powerpc/mm/book3s64/mmu_context.c | 15 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 84 ++- + arch/powerpc/mm/kasan/kasan_init_32.c | 34 +- + arch/powerpc/platforms/powernv/smp.c | 2 +- + arch/powerpc/platforms/pseries/lpar.c | 163 +++++- + arch/powerpc/platforms/pseries/papr_scm.c | 72 ++- + arch/powerpc/platforms/pseries/pseries.h | 1 + + arch/powerpc/platforms/pseries/setup.c | 1 + + arch/powerpc/sysdev/xics/icp-native.c | 6 +- + arch/powerpc/sysdev/xics/icp-opal.c | 6 +- + tools/testing/selftests/powerpc/mm/Makefile | 2 + + tools/testing/selftests/powerpc/mm/tlbie_test.c | 734 ++++++++++++++++++++++++ + tools/testing/selftests/powerpc/tm/.gitignore | 1 + + tools/testing/selftests/powerpc/tm/Makefile | 2 +- + tools/testing/selftests/powerpc/tm/tm-poison.c | 179 ++++++ + 27 files changed, 1474 insertions(+), 91 deletions(-) + create mode 100644 tools/testing/selftests/powerpc/mm/tlbie_test.c + create mode 100644 tools/testing/selftests/powerpc/tm/tm-poison.c +Merging s390-fixes/fixes (d45331b00ddb1 Linux 5.3-rc4) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (038029c03e21b sparc: remove unneeded uapi/asm/statfs.h) +$ git merge sparc/master +Removing arch/sparc/include/uapi/asm/statfs.h +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1285 and retry the command. +Merge made by the 'recursive' strategy. + arch/sparc/include/uapi/asm/statfs.h | 7 ------- + 1 file changed, 7 deletions(-) + delete mode 100644 arch/sparc/include/uapi/asm/statfs.h +Merging fscrypt-current/for-stable (ae64f9bd1d362 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (9f5c44cf61a7c gianfar: Make reset_gfar static) +$ git merge net/master +Removing include/linux/platform_data/eth-netx.h +Removing drivers/net/ethernet/netx-eth.c +Auto-merging drivers/infiniband/core/addr.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/adi,adin.yaml | 7 - + .../devicetree/bindings/net/micrel-ksz90x1.txt | 32 +- + .../devicetree/bindings/net/snps,dwmac.yaml | 2 +- + drivers/atm/he.c | 2 +- + drivers/infiniband/core/addr.c | 2 +- + drivers/isdn/mISDN/socket.c | 2 + + drivers/net/arcnet/arcnet.c | 31 +- + drivers/net/dsa/b53/b53_serdes.h | 4 +- + drivers/net/dsa/lantiq_pce.h | 2 +- + drivers/net/dsa/sja1105/Kconfig | 1 + + drivers/net/ethernet/Kconfig | 11 - + drivers/net/ethernet/Makefile | 1 - + drivers/net/ethernet/amazon/Kconfig | 1 + + drivers/net/ethernet/freescale/gianfar.c | 2 +- + drivers/net/ethernet/ibm/ibmvnic.c | 269 +++++++---- + drivers/net/ethernet/ibm/ibmvnic.h | 6 +- + drivers/net/ethernet/marvell/skge.c | 2 +- + drivers/net/ethernet/netx-eth.c | 497 --------------------- + .../net/ethernet/pensando/ionic/ionic_debugfs.c | 2 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 1 + + drivers/net/ethernet/qlogic/qede/qede_fp.c | 3 +- + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 5 +- + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 14 +- + drivers/net/phy/national.c | 9 +- + drivers/net/ppp/ppp_generic.c | 2 + + drivers/net/usb/cdc_ncm.c | 6 +- + drivers/net/usb/usbnet.c | 8 + + include/linux/platform_data/eth-netx.h | 13 - + include/net/route.h | 3 +- + net/appletalk/ddp.c | 5 + + net/ax25/af_ax25.c | 2 + + net/ieee802154/socket.c | 3 + + net/ipv4/inet_connection_sock.c | 4 +- + net/ipv4/ip_forward.c | 2 +- + net/ipv4/ip_output.c | 2 +- + net/ipv4/route.c | 36 +- + net/ipv4/xfrm4_policy.c | 1 + + net/ipv6/ip6_fib.c | 2 +- + net/ncsi/internal.h | 7 +- + net/ncsi/ncsi-manage.c | 98 +--- + net/nfc/llcp_sock.c | 7 +- + net/qrtr/qrtr.c | 1 + + net/sched/act_api.c | 34 +- + net/sched/act_sample.c | 1 + + net/sched/cls_api.c | 6 +- + net/sched/sch_api.c | 3 +- + net/sched/sch_netem.c | 2 +- + .../selftests/net/fib_nexthop_multiprefix.sh | 6 +- + tools/testing/selftests/net/fib_nexthops.sh | 14 + + tools/testing/selftests/net/fib_tests.sh | 4 +- + 50 files changed, 387 insertions(+), 793 deletions(-) + delete mode 100644 drivers/net/ethernet/netx-eth.c + delete mode 100644 include/linux/platform_data/eth-netx.h +Merging bpf/master (733ef7f056a5e xsk: relax UMEM headroom alignment) +$ git merge bpf/master +Auto-merging net/xdp/xdp_umem.c +Merge made by the 'recursive' strategy. + include/uapi/linux/btf.h | 4 ++-- + kernel/bpf/btf.c | 5 ++--- + net/xdp/xdp_umem.c | 2 -- + tools/lib/bpf/xsk.c | 11 ----------- + 4 files changed, 4 insertions(+), 18 deletions(-) +Merging ipsec/master (00b368502d18f xen-netfront: do not assume sk_buff_head list is empty in error handling) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (9b05b6e11d5e9 netfilter: nf_tables: bogus EBUSY when deleting flowtable after flush) +$ git merge netfilter/master +Auto-merging usr/include/Makefile +Merge made by the 'recursive' strategy. + include/net/netfilter/nf_tables.h | 6 ++++++ + include/uapi/linux/netfilter_bridge/ebtables.h | 6 +++--- + net/netfilter/nf_tables_api.c | 25 ++++++++++++++++++++++--- + net/netfilter/nf_tables_offload.c | 2 +- + net/netfilter/nft_flow_offload.c | 19 +++++++++++++++++++ + net/netfilter/nft_lookup.c | 3 --- + usr/include/Makefile | 1 - + 7 files changed, 51 insertions(+), 11 deletions(-) +Merging ipvs/master (58e8b37069ff2 Merge branch 'net-phy-dp83867-add-some-fixes') +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (2b481835cf4e7 wil6210: use after free in wil_netif_rx_any()) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/wil6210/txrx.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 8 ++-- + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 9 +++- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 11 ++--- + drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 6 +-- + drivers/net/wireless/realtek/rtw88/mac.c | 3 -- + drivers/net/wireless/realtek/rtw88/main.c | 4 ++ + drivers/net/wireless/realtek/rtw88/pci.c | 48 +++++++++++++++++----- + drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 2 +- + 9 files changed, 63 insertions(+), 30 deletions(-) +Merging mac80211/master (f794dc2304d83 sctp: fix the missing put_user when dumping transport thresholds) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (531a64e4c35bb RDMA/siw: Fix IPv6 addr_list locking) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (f41f900568d9f ALSA: usb-audio: Add DSD support for EVGA NU Audio) +$ git merge sound-current/for-linus +Already up to date. +$ git am -3 ../patches/0001-ASoC-Intel-boards-merge-fix-for-INTEL_FAM6_KABYLAKE_.patch +Applying: ASoC: Intel: boards: merge fix for INTEL_FAM6_KABYLAKE_MOBILE -> INTEL_FAM6_KABYLAKE_L change +Using index info to reconstruct a base tree... +M sound/soc/intel/common/soc-intel-quirks.h +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging sound-asoc-fixes/for-linus (c077f737949fe Merge branch 'asoc-5.4' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1644 and retry the command. +Merge made by the 'recursive' strategy. + sound/soc/codecs/wm8994.c | 43 +++++++++++++++++++++++--------------- + sound/soc/samsung/arndale_rt5631.c | 34 ++++++++++++++++++++++++++---- + sound/soc/soc-pcm.c | 4 ++-- + 3 files changed, 58 insertions(+), 23 deletions(-) +Merging regmap-fixes/for-linus (0161b8716465a Merge branch 'regmap-5.3' into regmap-linus) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (f9a60abc26d98 Merge branch 'regulator-5.4' into regulator-linus) +$ git merge regulator-fixes/for-linus +Auto-merging drivers/regulator/of_regulator.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1245 and retry the command. +Merge made by the 'recursive' strategy. + .../bindings/regulator/fixed-regulator.yaml | 4 +- + drivers/regulator/core.c | 13 +++ + drivers/regulator/da9062-regulator.c | 118 ++++++++------------- + drivers/regulator/fixed.c | 5 +- + drivers/regulator/of_regulator.c | 27 +++-- + 5 files changed, 82 insertions(+), 85 deletions(-) +Merging spi-fixes/for-linus (55eaa28551e17 Merge branch 'spi-5.4' into spi-linus) +$ git merge spi-fixes/for-linus +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1674 and retry the command. +Merge made by the 'recursive' strategy. + drivers/spi/spi-mxic.c | 6 +++--- + drivers/spi/spidev.c | 3 +++ + 2 files changed, 6 insertions(+), 3 deletions(-) +Merging pci-current/for-linus (5184d449600f5 Merge tag 'microblaze-v5.4-rc1' of git://git.monstr.eu/linux-2.6-microblaze) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (351c8a09b00b5 Merge branch 'i2c/for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (351c8a09b00b5 Merge branch 'i2c/for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (351c8a09b00b5 Merge branch 'i2c/for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (4a56a478a525d usb: gadget: mass_storage: Fix races between fsg_disable and fsg_set_alt) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (d1abaeb3be7b5 Linux 5.3-rc5) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51d usb: chipidea: udc: workaround for endpoint conflict issue) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Auto-merging drivers/usb/chipidea/udc.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2979 and retry the command. +Merge made by the 'recursive' strategy. +Merging phy/fixes (609488bc979f9 Linux 5.3-rc2) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (351c8a09b00b5 Merge branch 'i2c/for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (38c7a30a9d5ff Documentation/process: Volunteer as the ambassador for Intel) +$ git merge char-misc.current/char-misc-linus +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1251 and retry the command. +Merge made by the 'recursive' strategy. + Documentation/process/embargoed-hardware-issues.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging soundwire-fixes/fixes (d1abaeb3be7b5 Linux 5.3-rc5) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (4d856f72c10ec Linux 5.3) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (0898782247ae5 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (bf6a7a5ad6fa6 crypto: hisilicon - avoid unused function warning) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (baf6722aa0cbc ide: Use dev_get_drvdata where possible) +$ git merge ide/master +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1285 and retry the command. +Merge made by the 'recursive' strategy. + drivers/ide/siimage.c | 3 +-- + drivers/ide/via82cxxx.c | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) +Merging vfio-fixes/for-linus (5715c4dd66a31 vfio/mdev: Synchronize device create/remove with parent removal) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (fbb01c52471c8 selftests/livepatch: push and pop dynamic debug config) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (be71eda5383fa module: Fix display of wrong module .text address) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (cf24aac38698b dmaengine: rcar-dmac: Fix DMACHCLR handling if iommu is mapped) +$ git merge slave-dma-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (e93c9c99a629c Linux 5.1) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (dc9cfd2692225 mtd: hyperbus: fix dependency and build error) +$ git merge mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (4d82fa67dd6b0 mfd: rk808: Make PM function declaration static) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (63ad05e36ec5a media: cec-notifier: clear cec_adap in cec_notifier_unregister) +$ git merge v4l-dvb-fixes/fixes +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1257 and retry the command. +Merge made by the 'recursive' strategy. +Merging reset-fixes/reset/fixes (a71dcd3757e29 reset: remove redundant null check on pointer dev) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (74034a09267c1 MIPS: BCM63XX: Mark expected switch fall-through) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (5f9e832c13707 Linus 5.3-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (1d70ded8567cc ARM: omap2plus_defconfig: Enable more droid4 devices as loadable modules) +$ git merge omap-fixes/fixes +Auto-merging drivers/bus/ti-sysc.c +Auto-merging arch/arm/boot/dts/omap3-gta04.dtsi +Auto-merging arch/arm/boot/dts/dra7-l4.dtsi +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1251 and retry the command. +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am3517-evm.dts | 23 ++--------- + arch/arm/boot/dts/dra7-l4.dtsi | 48 ++++++++++------------ + arch/arm/boot/dts/logicpd-som-lv.dtsi | 26 ++++++------ + arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 37 +++-------------- + arch/arm/boot/dts/omap3-gta04.dtsi | 1 + + arch/arm/configs/omap2plus_defconfig | 4 ++ + arch/arm/mach-omap2/pdata-quirks.c | 4 +- + drivers/bus/ti-sysc.c | 52 +++++++++++++++++------- + drivers/clk/ti/clk-7xx.c | 6 +-- + 9 files changed, 92 insertions(+), 109 deletions(-) +Merging kvm-fixes/master (90a48843a1866 KVM: selftests: fix ucall on x86) +$ git merge kvm-fixes/master +Merge made by the 'recursive' strategy. + Documentation/virt/kvm/api.txt | 13 + + arch/x86/include/asm/hyperv-tlfs.h | 31 ++- + arch/x86/include/asm/kvm_host.h | 48 +++- + arch/x86/include/asm/svm.h | 1 + + arch/x86/include/asm/vmx.h | 2 + + arch/x86/include/uapi/asm/svm.h | 1 + + arch/x86/include/uapi/asm/vmx.h | 6 +- + arch/x86/kernel/cpu/umwait.c | 6 + + arch/x86/kvm/cpuid.c | 8 +- + arch/x86/kvm/hyperv.c | 16 +- + arch/x86/kvm/lapic.c | 28 +-- + arch/x86/kvm/lapic.h | 1 - + arch/x86/kvm/mmu.c | 145 +++++------ + arch/x86/kvm/mmutrace.h | 42 +++- + arch/x86/kvm/svm.c | 79 +++--- + arch/x86/kvm/vmx/capabilities.h | 6 + + arch/x86/kvm/vmx/evmcs.h | 2 + + arch/x86/kvm/vmx/nested.c | 76 +++++- + arch/x86/kvm/vmx/vmx.c | 268 +++++++++++++-------- + arch/x86/kvm/vmx/vmx.h | 9 + + arch/x86/kvm/x86.c | 194 ++++++++++----- + arch/x86/kvm/x86.h | 2 +- + include/linux/cpu.h | 2 + + include/uapi/linux/kvm.h | 1 + + kernel/cpu.c | 11 +- + kernel/locking/qspinlock_paravirt.h | 2 +- + tools/testing/selftests/kvm/dirty_log_test.c | 79 ++---- + tools/testing/selftests/kvm/include/kvm_util.h | 18 +- + .../selftests/kvm/include/x86_64/processor.h | 3 + + .../testing/selftests/kvm/lib/aarch64/processor.c | 3 + + tools/testing/selftests/kvm/lib/kvm_util.c | 67 ++++-- + tools/testing/selftests/kvm/lib/x86_64/processor.c | 30 ++- + tools/testing/selftests/kvm/lib/x86_64/ucall.c | 2 +- + tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c | 27 +++ + 34 files changed, 815 insertions(+), 414 deletions(-) +Merging kvms390-fixes/master (53936b5bf35e1 KVM: s390: Do not leak kernel stack data in the KVM_S390_INTERRUPT ioctl) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (98d1a3c245e4b hwmon: (nct7904) Fix the incorrect value of vsen_mask in nct7904_data struct) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/nct7904.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (4c806b897d607 libnvdimm/region: Enable MAP_SYNC for volatile regions) +$ git merge nvdimm-fixes/libnvdimm-fixes +Auto-merging include/linux/memremap.h +Auto-merging include/linux/huge_mm.h +Auto-merging drivers/nvdimm/pfn_devs.c +Auto-merging arch/powerpc/mm/book3s64/radix_pgtable.c +Auto-merging arch/powerpc/include/asm/book3s/64/radix.h +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1253 and retry the command. +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/book3s/64/radix.h | 8 +++- + arch/powerpc/mm/book3s64/hash_pgtable.c | 2 + + arch/powerpc/mm/book3s64/radix_pgtable.c | 7 --- + arch/powerpc/mm/init_64.c | 17 ++++++- + drivers/nvdimm/btt.c | 8 ++-- + drivers/nvdimm/bus.c | 2 +- + drivers/nvdimm/namespace_devs.c | 7 +-- + drivers/nvdimm/nd.h | 6 +-- + drivers/nvdimm/pfn_devs.c | 77 ++++++++++++++++++++++-------- + drivers/nvdimm/region.c | 4 +- + drivers/nvdimm/region_devs.c | 7 ++- + drivers/nvdimm/security.c | 4 ++ + include/linux/huge_mm.h | 7 ++- + include/linux/memremap.h | 1 + + tools/testing/nvdimm/test/nfit_test.h | 4 +- + 15 files changed, 110 insertions(+), 51 deletions(-) +Merging btrfs-fixes/next-fixes (a529cd1cfcbc6 Merge branch 'misc-5.4' into next-fixes) +$ git merge btrfs-fixes/next-fixes +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1248 and retry the command. +Merge made by the 'recursive' strategy. + fs/btrfs/extent_io.c | 13 +++++++++++++ + fs/btrfs/qgroup.c | 33 +++++++++++++++++++-------------- + fs/btrfs/tests/btrfs-tests.c | 8 +++++++- + 3 files changed, 39 insertions(+), 15 deletions(-) +Merging vfs-fixes/fixes (d4f4de5e5ef8e Fix the locking in dcache_readdir() and friends) +$ git merge vfs-fixes/fixes +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1251 and retry the command. +Merge made by the 'recursive' strategy. + fs/libfs.c | 134 +++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 69 insertions(+), 65 deletions(-) +Merging erofs-fixes/fixes (89b038ccec69c erofs: fix mis-inplace determination related with noio chain) +$ git merge erofs-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 +++ + fs/erofs/data.c | 10 +++++++--- + fs/erofs/super.c | 4 ++-- + fs/erofs/zdata.c | 12 ++++++++++-- + 4 files changed, 22 insertions(+), 7 deletions(-) +Merging dma-mapping-fixes/for-linus (33dcb37cef741 dma-mapping: fix page attributes for dma_mmap_*) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/master (6fbc7275c7a9b Linux 5.2-rc7) +$ git merge i3c-fixes/master +Already up to date. +Merging drivers-x86-fixes/fixes (4d856f72c10ec Linux 5.3) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (5f9e832c13707 Linus 5.3-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (5f9e832c13707 Linus 5.3-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (83f82d7a42583 of: irq: fix a trivial typo in a doc comment) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (0aabb6b699f72 scsi: qla2xxx: Fix Nport ID display value) +$ git merge scsi-fixes/fixes +Auto-merging drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/qla2xxx/qla_init.c +Auto-merging drivers/scsi/qla2xxx/qla_attr.c +Auto-merging drivers/scsi/qedf/qedf_main.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1285 and retry the command. +Merge made by the 'recursive' strategy. + drivers/scsi/bnx2fc/bnx2fc_io.c | 29 +++++++-- + drivers/scsi/hisi_sas/hisi_sas_main.c | 6 +- + drivers/scsi/megaraid.c | 4 +- + drivers/scsi/qedf/qedf_main.c | 2 +- + drivers/scsi/qla2xxx/qla_attr.c | 2 + + drivers/scsi/qla2xxx/qla_def.h | 4 +- + drivers/scsi/qla2xxx/qla_gs.c | 3 +- + drivers/scsi/qla2xxx/qla_init.c | 109 ++++++++++++++++++++++++---------- + drivers/scsi/qla2xxx/qla_iocb.c | 7 ++- + drivers/scsi/qla2xxx/qla_mbx.c | 25 +++++++- + drivers/scsi/qla2xxx/qla_mid.c | 32 ++++++---- + drivers/scsi/qla2xxx/qla_os.c | 18 ++++-- + drivers/scsi/qla2xxx/qla_target.c | 26 ++++---- + drivers/scsi/storvsc_drv.c | 3 +- + drivers/scsi/ufs/ufshcd.c | 3 + + 15 files changed, 193 insertions(+), 80 deletions(-) +Merging drm-fixes/drm-fixes (e6bb711600db2 Merge tag 'drm-misc-fixes-2019-09-12' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (e16a7cbced711 drm/amdgpu: flag navi12 and 14 as experimental for 5.4) +$ git merge amdgpu-fixes/drm-fixes +Auto-merging drivers/gpu/drm/radeon/radeon_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 7 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 - + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 10 ++-- + drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 10 +++- + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 6 +- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 10 ++-- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 + + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 4 ++ + .../amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c | 25 ++++++-- + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 4 +- + .../drm/amd/display/dc/dce112/dce112_resource.c | 16 +++-- + .../drm/amd/display/dc/dce120/dce120_resource.c | 11 +++- + .../amd/display/dc/gpio/dcn21/hw_factory_dcn21.c | 38 +++++++++++- + .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.c | 3 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 2 + + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 7 ++- + drivers/gpu/drm/amd/include/renoir_ip_offset.h | 2 +- + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 7 ++- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 3 + + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 70 ++++++++++++++++++++++ + drivers/gpu/drm/amd/powerplay/renoir_ppt.h | 25 ++++++++ + drivers/gpu/drm/radeon/radeon_drv.c | 31 ++++++++++ + drivers/gpu/drm/radeon/radeon_kms.c | 25 -------- + 26 files changed, 262 insertions(+), 67 deletions(-) +Merging drm-intel-fixes/for-linux-next-fixes (4d856f72c10ec Linux 5.3) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (f2be48b43e34a mmc: tegra: Implement ->set_dma_mask()) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/sdhci-of-esdhc.c | 7 +++++- + drivers/mmc/host/sdhci-tegra.c | 48 +++++++++++++++++++++++---------------- + drivers/mmc/host/sdhci.c | 27 +++++++++++----------- + drivers/mmc/host/sdhci.h | 1 + + 4 files changed, 49 insertions(+), 34 deletions(-) +Merging rtc-fixes/rtc-fixes (5f9e832c13707 Linus 5.3-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (f2c7c76c5d0a4 Linux 5.2-rc3) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (e395071a12f9d HID: hyperv: Use in-place iterator API in the channel callback) +$ git merge hyperv-fixes/hyperv-fixes +Auto-merging drivers/hid/hid-hyperv.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1251 and retry the command. +Merge made by the 'recursive' strategy. + drivers/hid/hid-hyperv.c | 56 +++++++++--------------------------------------- + 1 file changed, 10 insertions(+), 46 deletions(-) +Merging soc-fsl-fixes/fix (5674a92ca4b7e soc/fsl/qe: Fix an error code in qe_pin_request()) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (c82dd6d078a2b riscv: Avoid interrupts being erroneously enabled in handle_exception()) +$ git merge risc-v-fixes/fixes +Auto-merging include/uapi/linux/kvm.h +Auto-merging arch/riscv/include/asm/pgtable.h +CONFLICT (content): Merge conflict in arch/riscv/include/asm/pgtable.h +Recorded preimage for 'arch/riscv/include/asm/pgtable.h' +Automatic merge failed; fix conflicts and then commit the result. +Merging kbuild-current/fixes (f97c81dc6ca59 Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc) +$ git merge kbuild-current/fixes +error: Merging is not possible because you have unmerged files. +hint: Fix them up in the work tree, and then use 'git add/rm <file>' +hint: as appropriate to mark resolution and make a commit. +fatal: Exiting because of an unresolved conflict. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/riscv/include/asm/pgtable.h'. +[master beccfd671d1b4] Merge remote-tracking branch 'risc-v-fixes/fixes' +$ git diff -M --stat --summary HEAD^.. + arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 22 +++++++++++++++++--- + .../riscv/boot/dts/sifive/hifive-unleashed-a00.dts | 8 ++++++++ + arch/riscv/configs/defconfig | 11 ++++++++++ + arch/riscv/configs/rv32_defconfig | 11 ++++++++++ + arch/riscv/include/asm/pgtable.h | 24 +++++++++++----------- + arch/riscv/kernel/entry.S | 6 +++++- + arch/riscv/kernel/head.S | 8 +++++--- + arch/riscv/kernel/smp.c | 1 + + arch/riscv/kernel/time.c | 1 + + include/uapi/linux/kvm.h | 1 + + 10 files changed, 74 insertions(+), 19 deletions(-) +Merging arc-current/for-curr (089cf7f6ecb26 Linux 5.3-rc7) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (5b3efa4f1479c ARM: 8901/1: add a criteria for pfn_valid of arm) +$ git merge arm-current/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (b74d957f6317e ARM: aspeed: ast2500 is ARMv6K) +$ git merge arm-soc-fixes/arm/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (799c851052335 arm64: Fix reference to docs for ARM64_TAGGED_ADDR_ABI) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging m68k-current/for-linus (0f1979b402df5 m68k: Remove ioremap_fullcache()) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (faa6d21153fd1 powerpc/nvdimm: use H_SCM_QUERY hcall on H_OVERLAP error) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (d45331b00ddb1 Linux 5.3-rc4) +$ git merge s390-fixes/fixes +Already up to date. +Merging sparc/master (038029c03e21b sparc: remove unneeded uapi/asm/statfs.h) +$ git merge sparc/master +Already up to date. +Merging fscrypt-current/for-stable (ae64f9bd1d362 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (9f5c44cf61a7c gianfar: Make reset_gfar static) +$ git merge net/master +Already up to date. +Merging bpf/master (733ef7f056a5e xsk: relax UMEM headroom alignment) +$ git merge bpf/master +Already up to date. +Merging ipsec/master (00b368502d18f xen-netfront: do not assume sk_buff_head list is empty in error handling) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (9b05b6e11d5e9 netfilter: nf_tables: bogus EBUSY when deleting flowtable after flush) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (58e8b37069ff2 Merge branch 'net-phy-dp83867-add-some-fixes') +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (2b481835cf4e7 wil6210: use after free in wil_netif_rx_any()) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (f794dc2304d83 sctp: fix the missing put_user when dumping transport thresholds) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (531a64e4c35bb RDMA/siw: Fix IPv6 addr_list locking) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (f41f900568d9f ALSA: usb-audio: Add DSD support for EVGA NU Audio) +$ git merge sound-current/for-linus +Already up to date. +$ git am -3 ../patches/0001-ASoC-Intel-boards-merge-fix-for-INTEL_FAM6_KABYLAKE_.patch +Applying: ASoC: Intel: boards: merge fix for INTEL_FAM6_KABYLAKE_MOBILE -> INTEL_FAM6_KABYLAKE_L change +Using index info to reconstruct a base tree... +M sound/soc/intel/common/soc-intel-quirks.h +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging sound-asoc-fixes/for-linus (c077f737949fe Merge branch 'asoc-5.4' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Already up to date. +Merging regmap-fixes/for-linus (0161b8716465a Merge branch 'regmap-5.3' into regmap-linus) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (f9a60abc26d98 Merge branch 'regulator-5.4' into regulator-linus) +$ git merge regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (55eaa28551e17 Merge branch 'spi-5.4' into spi-linus) +$ git merge spi-fixes/for-linus +Already up to date. +Merging pci-current/for-linus (5184d449600f5 Merge tag 'microblaze-v5.4-rc1' of git://git.monstr.eu/linux-2.6-microblaze) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (351c8a09b00b5 Merge branch 'i2c/for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (351c8a09b00b5 Merge branch 'i2c/for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (351c8a09b00b5 Merge branch 'i2c/for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (4a56a478a525d usb: gadget: mass_storage: Fix races between fsg_disable and fsg_set_alt) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (d1abaeb3be7b5 Linux 5.3-rc5) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51d usb: chipidea: udc: workaround for endpoint conflict issue) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up to date. +Merging phy/fixes (609488bc979f9 Linux 5.3-rc2) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (351c8a09b00b5 Merge branch 'i2c/for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (38c7a30a9d5ff Documentation/process: Volunteer as the ambassador for Intel) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (d1abaeb3be7b5 Linux 5.3-rc5) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (4d856f72c10ec Linux 5.3) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (0898782247ae5 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (bf6a7a5ad6fa6 crypto: hisilicon - avoid unused function warning) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (baf6722aa0cbc ide: Use dev_get_drvdata where possible) +$ git merge ide/master +Already up to date. +Merging vfio-fixes/for-linus (5715c4dd66a31 vfio/mdev: Synchronize device create/remove with parent removal) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (fbb01c52471c8 selftests/livepatch: push and pop dynamic debug config) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (be71eda5383fa module: Fix display of wrong module .text address) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (cf24aac38698b dmaengine: rcar-dmac: Fix DMACHCLR handling if iommu is mapped) +$ git merge slave-dma-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (e93c9c99a629c Linux 5.1) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (dc9cfd2692225 mtd: hyperbus: fix dependency and build error) +$ git merge mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (4d82fa67dd6b0 mfd: rk808: Make PM function declaration static) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (63ad05e36ec5a media: cec-notifier: clear cec_adap in cec_notifier_unregister) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (a71dcd3757e29 reset: remove redundant null check on pointer dev) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (74034a09267c1 MIPS: BCM63XX: Mark expected switch fall-through) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (5f9e832c13707 Linus 5.3-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (1d70ded8567cc ARM: omap2plus_defconfig: Enable more droid4 devices as loadable modules) +$ git merge omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (90a48843a1866 KVM: selftests: fix ucall on x86) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (53936b5bf35e1 KVM: s390: Do not leak kernel stack data in the KVM_S390_INTERRUPT ioctl) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (98d1a3c245e4b hwmon: (nct7904) Fix the incorrect value of vsen_mask in nct7904_data struct) +$ git merge hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (4c806b897d607 libnvdimm/region: Enable MAP_SYNC for volatile regions) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (a529cd1cfcbc6 Merge branch 'misc-5.4' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date. +Merging vfs-fixes/fixes (d4f4de5e5ef8e Fix the locking in dcache_readdir() and friends) +$ git merge vfs-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (89b038ccec69c erofs: fix mis-inplace determination related with noio chain) +$ git merge erofs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (33dcb37cef741 dma-mapping: fix page attributes for dma_mmap_*) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/master (6fbc7275c7a9b Linux 5.2-rc7) +$ git merge i3c-fixes/master +Already up to date. +Merging drivers-x86-fixes/fixes (4d856f72c10ec Linux 5.3) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (5f9e832c13707 Linus 5.3-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (5f9e832c13707 Linus 5.3-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (83f82d7a42583 of: irq: fix a trivial typo in a doc comment) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (0aabb6b699f72 scsi: qla2xxx: Fix Nport ID display value) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (e6bb711600db2 Merge tag 'drm-misc-fixes-2019-09-12' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (e16a7cbced711 drm/amdgpu: flag navi12 and 14 as experimental for 5.4) +$ git merge amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (4d856f72c10ec Linux 5.3) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (f2be48b43e34a mmc: tegra: Implement ->set_dma_mask()) +$ git merge mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (5f9e832c13707 Linus 5.3-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (f2c7c76c5d0a4 Linux 5.2-rc3) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (e395071a12f9d HID: hyperv: Use in-place iterator API in the channel callback) +$ git merge hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (5674a92ca4b7e soc/fsl/qe: Fix an error code in qe_pin_request()) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (c82dd6d078a2b riscv: Avoid interrupts being erroneously enabled in handle_exception()) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (28f59b04707df sched: Add __ASSEMBLY__ guards around struct clone_args) +$ git merge pidfd-fixes/fixes +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1251 and retry the command. +Merge made by the 'recursive' strategy. + include/uapi/linux/sched.h | 2 ++ + 1 file changed, 2 insertions(+) +Merging fpga-fixes/fixes (dec43da46f63e fpga: altera-ps-spi: Fix getting of optional confd gpio) +$ git merge fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (619e17cf75dd5 Merge tag 'for-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-intel-fixes/fixes (5f9e832c13707 Linus 5.3-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (4d856f72c10ec Linux 5.3) +$ git merge pinctrl-intel-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (b1066a1235380 drm: Clear the fence pointer when writeback job signaled) +$ git merge drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/vc4/vc4_txp.c +Auto-merging drivers/gpu/drm/arm/malidp_mw.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1253 and retry the command. +Merge made by the 'recursive' strategy. + .../drm/arm/display/komeda/komeda_wb_connector.c | 3 +-- + drivers/gpu/drm/arm/malidp_mw.c | 4 ++-- + drivers/gpu/drm/drm_atomic.c | 13 ++++++++---- + drivers/gpu/drm/drm_writeback.c | 23 ++++++++++++++-------- + drivers/gpu/drm/rcar-du/rcar_du_writeback.c | 4 ++-- + drivers/gpu/drm/vc4/vc4_txp.c | 5 ++--- + 6 files changed, 31 insertions(+), 21 deletions(-) +Merging kspp-gustavo/for-next/kspp (609488bc979f9 Linux 5.3-rc2) +$ git merge kspp-gustavo/for-next/kspp +Already up to date. +Merging kbuild/for-next (337bf824b735c Corrected formatting of header in kbuild module docs) +$ git merge kbuild/for-next +Removing arch/ia64/include/uapi/asm/ioctls.h +Removing arch/ia64/include/uapi/asm/ioctl.h +Removing arch/ia64/include/uapi/asm/errno.h +Removing arch/hexagon/include/uapi/asm/bitsperlong.h +Merge made by the 'recursive' strategy. + Documentation/kbuild/makefiles.rst | 5 ---- + Documentation/kbuild/modules.rst | 3 ++- + Makefile | 24 ++----------------- + arch/hexagon/include/uapi/asm/bitsperlong.h | 27 ---------------------- + arch/ia64/include/uapi/asm/errno.h | 2 -- + arch/ia64/include/uapi/asm/ioctl.h | 2 -- + arch/ia64/include/uapi/asm/ioctls.h | 7 ------ + arch/powerpc/boot/Makefile | 2 +- + drivers/video/logo/.gitignore | 1 + + drivers/video/logo/Makefile | 36 ++++++----------------------- + {scripts => drivers/video/logo}/pnmtologo.c | 0 + scripts/.gitignore | 1 - + scripts/Kbuild.include | 5 ---- + scripts/Makefile | 2 -- + scripts/Makefile.build | 2 +- + scripts/Makefile.lib | 2 +- + scripts/kconfig/Makefile | 2 +- + scripts/kconfig/parser.y | 1 - + security/integrity/Makefile | 3 --- + 19 files changed, 16 insertions(+), 111 deletions(-) + delete mode 100644 arch/hexagon/include/uapi/asm/bitsperlong.h + delete mode 100644 arch/ia64/include/uapi/asm/errno.h + delete mode 100644 arch/ia64/include/uapi/asm/ioctl.h + delete mode 100644 arch/ia64/include/uapi/asm/ioctls.h + rename {scripts => drivers/video/logo}/pnmtologo.c (100%) +Merging compiler-attributes/compiler-attributes (32ee8230b2b06 x86: bug.h: use asm_inline in _BUG_FLAGS definitions) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging leaks/leaks-next (9e98c678c2d6a Linux 5.1-rc1) +$ git merge leaks/leaks-next +Already up to date. +Merging dma-mapping/for-next (c7d9eccb3c1e8 mmc: renesas_sdhi_internal_dmac: Add MMC_CAP2_MERGE_CAPABLE) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (9b87647c665db asm-generic: add unlikely to default BUG_ON(x)) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (6fbc7275c7a9b Linux 5.2-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (3a6d5fc437605 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (e376897f424a1 arm64: remove __iounmap) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (3724e186fead3 docs/perf: Add documentation for the i.MX8 DDR PMU) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (cc01ccf8045fa arm-soc: document merges) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 255 +++++++++++++++++++++++++++++++++ + 1 file changed, 255 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging actions/for-next (fb9c1c1deb5ec Merge branch 'v4.20/drivers+s900-sps' into next) +$ git merge actions/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (83405c3ff5e14 Merge branch 'v5.4/dt64' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging aspeed/for-next (ba0fdbb07d051 Merge branch 'dt-for-v5.4' into for-next) +$ git merge aspeed/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (1069a5a3f3d88 Merge branches 'at91-soc' and 'at91-dt' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (c165c01bb6f78 Merge branch 'bcm2835-dt-next' into for-next) +$ git merge bcm2835/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (d26d83e3e1fc7 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 (78145dbeaea10 Merge branch 'for_5.3/driver-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (4ae1ce88e9a01 Merge branch 'v5.3-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (153e97d3bdf35 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 (75e66cd99933c Merge branch 'fixes' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/mach-omap2/Makefile +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/Makefile +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1250 and retry the command. +Resolved 'arch/arm/mach-omap2/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 45d5e65bb9fae] Merge remote-tracking branch 'omap/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-omap2/Makefile | 1 - + 1 file changed, 1 deletion(-) +Merging qcom/for-next (63e5846442478 Merge tag 'qcom-arm64-defconfig-for-5.4' into all-for-5.4) +$ git merge qcom/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging renesas/next (ae688e1720fd3 arm64: dts: renesas: hihope-common: Fix eMMC status) +$ git merge renesas/next +Already up to date. +Merging renesas-geert/next (e180e8bda8292 Merge remote-tracking branch 'origin/fixes-for-v5.3' into renesas-next) +$ git merge renesas-geert/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging reset/reset/next (2d94bccca49ff reset: uniphier-glue: Add Pro5 USB3 support) +$ git merge reset/reset/next +Removing Documentation/devicetree/bindings/reset/qcom,pdc-global.txt +Removing Documentation/devicetree/bindings/reset/qcom,aoss-reset.txt +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1285 and retry the command. +Merge made by the 'recursive' strategy. + .../bindings/reset/amlogic,meson-axg-audio-arb.txt | 3 +- + .../devicetree/bindings/reset/qcom,aoss-reset.txt | 52 ---------------------- + .../devicetree/bindings/reset/qcom,aoss-reset.yaml | 47 +++++++++++++++++++ + .../devicetree/bindings/reset/qcom,pdc-global.txt | 52 ---------------------- + .../devicetree/bindings/reset/qcom,pdc-global.yaml | 47 +++++++++++++++++++ + .../devicetree/bindings/reset/uniphier-reset.txt | 5 ++- + drivers/reset/core.c | 2 - + drivers/reset/reset-meson-audio-arb.c | 43 ++++++++++++++++-- + drivers/reset/reset-uniphier-glue.c | 4 ++ + .../reset/amlogic,meson-axg-audio-arb.h | 2 + + 10 files changed, 145 insertions(+), 112 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/reset/qcom,aoss-reset.txt + create mode 100644 Documentation/devicetree/bindings/reset/qcom,aoss-reset.yaml + delete mode 100644 Documentation/devicetree/bindings/reset/qcom,pdc-global.txt + create mode 100644 Documentation/devicetree/bindings/reset/qcom,pdc-global.yaml +Merging rockchip/for-next (155cb7cd4cd41 Merge branch 'v5.4-clk/next' into for-next) +$ git merge rockchip/for-next +Auto-merging Documentation/devicetree/bindings/arm/rockchip.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/rockchip.yaml +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1280 and retry the command. +Resolved 'Documentation/devicetree/bindings/arm/rockchip.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f4b501f584c84] Merge remote-tracking branch 'rockchip/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging samsung-krzk/for-next (2f776c5a7270d Merge branch 'next/defconfig' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm64/Kconfig.platforms +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1286 and retry the command. +Merge made by the 'recursive' strategy. + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 2 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 102 ++++++++++----------- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 2 +- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 23 +++-- + 4 files changed, 64 insertions(+), 65 deletions(-) +Merging scmi/for-linux-next (a561f1ecaee0b Merge tag 'scmi-fixes-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge scmi/for-linux-next +Merge made by the 'recursive' strategy. + drivers/firmware/arm_scmi/reset.c | 2 +- + drivers/reset/reset-scmi.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging sunxi/sunxi/for-next (15ea63583bfb8 Merge branch 'sunxi/dt-for-5.4' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (6290ae1fb7e26 Merge branch for-5.4/firmware into for-next) +$ git merge tegra/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1288 and retry the command. +Merge made by the 'recursive' strategy. + drivers/firmware/tegra/bpmp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging clk/clk-next (ebd47c8434064 Merge branches 'clk-bulk-fix', 'clk-at91' and 'clk-sprd' into clk-next) +$ git merge clk/clk-next +Already up to date. +Merging clk-samsung/for-next (a188339ca5a39 Linux 5.2-rc1) +$ git merge clk-samsung/for-next +Already up to date. +Merging c6x/for-linux-next (8adcc59974b8a Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge c6x/for-linux-next +Already up to date. +Merging csky/linux-next (4ad35c1f56386 csky: Fixup 610 vipt cache flush mechanism) +$ git merge csky/linux-next +Auto-merging arch/csky/mm/dma-mapping.c +CONFLICT (content): Merge conflict in arch/csky/mm/dma-mapping.c +Auto-merging arch/csky/include/asm/pgtable.h +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1260 and retry the command. +Resolved 'arch/csky/mm/dma-mapping.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e768596c11777] Merge remote-tracking branch 'csky/linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/csky/abiv1/alignment.c | 62 +++++++++++++++++++++-------- + arch/csky/abiv1/cacheflush.c | 70 ++++++++++++++++++++++----------- + arch/csky/abiv1/inc/abi/cacheflush.h | 45 ++++++++++++++------- + arch/csky/abiv1/inc/abi/page.h | 5 ++- + arch/csky/abiv1/mmap.c | 75 ++++++++++++++++++----------------- + arch/csky/include/asm/barrier.h | 15 ++++--- + arch/csky/include/asm/cache.h | 1 + + arch/csky/include/asm/io.h | 23 +++++------ + arch/csky/include/asm/pgtable.h | 10 +++++ + arch/csky/mm/cachev1.c | 7 +++- + arch/csky/mm/cachev2.c | 11 +++++- + arch/csky/mm/dma-mapping.c | 76 +++++++++++++----------------------- + arch/csky/mm/ioremap.c | 27 ++++++++----- + 13 files changed, 258 insertions(+), 169 deletions(-) +Merging h8300/h8300-next (a5de8865cb3ed h8300: move definition of __kernel_size_t etc. to posix_types.h) +$ git merge h8300/h8300-next +Removing arch/h8300/include/uapi/asm/bitsperlong.h +Auto-merging arch/h8300/Kconfig +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2982 and retry the command. +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig | 3 +++ + arch/h8300/include/uapi/asm/bitsperlong.h | 15 --------------- + arch/h8300/include/uapi/asm/posix_types.h | 13 +++++++++++++ + arch/h8300/lib/memset.S | 17 ++++++++++------- + 4 files changed, 26 insertions(+), 22 deletions(-) + delete mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h + create mode 100644 arch/h8300/include/uapi/asm/posix_types.h +Merging ia64/next (0d3d343560bad genirq: remove the is_affinity_mask_valid hook) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (0f1979b402df5 m68k: Remove ioremap_fullcache()) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (372ea263b3d9c m68k: coldfire: Include the GPIO driver header) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (7cca9b8b7c5bc microblaze: Switch to standard restart handler) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (05d013a0366d5 MIPS: Detect bad _PFN_SHIFT values) +$ git merge mips/mips-next +Already up to date. +Merging nds32/next (9322961205431 nds32: add new emulations for floating point instruction) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (91d99a724e9c6 nios2: force the string buffer NULL-terminated) +$ git merge nios2/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1255 and retry the command. +Merge made by the 'recursive' strategy. + arch/nios2/kernel/setup.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging openrisc/for-next (f3b17320db25b openrisc: map as uncached in ioremap) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (13859539bc0ec MAINTAINERS: Add hp_sdc drivers to parisc arch) +$ git merge parisc-hd/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 +++ + drivers/parisc/sba_iommu.c | 8 -------- + 2 files changed, 3 insertions(+), 8 deletions(-) +Merging powerpc/next (45824fc0da6e4 Merge tag 'powerpc-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge powerpc/next +Already up to date. +$ git am -3 ../patches/0001-merge-fixes-for-dma-mapping-make-dma_atomic_pool_ini.patch +Applying: merge fixes for "dma-mapping: make dma_atomic_pool_init self-contained" +Using index info to reconstruct a base tree... +M arch/microblaze/mm/consistent.c +M arch/powerpc/mm/dma-noncoherent.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging fsl/next (63d86876f3244 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask") +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (eadf0b17b43db bus: fsl-mc: remove explicit device_link_del) +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (9ce06497c2722 irqchip/sifive-plic: set max threshold for ignored handlers) +$ git merge risc-v/for-next +Already up to date. +Merging sifive/for-next (467e050e9760f Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge sifive/for-next +Already up to date. +Merging s390/features (ab5758848039d s390/cio: exclude subchannels with no parent from pseudo check) +$ git merge s390/features +Auto-merging drivers/s390/cio/ccwgroup.c +Merge made by the 'recursive' strategy. + arch/s390/include/asm/cpu_mf.h | 10 +-- + arch/s390/include/asm/perf_event.h | 2 + + arch/s390/include/uapi/asm/zcrypt.h | 4 +- + arch/s390/kernel/perf_cpum_sf.c | 165 +++++++++++++++++++++++++++--------- + arch/s390/kernel/topology.c | 3 +- + drivers/s390/cio/ccwgroup.c | 2 +- + drivers/s390/cio/css.c | 2 + + drivers/s390/cio/device_ops.c | 23 +++-- + drivers/s390/crypto/ap_bus.c | 12 +-- + drivers/s390/crypto/ap_bus.h | 3 +- + drivers/s390/crypto/pkey_api.c | 113 ++++++++++++++++++++++++ + drivers/s390/crypto/vfio_ap_drv.c | 2 + + drivers/s390/crypto/zcrypt_api.h | 3 +- + drivers/s390/crypto/zcrypt_cex4.c | 72 +++++++++++----- + 14 files changed, 334 insertions(+), 82 deletions(-) +Merging sh/sh-next (baf58858e8b6d sh: prefer __section from compiler_attributes.h) +$ git merge sh/sh-next +Auto-merging arch/sh/kernel/hw_breakpoint.c +CONFLICT (modify/delete): arch/sh/include/uapi/asm/types.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/types.h left in tree. +CONFLICT (modify/delete): arch/sh/include/uapi/asm/setup.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/setup.h left in tree. +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2983 and retry the command. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/sh/include/uapi/asm/setup.h arch/sh/include/uapi/asm/types.h +arch/sh/include/uapi/asm/setup.h: needs merge +arch/sh/include/uapi/asm/types.h: needs merge +rm 'arch/sh/include/uapi/asm/setup.h' +rm 'arch/sh/include/uapi/asm/types.h' +$ git commit --no-edit -v -a +[master 68bc7d0c14609] Merge remote-tracking branch 'sh/sh-next' +$ git diff -M --stat --summary HEAD^.. + arch/sh/include/asm/bitops-op32.h | 8 +++----- + arch/sh/include/asm/cache.h | 2 +- + arch/sh/include/uapi/asm/setup.h | 2 -- + arch/sh/include/uapi/asm/types.h | 2 -- + arch/sh/kernel/Makefile | 2 -- + 5 files changed, 4 insertions(+), 12 deletions(-) + delete mode 100644 arch/sh/include/uapi/asm/setup.h + delete mode 100644 arch/sh/include/uapi/asm/types.h +Merging sparc-next/master (b71acb0e37216 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge sparc-next/master +Already up to date. +Merging uml/linux-next (73625ed66389d um: irq: Fix LAST_IRQ usage in init_IRQ()) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (9c2ec7545cbd2 Merge branch 'xtensa-call0' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Auto-merging arch/xtensa/Kconfig +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1256 and retry the command. +Merge made by the 'recursive' strategy. +Merging fscrypt/master (0642ea2409f3b ext4 crypto: fix to check feature status before get policy) +$ git merge fscrypt/master +Already up to date. +Merging afs/afs-next (a0753c29004f4 afs: Support RCU pathwalk) +$ git merge afs/afs-next +Already up to date. +Merging btrfs/next (29dcea88779c8 Linux 4.17) +$ git merge btrfs/next +Already up to date. +Merging btrfs-kdave/for-next (feee7d2306b24 Merge branch 'misc-5.4' into for-next-20190924) +$ git merge btrfs-kdave/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ceph/master (3ee5a7015c8b7 ceph: call ceph_mdsc_destroy from destroy_fs_client) +$ git merge ceph/master +Auto-merging fs/ceph/super.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1255 and retry the command. +Merge made by the 'recursive' strategy. + Documentation/filesystems/ceph.txt | 14 +++ + drivers/block/rbd.c | 18 ++-- + fs/ceph/Makefile | 2 +- + fs/ceph/addr.c | 61 +++++++------ + fs/ceph/cache.c | 2 + + fs/ceph/caps.c | 173 +++++++++++++++++++------------------ + fs/ceph/debugfs.c | 1 - + fs/ceph/export.c | 60 ++++++------- + fs/ceph/file.c | 104 +++++++++++++--------- + fs/ceph/inode.c | 50 ++++++----- + fs/ceph/io.c | 163 ++++++++++++++++++++++++++++++++++ + fs/ceph/io.h | 12 +++ + fs/ceph/locks.c | 8 +- + fs/ceph/mds_client.c | 110 +++++++++++++++++------ + fs/ceph/mds_client.h | 8 +- + fs/ceph/super.c | 52 +++++++++-- + fs/ceph/super.h | 49 +++++++---- + fs/ceph/xattr.c | 76 ++-------------- + include/linux/ceph/libceph.h | 1 + + include/linux/ceph/messenger.h | 1 + + include/linux/ceph/mon_client.h | 1 + + include/linux/ceph/osd_client.h | 2 + + net/ceph/ceph_common.c | 37 ++++++-- + net/ceph/messenger.c | 6 ++ + net/ceph/mon_client.c | 7 ++ + net/ceph/osd_client.c | 65 +++++++++++--- + net/ceph/osdmap.c | 69 +++++++++------ + 27 files changed, 767 insertions(+), 385 deletions(-) + create mode 100644 fs/ceph/io.c + create mode 100644 fs/ceph/io.h +Merging cifs/for-next (fe64cdfd40e38 smb3: pass mode bits into create calls) +$ git merge cifs/for-next +Auto-merging fs/cifs/cifsfs.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1255 and retry the command. +Merge made by the 'recursive' strategy. + fs/cifs/cifs_ioctl.h | 9 +++++++++ + fs/cifs/cifsfs.c | 4 ++++ + fs/cifs/cifsglob.h | 24 +++++++++++++++++++++--- + fs/cifs/cifsproto.h | 4 +++- + fs/cifs/cifssmb.c | 3 ++- + fs/cifs/connect.c | 39 +++++++++++++++++++++++++++++++++++++-- + fs/cifs/inode.c | 3 ++- + fs/cifs/ioctl.c | 29 +++++++++++++++++++++++++++++ + fs/cifs/sess.c | 3 +-- + fs/cifs/smb2inode.c | 34 +++++++++++++++++++--------------- + fs/cifs/smb2ops.c | 16 ++++++++++++++++ + fs/cifs/smb2pdu.c | 23 ++++++++++++++++++++++- + fs/cifs/smb2proto.h | 6 ++++-- + fs/cifs/smb2transport.c | 24 ++++++++++++------------ + fs/cifs/smbfsctl.h | 11 +++++++++++ + fs/cifs/transport.c | 4 ++-- + fs/cifs/xattr.c | 2 +- + 17 files changed, 195 insertions(+), 43 deletions(-) +Merging configfs/for-next (e9c03af21cc7e configfs: calculate the symlink target only once) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (b4a81b87a4cfe ecryptfs: fix a memory leak bug in ecryptfs_init_messaging()) +$ git merge ecryptfs/next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1258 and retry the command. +Merge made by the 'recursive' strategy. + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/messaging.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging ext3/for_next (0f7dbaee76f40 Merge quota initialization check fix from Chao Yu.) +$ git merge ext3/for_next +Auto-merging fs/notify/fanotify/fanotify_user.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1263 and retry the command. +Merge made by the 'recursive' strategy. + fs/notify/fanotify/fanotify_user.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging ext4/dev (040823b5372b4 Merge tag 'unicode-next-v5.4' of https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode into dev) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (619e17cf75dd5 Merge tag 'for-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply) +$ git merge f2fs/dev +Already up to date. +Merging fsverity/fsverity (95ae251fe8283 f2fs: add fs-verity support) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (b7c8525a97d77 Merge branch 'virtio-fs' into for-next) +$ git merge fuse/for-next +Auto-merging include/linux/fs_context.h +Auto-merging fs/super.c +Auto-merging fs/namespace.c +Auto-merging MAINTAINERS +Auto-merging Documentation/filesystems/index.rst +CONFLICT (content): Merge conflict in Documentation/filesystems/index.rst +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1258 and retry the command. +Resolved 'Documentation/filesystems/index.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3c001be31d64e] Merge remote-tracking branch 'fuse/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/index.rst | 10 + + Documentation/filesystems/virtiofs.rst | 60 ++ + MAINTAINERS | 12 + + fs/fs_context.c | 14 - + fs/fuse/Kconfig | 11 + + fs/fuse/Makefile | 1 + + fs/fuse/cuse.c | 101 +-- + fs/fuse/dev.c | 654 ++++++++--------- + fs/fuse/dir.c | 283 ++++---- + fs/fuse/file.c | 1227 +++++++++++++++++--------------- + fs/fuse/fuse_i.h | 357 +++++----- + fs/fuse/inode.c | 557 ++++++++------- + fs/fuse/readdir.c | 72 +- + fs/fuse/virtio_fs.c | 1195 +++++++++++++++++++++++++++++++ + fs/fuse/xattr.c | 76 +- + fs/namespace.c | 2 - + fs/proc_namespace.c | 2 +- + fs/super.c | 5 - + include/linux/fs_context.h | 1 - + include/uapi/linux/fuse.h | 12 +- + include/uapi/linux/virtio_fs.h | 19 + + include/uapi/linux/virtio_ids.h | 1 + + 22 files changed, 3058 insertions(+), 1614 deletions(-) + create mode 100644 Documentation/filesystems/virtiofs.rst + create mode 100644 fs/fuse/virtio_fs.c + create mode 100644 include/uapi/linux/virtio_fs.h +Merging jfs/jfs-next (a5fdd713d2568 jfs: fix bogus variable self-initialization) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (4d856f72c10ec Linux 5.3) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (a8fd0feeca35c pNFS/filelayout: enable LAYOUTGET on OPEN) +$ git merge nfs-anna/linux-next +Auto-merging net/sunrpc/xprtrdma/verbs.c +Auto-merging net/sunrpc/xprt.c +Auto-merging net/sunrpc/clnt.c +Auto-merging include/linux/sunrpc/sched.h +Auto-merging fs/nfs/super.c +Auto-merging fs/nfs/internal.h +Auto-merging fs/nfs/dir.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1261 and retry the command. +Merge made by the 'recursive' strategy. + fs/nfs/dir.c | 41 +++-- + fs/nfs/filelayout/filelayout.c | 1 + + fs/nfs/internal.h | 8 - + fs/nfs/nfs3proc.c | 45 ++++-- + fs/nfs/nfs4_fs.h | 11 +- + fs/nfs/nfs4proc.c | 315 ++++++++++++++++++++++++-------------- + fs/nfs/nfs4state.c | 22 +-- + fs/nfs/nfs4xdr.c | 2 +- + fs/nfs/pnfs.c | 71 ++++++++- + fs/nfs/pnfs.h | 17 +- + fs/nfs/super.c | 9 +- + include/linux/nfs_fs.h | 3 + + include/linux/sunrpc/sched.h | 3 - + include/linux/sunrpc/xdr.h | 2 +- + include/linux/sunrpc/xprt.h | 1 + + include/linux/sunrpc/xprtrdma.h | 4 +- + include/trace/events/rpcrdma.h | 88 +++++++++-- + net/sunrpc/auth_gss/auth_gss.c | 2 +- + net/sunrpc/clnt.c | 26 +++- + net/sunrpc/sched.c | 32 +--- + net/sunrpc/xdr.c | 65 +++++--- + net/sunrpc/xprt.c | 61 +++++--- + net/sunrpc/xprtrdma/backchannel.c | 4 +- + net/sunrpc/xprtrdma/frwr_ops.c | 166 +++++++++----------- + net/sunrpc/xprtrdma/rpc_rdma.c | 71 ++++++--- + net/sunrpc/xprtrdma/transport.c | 15 +- + net/sunrpc/xprtrdma/verbs.c | 263 ++++++++++++++----------------- + net/sunrpc/xprtrdma/xprt_rdma.h | 59 ++++--- + net/sunrpc/xprtsock.c | 8 +- + 29 files changed, 835 insertions(+), 580 deletions(-) +Merging nfsd/nfsd-next (e41f9efb85d38 sunrpc: clean up indentation issue) +$ git merge nfsd/nfsd-next +Auto-merging net/sunrpc/xprtrdma/svc_rdma_transport.c +Auto-merging include/linux/fs.h +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/locks.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1266 and retry the command. +Merge made by the 'recursive' strategy. + fs/file_table.c | 1 + + fs/locks.c | 62 ++ + fs/nfsd/Kconfig | 3 +- + fs/nfsd/Makefile | 3 +- + fs/nfsd/acl.h | 8 - + fs/nfsd/blocklayout.c | 3 +- + fs/nfsd/export.c | 13 + + fs/nfsd/filecache.c | 934 +++++++++++++++++++++++++++++++ + fs/nfsd/filecache.h | 61 ++ + fs/nfsd/netns.h | 4 + + fs/nfsd/nfs3proc.c | 9 +- + fs/nfsd/nfs3xdr.c | 13 +- + fs/nfsd/nfs4callback.c | 35 +- + fs/nfsd/nfs4layouts.c | 12 +- + fs/nfsd/nfs4proc.c | 97 ++-- + fs/nfsd/nfs4recover.c | 388 ++++++++++--- + fs/nfsd/nfs4state.c | 239 ++++---- + fs/nfsd/nfs4xdr.c | 56 +- + fs/nfsd/nfsctl.c | 1 + + fs/nfsd/nfsproc.c | 4 +- + fs/nfsd/nfssvc.c | 48 +- + fs/nfsd/state.h | 13 +- + fs/nfsd/trace.h | 140 +++++ + fs/nfsd/vfs.c | 351 +++++------- + fs/nfsd/vfs.h | 37 +- + fs/nfsd/xdr3.h | 2 +- + fs/nfsd/xdr4.h | 19 +- + fs/notify/fsnotify.h | 2 - + fs/notify/group.c | 2 + + fs/notify/mark.c | 6 + + include/linux/fs.h | 5 + + include/linux/fsnotify_backend.h | 2 + + include/linux/sunrpc/cache.h | 7 +- + include/linux/sunrpc/svc_rdma.h | 6 +- + include/uapi/linux/nfsd/cld.h | 41 +- + net/sunrpc/cache.c | 15 +- + net/sunrpc/svc.c | 4 +- + net/sunrpc/xprtrdma/svc_rdma.c | 7 - + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 24 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 6 +- + 40 files changed, 2083 insertions(+), 600 deletions(-) + create mode 100644 fs/nfsd/filecache.c + create mode 100644 fs/nfsd/filecache.h +Merging orangefs/for-next (e6b998ab62be2 orangefs: remove redundant assignment to err) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (5c2e9f346b815 ovl: filter of trusted xattr results in audit) +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/linux-next (6a379f67454a3 jffs2: Fix memory leak in jffs2_scan_eraseblock() error path) +$ git merge ubifs/linux-next +Already up to date. +Merging v9fs/9p-next (aafee43b72863 9p/vfs_super.c: Remove unused parameter data in v9fs_fill_super) +$ git merge v9fs/9p-next +Auto-merging fs/9p/vfs_super.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1262 and retry the command. +Merge made by the 'recursive' strategy. + fs/9p/cache.c | 2 ++ + fs/9p/vfs_file.c | 3 +++ + fs/9p/vfs_super.c | 4 ++-- + net/9p/client.c | 1 + + 4 files changed, 8 insertions(+), 2 deletions(-) +Merging xfs/for-next (88d32d3983e72 xfs: avoid unused to_mp() function warning) +$ git merge xfs/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1263 and retry the command. +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_alloc.h | 7 ++++--- + fs/xfs/libxfs/xfs_bmap.c | 13 +++++++++++-- + fs/xfs/libxfs/xfs_sb.c | 2 +- + fs/xfs/scrub/alloc.c | 3 +-- + fs/xfs/xfs_sysfs.c | 13 ------------- + 5 files changed, 17 insertions(+), 21 deletions(-) +Merging iomap/iomap-for-next (838c4f3d7515e iomap: move the iomap_dio_rw ->end_io callback into a structure) +$ git merge iomap/iomap-for-next +Auto-merging fs/xfs/xfs_file.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1268 and retry the command. +Merge made by the 'recursive' strategy. + fs/iomap/direct-io.c | 24 ++++++++++-------------- + fs/xfs/xfs_file.c | 14 ++++++++++---- + include/linux/iomap.h | 10 +++++++--- + 3 files changed, 27 insertions(+), 21 deletions(-) +Merging djw-vfs/vfs-for-next (dc617f29dbe5e vfs: don't allow writes to swap files) +$ git merge djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (b41dae061bbd7 Merge tag 'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (3e501af8dd7b5 Merge branches 'work.misc', 'work.mount3', 'work.namei', 'work.dcache' and 'work.autofs' into for-next) +$ git merge vfs/for-next +Auto-merging fs/afs/internal.h +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1263 and retry the command. +Merge made by the 'recursive' strategy. + fs/afs/dynroot.c | 7 ------- + fs/afs/inode.c | 2 +- + fs/afs/internal.h | 1 - + fs/fhandle.c | 2 +- + 4 files changed, 2 insertions(+), 10 deletions(-) +$ git am -3 ../patches/0001-docs-filesystems-vfs-update-for-vfs-Kill-mount_singl.patch +Applying: docs: filesystems: vfs: update for "vfs: Kill mount_single()" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/filesystems/vfs.rst +$ git add -A . +$ git commit -v -a --amend +[master 10139993028d1] Merge remote-tracking branch 'vfs/for-next' + Date: Wed Sep 25 11:11:38 2019 -0700 +Merging printk/for-next (c38822ab9bd62 Merge branch 'for-5.4' into for-next) +$ git merge printk/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci/next (5184d449600f5 Merge tag 'microblaze-v5.4-rc1' of git://git.monstr.eu/linux-2.6-microblaze) +$ git merge pci/next +Already up to date. +Merging pstore/for-next/pstore (609488bc979f9 Linux 5.3-rc2) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (8c97be0a0aa08 Merge branch 'for-5.4/core' into for-next) +$ git merge hid/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (5ae7657f46b2b Merge branch 'i2c/for-5.4' into i2c/for-next) +$ git merge i2c/i2c/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1261 and retry the command. +Merge made by the 'recursive' strategy. + drivers/i2c/busses/i2c-qcom-geni.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) +Merging i3c/i3c/next (6030f42d20ced i3c: master: Use dev_to_i3cmaster()) +$ git merge i3c/i3c/next +Already up to date. +Merging dmi/master (57361846b52bc Linux 4.19-rc2) +$ git merge dmi/master +Already up to date. +Merging hwmon-staging/hwmon-next (4e19e72f45d36 hwmon: submitting-patches: Add note on comment style) +$ git merge hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (fe013f8bc160d Documentation: kbuild: Add document about reproducible builds) +$ git merge jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (6f51fdfd8229d media: videobuf-core.c: poll_wait needs a non-NULL buf pointer) +$ git merge v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (5f9e832c13707 Linus 5.3-rc1) +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (732146a3f1dc7 video: fbdev: imxfb: fix a typo in imxfb_probe()) +$ git merge fbdev/fbdev-for-next +Already up to date. +Merging pm/linux-next (315ea754a4c4b Merge branch 'pm-cpuidle' into linux-next) +$ git merge pm/linux-next +Already up to date! +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1725 and retry the command. +Merge made by the 'recursive' strategy. +Merging cpufreq-arm/cpufreq/arm/linux-next (f75d2accca778 Merge branch 'cpufreq/qcom-updates' into cpufreq/arm/linux-next) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (87ce243206944 cpupower: update German translation) +$ git merge cpupower/cpupower +Already up to date. +Merging opp/opp/linux-next (071afa50609d4 Merge branch 'opp/qcom-updates' into opp/linux-next) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/next (0ca7ab5b00929 Merge branch 'thermal-soc' into next) +$ git merge thermal/next +Auto-merging MAINTAINERS +CONFLICT (rename/delete): Documentation/thermal/x86_pkg_temperature_thermal.rst deleted in HEAD and renamed to Documentation/driver-api/thermal/x86_pkg_temperature_thermal.rst in thermal/next. Version thermal/next of Documentation/driver-api/thermal/x86_pkg_temperature_thermal.rst left in tree. +CONFLICT (rename/delete): Documentation/thermal/sysfs-api.rst deleted in HEAD and renamed to Documentation/driver-api/thermal/sysfs-api.rst in thermal/next. Version thermal/next of Documentation/driver-api/thermal/sysfs-api.rst left in tree. +CONFLICT (rename/delete): Documentation/thermal/index.rst deleted in HEAD and renamed to Documentation/driver-api/thermal/index.rst in thermal/next. Version thermal/next of Documentation/driver-api/thermal/index.rst left in tree. +Auto-merging Documentation/driver-api/index.rst +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1263 and retry the command. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 77a4a0a414666] Merge remote-tracking branch 'thermal/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/thermal/qoriq-thermal.txt | 1 + + Documentation/driver-api/thermal/index.rst | 18 - + Documentation/driver-api/thermal/sysfs-api.rst | 798 --------------------- + .../thermal/x86_pkg_temperature_thermal.rst | 55 -- + MAINTAINERS | 1 + + drivers/thermal/armada_thermal.c | 5 +- + .../intel/int340x_thermal/acpi_thermal_rel.c | 6 - + .../int340x_thermal/processor_thermal_device.c | 96 ++- + drivers/thermal/intel/intel_pch_thermal.c | 6 +- + drivers/thermal/qcom/tsens-8960.c | 2 + + drivers/thermal/qcom/tsens-v0_1.c | 12 +- + drivers/thermal/qcom/tsens-v1.c | 1 + + drivers/thermal/qcom/tsens.h | 1 + + drivers/thermal/qoriq_thermal.c | 45 +- + drivers/thermal/rcar_gen3_thermal.c | 3 +- + drivers/thermal/tegra/soctherm.c | 2 +- + drivers/thermal/thermal_core.c | 44 +- + drivers/thermal/thermal_hwmon.c | 8 +- + 18 files changed, 177 insertions(+), 927 deletions(-) + delete mode 100644 Documentation/driver-api/thermal/index.rst + delete mode 100644 Documentation/driver-api/thermal/sysfs-api.rst + delete mode 100644 Documentation/driver-api/thermal/x86_pkg_temperature_thermal.rst +Merging thermal-soc/next (6c375eccded41 thermal: db8500: Rewrite to be a pure OF sensor) +$ git merge thermal-soc/next +Removing include/linux/platform_data/db8500_thermal.h +Auto-merging drivers/mfd/db8500-prcmu.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1259 and retry the command. +Merge made by the 'recursive' strategy. + drivers/mfd/db8500-prcmu.c | 53 +-- + drivers/thermal/Kconfig | 2 +- + drivers/thermal/db8500_thermal.c | 486 ++++++--------------------- + drivers/thermal/thermal_mmio.c | 7 - + include/linux/platform_data/db8500_thermal.h | 29 -- + 5 files changed, 114 insertions(+), 463 deletions(-) + delete mode 100644 include/linux/platform_data/db8500_thermal.h +Merging ieee1394/for-next (812cd88749e09 firewire: mark expected switch fall-throughs) +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/core-topology.c +Auto-merging drivers/firewire/core-iso.c +Auto-merging drivers/firewire/core-device.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 5403 and retry the command. +Merge made by the 'recursive' strategy. +Merging dlm/next (a48f9721e6db7 dlm: no need to check return value of debugfs_create functions) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (4cdfb27ba80d2 xen/swiotlb: remember having called xen_create_contiguous_region()) +$ git merge swiotlb/linux-next +Auto-merging include/linux/page-flags.h +Auto-merging drivers/xen/swiotlb-xen.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2958 and retry the command. +Merge made by the 'recursive' strategy. +Merging rdma/for-next (3eca7fc2d8d12 RDMA: Fix double-free in srq creation error flow) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (b41dae061bbd7 Merge tag 'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge net-next/master +Already up to date. +$ git am -3 ../patches/0001-link-vmlinux.sh-is-now-a-bash-script.patch +Applying: link-vmlinux.sh is now a bash script +$ git reset HEAD^ +Unstaged changes after reset: +M Makefile +M scripts/link-vmlinux.sh +$ git add -A . +$ git commit -v -a --amend +[master 29923b9a9fe68] Merge remote-tracking branch 'swiotlb/linux-next' + Date: Wed Sep 25 11:19:04 2019 -0700 +Merging bpf-next/master (b41dae061bbd7 Merge tag 'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge bpf-next/master +Already up to date. +Merging ipsec-next/master (990925fad5c22 Merge branch 'mlxsw-spectrum_buffers-Add-the-ability-to-query-the-CPU-ports-shared-buffer') +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (fc603294267f8 net/mlx5: Set only stag for match untagged packets) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (67e80b99a5546 net: phylink: clarify where phylink should be used) +$ git merge netfilter-next/master +Already up to date. +Merging nfc-next/master (1f008cfec5d52 NFC: fdp: Fix unused variable warnings) +$ git merge nfc-next/master +Auto-merging net/nfc/netlink.c +Auto-merging net/nfc/hci/core.c +Auto-merging drivers/nfc/st95hf/core.c +Auto-merging drivers/nfc/st21nfca/se.c +CONFLICT (content): Merge conflict in drivers/nfc/st21nfca/se.c +Auto-merging drivers/nfc/st21nfca/dep.c +Auto-merging drivers/nfc/fdp/i2c.c +Auto-merging drivers/nfc/fdp/fdp.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 9144 and retry the command. +Resolved 'drivers/nfc/st21nfca/se.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ca6cb2a18d84b] Merge remote-tracking branch 'nfc-next/master' +$ git diff -M --stat --summary HEAD^.. + drivers/nfc/fdp/fdp.c | 35 +++++------------------------------ + drivers/nfc/fdp/i2c.c | 26 +++++++++++++------------- + drivers/nfc/st21nfca/dep.c | 3 ++- + drivers/nfc/st21nfca/se.c | 3 +-- + drivers/nfc/st95hf/core.c | 7 ++----- + net/nfc/netlink.c | 3 ++- + 6 files changed, 25 insertions(+), 52 deletions(-) +Merging ipvs-next/master (1b0b807dd7469 Merge branch 'r8169-fw') +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (aa2eaa8c272a3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (b41dae061bbd7 Merge tag 'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge bluetooth/master +Already up to date. +Merging mac80211-next/master (c1d3ad84eae35 cfg80211: Purge frame registrations on iftype change) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (f0b444b349e33 gfs2: clear buf_in_tr when ending a transaction in sweep_bh_for_rgrps) +$ git merge gfs2/for-next +Already up to date. +Merging mtd/mtd/next (2cfcfadb8e138 mtd: pmc551: Remove set but not used variable 'soff_lo') +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (f480b969448ee mtd: rawnand: omap2: Fix number of bitflips reporting with ELM) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (9607af6f857ff mtd: spi-nor: Rename "n25q512a" to "mt25qu512a (n25q512a)") +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (9575d1a5c0780 crypto: caam - Cast to long first before pointer conversion) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (945b584c94f8c Merge branch 'linux-5.4' of git://github.com/skeggsb/linux into drm-next) +$ git merge drm/drm-next +Already up to date. +Merging amdgpu/drm-next (9c9284f9cee90 drm/amdgpu: Move null pointer dereference check) +$ git merge amdgpu/drm-next +Already up to date. +Merging drm-intel/for-linux-next (458863e08e13e drm/i915: Mark contents as dirty on a write fault) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_display.c | 15 ++++++++++++++- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 12 +++++++----- + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 3 --- + drivers/gpu/drm/i915/gt/intel_lrc.c | 21 ++++++++++++--------- + drivers/gpu/drm/i915/gt/intel_reset.c | 8 +++----- + drivers/gpu/drm/i915/gt/intel_reset.h | 2 +- + drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 2 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 3 +++ + drivers/gpu/drm/i915/i915_drv.c | 5 +++++ + drivers/gpu/drm/i915/i915_request.c | 25 ++++++++++++++++++++++--- + drivers/gpu/drm/i915/selftests/i915_gem.c | 6 ++++++ + 11 files changed, 74 insertions(+), 28 deletions(-) +Merging drm-tegra/drm/tegra/for-next (2a6fc3cb5cb68 drm/tegra: Fix gpiod_get_from_of_node() regression) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (65e51e30d8625 drm/panfrost: Prevent race when handling page fault) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/panfrost/panfrost_mmu.c +Auto-merging drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 12 +--- + drivers/gpu/drm/drm_atomic_helper.c | 22 ++++++- + drivers/gpu/drm/drm_atomic_state_helper.c | 2 +- + drivers/gpu/drm/drm_atomic_uapi.c | 3 +- + drivers/gpu/drm/drm_drv.c | 4 +- + drivers/gpu/drm/drm_ioctl.c | 7 ++- + drivers/gpu/drm/drm_mode_object.c | 4 +- + drivers/gpu/drm/drm_self_refresh_helper.c | 73 ++++++++++++++++++++--- + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 4 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 10 ++-- + drivers/gpu/drm/panfrost/panfrost_device.c | 8 +-- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 55 +++++++++++------ + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 5 +- + include/drm/drm_crtc.h | 10 ++-- + include/drm/drm_self_refresh_helper.h | 6 +- + 16 files changed, 157 insertions(+), 73 deletions(-) +Merging drm-msm/msm-next (9f614197c7440 drm/msm: Use the correct dma_sync calls harder) +$ git merge drm-msm/msm-next +Already up to date. +Merging hdlcd/for-upstream/hdlcd (d664b851eb2bc drm/arm/hdlcd: Reject atomic commits that disable only the plane) +$ git merge hdlcd/for-upstream/hdlcd +Already up to date. +Merging mali-dp/for-upstream/mali-dp (4cf643a39221a Merge tag 'drm-next-5.3-2019-06-27' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge mali-dp/for-upstream/mali-dp +Already up to date. +Merging imx-drm/imx-drm/next (4d24376370fbf gpu: ipu-v3: image-convert: only sample into the next tile if necessary) +$ git merge imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (dbcc574a4bfad drm/etnaviv: fix missing unlock on error in etnaviv_iommuv1_context_alloc()) +$ git merge etnaviv/etnaviv/next +Already up to date. +Merging regmap/for-next (1bd4584626a97 Merge branch 'regmap-5.4' into regmap-next) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (f41f900568d9f ALSA: usb-audio: Add DSD support for EVGA NU Audio) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (c077f737949fe Merge branch 'asoc-5.4' into asoc-linus) +$ git merge sound-asoc/for-next +Already up to date. +Merging modules/modules-next (2e6fcfeb9df60 module: Remove leftover '#undef' from export header) +$ git merge modules/modules-next +Already up to date. +Merging input/next (410f25de467ee Input: sidewinder - make array seq static const, makes object smaller) +$ git merge input/next +Already up to date. +Merging block/for-next (7fb33b99d62a9 Merge branch 'for-5.4/io_uring' into for-next) +$ git merge block/for-next +Auto-merging fs/io_uring.c +Merge made by the 'recursive' strategy. + fs/io_uring.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++---------- + 1 file changed, 56 insertions(+), 11 deletions(-) +Merging device-mapper/for-next (afa179eb60384 dm: introduce DM_GET_TARGET_VERSION) +$ git merge device-mapper/for-next +Already up to date. +Merging pcmcia/pcmcia-next (95691e3eddc41 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (f2be48b43e34a mmc: tegra: Implement ->set_dma_mask()) +$ git merge mmc/next +Already up to date. +Merging kgdb/kgdb-next (3bd67b37e3506 kdb: print real address of pointers instead of hashed addresses) +$ git merge kgdb/kgdb-next +Auto-merging kernel/debug/kdb/kdb_support.c +Auto-merging kernel/debug/kdb/kdb_main.c +Auto-merging kernel/debug/kdb/kdb_bt.c +CONFLICT (content): Merge conflict in kernel/debug/kdb/kdb_bt.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 7418 and retry the command. +Resolved 'kernel/debug/kdb/kdb_bt.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c9965a35189db] Merge remote-tracking branch 'kgdb/kgdb-next' +$ git diff -M --stat --summary HEAD^.. +Merging md/for-next (e820d55cb99dd md: fix raid10 hang issue caused by barrier) +$ git merge md/for-next +Already up to date. +Merging mfd/for-mfd-next (8391c6cb2414d mfd: mt6323: Add MT6323 RTC and PWRC) +$ git merge mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (c0b64faf0fe6c backlight: pwm_bl: Set scale type for brightness curves specified in the DT) +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (7f7378618b410 power: supply: cpcap-charger: Enable vbus boost voltage) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (f9a60abc26d98 Merge branch 'regulator-5.4' into regulator-linus) +$ git merge regulator/for-next +Already up to date. +Merging security/next-testing (45893a0abee6b kexec: Fix file verification on S390) +$ git merge security/next-testing +Auto-merging security/security.c +Auto-merging security/integrity/ima/ima_policy.c +Auto-merging security/integrity/ima/ima_main.c +Auto-merging security/integrity/ima/ima.h +Auto-merging security/integrity/ima/Kconfig +CONFLICT (content): Merge conflict in security/integrity/ima/Kconfig +Auto-merging security/Kconfig +Auto-merging kernel/trace/trace_kprobe.c +CONFLICT (content): Merge conflict in kernel/trace/trace_kprobe.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging kernel/module.c +Auto-merging kernel/kexec_file.c +Auto-merging kernel/events/core.c +Auto-merging init/main.c +Auto-merging init/Kconfig +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/kexec.h +Auto-merging include/linux/ima.h +Auto-merging include/linux/acpi.h +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging fs/tracefs/inode.c +Auto-merging fs/debugfs/inode.c +Auto-merging fs/debugfs/file.c +Auto-merging drivers/tty/serial/serial_core.c +Auto-merging drivers/pci/proc.c +Auto-merging drivers/pci/pci-sysfs.c +Auto-merging drivers/firmware/efi/efi.c +Auto-merging drivers/char/mem.c +Auto-merging drivers/acpi/tables.c +Auto-merging drivers/acpi/osl.c +Auto-merging drivers/acpi/custom_method.c +Auto-merging arch/x86/kernel/x86_init.c +Auto-merging arch/x86/kernel/kexec-bzimage64.c +Auto-merging arch/x86/kernel/ima_arch.c +Auto-merging arch/x86/include/asm/x86_init.h +Auto-merging arch/x86/boot/compressed/acpi.c +Auto-merging arch/x86/Kconfig +CONFLICT (modify/delete): arch/s390/configs/performance_defconfig deleted in HEAD and modified in security/next-testing. Version security/next-testing of arch/s390/configs/performance_defconfig left in tree. +Auto-merging arch/s390/configs/defconfig +CONFLICT (content): Merge conflict in arch/s390/configs/defconfig +Auto-merging arch/s390/configs/debug_defconfig +CONFLICT (content): Merge conflict in arch/s390/configs/debug_defconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2937 and retry the command. +Resolved 'arch/s390/configs/debug_defconfig' using previous resolution. +Resolved 'arch/s390/configs/defconfig' using previous resolution. +Resolved 'kernel/trace/trace_kprobe.c' using previous resolution. +Resolved 'security/integrity/ima/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/s390/configs/performance_defconfig +arch/s390/configs/performance_defconfig: needs merge +rm 'arch/s390/configs/performance_defconfig' +$ git commit --no-edit -v -a +[master c1e51a01f52ac] Merge remote-tracking branch 'security/next-testing' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 9 ++ + arch/arm64/Kconfig | 6 +- + arch/s390/Kconfig | 2 +- + arch/s390/kernel/kexec_elf.c | 4 +- + arch/s390/kernel/kexec_image.c | 4 +- + arch/s390/kernel/machine_kexec_file.c | 4 +- + arch/x86/Kconfig | 20 ++- + arch/x86/boot/compressed/acpi.c | 19 ++- + arch/x86/include/asm/acpi.h | 9 ++ + arch/x86/include/asm/x86_init.h | 2 + + arch/x86/kernel/acpi/boot.c | 5 + + arch/x86/kernel/ima_arch.c | 4 +- + arch/x86/kernel/ioport.c | 7 +- + arch/x86/kernel/kexec-bzimage64.c | 1 + + arch/x86/kernel/msr.c | 8 + + arch/x86/kernel/x86_init.c | 1 + + arch/x86/mm/testmmiotrace.c | 5 + + crypto/asymmetric_keys/verify_pefile.c | 4 +- + drivers/acpi/custom_method.c | 6 + + drivers/acpi/osl.c | 14 +- + drivers/acpi/tables.c | 6 + + drivers/char/mem.c | 7 +- + drivers/firmware/efi/efi.c | 6 + + drivers/pci/pci-sysfs.c | 16 ++ + drivers/pci/proc.c | 14 +- + drivers/pci/syscall.c | 4 +- + drivers/pcmcia/cistpl.c | 5 + + drivers/tty/serial/serial_core.c | 5 + + fs/debugfs/file.c | 30 ++++ + fs/debugfs/inode.c | 32 +++- + fs/proc/kcore.c | 6 + + fs/tracefs/inode.c | 42 +++++- + include/asm-generic/vmlinux.lds.h | 8 +- + include/linux/acpi.h | 6 + + include/linux/ima.h | 9 ++ + include/linux/kexec.h | 4 +- + include/linux/lsm_hooks.h | 13 ++ + include/linux/security.h | 59 ++++++++ + init/Kconfig | 5 + + init/main.c | 1 + + kernel/events/core.c | 7 + + kernel/kexec.c | 8 + + kernel/kexec_file.c | 68 +++++++-- + kernel/module.c | 37 ++++- + kernel/params.c | 21 ++- + kernel/power/hibernate.c | 3 +- + kernel/trace/bpf_trace.c | 10 ++ + kernel/trace/trace_kprobe.c | 5 + + security/Kconfig | 11 +- + security/Makefile | 2 + + security/integrity/ima/Kconfig | 2 +- + security/integrity/ima/ima.h | 2 + + security/integrity/ima/ima_main.c | 4 +- + security/integrity/ima/ima_policy.c | 50 +++++++ + security/lockdown/Kconfig | 47 ++++++ + security/lockdown/Makefile | 1 + + security/lockdown/lockdown.c | 191 ++++++++++++++++++++++++ + security/security.c | 56 ++++++- + 58 files changed, 861 insertions(+), 76 deletions(-) + create mode 100644 security/lockdown/Kconfig + create mode 100644 security/lockdown/Makefile + create mode 100644 security/lockdown/lockdown.c +Merging apparmor/apparmor-next (136db994852a9 apparmor: increase left match history buffer size) +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/policy_unpack.c +Auto-merging security/apparmor/policy.c +Auto-merging security/apparmor/mount.c +Auto-merging security/apparmor/match.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/include/policy_unpack.h +Auto-merging security/apparmor/include/path.h +Auto-merging security/apparmor/include/match.h +Auto-merging security/apparmor/include/apparmor.h +Auto-merging security/apparmor/file.c +Auto-merging security/apparmor/domain.c +Auto-merging security/apparmor/apparmorfs.c +Auto-merging security/apparmor/Kconfig +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 4344 and retry the command. +Merge made by the 'recursive' strategy. + security/apparmor/Kconfig | 2 + + security/apparmor/apparmorfs.c | 130 ++++++++++++++++++++++-- + security/apparmor/domain.c | 46 ++++----- + security/apparmor/file.c | 26 +++-- + security/apparmor/include/apparmor.h | 1 + + security/apparmor/include/match.h | 3 +- + security/apparmor/include/path.h | 49 +-------- + security/apparmor/include/policy_unpack.h | 8 +- + security/apparmor/lsm.c | 160 ++++++++++++++++++++++++------ + security/apparmor/match.c | 6 +- + security/apparmor/mount.c | 67 ++++++++++--- + security/apparmor/policy.c | 5 +- + security/apparmor/policy_unpack.c | 116 +++++++++++++++++++++- + 13 files changed, 477 insertions(+), 142 deletions(-) +Merging integrity/next-integrity (2a7f0e53daf29 ima: ima_api: Use struct_size() in kzalloc()) +$ git merge integrity/next-integrity +Auto-merging security/integrity/ima/ima_policy.c +Auto-merging security/integrity/ima/ima_main.c +Auto-merging security/integrity/ima/ima.h +Auto-merging security/integrity/ima/Kconfig +Auto-merging scripts/Makefile +Auto-merging kernel/module.c +Auto-merging kernel/Makefile +Auto-merging init/Kconfig +CONFLICT (content): Merge conflict in init/Kconfig +Auto-merging include/linux/module.h +Auto-merging arch/s390/kernel/machine_kexec_file.c +CONFLICT (content): Merge conflict in arch/s390/kernel/machine_kexec_file.c +Auto-merging arch/s390/Kconfig +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1268 and retry the command. +Resolved 'arch/s390/kernel/machine_kexec_file.c' using previous resolution. +Resolved 'init/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9dfff9a98ebde] Merge remote-tracking branch 'integrity/next-integrity' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/ima_policy | 6 +- + Documentation/security/IMA-templates.rst | 3 + + arch/s390/Kconfig | 2 +- + arch/s390/kernel/machine_kexec_file.c | 24 +-- + certs/system_keyring.c | 61 +++++-- + crypto/asymmetric_keys/pkcs7_verify.c | 33 ++++ + include/crypto/pkcs7.h | 4 + + include/linux/module.h | 3 - + include/linux/module_signature.h | 46 +++++ + include/linux/verification.h | 10 ++ + init/Kconfig | 6 +- + kernel/Makefile | 1 + + kernel/module.c | 1 + + kernel/module_signature.c | 46 +++++ + kernel/module_signing.c | 56 +----- + scripts/Makefile | 2 +- + security/integrity/Kconfig | 2 +- + security/integrity/digsig.c | 43 ++++- + security/integrity/ima/Kconfig | 13 ++ + security/integrity/ima/Makefile | 1 + + security/integrity/ima/ima.h | 60 ++++++- + security/integrity/ima/ima_api.c | 27 ++- + security/integrity/ima/ima_appraise.c | 194 ++++++++++++++------- + security/integrity/ima/ima_crypto.c | 10 +- + security/integrity/ima/ima_main.c | 24 ++- + security/integrity/ima/ima_modsig.c | 168 ++++++++++++++++++ + security/integrity/ima/ima_policy.c | 71 ++++++-- + security/integrity/ima/ima_template.c | 31 +++- + security/integrity/ima/ima_template_lib.c | 64 ++++++- + security/integrity/ima/ima_template_lib.h | 4 + + security/integrity/integrity.h | 20 +++ + .../selftests/kexec/test_kexec_file_load.sh | 38 +++- + 32 files changed, 871 insertions(+), 203 deletions(-) + create mode 100644 include/linux/module_signature.h + create mode 100644 kernel/module_signature.c + create mode 100644 security/integrity/ima/ima_modsig.c +Merging keys/keys-next (1f96e0f129eb2 Merge branch 'keys-acl' into keys-next) +$ git merge keys/keys-next +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/keys/request_key_auth.c +Auto-merging security/keys/request_key.c +Auto-merging security/integrity/integrity.h +Auto-merging security/integrity/digsig.c +Auto-merging net/wireless/reg.c +Auto-merging net/ceph/ceph_common.c +Auto-merging include/uapi/asm-generic/unistd.h +Auto-merging include/linux/usb.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/key.h +CONFLICT (content): Merge conflict in include/linux/key.h +Auto-merging include/linux/device.h +Auto-merging include/linux/blkdev.h +Auto-merging fs/ubifs/auth.c +Auto-merging fs/ecryptfs/keystore.c +CONFLICT (modify/delete): fs/crypto/keyinfo.c deleted in HEAD and modified in keys/keys-next. Version keys/keys-next of fs/crypto/keyinfo.c left in tree. +Auto-merging fs/cifs/connect.c +Auto-merging fs/cifs/cifsacl.c +Auto-merging fs/afs/security.c +CONFLICT (content): Merge conflict in fs/afs/security.c +Auto-merging drivers/usb/core/devio.c +Auto-merging drivers/nvdimm/security.c +Auto-merging drivers/misc/Makefile +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/md/dm-crypt.c +Auto-merging drivers/base/Kconfig +Auto-merging certs/system_keyring.c +Auto-merging block/blk-core.c +Auto-merging block/Kconfig +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging Documentation/ioctl/ioctl-number.rst +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1266 and retry the command. +Resolved 'fs/afs/security.c' using previous resolution. +Resolved 'include/linux/key.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f fs/crypto/keyinfo.c +fs/crypto/keyinfo.c: needs merge +rm 'fs/crypto/keyinfo.c' +$ git commit --no-edit -v -a +[master 3dff0221c3519] Merge remote-tracking branch 'keys/keys-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ioctl/ioctl-number.rst | 1 + + Documentation/security/keys/core.rst | 186 ++++- + Documentation/security/keys/request-key.rst | 9 +- + Documentation/watch_queue.rst | 460 +++++++++++ + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + block/Kconfig | 9 + + block/blk-core.c | 29 + + certs/blacklist.c | 7 +- + certs/system_keyring.c | 12 +- + drivers/base/Kconfig | 9 + + drivers/base/Makefile | 1 + + drivers/base/watch.c | 90 +++ + drivers/md/dm-crypt.c | 2 +- + drivers/misc/Kconfig | 13 + + drivers/misc/Makefile | 1 + + drivers/misc/watch_queue.c | 898 +++++++++++++++++++++ + drivers/nvdimm/security.c | 2 +- + drivers/usb/core/Kconfig | 9 + + drivers/usb/core/devio.c | 49 ++ + drivers/usb/core/hub.c | 4 + + fs/afs/security.c | 2 +- + fs/cifs/cifs_spnego.c | 25 +- + fs/cifs/cifsacl.c | 28 +- + fs/cifs/connect.c | 4 +- + fs/ecryptfs/ecryptfs_kernel.h | 2 +- + fs/ecryptfs/keystore.c | 2 +- + fs/fscache/object-list.c | 2 +- + fs/nfs/nfs4idmap.c | 30 +- + fs/ubifs/auth.c | 2 +- + include/linux/blkdev.h | 15 + + include/linux/device.h | 7 + + include/linux/key.h | 124 +-- + include/linux/lsm_audit.h | 1 + + include/linux/lsm_hooks.h | 38 + + include/linux/security.h | 32 +- + include/linux/syscalls.h | 1 + + include/linux/usb.h | 18 + + include/linux/watch_queue.h | 94 +++ + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/keyctl.h | 68 ++ + include/uapi/linux/watch_queue.h | 181 +++++ + kernel/sys_ni.c | 1 + + lib/digsig.c | 2 +- + net/ceph/ceph_common.c | 2 +- + net/dns_resolver/dns_key.c | 12 +- + net/dns_resolver/dns_query.c | 15 +- + net/rxrpc/key.c | 19 +- + net/wireless/reg.c | 6 +- + samples/Kconfig | 6 + + samples/Makefile | 1 + + samples/watch_queue/Makefile | 8 + + samples/watch_queue/watch_test.c | 231 ++++++ + security/integrity/digsig.c | 31 +- + security/integrity/digsig_asymmetric.c | 2 +- + security/integrity/evm/evm_crypto.c | 2 +- + security/integrity/ima/ima_mok.c | 13 +- + security/integrity/integrity.h | 6 +- + .../integrity/platform_certs/platform_keyring.c | 14 +- + security/keys/Kconfig | 9 + + security/keys/compat.c | 5 + + security/keys/encrypted-keys/encrypted.c | 2 +- + security/keys/encrypted-keys/masterkey_trusted.c | 2 +- + security/keys/gc.c | 7 +- + security/keys/internal.h | 46 +- + security/keys/key.c | 67 +- + security/keys/keyctl.c | 201 ++++- + security/keys/keyring.c | 47 +- + security/keys/permission.c | 363 ++++++++- + security/keys/persistent.c | 27 +- + security/keys/proc.c | 22 +- + security/keys/process_keys.c | 86 +- + security/keys/request_key.c | 38 +- + security/keys/request_key_auth.c | 15 +- + security/security.c | 23 + + security/selinux/hooks.c | 30 +- + security/smack/smack_lsm.c | 85 +- + 93 files changed, 3583 insertions(+), 354 deletions(-) + create mode 100644 Documentation/watch_queue.rst + create mode 100644 drivers/base/watch.c + create mode 100644 drivers/misc/watch_queue.c + create mode 100644 include/linux/watch_queue.h + create mode 100644 include/uapi/linux/watch_queue.h + create mode 100644 samples/watch_queue/Makefile + create mode 100644 samples/watch_queue/watch_test.c +$ git am -3 ../patches/0001-fsverity-merge-fix-for-keyring_alloc-API-change.patch +Applying: fsverity: merge fix for keyring_alloc API change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/verity/signature.c +$ git add -A . +$ git commit -v -a --amend +[master 1811fe968a4e2] Merge remote-tracking branch 'keys/keys-next' + Date: Wed Sep 25 11:53:38 2019 -0700 +$ git am -3 ../patches/0001-fscrypt-merge-resolution-for-keys-Replace-uid-gid-pe.patch +Applying: fscrypt: merge resolution for "keys: Replace uid/gid/perm permissions checking with an ACL" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/crypto/keyring.c +M fs/crypto/keysetup_v1.c +$ git add -A . +$ git commit -v -a --amend +[master b10f2e3820749] Merge remote-tracking branch 'keys/keys-next' + Date: Wed Sep 25 11:53:38 2019 -0700 +$ git am -3 ../patches/0001-dm-verity-merge-fix-for-keys-Replace-uid-gid-perm-pe.patch +Applying: dm verity: merge fix for "keys: Replace uid/gid/perm permissions checking with an ACL" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/md/dm-verity-verify-sig.c +$ git add -A . +$ git commit -v -a --amend +[master 7a4f031b073ea] Merge remote-tracking branch 'keys/keys-next' + Date: Wed Sep 25 11:53:38 2019 -0700 +Merging selinux/next (15322a0d90b6f lsm: remove current_security()) +$ git merge selinux/next +Already up to date. +Merging smack/for-next (92604e825304c smack: use GFP_NOFS while holding inode_smack::smk_lock) +$ git merge smack/for-next +Auto-merging security/smack/smack_lsm.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2950 and retry the command. +Merge made by the 'recursive' strategy. +Merging tpmdd/next (e13cd21ffd50a tpm: Wrap the buffer from the caller to tpm_buf in tpm_send()) +$ git merge tpmdd/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/char/tpm/tpm-interface.c | 23 +++++++++++------------ + security/keys/trusted.c | 5 +++++ + tools/testing/selftests/.gitignore | 2 ++ + tools/testing/selftests/tpm2/Makefile | 1 + + 5 files changed, 20 insertions(+), 13 deletions(-) +Merging watchdog/master (ca2fc5efffde5 watchdog: f71808e_wdt: Add F81803 support) +$ git merge watchdog/master +Removing drivers/watchdog/nuc900_wdt.c +Removing drivers/watchdog/ks8695_wdt.c +Auto-merging drivers/watchdog/Kconfig +Removing Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1306 and retry the command. +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-watchdog | 34 ++ + .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 58 ++++ + .../devicetree/bindings/watchdog/aspeed-wdt.txt | 1 + + .../bindings/watchdog/fsl-imx7ulp-wdt.txt | 22 ++ + .../devicetree/bindings/watchdog/sunxi-wdt.txt | 22 -- + .../devicetree/bindings/watchdog/watchdog.yaml | 26 ++ + Documentation/watchdog/watchdog-parameters.rst | 19 -- + drivers/watchdog/Kconfig | 33 +- + drivers/watchdog/Makefile | 3 +- + drivers/watchdog/aspeed_wdt.c | 69 +++- + drivers/watchdog/ath79_wdt.c | 4 +- + drivers/watchdog/cpwd.c | 25 +- + drivers/watchdog/diag288_wdt.c | 3 - + drivers/watchdog/f71808e_wdt.c | 17 +- + drivers/watchdog/imx2_wdt.c | 4 +- + drivers/watchdog/imx7ulp_wdt.c | 243 ++++++++++++++ + drivers/watchdog/imx_sc_wdt.c | 9 +- + drivers/watchdog/jz4740_wdt.c | 1 - + drivers/watchdog/ks8695_wdt.c | 319 ------------------- + drivers/watchdog/nuc900_wdt.c | 302 ------------------ + drivers/watchdog/orion_wdt.c | 66 +++- + drivers/watchdog/qcom-wdt.c | 84 ++++- + drivers/watchdog/sprd_wdt.c | 4 +- + drivers/watchdog/ziirave_wdt.c | 351 ++++++++++----------- + 24 files changed, 789 insertions(+), 930 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/fsl-imx7ulp-wdt.txt + delete mode 100644 Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/watchdog.yaml + create mode 100644 drivers/watchdog/imx7ulp_wdt.c + delete mode 100644 drivers/watchdog/ks8695_wdt.c + delete mode 100644 drivers/watchdog/nuc900_wdt.c +Merging iommu/next (e95adb9add75a Merge branches 'arm/omap', 'arm/exynos', 'arm/smmu', 'arm/mediatek', 'arm/qcom', 'arm/renesas', 'x86/amd', 'x86/vt-d' and 'core' into next) +$ git merge iommu/next +Already up to date. +Merging vfio/next (e6c5d727db0a8 Merge branches 'v5.4/vfio/alexey-tce-memory-free-v1', 'v5.4/vfio/connie-re-arrange-v2', 'v5.4/vfio/hexin-pci-reset-v3', 'v5.4/vfio/parav-mtty-uuid-v2' and 'v5.4/vfio/shameer-iova-list-v8' into v5.4/vfio/next) +$ git merge vfio/next +Already up to date. +Merging audit/next (5f9e832c13707 Linus 5.3-rc1) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (59e9fcf8772bd of: restore old handling of cells_name=NULL in of_*_phandle_with_args()) +$ git merge devicetree/for-next +Already up to date. +Merging mailbox/mailbox-for-next (556a0964e28c4 mailbox: qcom-apcs: fix max_register value) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (4c34e7629326a Merge branch 'spi-5.4' into spi-linus) +$ git merge spi/for-next +Auto-merging drivers/spi/spidev.c +CONFLICT (content): Merge conflict in drivers/spi/spidev.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1674 and retry the command. +Recorded preimage for 'drivers/spi/spidev.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/spi/spidev.c'. +[master bb3f990e9e962] Merge remote-tracking branch 'spi/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging tip/auto-latest (e3c5706691fb5 Merge branch 'linus') +$ git merge tip/auto-latest +Auto-merging include/linux/sched.h +Auto-merging arch/x86/Kconfig +Merge made by the 'recursive' strategy. + arch/x86/Kconfig | 1 + + arch/x86/kernel/cpu/intel.c | 8 +- + include/linux/sched.h | 5 +- + kernel/sched/fair.c | 16 - + kernel/time/timer.c | 8 +- + .../Documentation/libtraceevent-func_apis.txt | 10 +- + tools/lib/traceevent/event-parse.c | 18 +- + tools/perf/Makefile.perf | 2 +- + tools/perf/arch/arm/util/cs-etm.c | 2 +- + tools/perf/arch/arm64/util/arm-spe.c | 2 +- + tools/perf/arch/arm64/util/dwarf-regs.c | 1 - + tools/perf/arch/arm64/util/header.c | 4 +- + tools/perf/arch/arm64/util/unwind-libunwind.c | 2 +- + tools/perf/arch/powerpc/util/dwarf-regs.c | 1 - + tools/perf/arch/powerpc/util/header.c | 1 - + tools/perf/arch/powerpc/util/kvm-stat.c | 45 + + tools/perf/arch/powerpc/util/skip-callchain-idx.c | 1 + + tools/perf/arch/powerpc/util/sym-handling.c | 1 - + tools/perf/arch/s390/util/machine.c | 2 +- + tools/perf/arch/x86/tests/intel-cqm.c | 1 - + tools/perf/arch/x86/tests/perf-time-to-tsc.c | 1 - + tools/perf/arch/x86/tests/rdpmc.c | 2 +- + tools/perf/arch/x86/util/archinsn.c | 1 + + tools/perf/arch/x86/util/event.c | 2 + + tools/perf/arch/x86/util/intel-bts.c | 2 +- + tools/perf/arch/x86/util/intel-pt.c | 2 +- + tools/perf/arch/x86/util/machine.c | 3 +- + tools/perf/arch/x86/util/tsc.c | 2 + + tools/perf/bench/epoll-ctl.c | 2 +- + tools/perf/bench/epoll-wait.c | 2 +- + tools/perf/bench/futex-hash.c | 2 +- + tools/perf/bench/futex-lock-pi.c | 2 +- + tools/perf/bench/futex-requeue.c | 2 +- + tools/perf/bench/futex-wake-parallel.c | 3 +- + tools/perf/bench/futex-wake.c | 2 +- + tools/perf/bench/numa.c | 1 - + tools/perf/bench/sched-messaging.c | 2 - + tools/perf/bench/sched-pipe.c | 2 - + tools/perf/builtin-annotate.c | 1 + + tools/perf/builtin-c2c.c | 1 + + tools/perf/builtin-config.c | 1 - + tools/perf/builtin-evlist.c | 2 - + tools/perf/builtin-inject.c | 1 + + tools/perf/builtin-kvm.c | 15 +- + tools/perf/builtin-record.c | 10 +- + tools/perf/builtin-report.c | 2 +- + tools/perf/builtin-sched.c | 3 + + tools/perf/builtin-stat.c | 24 +- + tools/perf/builtin-top.c | 1 + + tools/perf/builtin-trace.c | 1 + + tools/perf/jvmti/Build | 9 + + tools/perf/lib/Makefile | 1 + + tools/perf/lib/cpumap.c | 12 + + tools/perf/lib/include/perf/cpumap.h | 1 + + tools/perf/lib/libperf.map | 1 + + tools/perf/perf.c | 2 +- + .../arch/arm64/arm/cortex-a76-n1/branch.json | 14 + + .../arch/arm64/arm/cortex-a76-n1/bus.json | 24 + + .../arch/arm64/arm/cortex-a76-n1/cache.json | 207 +++ + .../arch/arm64/arm/cortex-a76-n1/exception.json | 52 + + .../arch/arm64/arm/cortex-a76-n1/instruction.json | 108 ++ + .../arch/arm64/arm/cortex-a76-n1/memory.json | 23 + + .../arch/arm64/arm/cortex-a76-n1/other.json | 7 + + .../arch/arm64/arm/cortex-a76-n1/pipeline.json | 14 + + tools/perf/pmu-events/arch/arm64/mapfile.csv | 2 + + tools/perf/tests/bitmap.c | 2 +- + tools/perf/tests/clang.c | 2 - + tools/perf/tests/code-reading.c | 2 +- + tools/perf/tests/cpumap.c | 1 + + tools/perf/tests/dso-data.c | 1 - + tools/perf/tests/dwarf-unwind.c | 1 + + tools/perf/tests/event-times.c | 1 - + tools/perf/tests/event_update.c | 4 +- + tools/perf/tests/hists_common.c | 2 + + tools/perf/tests/keep-tracking.c | 3 +- + tools/perf/tests/llvm.c | 1 - + tools/perf/tests/make | 6 +- + tools/perf/tests/mem2node.c | 2 +- + tools/perf/tests/mmap-basic.c | 3 +- + tools/perf/tests/mmap-thread-lookup.c | 4 +- + tools/perf/tests/openat-syscall-all-cpus.c | 5 +- + tools/perf/tests/parse-events.c | 1 - + tools/perf/tests/parse-no-sample-id-all.c | 2 - + tools/perf/tests/perf-hooks.c | 1 - + tools/perf/tests/pmu.c | 1 - + tools/perf/tests/sample-parsing.c | 2 +- + tools/perf/tests/stat.c | 1 + + tools/perf/tests/switch-tracking.c | 1 - + tools/perf/tests/task-exit.c | 2 +- + tools/perf/tests/thread-map.c | 1 + + tools/perf/tests/topology.c | 2 +- + tools/perf/tests/vmlinux-kallsyms.c | 2 +- + tools/perf/ui/browser.c | 1 - + tools/perf/ui/browsers/annotate.c | 1 - + tools/perf/ui/browsers/header.c | 1 - + tools/perf/ui/browsers/map.c | 1 - + tools/perf/ui/browsers/res_sample.c | 2 +- + tools/perf/ui/browsers/scripts.c | 3 +- + tools/perf/ui/gtk/helpline.c | 1 - + tools/perf/ui/gtk/progress.c | 1 - + tools/perf/ui/gtk/setup.c | 3 +- + tools/perf/ui/gtk/util.c | 1 - + tools/perf/ui/helpline.c | 2 - + tools/perf/ui/hist.c | 1 - + tools/perf/ui/setup.c | 2 +- + tools/perf/ui/stdio/hist.c | 1 + + tools/perf/ui/tui/helpline.c | 1 - + tools/perf/ui/tui/setup.c | 2 +- + tools/perf/ui/tui/util.c | 1 - + tools/perf/util/Build | 1 + + tools/perf/util/annotate.c | 2 +- + tools/perf/util/arm-spe.c | 1 - + tools/perf/util/auxtrace.c | 6 +- + tools/perf/util/auxtrace.h | 18 +- + tools/perf/util/bpf-event.c | 1 + + tools/perf/util/bpf-event.h | 15 +- + tools/perf/util/branch.c | 2 - + tools/perf/util/branch.h | 9 +- + tools/perf/util/build-id.c | 2 +- + tools/perf/util/callchain.c | 1 + + tools/perf/util/callchain.h | 5 +- + tools/perf/util/cloexec.c | 2 +- + tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 1 - + tools/perf/util/cs-etm.c | 2 +- + tools/perf/util/data.c | 3 +- + tools/perf/util/debug.c | 1 - + tools/perf/util/debug.h | 2 +- + tools/perf/util/demangle-java.c | 1 - + tools/perf/util/demangle-rust.c | 1 - + tools/perf/util/dwarf-regs.c | 1 - + tools/perf/util/env.h | 3 +- + tools/perf/util/event.c | 1109 +----------- + tools/perf/util/event.h | 77 +- + tools/perf/util/evlist.c | 2 +- + tools/perf/util/evsel.c | 280 +-- + tools/perf/util/evsel.h | 5 - + tools/perf/util/evsel_fprintf.c | 1 + + tools/perf/util/header.c | 395 +--- + tools/perf/util/header.h | 60 +- + tools/perf/util/hist.h | 1 + + tools/perf/util/intel-bts.c | 2 +- + tools/perf/util/intel-pt.c | 1 + + tools/perf/util/jitdump.c | 2 - + tools/perf/util/kvm-stat.h | 4 + + tools/perf/util/libunwind/arm64.c | 1 - + tools/perf/util/libunwind/x86_32.c | 1 - + tools/perf/util/llvm-utils.c | 1 + + tools/perf/util/lzma.c | 2 +- + tools/perf/util/machine.c | 15 - + tools/perf/util/machine.h | 15 - + tools/perf/util/memswap.h | 7 + + tools/perf/util/namespaces.c | 18 + + tools/perf/util/namespaces.h | 2 + + tools/perf/util/parse-events.c | 1 - + tools/perf/util/perf-hooks.c | 1 - + tools/perf/util/pmu.c | 1 - + tools/perf/util/probe-file.c | 1 + + tools/perf/util/python.c | 4 +- + tools/perf/util/record.c | 2 - + tools/perf/util/rwsem.c | 1 + + tools/perf/util/s390-cpumsf.c | 1 - + tools/perf/util/s390-sample-raw.c | 1 - + .../util/scripting-engines/trace-event-python.c | 2 - + tools/perf/util/session.c | 72 +- + tools/perf/util/session.h | 5 - + tools/perf/util/srccode.c | 2 +- + tools/perf/util/stat.c | 60 +- + tools/perf/util/stat.h | 9 +- + tools/perf/util/svghelper.c | 2 +- + tools/perf/util/symbol-elf.c | 3 + + tools/perf/util/symbol-minimal.c | 3 +- + tools/perf/util/symbol.c | 2 +- + tools/perf/util/synthetic-events.c | 1884 ++++++++++++++++++++ + tools/perf/util/synthetic-events.h | 103 ++ + tools/perf/util/target.c | 2 - + tools/perf/util/top.c | 1 - + tools/perf/util/trace-event-info.c | 2 +- + tools/perf/util/trace-event-read.c | 1 - + tools/perf/util/trace-event.c | 1 - + tools/perf/util/tsc.h | 14 +- + tools/perf/util/unwind-libdw.c | 1 - + tools/perf/util/unwind-libunwind-local.c | 1 - + tools/perf/util/usage.c | 1 - + tools/perf/util/vdso.c | 2 +- + tools/perf/util/zlib.c | 4 +- + 185 files changed, 2777 insertions(+), 2280 deletions(-) + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/branch.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/bus.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/exception.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/instruction.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/memory.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/other.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/pipeline.json + create mode 100644 tools/perf/util/synthetic-events.c + create mode 100644 tools/perf/util/synthetic-events.h +Merging clockevents/clockevents/next (befd04abfbe4b clocksource/drivers/sh_cmt: Document "cmt-48" as deprecated) +$ git merge clockevents/clockevents/next +Auto-merging kernel/time/posix-timers.c +CONFLICT (content): Merge conflict in kernel/time/posix-timers.c +Auto-merging drivers/clocksource/Kconfig +Auto-merging arch/arm64/boot/dts/freescale/imx8mq.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mm.dtsi +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1320 and retry the command. +Resolved 'kernel/time/posix-timers.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6ee1d2def15c5] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. +Merging edac/edac-for-next (3e443eb353eda EDAC/amd64: Add PCI device IDs for family 17h, model 70h) +$ git merge edac/edac-for-next +Already up to date. +Merging irqchip/irq/irqchip-next (bb0fed1c60ccc irqchip/sifive-plic: Switch to fasteoi flow) +$ git merge irqchip/irq/irqchip-next +Auto-merging drivers/irqchip/irq-sifive-plic.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1291 and retry the command. +Merge made by the 'recursive' strategy. + .../bindings/interrupt-controller/atmel,aic.txt | 7 ++++-- + drivers/irqchip/irq-al-fic.c | 12 +++++++++ + drivers/irqchip/irq-atmel-aic5.c | 10 ++++++++ + drivers/irqchip/irq-gic-v3.c | 2 +- + drivers/irqchip/irq-sifive-plic.c | 29 +++++++++++----------- + 5 files changed, 43 insertions(+), 17 deletions(-) +Merging ftrace/for-next (b78b94b821222 selftests/ftrace: Update kprobe event error testcase) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (049b405029c00 MAINTAINERS: Update from paulmck@linux.ibm.com to paulmck@kernel.org) +$ git merge rcu/rcu/next +Already up to date. +Merging kvm/linux-next (90a48843a1866 KVM: selftests: fix ucall on x86) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (aac60f1a86777 KVM: arm/arm64: vgic: Use the appropriate TRACE_INCLUDE_PATH) +$ git merge kvm-arm/next +Auto-merging arch/arm64/kvm/hyp/switch.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1288 and retry the command. +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/kvm_hyp.h | 24 ------------------------ + arch/arm64/kvm/hyp/switch.c | 17 ++--------------- + arch/arm64/kvm/hyp/tlb.c | 36 ++++++++++++++++++++++-------------- + virt/kvm/arm/vgic/trace.h | 2 +- + 4 files changed, 25 insertions(+), 54 deletions(-) +Merging kvm-ppc/kvm-ppc-next (ff42df49e75f0 KVM: PPC: Book3S HV: Don't lose pending doorbell request on migration on P9) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (0af2889f89bbb KVM: s390: Remove unused parameter from __inject_sigp_restart()) +$ git merge kvms390/next +Auto-merging arch/s390/kvm/interrupt.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1288 and retry the command. +Merge made by the 'recursive' strategy. + arch/s390/kvm/interrupt.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging xen-tip/linux-next (a4098bc6eed5e xen/pci: reserve MCFG areas earlier) +$ git merge xen-tip/linux-next +Auto-merging drivers/xen/swiotlb-xen.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1286 and retry the command. +Merge made by the 'recursive' strategy. + drivers/xen/pci.c | 21 +++++++++++++++------ + drivers/xen/swiotlb-xen.c | 5 ++--- + 2 files changed, 17 insertions(+), 9 deletions(-) +Merging percpu/for-next (69f98a60cdbb2 Merge branch 'for-5.4' into for-next) +$ git merge percpu/for-next +Already up to date! +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1705 and retry the command. +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (30ae2fc0a75eb workqueue: Minor follow-ups to the rescuer destruction change) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 29 ++++++++++++++++++++++------- + 1 file changed, 22 insertions(+), 7 deletions(-) +Merging drivers-x86/for-next (24a8d78a9affb platform/x86: i2c-multi-instantiate: Derive the device name from parent) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (4c1fde5077dca platform/chrome: cros_usbpd_logger: null check create_singlethread_workqueue) +$ git merge chrome-platform/for-next +Already up to date. +Merging hsi/for-next (c1030cd456198 HSI: Remove dev_err() usage after platform_get_irq()) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (6d4faf3b6b6eb leds: lm3532: Fix optional led-max-microamp prop error handling) +$ git merge leds/for-next +Already up to date. +Merging ipmi/for-next (c9acc3c4f8e42 ipmi_si_intf: Fix race in timer shutdown handling) +$ git merge ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (351c8a09b00b5 Merge branch 'i2c/for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (351c8a09b00b5 Merge branch 'i2c/for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge usb/usb-next +Already up to date. +Merging usb-gadget/next (18a93cd38be3e usb: gadget: net2280: Add workaround for AB chip Errata 11) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (7a786b8479078 USB: serial: ftdi_sio: add support for FT232H CBUS gpios) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (ecd55e367f3d7 usb: chipidea: msm: Use device-managed registration API) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up to date. +Merging phy-next/next (5af67635c36ed phy: marvell: phy-mvebu-cp110-comphy: rename instances of DLT) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (351c8a09b00b5 Merge branch 'i2c/for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (351c8a09b00b5 Merge branch 'i2c/for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (f25379de41238 extcon-intel-cht-wc: Don't reset USB data connection at probe) +$ git merge extcon/extcon-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1320 and retry the command. +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-intel-cht-wc.c | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) +Merging soundwire/next (dfcff3f8a5f18 soundwire: stream: make stream name a const pointer) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (dfda204198848 ACPI / property: Add two new Thunderbolt property GUIDs to the list) +$ git merge thunderbolt/next +Already up to date. +Merging staging/staging-next (351c8a09b00b5 Merge branch 'i2c/for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge staging/staging-next +Already up to date. +Merging mux/for-next (05fb8284a4171 Merge branch 'i2c-mux/for-next' into for-next) +$ git merge mux/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 3042 and retry the command. +Merge made by the 'recursive' strategy. +Merging icc/icc-next (6311b6521bcc8 drivers: qcom: Add BCM vote macro to header) +$ git merge icc/icc-next +Already up to date. +Merging slave-dma/next (c5c6faaee6e0c dmaengine: ti: edma: Use bitmap_set() instead of open coded edma_set_bits()) +$ git merge slave-dma/next +Already up to date. +Merging cgroup/for-next (275278e1525a4 Merge branch 'for-5.3-fixes' into for-next) +$ git merge cgroup/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (ae7ccd015ece5 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1246 and retry the command. +Merge made by the 'recursive' strategy. + drivers/scsi/scsi_lib.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging scsi-mkp/for-next (4f38b20f40c2c Merge branch '5.4/scsi-fixes' into 5.4/scsi-next) +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/lpfc/lpfc_sli4.h +CONFLICT (content): Merge conflict in drivers/scsi/lpfc/lpfc_sli4.h +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1320 and retry the command. +Resolved 'drivers/scsi/lpfc/lpfc_sli4.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b21d8bcb8da8f] Merge remote-tracking branch 'scsi-mkp/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging vhost/linux-next (0d4a3f2abbef7 Revert "vhost: block speculation of translated descriptors") +$ git merge vhost/linux-next +Already up to date. +Merging rpmsg/for-next (741dc0aa4122c Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging MAINTAINERS +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1320 and retry the command. +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging gpio/for-next (367677d498390 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging gpio-brgl/gpio/for-next (b630cea7bee7c gpio: mxc: Only get the second IRQ when there is more than one IRQ) +$ git merge gpio-brgl/gpio/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-mxc.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) +Merging gpio-intel/for-next (85af79659f455 MAINTAINERS: Remove stale record for gpio-intel-mid.c) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (cb0438e443608 pinctrl: meson-gxbb: Fix wrong pinning definition for uart_c) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (55dac43747be9 pinctrl: intel: mark intel_pin_to_gpio __maybe_unused) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-samsung/for-next (10971e2ab6eb8 pinctrl: samsung: Fix device node refcount leaks in init code) +$ git merge pinctrl-samsung/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1320 and retry the command. +Merge made by the 'recursive' strategy. + drivers/pinctrl/samsung/pinctrl-exynos.c | 14 +++++++++++--- + drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 6 +++++- + drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 6 +++++- + drivers/pinctrl/samsung/pinctrl-samsung.c | 10 ++++++++-- + 4 files changed, 29 insertions(+), 7 deletions(-) +Merging pwm/for-next (028bc338e5849 MAINTAINERS: Add myself as reviewer for the PWM subsystem) +$ git merge pwm/for-next +Auto-merging drivers/pwm/pwm-cros-ec.c +Auto-merging drivers/pwm/Kconfig +Auto-merging MAINTAINERS +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1320 and retry the command. +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/pwm-mediatek.txt | 2 + + Documentation/devicetree/bindings/pwm/pwm-sprd.txt | 40 +++ + MAINTAINERS | 3 + + drivers/gpio/gpio-mvebu.c | 2 +- + drivers/pwm/Kconfig | 13 +- + drivers/pwm/Makefile | 1 + + drivers/pwm/core.c | 40 +-- + drivers/pwm/pwm-atmel-hlcdc.c | 2 +- + drivers/pwm/pwm-atmel.c | 49 +--- + drivers/pwm/pwm-bcm-iproc.c | 2 +- + drivers/pwm/pwm-bcm2835.c | 19 +- + drivers/pwm/pwm-cros-ec.c | 2 +- + drivers/pwm/pwm-fsl-ftm.c | 8 +- + drivers/pwm/pwm-hibvt.c | 2 +- + drivers/pwm/pwm-imx-tpm.c | 4 +- + drivers/pwm/pwm-imx27.c | 6 +- + drivers/pwm/pwm-jz4740.c | 7 +- + drivers/pwm/pwm-lpss.c | 2 +- + drivers/pwm/pwm-mediatek.c | 225 +++++++-------- + drivers/pwm/pwm-meson.c | 4 +- + drivers/pwm/pwm-mxs.c | 4 +- + drivers/pwm/pwm-rcar.c | 4 +- + drivers/pwm/pwm-rockchip.c | 18 +- + drivers/pwm/pwm-sifive.c | 6 +- + drivers/pwm/pwm-sprd.c | 309 +++++++++++++++++++++ + drivers/pwm/pwm-sti.c | 4 +- + drivers/pwm/pwm-stm32-lp.c | 8 +- + drivers/pwm/pwm-stm32.c | 4 +- + drivers/pwm/pwm-sun4i.c | 10 +- + drivers/pwm/pwm-zx.c | 2 +- + include/linux/pwm.h | 4 +- + 31 files changed, 570 insertions(+), 236 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-sprd.txt + create mode 100644 drivers/pwm/pwm-sprd.c +Merging userns/for-next (318759b4737c3 signal/x86: Move tsk inside of CONFIG_MEMORY_FAILURE in do_sigbus) +$ git merge userns/for-next +Already up to date. +Merging ktest/for-next (aecea57f84b05 ktest: Fix some typos in config-bisect.pl) +$ git merge ktest/for-next +Already up to date. +Merging random/dev (58be0106c5306 random: fix soft lockup when trying to read from an uninitialized blocking pool) +$ git merge random/dev +Already up to date. +Merging kselftest/next (721cb3c8bc889 selftests: tpm2: install python files) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/tpm2/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/tpm2/Makefile +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1289 and retry the command. +Resolved 'tools/testing/selftests/tpm2/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 90b36f3cb88b9] Merge remote-tracking branch 'kselftest/next' +$ git diff -M --stat --summary HEAD^.. + tools/testing/selftests/Makefile | 22 ++++++------ + .../ftrace/test.d/trigger/trigger-snapshot.tc | 2 +- + tools/testing/selftests/livepatch/config | 2 ++ + tools/testing/selftests/seccomp/seccomp_bpf.c | 5 +++ + tools/testing/selftests/tpm2/Makefile | 1 + + tools/testing/selftests/watchdog/watchdog-test.c | 41 +++++++++++++++------- + 6 files changed, 48 insertions(+), 25 deletions(-) +Merging y2038/y2038 (870e0167cd9cf Merge tag 'compat-ioctl-5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground into y2038) +$ git merge y2038/y2038 +Auto-merging lib/iov_iter.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/blkdev.h +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/fuse/dev.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/ext4/ioctl.c +Auto-merging fs/ceph/super.h +Auto-merging fs/ceph/file.c +Auto-merging fs/btrfs/super.c +Auto-merging drivers/watchdog/f71808e_wdt.c +Auto-merging drivers/watchdog/ath79_wdt.c +Auto-merging drivers/video/fbdev/aty/atyfb_base.c +Auto-merging drivers/vhost/vsock.c +Auto-merging drivers/vhost/test.c +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/usb/core/devio.c +Auto-merging drivers/usb/class/usbtmc.c +Auto-merging drivers/usb/class/cdc-wdm.c +Auto-merging drivers/tty/tty_io.c +Auto-merging drivers/staging/android/ion/ion.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/pmcraid.c +Auto-merging drivers/scsi/cxlflash/main.c +Auto-merging drivers/rtc/rtc-ds1374.c +Auto-merging drivers/platform/x86/wmi.c +Auto-merging drivers/nvme/host/core.c +Auto-merging drivers/nvdimm/bus.c +Auto-merging drivers/net/ppp/ppp_generic.c +Auto-merging drivers/misc/mei/main.c +Auto-merging drivers/isdn/capi/capi.c +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/hwtracing/stm/core.c +Auto-merging drivers/hid/usbhid/hiddev.c +Auto-merging drivers/hid/hidraw.c +Auto-merging drivers/dma-buf/sync_file.c +Auto-merging drivers/dma-buf/sw_sync.c +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging drivers/char/random.c +Auto-merging drivers/char/ppdev.c +Auto-merging drivers/block/pktcdvd.c +Auto-merging drivers/android/binder.c +Auto-merging arch/um/drivers/hostaudio_kern.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1289 and retry the command. +Merge made by the 'recursive' strategy. + Documentation/networking/ppp_generic.txt | 2 + + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 1 + + arch/um/drivers/harddog_kern.c | 1 + + arch/um/drivers/hostaudio_kern.c | 1 + + block/scsi_ioctl.c | 132 +++- + drivers/android/binder.c | 2 +- + drivers/block/pktcdvd.c | 25 + + drivers/char/ipmi/ipmi_watchdog.c | 1 + + drivers/char/ppdev.c | 12 +- + drivers/char/random.c | 1 + + drivers/char/tpm/tpm_vtpm_proxy.c | 12 +- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 2 +- + drivers/dma-buf/dma-buf.c | 4 +- + drivers/dma-buf/sw_sync.c | 2 +- + drivers/dma-buf/sync_file.c | 2 +- + drivers/firewire/core-cdev.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- + drivers/hid/hidraw.c | 4 +- + drivers/hid/usbhid/hiddev.c | 11 +- + drivers/hwmon/fschmd.c | 1 + + drivers/hwtracing/stm/core.c | 12 +- + drivers/ide/ide-tape.c | 27 +- + drivers/iio/industrialio-core.c | 2 +- + drivers/infiniband/core/uverbs_main.c | 4 +- + drivers/isdn/capi/capi.c | 31 + + drivers/media/rc/lirc_dev.c | 4 +- + drivers/misc/cxl/flash.c | 8 +- + drivers/misc/genwqe/card_dev.c | 23 +- + drivers/misc/mei/main.c | 22 +- + drivers/misc/vmw_vmci/vmci_host.c | 2 +- + drivers/mtd/ubi/cdev.c | 36 +- + drivers/net/ppp/ppp_generic.c | 245 +++++--- + drivers/net/tap.c | 12 +- + drivers/nvdimm/bus.c | 4 +- + drivers/nvme/host/core.c | 2 +- + drivers/pci/switch/switchtec.c | 2 +- + drivers/platform/x86/wmi.c | 2 +- + drivers/rpmsg/rpmsg_char.c | 4 +- + drivers/rtc/dev.c | 13 +- + drivers/rtc/rtc-ds1374.c | 1 + + drivers/rtc/rtc-vr41xx.c | 10 + + drivers/s390/char/tape_char.c | 41 +- + drivers/sbus/char/display7seg.c | 2 +- + drivers/sbus/char/envctrl.c | 4 +- + drivers/scsi/3w-xxxx.c | 4 +- + drivers/scsi/cxlflash/main.c | 2 +- + drivers/scsi/esas2r/esas2r_main.c | 2 +- + drivers/scsi/megaraid/megaraid_mm.c | 28 +- + drivers/scsi/pmcraid.c | 4 +- + drivers/scsi/sd.c | 14 +- + drivers/scsi/sg.c | 59 +- + drivers/scsi/st.c | 28 +- + drivers/staging/android/ion/ion.c | 4 +- + drivers/staging/pi433/pi433_if.c | 12 +- + drivers/staging/vme/devices/vme_user.c | 2 +- + drivers/tee/tee_core.c | 2 +- + drivers/tty/tty_io.c | 5 + + drivers/usb/class/cdc-wdm.c | 2 +- + drivers/usb/class/usbtmc.c | 4 +- + drivers/usb/core/devio.c | 16 +- + drivers/usb/gadget/function/f_fs.c | 12 +- + drivers/vfio/vfio.c | 39 +- + drivers/vhost/net.c | 12 +- + drivers/vhost/scsi.c | 12 +- + drivers/vhost/test.c | 12 +- + drivers/vhost/vsock.c | 12 +- + drivers/video/fbdev/aty/atyfb_base.c | 12 +- + drivers/virt/fsl_hypervisor.c | 2 +- + drivers/watchdog/acquirewdt.c | 1 + + drivers/watchdog/advantechwdt.c | 1 + + drivers/watchdog/alim1535_wdt.c | 1 + + drivers/watchdog/alim7101_wdt.c | 1 + + drivers/watchdog/ar7_wdt.c | 1 + + drivers/watchdog/at91rm9200_wdt.c | 1 + + drivers/watchdog/ath79_wdt.c | 1 + + drivers/watchdog/bcm63xx_wdt.c | 1 + + drivers/watchdog/cpu5wdt.c | 1 + + drivers/watchdog/eurotechwdt.c | 1 + + drivers/watchdog/f71808e_wdt.c | 1 + + drivers/watchdog/gef_wdt.c | 1 + + drivers/watchdog/geodewdt.c | 1 + + drivers/watchdog/ib700wdt.c | 1 + + drivers/watchdog/ibmasr.c | 1 + + drivers/watchdog/indydog.c | 1 + + drivers/watchdog/intel_scu_watchdog.c | 1 + + drivers/watchdog/iop_wdt.c | 1 + + drivers/watchdog/it8712f_wdt.c | 1 + + drivers/watchdog/ixp4xx_wdt.c | 1 + + drivers/watchdog/m54xx_wdt.c | 1 + + drivers/watchdog/machzwd.c | 1 + + drivers/watchdog/mixcomwd.c | 1 + + drivers/watchdog/mtx-1_wdt.c | 1 + + drivers/watchdog/mv64x60_wdt.c | 1 + + drivers/watchdog/nv_tco.c | 1 + + drivers/watchdog/pc87413_wdt.c | 1 + + drivers/watchdog/pcwd.c | 1 + + drivers/watchdog/pcwd_pci.c | 1 + + drivers/watchdog/pcwd_usb.c | 1 + + drivers/watchdog/pika_wdt.c | 1 + + drivers/watchdog/pnx833x_wdt.c | 1 + + drivers/watchdog/rc32434_wdt.c | 1 + + drivers/watchdog/rdc321x_wdt.c | 1 + + drivers/watchdog/riowd.c | 1 + + drivers/watchdog/sa1100_wdt.c | 1 + + drivers/watchdog/sb_wdog.c | 1 + + drivers/watchdog/sbc60xxwdt.c | 1 + + drivers/watchdog/sbc7240_wdt.c | 1 + + drivers/watchdog/sbc_epx_c3.c | 1 + + drivers/watchdog/sbc_fitpc2_wdt.c | 1 + + drivers/watchdog/sc1200wdt.c | 1 + + drivers/watchdog/sc520_wdt.c | 1 + + drivers/watchdog/sch311x_wdt.c | 1 + + drivers/watchdog/scx200_wdt.c | 1 + + drivers/watchdog/smsc37b787_wdt.c | 1 + + drivers/watchdog/w83877f_wdt.c | 1 + + drivers/watchdog/w83977f_wdt.c | 1 + + drivers/watchdog/wafer5823wdt.c | 1 + + drivers/watchdog/watchdog_dev.c | 1 + + drivers/watchdog/wdrtas.c | 1 + + drivers/watchdog/wdt.c | 1 + + drivers/watchdog/wdt285.c | 1 + + drivers/watchdog/wdt977.c | 1 + + drivers/watchdog/wdt_pci.c | 1 + + fs/btrfs/super.c | 2 +- + fs/ceph/dir.c | 1 + + fs/ceph/file.c | 2 +- + fs/ceph/super.h | 1 + + fs/compat_ioctl.c | 917 ++-------------------------- + fs/ecryptfs/file.c | 1 + + fs/ext4/ioctl.c | 1 + + fs/f2fs/file.c | 1 + + fs/fat/file.c | 13 +- + fs/fuse/dev.c | 2 +- + fs/gfs2/file.c | 30 + + fs/hpfs/dir.c | 1 + + fs/hpfs/file.c | 1 + + fs/ioctl.c | 80 ++- + fs/nilfs2/ioctl.c | 1 + + fs/notify/fanotify/fanotify_user.c | 2 +- + fs/ocfs2/ioctl.c | 1 + + fs/userfaultfd.c | 2 +- + include/linux/blkdev.h | 2 + + include/linux/falloc.h | 20 + + include/linux/fs.h | 7 + + include/linux/mtio.h | 60 ++ + include/uapi/linux/ppp-ioctl.h | 2 + + include/uapi/linux/ppp_defs.h | 14 + + lib/iov_iter.c | 1 + + net/bluetooth/hci_sock.c | 21 +- + net/bluetooth/rfcomm/sock.c | 14 +- + net/rfkill/core.c | 2 +- + net/socket.c | 3 + + net/unix/af_unix.c | 19 + + sound/core/oss/pcm_oss.c | 4 + + sound/oss/dmasound/dmasound_core.c | 2 + + 155 files changed, 935 insertions(+), 1394 deletions(-) + create mode 100644 include/linux/mtio.h +Merging livepatching/for-next (1cfe141e17159 Merge branch 'for-5.4-core' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (c165d8947bc41 eeprom: Deprecate the legacy eeprom driver) +$ git merge coresight/next +Already up to date. +Merging rtc/rtc-next (b99a3120f9a30 rtc: meson: mark PM functions as __maybe_unused) +$ git merge rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (4c806b897d607 libnvdimm/region: Enable MAP_SYNC for volatile regions) +$ git merge nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (10742fee98eb3 eeprom: at24: remove unneeded include) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (e58aa8d1e5785 NTB: fix IDT Kconfig typos/spellos) +$ git merge ntb/ntb-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1289 and retry the command. +Merge made by the 'recursive' strategy. + drivers/ntb/hw/amd/ntb_hw_amd.c | 22 ++++++++++++++++++---- + drivers/ntb/hw/amd/ntb_hw_amd.h | 8 ++++++-- + drivers/ntb/hw/idt/Kconfig | 6 +++--- + drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 2 +- + drivers/ntb/ntb_transport.c | 2 +- + drivers/ntb/test/ntb_perf.c | 2 +- + 6 files changed, 30 insertions(+), 12 deletions(-) +Merging kspp/for-next/kspp (6f88ed285e675 Merge branch 'fixes/usercopy/highmem-fromlist' into for-next/kspp) +$ git merge kspp/for-next/kspp +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1289 and retry the command. +Merge made by the 'recursive' strategy. + mm/usercopy.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) +Merging cisco/for-next (9e98c678c2d6a Linux 5.1-rc1) +$ git merge cisco/for-next +Already up to date. +Merging gnss/gnss-next (f2c7c76c5d0a4 Linux 5.2-rc3) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/next (799e064cc79e7 fsi: scom: Don't abort operations for minor errors) +$ git merge fsi/next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1323 and retry the command. +Merge made by the 'recursive' strategy. +Merging siox/siox/next (1e4b044d22517 Linux 4.18-rc4) +$ git merge siox/siox/next +Already up to date. +Merging slimbus/for-next (0a43bffb7e213 slimbus: fix slim_tid_txn()) +$ git merge slimbus/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1323 and retry the command. +Merge made by the 'recursive' strategy. +Merging nvmem/for-next (ad732da57bded nvmem: core: fix nvmem_cell_write inline function) +$ git merge nvmem/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1323 and retry the command. +Merge made by the 'recursive' strategy. + include/linux/nvmem-consumer.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging xarray/xarray (91abab83839aa XArray: Fix xas_next() with a single entry at 0) +$ git merge xarray/xarray +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2968 and retry the command. +Merge made by the 'recursive' strategy. + lib/test_xarray.c | 24 ++++++++++++++++++++++++ + lib/xarray.c | 4 ++++ + 2 files changed, 28 insertions(+) +Merging hyperv/hyperv-next (d8bd2d442bb26 Drivers: hv: vmbus: Resume after fixing up old primary channels) +$ git merge hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (4d856f72c10ec Linux 5.3) +$ git merge auxdisplay/auxdisplay +Already up to date. +Merging kgdb-dt/kgdb/for-next (d8a050f5a3e82 kgdb: fix comment regarding static function) +$ git merge kgdb-dt/kgdb/for-next +Already up to date. +Merging pidfd/for-next (590ef0128b427 waitid: Add support for waiting for the current process group) +$ git merge pidfd/for-next +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging include/uapi/linux/sched.h +Auto-merging include/linux/sched/task.h +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1321 and retry the command. +Merge made by the 'recursive' strategy. + include/linux/pid.h | 2 +- + include/linux/sched/task.h | 1 + + include/uapi/linux/sched.h | 1 + + kernel/fork.c | 14 +- + kernel/pid.c | 37 +++- + tools/testing/selftests/clone3/.gitignore | 2 + + tools/testing/selftests/clone3/Makefile | 11 ++ + tools/testing/selftests/clone3/clone3.c | 231 ++++++++++++++++++++++++ + tools/testing/selftests/clone3/clone3_set_tid.c | 161 +++++++++++++++++ + 9 files changed, 450 insertions(+), 10 deletions(-) + create mode 100644 tools/testing/selftests/clone3/.gitignore + create mode 100644 tools/testing/selftests/clone3/Makefile + create mode 100644 tools/testing/selftests/clone3/clone3.c + create mode 100644 tools/testing/selftests/clone3/clone3_set_tid.c +Merging devfreq/for-next (d2f5fccd1ac93 PM / devfreq: Make log message more explicit when devfreq device already exists) +$ git merge devfreq/for-next +Auto-merging MAINTAINERS +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1292 and retry the command. +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/devfreq/devfreq.c | 2 +- + include/dt-bindings/pmu/exynos_ppmu.h | 25 +++++++++++++++++++++++++ + 3 files changed, 27 insertions(+), 1 deletion(-) + create mode 100644 include/dt-bindings/pmu/exynos_ppmu.h +Merging hmm/hmm (62974fc389b36 libnvdimm: Enable unit test infrastructure compile checks) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (e56476897448a fpga: Remove dev_err() usage after platform_get_irq()) +$ git merge fpga/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1327 and retry the command. +Merge made by the 'recursive' strategy. + drivers/fpga/zynq-fpga.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) +Merging akpm-current/current (f7dcf869ad39f ipc/msg.c: consolidate all xxxctl_down() functions) +$ git merge --no-ff akpm-current/current +Auto-merging net/xdp/xsk.c +Auto-merging net/xdp/xdp_umem.c +CONFLICT (content): Merge conflict in net/xdp/xdp_umem.c +Auto-merging mm/zswap.c +Auto-merging mm/zsmalloc.c +Auto-merging mm/vmscan.c +CONFLICT (content): Merge conflict in mm/vmscan.c +Auto-merging mm/vmalloc.c +Auto-merging mm/swapfile.c +Auto-merging mm/swap.c +Auto-merging mm/sparse.c +Auto-merging mm/slub.c +Auto-merging mm/slob.c +Auto-merging mm/slab_common.c +Auto-merging mm/shmem.c +Auto-merging mm/rmap.c +Auto-merging mm/page_alloc.c +Auto-merging mm/oom_kill.c +Auto-merging mm/mmap.c +Auto-merging mm/migrate.c +Auto-merging mm/memremap.c +Auto-merging mm/mempolicy.c +Auto-merging mm/memory_hotplug.c +Auto-merging mm/memory.c +CONFLICT (content): Merge conflict in mm/memory.c +Auto-merging mm/memcontrol.c +Auto-merging mm/madvise.c +Auto-merging mm/kmemleak.c +CONFLICT (content): Merge conflict in mm/kmemleak.c +Auto-merging mm/khugepaged.c +Auto-merging mm/huge_memory.c +CONFLICT (content): Merge conflict in mm/huge_memory.c +Auto-merging mm/filemap.c +Auto-merging mm/Kconfig +Auto-merging lib/iov_iter.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sysctl.c +Auto-merging kernel/sched/psi.c +Auto-merging kernel/sched/idle.c +Auto-merging kernel/resource.c +Auto-merging kernel/fork.c +Auto-merging kernel/dma/remap.c +Auto-merging kernel/debug/debug_core.c +Auto-merging ipc/mqueue.c +Auto-merging init/main.c +Auto-merging include/trace/events/writeback.h +Auto-merging include/linux/wait.h +Auto-merging include/linux/vmalloc.h +Auto-merging include/linux/slab.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/mm_types.h +CONFLICT (content): Merge conflict in include/linux/mm_types.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/memremap.h +CONFLICT (content): Merge conflict in include/linux/memremap.h +Auto-merging include/linux/memcontrol.h +Auto-merging include/linux/kexec.h +Auto-merging include/linux/huge_mm.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/cpumask.h +Auto-merging include/asm-generic/bug.h +Auto-merging fs/ramfs/inode.c +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/ocfs2/ioctl.c +Auto-merging fs/ocfs2/dlmglue.c +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/jbd2/transaction.c +Auto-merging fs/io_uring.c +Auto-merging fs/inode.c +Auto-merging fs/fat/inode.c +Auto-merging fs/fat/file.c +Auto-merging fs/f2fs/data.c +Auto-merging drivers/vfio/vfio_iommu_spapr_tce.c +Auto-merging drivers/infiniband/core/umem.c +Auto-merging drivers/gpu/drm/via/via_dmablit.c +Auto-merging drivers/crypto/chelsio/chtls/chtls_io.c +Auto-merging arch/unicore32/include/asm/pgtable.h +Auto-merging arch/um/include/asm/pgtable.h +Auto-merging arch/um/include/asm/pgalloc.h +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/riscv/include/asm/pgtable.h +CONFLICT (content): Merge conflict in arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/Kconfig +CONFLICT (content): Merge conflict in arch/riscv/Kconfig +Auto-merging arch/powerpc/mm/book3s64/hash_utils.c +Auto-merging arch/powerpc/include/asm/pgtable.h +Auto-merging arch/openrisc/include/asm/pgtable.h +Auto-merging arch/mips/include/asm/pgtable.h +Auto-merging arch/mips/Kconfig +Auto-merging arch/m68k/include/asm/pgtable_mm.h +Auto-merging arch/ia64/mm/init.c +Auto-merging arch/ia64/Kconfig +CONFLICT (content): Merge conflict in arch/ia64/Kconfig +Auto-merging arch/csky/include/asm/pgtable.h +Auto-merging arch/arm64/kernel/process.c +Auto-merging arch/arm64/include/asm/xen/page-coherent.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/xen/page-coherent.h +Auto-merging arch/arm64/include/asm/processor.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/processor.h +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/mm/dma-mapping.c +Auto-merging arch/arm/include/asm/xen/page-coherent.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/xen/page-coherent.h +Auto-merging arch/arm/include/asm/pgtable-nommu.h +Auto-merging arch/arm/Kconfig +Auto-merging arch/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/cgroup-v2.rst +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1295 and retry the command. +Resolved 'arch/arm/include/asm/xen/page-coherent.h' using previous resolution. +Recorded preimage for 'arch/arm64/include/asm/processor.h' +Resolved 'arch/arm64/include/asm/xen/page-coherent.h' using previous resolution. +Recorded preimage for 'arch/ia64/Kconfig' +Recorded preimage for 'arch/riscv/Kconfig' +Recorded preimage for 'arch/riscv/include/asm/pgtable.h' +Resolved 'include/linux/memremap.h' using previous resolution. +Recorded preimage for 'include/linux/mm_types.h' +Recorded preimage for 'mm/huge_memory.c' +Recorded preimage for 'mm/kmemleak.c' +Recorded preimage for 'mm/memory.c' +Recorded preimage for 'mm/vmscan.c' +Recorded preimage for 'net/xdp/xdp_umem.c' +Automatic merge failed; fix conflicts and then commit the result. +Merging akpm-current/current (f7dcf869ad39f ipc/msg.c: consolidate all xxxctl_down() functions) +$ git merge --no-ff akpm-current/current +Auto-merging net/xdp/xsk.c +Auto-merging net/xdp/xdp_umem.c +CONFLICT (content): Merge conflict in net/xdp/xdp_umem.c +Auto-merging mm/zswap.c +Auto-merging mm/zsmalloc.c +Auto-merging mm/vmscan.c +CONFLICT (content): Merge conflict in mm/vmscan.c +Auto-merging mm/vmalloc.c +Auto-merging mm/swapfile.c +Auto-merging mm/swap.c +Auto-merging mm/sparse.c +Auto-merging mm/slub.c +Auto-merging mm/slob.c +Auto-merging mm/slab_common.c +Auto-merging mm/shmem.c +Auto-merging mm/rmap.c +Auto-merging mm/page_alloc.c +Auto-merging mm/oom_kill.c +Auto-merging mm/mmap.c +Auto-merging mm/migrate.c +Auto-merging mm/memremap.c +Auto-merging mm/mempolicy.c +Auto-merging mm/memory_hotplug.c +Auto-merging mm/memory.c +CONFLICT (content): Merge conflict in mm/memory.c +Auto-merging mm/memcontrol.c +Auto-merging mm/madvise.c +Auto-merging mm/kmemleak.c +CONFLICT (content): Merge conflict in mm/kmemleak.c +Auto-merging mm/khugepaged.c +Auto-merging mm/huge_memory.c +CONFLICT (content): Merge conflict in mm/huge_memory.c +Auto-merging mm/filemap.c +Auto-merging mm/Kconfig +Auto-merging lib/iov_iter.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sysctl.c +Auto-merging kernel/sched/psi.c +Auto-merging kernel/sched/idle.c +Auto-merging kernel/resource.c +Auto-merging kernel/fork.c +Auto-merging kernel/dma/remap.c +Auto-merging kernel/debug/debug_core.c +Auto-merging ipc/mqueue.c +Auto-merging init/main.c +Auto-merging include/trace/events/writeback.h +Auto-merging include/linux/wait.h +Auto-merging include/linux/vmalloc.h +Auto-merging include/linux/slab.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/mm_types.h +CONFLICT (content): Merge conflict in include/linux/mm_types.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/memremap.h +CONFLICT (content): Merge conflict in include/linux/memremap.h +Auto-merging include/linux/memcontrol.h +Auto-merging include/linux/kexec.h +Auto-merging include/linux/huge_mm.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/cpumask.h +Auto-merging include/asm-generic/bug.h +Auto-merging fs/ramfs/inode.c +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/ocfs2/ioctl.c +Auto-merging fs/ocfs2/dlmglue.c +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/jbd2/transaction.c +Auto-merging fs/io_uring.c +Auto-merging fs/inode.c +Auto-merging fs/fat/inode.c +Auto-merging fs/fat/file.c +Auto-merging fs/f2fs/data.c +Auto-merging drivers/vfio/vfio_iommu_spapr_tce.c +Auto-merging drivers/infiniband/core/umem.c +Auto-merging drivers/gpu/drm/via/via_dmablit.c +Auto-merging drivers/crypto/chelsio/chtls/chtls_io.c +Auto-merging arch/unicore32/include/asm/pgtable.h +Auto-merging arch/um/include/asm/pgtable.h +Auto-merging arch/um/include/asm/pgalloc.h +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/riscv/include/asm/pgtable.h +CONFLICT (content): Merge conflict in arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/Kconfig +CONFLICT (content): Merge conflict in arch/riscv/Kconfig +Auto-merging arch/powerpc/mm/book3s64/hash_utils.c +Auto-merging arch/powerpc/include/asm/pgtable.h +Auto-merging arch/openrisc/include/asm/pgtable.h +Auto-merging arch/mips/include/asm/pgtable.h +Auto-merging arch/mips/Kconfig +Auto-merging arch/m68k/include/asm/pgtable_mm.h +Auto-merging arch/ia64/mm/init.c +Auto-merging arch/ia64/Kconfig +CONFLICT (content): Merge conflict in arch/ia64/Kconfig +Auto-merging arch/csky/include/asm/pgtable.h +Auto-merging arch/arm64/kernel/process.c +Auto-merging arch/arm64/include/asm/xen/page-coherent.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/xen/page-coherent.h +Auto-merging arch/arm64/include/asm/processor.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/processor.h +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/mm/dma-mapping.c +Auto-merging arch/arm/include/asm/xen/page-coherent.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/xen/page-coherent.h +Auto-merging arch/arm/include/asm/pgtable-nommu.h +Auto-merging arch/arm/Kconfig +Auto-merging arch/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/cgroup-v2.rst +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1295 and retry the command. +Resolved 'arch/arm/include/asm/xen/page-coherent.h' using previous resolution. +Recorded preimage for 'arch/arm64/include/asm/processor.h' +Resolved 'arch/arm64/include/asm/xen/page-coherent.h' using previous resolution. +Recorded preimage for 'arch/ia64/Kconfig' +Recorded preimage for 'arch/riscv/Kconfig' +Recorded preimage for 'arch/riscv/include/asm/pgtable.h' +Resolved 'include/linux/memremap.h' using previous resolution. +Recorded preimage for 'include/linux/mm_types.h' +Recorded preimage for 'mm/huge_memory.c' +Recorded preimage for 'mm/kmemleak.c' +Recorded preimage for 'mm/memory.c' +Recorded preimage for 'mm/vmscan.c' +Recorded preimage for 'net/xdp/xdp_umem.c' +Automatic merge failed; fix conflicts and then commit the result. +Merging akpm-current/current (6832daf28b944 ipc/msg.c: consolidate all xxxctl_down() functions) +$ git merge --no-ff akpm-current/current +Auto-merging net/xdp/xsk.c +Auto-merging net/xdp/xdp_umem.c +CONFLICT (content): Merge conflict in net/xdp/xdp_umem.c +Auto-merging mm/zswap.c +Auto-merging mm/zsmalloc.c +Auto-merging mm/z3fold.c +CONFLICT (content): Merge conflict in mm/z3fold.c +Auto-merging mm/vmscan.c +CONFLICT (content): Merge conflict in mm/vmscan.c +Auto-merging mm/vmalloc.c +Auto-merging mm/swapfile.c +Auto-merging mm/swap.c +Auto-merging mm/sparse.c +Auto-merging mm/slub.c +Auto-merging mm/slob.c +Auto-merging mm/slab_common.c +Auto-merging mm/shmem.c +Auto-merging mm/rmap.c +Auto-merging mm/page_alloc.c +Auto-merging mm/oom_kill.c +Auto-merging mm/mmap.c +Auto-merging mm/migrate.c +Auto-merging mm/memremap.c +Auto-merging mm/mempolicy.c +Auto-merging mm/memory_hotplug.c +Auto-merging mm/memory.c +CONFLICT (content): Merge conflict in mm/memory.c +Auto-merging mm/memcontrol.c +CONFLICT (content): Merge conflict in mm/memcontrol.c +Auto-merging mm/madvise.c +Auto-merging mm/kmemleak.c +CONFLICT (content): Merge conflict in mm/kmemleak.c +Auto-merging mm/khugepaged.c +Auto-merging mm/huge_memory.c +CONFLICT (content): Merge conflict in mm/huge_memory.c +Auto-merging mm/filemap.c +Auto-merging mm/Kconfig +Auto-merging lib/iov_iter.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sysctl.c +Auto-merging kernel/sched/psi.c +Auto-merging kernel/sched/idle.c +Auto-merging kernel/resource.c +Auto-merging kernel/fork.c +Auto-merging kernel/dma/remap.c +Auto-merging kernel/debug/debug_core.c +Auto-merging ipc/mqueue.c +Auto-merging init/main.c +Auto-merging include/trace/events/writeback.h +Auto-merging include/linux/wait.h +Auto-merging include/linux/vmalloc.h +Auto-merging include/linux/slab.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/mm_types.h +CONFLICT (content): Merge conflict in include/linux/mm_types.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/memremap.h +CONFLICT (content): Merge conflict in include/linux/memremap.h +Auto-merging include/linux/memcontrol.h +Auto-merging include/linux/kexec.h +Auto-merging include/linux/huge_mm.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/cpumask.h +Auto-merging include/asm-generic/bug.h +Auto-merging fs/ramfs/inode.c +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/ocfs2/ioctl.c +Auto-merging fs/ocfs2/dlmglue.c +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/jbd2/transaction.c +Auto-merging fs/io_uring.c +Auto-merging fs/inode.c +Auto-merging fs/fat/inode.c +Auto-merging fs/fat/file.c +Auto-merging fs/f2fs/data.c +Auto-merging drivers/vfio/vfio_iommu_spapr_tce.c +Auto-merging drivers/infiniband/core/umem.c +Auto-merging drivers/gpu/drm/via/via_dmablit.c +Auto-merging drivers/crypto/chelsio/chtls/chtls_io.c +Auto-merging arch/unicore32/include/asm/pgtable.h +Auto-merging arch/um/include/asm/pgtable.h +Auto-merging arch/um/include/asm/pgalloc.h +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/riscv/include/asm/pgtable.h +CONFLICT (content): Merge conflict in arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/Kconfig +CONFLICT (content): Merge conflict in arch/riscv/Kconfig +Auto-merging arch/powerpc/mm/book3s64/hash_utils.c +Auto-merging arch/powerpc/include/asm/pgtable.h +Auto-merging arch/openrisc/include/asm/pgtable.h +Auto-merging arch/mips/include/asm/pgtable.h +Auto-merging arch/mips/Kconfig +Auto-merging arch/m68k/include/asm/pgtable_mm.h +Auto-merging arch/ia64/mm/init.c +Auto-merging arch/ia64/Kconfig +CONFLICT (content): Merge conflict in arch/ia64/Kconfig +Auto-merging arch/csky/include/asm/pgtable.h +Auto-merging arch/arm64/kernel/process.c +Auto-merging arch/arm64/include/asm/xen/page-coherent.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/xen/page-coherent.h +Auto-merging arch/arm64/include/asm/processor.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/processor.h +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/mm/dma-mapping.c +Auto-merging arch/arm/include/asm/xen/page-coherent.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/xen/page-coherent.h +Auto-merging arch/arm/include/asm/pgtable-nommu.h +Auto-merging arch/arm/Kconfig +Auto-merging arch/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging .mailmap +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1295 and retry the command. +Resolved 'arch/arm/include/asm/xen/page-coherent.h' using previous resolution. +Recorded preimage for 'arch/arm64/include/asm/processor.h' +Resolved 'arch/arm64/include/asm/xen/page-coherent.h' using previous resolution. +Recorded preimage for 'arch/ia64/Kconfig' +Recorded preimage for 'arch/riscv/Kconfig' +Recorded preimage for 'arch/riscv/include/asm/pgtable.h' +Resolved 'include/linux/memremap.h' using previous resolution. +Recorded preimage for 'include/linux/mm_types.h' +Recorded preimage for 'mm/huge_memory.c' +Recorded preimage for 'mm/kmemleak.c' +Recorded preimage for 'mm/memcontrol.c' +Recorded preimage for 'mm/memory.c' +Recorded preimage for 'mm/vmscan.c' +Recorded preimage for 'mm/z3fold.c' +Recorded preimage for 'net/xdp/xdp_umem.c' +Automatic merge failed; fix conflicts and then commit the result. +Merging akpm-current/current (6832daf28b944 ipc/msg.c: consolidate all xxxctl_down() functions) +$ git merge --no-ff akpm-current/current +Auto-merging net/xdp/xsk.c +Auto-merging net/xdp/xdp_umem.c +CONFLICT (content): Merge conflict in net/xdp/xdp_umem.c +Auto-merging mm/zswap.c +Auto-merging mm/zsmalloc.c +Auto-merging mm/z3fold.c +CONFLICT (content): Merge conflict in mm/z3fold.c +Auto-merging mm/vmscan.c +CONFLICT (content): Merge conflict in mm/vmscan.c +Auto-merging mm/vmalloc.c +Auto-merging mm/swapfile.c +Auto-merging mm/swap.c +Auto-merging mm/sparse.c +Auto-merging mm/slub.c +Auto-merging mm/slob.c +Auto-merging mm/slab_common.c +Auto-merging mm/shmem.c +Auto-merging mm/rmap.c +Auto-merging mm/page_alloc.c +Auto-merging mm/oom_kill.c +Auto-merging mm/mmap.c +Auto-merging mm/migrate.c +Auto-merging mm/memremap.c +Auto-merging mm/mempolicy.c +Auto-merging mm/memory_hotplug.c +Auto-merging mm/memory.c +CONFLICT (content): Merge conflict in mm/memory.c +Auto-merging mm/memcontrol.c +CONFLICT (content): Merge conflict in mm/memcontrol.c +Auto-merging mm/madvise.c +Auto-merging mm/kmemleak.c +CONFLICT (content): Merge conflict in mm/kmemleak.c +Auto-merging mm/khugepaged.c +Auto-merging mm/huge_memory.c +CONFLICT (content): Merge conflict in mm/huge_memory.c +Auto-merging mm/filemap.c +Auto-merging mm/Kconfig +Auto-merging lib/iov_iter.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sysctl.c +Auto-merging kernel/sched/psi.c +Auto-merging kernel/sched/idle.c +Auto-merging kernel/resource.c +Auto-merging kernel/fork.c +Auto-merging kernel/dma/remap.c +Auto-merging kernel/debug/debug_core.c +Auto-merging ipc/mqueue.c +Auto-merging init/main.c +Auto-merging include/trace/events/writeback.h +Auto-merging include/linux/wait.h +Auto-merging include/linux/vmalloc.h +Auto-merging include/linux/slab.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/mm_types.h +CONFLICT (content): Merge conflict in include/linux/mm_types.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/memremap.h +CONFLICT (content): Merge conflict in include/linux/memremap.h +Auto-merging include/linux/memcontrol.h +Auto-merging include/linux/kexec.h +Auto-merging include/linux/huge_mm.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/cpumask.h +Auto-merging include/asm-generic/bug.h +Auto-merging fs/ramfs/inode.c +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/ocfs2/ioctl.c +Auto-merging fs/ocfs2/dlmglue.c +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/jbd2/transaction.c +Auto-merging fs/io_uring.c +Auto-merging fs/inode.c +Auto-merging fs/fat/inode.c +Auto-merging fs/fat/file.c +Auto-merging fs/f2fs/data.c +Auto-merging drivers/vfio/vfio_iommu_spapr_tce.c +Auto-merging drivers/infiniband/core/umem.c +Auto-merging drivers/gpu/drm/via/via_dmablit.c +Auto-merging drivers/crypto/chelsio/chtls/chtls_io.c +Auto-merging arch/unicore32/include/asm/pgtable.h +Auto-merging arch/um/include/asm/pgtable.h +Auto-merging arch/um/include/asm/pgalloc.h +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/riscv/include/asm/pgtable.h +CONFLICT (content): Merge conflict in arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/Kconfig +CONFLICT (content): Merge conflict in arch/riscv/Kconfig +Auto-merging arch/powerpc/mm/book3s64/hash_utils.c +Auto-merging arch/powerpc/include/asm/pgtable.h +Auto-merging arch/openrisc/include/asm/pgtable.h +Auto-merging arch/mips/include/asm/pgtable.h +Auto-merging arch/mips/Kconfig +Auto-merging arch/m68k/include/asm/pgtable_mm.h +Auto-merging arch/ia64/mm/init.c +Auto-merging arch/ia64/Kconfig +CONFLICT (content): Merge conflict in arch/ia64/Kconfig +Auto-merging arch/csky/include/asm/pgtable.h +Auto-merging arch/arm64/kernel/process.c +Auto-merging arch/arm64/include/asm/xen/page-coherent.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/xen/page-coherent.h +Auto-merging arch/arm64/include/asm/processor.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/processor.h +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/mm/dma-mapping.c +Auto-merging arch/arm/include/asm/xen/page-coherent.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/xen/page-coherent.h +Auto-merging arch/arm/include/asm/pgtable-nommu.h +Auto-merging arch/arm/Kconfig +Auto-merging arch/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging .mailmap +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1295 and retry the command. +Resolved 'arch/arm/include/asm/xen/page-coherent.h' using previous resolution. +Recorded preimage for 'arch/arm64/include/asm/processor.h' +Resolved 'arch/arm64/include/asm/xen/page-coherent.h' using previous resolution. +Recorded preimage for 'arch/ia64/Kconfig' +Recorded preimage for 'arch/riscv/Kconfig' +Recorded preimage for 'arch/riscv/include/asm/pgtable.h' +Resolved 'include/linux/memremap.h' using previous resolution. +Recorded preimage for 'include/linux/mm_types.h' +Recorded preimage for 'mm/huge_memory.c' +Recorded preimage for 'mm/kmemleak.c' +Recorded preimage for 'mm/memcontrol.c' +Recorded preimage for 'mm/memory.c' +Recorded preimage for 'mm/vmscan.c' +Recorded preimage for 'mm/z3fold.c' +Recorded preimage for 'net/xdp/xdp_umem.c' +Automatic merge failed; fix conflicts and then commit the result. +Merging akpm-current/current (2f9b49ccdf29d ipc/msg.c: consolidate all xxxctl_down() functions) +$ git merge --no-ff akpm-current/current +Auto-merging lib/Kconfig.debug +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/memremap.h +Auto-merging include/linux/kexec.h +Auto-merging fs/userfaultfd.c +Auto-merging fs/ocfs2/ioctl.c +Auto-merging fs/namespace.c +Auto-merging fs/fat/file.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 20 +- + Documentation/admin-guide/sysctl/kernel.rst | 20 +- + Documentation/core-api/genalloc.rst | 2 +- + Documentation/core-api/kernel-api.rst | 3 + + Documentation/core-api/memory-allocation.rst | 4 + + Documentation/process/deprecated.rst | 10 +- + Documentation/vm/split_page_table_lock.rst | 10 +- + arch/alpha/include/uapi/asm/mman.h | 3 + + arch/arc/include/asm/pgalloc.h | 4 +- + arch/arm/include/asm/tlb.h | 2 +- + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm/mm/mmu.c | 2 +- + arch/arm64/include/asm/tlb.h | 2 +- + arch/arm64/mm/mmu.c | 2 +- + arch/csky/include/asm/pgalloc.h | 2 +- + arch/hexagon/include/asm/pgalloc.h | 2 +- + arch/hexagon/mm/init.c | 13 -- + arch/m68k/include/asm/mcf_pgalloc.h | 6 +- + arch/m68k/include/asm/motorola_pgalloc.h | 6 +- + arch/m68k/include/asm/sun3_pgalloc.h | 2 +- + arch/mips/include/asm/pgalloc.h | 2 +- + arch/mips/include/uapi/asm/mman.h | 3 + + arch/nios2/include/asm/pgalloc.h | 2 +- + arch/openrisc/include/asm/pgalloc.h | 6 +- + arch/parisc/include/uapi/asm/mman.h | 3 + + arch/powerpc/mm/pgtable-frag.c | 6 +- + arch/riscv/include/asm/pgalloc.h | 2 +- + arch/s390/mm/pgalloc.c | 6 +- + arch/sh/include/asm/pgalloc.h | 2 +- + arch/sparc/include/asm/pgtable_64.h | 5 +- + arch/sparc/mm/init_64.c | 4 +- + arch/sparc/mm/srmmu.c | 4 +- + arch/um/include/asm/pgalloc.h | 2 +- + arch/unicore32/include/asm/tlb.h | 2 +- + arch/x86/mm/pat_rbtree.c | 19 +- + arch/x86/mm/pgtable.c | 2 +- + arch/xtensa/include/asm/pgalloc.h | 4 +- + arch/xtensa/include/uapi/asm/mman.h | 3 + + drivers/block/drbd/drbd_interval.c | 29 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 + + drivers/gpu/drm/radeon/radeon_gem.c | 2 + + drivers/infiniband/hw/hfi1/verbs.c | 2 +- + drivers/media/v4l2-core/videobuf-dma-contig.c | 9 +- + drivers/misc/sram-exec.c | 2 +- + drivers/net/wimax/i2400m/tx.c | 3 +- + drivers/tee/tee_shm.c | 1 + + drivers/vfio/vfio_iommu_type1.c | 2 + + drivers/xen/events/events_base.c | 2 +- + fs/aio.c | 9 +- + fs/buffer.c | 56 ++++- + fs/fat/dir.c | 4 +- + fs/fat/fat.h | 1 + + fs/fat/file.c | 8 +- + fs/fat/inode.c | 22 +- + fs/fs-writeback.c | 9 +- + fs/namespace.c | 2 +- + fs/ntfs/mft.c | 12 +- + fs/ntfs/namei.c | 2 +- + fs/ntfs/runlist.c | 2 +- + fs/ntfs/super.c | 2 +- + fs/ocfs2/aops.c | 25 ++- + fs/ocfs2/ioctl.c | 2 +- + fs/ocfs2/xattr.c | 56 ++--- + fs/open.c | 2 +- + fs/proc/page.c | 40 ++-- + fs/ramfs/inode.c | 12 + + fs/reiserfs/do_balan.c | 15 +- + fs/reiserfs/fix_node.c | 6 +- + fs/reiserfs/journal.c | 22 +- + fs/reiserfs/lbalance.c | 3 +- + fs/reiserfs/objectid.c | 3 +- + fs/reiserfs/prints.c | 3 - + fs/reiserfs/stree.c | 4 - + fs/userfaultfd.c | 22 +- + fs/xfs/xfs_buf.c | 4 +- + include/asm-generic/bug.h | 53 ++--- + include/asm-generic/pgalloc.h | 8 +- + include/linux/cpumask.h | 14 +- + include/linux/genalloc.h | 2 +- + include/linux/interval_tree_generic.h | 22 +- + include/linux/kexec.h | 2 + + include/linux/kgdb.h | 2 + + include/linux/memcontrol.h | 29 +++ + include/linux/memory_hotplug.h | 1 + + include/linux/memremap.h | 6 + + include/linux/mm.h | 4 +- + include/linux/mm_types_task.h | 4 + + include/linux/printk.h | 22 +- + include/linux/rbtree_augmented.h | 88 ++++++-- + include/linux/sched.h | 9 + + include/linux/sched/sysctl.h | 1 + + include/linux/slab.h | 4 + + include/linux/string.h | 50 ++++- + include/linux/swap.h | 2 + + include/linux/thread_info.h | 2 +- + include/linux/uaccess.h | 21 +- + include/linux/wait.h | 4 +- + include/trace/events/vmscan.h | 71 +++++- + include/trace/events/writeback.h | 38 ++-- + include/uapi/asm-generic/mman-common.h | 3 + + include/uapi/linux/coff.h | 5 + + ipc/mqueue.c | 22 +- + ipc/msg.c | 18 +- + ipc/sem.c | 3 +- + kernel/debug/debug_core.c | 31 +-- + kernel/dma/remap.c | 2 +- + kernel/elfcore.c | 1 + + kernel/fork.c | 20 +- + kernel/hung_task.c | 94 ++++++-- + kernel/kexec_core.c | 2 + + kernel/panic.c | 42 ++-- + kernel/sysctl.c | 8 + + lib/Kconfig.debug | 10 +- + lib/bug.c | 11 +- + lib/extable.c | 1 + + lib/genalloc.c | 5 +- + lib/generic-radix-tree.c | 4 +- + lib/hexdump.c | 21 -- + lib/lzo/lzo1x_compress.c | 14 +- + lib/math/rational.c | 63 ++++-- + lib/rbtree_test.c | 37 ++-- + lib/string.c | 12 +- + lib/strncpy_from_user.c | 3 +- + lib/strnlen_user.c | 3 +- + mm/frame_vector.c | 2 + + mm/gup.c | 4 + + mm/internal.h | 2 +- + mm/madvise.c | 268 ++++++++++++++++++++++- + mm/memcontrol.c | 15 ++ + mm/memory_hotplug.c | 17 +- + mm/mempolicy.c | 3 + + mm/memremap.c | 27 ++- + mm/migrate.c | 2 +- + mm/mincore.c | 2 + + mm/mlock.c | 4 + + mm/mmap.c | 77 ++++--- + mm/mprotect.c | 2 + + mm/mremap.c | 3 + + mm/msync.c | 2 + + mm/oom_kill.c | 69 +++--- + mm/shuffle.c | 2 +- + mm/slab_common.c | 19 +- + mm/slob.c | 62 ++++-- + mm/slub.c | 14 +- + mm/sparse.c | 2 +- + mm/swap.c | 42 ++++ + mm/vmalloc.c | 5 +- + mm/vmscan.c | 167 +++++++++++--- + scripts/checkpatch.pl | 93 ++++++-- + scripts/gdb/linux/symbols.py | 4 +- + tools/include/linux/rbtree.h | 71 ++++-- + tools/include/linux/rbtree_augmented.h | 119 ++++++---- + tools/lib/rbtree.c | 37 +--- + 154 files changed, 1821 insertions(+), 807 deletions(-) +$ git am -3 ../patches/0001-mm-merge-fix-for-pagewalk-separate-function-pointers.patch +Applying: mm: merge fix for "pagewalk: separate function pointers from iterator data" +Using index info to reconstruct a base tree... +M mm/madvise.c +Falling back to patching base and 3-way merge... +Auto-merging mm/madvise.c +CONFLICT (content): Merge conflict in mm/madvise.c +Resolved 'mm/madvise.c' using previous resolution. +error: Failed to merge in the changes. +hint: Use 'git am --show-current-patch' to see the failed patch +Patch failed at 0001 mm: merge fix for "pagewalk: separate function pointers from iterator data" +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +$ git reset HEAD^ +Unstaged changes after reset: +M mm/madvise.c +$ git add -A . +$ git commit -v -a --amend +[master d90e261116170] Merge branch 'akpm-current/current' + Date: Wed Sep 25 18:46:30 2019 -0700 +Merging akpm-current/current (2f9b49ccdf29d ipc/msg.c: consolidate all xxxctl_down() functions) +$ git merge --no-ff akpm-current/current +Already up to date. +$ git am -3 ../patches/0001-mm-merge-fix-for-pagewalk-separate-function-pointers.patch +Applying: mm: merge fix for "pagewalk: separate function pointers from iterator data" +Using index info to reconstruct a base tree... +M mm/madvise.c +Falling back to patching base and 3-way merge... +Auto-merging mm/madvise.c +CONFLICT (content): Merge conflict in mm/madvise.c +Recorded preimage for 'mm/madvise.c' +error: Failed to merge in the changes. +hint: Use 'git am --show-current-patch' to see the failed patch +Patch failed at 0001 mm: merge fix for "pagewalk: separate function pointers from iterator data" +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +Merging akpm-current/current (2f9b49ccdf29d ipc/msg.c: consolidate all xxxctl_down() functions) +$ git merge --no-ff akpm-current/current +Already up to date. +$ git am -3 ../patches/0001-mm-merge-fix-for-pagewalk-separate-function-pointers.patch +fatal: previous rebase directory .git/rebase-apply still exists but mbox given. +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Merging akpm-current/current (2f9b49ccdf29d ipc/msg.c: consolidate all xxxctl_down() functions) +$ git merge --no-ff akpm-current/current +Auto-merging lib/Kconfig.debug +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/memremap.h +Auto-merging include/linux/kexec.h +Auto-merging fs/userfaultfd.c +Auto-merging fs/ocfs2/ioctl.c +Auto-merging fs/namespace.c +Auto-merging fs/fat/file.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 20 +- + Documentation/admin-guide/sysctl/kernel.rst | 20 +- + Documentation/core-api/genalloc.rst | 2 +- + Documentation/core-api/kernel-api.rst | 3 + + Documentation/core-api/memory-allocation.rst | 4 + + Documentation/process/deprecated.rst | 10 +- + Documentation/vm/split_page_table_lock.rst | 10 +- + arch/alpha/include/uapi/asm/mman.h | 3 + + arch/arc/include/asm/pgalloc.h | 4 +- + arch/arm/include/asm/tlb.h | 2 +- + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm/mm/mmu.c | 2 +- + arch/arm64/include/asm/tlb.h | 2 +- + arch/arm64/mm/mmu.c | 2 +- + arch/csky/include/asm/pgalloc.h | 2 +- + arch/hexagon/include/asm/pgalloc.h | 2 +- + arch/hexagon/mm/init.c | 13 -- + arch/m68k/include/asm/mcf_pgalloc.h | 6 +- + arch/m68k/include/asm/motorola_pgalloc.h | 6 +- + arch/m68k/include/asm/sun3_pgalloc.h | 2 +- + arch/mips/include/asm/pgalloc.h | 2 +- + arch/mips/include/uapi/asm/mman.h | 3 + + arch/nios2/include/asm/pgalloc.h | 2 +- + arch/openrisc/include/asm/pgalloc.h | 6 +- + arch/parisc/include/uapi/asm/mman.h | 3 + + arch/powerpc/mm/pgtable-frag.c | 6 +- + arch/riscv/include/asm/pgalloc.h | 2 +- + arch/s390/mm/pgalloc.c | 6 +- + arch/sh/include/asm/pgalloc.h | 2 +- + arch/sparc/include/asm/pgtable_64.h | 5 +- + arch/sparc/mm/init_64.c | 4 +- + arch/sparc/mm/srmmu.c | 4 +- + arch/um/include/asm/pgalloc.h | 2 +- + arch/unicore32/include/asm/tlb.h | 2 +- + arch/x86/mm/pat_rbtree.c | 19 +- + arch/x86/mm/pgtable.c | 2 +- + arch/xtensa/include/asm/pgalloc.h | 4 +- + arch/xtensa/include/uapi/asm/mman.h | 3 + + drivers/block/drbd/drbd_interval.c | 29 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 + + drivers/gpu/drm/radeon/radeon_gem.c | 2 + + drivers/infiniband/hw/hfi1/verbs.c | 2 +- + drivers/media/v4l2-core/videobuf-dma-contig.c | 9 +- + drivers/misc/sram-exec.c | 2 +- + drivers/net/wimax/i2400m/tx.c | 3 +- + drivers/tee/tee_shm.c | 1 + + drivers/vfio/vfio_iommu_type1.c | 2 + + drivers/xen/events/events_base.c | 2 +- + fs/aio.c | 9 +- + fs/buffer.c | 56 ++++- + fs/fat/dir.c | 4 +- + fs/fat/fat.h | 1 + + fs/fat/file.c | 8 +- + fs/fat/inode.c | 22 +- + fs/fs-writeback.c | 9 +- + fs/namespace.c | 2 +- + fs/ntfs/mft.c | 12 +- + fs/ntfs/namei.c | 2 +- + fs/ntfs/runlist.c | 2 +- + fs/ntfs/super.c | 2 +- + fs/ocfs2/aops.c | 25 ++- + fs/ocfs2/ioctl.c | 2 +- + fs/ocfs2/xattr.c | 56 ++--- + fs/open.c | 2 +- + fs/proc/page.c | 40 ++-- + fs/ramfs/inode.c | 12 + + fs/reiserfs/do_balan.c | 15 +- + fs/reiserfs/fix_node.c | 6 +- + fs/reiserfs/journal.c | 22 +- + fs/reiserfs/lbalance.c | 3 +- + fs/reiserfs/objectid.c | 3 +- + fs/reiserfs/prints.c | 3 - + fs/reiserfs/stree.c | 4 - + fs/userfaultfd.c | 22 +- + fs/xfs/xfs_buf.c | 4 +- + include/asm-generic/bug.h | 53 ++--- + include/asm-generic/pgalloc.h | 8 +- + include/linux/cpumask.h | 14 +- + include/linux/genalloc.h | 2 +- + include/linux/interval_tree_generic.h | 22 +- + include/linux/kexec.h | 2 + + include/linux/kgdb.h | 2 + + include/linux/memcontrol.h | 29 +++ + include/linux/memory_hotplug.h | 1 + + include/linux/memremap.h | 6 + + include/linux/mm.h | 4 +- + include/linux/mm_types_task.h | 4 + + include/linux/printk.h | 22 +- + include/linux/rbtree_augmented.h | 88 ++++++-- + include/linux/sched.h | 9 + + include/linux/sched/sysctl.h | 1 + + include/linux/slab.h | 4 + + include/linux/string.h | 50 ++++- + include/linux/swap.h | 2 + + include/linux/thread_info.h | 2 +- + include/linux/uaccess.h | 21 +- + include/linux/wait.h | 4 +- + include/trace/events/vmscan.h | 71 +++++- + include/trace/events/writeback.h | 38 ++-- + include/uapi/asm-generic/mman-common.h | 3 + + include/uapi/linux/coff.h | 5 + + ipc/mqueue.c | 22 +- + ipc/msg.c | 18 +- + ipc/sem.c | 3 +- + kernel/debug/debug_core.c | 31 +-- + kernel/dma/remap.c | 2 +- + kernel/elfcore.c | 1 + + kernel/fork.c | 20 +- + kernel/hung_task.c | 94 ++++++-- + kernel/kexec_core.c | 2 + + kernel/panic.c | 42 ++-- + kernel/sysctl.c | 8 + + lib/Kconfig.debug | 10 +- + lib/bug.c | 11 +- + lib/extable.c | 1 + + lib/genalloc.c | 5 +- + lib/generic-radix-tree.c | 4 +- + lib/hexdump.c | 21 -- + lib/lzo/lzo1x_compress.c | 14 +- + lib/math/rational.c | 63 ++++-- + lib/rbtree_test.c | 37 ++-- + lib/string.c | 12 +- + lib/strncpy_from_user.c | 3 +- + lib/strnlen_user.c | 3 +- + mm/frame_vector.c | 2 + + mm/gup.c | 4 + + mm/internal.h | 2 +- + mm/madvise.c | 268 ++++++++++++++++++++++- + mm/memcontrol.c | 15 ++ + mm/memory_hotplug.c | 17 +- + mm/mempolicy.c | 3 + + mm/memremap.c | 27 ++- + mm/migrate.c | 2 +- + mm/mincore.c | 2 + + mm/mlock.c | 4 + + mm/mmap.c | 77 ++++--- + mm/mprotect.c | 2 + + mm/mremap.c | 3 + + mm/msync.c | 2 + + mm/oom_kill.c | 69 +++--- + mm/shuffle.c | 2 +- + mm/slab_common.c | 19 +- + mm/slob.c | 62 ++++-- + mm/slub.c | 14 +- + mm/sparse.c | 2 +- + mm/swap.c | 42 ++++ + mm/vmalloc.c | 5 +- + mm/vmscan.c | 167 +++++++++++--- + scripts/checkpatch.pl | 93 ++++++-- + scripts/gdb/linux/symbols.py | 4 +- + tools/include/linux/rbtree.h | 71 ++++-- + tools/include/linux/rbtree_augmented.h | 119 ++++++---- + tools/lib/rbtree.c | 37 +--- + 154 files changed, 1821 insertions(+), 807 deletions(-) +$ git am -3 ../patches/0001-mm-merge-fix-for-pagewalk-separate-function-pointers.patch +fatal: previous rebase directory .git/rebase-apply still exists but mbox given. +$ git clone -s -l -n -q . ../rebase-tmp +fatal: destination path '../rebase-tmp' already exists and is not an empty directory. +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +fatal: 'remotes/origin/akpm/master' is not a commit and a branch 'akpm' cannot be created from it +$ git rebase --onto master remotes/origin/akpm/master-base +fatal: invalid upstream 'remotes/origin/akpm/master-base' +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +fatal: '../rebase-tmp' does not appear to be a git repository +fatal: Could not read from remote repository. + +Please make sure you have the correct access rights +and the repository exists. +Merging akpm-current/current (2f9b49ccdf29d ipc/msg.c: consolidate all xxxctl_down() functions) +$ git merge --no-ff akpm-current/current +Auto-merging lib/Kconfig.debug +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/memremap.h +Auto-merging include/linux/kexec.h +Auto-merging fs/userfaultfd.c +Auto-merging fs/ocfs2/ioctl.c +Auto-merging fs/namespace.c +Auto-merging fs/fat/file.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 20 +- + Documentation/admin-guide/sysctl/kernel.rst | 20 +- + Documentation/core-api/genalloc.rst | 2 +- + Documentation/core-api/kernel-api.rst | 3 + + Documentation/core-api/memory-allocation.rst | 4 + + Documentation/process/deprecated.rst | 10 +- + Documentation/vm/split_page_table_lock.rst | 10 +- + arch/alpha/include/uapi/asm/mman.h | 3 + + arch/arc/include/asm/pgalloc.h | 4 +- + arch/arm/include/asm/tlb.h | 2 +- + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm/mm/mmu.c | 2 +- + arch/arm64/include/asm/tlb.h | 2 +- + arch/arm64/mm/mmu.c | 2 +- + arch/csky/include/asm/pgalloc.h | 2 +- + arch/hexagon/include/asm/pgalloc.h | 2 +- + arch/hexagon/mm/init.c | 13 -- + arch/m68k/include/asm/mcf_pgalloc.h | 6 +- + arch/m68k/include/asm/motorola_pgalloc.h | 6 +- + arch/m68k/include/asm/sun3_pgalloc.h | 2 +- + arch/mips/include/asm/pgalloc.h | 2 +- + arch/mips/include/uapi/asm/mman.h | 3 + + arch/nios2/include/asm/pgalloc.h | 2 +- + arch/openrisc/include/asm/pgalloc.h | 6 +- + arch/parisc/include/uapi/asm/mman.h | 3 + + arch/powerpc/mm/pgtable-frag.c | 6 +- + arch/riscv/include/asm/pgalloc.h | 2 +- + arch/s390/mm/pgalloc.c | 6 +- + arch/sh/include/asm/pgalloc.h | 2 +- + arch/sparc/include/asm/pgtable_64.h | 5 +- + arch/sparc/mm/init_64.c | 4 +- + arch/sparc/mm/srmmu.c | 4 +- + arch/um/include/asm/pgalloc.h | 2 +- + arch/unicore32/include/asm/tlb.h | 2 +- + arch/x86/mm/pat_rbtree.c | 19 +- + arch/x86/mm/pgtable.c | 2 +- + arch/xtensa/include/asm/pgalloc.h | 4 +- + arch/xtensa/include/uapi/asm/mman.h | 3 + + drivers/block/drbd/drbd_interval.c | 29 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 + + drivers/gpu/drm/radeon/radeon_gem.c | 2 + + drivers/infiniband/hw/hfi1/verbs.c | 2 +- + drivers/media/v4l2-core/videobuf-dma-contig.c | 9 +- + drivers/misc/sram-exec.c | 2 +- + drivers/net/wimax/i2400m/tx.c | 3 +- + drivers/tee/tee_shm.c | 1 + + drivers/vfio/vfio_iommu_type1.c | 2 + + drivers/xen/events/events_base.c | 2 +- + fs/aio.c | 9 +- + fs/buffer.c | 56 ++++- + fs/fat/dir.c | 4 +- + fs/fat/fat.h | 1 + + fs/fat/file.c | 8 +- + fs/fat/inode.c | 22 +- + fs/fs-writeback.c | 9 +- + fs/namespace.c | 2 +- + fs/ntfs/mft.c | 12 +- + fs/ntfs/namei.c | 2 +- + fs/ntfs/runlist.c | 2 +- + fs/ntfs/super.c | 2 +- + fs/ocfs2/aops.c | 25 ++- + fs/ocfs2/ioctl.c | 2 +- + fs/ocfs2/xattr.c | 56 ++--- + fs/open.c | 2 +- + fs/proc/page.c | 40 ++-- + fs/ramfs/inode.c | 12 + + fs/reiserfs/do_balan.c | 15 +- + fs/reiserfs/fix_node.c | 6 +- + fs/reiserfs/journal.c | 22 +- + fs/reiserfs/lbalance.c | 3 +- + fs/reiserfs/objectid.c | 3 +- + fs/reiserfs/prints.c | 3 - + fs/reiserfs/stree.c | 4 - + fs/userfaultfd.c | 22 +- + fs/xfs/xfs_buf.c | 4 +- + include/asm-generic/bug.h | 53 ++--- + include/asm-generic/pgalloc.h | 8 +- + include/linux/cpumask.h | 14 +- + include/linux/genalloc.h | 2 +- + include/linux/interval_tree_generic.h | 22 +- + include/linux/kexec.h | 2 + + include/linux/kgdb.h | 2 + + include/linux/memcontrol.h | 29 +++ + include/linux/memory_hotplug.h | 1 + + include/linux/memremap.h | 6 + + include/linux/mm.h | 4 +- + include/linux/mm_types_task.h | 4 + + include/linux/printk.h | 22 +- + include/linux/rbtree_augmented.h | 88 ++++++-- + include/linux/sched.h | 9 + + include/linux/sched/sysctl.h | 1 + + include/linux/slab.h | 4 + + include/linux/string.h | 50 ++++- + include/linux/swap.h | 2 + + include/linux/thread_info.h | 2 +- + include/linux/uaccess.h | 21 +- + include/linux/wait.h | 4 +- + include/trace/events/vmscan.h | 71 +++++- + include/trace/events/writeback.h | 38 ++-- + include/uapi/asm-generic/mman-common.h | 3 + + include/uapi/linux/coff.h | 5 + + ipc/mqueue.c | 22 +- + ipc/msg.c | 18 +- + ipc/sem.c | 3 +- + kernel/debug/debug_core.c | 31 +-- + kernel/dma/remap.c | 2 +- + kernel/elfcore.c | 1 + + kernel/fork.c | 20 +- + kernel/hung_task.c | 94 ++++++-- + kernel/kexec_core.c | 2 + + kernel/panic.c | 42 ++-- + kernel/sysctl.c | 8 + + lib/Kconfig.debug | 10 +- + lib/bug.c | 11 +- + lib/extable.c | 1 + + lib/genalloc.c | 5 +- + lib/generic-radix-tree.c | 4 +- + lib/hexdump.c | 21 -- + lib/lzo/lzo1x_compress.c | 14 +- + lib/math/rational.c | 63 ++++-- + lib/rbtree_test.c | 37 ++-- + lib/string.c | 12 +- + lib/strncpy_from_user.c | 3 +- + lib/strnlen_user.c | 3 +- + mm/frame_vector.c | 2 + + mm/gup.c | 4 + + mm/internal.h | 2 +- + mm/madvise.c | 268 ++++++++++++++++++++++- + mm/memcontrol.c | 15 ++ + mm/memory_hotplug.c | 17 +- + mm/mempolicy.c | 3 + + mm/memremap.c | 27 ++- + mm/migrate.c | 2 +- + mm/mincore.c | 2 + + mm/mlock.c | 4 + + mm/mmap.c | 77 ++++--- + mm/mprotect.c | 2 + + mm/mremap.c | 3 + + mm/msync.c | 2 + + mm/oom_kill.c | 69 +++--- + mm/shuffle.c | 2 +- + mm/slab_common.c | 19 +- + mm/slob.c | 62 ++++-- + mm/slub.c | 14 +- + mm/sparse.c | 2 +- + mm/swap.c | 42 ++++ + mm/vmalloc.c | 5 +- + mm/vmscan.c | 167 +++++++++++--- + scripts/checkpatch.pl | 93 ++++++-- + scripts/gdb/linux/symbols.py | 4 +- + tools/include/linux/rbtree.h | 71 ++++-- + tools/include/linux/rbtree_augmented.h | 119 ++++++---- + tools/lib/rbtree.c | 37 +--- + 154 files changed, 1821 insertions(+), 807 deletions(-) +$ git am -3 ../patches/0001-mm-merge-fix-for-pagewalk-separate-function-pointers.patch +Applying: mm: merge fix for "pagewalk: separate function pointers from iterator data" +Using index info to reconstruct a base tree... +M mm/madvise.c +Falling back to patching base and 3-way merge... +Auto-merging mm/madvise.c +CONFLICT (content): Merge conflict in mm/madvise.c +Resolved 'mm/madvise.c' using previous resolution. +error: Failed to merge in the changes. +hint: Use 'git am --show-current-patch' to see the failed patch +Patch failed at 0001 mm: merge fix for "pagewalk: separate function pointers from iterator data" +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Merging akpm-current/current (2f9b49ccdf29d ipc/msg.c: consolidate all xxxctl_down() functions) +$ git merge --no-ff akpm-current/current +Auto-merging lib/Kconfig.debug +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/memremap.h +Auto-merging include/linux/kexec.h +Auto-merging fs/userfaultfd.c +Auto-merging fs/ocfs2/ioctl.c +Auto-merging fs/namespace.c +Auto-merging fs/fat/file.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 20 +- + Documentation/admin-guide/sysctl/kernel.rst | 20 +- + Documentation/core-api/genalloc.rst | 2 +- + Documentation/core-api/kernel-api.rst | 3 + + Documentation/core-api/memory-allocation.rst | 4 + + Documentation/process/deprecated.rst | 10 +- + Documentation/vm/split_page_table_lock.rst | 10 +- + arch/alpha/include/uapi/asm/mman.h | 3 + + arch/arc/include/asm/pgalloc.h | 4 +- + arch/arm/include/asm/tlb.h | 2 +- + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm/mm/mmu.c | 2 +- + arch/arm64/include/asm/tlb.h | 2 +- + arch/arm64/mm/mmu.c | 2 +- + arch/csky/include/asm/pgalloc.h | 2 +- + arch/hexagon/include/asm/pgalloc.h | 2 +- + arch/hexagon/mm/init.c | 13 -- + arch/m68k/include/asm/mcf_pgalloc.h | 6 +- + arch/m68k/include/asm/motorola_pgalloc.h | 6 +- + arch/m68k/include/asm/sun3_pgalloc.h | 2 +- + arch/mips/include/asm/pgalloc.h | 2 +- + arch/mips/include/uapi/asm/mman.h | 3 + + arch/nios2/include/asm/pgalloc.h | 2 +- + arch/openrisc/include/asm/pgalloc.h | 6 +- + arch/parisc/include/uapi/asm/mman.h | 3 + + arch/powerpc/mm/pgtable-frag.c | 6 +- + arch/riscv/include/asm/pgalloc.h | 2 +- + arch/s390/mm/pgalloc.c | 6 +- + arch/sh/include/asm/pgalloc.h | 2 +- + arch/sparc/include/asm/pgtable_64.h | 5 +- + arch/sparc/mm/init_64.c | 4 +- + arch/sparc/mm/srmmu.c | 4 +- + arch/um/include/asm/pgalloc.h | 2 +- + arch/unicore32/include/asm/tlb.h | 2 +- + arch/x86/mm/pat_rbtree.c | 19 +- + arch/x86/mm/pgtable.c | 2 +- + arch/xtensa/include/asm/pgalloc.h | 4 +- + arch/xtensa/include/uapi/asm/mman.h | 3 + + drivers/block/drbd/drbd_interval.c | 29 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 + + drivers/gpu/drm/radeon/radeon_gem.c | 2 + + drivers/infiniband/hw/hfi1/verbs.c | 2 +- + drivers/media/v4l2-core/videobuf-dma-contig.c | 9 +- + drivers/misc/sram-exec.c | 2 +- + drivers/net/wimax/i2400m/tx.c | 3 +- + drivers/tee/tee_shm.c | 1 + + drivers/vfio/vfio_iommu_type1.c | 2 + + drivers/xen/events/events_base.c | 2 +- + fs/aio.c | 9 +- + fs/buffer.c | 56 ++++- + fs/fat/dir.c | 4 +- + fs/fat/fat.h | 1 + + fs/fat/file.c | 8 +- + fs/fat/inode.c | 22 +- + fs/fs-writeback.c | 9 +- + fs/namespace.c | 2 +- + fs/ntfs/mft.c | 12 +- + fs/ntfs/namei.c | 2 +- + fs/ntfs/runlist.c | 2 +- + fs/ntfs/super.c | 2 +- + fs/ocfs2/aops.c | 25 ++- + fs/ocfs2/ioctl.c | 2 +- + fs/ocfs2/xattr.c | 56 ++--- + fs/open.c | 2 +- + fs/proc/page.c | 40 ++-- + fs/ramfs/inode.c | 12 + + fs/reiserfs/do_balan.c | 15 +- + fs/reiserfs/fix_node.c | 6 +- + fs/reiserfs/journal.c | 22 +- + fs/reiserfs/lbalance.c | 3 +- + fs/reiserfs/objectid.c | 3 +- + fs/reiserfs/prints.c | 3 - + fs/reiserfs/stree.c | 4 - + fs/userfaultfd.c | 22 +- + fs/xfs/xfs_buf.c | 4 +- + include/asm-generic/bug.h | 53 ++--- + include/asm-generic/pgalloc.h | 8 +- + include/linux/cpumask.h | 14 +- + include/linux/genalloc.h | 2 +- + include/linux/interval_tree_generic.h | 22 +- + include/linux/kexec.h | 2 + + include/linux/kgdb.h | 2 + + include/linux/memcontrol.h | 29 +++ + include/linux/memory_hotplug.h | 1 + + include/linux/memremap.h | 6 + + include/linux/mm.h | 4 +- + include/linux/mm_types_task.h | 4 + + include/linux/printk.h | 22 +- + include/linux/rbtree_augmented.h | 88 ++++++-- + include/linux/sched.h | 9 + + include/linux/sched/sysctl.h | 1 + + include/linux/slab.h | 4 + + include/linux/string.h | 50 ++++- + include/linux/swap.h | 2 + + include/linux/thread_info.h | 2 +- + include/linux/uaccess.h | 21 +- + include/linux/wait.h | 4 +- + include/trace/events/vmscan.h | 71 +++++- + include/trace/events/writeback.h | 38 ++-- + include/uapi/asm-generic/mman-common.h | 3 + + include/uapi/linux/coff.h | 5 + + ipc/mqueue.c | 22 +- + ipc/msg.c | 18 +- + ipc/sem.c | 3 +- + kernel/debug/debug_core.c | 31 +-- + kernel/dma/remap.c | 2 +- + kernel/elfcore.c | 1 + + kernel/fork.c | 20 +- + kernel/hung_task.c | 94 ++++++-- + kernel/kexec_core.c | 2 + + kernel/panic.c | 42 ++-- + kernel/sysctl.c | 8 + + lib/Kconfig.debug | 10 +- + lib/bug.c | 11 +- + lib/extable.c | 1 + + lib/genalloc.c | 5 +- + lib/generic-radix-tree.c | 4 +- + lib/hexdump.c | 21 -- + lib/lzo/lzo1x_compress.c | 14 +- + lib/math/rational.c | 63 ++++-- + lib/rbtree_test.c | 37 ++-- + lib/string.c | 12 +- + lib/strncpy_from_user.c | 3 +- + lib/strnlen_user.c | 3 +- + mm/frame_vector.c | 2 + + mm/gup.c | 4 + + mm/internal.h | 2 +- + mm/madvise.c | 268 ++++++++++++++++++++++- + mm/memcontrol.c | 15 ++ + mm/memory_hotplug.c | 17 +- + mm/mempolicy.c | 3 + + mm/memremap.c | 27 ++- + mm/migrate.c | 2 +- + mm/mincore.c | 2 + + mm/mlock.c | 4 + + mm/mmap.c | 77 ++++--- + mm/mprotect.c | 2 + + mm/mremap.c | 3 + + mm/msync.c | 2 + + mm/oom_kill.c | 69 +++--- + mm/shuffle.c | 2 +- + mm/slab_common.c | 19 +- + mm/slob.c | 62 ++++-- + mm/slub.c | 14 +- + mm/sparse.c | 2 +- + mm/swap.c | 42 ++++ + mm/vmalloc.c | 5 +- + mm/vmscan.c | 167 +++++++++++--- + scripts/checkpatch.pl | 93 ++++++-- + scripts/gdb/linux/symbols.py | 4 +- + tools/include/linux/rbtree.h | 71 ++++-- + tools/include/linux/rbtree_augmented.h | 119 ++++++---- + tools/lib/rbtree.c | 37 +--- + 154 files changed, 1821 insertions(+), 807 deletions(-) +$ git am -3 ../patches/0001-mm-merge-fix-for-pagewalk-separate-function-pointers.patch +fatal: previous rebase directory .git/rebase-apply still exists but mbox given. +$ 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' +Branch 'akpm' set up to track remote branch 'akpm/master' from 'origin'. +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: pinctrl: fix pxa2xx.c build warnings +Applying: drivers/tty/serial/sh-sci.c: suppress warning +Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + bc99cd1ddafc3...acfbae9c4b53b akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (acfbae9c4b53b drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + drivers/media/platform/sti/delta/delta-ipc.c | 4 ++-- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 1 + + drivers/tty/serial/sh-sci.c | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..a66a30f43dbc --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,14 @@ +Importing dmi based on 4.19-rc2 +Unchanged quilt series dmi +Importing dmi based on 4.19-rc2 +Unchanged quilt series dmi +Importing dmi based on 4.19-rc2 +Unchanged quilt series dmi +Importing dmi based on 4.19-rc2 +Unchanged quilt series dmi +Importing dmi based on 4.19-rc2 +Unchanged quilt series dmi +Importing dmi based on 4.19-rc2 +Unchanged quilt series dmi +Importing dmi based on 4.19-rc2 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..cfe8b7bf763c --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20190925 |