summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2020-04-14 12:36:49 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2020-04-14 12:36:49 +1000
commitf19bb13a0eaf0034a603e3b54a7c3a50faf6821e (patch)
treecc6dede0b47ab2773c1aa53d276256586ad2f279
parent20075715e011df95d88f6fd8ba3b98b7c734643f (diff)
downloadlinux-next-f19bb13a0eaf0034a603e3b54a7c3a50faf6821e.tar.gz
Add linux-next specific files for 20200414next-20200414
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r--Next/SHA1s318
-rw-r--r--Next/Trees320
-rw-r--r--Next/merge.log2601
-rw-r--r--Next/quilt-import.log12
-rw-r--r--localversion-next1
5 files changed, 3252 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 000000000000..66769aad2224
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,318 @@
+Name SHA1
+---- ----
+origin 8f3d9f354286745c751374f5f1fcafee6b3f3136
+fixes 6b038bdcd3d139f8da5f2eb08e275f9e57276df7
+kbuild-current d2f1606edabd9ebba096b0efb133558f1aad6e88
+arc-current 49b41356f74b95d1b913aed2f964999a55f5235e
+arm-current 89604523a76eb3e13014b2bdab7f8870becee284
+arm-soc-fixes c8042d1e5cb3e654b47447229ace3cd092a8fc27
+arm64-fixes 6f5459da2b8736720afdbd67c4bd2d1edba7d0e3
+m68k-current 86cded5fc52567774b596827544874499532b8ae
+powerpc-fixes 1d0c32ec3b860a32df593a22bad0d1dbc5546a59
+s390-fixes 7111951b8d4973bda27ff663f2cf18b663d15b48
+sparc 63bef48fd6c9d3f1ba4f0e23b4da1e007db6a3c0
+fscrypt-current 2b4eae95c7361e0a147b838715c8baa1380a428f
+net e154659ba39a1c2be576aaa0a5bda8088d707950
+bpf 40fc7ad2c8863479f3db34f9a9283b4884cd0e90
+ipsec 0452800f6db4ed0a42ffb15867c0acfd68829f6a
+netfilter 40fc7ad2c8863479f3db34f9a9283b4884cd0e90
+ipvs 0141317611ab913d6c227b82f3dd02ff3e6fc5d8
+wireless-drivers c9be1a642a7b9ec021e3f32e084dc781b3e5216d
+mac80211 0452800f6db4ed0a42ffb15867c0acfd68829f6a
+rdma-fixes 8f3d9f354286745c751374f5f1fcafee6b3f3136
+sound-current f8e4ae10de43fbb7ce85f79e04eca2988b6b2c40
+sound-asoc-fixes 33c385056aadd08490f3ccf5e8b10314f26fb195
+regmap-fixes 87fc8230f7aa11aeb382a2a6d1a1a02e3a038a7b
+regulator-fixes bae4cb90541a5bb9625377f6edf94e3dd1b9bb96
+spi-fixes 5bdb4c95849d29ba32fb901e9723edc114f6b556
+pci-current 8f3d9f354286745c751374f5f1fcafee6b3f3136
+driver-core.current 8f3d9f354286745c751374f5f1fcafee6b3f3136
+tty.current 8f3d9f354286745c751374f5f1fcafee6b3f3136
+usb.current 8f3d9f354286745c751374f5f1fcafee6b3f3136
+usb-gadget-fixes 42cd5ffe46c1037d5d9a253c72e71a024a7bfbef
+usb-serial-fixes 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e
+usb-chipidea-fixes 7cbf3dd3139ab4683d9cffe9d6972a1dbe3ecaa6
+phy be4e3c737eebd75815633f4b8fd766defaf0f1fc
+staging.current ed87d33ddbcd9a1c3b5ae87995da34e6f51a862c
+char-misc.current 8f3d9f354286745c751374f5f1fcafee6b3f3136
+soundwire-fixes 8f3d9f354286745c751374f5f1fcafee6b3f3136
+thunderbolt-fixes 7111951b8d4973bda27ff663f2cf18b663d15b48
+input-current cd510679f4b588b7726fc8b25e5a0afd6f889b14
+crypto-current 755bddd1e4eaf9178758bd554c60aaab46fc42ba
+ide 63bef48fd6c9d3f1ba4f0e23b4da1e007db6a3c0
+vfio-fixes 95f89e090618efca63918b658c2002e57d393036
+kselftest-fixes 8f3d9f354286745c751374f5f1fcafee6b3f3136
+modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de
+slave-dma-fixes 8f3d9f354286745c751374f5f1fcafee6b3f3136
+backlight-fixes 219d54332a09e8d8741c1e1982f5eae56099de85
+mtd-fixes 2098c564701c0dde76063dd9c5c00a7a1f173541
+mfd-fixes 603d9299da32955d49995738541f750f2ae74839
+v4l-dvb-fixes 2632e7b618a7730969f9782593c29ca53553aa22
+reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26
+mips-fixes 8f3d9f354286745c751374f5f1fcafee6b3f3136
+at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c
+omap-fixes 07bdc492cff6f555538df95e9812fe72e16d154a
+kvm-fixes dbef2808af6c594922fe32833b30f55f35e9da6d
+kvms390-fixes 1493e0f944f3c319d11e067c185c904d01c17ae5
+hwmon-fixes 0e786f328b382e6df64f31390973b81f8fb9a044
+nvdimm-fixes f84afbdd3a9e5e10633695677b95422572f920dc
+btrfs-fixes 9dba7a2365044653f5e4016be887f88012e605eb
+vfs-fixes 5bd73286d50fc242bbff1aaddb0e97c4527c9d78
+dma-mapping-fixes 9c24eaf81cc44d4bb38081c99eafd72ed85cf7f3
+i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf
+drivers-x86-fixes 8f3d9f354286745c751374f5f1fcafee6b3f3136
+samsung-krzk-fixes 8f3d9f354286745c751374f5f1fcafee6b3f3136
+pinctrl-samsung-fixes 8f3d9f354286745c751374f5f1fcafee6b3f3136
+devicetree-fixes 49722d64c3f35bb9aedb364ffca83da10ae59685
+scsi-fixes ea697a8bf5a4161e59806fab14f6e4a46dc7dcb0
+drm-fixes 8f3d9f354286745c751374f5f1fcafee6b3f3136
+amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01
+drm-intel-fixes bcad588dea538a4fc173d16a90a005536ec8dbf2
+mmc-fixes 2a7e3035f89d107c905438938067dc903b810ce5
+rtc-fixes bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9
+gnss-fixes f8788d86ab28f61f7b46eb6be375f8a726783636
+hyperv-fixes f3a99e761efa616028b255b4de58e9b5b87c5545
+soc-fsl-fixes fe8fe7723a3a824790bda681b40efd767e2251a7
+risc-v-fixes 2191b4f298fa360f2d1d967c2c7db565bea2c32e
+pidfd-fixes 3075afdf15b89a063f8d31c0db08a50472bb7faf
+fpga-fixes 3c2760b78f90db874401d97e3c17829e2e36f400
+spdx 5b8b9d0c6d0e0f1993c6c56deaf9646942c49d94
+gpio-intel-fixes 8f3d9f354286745c751374f5f1fcafee6b3f3136
+pinctrl-intel-fixes ccd025eaddaeb99e982029446197c544252108e2
+erofs-fixes d1eef1c619749b2a57e514a3fa67d9a516ffa919
+drm-misc-fixes 83a196773b8bc6702f49df1eddc848180e350340
+kspp-gustavo 90e5d84c7b06b849a330ea43625086ff81388ed4
+kbuild b032227c62939b5481bcd45442b36dfa263f4a7c
+compiler-attributes 98d54f81e36ba3bf92172791eba5ca5bd813989b
+leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b
+dma-mapping 9bb50ed7470944238ec8e30a94ef096caf9056ee
+asm-generic 060dc911501f6ee222569304f50962172a52b1d6
+arc def9d2780727cec3313ed3522d0123158d87224d
+arm 52d3b2f98483c34af44171dd10f43f90b7cf1ae0
+arm64 fc2266011accd5aeb8ebc335c381991f20e26e33
+arm-perf 8673e02e58410e6c4cefa499efa846286e45a991
+arm-soc d9725e56e1d806021cb277c3faf0c9ffad621576
+amlogic b40f5228c5f63c0c847ff9203e87e7b1a1334035
+aspeed de285b938cf330b30acfdb037d14018d38292c3e
+at91 ec539e70d882af33660bcab178a59b1251588a22
+imx-mxs e506dba69a5e9aaff20fd73a108639f84e2c39d9
+keystone 560b4d4691b07819f8d3e0cb030f72f863ec1ba3
+mediatek 23a1613226584c00ac303b563b37b62cf70e2e74
+mvebu 9d32706f8aa8bbea3722e8f074801c0807d19951
+omap e90f16cc1a48c3ca39f3a1756b3f1fd34fedbc62
+qcom 8dc3769c8a680bfc1f38221e68d3fd994f490970
+raspberrypi e7b7daeb48e0bf5d8412d77f11069750ee7032bb
+realtek 486f29df69413411a205d3101bae0427a892bee4
+renesas bf4540d5148c39f1339cc9c870b4075864a8c76c
+reset 2ebf89fd4ecf37e7ae4c323a9fd69f9d9d0ea260
+rockchip c018aff1a20156b60e0cf9cc906a21e2e64767e6
+samsung-krzk ff602fc2b39eb0beff2466132f7eec218fbde9ae
+scmi 7e63420847ae5f1036e4f7c42f0b3282e73efbc2
+sunxi 8f3d9f354286745c751374f5f1fcafee6b3f3136
+tegra df0a178cf2df7b29622514556e15a98c626fb23e
+clk 2d3dfd15d2a5984e3c0e47310ba984e51bcf5045
+clk-samsung 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c
+c6x 8adcc59974b8a65b7eac7d503364837c297139bc
+csky b8e9c96a8f7013b5e4f8734ee5a32085a85dc340
+h8300 a5de8865cb3edc9c5b719dc45651b38226805f9e
+ia64 172e7890406d6183b9b39271ffb434ff0a97ce72
+m68k 86cded5fc52567774b596827544874499532b8ae
+m68knommu ba000760eb0f182e6ef04faca70bb9737a9674b4
+microblaze 9fd1a1c9b3f2a38a5357a13335e0b9e5f21d093b
+mips 8f3d9f354286745c751374f5f1fcafee6b3f3136
+nds32 d785c5a324cd8812720a409dc85050558281a567
+nios2 0ec8a5054d7fc5e31509fed7893358564ede2477
+openrisc 9737e2c5f0bc768b58416ec070bd96c91c52a153
+parisc-hd 7111951b8d4973bda27ff663f2cf18b663d15b48
+powerpc 6ba4a2d3591039aea1cb45c7c42262d26351a2fa
+fsl a76bea0287ce13d28494b19649d80d8ee5e7b757
+soc-fsl 461c3ac0dc46ba7fc09628aadf63c81253c4c3de
+risc-v 37809df4b1c88927fe944eb766e0553811c51f64
+sifive 467e050e9760fc31dcf854ec88401e18419f5f78
+s390 2bc55eaeb88d30accfc1b6ac2708d4e4b81ca260
+sh a193018e5290ee9d9fe62ad80cd8f874711eb575
+sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e
+uml 4a7c46247f9c620c0390a15cb00b6ef9576b9c23
+xtensa 70cbddb973859158731ce77ab20cd5e53822c089
+fscrypt 861261f2a9cc488c845fc214d9035f7a11094591
+afs 4fe171bb81b13b40bf568330ec3716dfb304ced1
+btrfs 5a7ef5cb05dc077737d88162aeaa8661acc2a946
+ceph 2a575f138d003fff0f4930b5cfae4a1c46343b8f
+cifs 04c56e9e106cf960a877b2b571d825fa67db18a2
+configfs e2f238f7d5a1fa69ff1884d37acf9a2a3a01b308
+ecryptfs 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238
+erofs 8f3d9f354286745c751374f5f1fcafee6b3f3136
+ext3 a32f0ecd79b4757e417b778c8dc64916e93f7b80
+ext4 54d3adbc29f0c7c53890da1683e629cd220d7201
+f2fs 9f0d5809eb7ce74039cbbd91d95667723273c666
+fsverity 98d54f81e36ba3bf92172791eba5ca5bd813989b
+fuse 3e8cb8b2eaeb22f540f1cbc00cbb594047b7ba89
+jfs 7aba5dcc234635b44b2781dbc268048cfba388ad
+nfs 8f3d9f354286745c751374f5f1fcafee6b3f3136
+nfs-anna 55dee1bc0d72877b99805e42e0205087e98b9edd
+nfsd 2653de9f0398b3230bb098704451ba16be5458f0
+orangefs aa317d3351dee7cb0b27db808af0cd2340dcbaef
+overlayfs 2eda9eaa6d7ec129150df4c7b7be65f27ac47346
+ubifs 3676f32a98cd6ed4481c21bceb8b4829d4b6d1cf
+v9fs c6f141412d24c8d8a9d98ef45303c0235829044b
+xfs 5833112df7e9a306af9af09c60127b92ed723962
+zonefs 0dda2ddb7ded1395189e95d43106469687c07795
+iomap 457df33e035a2cffc6561992f3f25a6c61605c46
+djw-vfs 56939e014a6c212b317414faa307029e2e80c3b9
+file-locks dbdaf6a3250b9cda6d7f761e9ff8b8bed8409a38
+vfs ffca8b2a77f27cdaec081a8bd447f8a5c59af142
+printk d34f14ae521f076f68f3ce213c64193f9a5a8adf
+pci 8f3d9f354286745c751374f5f1fcafee6b3f3136
+pstore 8f3d9f354286745c751374f5f1fcafee6b3f3136
+hid 04f6305f8071ed2dfac9f98e27263e79fbd8ad33
+i2c a10c9c710f9ecea87b9f4bbb837467893b4bef01
+i3c c4b9de11d0101792c4d5458b18581f4f527862d1
+dmi 8cf87c7446968660a8e997b4427be5340c2825ef
+hwmon-staging 635049d0e3a0464a63e85b382640446e06d581a7
+jc_docs befacdcf47d4a19eb584ae5b43da40941e8e660c
+v4l-dvb 2632e7b618a7730969f9782593c29ca53553aa22
+v4l-dvb-next 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c
+fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f
+pm d3e5e977abe2b6c98455e4f6acd3b09cb4a0a940
+cpufreq-arm a8811ec764f95a04ba82f6f457e28c5e9e36e36b
+cpupower 8f3d9f354286745c751374f5f1fcafee6b3f3136
+opp aca48b61f963869ccbb5cf84805a7ad68bf812cd
+thermal df1982294937fc3837ddd4a788a3c95d61434ae1
+thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c
+thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67
+ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610
+dlm a48f9721e6db74dfbeb8d4a2cd616b20017f4b78
+swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c
+rdma 8f3d9f354286745c751374f5f1fcafee6b3f3136
+net-next 63bef48fd6c9d3f1ba4f0e23b4da1e007db6a3c0
+bpf-next 1a323ea5356edbb3073dc59d51b9e6b86908857d
+ipsec-next 308491755f36c461ee67290af159fdba6be0169d
+mlx5-next 826096d84f509d95ee8f72728fe19c44fbb9df6b
+netfilter-next 1a323ea5356edbb3073dc59d51b9e6b86908857d
+ipvs-next d54725cd11a57c30f650260cfb0a92c268bdc3e0
+wireless-drivers-next 5988b8ec713270fa29e0535ff3d0ef26a94c8220
+bluetooth 04896832c94aae4842100cafb8d3a73e1bed3a45
+mac80211-next 1e8f471425f4012f2c98f228ac2ba19cea22c39b
+gfs2 75b46c437f6b0f8e37032a407c7373f85f5c26a8
+mtd 025a06c1104cd8995646b761d117816b5f28c873
+nand fca88925d76978b7f20de42d8ead34fb91500003
+spi-nor f3f2b7eb2f1c5889b0a7162b6b5a69c0f357befd
+crypto fcb90d51c375d09a034993cda262b68499e233a4
+drm 74bd4f0c921cc9cf5f99ba4129dafe35496de6f3
+amdgpu 54c46f9a8781d3570dadf00f390c12d731302d11
+drm-intel f30d3ced9fafa03e4855508929b5b6334907f45e
+drm-tegra e32c8c2a5fbe1514e4ae9063a49e76ecf486ffb8
+drm-misc 152cce0006abf7e17dfb7dc94896b044bda4e588
+drm-msm a5fb8b918920c6f7706a8b5b8ea535a7f077a7f6
+mali-dp f634c6a8028789b05a9277a3d51303829ae29547
+imx-drm 2c76b324c7944fedf453abca5003569d9556c6df
+etnaviv f232d9ec029ce3e2543b05213e2979e01e503408
+regmap 2060986f04ad409fa6cb8059251d215064618253
+sound d94541fa8ae87f916ac5f6546972afb4a19acbc9
+sound-asoc 33c385056aadd08490f3ccf5e8b10314f26fb195
+modules 0f74226649fb2875a91b68f3750f55220aa73425
+input 3a8579629665bd6c0b37afcb2291080e959b885d
+block 8f3d9f354286745c751374f5f1fcafee6b3f3136
+device-mapper 8267d8fb4819afa76b2a54dca48efdda6f0b1910
+pcmcia a8c122f72d944f0e77b58c8b44a539a8f0e39017
+mmc 92075d98abf0f42db1cb518150364f196d4ad217
+md e820d55cb99dd93ac2dc949cf486bb187e5cd70d
+mfd d2923aa4535664ae5c46c3a093985afd18fec118
+backlight ee0c8e494cc3c135350cd5c4752e82af3feae1ab
+battery 164eaf6b435c31d98fdabe0151e979fa0b4280a0
+regulator 24bd2afda8ce633385a3c96aa51181008d7252da
+security 3e27a33932df104f4f9ff811467b0b4ccebde773
+apparmor 01df52d726b5d55d2970f5c957f1961930acd5d6
+integrity 9e2b4be377f0d715d9d910507890f9620cc22a9d
+keys 43672cf93c6d96380222064aec06e9593113cdea
+selinux c753924b628551564b6eea3c9896e4a95aa25ed9
+smack 92604e825304ce170955df44b00973843054dcd5
+tomoyo 8f3d9f354286745c751374f5f1fcafee6b3f3136
+tpmdd 872b0971d74bab4c19762f497a37fc4b185e0d26
+watchdog ea104a9e4d3e9ebc26fb78dac35585b142ee288b
+iommu ff68eb23308e6538ec7864c83d39540f423bbe90
+vfio f44efca0493ddc1e8731047c234ec8e475943077
+audit 1320a4052ea11eb2879eb7361da15a106a780972
+devicetree 8967918e7cee84d8b781feec38286c7d3c1c05da
+mailbox 0a67003b1985c79811160af1b01aca07cd5fbc53
+spi 5bdb4c95849d29ba32fb901e9723edc114f6b556
+tip 93df12fe0d14311ef960811ef397766f0b31d2e9
+clockevents c1ac28a4de6f848ef17b43ee76d1f28a219c3785
+edac ad49d9a8228e10cb4ee8b7f13c88d4711aa55894
+irqchip 4cea749d56bec9409f3bd126d2b2f949dc6c66e2
+ftrace 8e99cf91b99bb30e16727f10ad6828741c0e992f
+rcu aa93ec620be378cce1454286122915533ff8fa48
+kvm dbef2808af6c594922fe32833b30f55f35e9da6d
+kvm-arm 463050599742a89e0508355e626e032e8d0dab8d
+kvm-ppc 9a5788c615f52f6d7bf0b61986a632d4ec86791d
+kvms390 7a2653612bb6f18fb236c5b0c4d28f7b459bf7c2
+xen-tip 0e1b4271078787d3408d3dd314d80b290578cc00
+percpu dedac37ea96b23c23b72d6e90f01d060d5287e4e
+workqueues 4acf8a423cd321248b4cc9eb21c11bb88931938b
+drivers-x86 8f3d9f354286745c751374f5f1fcafee6b3f3136
+chrome-platform a46387712da12b61bf1ce1a3f63b60a17b098960
+hsi bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9
+leds 10a6cce3c1a15e40dd7b69e66e4780476e590f68
+ipmi ab032f08dc4584c4f2f73f4973d9a954a6787f47
+driver-core 8f3d9f354286745c751374f5f1fcafee6b3f3136
+usb 8f3d9f354286745c751374f5f1fcafee6b3f3136
+usb-gadget 4a5dbd9009570d3b23fd1392c4d178bfe3538d2c
+usb-serial 57aa9f294b09463492f604feaa5cc719beaace32
+usb-chipidea-next 95caa2ae70fdbf626335700d24400f47c12825ee
+phy-next 89d715371a05b1dee32faf49014b1acff6138b83
+tty 8f3d9f354286745c751374f5f1fcafee6b3f3136
+char-misc 8f3d9f354286745c751374f5f1fcafee6b3f3136
+extcon 9c94553099efb2ba873cbdddfd416a8a09d0e5f1
+soundwire 8f3d9f354286745c751374f5f1fcafee6b3f3136
+thunderbolt 3010518964dc96c41848a05a5b0ec11ccf8d5ebe
+staging 73a6e90041ce80d5683f62bee0eaf7226ce73392
+mux f356d58c3a04159f35003b26f8c5183f9456f95d
+icc 03c4e6186bbbe639b5277077c26786069e9e2b89
+slave-dma 8f3d9f354286745c751374f5f1fcafee6b3f3136
+cgroup eec8fd0277e37cf447b88c6be181e81df867bcf1
+scsi c128052e69912d263f01d93262c520f5395ad081
+scsi-mkp 1b55940b9bcc64acb7336224b0e49203ff7987c6
+vhost d4a85c2ace895a58dcab687ff49c76719011f58d
+rpmsg 45c2824de341e67ac80d888cd5ea5c90d5fc5ab6
+gpio 4ed7d7dd4890bb8120a3e77c16191a695fdfcc5a
+gpio-brgl 03434e049439226f8d4f3420838c6987dd969a64
+gpio-intel 8f3d9f354286745c751374f5f1fcafee6b3f3136
+pinctrl c42f69b4207e104229242c3d9da43b55d4b95d6d
+pinctrl-intel ccd025eaddaeb99e982029446197c544252108e2
+pinctrl-samsung b577a279914085c6b657c33e9f39ef56d96a3302
+pwm 9cc5f232a4b6a0ef6e9b57876d61b88f61bdd7c2
+userns 63f818f46af9f8b3f17b9695501e8d08959feb60
+ktest 1091c8fce8aa9c5abe1a73acab4bcaf58a729005
+random ab9a7e27044b87ff2be47b8f8e095400e7fccc44
+kselftest ffa773e1011d57550e3bf9aea98468c1c4bea552
+y2038 c4e71212a245017d2ab05f322f7722f0b87a55da
+livepatching d28b4c1b2b3d1337069cbe0bf0bec151d0e4d576
+coresight 50f3e61d96bd8db4475ba01522491ab52f803258
+rtc 8f3d9f354286745c751374f5f1fcafee6b3f3136
+nvdimm f6d2b802f80d0ca89ee1f51c1781b3f79cdb25d5
+at24 4837621cd61e6b81a182098889143c6c9a06b0f3
+ntb 5cc3de3c74357b78202ed86ef68ee03d00267e6d
+kspp c7527373fe28f97d8a196ab562db5589be0d34b9
+cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b
+gnss f8788d86ab28f61f7b46eb6be375f8a726783636
+fsi 2c01397b71c5e5001752046328d7f2aaf51b4c13
+slimbus ba1589ff458e032f40780188189eb0fb5a71a103
+nvmem 990df64027528086ea2160f51dcb481f9b6442c5
+xarray 27586ca786a729cda6c807621a1494900a56e7bc
+hyperv dbf7071bdc3a2a2feee403154d42ed6ab2d66036
+auxdisplay 2f920c0f0e29268827c2894c6e8f237a78159718
+kgdb 5ea771abd5a3734dfc55dee3772ff94ecc0b6f6a
+pidfd 6952a4f646446fde9e190b62c5e45f84c6cf91aa
+devfreq 19b5622d849bf678c1b5403208ae4f581948f7b8
+hmm 8f3d9f354286745c751374f5f1fcafee6b3f3136
+fpga cef0ca6417de6c3805847b5e025a1e3af7c7d473
+kunit 8f3d9f354286745c751374f5f1fcafee6b3f3136
+cel 36b6e409294af454e5ec928c5fc7a878c3805d77
+generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c
+cfi b6fe8bc67d2d33a9eff1b0785482bccd14979115
+kunit-next 8f3d9f354286745c751374f5f1fcafee6b3f3136
+trivial fad7c9020948eab2bc4661eade4e1ef357279590
+zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e
+mhi 8f3d9f354286745c751374f5f1fcafee6b3f3136
+akpm-current 547e35135ac5d10cfe5bb208830da744ebbd353d
+akpm cd91ba3aceb7328f9677aaaf2d12d20f0efdc917
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 000000000000..3836395c722c
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,320 @@
+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/netdev/net.git#master
+bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master
+ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master
+netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master
+ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master
+wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master
+mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master
+rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc
+sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus
+sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus
+regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus
+regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus
+spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus
+pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus
+driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus
+tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus
+usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus
+usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes
+usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus
+usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#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
+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
+erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.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
+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
+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
+raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next
+realtek git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.git#for-next
+renesas git git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next
+reset git https://git.pengutronix.de/git/pza/linux#reset/next
+rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next
+samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next
+scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next
+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/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
+erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev
+ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next
+ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev
+f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev
+fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity
+fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next
+jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next
+nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next
+nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next
+nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next
+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
+zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next
+iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next
+djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next
+file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next
+vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next
+printk git git://git.kernel.org/pub/scm/linux/kernel/git/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/thermal/linux.git#thermal/linux-next
+thermal-rzhang git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next
+thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next
+ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next
+dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next
+swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next
+rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next
+net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master
+bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#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
+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
+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
+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
+tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master
+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#timers/drivers/next
+edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next
+irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next
+ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next
+rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next
+kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#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/pavel/linux-leds.git#for-next
+ipmi git git://github.com/cminyard/linux-ipmi.git#for-next
+driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next
+usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next
+usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next
+usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next
+usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#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://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git#for-next
+gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next
+gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next
+gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next
+pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next
+pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next
+pinctrl-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
+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 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/chanwoo/linux.git#devfreq-next
+hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm
+fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next
+kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test
+cel git git://git.linux-nfs.org/projects/cel/cel-2.6.git#cel-next
+generic-ioremap git git://git.infradead.org/users/hch/ioremap.git#for-next
+cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next
+kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit
+trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next
+zx2c4 git git://git.kernel.org/pub/scm/linux/kernel/git/zx2c4/linux.git#for-next
+mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next
+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..190acdd40e39
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,2601 @@
+$ date -R
+Tue, 14 Apr 2020 08:40:43 +1000
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 8f3d9f354286 Linux 5.7-rc1
+Merging origin/master (8f3d9f354286 Linux 5.7-rc1)
+$ git merge origin/master
+Already up to date.
+Merging fixes/master (6b038bdcd3d1 sh: mm: Fix build error)
+$ git merge fixes/master
+Updating 8f3d9f354286..6b038bdcd3d1
+Fast-forward
+ arch/sh/mm/init.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging kbuild-current/fixes (d2f1606edabd scripts/config: allow colons in option strings for sed)
+$ git merge kbuild-current/fixes
+Merge made by the 'recursive' strategy.
+ scripts/config | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+Merging arc-current/for-curr (49b41356f74b ARC: entry: comment)
+$ git merge arc-current/for-curr
+Merge made by the 'recursive' strategy.
+ arch/arc/configs/hsdk_defconfig | 1 +
+ arch/arc/include/asm/entry-arcv2.h | 2 ++
+ arch/arc/kernel/Makefile | 3 ---
+ arch/arc/kernel/ptrace.c | 2 +-
+ arch/arc/kernel/setup.c | 5 +++--
+ arch/arc/kernel/unwind.c | 2 --
+ 6 files changed, 7 insertions(+), 8 deletions(-)
+Merging arm-current/fixes (89604523a76e ARM: 8961/2: Fix Kbuild issue caused by per-task stack protector GCC plugin)
+$ git merge arm-current/fixes
+Already up to date.
+Merging arm-soc-fixes/arm/fixes (c8042d1e5cb3 soc: samsung: chipid: Fix return value on non-Exynos platforms)
+$ git merge arm-soc-fixes/arm/fixes
+Already up to date.
+Merging arm64-fixes/for-next/fixes (6f5459da2b87 arm64: alternative: fix build with clang integrated assembler)
+$ git merge arm64-fixes/for-next/fixes
+Already up to date.
+Merging m68k-current/for-linus (86cded5fc525 m68k: defconfig: Update defconfigs for v5.6-rc4)
+$ git merge m68k-current/for-linus
+Already up to date.
+Merging powerpc-fixes/fixes (1d0c32ec3b86 KVM: PPC: Fix kernel crash with PR KVM)
+$ git merge powerpc-fixes/fixes
+Already up to date.
+Merging s390-fixes/fixes (7111951b8d49 Linux 5.6)
+$ git merge s390-fixes/fixes
+Already up to date.
+Merging sparc/master (63bef48fd6c9 Merge branch 'akpm' (patches from Andrew))
+$ git merge sparc/master
+Already up to date.
+Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty inodes after removing key)
+$ git merge fscrypt-current/for-stable
+Already up to date.
+Merging net/master (e154659ba39a mptcp: fix double-unlock in mptcp_poll)
+$ git merge net/master
+Auto-merging net/netfilter/nf_tables_api.c
+Auto-merging arch/riscv/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/net/fsl-fec.txt | 2 +
+ Documentation/networking/devlink/devlink-trap.rst | 2 +
+ Documentation/networking/index.rst | 1 +
+ .../networking/{net_dim.txt => net_dim.rst} | 96 ++++++-------
+ MAINTAINERS | 1 +
+ arch/arm/boot/dts/imx6qdl.dtsi | 6 +-
+ arch/arm/boot/dts/imx6qp.dtsi | 1 -
+ arch/arm/net/bpf_jit_32.c | 12 +-
+ arch/riscv/Kconfig | 2 +-
+ arch/riscv/net/bpf_jit_comp64.c | 49 ++++---
+ drivers/net/dsa/mt7530.c | 85 ------------
+ drivers/net/dsa/mt7530.h | 10 --
+ drivers/net/ethernet/freescale/fec.h | 7 +
+ drivers/net/ethernet/freescale/fec_main.c | 149 +++++++++++++++++----
+ drivers/net/ethernet/mediatek/mtk_eth_soc.c | 24 +++-
+ drivers/net/ethernet/mediatek/mtk_eth_soc.h | 8 ++
+ drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 5 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 19 +--
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 9 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 8 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 1 -
+ .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 12 +-
+ drivers/net/ethernet/mellanox/mlx5/core/health.c | 2 +-
+ drivers/net/ethernet/neterion/s2io.c | 2 +-
+ drivers/net/ethernet/pensando/ionic/ionic_lif.c | 44 +++---
+ .../net/ethernet/pensando/ionic/ionic_rx_filter.c | 52 +++++--
+ .../net/ethernet/pensando/ionic/ionic_rx_filter.h | 2 +-
+ drivers/net/ethernet/ti/am65-cpsw-nuss.c | 6 +-
+ drivers/net/ipa/ipa_modem.c | 5 +-
+ drivers/net/macsec.c | 2 +-
+ drivers/net/phy/marvell.c | 46 ++++---
+ drivers/net/phy/mdio_bus.c | 2 +-
+ drivers/net/tun.c | 3 +-
+ include/net/ip6_route.h | 1 +
+ include/net/netfilter/nf_tables.h | 2 +-
+ include/net/sock.h | 6 +-
+ include/uapi/linux/netfilter/nf_tables.h | 2 +
+ include/uapi/linux/netfilter/xt_IDLETIMER.h | 1 +
+ kernel/bpf/bpf_lru_list.h | 2 +-
+ lib/Kconfig.debug | 2 +
+ net/core/dev.c | 3 +-
+ net/core/filter.c | 2 +-
+ net/core/net-sysfs.c | 2 +-
+ net/core/sock.c | 2 +-
+ net/hsr/hsr_netlink.c | 10 +-
+ net/ipv4/devinet.c | 13 +-
+ net/ipv6/icmp.c | 21 ++-
+ net/l2tp/l2tp_netlink.c | 16 +--
+ net/mptcp/protocol.c | 25 ++--
+ net/netfilter/ipset/ip_set_core.c | 3 +-
+ net/netfilter/nf_tables_api.c | 7 +-
+ net/netfilter/nft_lookup.c | 12 +-
+ net/netfilter/nft_set_bitmap.c | 1 -
+ net/netfilter/nft_set_rbtree.c | 23 ++--
+ net/netfilter/xt_IDLETIMER.c | 3 +
+ net/qrtr/qrtr.c | 7 +-
+ net/rds/message.c | 6 +-
+ net/rds/rdma.c | 53 ++++----
+ net/rds/rds.h | 17 +--
+ net/sched/cls_api.c | 1 +
+ net/tls/tls_main.c | 4 +-
+ net/xdp/xsk.c | 5 +-
+ tools/lib/bpf/netlink.c | 6 +-
+ tools/testing/selftests/bpf/prog_tests/test_lsm.c | 18 +--
+ tools/testing/selftests/bpf/prog_tests/xdp_info.c | 68 ++++++++++
+ tools/testing/selftests/bpf/progs/lsm.c | 8 +-
+ tools/testing/selftests/bpf/verifier/bounds.c | 4 +-
+ tools/testing/selftests/tc-testing/tdc.py | 5 +-
+ 69 files changed, 620 insertions(+), 418 deletions(-)
+ rename Documentation/networking/{net_dim.txt => net_dim.rst} (78%)
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_info.c
+Merging bpf/master (40fc7ad2c886 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf)
+$ git merge bpf/master
+Already up to date.
+Merging ipsec/master (0452800f6db4 net: dsa: mt7530: fix null pointer dereferencing in port5 setup)
+$ git merge ipsec/master
+Already up to date.
+Merging netfilter/master (40fc7ad2c886 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf)
+$ git merge netfilter/master
+Already up to date.
+Merging ipvs/master (0141317611ab Merge branch 'hns3-fixes')
+$ git merge ipvs/master
+Already up to date.
+Merging wireless-drivers/master (c9be1a642a7b ath11k: fix compiler warnings without CONFIG_THERMAL)
+$ git merge wireless-drivers/master
+Merge made by the 'recursive' strategy.
+ drivers/net/wireless/ath/ath11k/thermal.h | 3 ++-
+ drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 9 +++++++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+Merging mac80211/master (0452800f6db4 net: dsa: mt7530: fix null pointer dereferencing in port5 setup)
+$ git merge mac80211/master
+Already up to date.
+Merging rdma-fixes/for-rc (8f3d9f354286 Linux 5.7-rc1)
+$ git merge rdma-fixes/for-rc
+Already up to date.
+Merging sound-current/for-linus (f8e4ae10de43 ALSA: hda: Allow setting preallocation again for x86)
+$ git merge sound-current/for-linus
+Merge made by the 'recursive' strategy.
+ include/sound/hda_codec.h | 5 ++
+ sound/hda/Kconfig | 7 +--
+ sound/pci/ctxfi/cthw20k1.c | 14 +++---
+ sound/pci/hda/hda_codec.c | 2 +-
+ sound/pci/hda/hda_intel.c | 106 ++++++++++++++++++++++++------------------
+ sound/pci/hda/hda_intel.h | 1 +
+ sound/pci/hda/patch_realtek.c | 1 +
+ sound/usb/mixer.c | 31 +++++++-----
+ sound/usb/mixer_maps.c | 4 +-
+ 9 files changed, 103 insertions(+), 68 deletions(-)
+Merging sound-asoc-fixes/for-linus (33c385056aad Merge branch 'asoc-5.7' into asoc-linus)
+$ git merge sound-asoc-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ sound/soc/soc-topology.c | 113 ++++++++++++++++++++++++++++++++++++-----------
+ 1 file changed, 88 insertions(+), 25 deletions(-)
+Merging regmap-fixes/for-linus (87fc8230f7aa Merge branch 'regmap-5.6' into regmap-linus)
+$ git merge regmap-fixes/for-linus
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging regulator-fixes/for-linus (bae4cb90541a Merge branch 'regulator-5.6' into regulator-linus)
+$ git merge regulator-fixes/for-linus
+Already up to date.
+Merging spi-fixes/for-linus (5bdb4c95849d Merge branch 'spi-5.7' into spi-linus)
+$ git merge spi-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/spi/spi-axi-spi-engine.c | 32 ++++++++++++++++----------------
+ drivers/spi/spi-ep93xx.c | 8 ++++++--
+ 2 files changed, 22 insertions(+), 18 deletions(-)
+Merging pci-current/for-linus (8f3d9f354286 Linux 5.7-rc1)
+$ git merge pci-current/for-linus
+Already up to date.
+Merging driver-core.current/driver-core-linus (8f3d9f354286 Linux 5.7-rc1)
+$ git merge driver-core.current/driver-core-linus
+Already up to date.
+Merging tty.current/tty-linus (8f3d9f354286 Linux 5.7-rc1)
+$ git merge tty.current/tty-linus
+Already up to date.
+Merging usb.current/usb-linus (8f3d9f354286 Linux 5.7-rc1)
+$ git merge usb.current/usb-linus
+Already up to date.
+Merging usb-gadget-fixes/fixes (42cd5ffe46c1 usb: dwc3: debug: fix string position formatting mixup with ret and len)
+$ git merge usb-gadget-fixes/fixes
+Already up to date.
+Merging usb-serial-fixes/usb-linus (16fbf79b0f83 Linux 5.6-rc7)
+$ git merge usb-serial-fixes/usb-linus
+Already up to date.
+Merging usb-chipidea-fixes/ci-for-usb-stable (7cbf3dd3139a usb: chipidea: udc: fix sleeping function called from invalid context)
+$ git merge usb-chipidea-fixes/ci-for-usb-stable
+Auto-merging drivers/usb/chipidea/udc.c
+Merge made by the 'recursive' strategy.
+Merging phy/fixes (be4e3c737eeb phy: mapphone-mdm6600: Fix timeouts by adding wake-up handling)
+$ git merge phy/fixes
+Already up to date.
+Merging staging.current/staging-linus (ed87d33ddbcd staging: comedi: dt2815: fix writing hi byte of analog output)
+$ git merge staging.current/staging-linus
+Merge made by the 'recursive' strategy.
+ drivers/staging/comedi/drivers/dt2815.c | 3 +++
+ drivers/staging/gasket/gasket_sysfs.c | 3 +--
+ drivers/staging/gasket/gasket_sysfs.h | 4 ----
+ 3 files changed, 4 insertions(+), 6 deletions(-)
+Merging char-misc.current/char-misc-linus (8f3d9f354286 Linux 5.7-rc1)
+$ git merge char-misc.current/char-misc-linus
+Already up to date.
+Merging soundwire-fixes/fixes (8f3d9f354286 Linux 5.7-rc1)
+$ git merge soundwire-fixes/fixes
+Already up to date.
+Merging thunderbolt-fixes/fixes (7111951b8d49 Linux 5.6)
+$ git merge thunderbolt-fixes/fixes
+Already up to date.
+Merging input-current/for-linus (cd510679f4b5 Merge branch 'next' into for-linus)
+$ git merge input-current/for-linus
+Already up to date.
+Merging crypto-current/master (755bddd1e4ea crypto: marvell/octeontx - fix double free of ptr)
+$ git merge crypto-current/master
+Already up to date.
+Merging ide/master (63bef48fd6c9 Merge branch 'akpm' (patches from Andrew))
+$ git merge ide/master
+Already up to date.
+Merging vfio-fixes/for-linus (95f89e090618 vfio/type1: Initialize resv_msi_base)
+$ git merge vfio-fixes/for-linus
+Already up to date.
+Merging kselftest-fixes/fixes (8f3d9f354286 Linux 5.7-rc1)
+$ git merge kselftest-fixes/fixes
+Already up to date.
+Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch)
+$ git merge modules-fixes/modules-linus
+Already up to date.
+Merging slave-dma-fixes/fixes (8f3d9f354286 Linux 5.7-rc1)
+$ git merge slave-dma-fixes/fixes
+Already up to date.
+Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4)
+$ git merge backlight-fixes/for-backlight-fixes
+Already up to date.
+Merging mtd-fixes/mtd/fixes (2098c564701c mtd: spi-nor: Compile files in controllers/ directory)
+$ git merge mtd-fixes/mtd/fixes
+Merge made by the 'recursive' strategy.
+ drivers/mtd/spi-nor/Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging mfd-fixes/for-mfd-fixes (603d9299da32 mfd: mt6397: Fix probe after changing mt6397-core)
+$ git merge mfd-fixes/for-mfd-fixes
+Already up to date.
+Merging v4l-dvb-fixes/fixes (2632e7b618a7 media: venus: firmware: Ignore secure call error on first resume)
+$ git merge v4l-dvb-fixes/fixes
+Already up to date.
+Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency)
+$ git merge reset-fixes/reset/fixes
+Already up to date.
+Merging mips-fixes/mips-fixes (8f3d9f354286 Linux 5.7-rc1)
+$ git merge mips-fixes/mips-fixes
+Already up to date.
+Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1)
+$ git merge at91-fixes/at91-fixes
+Already up to date.
+Merging omap-fixes/fixes (07bdc492cff6 ARM: dts: OMAP3: disable RNG on N950/N9)
+$ git merge omap-fixes/fixes
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/omap3-n950-n9.dtsi | 5 +++++
+ 1 file changed, 5 insertions(+)
+Merging kvm-fixes/master (dbef2808af6c KVM: VMX: fix crash cleanup when KVM wasn't used)
+$ git merge kvm-fixes/master
+Already up to date.
+Merging kvms390-fixes/master (1493e0f944f3 KVM: s390: vsie: Fix possible race when shadowing region 3 tables)
+$ git merge kvms390-fixes/master
+Already up to date.
+Merging hwmon-fixes/hwmon (0e786f328b38 hwmon: (k10temp) make some symbols static)
+$ git merge hwmon-fixes/hwmon
+Merge made by the 'recursive' strategy.
+ Documentation/hwmon/isl68137.rst | 76 ++++++++++++++++-----------------
+ drivers/hwmon/Kconfig | 2 +-
+ drivers/hwmon/drivetemp.c | 6 +++
+ drivers/hwmon/k10temp.c | 6 +--
+ drivers/hwmon/pmbus/isl68137.c | 92 +++++++++++++++++++++++++++++++++++++---
+ 5 files changed, 133 insertions(+), 49 deletions(-)
+Merging nvdimm-fixes/libnvdimm-fixes (f84afbdd3a9e libnvdimm: Out of bounds read in __nd_ioctl())
+$ git merge nvdimm-fixes/libnvdimm-fixes
+Already up to date.
+Merging btrfs-fixes/next-fixes (9dba7a236504 Merge branch 'misc-5.7' into next-fixes)
+$ git merge btrfs-fixes/next-fixes
+Merge made by the 'recursive' strategy.
+ fs/btrfs/block-group.c | 1 +
+ fs/btrfs/file.c | 15 ++++++++
+ fs/btrfs/reflink.c | 1 +
+ fs/btrfs/relocation.c | 4 +-
+ fs/btrfs/space-info.c | 20 +++++++---
+ fs/btrfs/tree-log.c | 93 +++++++---------------------------------------
+ include/uapi/linux/btrfs.h | 10 ++---
+ 7 files changed, 51 insertions(+), 93 deletions(-)
+Merging vfs-fixes/fixes (5bd73286d50f fix a braino in legitimize_path())
+$ git merge vfs-fixes/fixes
+Already up to date.
+Merging dma-mapping-fixes/for-linus (9c24eaf81cc4 iommu/vt-d: Return the correct dma mask when we are bypassing the IOMMU)
+$ git merge dma-mapping-fixes/for-linus
+Already up to date.
+Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7)
+$ git merge i3c-fixes/master
+Already up to date.
+Merging drivers-x86-fixes/fixes (8f3d9f354286 Linux 5.7-rc1)
+$ git merge drivers-x86-fixes/fixes
+Already up to date.
+Merging samsung-krzk-fixes/fixes (8f3d9f354286 Linux 5.7-rc1)
+$ git merge samsung-krzk-fixes/fixes
+Already up to date.
+Merging pinctrl-samsung-fixes/pinctrl-fixes (8f3d9f354286 Linux 5.7-rc1)
+$ git merge pinctrl-samsung-fixes/pinctrl-fixes
+Already up to date.
+Merging devicetree-fixes/dt/linus (49722d64c3f3 dt-bindings: interrupt-controller: Fix loongson,parent_int_map property schema)
+$ git merge devicetree-fixes/dt/linus
+Merge made by the 'recursive' strategy.
+ .../arm/sunxi/allwinner,sun4i-a10-mbus.yaml | 6 ++++
+ .../devicetree/bindings/clock/arm,syscon-icst.yaml | 2 +-
+ .../bindings/hwmon/adi,axi-fan-control.yaml | 4 +--
+ .../devicetree/bindings/hwmon/adt7475.yaml | 2 +-
+ .../devicetree/bindings/iio/dac/adi,ad5770r.yaml | 4 +--
+ .../bindings/input/touchscreen/edt-ft5x06.yaml | 2 +-
+ .../interrupt-controller/loongson,liointc.yaml | 5 ++-
+ .../memory-controllers/nvidia,tegra186-mc.yaml | 41 ++++++++++++----------
+ .../devicetree/bindings/mfd/rohm,bd71837-pmic.yaml | 4 ++-
+ .../devicetree/bindings/mfd/rohm,bd71847-pmic.yaml | 4 ++-
+ .../devicetree/bindings/mfd/st,stpmic1.yaml | 2 +-
+ .../devicetree/bindings/net/qcom,ipq8064-mdio.yaml | 1 +
+ .../devicetree/bindings/rng/brcm,bcm2835.yaml | 2 +-
+ .../bindings/spi/qcom,spi-qcom-qspi.yaml | 2 +-
+ .../devicetree/bindings/usb/ingenic,musb.yaml | 2 +-
+ 15 files changed, 49 insertions(+), 34 deletions(-)
+Merging scsi-fixes/fixes (ea697a8bf5a4 scsi: sd: Fix optimal I/O size for devices that change reported values)
+$ git merge scsi-fixes/fixes
+Already up to date.
+Merging drm-fixes/drm-fixes (8f3d9f354286 Linux 5.7-rc1)
+$ git merge drm-fixes/drm-fixes
+Already up to date.
+Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
+$ git merge amdgpu-fixes/drm-fixes
+Already up to date.
+Merging drm-intel-fixes/for-linux-next-fixes (bcad588dea53 drm/i915/perf: Do not clear pollin for small user read buffers)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/i915_perf.c | 65 +++++++---------------------------------
+ 1 file changed, 11 insertions(+), 54 deletions(-)
+Merging mmc-fixes/fixes (2a7e3035f89d mmc: core: make mmc_interrupt_hpi() static)
+$ git merge mmc-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/mmc/core/mmc_ops.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging rtc-fixes/rtc-fixes (bb6d3fb354c5 Linux 5.6-rc1)
+$ git merge rtc-fixes/rtc-fixes
+Already up to date.
+Merging gnss-fixes/gnss-linus (f8788d86ab28 Linux 5.6-rc3)
+$ git merge gnss-fixes/gnss-linus
+Already up to date.
+Merging hyperv-fixes/hyperv-fixes (f3a99e761efa x86/Hyper-V: Report crash data in die() when panic_on_oops is set)
+$ git merge hyperv-fixes/hyperv-fixes
+Merge made by the 'recursive' strategy.
+ arch/x86/hyperv/hv_init.c | 6 +++-
+ arch/x86/kernel/cpu/mshyperv.c | 14 ++++++++--
+ drivers/hv/channel_mgmt.c | 3 ++
+ drivers/hv/hv_debugfs.c | 2 +-
+ drivers/hv/hyperv_vmbus.h | 2 +-
+ drivers/hv/vmbus_drv.c | 62 ++++++++++++++++++++++++++++++------------
+ include/asm-generic/mshyperv.h | 2 +-
+ 7 files changed, 67 insertions(+), 24 deletions(-)
+Merging soc-fsl-fixes/fix (fe8fe7723a3a soc: fsl: dpio: register dpio irq handlers after dpio create)
+$ git merge soc-fsl-fixes/fix
+Already up to date.
+Merging risc-v-fixes/fixes (2191b4f298fa RISC-V: Move all address space definition macros to one place)
+$ git merge risc-v-fixes/fixes
+Already up to date.
+Merging pidfd-fixes/fixes (3075afdf15b8 signal: use kill_proc_info instead of kill_pid_info in kill_something_info)
+$ git merge pidfd-fixes/fixes
+Merge made by the 'recursive' strategy.
+ kernel/signal.c | 14 +++++---------
+ 1 file changed, 5 insertions(+), 9 deletions(-)
+Merging fpga-fixes/fixes (3c2760b78f90 fpga: dfl: pci: fix return value of cci_pci_sriov_configure)
+$ git merge fpga-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/fpga/dfl-pci.c | 6 ++++--
+ drivers/fpga/zynq-fpga.c | 3 ++-
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+Merging spdx/spdx-linus (5b8b9d0c6d0e Merge branch 'akpm' (patches from Andrew))
+$ git merge spdx/spdx-linus
+Already up to date.
+Merging gpio-intel-fixes/fixes (8f3d9f354286 Linux 5.7-rc1)
+$ git merge gpio-intel-fixes/fixes
+Already up to date.
+Merging pinctrl-intel-fixes/fixes (ccd025eaddae pinctrl: baytrail: Enable pin configuration setting for GPIO chip)
+$ git merge pinctrl-intel-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/pinctrl/intel/pinctrl-baytrail.c | 1 +
+ drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 15 ++++++++-------
+ 2 files changed, 9 insertions(+), 7 deletions(-)
+Merging erofs-fixes/fixes (d1eef1c61974 Linux 5.5-rc2)
+$ git merge erofs-fixes/fixes
+Already up to date.
+Merging drm-misc-fixes/for-linux-next-fixes (83a196773b8b drm/bridge: analogix_dp: Split bind() into probe() and real bind())
+$ git merge drm-misc-fixes/for-linux-next-fixes
+Auto-merging drivers/gpu/drm/exynos/exynos_dp.c
+Auto-merging drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+Merge made by the 'recursive' strategy.
+Merging kspp-gustavo/for-next/kspp (90e5d84c7b06 xattr.h: Replace zero-length array with flexible-array member)
+$ git merge kspp-gustavo/for-next/kspp
+Auto-merging include/linux/xattr.h
+Auto-merging include/linux/swap.h
+Auto-merging include/linux/skbuff.h
+Auto-merging include/linux/sched/topology.h
+Auto-merging include/linux/platform_data/wilco-ec.h
+Auto-merging include/linux/memcontrol.h
+Auto-merging include/linux/irq.h
+Auto-merging include/linux/ethtool.h
+Auto-merging include/linux/blk-mq.h
+Auto-merging include/linux/bio.h
+Merge made by the 'recursive' strategy.
+ drivers/firmware/dmi-sysfs.c | 2 +-
+ drivers/firmware/google/memconsole-coreboot.c | 2 +-
+ drivers/firmware/google/vpd.c | 2 +-
+ include/linux/bio.h | 2 +-
+ include/linux/blk-mq.h | 2 +-
+ include/linux/blk_types.h | 2 +-
+ include/linux/can/dev/peak_canfd.h | 4 ++--
+ include/linux/cpu_rmap.h | 2 +-
+ include/linux/digsig.h | 4 ++--
+ include/linux/dirent.h | 2 +-
+ include/linux/enclosure.h | 2 +-
+ include/linux/energy_model.h | 2 +-
+ include/linux/ethtool.h | 4 ++--
+ include/linux/genalloc.h | 2 +-
+ include/linux/igmp.h | 2 +-
+ include/linux/ihex.h | 2 +-
+ include/linux/irq.h | 4 ++--
+ include/linux/list_lru.h | 2 +-
+ include/linux/memcontrol.h | 4 ++--
+ include/linux/platform_data/wilco-ec.h | 2 +-
+ include/linux/posix_acl.h | 2 +-
+ include/linux/rio.h | 4 ++--
+ include/linux/rslib.h | 2 +-
+ include/linux/sched/topology.h | 2 +-
+ include/linux/skbuff.h | 2 +-
+ include/linux/swap.h | 2 +-
+ include/linux/ti_wilink_st.h | 6 +++---
+ include/linux/tpm_eventlog.h | 6 +++---
+ include/linux/xattr.h | 2 +-
+ include/uapi/linux/dlm_device.h | 4 ++--
+ include/uapi/linux/fiemap.h | 2 +-
+ 31 files changed, 42 insertions(+), 42 deletions(-)
+Merging kbuild/for-next (b032227c6293 Merge tag 'nios2-v5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2)
+$ git merge kbuild/for-next
+Already up to date.
+Merging compiler-attributes/compiler-attributes (98d54f81e36b Linux 5.6-rc4)
+$ git merge compiler-attributes/compiler-attributes
+Already up to date.
+Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1)
+$ git merge leaks/leaks-next
+Already up to date.
+Merging dma-mapping/for-next (9bb50ed74709 dma-debug: fix displaying of dma allocation type)
+$ git merge dma-mapping/for-next
+Already up to date.
+Merging asm-generic/master (060dc911501f nds32: fix build failure caused by page table folding updates)
+$ git merge asm-generic/master
+Already up to date.
+Merging arc/for-next (def9d2780727 Linux 5.5-rc7)
+$ git merge arc/for-next
+Already up to date.
+Merging arm/for-next (52d3b2f98483 Merge branch 'devel-stable' into for-next)
+$ git merge arm/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging arm64/for-next/core (fc2266011acc arm64: armv8_deprecated: Fix undef_hook mask for thumb setend)
+$ git merge arm64/for-next/core
+Already up to date.
+Merging arm-perf/for-next/perf (8673e02e5841 arm64: perf: Add support for ARMv8.5-PMU 64-bit counters)
+$ git merge arm-perf/for-next/perf
+Already up to date.
+Merging arm-soc/for-next (d9725e56e1d8 soc: document merges)
+$ git merge arm-soc/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/arm-soc-for-next-contents.txt | 201 +++++++++++++++++++++++++++++++++
+ 1 file changed, 201 insertions(+)
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+Merging amlogic/for-next (b40f5228c5f6 Merge branch 'v5.7/drivers' into tmp/aml-rebuild)
+$ git merge amlogic/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging aspeed/for-next (de285b938cf3 ARM: dts: aspeed: ast2600: Fix SCU IRQ controller nodes)
+$ git merge aspeed/for-next
+Auto-merging arch/arm/boot/dts/aspeed-g6.dtsi
+Auto-merging arch/arm/boot/dts/aspeed-g5.dtsi
+Auto-merging arch/arm/boot/dts/aspeed-g4.dtsi
+Merge made by the 'recursive' strategy.
+ .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 74 ++++++++++
+ .../boot/dts/aspeed-bmc-facebook-yosemitev2.dts | 151 +++++++++++++++++++++
+ arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 21 +++
+ arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 4 +
+ arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 34 +++++
+ arch/arm/boot/dts/aspeed-g4.dtsi | 10 ++
+ arch/arm/boot/dts/aspeed-g5.dtsi | 19 +++
+ arch/arm/boot/dts/aspeed-g6.dtsi | 38 ++++++
+ 8 files changed, 351 insertions(+)
+ create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-yosemitev2.dts
+Merging at91/at91-next (ec539e70d882 Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next)
+$ git merge at91/at91-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging imx-mxs/for-next (e506dba69a5e 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 (560b4d4691b0 Merge branch 'for_5.7/keystone-dts' into next)
+$ git merge keystone/next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/keystone-k2g-evm.dts | 101 +++++++++++++++++++++++++++++++++
+ arch/arm/boot/dts/keystone-k2g.dtsi | 22 +++++++
+ 2 files changed, 123 insertions(+)
+Merging mediatek/for-next (23a161322658 Merge branch 'v5.7-next/soc' into for-next)
+$ git merge mediatek/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/mediatek.yaml | 22 +
+ .../bindings/arm/mediatek/mediatek,mmsys.txt | 7 +-
+ arch/arm/boot/dts/mt7623n-rfb-emmc.dts | 1 +
+ arch/arm64/boot/dts/mediatek/Makefile | 3 +
+ .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 4 +
+ arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 4 +
+ arch/arm64/boot/dts/mediatek/mt7622.dtsi | 11 +
+ .../boot/dts/mediatek/mt8173-elm-hana-rev7.dts | 27 +
+ arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dts | 14 +
+ arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi | 70 ++
+ arch/arm64/boot/dts/mediatek/mt8173-elm.dts | 14 +
+ arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 1173 ++++++++++++++++++++
+ arch/arm64/boot/dts/mediatek/mt8173.dtsi | 45 +-
+ arch/arm64/boot/dts/mediatek/mt8183.dtsi | 26 +-
+ drivers/clk/mediatek/Kconfig | 7 +
+ drivers/clk/mediatek/Makefile | 1 +
+ drivers/clk/mediatek/clk-mt8173-mm.c | 146 +++
+ drivers/clk/mediatek/clk-mt8173.c | 104 --
+ drivers/gpu/drm/mediatek/Kconfig | 1 +
+ drivers/gpu/drm/mediatek/mtk_disp_color.c | 5 +-
+ drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 5 +-
+ drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 5 +-
+ drivers/gpu/drm/mediatek/mtk_dpi.c | 12 +-
+ drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 19 +-
+ drivers/gpu/drm/mediatek/mtk_drm_ddp.c | 259 +----
+ drivers/gpu/drm/mediatek/mtk_drm_ddp.h | 7 -
+ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 45 +-
+ drivers/gpu/drm/mediatek/mtk_drm_drv.h | 2 +-
+ drivers/gpu/drm/mediatek/mtk_dsi.c | 8 +-
+ drivers/gpu/drm/mediatek/mtk_hdmi.c | 4 +-
+ drivers/soc/mediatek/Kconfig | 8 +
+ drivers/soc/mediatek/Makefile | 1 +
+ drivers/soc/mediatek/mtk-mmsys.c | 337 ++++++
+ include/linux/soc/mediatek/mtk-mmsys.h | 20 +
+ 34 files changed, 1984 insertions(+), 433 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8173-elm-hana-rev7.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8173-elm.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi
+ create mode 100644 drivers/clk/mediatek/clk-mt8173-mm.c
+ create mode 100644 drivers/soc/mediatek/mtk-mmsys.c
+ create mode 100644 include/linux/soc/mediatek/mtk-mmsys.h
+Merging mvebu/for-next (9d32706f8aa8 Merge branch 'mvebu/dt64' into mvebu/for-next)
+$ git merge mvebu/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts | 2 +-
+ arch/arm64/boot/dts/marvell/armada-8040-mcbin-singleshot.dts | 4 ++--
+ arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+Merging omap/for-next (e90f16cc1a48 Merge branch 'fixes' into for-next)
+$ git merge omap/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging qcom/for-next (8dc3769c8a68 Merge branches 'arm64-for-5.7', 'arm64-defconfig-for-5.7', 'defconfig-for-5.7', 'drivers-for-5.7' and 'dts-for-5.7' into for-next)
+$ git merge qcom/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging raspberrypi/for-next (e7b7daeb48e0 ARM: dts: bcm283x: Use firmware PM driver for V3D)
+$ git merge raspberrypi/for-next
+Auto-merging arch/arm/configs/bcm2835_defconfig
+CONFLICT (content): Merge conflict in arch/arm/configs/bcm2835_defconfig
+Auto-merging arch/arm/boot/dts/bcm2711-rpi-4-b.dts
+Resolved 'arch/arm/configs/bcm2835_defconfig' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 5854a13d2efd] Merge remote-tracking branch 'raspberrypi/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 13 ++++++++++++-
+ arch/arm/boot/dts/bcm2835-common.dtsi | 1 -
+ arch/arm/boot/dts/bcm2835-rpi-common.dtsi | 12 ++++++++++++
+ arch/arm/boot/dts/bcm2835.dtsi | 1 +
+ arch/arm/boot/dts/bcm2836.dtsi | 1 +
+ arch/arm/boot/dts/bcm2837.dtsi | 1 +
+ arch/arm/configs/bcm2835_defconfig | 1 +
+ 7 files changed, 28 insertions(+), 2 deletions(-)
+ create mode 100644 arch/arm/boot/dts/bcm2835-rpi-common.dtsi
+Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next)
+$ git merge realtek/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/realtek.yaml | 21 ++
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ MAINTAINERS | 2 +
+ arch/arm/Kconfig | 2 +
+ arch/arm/Makefile | 3 +
+ arch/arm/boot/dts/Makefile | 3 +
+ arch/arm/boot/dts/rtd1195-horseradish.dts | 32 +++
+ arch/arm/boot/dts/rtd1195-mele-x1000.dts | 32 +++
+ arch/arm/boot/dts/rtd1195.dtsi | 217 +++++++++++++++++++
+ arch/arm/mach-realtek/Kconfig | 11 +
+ arch/arm/mach-realtek/Makefile | 2 +
+ arch/arm/mach-realtek/rtd1195.c | 40 ++++
+ arch/arm64/boot/dts/realtek/Makefile | 6 +
+ arch/arm64/boot/dts/realtek/rtd1293-ds418j.dts | 6 +-
+ arch/arm64/boot/dts/realtek/rtd1293.dtsi | 12 +-
+ arch/arm64/boot/dts/realtek/rtd1295-mele-v9.dts | 6 +-
+ .../arm64/boot/dts/realtek/rtd1295-probox2-ava.dts | 6 +-
+ arch/arm64/boot/dts/realtek/rtd1295-xnano-x5.dts | 30 +++
+ arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts | 4 +-
+ arch/arm64/boot/dts/realtek/rtd1295.dtsi | 21 +-
+ arch/arm64/boot/dts/realtek/rtd1296-ds418.dts | 4 +-
+ arch/arm64/boot/dts/realtek/rtd1296.dtsi | 8 +-
+ arch/arm64/boot/dts/realtek/rtd129x.dtsi | 221 +++++++++++++-------
+ arch/arm64/boot/dts/realtek/rtd1395-bpi-m4.dts | 30 +++
+ arch/arm64/boot/dts/realtek/rtd1395-lionskin.dts | 36 ++++
+ arch/arm64/boot/dts/realtek/rtd1395.dtsi | 65 ++++++
+ arch/arm64/boot/dts/realtek/rtd139x.dtsi | 193 +++++++++++++++++
+ arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts | 44 ++++
+ arch/arm64/boot/dts/realtek/rtd1619.dtsi | 12 ++
+ arch/arm64/boot/dts/realtek/rtd16xx.dtsi | 229 +++++++++++++++++++++
+ include/dt-bindings/reset/realtek,rtd1195.h | 74 +++++++
+ include/dt-bindings/reset/realtek,rtd1295.h | 3 +
+ 32 files changed, 1268 insertions(+), 109 deletions(-)
+ create mode 100644 arch/arm/boot/dts/rtd1195-horseradish.dts
+ create mode 100644 arch/arm/boot/dts/rtd1195-mele-x1000.dts
+ create mode 100644 arch/arm/boot/dts/rtd1195.dtsi
+ create mode 100644 arch/arm/mach-realtek/Kconfig
+ create mode 100644 arch/arm/mach-realtek/Makefile
+ create mode 100644 arch/arm/mach-realtek/rtd1195.c
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd1295-xnano-x5.dts
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd1395-bpi-m4.dts
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd1395-lionskin.dts
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd1395.dtsi
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd139x.dtsi
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd1619.dtsi
+ create mode 100644 arch/arm64/boot/dts/realtek/rtd16xx.dtsi
+ create mode 100644 include/dt-bindings/reset/realtek,rtd1195.h
+Merging renesas/next (bf4540d5148c Merge branch 'renesas-arm64-dt-for-v5.7' into renesas-next)
+$ git merge renesas/next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging reset/reset/next (2ebf89fd4ecf reset: hi6220: Add support for AO reset controller)
+$ git merge reset/reset/next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/reset/fsl,imx7-src.txt | 6 +-
+ drivers/reset/hisilicon/hi6220_reset.c | 69 +++++++++++++-
+ drivers/reset/reset-imx7.c | 101 +++++++++++++++++++++
+ .../dt-bindings/reset/amlogic,meson-gxbb-reset.h | 2 +-
+ include/dt-bindings/reset/imx8mp-reset.h | 50 ++++++++++
+ include/dt-bindings/reset/imx8mq-reset.h | 56 ++++++------
+ 6 files changed, 253 insertions(+), 31 deletions(-)
+ create mode 100644 include/dt-bindings/reset/imx8mp-reset.h
+Merging rockchip/for-next (c018aff1a201 Merge branch 'v5.7-armsoc/dts64' into for-next)
+$ git merge rockchip/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/mach-rockchip/platsmp.c | 2 +-
+ arch/arm/mach-rockchip/rockchip.c | 2 +-
+ drivers/clk/rockchip/clk-pll.c | 70 +++++++++++++++++++++++----------------
+ drivers/clk/rockchip/clk-rk3228.c | 17 +++-------
+ 4 files changed, 47 insertions(+), 44 deletions(-)
+Merging samsung-krzk/for-next (ff602fc2b39e Merge branch 'next/soc' into for-next)
+$ git merge samsung-krzk/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ .../bindings/arm/samsung/samsung-boards.yaml | 1 +
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/exynos3250-monk.dts | 3 +-
+ arch/arm/boot/dts/exynos3250-rinato.dts | 48 +-
+ arch/arm/boot/dts/exynos4210-i9100.dts | 768 +++++++++++++++++++++
+ arch/arm/boot/dts/exynos4210-origen.dts | 7 +-
+ arch/arm/boot/dts/exynos4210-trats.dts | 41 +-
+ arch/arm/boot/dts/exynos4210-universal_c210.dts | 33 +-
+ arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 6 +-
+ arch/arm/boot/dts/exynos4412-midas.dtsi | 17 +-
+ arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 8 +-
+ arch/arm/boot/dts/exynos4412-origen.dts | 14 +-
+ arch/arm/boot/dts/exynos5250-arndale.dts | 13 +-
+ arch/arm/boot/dts/exynos5420-arndale-octa.dts | 2 +-
+ arch/arm/configs/exynos_defconfig | 8 +-
+ arch/arm/mach-s3c64xx/mach-crag6410-module.c | 7 +-
+ 16 files changed, 921 insertions(+), 56 deletions(-)
+ create mode 100644 arch/arm/boot/dts/exynos4210-i9100.dts
+Merging scmi/for-linux-next (7e63420847ae Merge tag 'acpi-5.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
+$ git merge scmi/for-linux-next
+Already up to date.
+Merging sunxi/sunxi/for-next (8f3d9f354286 Linux 5.7-rc1)
+$ git merge sunxi/sunxi/for-next
+Already up to date.
+Merging tegra/for-next (df0a178cf2df Merge branch for-5.7/usb into for-next)
+$ git merge tegra/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging clk/clk-next (2d3dfd15d2a5 clk: sprd: don't gate uart console clock)
+$ git merge clk/clk-next
+Merge made by the 'recursive' strategy.
+ drivers/clk/clk-asm9260.c | 2 +-
+ drivers/clk/mmp/clk-pll.c | 33 ++++++++++++++++++++++++++++++++-
+ drivers/clk/mmp/clk.c | 31 -------------------------------
+ drivers/clk/mmp/clk.h | 7 -------
+ drivers/clk/sprd/sc9863a-clk.c | 3 ++-
+ 5 files changed, 35 insertions(+), 41 deletions(-)
+Merging clk-samsung/for-next (54ecb8f7028c Linux 5.4-rc1)
+$ git merge clk-samsung/for-next
+Already up to date.
+Merging c6x/for-linux-next (8adcc59974b8 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 (b8e9c96a8f70 csky: Fixup compile error for abiv1 entry.S)
+$ git merge csky/linux-next
+Merge made by the 'recursive' strategy.
+ arch/csky/abiv2/mcount.S | 2 ++
+ arch/csky/include/asm/thread_info.h | 8 ++++----
+ arch/csky/kernel/ftrace.c | 2 ++
+ 3 files changed, 8 insertions(+), 4 deletions(-)
+Merging h8300/h8300-next (a5de8865cb3e h8300: move definition of __kernel_size_t etc. to posix_types.h)
+$ git merge h8300/h8300-next
+Auto-merging arch/h8300/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/h8300/Kconfig | 3 +++
+ arch/h8300/lib/memset.S | 17 ++++++++++-------
+ 2 files changed, 13 insertions(+), 7 deletions(-)
+Merging ia64/next (172e7890406d tty/serial: cleanup after ioc*_serial driver removal)
+$ git merge ia64/next
+Already up to date.
+Merging m68k/for-next (86cded5fc525 m68k: defconfig: Update defconfigs for v5.6-rc4)
+$ git merge m68k/for-next
+Already up to date.
+Merging m68knommu/for-next (ba000760eb0f m68k: Replace setup_irq() by request_irq())
+$ git merge m68knommu/for-next
+Already up to date.
+Merging microblaze/next (9fd1a1c9b3f2 microblaze: Replace setup_irq() by request_irq())
+$ git merge microblaze/next
+Already up to date.
+Merging mips/mips-next (8f3d9f354286 Linux 5.7-rc1)
+$ git merge mips/mips-next
+Already up to date.
+Merging nds32/next (d785c5a324cd nds32: configs: Cleanup CONFIG_CROSS_COMPILE)
+$ git merge nds32/next
+Merge made by the 'recursive' strategy.
+ arch/nds32/configs/defconfig | 1 -
+ arch/nds32/kernel/time.c | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+Merging nios2/for-next (0ec8a5054d7f MAINTAINERS: Remove nios2-dev@lists.rocketboards.org)
+$ git merge nios2/for-next
+Already up to date.
+Merging openrisc/for-next (9737e2c5f0bc openrisc: Remove obsolete show_trace_task function)
+$ git merge openrisc/for-next
+Already up to date.
+Merging parisc-hd/for-next (7111951b8d49 Linux 5.6)
+$ git merge parisc-hd/for-next
+Already up to date.
+Merging powerpc/next (6ba4a2d35910 selftests/powerpc: Always build the tm-poison test 64-bit)
+$ git merge powerpc/next
+Already up to date.
+Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges)
+$ git merge fsl/next
+Already up to date.
+Merging soc-fsl/next (461c3ac0dc46 soc: fsl: qe: fix sparse warnings for ucc_slow.c)
+$ git merge soc-fsl/next
+Already up to date.
+Merging risc-v/for-next (37809df4b1c8 riscv: create a loader.bin boot image for Kendryte SoC)
+$ git merge risc-v/for-next
+Already up to date.
+Merging sifive/for-next (467e050e9760 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 (2bc55eaeb88d s390/cio: generate delayed uevent for vfio-ccw subchannels)
+$ git merge s390/features
+Already up to date.
+Merging sh/sh-next (a193018e5290 sh: add missing EXPORT_SYMBOL() for __delay)
+$ git merge sh/sh-next
+Merge made by the 'recursive' strategy.
+ arch/sh/include/asm/cache.h | 2 +-
+ arch/sh/kernel/Makefile | 2 --
+ arch/sh/kernel/sh_ksyms_32.c | 17 +++++++++++++++++
+ arch/sh/lib/delay.c | 1 +
+ 4 files changed, 19 insertions(+), 3 deletions(-)
+Merging sparc-next/master (b71acb0e3721 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 (4a7c46247f9c um: Remove some unnecessary NULL checks in vector_user.c)
+$ git merge uml/linux-next
+Already up to date.
+Merging xtensa/xtensa-for-next (70cbddb97385 arch/xtensa: fix grammar in Kconfig help text)
+$ git merge xtensa/xtensa-for-next
+Already up to date.
+Merging fscrypt/master (861261f2a9cc ubifs: wire up FS_IOC_GET_ENCRYPTION_NONCE)
+$ git merge fscrypt/master
+Already up to date.
+Merging afs/afs-next (4fe171bb81b1 afs: Remove set but not used variable 'ret')
+$ git merge afs/afs-next
+Already up to date.
+Merging btrfs/for-next (5a7ef5cb05dc Merge branch 'for-next-current-v5.6-20200331' into for-next-20200331)
+$ git merge btrfs/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging ceph/master (2a575f138d00 ceph: fix potential bad pointer deref in async dirops cb's)
+$ git merge ceph/master
+Merge made by the 'recursive' strategy.
+ drivers/block/rbd.c | 33 +++++++++++++++++++--------------
+ fs/ceph/dir.c | 4 ++--
+ fs/ceph/file.c | 4 ++--
+ fs/ceph/mds_client.h | 2 +-
+ 4 files changed, 24 insertions(+), 19 deletions(-)
+Merging cifs/for-next (04c56e9e106c cifs: dump the session id and keys also for SMB2 sessions)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/smb2pdu.c | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+Merging configfs/for-next (e2f238f7d5a1 configfs: calculate the depth of parent item)
+$ git merge configfs/for-next
+Already up to date.
+Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6)
+$ git merge ecryptfs/next
+Already up to date.
+Merging erofs/dev (8f3d9f354286 Linux 5.7-rc1)
+$ git merge erofs/dev
+Already up to date.
+Merging ext3/for_next (a32f0ecd79b4 Merge fanotify fix from Nathan Chancellor.)
+$ git merge ext3/for_next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging ext4/dev (54d3adbc29f0 ext4: save all error info in save_error_info() and drop ext4_set_errno())
+$ git merge ext4/dev
+Already up to date.
+Merging f2fs/dev (9f0d5809eb7c f2fs: fix to handle error path of f2fs_ra_meta_pages())
+$ git merge f2fs/dev
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-fs-f2fs | 9 ++++++
+ fs/f2fs/checkpoint.c | 5 ++--
+ fs/f2fs/data.c | 27 +++++++++++++++--
+ fs/f2fs/f2fs.h | 13 ++++++++-
+ fs/f2fs/sysfs.c | 37 ++++++++++++++++++++++-
+ include/trace/events/f2fs.h | 52 +++++++++++++++++++++++++++++++++
+ 6 files changed, 137 insertions(+), 6 deletions(-)
+Merging fsverity/fsverity (98d54f81e36b Linux 5.6-rc4)
+$ git merge fsverity/fsverity
+Already up to date.
+Merging fuse/for-next (3e8cb8b2eaeb fuse: fix stack use after return)
+$ git merge fuse/for-next
+Already up to date.
+Merging jfs/jfs-next (7aba5dcc2346 jfs: Replace zero-length array with flexible-array member)
+$ git merge jfs/jfs-next
+Merge made by the 'recursive' strategy.
+ fs/jfs/jfs_dtree.c | 2 +-
+ fs/jfs/jfs_xattr.h | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+Merging nfs/linux-next (8f3d9f354286 Linux 5.7-rc1)
+$ git merge nfs/linux-next
+Already up to date.
+Merging nfs-anna/linux-next (55dee1bc0d72 nfs: add minor version to nfs_server_key for fscache)
+$ git merge nfs-anna/linux-next
+Already up to date.
+Merging nfsd/nfsd-next (2653de9f0398 fs: nfsd: fileache.c: Use built-in RCU list checking)
+$ git merge nfsd/nfsd-next
+Auto-merging net/sunrpc/xprtrdma/svc_rdma_rw.c
+Auto-merging net/sunrpc/cache.c
+CONFLICT (content): Merge conflict in net/sunrpc/cache.c
+Auto-merging include/linux/sunrpc/svc.h
+Auto-merging fs/nfsd/nfs4xdr.c
+Auto-merging fs/nfsd/nfs4state.c
+Resolved 'net/sunrpc/cache.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master e8190c3dd390] Merge remote-tracking branch 'nfsd/nfsd-next'
+$ git diff -M --stat --summary HEAD^..
+Merging orangefs/for-next (aa317d3351de orangefs: clarify build steps for test server in orangefs.txt)
+$ git merge orangefs/for-next
+Already up to date.
+Merging overlayfs/overlayfs-next (2eda9eaa6d7e ovl: document xino expected behavior)
+$ git merge overlayfs/overlayfs-next
+Already up to date.
+Merging ubifs/linux-next (3676f32a98cd ubi: ubi-media.h: Replace zero-length array with flexible-array member)
+$ git merge ubifs/linux-next
+Already up to date.
+Merging v9fs/9p-next (c6f141412d24 9p: document short read behaviour with O_NONBLOCK)
+$ git merge v9fs/9p-next
+Already up to date.
+Merging xfs/for-next (5833112df7e9 xfs: reflink should force the log out if mounted with wsync)
+$ git merge xfs/for-next
+Already up to date.
+Merging zonefs/for-next (0dda2ddb7ded zonefs: select FS_IOMAP)
+$ git merge zonefs/for-next
+Already up to date.
+Merging iomap/iomap-for-next (457df33e035a iomap: Handle memory allocation failure in readahead)
+$ git merge iomap/iomap-for-next
+Already up to date.
+Merging djw-vfs/vfs-for-next (56939e014a6c hibernate: Allow uswsusp to write to swap)
+$ git merge djw-vfs/vfs-for-next
+Already up to date.
+Merging file-locks/locks-next (dbdaf6a3250b locks: reinstate locks_delete_block optimization)
+$ git merge file-locks/locks-next
+Auto-merging fs/cifs/file.c
+Merge made by the 'recursive' strategy.
+Merging vfs/for-next (ffca8b2a77f2 Merge branch 'work.exfat' into for-next)
+$ git merge vfs/for-next
+Auto-merging fs/namespace.c
+Auto-merging fs/erofs/zdata.c
+Auto-merging fs/erofs/super.c
+Auto-merging fs/erofs/internal.h
+Merge made by the 'recursive' strategy.
+ fs/erofs/internal.h | 27 +++---
+ fs/erofs/super.c | 251 +++++++++++++++++++++++-----------------------------
+ fs/erofs/xattr.c | 4 +-
+ fs/erofs/zdata.c | 4 +-
+ fs/namespace.c | 5 +-
+ fs/super.c | 2 +-
+ 6 files changed, 134 insertions(+), 159 deletions(-)
+Merging printk/for-next (d34f14ae521f Merge branch 'for-5.7-preferred-console' into for-next)
+$ git merge printk/for-next
+Auto-merging kernel/printk/printk.c
+Auto-merging include/linux/console.h
+Merge made by the 'recursive' strategy.
+ include/linux/console.h | 2 +-
+ kernel/printk/console_cmdline.h | 1 +
+ kernel/printk/printk.c | 128 +++++++++++++++++++++++++---------------
+ 3 files changed, 83 insertions(+), 48 deletions(-)
+Merging pci/next (8f3d9f354286 Linux 5.7-rc1)
+$ git merge pci/next
+Already up to date.
+Merging pstore/for-next/pstore (8f3d9f354286 Linux 5.7-rc1)
+$ git merge pstore/for-next/pstore
+Already up to date.
+Merging hid/for-next (04f6305f8071 Merge branch 'for-5.8/logitech' into for-next)
+$ git merge hid/for-next
+Merge made by the 'recursive' strategy.
+ drivers/hid/Kconfig | 6 +++---
+ drivers/hid/hid-logitech-dj.c | 4 ++--
+ drivers/hid/hid-logitech-hidpp.c | 2 +-
+ drivers/hid/wacom_sys.c | 4 +++-
+ 4 files changed, 9 insertions(+), 7 deletions(-)
+Merging i2c/i2c/for-next (a10c9c710f9e Merge tag 'for-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply)
+$ git merge i2c/i2c/for-next
+Already up to date.
+Merging i3c/i3c/next (c4b9de11d010 i3c: convert to use i2c_new_client_device())
+$ git merge i3c/i3c/next
+Already up to date.
+Merging dmi/master (8cf87c744696 firmware/dmi: Report DMI Bios & EC firmware release)
+$ git merge dmi/master
+Auto-merging scripts/mod/file2alias.c
+Auto-merging include/linux/mod_devicetable.h
+Auto-merging drivers/firmware/dmi_scan.c
+Merge made by the 'recursive' strategy.
+ drivers/firmware/dmi-id.c | 6 ++++++
+ drivers/firmware/dmi_scan.c | 30 ++++++++++++++++++++++++++++++
+ include/linux/mod_devicetable.h | 2 ++
+ scripts/mod/file2alias.c | 2 ++
+ 4 files changed, 40 insertions(+)
+Merging hwmon-staging/hwmon-next (635049d0e3a0 hwmon: (dell-smm) Use one DMI match for all XPS models)
+$ git merge hwmon-staging/hwmon-next
+Merge made by the 'recursive' strategy.
+ drivers/hwmon/Kconfig | 6 +-
+ drivers/hwmon/dell-smm-hwmon.c | 26 +-------
+ drivers/hwmon/nct7904.c | 138 ++++++++++++++++++++++++++++++++++++++++-
+ 3 files changed, 143 insertions(+), 27 deletions(-)
+Merging jc_docs/docs-next (befacdcf47d4 Documentation: android: binderfs: add 'stats' mount option)
+$ git merge jc_docs/docs-next
+Already up to date.
+Merging v4l-dvb/master (2632e7b618a7 media: venus: firmware: Ignore secure call error on first resume)
+$ git merge v4l-dvb/master
+Already up to date.
+Merging v4l-dvb-next/master (54ecb8f7028c Linux 5.4-rc1)
+$ git merge v4l-dvb-next/master
+Already up to date.
+Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe())
+$ git merge fbdev/fbdev-for-next
+Already up to date.
+Merging pm/linux-next (d3e5e977abe2 Merge tag 'acpi-5.7-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
+$ git merge pm/linux-next
+Already up to date.
+Merging cpufreq-arm/cpufreq/arm/linux-next (a8811ec764f9 cpufreq: qcom: Add support for krait based socs)
+$ git merge cpufreq-arm/cpufreq/arm/linux-next
+Already up to date.
+Merging cpupower/cpupower (8f3d9f354286 Linux 5.7-rc1)
+$ git merge cpupower/cpupower
+Already up to date.
+Merging opp/opp/linux-next (aca48b61f963 opp: Manage empty OPP tables with clk handle)
+$ git merge opp/opp/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/opp/core.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+Merging thermal/thermal/linux-next (df1982294937 thermal: Delete an error message in four functions)
+$ git merge thermal/thermal/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/thermal/devfreq_cooling.c | 70 ++++++++----------------
+ drivers/thermal/imx_sc_thermal.c | 4 ++
+ drivers/thermal/rockchip_thermal.c | 4 +-
+ drivers/thermal/st/st_thermal_memmap.c | 4 +-
+ drivers/thermal/st/stm_thermal.c | 4 +-
+ drivers/thermal/thermal_core.c | 6 ---
+ drivers/thermal/thermal_core.h | 52 ++++++++++++++++++
+ drivers/thermal/thermal_helpers.c | 13 ++++-
+ drivers/thermal/ti-soc-thermal/ti-bandgap.c | 5 +-
+ include/linux/thermal.h | 84 ++---------------------------
+ 10 files changed, 99 insertions(+), 147 deletions(-)
+Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1)
+$ git merge thermal-rzhang/next
+Already up to date.
+Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor)
+$ git merge thermal-soc/next
+Already up to date.
+Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid')
+$ git merge ieee1394/for-next
+Auto-merging drivers/firewire/net.c
+Merge made by the 'recursive' strategy.
+ drivers/firewire/net.c | 2 --
+ 1 file changed, 2 deletions(-)
+Merging dlm/next (a48f9721e6db dlm: no need to check return value of debugfs_create functions)
+$ git merge dlm/next
+Already up to date.
+Merging swiotlb/linux-next (4cdfb27ba80d 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
+Merge made by the 'recursive' strategy.
+Merging rdma/for-next (8f3d9f354286 Linux 5.7-rc1)
+$ git merge rdma/for-next
+Already up to date.
+Merging net-next/master (63bef48fd6c9 Merge branch 'akpm' (patches from Andrew))
+$ git merge net-next/master
+Already up to date.
+Merging bpf-next/master (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
+$ git merge bpf-next/master
+Already up to date.
+Merging ipsec-next/master (308491755f36 xfrm: add prep for esp beet mode offload)
+$ git merge ipsec-next/master
+Already up to date.
+Merging mlx5-next/mlx5-next (826096d84f50 mlx5: Remove uninitialized use of key in mlx5_core_create_mkey)
+$ git merge mlx5-next/mlx5-next
+Already up to date.
+Merging netfilter-next/master (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
+$ git merge netfilter-next/master
+Already up to date.
+Merging ipvs-next/master (d54725cd11a5 netfilter: nf_tables: support for multiple devices per netdev hook)
+$ git merge ipvs-next/master
+Already up to date.
+Merging wireless-drivers-next/master (5988b8ec7132 Merge tag 'iwlwifi-next-for-kalle-2020-03-27' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next)
+$ git merge wireless-drivers-next/master
+Already up to date.
+Merging bluetooth/master (04896832c94a Bluetooth: btrtl: Add support for RTL8761B)
+$ git merge bluetooth/master
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/net/qualcomm-bluetooth.txt | 1 +
+ drivers/bluetooth/btqca.c | 18 +-
+ drivers/bluetooth/btqca.h | 3 +-
+ drivers/bluetooth/btrtl.c | 10 +-
+ drivers/bluetooth/btusb.c | 185 ++++++++++++++++-----
+ drivers/bluetooth/hci_bcm.c | 8 +-
+ drivers/bluetooth/hci_qca.c | 40 ++++-
+ include/net/bluetooth/bluetooth.h | 8 +
+ include/net/bluetooth/hci.h | 12 ++
+ include/net/bluetooth/hci_core.h | 15 ++
+ include/net/bluetooth/mgmt.h | 7 +
+ net/bluetooth/Kconfig | 23 ++-
+ net/bluetooth/Makefile | 1 +
+ net/bluetooth/hci_conn.c | 25 ++-
+ net/bluetooth/hci_core.c | 115 +++++++------
+ net/bluetooth/hci_debugfs.c | 46 +++++
+ net/bluetooth/hci_event.c | 54 +++++-
+ net/bluetooth/l2cap_sock.c | 138 ++++++++++++++-
+ net/bluetooth/mgmt.c | 55 +++++-
+ net/bluetooth/msft.c | 141 ++++++++++++++++
+ net/bluetooth/msft.h | 18 ++
+ net/bluetooth/smp.c | 33 +++-
+ 22 files changed, 816 insertions(+), 140 deletions(-)
+ create mode 100644 net/bluetooth/msft.c
+ create mode 100644 net/bluetooth/msft.h
+Merging mac80211-next/master (1e8f471425f4 mac80211_hwsim: notify wmediumd of used MAC addresses)
+$ git merge mac80211-next/master
+Merge made by the 'recursive' strategy.
+ drivers/net/wireless/mac80211_hwsim.c | 51 +++++++++++++++++++++++++++++++++++
+ drivers/net/wireless/mac80211_hwsim.h | 8 ++++++
+ 2 files changed, 59 insertions(+)
+Merging gfs2/for-next (75b46c437f6b gfs2: Fix oversight in gfs2_ail1_flush)
+$ git merge gfs2/for-next
+Already up to date.
+Merging mtd/mtd/next (025a06c1104c mtd: Convert fallthrough comments into statements)
+$ git merge mtd/mtd/next
+Already up to date.
+Merging nand/nand/next (fca88925d769 mtd: rawnand: toshiba: Support reading the number of bitflips for BENAND (Built-in ECC NAND))
+$ git merge nand/nand/next
+Already up to date.
+Merging spi-nor/spi-nor/next (f3f2b7eb2f1c mtd: spi-nor: Enable locking for n25q512ax3/n25q512a)
+$ git merge spi-nor/spi-nor/next
+Already up to date.
+Merging crypto/master (fcb90d51c375 crypto: af_alg - bool type cosmetics)
+$ git merge crypto/master
+Already up to date.
+Merging drm/drm-next (74bd4f0c921c Merge tag 'amd-drm-fixes-5.7-2020-04-08' of git://people.freedesktop.org/~agd5f/linux into drm-next)
+$ git merge drm/drm-next
+Already up to date.
+Merging amdgpu/drm-next (54c46f9a8781 drm/amdgpu/gfx9: add gfxoff quirk)
+$ git merge amdgpu/drm-next
+Removing include/drm/ttm/ttm_debug.h
+Auto-merging drivers/pci/p2pdma.c
+Auto-merging drivers/gpu/drm/amd/powerplay/renoir_ppt.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/powerplay/renoir_ppt.c
+Auto-merging drivers/gpu/drm/amd/powerplay/amd_powerplay.c
+Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
+Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
+Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+Resolved 'drivers/gpu/drm/amd/powerplay/renoir_ppt.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 98211f6937c0] Merge remote-tracking branch 'amdgpu/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/gpu/amdgpu.rst | 88 +
+ drivers/gpu/drm/amd/amdgpu/Makefile | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 65 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 3 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 160 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 3 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 73 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 246 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 21 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 184 ++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.h | 29 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 51 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 5 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 35 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 4 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 85 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 13 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 2 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 11 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 75 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 4 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 13 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 54 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 5 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 322 ++-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 103 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 32 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 79 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 20 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 90 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 28 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 30 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/atom.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/cik.c | 10 -
+ drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 2813 +++++++++++++++++++-
+ drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 31 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 51 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 41 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 121 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 3 +
+ drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 3 +-
+ drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 97 +-
+ drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 44 +-
+ drivers/gpu/drm/amd/amdgpu/mxgpu_vi.h | 3 +-
+ drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 302 ++-
+ drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 18 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 18 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 7 -
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 36 +-
+ drivers/gpu/drm/amd/amdgpu/nv.c | 21 +-
+ drivers/gpu/drm/amd/amdgpu/nvd.h | 49 +
+ drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 40 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 127 +-
+ drivers/gpu/drm/amd/amdgpu/si.c | 8 -
+ drivers/gpu/drm/amd/amdgpu/si_dma.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/si_dpm.c | 20 -
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/soc15d.h | 26 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 16 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 23 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 77 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 90 +-
+ drivers/gpu/drm/amd/amdgpu/vi.c | 26 -
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 41 +
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 40 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 +
+ .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 9 +
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 2 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 68 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 3 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 61 +
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +-
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 43 -
+ drivers/gpu/drm/amd/display/dc/basics/Makefile | 3 +-
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 4 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c | 475 ++--
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 15 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 8 +-
+ drivers/gpu/drm/amd/display/dc/dc.h | 45 +-
+ drivers/gpu/drm/amd/display/dc/dc_link.h | 7 +
+ drivers/gpu/drm/amd/display/dc/dce/Makefile | 2 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 1 +
+ .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 20 +-
+ .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 3 +
+ drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 436 +++
+ .../dc/{basics/log_helpers.c => dce/dmub_abm.h} | 25 +-
+ drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 3 -
+ .../drm/amd/display/dc/dce80/dce80_hw_sequencer.c | 28 -
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 49 +-
+ .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 20 +-
+ .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 3 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 6 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 6 +
+ .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 40 +
+ .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 4 +
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 12 +-
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 1 +
+ .../drm/amd/display/dc/dcn21/dcn21_link_encoder.c | 27 +-
+ .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 43 +-
+ .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 3 +-
+ drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 89 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 3 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 2 +
+ drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 4 +
+ .../amd/display/dc/virtual/virtual_link_encoder.c | 9 +
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 11 +
+ .../gpu/drm/amd/display/dmub/inc/dmub_cmd_dal.h | 14 +-
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_srv.h | 11 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 24 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 25 +-
+ drivers/gpu/drm/amd/display/include/hdcp_types.h | 7 +
+ .../gpu/drm/amd/display/include/logger_interface.h | 4 -
+ drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 5 +-
+ drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 30 +-
+ .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 2 +-
+ .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 2 +-
+ .../gpu/drm/amd/display/modules/hdcp/hdcp_log.c | 8 +-
+ .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 482 ++--
+ drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 5 +-
+ .../drm/amd/display/modules/power/power_helpers.c | 27 +-
+ .../drm/amd/display/modules/power/power_helpers.h | 3 +
+ .../amd/include/asic_reg/nbif/nbif_6_1_offset.h | 2 +
+ .../amd/include/asic_reg/nbio/nbio_7_0_offset.h | 2 +
+ .../amd/include/asic_reg/nbio/nbio_7_4_offset.h | 2 +
+ .../drm/amd/include/asic_reg/pwr/pwr_10_0_offset.h | 27 +
+ .../amd/include/asic_reg/pwr/pwr_10_0_sh_mask.h | 30 +
+ .../include/asic_reg/smuio/smuio_12_0_0_offset.h | 30 +
+ .../include/asic_reg/smuio/smuio_12_0_0_sh_mask.h | 33 +
+ drivers/gpu/drm/amd/include/cgs_common.h | 1 -
+ drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 3 +
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 174 +-
+ .../amd/powerplay/hwmgr/smu7_clockpowergating.c | 61 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 140 +-
+ .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 40 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c | 17 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c | 157 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c | 4 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega10_baco.c | 2 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 141 +-
+ .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 9 +-
+ .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 6 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega12_baco.c | 2 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 149 +-
+ .../gpu/drm/amd/powerplay/hwmgr/vega12_thermal.c | 7 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c | 8 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 181 +-
+ .../gpu/drm/amd/powerplay/hwmgr/vega20_powertune.c | 6 +-
+ .../gpu/drm/amd/powerplay/hwmgr/vega20_thermal.c | 7 +-
+ drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 +
+ drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 1 -
+ drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 7 +-
+ drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 2 +-
+ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 10 +-
+ drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 12 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 18 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 35 +-
+ .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 1 +
+ .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 31 +-
+ .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 39 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 48 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h | 4 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 69 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 56 +-
+ .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 15 +-
+ .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 56 +-
+ .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 68 +-
+ .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 106 +-
+ .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 18 +-
+ drivers/gpu/drm/radeon/Makefile | 35 +-
+ drivers/gpu/drm/radeon/ci_dpm.c | 14 -
+ drivers/gpu/drm/radeon/si_dpm.c | 18 -
+ drivers/gpu/drm/ttm/ttm_bo.c | 2 +-
+ drivers/pci/p2pdma.c | 2 +
+ include/drm/ttm/ttm_debug.h | 31 -
+ include/uapi/drm/amdgpu_drm.h | 15 +-
+ include/uapi/linux/kfd_ioctl.h | 19 +-
+ 225 files changed, 8092 insertions(+), 2583 deletions(-)
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c
+ rename drivers/gpu/drm/amd/display/dc/{basics/log_helpers.c => dce/dmub_abm.h} (75%)
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/pwr/pwr_10_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/pwr/pwr_10_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_12_0_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_12_0_0_sh_mask.h
+ delete mode 100644 include/drm/ttm/ttm_debug.h
+Merging drm-intel/for-linux-next (f30d3ced9faf agp/intel: Reinforce the barrier after GTT updates)
+$ git merge drm-intel/for-linux-next
+Auto-merging include/drm/drm_dp_helper.h
+Removing drivers/gpu/drm/i915/oa/i915_oa_tgl.h
+Removing drivers/gpu/drm/i915/oa/i915_oa_tgl.c
+Removing drivers/gpu/drm/i915/oa/i915_oa_sklgt4.h
+Removing drivers/gpu/drm/i915/oa/i915_oa_sklgt4.c
+Removing drivers/gpu/drm/i915/oa/i915_oa_sklgt3.h
+Removing drivers/gpu/drm/i915/oa/i915_oa_sklgt3.c
+Removing drivers/gpu/drm/i915/oa/i915_oa_sklgt2.h
+Removing drivers/gpu/drm/i915/oa/i915_oa_sklgt2.c
+Removing drivers/gpu/drm/i915/oa/i915_oa_kblgt3.h
+Removing drivers/gpu/drm/i915/oa/i915_oa_kblgt3.c
+Removing drivers/gpu/drm/i915/oa/i915_oa_kblgt2.h
+Removing drivers/gpu/drm/i915/oa/i915_oa_kblgt2.c
+Removing drivers/gpu/drm/i915/oa/i915_oa_icl.h
+Removing drivers/gpu/drm/i915/oa/i915_oa_icl.c
+Removing drivers/gpu/drm/i915/oa/i915_oa_hsw.h
+Removing drivers/gpu/drm/i915/oa/i915_oa_hsw.c
+Removing drivers/gpu/drm/i915/oa/i915_oa_glk.h
+Removing drivers/gpu/drm/i915/oa/i915_oa_glk.c
+Removing drivers/gpu/drm/i915/oa/i915_oa_cnl.h
+Removing drivers/gpu/drm/i915/oa/i915_oa_cnl.c
+Removing drivers/gpu/drm/i915/oa/i915_oa_chv.h
+Removing drivers/gpu/drm/i915/oa/i915_oa_chv.c
+Removing drivers/gpu/drm/i915/oa/i915_oa_cflgt3.h
+Removing drivers/gpu/drm/i915/oa/i915_oa_cflgt3.c
+Removing drivers/gpu/drm/i915/oa/i915_oa_cflgt2.h
+Removing drivers/gpu/drm/i915/oa/i915_oa_cflgt2.c
+Removing drivers/gpu/drm/i915/oa/i915_oa_bxt.h
+Removing drivers/gpu/drm/i915/oa/i915_oa_bxt.c
+Removing drivers/gpu/drm/i915/oa/i915_oa_bdw.h
+Removing drivers/gpu/drm/i915/oa/i915_oa_bdw.c
+Auto-merging drivers/gpu/drm/i915/i915_vma.c
+Auto-merging drivers/gpu/drm/i915/i915_reg.h
+Auto-merging drivers/gpu/drm/i915/i915_perf.c
+Auto-merging drivers/gpu/drm/i915/i915_irq.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.c
+Auto-merging drivers/gpu/drm/i915/gt/selftest_rc6.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/selftest_rc6.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_rps.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_ring_submission.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_reset.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_rc6.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_ggtt.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_context.c
+Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.h
+Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c
+Auto-merging drivers/gpu/drm/i915/display/intel_fbdev.c
+Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c
+Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/display/intel_display.c
+Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_ddi.c
+Auto-merging drivers/gpu/drm/i915/Makefile
+Auto-merging drivers/gpu/drm/drm_dp_helper.c
+Recorded preimage for 'drivers/gpu/drm/i915/display/intel_ddi.c'
+Recorded preimage for 'drivers/gpu/drm/i915/gt/selftest_rc6.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'drivers/gpu/drm/i915/display/intel_ddi.c'.
+Recorded resolution for 'drivers/gpu/drm/i915/gt/selftest_rc6.c'.
+[master 513f1ed64b5e] Merge remote-tracking branch 'drm-intel/for-linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/gpu/i915.rst | 6 +-
+ drivers/char/agp/intel-gtt.c | 4 +-
+ drivers/gpu/drm/drm_dp_helper.c | 2 +
+ drivers/gpu/drm/i915/Makefile | 23 +-
+ drivers/gpu/drm/i915/display/icl_dsi.c | 167 ++++-
+ drivers/gpu/drm/i915/display/intel_atomic_plane.c | 21 +-
+ drivers/gpu/drm/i915/display/intel_atomic_plane.h | 2 +
+ drivers/gpu/drm/i915/display/intel_audio.c | 14 +-
+ drivers/gpu/drm/i915/display/intel_bw.c | 9 +-
+ drivers/gpu/drm/i915/display/intel_color.c | 121 +++-
+ drivers/gpu/drm/i915/display/intel_connector.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_crt.c | 36 +-
+ drivers/gpu/drm/i915/display/intel_ddi.c | 522 ++++++++++----
+ drivers/gpu/drm/i915/display/intel_ddi.h | 3 +-
+ drivers/gpu/drm/i915/display/intel_display.c | 457 ++++---------
+ drivers/gpu/drm/i915/display/intel_display.h | 8 +-
+ drivers/gpu/drm/i915/display/intel_display_power.c | 22 +-
+ drivers/gpu/drm/i915/display/intel_display_types.h | 38 +-
+ drivers/gpu/drm/i915/display/intel_dp.c | 761 +++++++++++++++++----
+ drivers/gpu/drm/i915/display/intel_dp.h | 3 +
+ .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 84 ++-
+ drivers/gpu/drm/i915/display/intel_dp_mst.c | 153 +++--
+ drivers/gpu/drm/i915/display/intel_dsi.c | 9 +-
+ drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 11 +-
+ drivers/gpu/drm/i915/display/intel_dvo.c | 9 +-
+ drivers/gpu/drm/i915/display/intel_fbc.c | 84 ++-
+ drivers/gpu/drm/i915/display/intel_fbdev.c | 96 +--
+ drivers/gpu/drm/i915/display/intel_global_state.c | 5 +-
+ drivers/gpu/drm/i915/display/intel_hdcp.c | 6 +-
+ drivers/gpu/drm/i915/display/intel_hdcp.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_hdmi.c | 253 ++++---
+ drivers/gpu/drm/i915/display/intel_hotplug.c | 16 +-
+ drivers/gpu/drm/i915/display/intel_hotplug.h | 3 +-
+ drivers/gpu/drm/i915/display/intel_lvds.c | 22 +-
+ drivers/gpu/drm/i915/display/intel_overlay.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_panel.c | 22 +-
+ drivers/gpu/drm/i915/display/intel_panel.h | 3 +-
+ drivers/gpu/drm/i915/display/intel_psr.c | 47 +-
+ drivers/gpu/drm/i915/display/intel_sdvo.c | 22 +-
+ drivers/gpu/drm/i915/display/intel_tc.c | 47 +-
+ drivers/gpu/drm/i915/display/intel_tv.c | 15 +-
+ drivers/gpu/drm/i915/display/vlv_dsi.c | 15 +-
+ drivers/gpu/drm/i915/gem/i915_gem_context.c | 85 ++-
+ drivers/gpu/drm/i915/gem/i915_gem_context.h | 4 +
+ drivers/gpu/drm/i915/gem/i915_gem_domain.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 365 ++++++----
+ drivers/gpu/drm/i915/gem/i915_gem_object.c | 1 -
+ drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 3 -
+ drivers/gpu/drm/i915/gem/i915_gem_pages.c | 2 -
+ drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 18 +-
+ drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 4 +-
+ .../gpu/drm/i915/gem/selftests/huge_gem_object.c | 3 +-
+ .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 2 +-
+ drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 4 -
+ .../gpu/drm/i915/gem/selftests/i915_gem_object.c | 2 +-
+ drivers/gpu/drm/i915/gt/debugfs_engines.c | 2 +-
+ drivers/gpu/drm/i915/gt/debugfs_gt.c | 15 +-
+ drivers/gpu/drm/i915/gt/debugfs_gt.h | 9 +-
+ drivers/gpu/drm/i915/gt/debugfs_gt_pm.c | 10 +-
+ drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 6 +-
+ drivers/gpu/drm/i915/gt/intel_context.c | 5 +
+ drivers/gpu/drm/i915/gt/intel_engine.h | 2 +
+ drivers/gpu/drm/i915/gt/intel_engine_cs.c | 127 ++--
+ drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_engine_pm.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_engine_pm.h | 6 +
+ drivers/gpu/drm/i915/gt/intel_engine_types.h | 12 +
+ drivers/gpu/drm/i915/gt/intel_ggtt.c | 52 +-
+ .../intel_ggtt_fencing.c} | 170 +++--
+ .../intel_ggtt_fencing.h} | 17 +-
+ drivers/gpu/drm/i915/gt/intel_gt.c | 3 +-
+ drivers/gpu/drm/i915/gt/intel_gt_irq.c | 15 +-
+ drivers/gpu/drm/i915/gt/intel_gt_pm.c | 5 +-
+ drivers/gpu/drm/i915/gt/intel_gt_requests.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_gtt.h | 5 +-
+ drivers/gpu/drm/i915/gt/intel_lrc.c | 252 +++++--
+ drivers/gpu/drm/i915/gt/intel_rc6.c | 39 +-
+ drivers/gpu/drm/i915/gt/intel_renderstate.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_reset.c | 16 +-
+ drivers/gpu/drm/i915/gt/intel_ring.h | 5 +-
+ drivers/gpu/drm/i915/gt/intel_ring_submission.c | 33 +-
+ drivers/gpu/drm/i915/gt/intel_rps.c | 92 ++-
+ drivers/gpu/drm/i915/gt/intel_sseu.c | 33 +-
+ drivers/gpu/drm/i915/gt/intel_timeline.c | 12 +-
+ drivers/gpu/drm/i915/gt/intel_workarounds.c | 19 +-
+ drivers/gpu/drm/i915/gt/selftest_lrc.c | 117 ++--
+ drivers/gpu/drm/i915/gt/selftest_rc6.c | 44 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc.c | 46 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc.h | 7 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c | 42 ++
+ drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.h | 14 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 14 -
+ drivers/gpu/drm/i915/gt/uc/intel_guc_fw.h | 1 -
+ drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 97 ++-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_log.h | 4 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_log_debugfs.c | 124 ++++
+ drivers/gpu/drm/i915/gt/uc/intel_guc_log_debugfs.h | 15 +
+ drivers/gpu/drm/i915/gt/uc/intel_huc.c | 53 +-
+ drivers/gpu/drm/i915/gt/uc/intel_huc.h | 2 +
+ drivers/gpu/drm/i915/gt/uc/intel_huc_debugfs.c | 36 +
+ drivers/gpu/drm/i915/gt/uc/intel_huc_debugfs.h | 14 +
+ drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 17 -
+ drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h | 1 -
+ drivers/gpu/drm/i915/gt/uc/intel_uc.c | 35 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc.h | 1 +
+ drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c | 30 +
+ drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.h | 14 +
+ drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 56 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 3 +-
+ drivers/gpu/drm/i915/gvt/aperture_gm.c | 2 +-
+ drivers/gpu/drm/i915/i915_active.c | 137 +++-
+ drivers/gpu/drm/i915/i915_active.h | 14 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 298 +-------
+ drivers/gpu/drm/i915/i915_drv.c | 4 -
+ drivers/gpu/drm/i915/i915_drv.h | 7 +-
+ drivers/gpu/drm/i915/i915_gem.c | 20 +-
+ drivers/gpu/drm/i915/i915_gem_evict.c | 7 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 2 +-
+ drivers/gpu/drm/i915/i915_irq.c | 8 +-
+ drivers/gpu/drm/i915/i915_pci.c | 23 +-
+ drivers/gpu/drm/i915/i915_perf.c | 563 +++++++--------
+ drivers/gpu/drm/i915/i915_perf_types.h | 46 +-
+ drivers/gpu/drm/i915/i915_pmu.c | 4 +-
+ drivers/gpu/drm/i915/i915_reg.h | 110 ++-
+ drivers/gpu/drm/i915/i915_request.c | 29 +-
+ drivers/gpu/drm/i915/i915_request.h | 2 +
+ drivers/gpu/drm/i915/i915_scheduler.c | 10 +
+ drivers/gpu/drm/i915/i915_sw_fence.c | 2 +-
+ drivers/gpu/drm/i915/i915_sw_fence_work.c | 5 +-
+ drivers/gpu/drm/i915/i915_sw_fence_work.h | 23 +
+ drivers/gpu/drm/i915/i915_switcheroo.c | 4 +-
+ drivers/gpu/drm/i915/i915_utils.c | 3 +-
+ drivers/gpu/drm/i915/i915_vma.c | 93 ++-
+ drivers/gpu/drm/i915/i915_vma.h | 4 +-
+ drivers/gpu/drm/i915/intel_device_info.c | 41 +-
+ drivers/gpu/drm/i915/intel_device_info.h | 1 +
+ drivers/gpu/drm/i915/intel_dram.c | 3 +-
+ drivers/gpu/drm/i915/intel_uncore.c | 24 +-
+ drivers/gpu/drm/i915/intel_uncore.h | 6 +-
+ drivers/gpu/drm/i915/intel_wakeref.c | 12 +-
+ drivers/gpu/drm/i915/intel_wakeref.h | 22 +-
+ drivers/gpu/drm/i915/intel_wopcm.c | 22 +-
+ drivers/gpu/drm/i915/oa/i915_oa_bdw.c | 90 ---
+ drivers/gpu/drm/i915/oa/i915_oa_bdw.h | 16 -
+ drivers/gpu/drm/i915/oa/i915_oa_bxt.c | 88 ---
+ drivers/gpu/drm/i915/oa/i915_oa_bxt.h | 16 -
+ drivers/gpu/drm/i915/oa/i915_oa_cflgt2.c | 89 ---
+ drivers/gpu/drm/i915/oa/i915_oa_cflgt2.h | 16 -
+ drivers/gpu/drm/i915/oa/i915_oa_cflgt3.c | 89 ---
+ drivers/gpu/drm/i915/oa/i915_oa_cflgt3.h | 16 -
+ drivers/gpu/drm/i915/oa/i915_oa_chv.c | 89 ---
+ drivers/gpu/drm/i915/oa/i915_oa_chv.h | 16 -
+ drivers/gpu/drm/i915/oa/i915_oa_cnl.c | 101 ---
+ drivers/gpu/drm/i915/oa/i915_oa_cnl.h | 16 -
+ drivers/gpu/drm/i915/oa/i915_oa_glk.c | 88 ---
+ drivers/gpu/drm/i915/oa/i915_oa_glk.h | 16 -
+ drivers/gpu/drm/i915/oa/i915_oa_hsw.c | 118 ----
+ drivers/gpu/drm/i915/oa/i915_oa_hsw.h | 16 -
+ drivers/gpu/drm/i915/oa/i915_oa_icl.c | 98 ---
+ drivers/gpu/drm/i915/oa/i915_oa_icl.h | 16 -
+ drivers/gpu/drm/i915/oa/i915_oa_kblgt2.c | 89 ---
+ drivers/gpu/drm/i915/oa/i915_oa_kblgt2.h | 16 -
+ drivers/gpu/drm/i915/oa/i915_oa_kblgt3.c | 89 ---
+ drivers/gpu/drm/i915/oa/i915_oa_kblgt3.h | 16 -
+ drivers/gpu/drm/i915/oa/i915_oa_sklgt2.c | 88 ---
+ drivers/gpu/drm/i915/oa/i915_oa_sklgt2.h | 16 -
+ drivers/gpu/drm/i915/oa/i915_oa_sklgt3.c | 89 ---
+ drivers/gpu/drm/i915/oa/i915_oa_sklgt3.h | 16 -
+ drivers/gpu/drm/i915/oa/i915_oa_sklgt4.c | 89 ---
+ drivers/gpu/drm/i915/oa/i915_oa_sklgt4.h | 16 -
+ drivers/gpu/drm/i915/oa/i915_oa_tgl.c | 121 ----
+ drivers/gpu/drm/i915/oa/i915_oa_tgl.h | 16 -
+ drivers/gpu/drm/i915/selftests/i915_active.c | 12 +-
+ drivers/gpu/drm/i915/selftests/i915_gem.c | 2 -
+ drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 26 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 1 -
+ drivers/gpu/drm/i915/selftests/i915_perf.c | 98 ++-
+ drivers/gpu/drm/i915/selftests/i915_request.c | 16 +-
+ .../gpu/drm/i915/selftests/intel_memory_region.c | 5 +-
+ drivers/gpu/drm/i915/selftests/mock_gem_device.c | 6 +-
+ include/drm/drm_dp_helper.h | 137 ++++
+ include/drm/i915_pciids.h | 8 +-
+ include/uapi/drm/i915_drm.h | 24 +
+ 183 files changed, 4676 insertions(+), 4266 deletions(-)
+ rename drivers/gpu/drm/i915/{i915_gem_fence_reg.c => gt/intel_ggtt_fencing.c} (88%)
+ rename drivers/gpu/drm/i915/{i915_gem_fence_reg.h => gt/intel_ggtt_fencing.h} (86%)
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.h
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_log_debugfs.c
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_log_debugfs.h
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_huc_debugfs.c
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_huc_debugfs.h
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.h
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_bdw.c
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_bdw.h
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_bxt.c
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_bxt.h
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_cflgt2.c
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_cflgt2.h
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_cflgt3.c
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_cflgt3.h
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_chv.c
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_chv.h
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_cnl.c
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_cnl.h
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_glk.c
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_glk.h
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_hsw.c
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_hsw.h
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_icl.c
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_icl.h
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_kblgt2.c
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_kblgt2.h
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_kblgt3.c
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_kblgt3.h
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_sklgt2.c
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_sklgt2.h
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_sklgt3.c
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_sklgt3.h
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_sklgt4.c
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_sklgt4.h
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_tgl.c
+ delete mode 100644 drivers/gpu/drm/i915/oa/i915_oa_tgl.h
+Merging drm-tegra/drm/tegra/for-next (e32c8c2a5fbe drm/tegra: hdmi: Silence deferred-probe error)
+$ git merge drm-tegra/drm/tegra/for-next
+Already up to date.
+Merging drm-misc/for-linux-next (152cce0006ab drm/bridge: analogix_dp: Split bind() into probe() and real bind())
+$ git merge drm-misc/for-linux-next
+Already up to date.
+Merging drm-msm/msm-next (a5fb8b918920 drm/msm/a6xx: Use the DMA API for GMU memory objects)
+$ git merge drm-msm/msm-next
+Already up to date.
+Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500)
+$ git merge mali-dp/for-upstream/mali-dp
+Merge made by the 'recursive' strategy.
+Merging imx-drm/imx-drm/next (2c76b324c794 drm/imx: parallel-display: Adjust bus_flags handling)
+$ git merge imx-drm/imx-drm/next
+Auto-merging drivers/gpu/drm/imx/parallel-display.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/imx/parallel-display.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging etnaviv/etnaviv/next (f232d9ec029c drm/etnaviv: fix TS cache flushing on GPUs with BLT engine)
+$ git merge etnaviv/etnaviv/next
+Already up to date.
+Merging regmap/for-next (2060986f04ad Merge branch 'regmap-5.7' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/regmap-debugfs.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+Merging sound/for-next (d94541fa8ae8 Merge branch 'topic/for-5.8' into for-next)
+$ git merge sound/for-next
+Merge made by the 'recursive' strategy.
+ sound/hda/intel-dsp-config.c | 97 ++++++++++++++++++++++++++++++++++++--------
+ 1 file changed, 81 insertions(+), 16 deletions(-)
+Merging sound-asoc/for-next (33c385056aad Merge branch 'asoc-5.7' into asoc-linus)
+$ git merge sound-asoc/for-next
+Already up to date.
+Merging modules/modules-next (0f74226649fb kernel: module: Replace zero-length array with flexible-array member)
+$ git merge modules/modules-next
+Already up to date.
+Merging input/next (3a8579629665 Input: update SPDX tag for input-event-codes.h)
+$ git merge input/next
+Already up to date.
+Merging block/for-next (8f3d9f354286 Linux 5.7-rc1)
+$ git merge block/for-next
+Already up to date.
+Merging device-mapper/for-next (8267d8fb4819 dm integrity: fix logic bug in integrity tag testing)
+$ git merge device-mapper/for-next
+Already up to date.
+Merging pcmcia/pcmcia-next (a8c122f72d94 pcmcia: remove some unused space characters)
+$ git merge pcmcia/pcmcia-next
+Already up to date.
+Merging mmc/next (92075d98abf0 mmc: cavium-octeon: remove nonsense variable coercion)
+$ git merge mmc/next
+Already up to date.
+Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier)
+$ git merge md/for-next
+Already up to date.
+Merging mfd/for-mfd-next (d2923aa45356 mfd: intel-lpss: Fix Intel Elkhart Lake LPSS I2C input clock)
+$ git merge mfd/for-mfd-next
+Already up to date.
+Merging backlight/for-backlight-next (ee0c8e494cc3 backlight: corgi: Convert to use GPIO descriptors)
+$ git merge backlight/for-backlight-next
+Already up to date.
+Merging battery/for-next (164eaf6b435c power: supply: 88pm860x_battery: remove redundant dev_err message)
+$ git merge battery/for-next
+Merge made by the 'recursive' strategy.
+ drivers/power/supply/88pm860x_battery.c | 8 ++------
+ drivers/power/supply/Kconfig | 2 +-
+ drivers/power/supply/axp288_fuel_gauge.c | 6 ++++++
+ drivers/power/supply/max14656_charger_detector.c | 5 ++---
+ 4 files changed, 11 insertions(+), 10 deletions(-)
+Merging regulator/for-next (24bd2afda8ce Merge branch 'regulator-5.7' into regulator-next)
+$ git merge regulator/for-next
+Already up to date.
+Merging security/next-testing (3e27a33932df security: remove duplicated include from security.h)
+$ git merge security/next-testing
+Already up to date.
+Merging apparmor/apparmor-next (01df52d726b5 apparmor: remove duplicate check of xattrs on profile attachment.)
+$ git merge apparmor/apparmor-next
+Auto-merging security/apparmor/policy_unpack.c
+Auto-merging security/apparmor/apparmorfs.c
+Auto-merging fs/proc/base.c
+Merge made by the 'recursive' strategy.
+ fs/proc/base.c | 13 ++++++++++
+ security/apparmor/apparmorfs.c | 54 +++++++++------------------------------
+ security/apparmor/domain.c | 39 ++++++++++------------------
+ security/apparmor/include/label.h | 1 +
+ security/apparmor/include/match.h | 11 ++++++++
+ security/apparmor/label.c | 37 +++++++++++++++++++++++++--
+ security/apparmor/match.c | 53 +++++++++++++++++++++++++++++++++++++-
+ security/apparmor/path.c | 2 +-
+ security/apparmor/policy_unpack.c | 4 +++
+ 9 files changed, 143 insertions(+), 71 deletions(-)
+Merging integrity/next-integrity (9e2b4be377f0 ima: add a new CONFIG for loading arch-specific policies)
+$ git merge integrity/next-integrity
+Already up to date.
+Merging keys/keys-next (43672cf93c6d Merge branch 'notifications-pipe-core' into keys-next)
+$ git merge keys/keys-next
+Auto-merging security/selinux/hooks.c
+Auto-merging security/security.c
+Auto-merging security/keys/keyring.c
+Auto-merging security/keys/keyctl.c
+Auto-merging security/keys/key.c
+Auto-merging security/keys/internal.h
+Auto-merging init/Kconfig
+Auto-merging include/linux/security.h
+Auto-merging include/linux/pipe_fs_i.h
+Auto-merging include/linux/lsm_hooks.h
+CONFLICT (content): Merge conflict in include/linux/lsm_hooks.h
+Auto-merging fs/splice.c
+Auto-merging fs/pipe.c
+CONFLICT (content): Merge conflict in fs/pipe.c
+Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst
+Resolved 'fs/pipe.c' using previous resolution.
+Resolved 'include/linux/lsm_hooks.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master d96bf98b1a11] Merge remote-tracking branch 'keys/keys-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/security/keys/core.rst | 58 ++
+ Documentation/userspace-api/ioctl/ioctl-number.rst | 1 +
+ Documentation/watch_queue.rst | 354 +++++++++++
+ fs/pipe.c | 242 +++++---
+ fs/splice.c | 12 +-
+ include/linux/key.h | 3 +
+ include/linux/lsm_audit.h | 1 +
+ include/linux/lsm_hooks.h | 18 +
+ include/linux/pipe_fs_i.h | 27 +-
+ include/linux/security.h | 31 +
+ include/linux/watch_queue.h | 127 ++++
+ include/uapi/linux/keyctl.h | 2 +
+ include/uapi/linux/watch_queue.h | 104 ++++
+ init/Kconfig | 12 +
+ kernel/Makefile | 1 +
+ kernel/watch_queue.c | 659 +++++++++++++++++++++
+ samples/Kconfig | 6 +
+ samples/Makefile | 1 +
+ samples/watch_queue/Makefile | 7 +
+ samples/watch_queue/watch_test.c | 186 ++++++
+ security/keys/Kconfig | 9 +
+ security/keys/compat.c | 3 +
+ security/keys/gc.c | 5 +
+ security/keys/internal.h | 30 +-
+ security/keys/key.c | 38 +-
+ security/keys/keyctl.c | 99 +++-
+ security/keys/keyring.c | 20 +-
+ security/keys/request_key.c | 4 +-
+ security/security.c | 23 +
+ security/selinux/hooks.c | 14 +
+ security/smack/smack_lsm.c | 83 ++-
+ 31 files changed, 2075 insertions(+), 105 deletions(-)
+ create mode 100644 Documentation/watch_queue.rst
+ create mode 100644 include/linux/watch_queue.h
+ create mode 100644 include/uapi/linux/watch_queue.h
+ create mode 100644 kernel/watch_queue.c
+ create mode 100644 samples/watch_queue/Makefile
+ create mode 100644 samples/watch_queue/watch_test.c
+$ git am -3 ../patches/0001-io_uring-fix-up-get_pipe_info-API-change.patch
+Applying: io_uring: fix up for get_pipe_info() API change
+$ git reset HEAD^
+Unstaged changes after reset:
+M fs/io_uring.c
+$ git add -A .
+$ git commit -v -a --amend
+[master dd450c6e3333] Merge remote-tracking branch 'keys/keys-next'
+ Date: Tue Apr 14 10:13:50 2020 +1000
+$ git am -3 ../patches/0001-security-keys-fixup-for-security-Refactor-declaratio.patch
+Applying: security: keys: fixup for "security: Refactor declaration of LSM hooks"
+$ git reset HEAD^
+Unstaged changes after reset:
+M include/linux/lsm_hook_defs.h
+$ git add -A .
+$ git commit -v -a --amend
+[master 506e5cda5b8a] Merge remote-tracking branch 'keys/keys-next'
+ Date: Tue Apr 14 10:13:50 2020 +1000
+Merging selinux/next (c753924b6285 selinux: clean up indentation issue with assignment statement)
+$ git merge selinux/next
+Already up to date.
+Merging smack/for-next (92604e825304 smack: use GFP_NOFS while holding inode_smack::smk_lock)
+$ git merge smack/for-next
+Auto-merging security/smack/smack_lsm.c
+Merge made by the 'recursive' strategy.
+Merging tomoyo/master (8f3d9f354286 Linux 5.7-rc1)
+$ git merge tomoyo/master
+Already up to date.
+Merging tpmdd/next (872b0971d74b tpm: ibmvtpm: retry on H_CLOSED in tpm_ibmvtpm_send())
+$ git merge tpmdd/next
+Merge made by the 'recursive' strategy.
+ drivers/char/tpm/tpm2-cmd.c | 1 +
+ drivers/char/tpm/tpm_ibmvtpm.c | 136 ++++++++++++++++++++++-------------------
+ 2 files changed, 74 insertions(+), 63 deletions(-)
+Merging watchdog/master (ea104a9e4d3e watchdog: sp805: fix restart handler)
+$ git merge watchdog/master
+Merge made by the 'recursive' strategy.
+ drivers/watchdog/sp805_wdt.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+Merging iommu/next (ff68eb23308e Merge branches 'iommu/fixes', 'arm/qcom', 'arm/omap', 'arm/smmu', 'x86/amd', 'x86/vt-d', 'virtio' and 'core' into next)
+$ git merge iommu/next
+Already up to date.
+Merging vfio/next (f44efca0493d vfio: Ignore -ENODEV when getting MSI cookie)
+$ git merge vfio/next
+Already up to date.
+Merging audit/next (1320a4052ea1 audit: trigger accompanying records when no rules present)
+$ git merge audit/next
+Already up to date.
+Merging devicetree/for-next (8967918e7cee MAINTAINERS: drop an old reference to stm32 pwm timers doc)
+$ git merge devicetree/for-next
+Already up to date.
+Merging mailbox/mailbox-for-next (0a67003b1985 mailbox: imx: add SCU MU support)
+$ git merge mailbox/mailbox-for-next
+Already up to date.
+Merging spi/for-next (5bdb4c95849d Merge branch 'spi-5.7' into spi-linus)
+$ git merge spi/for-next
+Already up to date.
+Merging tip/auto-latest (93df12fe0d14 Merge branch 'locking/kcsan')
+$ git merge tip/auto-latest
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/dev-tools/index.rst | 1 +
+ Documentation/dev-tools/kcsan.rst | 266 ++++++++
+ MAINTAINERS | 11 +
+ Makefile | 3 +-
+ arch/x86/Kconfig | 1 +
+ arch/x86/boot/Makefile | 2 +
+ arch/x86/boot/compressed/Makefile | 2 +
+ arch/x86/entry/vdso/Makefile | 6 +
+ arch/x86/include/asm/bitops.h | 6 +-
+ arch/x86/kernel/Makefile | 4 +
+ arch/x86/kernel/cpu/Makefile | 3 +
+ arch/x86/kernel/e820.c | 10 +-
+ arch/x86/kernel/smpboot.c | 17 +-
+ arch/x86/lib/Makefile | 9 +
+ arch/x86/mm/Makefile | 4 +
+ arch/x86/purgatory/.gitignore | 1 +
+ arch/x86/purgatory/Makefile | 21 +-
+ arch/x86/realmode/Makefile | 3 +
+ arch/x86/realmode/rm/Makefile | 3 +
+ drivers/firmware/efi/libstub/Makefile | 2 +
+ include/asm-generic/atomic-instrumented.h | 711 ++++++++++----------
+ include/asm-generic/atomic-long.h | 331 +++++-----
+ include/asm-generic/bitops/instrumented-atomic.h | 14 +-
+ include/asm-generic/bitops/instrumented-lock.h | 10 +-
+ .../asm-generic/bitops/instrumented-non-atomic.h | 16 +-
+ include/linux/atomic-fallback.h | 340 +++++-----
+ include/linux/compiler-clang.h | 11 +-
+ include/linux/compiler-gcc.h | 6 +
+ include/linux/compiler.h | 60 +-
+ include/linux/instrumented.h | 109 +++
+ include/linux/kcsan-checks.h | 251 +++++++
+ include/linux/kcsan.h | 72 ++
+ include/linux/sched.h | 4 +
+ include/linux/seqlock.h | 51 +-
+ include/linux/uaccess.h | 14 +-
+ init/init_task.c | 9 +
+ init/main.c | 2 +
+ kernel/Makefile | 6 +
+ kernel/kcsan/Makefile | 14 +
+ kernel/kcsan/atomic.h | 27 +
+ kernel/kcsan/core.c | 730 +++++++++++++++++++++
+ kernel/kcsan/debugfs.c | 326 +++++++++
+ kernel/kcsan/encoding.h | 95 +++
+ kernel/kcsan/kcsan.h | 138 ++++
+ kernel/kcsan/report.c | 515 +++++++++++++++
+ kernel/kcsan/test.c | 131 ++++
+ kernel/locking/Makefile | 3 +
+ kernel/sched/Makefile | 6 +
+ kernel/trace/Makefile | 3 +
+ lib/Kconfig.debug | 2 +
+ lib/Kconfig.kcsan | 156 +++++
+ lib/Makefile | 4 +
+ lib/iov_iter.c | 7 +-
+ lib/usercopy.c | 7 +-
+ mm/Makefile | 8 +
+ scripts/Makefile.kcsan | 6 +
+ scripts/Makefile.lib | 10 +
+ scripts/atomic/fallbacks/acquire | 2 +-
+ scripts/atomic/fallbacks/add_negative | 2 +-
+ scripts/atomic/fallbacks/add_unless | 2 +-
+ scripts/atomic/fallbacks/andnot | 2 +-
+ scripts/atomic/fallbacks/dec | 2 +-
+ scripts/atomic/fallbacks/dec_and_test | 2 +-
+ scripts/atomic/fallbacks/dec_if_positive | 2 +-
+ scripts/atomic/fallbacks/dec_unless_positive | 2 +-
+ scripts/atomic/fallbacks/fence | 2 +-
+ scripts/atomic/fallbacks/fetch_add_unless | 2 +-
+ scripts/atomic/fallbacks/inc | 2 +-
+ scripts/atomic/fallbacks/inc_and_test | 2 +-
+ scripts/atomic/fallbacks/inc_not_zero | 2 +-
+ scripts/atomic/fallbacks/inc_unless_negative | 2 +-
+ scripts/atomic/fallbacks/read_acquire | 2 +-
+ scripts/atomic/fallbacks/release | 2 +-
+ scripts/atomic/fallbacks/set_release | 2 +-
+ scripts/atomic/fallbacks/sub_and_test | 2 +-
+ scripts/atomic/fallbacks/try_cmpxchg | 2 +-
+ scripts/atomic/gen-atomic-fallback.sh | 2 +
+ scripts/atomic/gen-atomic-instrumented.sh | 9 +-
+ scripts/atomic/gen-atomic-long.sh | 3 +-
+ tools/objtool/check.c | 18 +
+ 80 files changed, 3875 insertions(+), 775 deletions(-)
+ create mode 100644 Documentation/dev-tools/kcsan.rst
+ create mode 100644 arch/x86/purgatory/.gitignore
+ create mode 100644 include/linux/instrumented.h
+ create mode 100644 include/linux/kcsan-checks.h
+ create mode 100644 include/linux/kcsan.h
+ create mode 100644 kernel/kcsan/Makefile
+ create mode 100644 kernel/kcsan/atomic.h
+ create mode 100644 kernel/kcsan/core.c
+ create mode 100644 kernel/kcsan/debugfs.c
+ create mode 100644 kernel/kcsan/encoding.h
+ create mode 100644 kernel/kcsan/kcsan.h
+ create mode 100644 kernel/kcsan/report.c
+ create mode 100644 kernel/kcsan/test.c
+ create mode 100644 lib/Kconfig.kcsan
+ create mode 100644 scripts/Makefile.kcsan
+Merging clockevents/timers/drivers/next (c1ac28a4de6f Revert "clocksource: Avoid creating dead devices")
+$ git merge clockevents/timers/drivers/next
+Merge made by the 'recursive' strategy.
+Merging edac/edac-for-next (ad49d9a8228e Merge branch 'edac-misc' into edac-for-next)
+$ git merge edac/edac-for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging irqchip/irq/irqchip-next (4cea749d56be Revert "irqchip/xilinx: Enable generic irq multi handler")
+$ git merge irqchip/irq/irqchip-next
+Already up to date.
+Merging ftrace/for-next (8e99cf91b99b tracing: Do not allocate buffer in trace_find_next_entry() in atomic)
+$ git merge ftrace/for-next
+Already up to date.
+Merging rcu/rcu/next (aa93ec620be3 Merge branches 'doc.2020.02.27a', 'fixes.2020.03.21a', 'kfree_rcu.2020.02.20a', 'locktorture.2020.02.20a', 'ovld.2020.02.20a', 'rcu-tasks.2020.02.20a', 'srcu.2020.02.20a' and 'torture.2020.02.20a' into HEAD)
+$ git merge rcu/rcu/next
+Already up to date.
+Merging kvm/linux-next (dbef2808af6c KVM: VMX: fix crash cleanup when KVM wasn't used)
+$ git merge kvm/linux-next
+Already up to date.
+Merging kvm-arm/next (463050599742 Merge tag 'kvm-arm-removal' into kvmarm-master/next)
+$ git merge kvm-arm/next
+Already up to date.
+Merging kvm-ppc/kvm-ppc-next (9a5788c615f5 KVM: PPC: Book3S HV: Add a capability for enabling secure guests)
+$ git merge kvm-ppc/kvm-ppc-next
+Already up to date.
+Merging kvms390/next (7a2653612bb6 s390/gmap: return proper error code on ksm unsharing)
+$ git merge kvms390/next
+Already up to date.
+Merging xen-tip/linux-next (0e1b42710787 x86/xen: make xen_pvmmu_arch_setup() static)
+$ git merge xen-tip/linux-next
+Already up to date.
+Merging percpu/for-next (dedac37ea96b Merge branch 'for-5.7' into for-next)
+$ git merge percpu/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging workqueues/for-next (4acf8a423cd3 Merge branch 'for-5.7' into for-next)
+$ git merge workqueues/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging drivers-x86/for-next (8f3d9f354286 Linux 5.7-rc1)
+$ git merge drivers-x86/for-next
+Already up to date.
+Merging chrome-platform/for-next (a46387712da1 platform/chrome: cros_ec_spi: Wait for USECS, not NSECS)
+$ git merge chrome-platform/for-next
+Already up to date.
+Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1)
+$ git merge hsi/for-next
+Already up to date.
+Merging leds/for-next (10a6cce3c1a1 Group LED functions according to functionality, and add some explaining comments.)
+$ git merge leds/for-next
+Auto-merging drivers/leds/Makefile
+CONFLICT (content): Merge conflict in drivers/leds/Makefile
+Resolved 'drivers/leds/Makefile' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 965772c665c4] Merge remote-tracking branch 'leds/for-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/leds/Kconfig | 14 ++
+ drivers/leds/Makefile | 1 +
+ drivers/leds/leds-turris-omnia.c | 295 +++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 310 insertions(+)
+ create mode 100644 drivers/leds/leds-turris-omnia.c
+Merging ipmi/for-next (ab032f08dc45 ipmi:bt-bmc: Avoid unnecessary check)
+$ git merge ipmi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/char/ipmi/bt-bmc.c | 3 ---
+ 1 file changed, 3 deletions(-)
+Merging driver-core/driver-core-next (8f3d9f354286 Linux 5.7-rc1)
+$ git merge driver-core/driver-core-next
+Already up to date.
+Merging usb/usb-next (8f3d9f354286 Linux 5.7-rc1)
+$ git merge usb/usb-next
+Already up to date.
+Merging usb-gadget/next (4a5dbd900957 dt-bindings: usb: add documentation for aspeed usb-vhub)
+$ git merge usb-gadget/next
+Already up to date.
+Merging usb-serial/usb-next (57aa9f294b09 USB: serial: io_edgeport: fix slab-out-of-bounds read in edge_interrupt_callback)
+$ git merge usb-serial/usb-next
+Already up to date.
+Merging usb-chipidea-next/ci-for-usb-next (95caa2ae70fd usb: chipidea: allow disabling glue drivers if EMBEDDED)
+$ git merge usb-chipidea-next/ci-for-usb-next
+Removing drivers/usb/chipidea/ci_hdrc_zevio.c
+Merge made by the 'recursive' strategy.
+ drivers/usb/chipidea/Kconfig | 37 ++++++++++++++------
+ drivers/usb/chipidea/Makefile | 13 +++----
+ drivers/usb/chipidea/ci_hdrc_usb2.c | 30 +++++++++-------
+ drivers/usb/chipidea/ci_hdrc_zevio.c | 67 ------------------------------------
+ drivers/usb/chipidea/core.c | 42 +++++-----------------
+ drivers/usb/chipidea/udc.h | 5 +--
+ 6 files changed, 58 insertions(+), 136 deletions(-)
+ delete mode 100644 drivers/usb/chipidea/ci_hdrc_zevio.c
+Merging phy-next/next (89d715371a05 phy: qcom-qusb2: Add new overriding tuning parameters in QUSB2 V2 PHY)
+$ git merge phy-next/next
+Already up to date.
+Merging tty/tty-next (8f3d9f354286 Linux 5.7-rc1)
+$ git merge tty/tty-next
+Already up to date.
+Merging char-misc/char-misc-next (8f3d9f354286 Linux 5.7-rc1)
+$ git merge char-misc/char-misc-next
+Already up to date.
+Merging extcon/extcon-next (9c94553099ef extcon: axp288: Add wakeup support)
+$ git merge extcon/extcon-next
+Already up to date.
+Merging soundwire/next (8f3d9f354286 Linux 5.7-rc1)
+$ git merge soundwire/next
+Already up to date.
+Merging thunderbolt/next (3010518964dc thunderbolt: Use scnprintf() for avoiding potential buffer overflow)
+$ git merge thunderbolt/next
+Already up to date.
+Merging staging/staging-next (73a6e90041ce staging: rtl8723bs: hal: Correct misspelled symbolic name)
+$ git merge staging/staging-next
+Merge made by the 'recursive' strategy.
+ drivers/staging/android/ion/ion_page_pool.c | 4 +-
+ drivers/staging/axis-fifo/axis-fifo.c | 12 +-
+ drivers/staging/comedi/comedi_internal.h | 4 +-
+ drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 6 +-
+ drivers/staging/gdm724x/gdm_lte.c | 2 +-
+ drivers/staging/greybus/hid.c | 3 +-
+ drivers/staging/greybus/light.c | 3 +-
+ drivers/staging/rtl8188eu/core/rtw_ap.c | 99 ++--
+ drivers/staging/rtl8188eu/core/rtw_efuse.c | 33 +-
+ drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 4 +-
+ drivers/staging/rtl8188eu/core/rtw_led.c | 17 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 4 +-
+ drivers/staging/rtl8188eu/hal/odm.c | 52 +--
+ drivers/staging/rtl8188eu/hal/phy.c | 8 +-
+ drivers/staging/rtl8188eu/hal/rf.c | 2 +-
+ drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 2 +-
+ drivers/staging/rtl8188eu/include/osdep_service.h | 2 +-
+ drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 94 ++--
+ drivers/staging/rtl8188eu/os_dep/rtw_android.c | 2 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 8 +-
+ drivers/staging/rtl8712/rtl871x_xmit.c | 158 +++----
+ drivers/staging/rtl8712/rtl871x_xmit.h | 2 +-
+ drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 8 +-
+ drivers/staging/rtl8723bs/hal/odm.h | 2 +-
+ drivers/staging/rtl8723bs/hal/odm_RegDefine11N.h | 4 +-
+ drivers/staging/rtl8723bs/include/hal_data.h | 8 +-
+ drivers/staging/sm750fb/sm750.c | 4 +-
+ drivers/staging/unisys/visorhba/visorhba_main.c | 2 +-
+ .../vc04_services/bcm2835-camera/bcm2835-camera.c | 382 ++++++++-------
+ .../vc04_services/bcm2835-camera/bcm2835-camera.h | 62 ++-
+ .../vc04_services/bcm2835-camera/controls.c | 97 ++--
+ .../vc04_services/bcm2835-camera/mmal-common.h | 18 +-
+ .../vc04_services/bcm2835-camera/mmal-parameters.h | 14 +-
+ drivers/staging/vt6655/baseband.c | 320 +++++++------
+ drivers/staging/vt6655/baseband.h | 37 +-
+ drivers/staging/vt6655/card.c | 145 +-----
+ drivers/staging/vt6655/card.h | 4 -
+ drivers/staging/vt6655/channel.c | 4 +-
+ drivers/staging/vt6655/device_main.c | 36 +-
+ drivers/staging/vt6655/rf.c | 4 +-
+ drivers/staging/vt6655/rxtx.c | 189 ++++----
+ drivers/staging/vt6656/baseband.c | 343 +++++---------
+ drivers/staging/vt6656/card.c | 112 +----
+ drivers/staging/vt6656/mac.h | 2 +-
+ drivers/staging/vt6656/main_usb.c | 6 +-
+ drivers/staging/vt6656/rf.c | 79 +---
+ drivers/staging/wfx/bh.c | 4 +-
+ drivers/staging/wfx/data_tx.c | 196 +++-----
+ drivers/staging/wfx/data_tx.h | 5 +-
+ drivers/staging/wfx/hif_tx.c | 2 +
+ drivers/staging/wfx/main.c | 2 -
+ drivers/staging/wfx/queue.c | 515 +++++++--------------
+ drivers/staging/wfx/queue.h | 36 +-
+ drivers/staging/wfx/sta.c | 87 +---
+ drivers/staging/wfx/sta.h | 2 -
+ drivers/staging/wfx/wfx.h | 7 +-
+ 56 files changed, 1272 insertions(+), 1987 deletions(-)
+Merging mux/for-next (f356d58c3a04 Merge branch 'i2c-mux/for-next' into for-next)
+$ git merge mux/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging icc/icc-next (03c4e6186bbb interconnect: qcom: Add OSM L3 support on SC7180)
+$ git merge icc/icc-next
+Already up to date.
+Merging slave-dma/next (8f3d9f354286 Linux 5.7-rc1)
+$ git merge slave-dma/next
+Already up to date.
+Merging cgroup/for-next (eec8fd0277e3 device_cgroup: Cleanup cgroup eBPF device filter code)
+$ git merge cgroup/for-next
+Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +-
+ fs/xattr.c | 6 +++---
+ include/linux/device_cgroup.h | 14 +++++---------
+ kernel/cgroup/rstat.c | 16 +++-------------
+ security/Makefile | 2 +-
+ security/device_cgroup.c | 19 ++++++++++++++++---
+ 6 files changed, 29 insertions(+), 30 deletions(-)
+Merging scsi/for-next (c128052e6991 Merge branch 'misc' into for-next)
+$ git merge scsi/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging scsi-mkp/for-next (1b55940b9bcc scsi: core: Add DID_ALLOC_FAILURE and DID_MEDIUM_ERROR to hostbyte_table)
+$ git merge scsi-mkp/for-next
+Already up to date.
+Merging vhost/linux-next (d4a85c2ace89 vdpa: fix comment of vdpa_register_device())
+$ git merge vhost/linux-next
+Auto-merging drivers/virtio/Kconfig
+Auto-merging drivers/remoteproc/stm32_rproc.c
+Auto-merging drivers/remoteproc/remoteproc_virtio.c
+Auto-merging drivers/remoteproc/remoteproc_core.c
+Auto-merging drivers/gpu/drm/virtio/virtgpu_kms.c
+Auto-merging drivers/gpu/drm/virtio/virtgpu_ioctl.c
+Auto-merging drivers/block/virtio_blk.c
+Merge made by the 'recursive' strategy.
+ drivers/block/virtio_blk.c | 1 +
+ drivers/char/hw_random/virtio-rng.c | 1 +
+ drivers/gpu/drm/virtio/virtgpu_ioctl.c | 1 +
+ drivers/gpu/drm/virtio/virtgpu_kms.c | 1 +
+ drivers/misc/mic/vop/vop_main.c | 5 +-
+ drivers/misc/mic/vop/vop_vringh.c | 8 ++-
+ drivers/platform/mellanox/mlxbf-tmfifo.c | 6 +-
+ drivers/remoteproc/remoteproc_core.c | 2 +-
+ drivers/remoteproc/remoteproc_sysfs.c | 1 +
+ drivers/remoteproc/remoteproc_virtio.c | 2 +-
+ drivers/remoteproc/stm32_rproc.c | 1 +
+ drivers/rpmsg/mtk_rpmsg.c | 1 +
+ drivers/vdpa/Kconfig | 19 +++---
+ drivers/vdpa/ifcvf/ifcvf_base.c | 2 -
+ drivers/vdpa/ifcvf/ifcvf_main.c | 4 +-
+ drivers/vdpa/vdpa.c | 2 +-
+ drivers/vdpa/vdpa_sim/vdpa_sim.c | 4 +-
+ drivers/vhost/Kconfig | 5 +-
+ drivers/vhost/net.c | 28 +++++----
+ drivers/vhost/scsi.c | 14 ++---
+ drivers/vhost/test.c | 71 +++++++++++++++++++---
+ drivers/vhost/test.h | 1 +
+ drivers/vhost/vdpa.c | 5 --
+ drivers/vhost/vhost.h | 33 +++++++++-
+ drivers/vhost/vringh.c | 5 ++
+ drivers/vhost/vsock.c | 14 ++---
+ drivers/virtio/Kconfig | 2 +-
+ drivers/virtio/virtio_input.c | 1 +
+ drivers/virtio/virtio_mmio.c | 4 +-
+ drivers/virtio/virtio_pci_modern.c | 1 +
+ drivers/virtio/virtio_ring.c | 15 +++--
+ include/linux/vdpa.h | 2 +-
+ include/linux/virtio.h | 1 -
+ include/linux/virtio_ring.h | 46 ++++++++++++++
+ include/linux/vringh.h | 7 +++
+ include/uapi/linux/virtio_ring.h | 30 ++++++---
+ tools/virtio/Makefile | 5 +-
+ tools/virtio/asm/barrier.h | 1 +
+ tools/virtio/generated/autoconf.h | 0
+ tools/virtio/linux/compiler.h | 1 +
+ tools/virtio/ringtest/virtio_ring_0_9.c | 6 +-
+ tools/virtio/virtio_test.c | 101 ++++++++++++++++++++++++++-----
+ tools/virtio/vringh_test.c | 18 +++---
+ 43 files changed, 354 insertions(+), 124 deletions(-)
+ create mode 100644 tools/virtio/generated/autoconf.h
+Merging rpmsg/for-next (45c2824de341 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
+$ git merge rpmsg/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging gpio/for-next (4ed7d7dd4890 Revert "gpio: eic-sprd: Use devm_platform_ioremap_resource()")
+$ git merge gpio/for-next
+Already up to date.
+Merging gpio-brgl/gpio/for-next (03434e049439 gpio: Extend TODO to cover code duplication avoidance)
+$ git merge gpio-brgl/gpio/for-next
+Merge made by the 'recursive' strategy.
+ drivers/gpio/TODO | 4 ++++
+ drivers/gpio/gpio-xgene-sb.c | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+Merging gpio-intel/for-next (8f3d9f354286 Linux 5.7-rc1)
+$ git merge gpio-intel/for-next
+Already up to date.
+Merging pinctrl/for-next (c42f69b4207e pinctrl: qcom: fix compilation error)
+$ git merge pinctrl/for-next
+Already up to date.
+Merging pinctrl-intel/for-next (ccd025eaddae pinctrl: baytrail: Enable pin configuration setting for GPIO chip)
+$ git merge pinctrl-intel/for-next
+Already up to date.
+Merging pinctrl-samsung/for-next (b577a2799140 pinctrl: samsung: Correct setting of eint wakeup mask on s5pv210)
+$ git merge pinctrl-samsung/for-next
+Merge made by the 'recursive' strategy.
+ drivers/pinctrl/samsung/pinctrl-exynos.c | 73 +++++++++++++++++++++-----------
+ 1 file changed, 49 insertions(+), 24 deletions(-)
+Merging pwm/for-next (9cc5f232a4b6 pwm: pca9685: Fix PWM/GPIO inter-operation)
+$ git merge pwm/for-next
+Already up to date.
+Merging userns/for-next (63f818f46af9 proc: Use a dedicated lock in struct pid)
+$ git merge userns/for-next
+Already up to date.
+Merging ktest/for-next (1091c8fce8aa ktest: Fix typos in ktest.pl)
+$ git merge ktest/for-next
+Already up to date.
+Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds)
+$ git merge random/dev
+Already up to date.
+Merging kselftest/next (ffa773e1011d selftests: Fix memfd test run-time regression)
+$ git merge kselftest/next
+Merge made by the 'recursive' strategy.
+ tools/testing/selftests/memfd/Makefile | 3 ++-
+ tools/testing/selftests/vm/Makefile | 4 ++--
+ tools/testing/selftests/vm/run_vmtests | 2 +-
+ 3 files changed, 5 insertions(+), 4 deletions(-)
+Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC")
+$ git merge y2038/y2038
+Already up to date.
+Merging livepatching/for-next (d28b4c1b2b3d Merge branch 'for-5.6/selftests' into for-next)
+$ git merge livepatching/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging coresight/next (50f3e61d96bd coresight: etb10: Make coresight_etb_groups static)
+$ git merge coresight/next
+Merge made by the 'recursive' strategy.
+ Documentation/trace/coresight/coresight-ect.rst | 6 +-
+ Documentation/trace/coresight/coresight.rst | 85 ++++++++++
+ drivers/hwtracing/coresight/Makefile | 3 +-
+ drivers/hwtracing/coresight/coresight-cti.c | 58 ++++++-
+ drivers/hwtracing/coresight/coresight-etb10.c | 2 +-
+ drivers/hwtracing/coresight/coresight-etm4x.c | 6 +-
+ drivers/hwtracing/coresight/coresight-platform.c | 2 +-
+ drivers/hwtracing/coresight/coresight-priv.h | 12 +-
+ drivers/hwtracing/coresight/coresight-sysfs.c | 204 +++++++++++++++++++++++
+ drivers/hwtracing/coresight/coresight.c | 75 ++++++---
+ include/linux/coresight.h | 22 +++
+ 11 files changed, 437 insertions(+), 38 deletions(-)
+ create mode 100644 drivers/hwtracing/coresight/coresight-sysfs.c
+Merging rtc/rtc-next (8f3d9f354286 Linux 5.7-rc1)
+$ git merge rtc/rtc-next
+Already up to date.
+Merging nvdimm/libnvdimm-for-next (f6d2b802f80d Merge branch 'for-5.7/libnvdimm' into libnvdimm-for-next)
+$ git merge nvdimm/libnvdimm-for-next
+Already up to date.
+Merging at24/at24/for-next (4837621cd61e eeprom: at24: add TPF0001 ACPI ID for 24c1024 device)
+$ git merge at24/at24/for-next
+Already up to date.
+Merging ntb/ntb-next (5cc3de3c7435 NTB: ntb_test: Fix bug when counting remote files)
+$ git merge ntb/ntb-next
+Merge made by the 'recursive' strategy.
+ drivers/ntb/core.c | 9 ++-------
+ drivers/ntb/hw/amd/ntb_hw_amd.c | 4 ----
+ drivers/ntb/hw/idt/ntb_hw_idt.c | 6 ------
+ drivers/ntb/hw/intel/ntb_hw_gen1.c | 4 ----
+ drivers/ntb/test/ntb_perf.c | 33 ++++++++++++++++++++++++---------
+ drivers/ntb/test/ntb_pingpong.c | 14 ++++++--------
+ drivers/ntb/test/ntb_tool.c | 9 ++++-----
+ include/linux/ntb.h | 2 +-
+ tools/testing/selftests/ntb/ntb_test.sh | 2 +-
+ 9 files changed, 38 insertions(+), 45 deletions(-)
+Merging kspp/for-next/kspp (c7527373fe28 gcc-common.h: Update for GCC 10)
+$ git merge kspp/for-next/kspp
+Merge made by the 'recursive' strategy.
+ scripts/gcc-plugins/Makefile | 1 +
+ scripts/gcc-plugins/gcc-common.h | 4 ++++
+ scripts/gcc-plugins/stackleak_plugin.c | 5 ++---
+ 3 files changed, 7 insertions(+), 3 deletions(-)
+Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
+$ git merge cisco/for-next
+Already up to date.
+Merging gnss/gnss-next (f8788d86ab28 Linux 5.6-rc3)
+$ git merge gnss/gnss-next
+Already up to date.
+Merging fsi/next (2c01397b71c5 fsi: aspeed: Fix OPB0 byte order register values)
+$ git merge fsi/next
+Auto-merging drivers/fsi/Kconfig
+CONFLICT (content): Merge conflict in drivers/fsi/Kconfig
+Resolved 'drivers/fsi/Kconfig' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 761cd535c3ce] Merge remote-tracking branch 'fsi/next'
+$ git diff -M --stat --summary HEAD^..
+Merging slimbus/for-next (ba1589ff458e slimbus: ngd: add v2.1.0 compatible)
+$ git merge slimbus/for-next
+Merge made by the 'recursive' strategy.
+Merging nvmem/for-next (990df6402752 nvmem: mxs-ocotp: Use devm_add_action_or_reset() for cleanup)
+$ git merge nvmem/for-next
+CONFLICT (modify/delete): drivers/nvmem/nvmem-sysfs.c deleted in HEAD and modified in nvmem/for-next. Version nvmem/for-next of drivers/nvmem/nvmem-sysfs.c left in tree.
+Auto-merging drivers/nvmem/core.c
+Auto-merging drivers/nvmem/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/nvmem/nvmem-sysfs.c
+rm 'drivers/nvmem/nvmem-sysfs.c'
+$ git commit --no-edit -v -a
+[master bca0d9f157c9] Merge remote-tracking branch 'nvmem/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging xarray/xarray (27586ca786a7 XArray: Handle retry entries within xas_find_marked)
+$ git merge xarray/xarray
+Merge made by the 'recursive' strategy.
+ Documentation/core-api/xarray.rst | 13 +++++++------
+ drivers/infiniband/core/device.c | 6 +-----
+ include/linux/xarray.h | 23 +++++++++++++++++++++-
+ lib/idr.c | 1 +
+ lib/test_xarray.c | 20 +++++++++++++++++++
+ lib/xarray.c | 39 +++++++++++++++++++++++++++++++------
+ tools/testing/radix-tree/idr-test.c | 29 +++++++++++++++++++++++++++
+ 7 files changed, 113 insertions(+), 18 deletions(-)
+Merging hyperv/hyperv-next (dbf7071bdc3a scsi: storvsc: Re-init stor_chns when a channel interrupt is re-assigned)
+$ git merge hyperv/hyperv-next
+Auto-merging drivers/pci/controller/pci-hyperv.c
+Auto-merging drivers/net/hyperv/netvsc.c
+Auto-merging drivers/hv/vmbus_drv.c
+Auto-merging drivers/hv/hyperv_vmbus.h
+Auto-merging drivers/hv/channel_mgmt.c
+Merge made by the 'recursive' strategy.
+ drivers/hv/channel.c | 58 ++++--
+ drivers/hv/channel_mgmt.c | 406 +++++++++++++++++++-----------------
+ drivers/hv/connection.c | 58 ++----
+ drivers/hv/hv.c | 16 +-
+ drivers/hv/hv_fcopy.c | 2 +-
+ drivers/hv/hv_snapshot.c | 2 +-
+ drivers/hv/hv_trace.h | 19 ++
+ drivers/hv/hyperv_vmbus.h | 33 ++-
+ drivers/hv/vmbus_drv.c | 281 ++++++++++++++++++++-----
+ drivers/net/hyperv/netvsc.c | 7 +-
+ drivers/pci/controller/pci-hyperv.c | 44 ++--
+ drivers/scsi/storvsc_drv.c | 95 ++++++++-
+ include/linux/hyperv.h | 53 ++---
+ 13 files changed, 685 insertions(+), 389 deletions(-)
+Merging auxdisplay/auxdisplay (2f920c0f0e29 auxdisplay: charlcd: replace zero-length array with flexible-array member)
+$ git merge auxdisplay/auxdisplay
+Already up to date.
+Merging kgdb/kgdb/for-next (5ea771abd5a3 kdb: Censor attempts to set PROMPT without ENABLE_MEM_READ)
+$ git merge kgdb/kgdb/for-next
+Merge made by the 'recursive' strategy.
+Merging pidfd/for-next (6952a4f64644 selftests: add pid namespace ENOMEM regression test)
+$ git merge pidfd/for-next
+Already up to date.
+Merging devfreq/devfreq-next (19b5622d849b PM / devfreq: tegra30: Delete an error message in tegra_devfreq_probe())
+$ git merge devfreq/devfreq-next
+Merge made by the 'recursive' strategy.
+ drivers/devfreq/tegra30-devfreq.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+Merging hmm/hmm (8f3d9f354286 Linux 5.7-rc1)
+$ git merge hmm/hmm
+Already up to date.
+Merging fpga/for-next (cef0ca6417de fpga: dfl: afu: support debug access to memory-mapped afu regions)
+$ git merge fpga/for-next
+Auto-merging arch/arm64/boot/dts/intel/socfpga_agilex.dtsi
+Merge made by the 'recursive' strategy.
+ .../bindings/firmware/intel,stratix10-svc.txt | 2 +-
+ .../bindings/fpga/intel-stratix10-soc-fpga-mgr.txt | 3 +-
+ arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 4 +--
+ drivers/fpga/dfl-afu-main.c | 35 +++++++++++++-------
+ drivers/fpga/dfl-fme-main.c | 19 +++++++----
+ drivers/fpga/dfl.c | 15 +++++++--
+ drivers/fpga/dfl.h | 37 ++++++++++++++++------
+ drivers/fpga/ice40-spi.c | 10 ++++--
+ drivers/fpga/machxo2-spi.c | 12 ++++---
+ drivers/fpga/stratix10-soc.c | 3 +-
+ 10 files changed, 100 insertions(+), 40 deletions(-)
+Merging kunit/test (8f3d9f354286 Linux 5.7-rc1)
+$ git merge kunit/test
+Already up to date.
+Merging cel/cel-next (36b6e409294a svcrdma: Fix leak of svc_rdma_recv_ctxt objects)
+$ git merge cel/cel-next
+Merge made by the 'recursive' strategy.
+ fs/nfsd/nfs4callback.c | 4 ++-
+ fs/nfsd/nfs4state.c | 2 ++
+ include/linux/sunrpc/svc_rdma.h | 1 +
+ include/trace/events/rpcrdma.h | 50 +++++++++++++++++++++---------
+ net/sunrpc/cache.c | 5 +--
+ net/sunrpc/svc_xprt.c | 5 ++-
+ net/sunrpc/svcsock.c | 4 +++
+ net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 2 ++
+ net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 22 +++++++++++++
+ net/sunrpc/xprtrdma/svc_rdma_rw.c | 3 +-
+ net/sunrpc/xprtrdma/svc_rdma_sendto.c | 29 +++++++----------
+ net/sunrpc/xprtrdma/svc_rdma_transport.c | 5 ---
+ net/sunrpc/xprtsock.c | 1 +
+ 13 files changed, 89 insertions(+), 44 deletions(-)
+Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache)
+$ git merge generic-ioremap/for-next
+Already up to date.
+Merging cfi/cfi/next (b6fe8bc67d2d mtd: hyperbus: move direct mapping setup to AM654 HBMC driver)
+$ git merge cfi/cfi/next
+Already up to date.
+Merging kunit-next/kunit (8f3d9f354286 Linux 5.7-rc1)
+$ git merge kunit-next/kunit
+Already up to date.
+Merging trivial/for-next (fad7c9020948 err.h: remove deprecated PTR_RET for good)
+$ git merge trivial/for-next
+Already up to date.
+Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7)
+$ git merge zx2c4/for-next
+Already up to date.
+Merging mhi/mhi-next (8f3d9f354286 Linux 5.7-rc1)
+$ git merge mhi/mhi-next
+Already up to date.
+Merging akpm-current/current (547e35135ac5 usb: core: kcov: collect coverage from usb complete callback)
+$ git merge --no-ff akpm-current/current
+Auto-merging lib/Kconfig.debug
+Auto-merging include/linux/sched.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/dev-tools/kcov.rst | 17 +--
+ MAINTAINERS | 7 ++
+ drivers/base/memory.c | 44 +++++--
+ drivers/hv/hv_balloon.c | 1 +
+ drivers/tty/serial/sh-sci.c | 2 +-
+ drivers/usb/core/hcd.c | 3 +
+ fs/aio.c | 9 +-
+ fs/buffer.c | 56 ++++++++-
+ fs/exec.c | 14 ++-
+ fs/proc/page.c | 40 +++---
+ fs/ramfs/inode.c | 12 ++
+ include/linux/gfp.h | 3 +
+ include/linux/list.h | 50 +++++---
+ include/linux/memremap.h | 6 +
+ include/linux/nmi.h | 1 +
+ include/linux/sched.h | 11 ++
+ include/linux/wait.h | 4 +-
+ ipc/mqueue.c | 34 +++--
+ kernel/hung_task.c | 44 +++++++
+ kernel/kcov.c | 266 +++++++++++++++++++++++++++------------
+ kernel/relay.c | 17 ++-
+ kernel/watchdog.c | 22 ++++
+ kernel/watchdog_hld.c | 1 +
+ lib/Kconfig.debug | 15 +++
+ lib/cpumask.c | 102 +++++++++++++--
+ mm/memcontrol.c | 51 ++++----
+ mm/memremap.c | 20 +++
+ mm/mmap.c | 43 ++++---
+ mm/page_alloc.c | 14 +++
+ 29 files changed, 695 insertions(+), 214 deletions(-)
+$ git clone -s -l -n -q . ../rebase-tmp
+$ cd ../rebase-tmp
+$ git checkout -b akpm remotes/origin/akpm/master
+Switched to a new branch 'akpm'
+$ git rebase --onto master remotes/origin/akpm/master-base
+First, rewinding head to replay your work on top of it...
+Applying: mm/kmemleak: silence KCSAN splats in checksum
+Applying: mm/frontswap: mark various intentional data races
+Applying: mm/page_io: mark various intentional data races
+Applying: mm-page_io-mark-various-intentional-data-races-v2
+Applying: mm/swap_state: mark various intentional data races
+Applying: mm/filemap.c: fix a data race in filemap_fault()
+Applying: mm/swapfile: fix and annotate various data races
+Applying: mm-swapfile-fix-and-annotate-various-data-races-v2
+Applying: mm/page_counter: fix various data races at memsw
+Applying: mm/memcontrol: fix a data race in scan count
+Applying: mm/list_lru: fix a data race in list_lru_count_one
+Applying: mm/mempool: fix a data race in mempool_free()
+Applying: mm/util.c: annotate an data race at vm_committed_as
+Applying: mm/rmap: annotate a data race at tlb_flush_batched
+Applying: mm: annotate a data race in page_zonenum()
+Applying: mm/swap.c: annotate data races for lru_rotate_pvecs
+Applying: net-zerocopy: use vm_insert_pages() for tcp rcv zerocopy
+Applying: net-zerocopy-use-vm_insert_pages-for-tcp-rcv-zerocopy-fix
+Applying: mm/debug: add tests validating architecture page table helpers
+Applying: mm/madvise: pass task and mm to do_madvise
+Applying: mm/madvise: introduce process_madvise() syscall: an external memory hinting API
+Applying: fix process_madvise build break for arm64
+Applying: mm/madvise: check fatal signal pending of target process
+Applying: pid: move pidfd_get_pid() to pid.c
+Applying: mm/madvise: support both pid and pidfd for process_madvise
+Applying: mm/madvise: employ mmget_still_valid() for write lock
+Applying: mm/madvise: allow KSM hints for remote API
+Applying: kexec: prevent removal of memory in use by a loaded kexec image
+Applying: mm/memory_hotplug: allow arch override of non boot memory resource names
+Applying: arm64: memory: give hotplug memory a different resource name
+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
+ + 0e7836b8454f...cd91ba3aceb7 akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (cd91ba3aceb7 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ .../debug/debug-vm-pgtable/arch-support.txt | 34 ++
+ arch/alpha/kernel/syscalls/syscall.tbl | 1 +
+ arch/arc/Kconfig | 1 +
+ arch/arm/tools/syscall.tbl | 1 +
+ arch/arm64/Kconfig | 1 +
+ arch/arm64/include/asm/memory.h | 11 +
+ 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/parisc/kernel/syscalls/syscall.tbl | 1 +
+ arch/powerpc/Kconfig | 1 +
+ arch/powerpc/kernel/syscalls/syscall.tbl | 1 +
+ arch/s390/Kconfig | 1 +
+ arch/s390/kernel/syscalls/syscall.tbl | 1 +
+ arch/sh/kernel/syscalls/syscall.tbl | 1 +
+ arch/sparc/kernel/syscalls/syscall.tbl | 1 +
+ arch/x86/Kconfig | 1 +
+ arch/x86/entry/syscalls/syscall_32.tbl | 1 +
+ arch/x86/entry/syscalls/syscall_64.tbl | 1 +
+ arch/x86/include/asm/pgtable_64.h | 6 +
+ arch/xtensa/kernel/syscalls/syscall.tbl | 1 +
+ drivers/media/platform/sti/delta/delta-ipc.c | 4 +-
+ fs/io_uring.c | 2 +-
+ include/linux/memcontrol.h | 2 +-
+ include/linux/mm.h | 4 +-
+ include/linux/mmdebug.h | 5 +
+ include/linux/pid.h | 1 +
+ include/linux/syscalls.h | 3 +
+ include/uapi/asm-generic/unistd.h | 4 +-
+ init/main.c | 2 +
+ kernel/exit.c | 17 -
+ kernel/kexec_core.c | 56 +++
+ kernel/pid.c | 17 +
+ kernel/sys_ni.c | 1 +
+ lib/Kconfig.debug | 26 ++
+ mm/Makefile | 1 +
+ mm/debug_vm_pgtable.c | 392 +++++++++++++++++++++
+ mm/filemap.c | 20 +-
+ mm/frontswap.c | 8 +-
+ mm/kmemleak.c | 2 +
+ mm/list_lru.c | 2 +-
+ mm/madvise.c | 144 ++++++--
+ mm/memory.c | 4 +-
+ mm/memory_hotplug.c | 6 +-
+ mm/mempool.c | 2 +-
+ mm/page_counter.c | 13 +-
+ mm/page_io.c | 8 +-
+ mm/rmap.c | 2 +-
+ mm/swap.c | 5 +-
+ mm/swap_state.c | 4 +-
+ mm/swapfile.c | 31 +-
+ mm/util.c | 8 +-
+ net/ipv4/tcp.c | 70 +++-
+ 57 files changed, 841 insertions(+), 100 deletions(-)
+ create mode 100644 Documentation/features/debug/debug-vm-pgtable/arch-support.txt
+ create mode 100644 mm/debug_vm_pgtable.c
diff --git a/Next/quilt-import.log b/Next/quilt-import.log
new file mode 100644
index 000000000000..fa8e2e6b2ebd
--- /dev/null
+++ b/Next/quilt-import.log
@@ -0,0 +1,12 @@
+Importing dmi based on 5.6
+$ git clone -s -l -n -q . ../quilt-tmp
+$ cd ../quilt-tmp
+$ git reset --hard 7111951b8d4973bda27ff663f2cf18b663d15b48
+Updating files: 21% (14300/67337) Updating files: 22% (14815/67337) Updating files: 23% (15488/67337) Updating files: 24% (16161/67337) Updating files: 25% (16835/67337) Updating files: 26% (17508/67337) Updating files: 27% (18181/67337) Updating files: 28% (18855/67337) Updating files: 29% (19528/67337) Updating files: 30% (20202/67337) Updating files: 31% (20875/67337) Updating files: 32% (21548/67337) Updating files: 33% (22222/67337) Updating files: 34% (22895/67337) Updating files: 35% (23568/67337) Updating files: 36% (24242/67337) Updating files: 37% (24915/67337) Updating files: 38% (25589/67337) Updating files: 39% (26262/67337) Updating files: 39% (26499/67337) Updating files: 40% (26935/67337) Updating files: 41% (27609/67337) Updating files: 42% (28282/67337) Updating files: 43% (28955/67337) Updating files: 44% (29629/67337) Updating files: 45% (30302/67337) Updating files: 46% (30976/67337) Updating files: 47% (31649/67337) Updating files: 48% (32322/67337) Updating files: 48% (32939/67337) Updating files: 49% (32996/67337) Updating files: 50% (33669/67337) Updating files: 51% (34342/67337) Updating files: 52% (35016/67337) Updating files: 53% (35689/67337) Updating files: 54% (36362/67337) Updating files: 55% (37036/67337) Updating files: 56% (37709/67337) Updating files: 57% (38383/67337) Updating files: 58% (39056/67337) Updating files: 59% (39729/67337) Updating files: 60% (40403/67337) Updating files: 60% (40597/67337) Updating files: 61% (41076/67337) Updating files: 62% (41749/67337) Updating files: 63% (42423/67337) Updating files: 64% (43096/67337) Updating files: 65% (43770/67337) Updating files: 66% (44443/67337) Updating files: 67% (45116/67337) Updating files: 68% (45790/67337) Updating files: 69% (46463/67337) Updating files: 70% (47136/67337) Updating files: 70% (47621/67337) Updating files: 71% (47810/67337) Updating files: 72% (48483/67337) Updating files: 73% (49157/67337) Updating files: 74% (49830/67337) Updating files: 75% (50503/67337) Updating files: 76% (51177/67337) Updating files: 77% (51850/67337) Updating files: 78% (52523/67337) Updating files: 79% (53197/67337) Updating files: 80% (53870/67337) Updating files: 81% (54543/67337) Updating files: 82% (55217/67337) Updating files: 83% (55890/67337) Updating files: 84% (56564/67337) Updating files: 85% (57237/67337) Updating files: 85% (57618/67337) Updating files: 86% (57910/67337) Updating files: 87% (58584/67337) Updating files: 88% (59257/67337) Updating files: 89% (59930/67337) Updating files: 90% (60604/67337) Updating files: 91% (61277/67337) Updating files: 92% (61951/67337) Updating files: 93% (62624/67337) Updating files: 94% (63297/67337) Updating files: 95% (63971/67337) Updating files: 96% (64644/67337) Updating files: 97% (65317/67337) Updating files: 98% (65991/67337) Updating files: 99% (66664/67337) Updating files: 100% (67337/67337) Updating files: 100% (67337/67337), done.
+HEAD is now at 7111951b8d49 Linux 5.6
+$ git am -s --patch-format=mbox ../quilt/dmi/firmware-dmi-report-dmi-bios-ec-firmware-release.patch
+Applying: firmware/dmi: Report DMI Bios & EC firmware release
+$ cd /home/sfr/kernels/next/next
+$ git fetch -f ../quilt-tmp master:dmi/master
+From ../quilt-tmp
+ + 12028f913eb9...8cf87c744696 master -> dmi/master (forced update)
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 000000000000..44db91ed075f
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20200414