From 17f166b56b2583b97f0f6612cfbbb7f99e6889bb Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 2 Apr 2020 17:09:05 +1100
Subject: [PATCH] Add linux-next specific files for 20200402

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 Next/SHA1s            |   317 ++
 Next/Trees            |   319 ++
 Next/merge.log        | 11944 ++++++++++++++++++++++++++++++++++++++++
 Next/quilt-import.log |     2 +
 localversion-next     |     1 +
 5 files changed, 12583 insertions(+)
 create mode 100644 Next/SHA1s
 create mode 100644 Next/Trees
 create mode 100644 Next/merge.log
 create mode 100644 Next/quilt-import.log
 create mode 100644 localversion-next

diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 0000000000000..446551a6f682e
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,317 @@
+Name		SHA1
+----		----
+origin		1a323ea5356edbb3073dc59d51b9e6b86908857d
+fixes		5ed25ddf2c861e2c08088e8e24e2a0d038e60fce
+kbuild-current	e595dd94515ed6bc5ba38fce0f9598db8c0ee9a9
+arc-current	f09d3174f002ee2cf15623d5a0f68f7393536ce7
+arm-current	89604523a76eb3e13014b2bdab7f8870becee284
+arm-soc-fixes	c8042d1e5cb3e654b47447229ace3cd092a8fc27
+arm64-fixes	6f5459da2b8736720afdbd67c4bd2d1edba7d0e3
+m68k-current	86cded5fc52567774b596827544874499532b8ae
+powerpc-fixes	1d0c32ec3b860a32df593a22bad0d1dbc5546a59
+s390-fixes	16fbf79b0f83bc752cee8589279f1ebfe57b3b6e
+sparc		11648b8339f840d4b1f4c54a1abec8025d9e077d
+fscrypt-current	2b4eae95c7361e0a147b838715c8baa1380a428f
+net		d61f4d61ff7f73bed1f4c613de59b4534c08a088
+bpf		b9258a2cece4ec1f020715fe3554bc2e360f6264
+ipsec		0141317611ab913d6c227b82f3dd02ff3e6fc5d8
+netfilter	d61f4d61ff7f73bed1f4c613de59b4534c08a088
+ipvs		0141317611ab913d6c227b82f3dd02ff3e6fc5d8
+wireless-drivers	0433ae556ec8fb588a0735ddb09d3eb9806df479
+mac80211		a0ba26f37ea04e025a793ef5e5ac809221728ecb
+rdma-fixes	7111951b8d4973bda27ff663f2cf18b663d15b48
+sound-current	5c6cd7021a05a02fcf37f360592d7c18d4d807fb
+sound-asoc-fixes	52ac54e1de31af2d40f10dd4e711e774655e091b
+regmap-fixes	87fc8230f7aa11aeb382a2a6d1a1a02e3a038a7b
+regulator-fixes	bae4cb90541a5bb9625377f6edf94e3dd1b9bb96
+spi-fixes	16fbf79b0f83bc752cee8589279f1ebfe57b3b6e
+pci-current	5901b51f3e5d9129da3e59b10cc76e4cc983e940
+driver-core.current	1a323ea5356edbb3073dc59d51b9e6b86908857d
+tty.current	1a323ea5356edbb3073dc59d51b9e6b86908857d
+usb.current	1a323ea5356edbb3073dc59d51b9e6b86908857d
+usb-gadget-fixes	42cd5ffe46c1037d5d9a253c72e71a024a7bfbef
+usb-serial-fixes	16fbf79b0f83bc752cee8589279f1ebfe57b3b6e
+usb-chipidea-fixes	7cbf3dd3139ab4683d9cffe9d6972a1dbe3ecaa6
+phy		be4e3c737eebd75815633f4b8fd766defaf0f1fc
+staging.current	1a323ea5356edbb3073dc59d51b9e6b86908857d
+char-misc.current	16fbf79b0f83bc752cee8589279f1ebfe57b3b6e
+soundwire-fixes	bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9
+thunderbolt-fixes	16fbf79b0f83bc752cee8589279f1ebfe57b3b6e
+input-current	4134252ab7e2c339a54302b88496cb5a89cdbaec
+crypto-current	fcb90d51c375d09a034993cda262b68499e233a4
+ide		94f2630b18975bb56eee5d1a36371db967643479
+vfio-fixes	95f89e090618efca63918b658c2002e57d393036
+kselftest-fixes	f3a60268f5cec7dae0e9713f5fc65aecc3734c09
+modules-fixes	57baec7b1b0459ef885e816d8c28a9d9a62bb8de
+slave-dma-fixes	018af9be3dd54e6f24f828966bdd873f4d63ad9b
+backlight-fixes	219d54332a09e8d8741c1e1982f5eae56099de85
+mtd-fixes	def9d2780727cec3313ed3522d0123158d87224d
+mfd-fixes	603d9299da32955d49995738541f750f2ae74839
+v4l-dvb-fixes	2632e7b618a7730969f9782593c29ca53553aa22
+reset-fixes	b460e0a9e2404450a0cc4c5e6476483d6cda1b26
+mips-fixes	f7d5f5655ef7e5d2a128f6696ac35256e83b119b
+at91-fixes	54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c
+omap-fixes	07bdc492cff6f555538df95e9812fe72e16d154a
+kvm-fixes	e1be9ac8e6014a9b0a216aebae7250f9863e9fc3
+kvms390-fixes	e93fc7b4544a5475cfdbc22f87e89f9829bf801c
+hwmon-fixes	4eb981e976791a08beede15a23cc862795e72afd
+nvdimm-fixes	f84afbdd3a9e5e10633695677b95422572f920dc
+btrfs-fixes	f5bf9a8fa525a858f520ba64618b35132dfd6ce1
+vfs-fixes	d9a9f4849fe0c9d560851ab22a85a666cddfdd24
+dma-mapping-fixes	9c24eaf81cc44d4bb38081c99eafd72ed85cf7f3
+i3c-fixes	6fbc7275c7a9ba97877050335f290341a1fd8dbf
+drivers-x86-fixes	1a323ea5356edbb3073dc59d51b9e6b86908857d
+samsung-krzk-fixes	0d935f0bf77d8d6f924f35da4b549c94d36795d2
+pinctrl-samsung-fixes	bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9
+devicetree-fixes	e33a814e772cdc36436c8c188d8c42d019fda639
+scsi-fixes	ea697a8bf5a4161e59806fab14f6e4a46dc7dcb0
+drm-fixes	c4b979ebcafe978338cad1df4c77cdc8f84bd51c
+amdgpu-fixes	2c409ba81be25516afe05ae27a4a15da01740b01
+drm-intel-fixes	7111951b8d4973bda27ff663f2cf18b663d15b48
+mmc-fixes	16fbf79b0f83bc752cee8589279f1ebfe57b3b6e
+rtc-fixes	bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9
+gnss-fixes	f8788d86ab28f61f7b46eb6be375f8a726783636
+hyperv-fixes	032d4a4802209fe25ce44deb2c002dccf663925f
+soc-fsl-fixes	fe8fe7723a3a824790bda681b40efd767e2251a7
+risc-v-fixes	2191b4f298fa360f2d1d967c2c7db565bea2c32e
+pidfd-fixes	10dab84caf400f2f5f8b010ebb0c7c4272ec5093
+fpga-fixes	3c2760b78f90db874401d97e3c17829e2e36f400
+spdx		71db3aa2816da62a2d150ad9fa81168537db4037
+gpio-intel-fixes	bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9
+pinctrl-intel-fixes	16fbf79b0f83bc752cee8589279f1ebfe57b3b6e
+erofs-fixes	d1eef1c619749b2a57e514a3fa67d9a516ffa919
+drm-misc-fixes	83a196773b8bc6702f49df1eddc848180e350340
+kspp-gustavo	90e5d84c7b06b849a330ea43625086ff81388ed4
+kbuild		4f6d08609bb6872eaca6c16701933038b643a74a
+compiler-attributes	98d54f81e36ba3bf92172791eba5ca5bd813989b
+leaks		9e98c678c2d6ae3a17cb2de55d17f69dddaa231b
+dma-mapping	fd27a526bb381f43dded6db30b3b016468ab0e6c
+asm-generic	060dc911501f6ee222569304f50962172a52b1d6
+arc		def9d2780727cec3313ed3522d0123158d87224d
+arm		52d3b2f98483c34af44171dd10f43f90b7cf1ae0
+arm64		15cd0e675f3f76b4d21c313795fe0c23df0ee20f
+arm-perf		8673e02e58410e6c4cefa499efa846286e45a991
+arm-soc		d9725e56e1d806021cb277c3faf0c9ffad621576
+amlogic		e304af8727dd515315dde08ce453df0e6897afc0
+aspeed		de285b938cf330b30acfdb037d14018d38292c3e
+at91		ec539e70d882af33660bcab178a59b1251588a22
+imx-mxs		e506dba69a5e9aaff20fd73a108639f84e2c39d9
+keystone		560b4d4691b07819f8d3e0cb030f72f863ec1ba3
+mediatek		6906847e14b57ae3e624dea2e1766578840850fe
+mvebu		9d32706f8aa8bbea3722e8f074801c0807d19951
+omap		e90f16cc1a48c3ca39f3a1756b3f1fd34fedbc62
+qcom		8dc3769c8a680bfc1f38221e68d3fd994f490970
+raspberrypi	e7b7daeb48e0bf5d8412d77f11069750ee7032bb
+realtek		45698e00d5a904bdefd5d4cd4a751803674815f1
+renesas		bf4540d5148c39f1339cc9c870b4075864a8c76c
+reset		2ebf89fd4ecf37e7ae4c323a9fd69f9d9d0ea260
+rockchip		c018aff1a20156b60e0cf9cc906a21e2e64767e6
+samsung-krzk	5c1cb4ae848e3cd49faa56ba30c9ac6aa978055c
+scmi		7111951b8d4973bda27ff663f2cf18b663d15b48
+sunxi		8afff9da61eaa1ffd0fbf0296027c58c0e8074f2
+tegra		df0a178cf2df7b29622514556e15a98c626fb23e
+clk		fe3419f5acf0cf90f9175aa5d4f4a94134808302
+clk-samsung	54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c
+c6x		8adcc59974b8a65b7eac7d503364837c297139bc
+csky		0ef5b782a807a908445350a965d69acbc0175b0e
+h8300		a5de8865cb3edc9c5b719dc45651b38226805f9e
+ia64		172e7890406d6183b9b39271ffb434ff0a97ce72
+m68k		86cded5fc52567774b596827544874499532b8ae
+m68knommu	ba000760eb0f182e6ef04faca70bb9737a9674b4
+microblaze	9fd1a1c9b3f2a38a5357a13335e0b9e5f21d093b
+mips		ba15533275dd70238b523417d222d43fb40dac9d
+nds32		d785c5a324cd8812720a409dc85050558281a567
+nios2		051d75d3bb31d456a41c7dc8cf2b8bd23a96774f
+openrisc		9737e2c5f0bc768b58416ec070bd96c91c52a153
+parisc-hd	8a29e21d8cb0ea82c78209466a565083369298e6
+powerpc		c17eb4dca5a353a9dbbb8ad6934fe57af7165e91
+fsl		a76bea0287ce13d28494b19649d80d8ee5e7b757
+soc-fsl		461c3ac0dc46ba7fc09628aadf63c81253c4c3de
+risc-v		f1e58583b9c7ceae7f11646e9edf2561d67f29c9
+sifive		467e050e9760fc31dcf854ec88401e18419f5f78
+s390		1058c163dc31b3335c9cf7c4fa42ccf87be73017
+sh		a193018e5290ee9d9fe62ad80cd8f874711eb575
+sparc-next	b71acb0e372160167bf6d5500b88b30b52ccef6e
+uml		4a7c46247f9c620c0390a15cb00b6ef9576b9c23
+xtensa		adc044bf2320162e9a7659a90e9bb79871053217
+fscrypt		861261f2a9cc488c845fc214d9035f7a11094591
+afs		4fe171bb81b13b40bf568330ec3716dfb304ced1
+btrfs		5a7ef5cb05dc077737d88162aeaa8661acc2a946
+ceph		3e10eb7331c7558dc84422fd77878b9a6f34dfe1
+cifs		c037725d043e7c729441bb8a10247acf8ed84c0f
+configfs		e2f238f7d5a1fa69ff1884d37acf9a2a3a01b308
+ecryptfs		8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238
+erofs		20741a6e146cab59745c7f25abf49d891a83f8e9
+ext3		a32f0ecd79b4757e417b778c8dc64916e93f7b80
+ext4		54d3adbc29f0c7c53890da1683e629cd220d7201
+f2fs		8a1ca11a95e23c89350212751eea424a0d7995ea
+fsverity		98d54f81e36ba3bf92172791eba5ca5bd813989b
+fuse		3e8cb8b2eaeb22f540f1cbc00cbb594047b7ba89
+jfs		7aba5dcc234635b44b2781dbc268048cfba388ad
+nfs		f764a1e1cb8bb3de42ca31abd034bdb82f156c29
+nfs-anna		55dee1bc0d72877b99805e42e0205087e98b9edd
+nfsd		2653de9f0398b3230bb098704451ba16be5458f0
+orangefs		9f198a2ac543eaaf47be275531ad5cbd50db3edf
+overlayfs	2eda9eaa6d7ec129150df4c7b7be65f27ac47346
+ubifs		3676f32a98cd6ed4481c21bceb8b4829d4b6d1cf
+v9fs		43657496e46672fe63bccc1fcfb5b68de6e1e2f4
+xfs		d8fcb6f1346c36316ccb20f887081299a61bbcc8
+zonefs		0dda2ddb7ded1395189e95d43106469687c07795
+iomap		d9973ce2fe5bcdc5e01bb3f49833d152b8e166ca
+djw-vfs		56939e014a6c212b317414faa307029e2e80c3b9
+file-locks	dbdaf6a3250b9cda6d7f761e9ff8b8bed8409a38
+vfs		575beddbd7f4f13d47455c07530c4f2efa38ceb4
+printk		d34f14ae521f076f68f3ce213c64193f9a5a8adf
+pci		505d60df262305d1318a8a30cd67752d18462c17
+pstore		8128d3aac0ee3420ede34950c9c0ef9ee118bec9
+hid		c2320c3ee0e66a75d91465e67a86fec8cbdca701
+i2c		ae7a83a5275b45966fe48318424b572c18aec01c
+i3c		c4b9de11d0101792c4d5458b18581f4f527862d1
+dmi		12028f913eb9090859d6cc1d579dd4f6c83306a3
+hwmon-staging	5b10a8194664a0d3b025f9b53de4476754ce8e41
+jc_docs		abcb1e021ae5a36374c635eeaba5cec733169b78
+v4l-dvb		2632e7b618a7730969f9782593c29ca53553aa22
+v4l-dvb-next	54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c
+fbdev		732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f
+pm		e2402957dd37c220c32bf4d7d1c517515667972d
+cpufreq-arm	a8811ec764f95a04ba82f6f457e28c5e9e36e36b
+cpupower		2de7fb60a4740135e03cf55c1982e393ccb87b6b
+opp		03758d60265c773e1d06d436b99ee338f2ac55d6
+thermal		76a5c400aae52f541737de982e2b5a2e1f423bab
+thermal-rzhang	54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c
+thermal-soc	6c375eccded41df8033ed55a1b785531b304fc67
+ieee1394		67f8e65e4fc19e24993e8780f41279eeffbd0610
+dlm		a48f9721e6db74dfbeb8d4a2cd616b20017f4b78
+swiotlb		4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c
+rdma		b4d8ddf8356d8ac73fb931d16bcc661a83b2c0fe
+net-next		1a323ea5356edbb3073dc59d51b9e6b86908857d
+bpf-next		1a323ea5356edbb3073dc59d51b9e6b86908857d
+ipsec-next	308491755f36c461ee67290af159fdba6be0169d
+mlx5-next	826096d84f509d95ee8f72728fe19c44fbb9df6b
+netfilter-next	5a470b1a63ac211e01a93de9d913753d64a21d9a
+ipvs-next	d54725cd11a57c30f650260cfb0a92c268bdc3e0
+wireless-drivers-next	5988b8ec713270fa29e0535ff3d0ef26a94c8220
+bluetooth	d7a448d5da889446d87d64e6b6f361cec759b6af
+mac80211-next	1e8f471425f4012f2c98f228ac2ba19cea22c39b
+gfs2		75b46c437f6b0f8e37032a407c7373f85f5c26a8
+mtd		025a06c1104cd8995646b761d117816b5f28c873
+nand		fca88925d76978b7f20de42d8ead34fb91500003
+spi-nor		f3f2b7eb2f1c5889b0a7162b6b5a69c0f357befd
+crypto		fcb90d51c375d09a034993cda262b68499e233a4
+drm		59e7a8cc2dcf335116d500d684bfb34d1d97a6fe
+amdgpu		03eab26d6a9ae01e60dcfa9eafe32c98671c6a5f
+drm-intel	17d0c1062a0c60e17c96538adf4a84c208930d9d
+drm-tegra	e32c8c2a5fbe1514e4ae9063a49e76ecf486ffb8
+drm-misc		d8a26d8fc37c5b8b9e95f2fa194f287cf8cab3f4
+drm-msm		a5fb8b918920c6f7706a8b5b8ea535a7f077a7f6
+mali-dp		f634c6a8028789b05a9277a3d51303829ae29547
+imx-drm		2c76b324c7944fedf453abca5003569d9556c6df
+etnaviv		f232d9ec029ce3e2543b05213e2979e01e503408
+regmap		2060986f04ad409fa6cb8059251d215064618253
+sound		5c6cd7021a05a02fcf37f360592d7c18d4d807fb
+sound-asoc	52ac54e1de31af2d40f10dd4e711e774655e091b
+modules		0f74226649fb2875a91b68f3750f55220aa73425
+input		c9c20ee3cfce924e7b2a8138df2d6958c500858a
+block		d9e92da49f29a9b818ae25ff0af9a51cc796db3c
+device-mapper	81d5553d1288c2ec0390f02f84d71ca0f0f9f137
+pcmcia		af741b0bad237bf85d388b70c62dfcb2769beef0
+mmc		92075d98abf0f42db1cb518150364f196d4ad217
+md		e820d55cb99dd93ac2dc949cf486bb187e5cd70d
+mfd		1129d6145ed58362738d9411279132b0c5e71e85
+backlight	ee0c8e494cc3c135350cd5c4752e82af3feae1ab
+battery		f78c55e3b4806974f7d590b2aab8683232b7bd25
+regulator	24bd2afda8ce633385a3c96aa51181008d7252da
+security		3e27a33932df104f4f9ff811467b0b4ccebde773
+apparmor		01df52d726b5d55d2970f5c957f1961930acd5d6
+integrity	9e2b4be377f0d715d9d910507890f9620cc22a9d
+keys		43672cf93c6d96380222064aec06e9593113cdea
+selinux		c753924b628551564b6eea3c9896e4a95aa25ed9
+smack		92604e825304ce170955df44b00973843054dcd5
+tomoyo		9efcc4a129363187c9bf15338692f107c5c9b6f0
+tpmdd		2e356101e72ab1361821b3af024d64877d9a798d
+watchdog		2d63908bdbfbce0d98195b22236ad5105dc6eba2
+iommu		ff68eb23308e6538ec7864c83d39540f423bbe90
+vfio		f44efca0493ddc1e8731047c234ec8e475943077
+audit		1320a4052ea11eb2879eb7361da15a106a780972
+devicetree	8967918e7cee84d8b781feec38286c7d3c1c05da
+mailbox		0a67003b1985c79811160af1b01aca07cd5fbc53
+spi		1ba0b52ea73bd46ff053edea21f5630f5277fefe
+tip		e5ff49d1dfba672fa275bd73f9626838d5529c8f
+clockevents	c1ac28a4de6f848ef17b43ee76d1f28a219c3785
+edac		ad49d9a8228e10cb4ee8b7f13c88d4711aa55894
+irqchip		4cea749d56bec9409f3bd126d2b2f949dc6c66e2
+ftrace		2ab2a0924b9980551ebe1c47d2a402a94efc1835
+rcu		1503af98f54de48952cd5b0fb65c0eaeef66e82a
+kvm		32bd3422a90aed3877b6b71ca08cecfa35dacb09
+kvm-arm		463050599742a89e0508355e626e032e8d0dab8d
+kvm-ppc		9a5788c615f52f6d7bf0b61986a632d4ec86791d
+kvms390		7a2653612bb6f18fb236c5b0c4d28f7b459bf7c2
+xen-tip		c3881eb58d56116c79ac4ee4f40fd15ead124c4b
+percpu		dedac37ea96b23c23b72d6e90f01d060d5287e4e
+workqueues	4acf8a423cd321248b4cc9eb21c11bb88931938b
+drivers-x86	1a323ea5356edbb3073dc59d51b9e6b86908857d
+chrome-platform	317a0ebe53f46527aed912f7c3df963cd9a41536
+hsi		bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9
+leds		10a6cce3c1a15e40dd7b69e66e4780476e590f68
+ipmi		26455d00ee58c8f5d197d82cdfafc1468e37efbf
+driver-core	1a323ea5356edbb3073dc59d51b9e6b86908857d
+usb		1a323ea5356edbb3073dc59d51b9e6b86908857d
+usb-gadget	4a5dbd9009570d3b23fd1392c4d178bfe3538d2c
+usb-serial	57aa9f294b09463492f604feaa5cc719beaace32
+usb-chipidea-next	86b17c7f14ed1a442246a332c90df0e81003a2d3
+phy-next		89d715371a05b1dee32faf49014b1acff6138b83
+tty		1a323ea5356edbb3073dc59d51b9e6b86908857d
+char-misc	885a64715fd81e6af6d94a038556e0b2e6deb19c
+extcon		9c94553099efb2ba873cbdddfd416a8a09d0e5f1
+soundwire	39ec6f992131f0e88910700286d83f5f48f4ee8f
+thunderbolt	3010518964dc96c41848a05a5b0ec11ccf8d5ebe
+staging		1a323ea5356edbb3073dc59d51b9e6b86908857d
+mux		f356d58c3a04159f35003b26f8c5183f9456f95d
+icc		03c4e6186bbbe639b5277077c26786069e9e2b89
+slave-dma	cea582b5ee5645839650b6667335cfb40ec71c19
+cgroup		6fc331767f41ccccf49c91298feec9e86f465b1d
+scsi		9dfce4c4d3cdb7856489dcc9f052449915cb39ea
+scsi-mkp		1b55940b9bcc64acb7336224b0e49203ff7987c6
+vhost		09880f689ab3c94327ffcb09c5de70ae91de8a21
+rpmsg		45c2824de341e67ac80d888cd5ea5c90d5fc5ab6
+gpio		33dd888263199676946f1c789e821d39a9a79d98
+gpio-brgl	97551625025320e9d635531625316e43c8ed62b0
+gpio-intel	bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9
+pinctrl		c42f69b4207e104229242c3d9da43b55d4b95d6d
+pinctrl-intel	16fbf79b0f83bc752cee8589279f1ebfe57b3b6e
+pinctrl-samsung	bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9
+pwm		a2005fc791798f40cc9895b6abda8fbc7a168174
+userns		d1e7fd6462ca9fc76650fbe6ca800e35b24267da
+ktest		1091c8fce8aa9c5abe1a73acab4bcaf58a729005
+random		ab9a7e27044b87ff2be47b8f8e095400e7fccc44
+kselftest	1056d3d2c97e47397d0037cbbdf24235ae8f88cb
+y2038		c4e71212a245017d2ab05f322f7722f0b87a55da
+livepatching	d28b4c1b2b3d1337069cbe0bf0bec151d0e4d576
+coresight	ed0efaa66ad871ee47af0c86f66538ea20e79fc8
+rtc		04b3f5186e8b6aa1e9f1250f28e1d2d350e2cead
+nvdimm		6ab3463a5fcd92546c795fd3c4e44ff242a4bf32
+at24		4837621cd61e6b81a182098889143c6c9a06b0f3
+ntb		b9fc54c38e2e0d189b027eaf10135e5a1a196bd4
+kspp		c79f46a282390e0f5b306007bf7b11a46d529538
+cisco		9e98c678c2d6ae3a17cb2de55d17f69dddaa231b
+gnss		f8788d86ab28f61f7b46eb6be375f8a726783636
+fsi		2c01397b71c5e5001752046328d7f2aaf51b4c13
+slimbus		ba1589ff458e032f40780188189eb0fb5a71a103
+nvmem		990df64027528086ea2160f51dcb481f9b6442c5
+xarray		ba44af6f2609f4fc0467c073efce7f95400923d9
+hyperv		86fd319b92405fb8b52fcbbf9a8720c3d40458af
+auxdisplay	2f920c0f0e29268827c2894c6e8f237a78159718
+kgdb		5ea771abd5a3734dfc55dee3772ff94ecc0b6f6a
+pidfd		6952a4f646446fde9e190b62c5e45f84c6cf91aa
+devfreq		7a51320ecd394202d80131ad7837a72ca2213e64
+hmm		bd5d3587b218d33d70a835582dfe1d8f8498e702
+fpga		cef0ca6417de6c3805847b5e025a1e3af7c7d473
+kunit		bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9
+cel		1a33d8a284b1e85e03b8c7b1ea8fb985fccd1d71
+generic-ioremap	4bdc0d676a643140bdf17dbf7eafedee3d496a3c
+cfi		b6fe8bc67d2d33a9eff1b0785482bccd14979115
+kunit-next	e23349af9ee25a5760112a2f8476b94a4ec86f1c
+trivial		fad7c9020948eab2bc4661eade4e1ef357279590
+zx2c4		16fbf79b0f83bc752cee8589279f1ebfe57b3b6e
+akpm-current	588c2d2fdd183e8759fa2770d9a1a5c20787b227
+akpm		cd36aa879b7318c32a2a74e1be69eb80498ab578
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 0000000000000..6bc38272c23a5
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,319 @@
+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
+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 0000000000000..2bb14a4cb5f61
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,11944 @@
+$ date -R
+Thu, 02 Apr 2020 08:29:14 +1100
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+Updating files:  80% (6597/8236)
Updating files:  81% (6672/8236)
Updating files:  82% (6754/8236)
Updating files:  83% (6836/8236)
Updating files:  84% (6919/8236)
Updating files:  85% (7001/8236)
Updating files:  86% (7083/8236)
Updating files:  87% (7166/8236)
Updating files:  88% (7248/8236)
Updating files:  89% (7331/8236)
Updating files:  90% (7413/8236)
Updating files:  91% (7495/8236)
Updating files:  92% (7578/8236)
Updating files:  93% (7660/8236)
Updating files:  94% (7742/8236)
Updating files:  95% (7825/8236)
Updating files:  96% (7907/8236)
Updating files:  97% (7989/8236)
Updating files:  98% (8072/8236)
Updating files:  99% (8154/8236)
Updating files: 100% (8236/8236)
Updating files: 100% (8236/8236), done.
+HEAD is now at 42595ce90b9d Merge branch 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
+Merging origin/master (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
+$ git merge origin/master
+Updating 42595ce90b9d..1a323ea5356e
+Fast-forward
+ .../ABI/obsolete/sysfs-selinux-checkreqprot        |   23 +
+ Documentation/ABI/testing/sysfs-tty                |    7 +
+ Documentation/Makefile                             |    3 +-
+ Documentation/admin-guide/kernel-parameters.txt    |    1 +
+ Documentation/admin-guide/sysctl/net.rst           |    3 +-
+ Documentation/bpf/bpf_devel_QA.rst                 |   29 +-
+ Documentation/bpf/bpf_lsm.rst                      |  142 +
+ Documentation/bpf/drgn.rst                         |  213 ++
+ Documentation/bpf/index.rst                        |    6 +-
+ Documentation/devicetree/bindings/.gitignore       |    2 +-
+ Documentation/devicetree/bindings/Makefile         |   32 +-
+ .../devicetree/bindings/mmc/fsl-imx-esdhc.txt      |    5 +
+ .../devicetree/bindings/mmc/mmc-controller.yaml    |    2 +-
+ Documentation/devicetree/bindings/mmc/mmci.txt     |    2 +
+ .../devicetree/bindings/mmc/sdhci-am654.txt        |   21 +-
+ .../devicetree/bindings/mmc/sdhci-msm.txt          |    8 +-
+ .../devicetree/bindings/mmc/synopsys-dw-mshc.yaml  |    2 +-
+ .../devicetree/bindings/net/dsa/ocelot.txt         |  116 +
+ .../devicetree/bindings/net/marvell,mvusb.yaml     |   65 +
+ .../devicetree/bindings/net/qcom,ipa.yaml          |  198 ++
+ .../devicetree/bindings/net/qcom,ipq8064-mdio.yaml |   53 +
+ .../devicetree/bindings/net/qualcomm-bluetooth.txt |    2 +
+ .../bindings/net/ti,k3-am654-cpsw-nuss.yaml        |  225 ++
+ .../bindings/net/wireless/mediatek,mt76.txt        |   29 +-
+ .../bindings/net/wireless/qcom,ath10k.txt          |    7 +
+ .../devicetree/bindings/net/wireless/ti,wl1251.txt |    3 +-
+ .../devicetree/bindings/ptp/ptp-idt82p33.yaml      |   45 +
+ .../devicetree/bindings/serial/fsl-imx-uart.txt    |    4 +
+ .../devicetree/bindings/serial/fsl-lpuart.txt      |   10 +-
+ Documentation/devicetree/writing-schema.rst        |    4 +
+ Documentation/filesystems/fscrypt.rst              |   11 +
+ Documentation/kbuild/index.rst                     |    1 +
+ Documentation/kbuild/kconfig-language.rst          |   27 +-
+ Documentation/kbuild/llvm.rst                      |   80 +
+ .../networking/{6lowpan.txt => 6lowpan.rst}        |   29 +-
+ Documentation/networking/bareudp.rst               |   52 +
+ .../networking/device_drivers/mellanox/mlx5.rst    |    2 +-
+ .../networking/device_drivers/stmicro/stmmac.rst   |    7 +-
+ Documentation/networking/devlink/bnxt.rst          |   14 +-
+ Documentation/networking/devlink/devlink-flash.rst |   93 +
+ Documentation/networking/devlink/devlink-info.rst  |  144 +-
+ .../networking/devlink/devlink-params.rst          |    2 +
+ .../networking/devlink/devlink-region.rst          |   14 +-
+ Documentation/networking/devlink/devlink-trap.rst  |   35 +
+ Documentation/networking/devlink/ice.rst           |   96 +
+ Documentation/networking/devlink/index.rst         |    2 +
+ Documentation/networking/devlink/mlx5.rst          |    6 +
+ Documentation/networking/ethtool-netlink.rst       |  497 +++-
+ Documentation/networking/filter.txt                |    2 +-
+ Documentation/networking/index.rst                 |    2 +
+ Documentation/networking/ip-sysctl.txt             |    9 +
+ Documentation/networking/page_pool.rst             |  159 ++
+ Documentation/networking/sfp-phylink.rst           |   49 +-
+ MAINTAINERS                                        |  135 +-
+ Makefile                                           |   55 +-
+ arch/arm/boot/dts/imx6qdl-apalis.dtsi              |    2 +-
+ arch/arm/boot/dts/mmp2-brownstone.dts              |  332 ++-
+ arch/arm/boot/dts/mmp2.dtsi                        |   16 +-
+ arch/arm/boot/dts/mmp3.dtsi                        |   16 +-
+ arch/arm/boot/dts/pxa168-aspenite.dts              |   24 +-
+ arch/arm/boot/dts/pxa168.dtsi                      |   15 +-
+ arch/arm/boot/dts/pxa910-dkb.dts                   |  286 +-
+ arch/arm/boot/dts/pxa910.dtsi                      |   15 +-
+ arch/arm/boot/dts/tango4-common.dtsi               |    2 +-
+ arch/arm64/Kconfig.platforms                       |    2 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi     |   73 +
+ arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi            |   49 +
+ arch/arm64/boot/dts/ti/k3-am65.dtsi                |    1 +
+ arch/arm64/boot/dts/ti/k3-am654-base-board.dts     |   42 +
+ .../boot/dts/ti/k3-j721e-common-proc-board.dts     |   43 +
+ arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi    |   49 +
+ arch/arm64/boot/dts/ti/k3-j721e.dtsi               |    1 +
+ arch/arm64/configs/defconfig                       |    3 +
+ arch/powerpc/kernel/vmlinux.lds.S                  |    6 -
+ arch/riscv/Kconfig                                 |    2 +-
+ arch/riscv/net/Makefile                            |    9 +-
+ arch/riscv/net/bpf_jit.h                           |  514 ++++
+ arch/riscv/net/bpf_jit_comp32.c                    | 1310 +++++++++
+ .../riscv/net/{bpf_jit_comp.c => bpf_jit_comp64.c} |  605 +----
+ arch/riscv/net/bpf_jit_core.c                      |  166 ++
+ arch/s390/include/asm/qdio.h                       |    9 +-
+ arch/sh/Kconfig                                    |    5 -
+ arch/sparc/Kconfig                                 |    5 -
+ arch/sparc/include/asm/string.h                    |    4 +
+ arch/sparc/include/asm/string_64.h                 |    4 -
+ arch/um/drivers/vector_kern.c                      |    1 +
+ arch/x86/Kconfig                                   |    5 -
+ arch/x86/include/asm/uaccess.h                     |   41 +-
+ arch/x86/mm/init_32.c                              |   14 +-
+ arch/x86/net/bpf_jit_comp.c                        |  260 +-
+ arch/x86/um/Kconfig                                |    5 -
+ drivers/accessibility/braille/braille_console.c    |    4 -
+ drivers/base/core.c                                |  120 +
+ drivers/base/power/power.h                         |    3 +
+ drivers/base/power/sysfs.c                         |   55 +-
+ drivers/bluetooth/Kconfig                          |    4 +-
+ drivers/bluetooth/bfusb.c                          |   33 +-
+ drivers/bluetooth/btintel.c                        |    4 +-
+ drivers/bluetooth/btqca.c                          |   10 +-
+ drivers/bluetooth/btqca.h                          |    6 +-
+ drivers/bluetooth/btrtl.c                          |   12 +
+ drivers/bluetooth/btrtl.h                          |    4 +-
+ drivers/bluetooth/btusb.c                          |   32 +-
+ drivers/bluetooth/hci_ag6xx.c                      |    2 +-
+ drivers/bluetooth/hci_h4.c                         |    4 +-
+ drivers/bluetooth/hci_h5.c                         |   49 +-
+ drivers/bluetooth/hci_intel.c                      |    2 +-
+ drivers/bluetooth/hci_qca.c                        |  174 +-
+ drivers/crypto/chelsio/Kconfig                     |   11 +
+ drivers/crypto/chelsio/Makefile                    |    3 +
+ drivers/crypto/chelsio/chcr_common.h               |  135 +
+ drivers/crypto/chelsio/chcr_core.c                 |   85 +-
+ drivers/crypto/chelsio/chcr_core.h                 |    7 +
+ drivers/crypto/chelsio/chcr_ipsec.c                |    2 -
+ drivers/crypto/chelsio/chcr_ktls.c                 | 2020 ++++++++++++++
+ drivers/crypto/chelsio/chcr_ktls.h                 |   98 +
+ drivers/crypto/chelsio/chtls/chtls_cm.c            |   29 +-
+ drivers/crypto/chelsio/chtls/chtls_io.c            |   73 +-
+ drivers/firmware/xilinx/zynqmp.c                   |    2 +
+ drivers/infiniband/hw/mlx5/main.c                  |    4 +-
+ drivers/infiniband/hw/mlx5/mlx5_ib.h               |    5 +
+ drivers/infiniband/hw/mlx5/mr.c                    |   65 +-
+ drivers/infiniband/ulp/ipoib/ipoib_ethtool.c       |    2 +
+ drivers/mmc/core/block.c                           |  125 +-
+ drivers/mmc/core/core.c                            |   54 +-
+ drivers/mmc/core/mmc.c                             |   56 +-
+ drivers/mmc/core/mmc_ops.c                         |  194 +-
+ drivers/mmc/core/mmc_ops.h                         |   15 +-
+ drivers/mmc/core/mmc_test.c                        |   52 +-
+ drivers/mmc/core/queue.c                           |   22 +-
+ drivers/mmc/core/sd.c                              |   10 +
+ drivers/mmc/core/sdio_irq.c                        |   15 +-
+ drivers/mmc/host/Kconfig                           |   12 +
+ drivers/mmc/host/Makefile                          |    1 +
+ drivers/mmc/host/cavium-octeon.c                   |    4 +-
+ drivers/mmc/host/cqhci.c                           |   16 +-
+ drivers/mmc/host/cqhci.h                           |    6 +-
+ drivers/mmc/host/mmc_hsq.c                         |  348 +++
+ drivers/mmc/host/mmc_hsq.h                         |   30 +
+ drivers/mmc/host/mmci.c                            |   43 +-
+ drivers/mmc/host/mmci.h                            |    8 +
+ drivers/mmc/host/mmci_stm32_sdmmc.c                |  208 +-
+ drivers/mmc/host/mtk-sd.c                          |   41 +
+ drivers/mmc/host/renesas_sdhi.h                    |    6 +
+ drivers/mmc/host/renesas_sdhi_core.c               |  183 +-
+ drivers/mmc/host/sdhci-acpi.c                      |    2 +-
+ drivers/mmc/host/sdhci-cadence.c                   |    2 +-
+ drivers/mmc/host/sdhci-esdhc-imx.c                 |  167 +-
+ drivers/mmc/host/sdhci-esdhc.h                     |    1 +
+ drivers/mmc/host/sdhci-iproc.c                     |   17 +-
+ drivers/mmc/host/sdhci-milbeaut.c                  |   13 +-
+ drivers/mmc/host/sdhci-msm.c                       |   27 +-
+ drivers/mmc/host/sdhci-of-arasan.c                 |   74 +-
+ drivers/mmc/host/sdhci-of-at91.c                   |   22 +-
+ drivers/mmc/host/sdhci-omap.c                      |   57 +
+ drivers/mmc/host/sdhci-pci.h                       |    2 +-
+ drivers/mmc/host/sdhci-pltfm.h                     |    2 +-
+ drivers/mmc/host/sdhci-sprd.c                      |   30 +-
+ drivers/mmc/host/sdhci-tegra.c                     |   35 +-
+ drivers/mmc/host/sdhci.c                           |   45 +-
+ drivers/mmc/host/sdhci.h                           |   18 +-
+ drivers/mmc/host/sdhci_am654.c                     |  264 +-
+ drivers/mmc/host/tmio_mmc.h                        |   11 +-
+ drivers/mmc/host/tmio_mmc_core.c                   |   77 +-
+ drivers/mmc/host/vub300.c                          |    4 +-
+ drivers/net/Kconfig                                |   15 +
+ drivers/net/Makefile                               |    2 +
+ drivers/net/bareudp.c                              |  817 ++++++
+ drivers/net/bonding/bond_main.c                    |    8 +-
+ drivers/net/bonding/bonding_priv.h                 |    5 +-
+ drivers/net/can/slcan.c                            |    7 +-
+ drivers/net/dsa/b53/b53_common.c                   |   58 +-
+ drivers/net/dsa/b53/b53_priv.h                     |    4 +-
+ drivers/net/dsa/bcm_sf2.c                          |   14 +-
+ drivers/net/dsa/bcm_sf2_cfp.c                      |  139 +-
+ drivers/net/dsa/lantiq_gswip.c                     |    4 +-
+ drivers/net/dsa/microchip/Kconfig                  |    1 +
+ drivers/net/dsa/microchip/ksz_common.c             |   26 +-
+ drivers/net/dsa/microchip/ksz_common.h             |    3 +-
+ drivers/net/dsa/mt7530.c                           |  121 +-
+ drivers/net/dsa/mt7530.h                           |   11 +
+ drivers/net/dsa/mv88e6xxx/chip.c                   |  492 ++--
+ drivers/net/dsa/mv88e6xxx/chip.h                   |   40 +-
+ drivers/net/dsa/mv88e6xxx/port.c                   |  285 +-
+ drivers/net/dsa/mv88e6xxx/port.h                   |   29 +-
+ drivers/net/dsa/mv88e6xxx/serdes.c                 |  452 +++-
+ drivers/net/dsa/mv88e6xxx/serdes.h                 |   39 +-
+ drivers/net/dsa/ocelot/felix.c                     |   97 +-
+ drivers/net/dsa/ocelot/felix.h                     |    3 +
+ drivers/net/dsa/ocelot/felix_vsc9959.c             |  134 +-
+ drivers/net/dsa/qca/ar9331.c                       |    4 +-
+ drivers/net/dsa/sja1105/Makefile                   |    1 +
+ drivers/net/dsa/sja1105/sja1105.h                  |   49 +
+ drivers/net/dsa/sja1105/sja1105_clocking.c         |    4 +
+ drivers/net/dsa/sja1105/sja1105_dynamic_config.c   |   24 +-
+ drivers/net/dsa/sja1105/sja1105_ethtool.c          |  133 +-
+ drivers/net/dsa/sja1105/sja1105_flower.c           |  340 +++
+ drivers/net/dsa/sja1105/sja1105_main.c             |  400 ++-
+ drivers/net/dsa/sja1105/sja1105_ptp.c              |  285 +-
+ drivers/net/dsa/sja1105/sja1105_ptp.h              |   31 +
+ drivers/net/dsa/sja1105/sja1105_sgmii.h            |   53 +
+ drivers/net/dsa/sja1105/sja1105_spi.c              |    7 +
+ drivers/net/dsa/sja1105/sja1105_static_config.c    |    5 +-
+ drivers/net/dsa/sja1105/sja1105_static_config.h    |    1 +
+ drivers/net/dsa/sja1105/sja1105_tas.c              |   27 -
+ drivers/net/dsa/vitesse-vsc73xx-core.c             |   30 +-
+ drivers/net/dummy.c                                |    3 -
+ drivers/net/ethernet/3com/3c509.c                  |    8 +-
+ drivers/net/ethernet/3com/3c515.c                  |   16 +-
+ drivers/net/ethernet/3com/3c589_cs.c               |    2 -
+ drivers/net/ethernet/3com/typhoon.c                |  283 +-
+ drivers/net/ethernet/3com/typhoon.h                |    4 +-
+ drivers/net/ethernet/adaptec/starfire.c            |   19 +-
+ drivers/net/ethernet/aeroflex/greth.c              |    2 -
+ drivers/net/ethernet/agere/et131x.c                |    1 -
+ drivers/net/ethernet/agere/et131x.h                |    1 -
+ drivers/net/ethernet/alacritech/slicoss.c          |    3 -
+ drivers/net/ethernet/allwinner/sun4i-emac.c        |    2 -
+ drivers/net/ethernet/alteon/acenic.c               |    5 +-
+ drivers/net/ethernet/altera/altera_tse_ethtool.c   |    1 -
+ drivers/net/ethernet/amazon/ena/ena_com.c          |    4 -
+ drivers/net/ethernet/amazon/ena/ena_ethtool.c      |    9 +-
+ drivers/net/ethernet/amazon/ena/ena_netdev.c       |   30 +-
+ drivers/net/ethernet/amazon/ena/ena_netdev.h       |   16 +-
+ drivers/net/ethernet/amd/amd8111e.c                |    5 +-
+ drivers/net/ethernet/amd/au1000_eth.c              |    5 -
+ drivers/net/ethernet/amd/nmclan_cs.c               |    9 +-
+ drivers/net/ethernet/amd/pcnet32.c                 |    7 -
+ drivers/net/ethernet/amd/sunlance.c                |   10 -
+ drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c       |   27 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-main.c          |    1 -
+ drivers/net/ethernet/amd/xgbe/xgbe.h               |    1 -
+ drivers/net/ethernet/apm/xgene-v2/ethtool.c        |    2 -
+ drivers/net/ethernet/apm/xgene-v2/main.c           |    1 -
+ drivers/net/ethernet/apm/xgene-v2/main.h           |    1 -
+ .../net/ethernet/apm/xgene/xgene_enet_ethtool.c    |    2 -
+ drivers/net/ethernet/apm/xgene/xgene_enet_main.c   |    1 -
+ drivers/net/ethernet/apm/xgene/xgene_enet_main.h   |    1 -
+ drivers/net/ethernet/aquantia/Kconfig              |    1 +
+ drivers/net/ethernet/aquantia/atlantic/Makefile    |    7 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_cfg.h    |    4 -
+ drivers/net/ethernet/aquantia/atlantic/aq_common.h |    1 -
+ .../net/ethernet/aquantia/atlantic/aq_ethtool.c    |  176 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_hw.h     |    6 +
+ drivers/net/ethernet/aquantia/atlantic/aq_macsec.c | 1777 ++++++++++++
+ drivers/net/ethernet/aquantia/atlantic/aq_macsec.h |  133 +
+ drivers/net/ethernet/aquantia/atlantic/aq_main.c   |    1 -
+ drivers/net/ethernet/aquantia/atlantic/aq_nic.c    |   21 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_nic.h    |    6 +-
+ .../net/ethernet/aquantia/atlantic/aq_pci_func.c   |    5 +
+ .../aquantia/atlantic/hw_atl/hw_atl_utils.h        |   53 +-
+ .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c   |   69 +
+ .../atlantic/macsec/MSS_Egress_registers.h         |   73 +
+ .../atlantic/macsec/MSS_Ingress_registers.h        |   77 +
+ .../ethernet/aquantia/atlantic/macsec/macsec_api.c | 2473 +++++++++++++++++
+ .../ethernet/aquantia/atlantic/macsec/macsec_api.h |  323 +++
+ .../aquantia/atlantic/macsec/macsec_struct.h       |  914 +++++++
+ drivers/net/ethernet/aquantia/atlantic/ver.h       |   12 -
+ drivers/net/ethernet/arc/emac.h                    |    1 -
+ drivers/net/ethernet/arc/emac_arc.c                |    2 -
+ drivers/net/ethernet/arc/emac_main.c               |    1 -
+ drivers/net/ethernet/arc/emac_rockchip.c           |    2 -
+ drivers/net/ethernet/atheros/Kconfig               |    2 +-
+ drivers/net/ethernet/atheros/ag71xx.c              |  188 +-
+ drivers/net/ethernet/atheros/alx/main.c            |    5 +-
+ drivers/net/ethernet/atheros/atl1c/atl1c.h         |    1 -
+ drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c |    2 -
+ drivers/net/ethernet/atheros/atl1c/atl1c_main.c    |   11 +-
+ drivers/net/ethernet/atheros/atl1e/atl1e.h         |    1 -
+ drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c |    2 -
+ drivers/net/ethernet/atheros/atl1e/atl1e_main.c    |    4 -
+ drivers/net/ethernet/atheros/atlx/atl1.c           |    6 -
+ drivers/net/ethernet/atheros/atlx/atl2.c           |   11 -
+ drivers/net/ethernet/broadcom/b44.c                |    5 -
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c       |   11 +-
+ drivers/net/ethernet/broadcom/bcmsysport.c         |    7 +-
+ drivers/net/ethernet/broadcom/bgmac.c              |   12 +
+ drivers/net/ethernet/broadcom/bgmac.h              |    5 +-
+ drivers/net/ethernet/broadcom/bnx2.c               |   16 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x.h        |    8 +-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c    |    8 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c   |    7 -
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c          |  199 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.h          |    9 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c      |   19 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c  |   24 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c  |   12 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c    |    4 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c       |   11 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c      |    1 -
+ drivers/net/ethernet/broadcom/genet/bcmgenet.c     |   70 +-
+ drivers/net/ethernet/broadcom/genet/bcmmii.c       |   81 +-
+ drivers/net/ethernet/broadcom/tg3.c                |   16 +-
+ drivers/net/ethernet/brocade/bna/bnad.c            |   11 +-
+ drivers/net/ethernet/brocade/bna/bnad.h            |    4 +-
+ drivers/net/ethernet/brocade/bna/bnad_ethtool.c    |    4 +-
+ drivers/net/ethernet/cadence/macb.h                |    1 -
+ drivers/net/ethernet/cadence/macb_main.c           |   60 +-
+ drivers/net/ethernet/cavium/common/cavium_ptp.c    |   10 +-
+ drivers/net/ethernet/cavium/liquidio/lio_ethtool.c |   13 +-
+ drivers/net/ethernet/cavium/liquidio/lio_main.c    |   13 -
+ drivers/net/ethernet/cavium/liquidio/lio_vf_main.c |    5 +-
+ .../net/ethernet/cavium/liquidio/liquidio_common.h |    6 -
+ .../net/ethernet/cavium/liquidio/octeon_console.c  |   12 +-
+ drivers/net/ethernet/cavium/octeon/octeon_mgmt.c   |    6 -
+ .../net/ethernet/cavium/thunder/nicvf_ethtool.c    |    2 -
+ drivers/net/ethernet/cavium/thunder/nicvf_main.c   |    9 +-
+ drivers/net/ethernet/cavium/thunder/nicvf_queues.c |    3 +-
+ drivers/net/ethernet/cavium/thunder/nicvf_queues.h |    4 +-
+ drivers/net/ethernet/chelsio/cxgb/common.h         |    1 -
+ drivers/net/ethernet/chelsio/cxgb/cxgb2.c          |    6 +-
+ drivers/net/ethernet/chelsio/cxgb3/cxgb3_ioctl.h   |    2 +-
+ drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c    |    5 +-
+ drivers/net/ethernet/chelsio/cxgb3/t3_cpl.h        |    2 +-
+ drivers/net/ethernet/chelsio/cxgb3/version.h       |    2 -
+ drivers/net/ethernet/chelsio/cxgb4/clip_tbl.h      |    2 +-
+ drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h  |    8 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h         |    4 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c |   37 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h |    2 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c |   28 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c  |  303 ++-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.h  |    1 -
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |   10 -
+ .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c   |  132 +-
+ .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h   |    3 +-
+ .../net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c |   28 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c  |   79 +-
+ .../ethernet/chelsio/cxgb4/cxgb4_tc_u32_parse.h    |    2 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c     |   32 +
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h     |   25 +-
+ drivers/net/ethernet/chelsio/cxgb4/l2t.c           |   13 +-
+ drivers/net/ethernet/chelsio/cxgb4/l2t.h           |    1 +
+ drivers/net/ethernet/chelsio/cxgb4/sched.h         |    2 +-
+ drivers/net/ethernet/chelsio/cxgb4/sge.c           |    5 +
+ drivers/net/ethernet/chelsio/cxgb4/smt.h           |    2 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c         |   54 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_msg.h        |   30 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_regs.h       |    6 +
+ drivers/net/ethernet/chelsio/cxgb4/t4_tcb.h        |   62 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h      |    4 +-
+ .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c    |   11 +-
+ drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c |    2 -
+ drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.h |    4 +-
+ drivers/net/ethernet/cirrus/ep93xx_eth.c           |    2 -
+ drivers/net/ethernet/cisco/enic/enic.h             |    2 -
+ drivers/net/ethernet/cisco/enic/enic_ethtool.c     |   24 +-
+ drivers/net/ethernet/cisco/enic/enic_main.c        |    6 +-
+ drivers/net/ethernet/cisco/enic/vnic_devcmd.h      |    8 +-
+ drivers/net/ethernet/cisco/enic/vnic_vic.h         |    2 +-
+ drivers/net/ethernet/cortina/gemini.c              |    4 +-
+ drivers/net/ethernet/davicom/dm9000.c              |    2 -
+ drivers/net/ethernet/dec/tulip/de2104x.c           |   15 -
+ drivers/net/ethernet/dec/tulip/dmfe.c              |   14 -
+ drivers/net/ethernet/dec/tulip/tulip.h             |    2 +-
+ drivers/net/ethernet/dec/tulip/tulip_core.c        |   26 +-
+ drivers/net/ethernet/dec/tulip/uli526x.c           |   13 -
+ drivers/net/ethernet/dec/tulip/winbond-840.c       |   12 -
+ drivers/net/ethernet/dlink/dl2k.c                  |    9 -
+ drivers/net/ethernet/dlink/sundance.c              |   20 -
+ drivers/net/ethernet/dnet.c                        |    1 -
+ drivers/net/ethernet/dnet.h                        |    1 -
+ drivers/net/ethernet/emulex/benet/be.h             |    1 -
+ drivers/net/ethernet/emulex/benet/be_ethtool.c     |    4 +-
+ drivers/net/ethernet/emulex/benet/be_main.c        |    5 +-
+ drivers/net/ethernet/faraday/ftgmac100.c           |    5 -
+ drivers/net/ethernet/faraday/ftmac100.c            |    3 -
+ drivers/net/ethernet/fealnx.c                      |   20 -
+ drivers/net/ethernet/freescale/dpaa/dpaa_eth.c     |   18 +-
+ drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c |   17 +-
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c   |    7 +-
+ .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c   |   11 +
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c   |   61 +-
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h   |    1 +
+ drivers/net/ethernet/freescale/enetc/Kconfig       |   16 +-
+ drivers/net/ethernet/freescale/enetc/enetc.c       |   70 +-
+ drivers/net/ethernet/freescale/enetc/enetc.h       |   35 +-
+ .../net/ethernet/freescale/enetc/enetc_ethtool.c   |   22 +-
+ drivers/net/ethernet/freescale/enetc/enetc_hw.h    |   11 +-
+ drivers/net/ethernet/freescale/enetc/enetc_pf.c    |   19 -
+ drivers/net/ethernet/freescale/enetc/enetc_vf.c    |   13 -
+ drivers/net/ethernet/freescale/fec.h               |    2 +-
+ drivers/net/ethernet/freescale/fec_main.c          |    4 +-
+ drivers/net/ethernet/freescale/fman/fman_dtsec.c   |   50 +-
+ drivers/net/ethernet/freescale/fman/fman_memac.c   |   10 +-
+ drivers/net/ethernet/freescale/fman/fman_tgec.c    |   10 +-
+ drivers/net/ethernet/freescale/fman/mac.c          |   13 +-
+ .../net/ethernet/freescale/fs_enet/fs_enet-main.c  |    2 -
+ drivers/net/ethernet/freescale/fs_enet/fs_enet.h   |    2 -
+ drivers/net/ethernet/freescale/gianfar.c           |    2 -
+ drivers/net/ethernet/freescale/gianfar.h           |    1 -
+ drivers/net/ethernet/freescale/gianfar_ethtool.c   |   35 +-
+ drivers/net/ethernet/freescale/ucc_geth.c          |    1 -
+ drivers/net/ethernet/freescale/ucc_geth.h          |    1 -
+ drivers/net/ethernet/freescale/ucc_geth_ethtool.c  |    2 -
+ drivers/net/ethernet/hisilicon/hip04_eth.c         |   16 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h  |    2 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h  |    2 +-
+ drivers/net/ethernet/hisilicon/hns/hns_ethtool.c   |    5 +
+ drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h    |   54 +-
+ drivers/net/ethernet/hisilicon/hns3/hnae3.h        |    1 +
+ drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c |    2 +
+ drivers/net/ethernet/hisilicon/hns3/hns3_enet.c    |   22 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c |    9 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c |  159 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c |    3 -
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c    |   42 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h    |    1 +
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c |  387 ++-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c  |  370 +--
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h  |    4 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c   |   50 +-
+ drivers/net/ethernet/ibm/emac/core.c               |    3 +-
+ drivers/net/ethernet/ibm/ibmveth.c                 |   59 +-
+ drivers/net/ethernet/ibm/ibmveth.h                 |    3 +
+ drivers/net/ethernet/intel/Kconfig                 |    1 +
+ drivers/net/ethernet/intel/e1000/e1000_ethtool.c   |    1 +
+ drivers/net/ethernet/intel/e1000/e1000_main.c      |    6 +-
+ drivers/net/ethernet/intel/e1000e/ethtool.c        |    3 +
+ drivers/net/ethernet/intel/e1000e/hw.h             |    6 +
+ drivers/net/ethernet/intel/e1000e/ich8lan.c        |    7 +
+ drivers/net/ethernet/intel/e1000e/mac.c            |    4 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c         |   14 +-
+ drivers/net/ethernet/intel/e1000e/ptp.c            |    1 +
+ drivers/net/ethernet/intel/fm10k/fm10k.h           |    6 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c   |    2 +
+ drivers/net/ethernet/intel/i40e/i40e.h             |    4 +-
+ drivers/net/ethernet/intel/i40e/i40e_ethtool.c     |    5 +
+ drivers/net/ethernet/intel/iavf/iavf.h             |    2 +-
+ drivers/net/ethernet/intel/iavf/iavf_ethtool.c     |   24 +-
+ drivers/net/ethernet/intel/iavf/iavf_main.c        |   10 +-
+ drivers/net/ethernet/intel/iavf/iavf_virtchnl.c    |   27 -
+ drivers/net/ethernet/intel/ice/Makefile            |    1 +
+ drivers/net/ethernet/intel/ice/ice.h               |   17 +-
+ drivers/net/ethernet/intel/ice/ice_adminq_cmd.h    |   15 +
+ drivers/net/ethernet/intel/ice/ice_base.c          |   54 +-
+ drivers/net/ethernet/intel/ice/ice_base.h          |    4 +-
+ drivers/net/ethernet/intel/ice/ice_common.c        |   95 +-
+ drivers/net/ethernet/intel/ice/ice_common.h        |    9 -
+ drivers/net/ethernet/intel/ice/ice_dcb_lib.c       |   84 +-
+ drivers/net/ethernet/intel/ice/ice_dcb_lib.h       |    1 +
+ drivers/net/ethernet/intel/ice/ice_dcb_nl.c        |   58 +-
+ drivers/net/ethernet/intel/ice/ice_devids.h        |   26 +-
+ drivers/net/ethernet/intel/ice/ice_devlink.c       |  416 +++
+ drivers/net/ethernet/intel/ice/ice_devlink.h       |   17 +
+ drivers/net/ethernet/intel/ice/ice_ethtool.c       |  180 +-
+ drivers/net/ethernet/intel/ice/ice_flex_pipe.c     |   65 +-
+ drivers/net/ethernet/intel/ice/ice_flow.c          |    8 +-
+ drivers/net/ethernet/intel/ice/ice_hw_autogen.h    |    5 +
+ drivers/net/ethernet/intel/ice/ice_lib.c           |  325 ++-
+ drivers/net/ethernet/intel/ice/ice_lib.h           |   10 +-
+ drivers/net/ethernet/intel/ice/ice_main.c          |  278 +-
+ drivers/net/ethernet/intel/ice/ice_nvm.c           |  508 ++--
+ drivers/net/ethernet/intel/ice/ice_nvm.h           |   12 +
+ drivers/net/ethernet/intel/ice/ice_sriov.c         |    2 -
+ drivers/net/ethernet/intel/ice/ice_switch.c        |   24 +-
+ drivers/net/ethernet/intel/ice/ice_txrx.c          |    5 +-
+ drivers/net/ethernet/intel/ice/ice_type.h          |   32 +-
+ drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c   |  711 +++--
+ drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h   |   45 +-
+ drivers/net/ethernet/intel/ice/ice_xsk.c           |   36 +-
+ drivers/net/ethernet/intel/ice/ice_xsk.h           |    4 +-
+ drivers/net/ethernet/intel/igb/igb.h               |    2 +-
+ drivers/net/ethernet/intel/igb/igb_ethtool.c       |   22 +-
+ drivers/net/ethernet/intel/igb/igb_hwmon.c         |    6 +-
+ drivers/net/ethernet/intel/igbvf/ethtool.c         |    1 +
+ drivers/net/ethernet/intel/igc/Makefile            |    2 +-
+ drivers/net/ethernet/intel/igc/igc.h               |   12 +-
+ drivers/net/ethernet/intel/igc/igc_defines.h       |    6 +
+ drivers/net/ethernet/intel/igc/igc_dump.c          |  323 +++
+ drivers/net/ethernet/intel/igc/igc_ethtool.c       |   83 +-
+ drivers/net/ethernet/intel/igc/igc_main.c          |  144 +
+ drivers/net/ethernet/intel/igc/igc_ptp.c           |    2 +-
+ drivers/net/ethernet/intel/igc/igc_regs.h          |    5 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe.h           |    2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c   |    1 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c      |   17 +-
+ drivers/net/ethernet/intel/ixgbevf/ethtool.c       |    1 +
+ drivers/net/ethernet/jme.c                         |   10 +-
+ drivers/net/ethernet/marvell/mv643xx_eth.c         |    1 +
+ drivers/net/ethernet/marvell/mvneta.c              |  365 ++-
+ drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c     |    6 +
+ drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c    |  104 +-
+ drivers/net/ethernet/marvell/octeontx2/Kconfig     |    6 +
+ drivers/net/ethernet/marvell/octeontx2/af/cgx.c    |  192 +-
+ drivers/net/ethernet/marvell/octeontx2/af/cgx.h    |   16 +-
+ .../net/ethernet/marvell/octeontx2/af/cgx_fw_if.h  |    8 +-
+ drivers/net/ethernet/marvell/octeontx2/af/mbox.h   |   38 +-
+ drivers/net/ethernet/marvell/octeontx2/af/rvu.c    |  169 +-
+ drivers/net/ethernet/marvell/octeontx2/af/rvu.h    |   32 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c    |   79 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_nix.c    |  287 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_npa.c    |   13 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_npc.c    |    4 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_struct.h |    3 +
+ .../net/ethernet/marvell/octeontx2/nic/Makefile    |    2 +
+ .../ethernet/marvell/octeontx2/nic/otx2_common.c   |  163 +-
+ .../ethernet/marvell/octeontx2/nic/otx2_common.h   |   49 +-
+ .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c  |  182 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c   |  861 +++++-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_reg.h  |   13 +
+ .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c |   42 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c   |  648 +++++
+ drivers/net/ethernet/marvell/skge.c                |    1 +
+ drivers/net/ethernet/marvell/skge.h                |    8 +-
+ drivers/net/ethernet/marvell/sky2.c                |    4 +
+ drivers/net/ethernet/marvell/sky2.h                |    8 +-
+ drivers/net/ethernet/mediatek/mtk_eth_soc.c        |    7 +-
+ drivers/net/ethernet/mellanox/mlx4/crdump.c        |   39 +-
+ drivers/net/ethernet/mellanox/mlx4/en_ethtool.c    |    4 +
+ drivers/net/ethernet/mellanox/mlx5/core/Kconfig    |   10 +
+ drivers/net/ethernet/mellanox/mlx5/core/Makefile   |    9 +-
+ drivers/net/ethernet/mellanox/mlx5/core/dev.c      |    4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/devlink.c  |   43 +-
+ drivers/net/ethernet/mellanox/mlx5/core/devlink.h  |    6 +
+ .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c   |    2 +-
+ .../ethernet/mellanox/mlx5/core/diag/rsc_dump.c    |  286 ++
+ .../ethernet/mellanox/mlx5/core/diag/rsc_dump.h    |   58 +
+ drivers/net/ethernet/mellanox/mlx5/core/en.h       |   38 +-
+ .../net/ethernet/mellanox/mlx5/core/en/devlink.c   |   39 +
+ .../net/ethernet/mellanox/mlx5/core/en/devlink.h   |   15 +
+ .../net/ethernet/mellanox/mlx5/core/en/health.c    |  107 +-
+ .../net/ethernet/mellanox/mlx5/core/en/health.h    |    8 +-
+ .../net/ethernet/mellanox/mlx5/core/en/mapping.c   |  218 ++
+ .../net/ethernet/mellanox/mlx5/core/en/mapping.h   |   27 +
+ drivers/net/ethernet/mellanox/mlx5/core/en/port.c  |  253 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/port.h  |    8 +-
+ .../ethernet/mellanox/mlx5/core/en/reporter_rx.c   |  268 +-
+ .../ethernet/mellanox/mlx5/core/en/reporter_tx.c   |  183 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 1369 ++++++++++
+ drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h |  180 ++
+ .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c    |  115 +-
+ .../net/ethernet/mellanox/mlx5/core/en/tc_tun.h    |    3 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c   |    1 -
+ drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c  |   15 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c |   55 +-
+ .../net/ethernet/mellanox/mlx5/core/en_ethtool.c   |  134 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c  |  210 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.c   |  269 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.h   |   12 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_rx.c    |   72 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c    | 1143 ++++++--
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.h    |   54 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_tx.c    |   13 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c  |   11 +-
+ .../net/ethernet/mellanox/mlx5/core/esw/Makefile   |    2 +
+ .../{eswitch_offloads_chains.c => esw/chains.c}    |  220 +-
+ .../{eswitch_offloads_chains.h => esw/chains.h}    |   21 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.c  |  374 ++-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.h  |   69 +-
+ .../ethernet/mellanox/mlx5/core/eswitch_offloads.c |  985 +++++--
+ .../mellanox/mlx5/core/eswitch_offloads_termtbl.c  |  106 +-
+ .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.c   |    2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.c  |   82 +-
+ .../net/ethernet/mellanox/mlx5/core/fs_counters.c  |    2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fw.c       |   40 +
+ drivers/net/ethernet/mellanox/mlx5/core/health.c   |    4 +-
+ .../ethernet/mellanox/mlx5/core/ipoib/ethtool.c    |    3 +
+ .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c  |    2 +-
+ .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h  |    4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c   |   14 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lag_mp.h   |    1 +
+ .../net/ethernet/mellanox/mlx5/core/lib/crypto.c   |    2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c   |    2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/main.c     |   37 +-
+ .../net/ethernet/mellanox/mlx5/core/mlx5_core.h    |    4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/mr.c       |   35 +-
+ drivers/net/ethernet/mellanox/mlx5/core/rl.c       |  130 +-
+ drivers/net/ethernet/mellanox/mlx5/core/sriov.c    |    3 +-
+ .../mellanox/mlx5/core/steering/dr_action.c        |   28 +-
+ .../mellanox/mlx5/core/steering/dr_domain.c        |   17 +-
+ .../mellanox/mlx5/core/steering/dr_icm_pool.c      |    2 +-
+ .../mellanox/mlx5/core/steering/dr_matcher.c       |   12 +-
+ .../ethernet/mellanox/mlx5/core/steering/dr_rule.c |   18 +-
+ .../ethernet/mellanox/mlx5/core/steering/dr_send.c |   16 +-
+ .../ethernet/mellanox/mlx5/core/steering/dr_ste.c  |    2 +-
+ .../mellanox/mlx5/core/steering/dr_table.c         |    8 +-
+ .../mellanox/mlx5/core/steering/dr_types.h         |    2 +-
+ .../ethernet/mellanox/mlx5/core/steering/fs_dr.c   |   14 +-
+ .../ethernet/mellanox/mlx5/core/steering/mlx5dr.h  |  106 +-
+ drivers/net/ethernet/mellanox/mlxfw/Kconfig        |    1 +
+ drivers/net/ethernet/mellanox/mlxfw/mlxfw.h        |   50 +-
+ drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c    |  296 +-
+ drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c   |    2 +-
+ .../net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv.h   |    2 +-
+ drivers/net/ethernet/mellanox/mlxsw/core.c         |  205 +-
+ drivers/net/ethernet/mellanox/mlxsw/core.h         |  115 +-
+ .../mellanox/mlxsw/core_acl_flex_actions.c         |  563 +++-
+ .../mellanox/mlxsw/core_acl_flex_actions.h         |   17 +-
+ .../ethernet/mellanox/mlxsw/core_acl_flex_keys.c   |   52 +-
+ .../ethernet/mellanox/mlxsw/core_acl_flex_keys.h   |   36 +-
+ drivers/net/ethernet/mellanox/mlxsw/i2c.c          |    1 +
+ drivers/net/ethernet/mellanox/mlxsw/pci.c          |    9 +
+ drivers/net/ethernet/mellanox/mlxsw/pci_hw.h       |    7 +-
+ drivers/net/ethernet/mellanox/mlxsw/reg.h          |   45 +-
+ drivers/net/ethernet/mellanox/mlxsw/resources.h    |    2 +
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c     |  221 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.h     |   96 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c   |    2 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum2_kvdl.c   |    2 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c |  192 +-
+ .../mellanox/mlxsw/spectrum_acl_bloom_filter.c     |    2 +-
+ .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c    |    4 +-
+ .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.h    |    4 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.c |  268 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.h |    2 +
+ .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c   |   35 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c |  165 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_flower.c  |   63 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_kvdl.c    |   18 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.c  |   54 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c |   28 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c |    4 +
+ .../net/ethernet/mellanox/mlxsw/spectrum_qdisc.c   |  267 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c  |  543 ++--
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.h  |   43 +
+ .../net/ethernet/mellanox/mlxsw/spectrum_span.c    |  102 +-
+ .../ethernet/mellanox/mlxsw/spectrum_switchdev.c   |  263 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_trap.c    |  596 ++++-
+ .../net/ethernet/mellanox/mlxsw/spectrum_trap.h    |   24 +
+ drivers/net/ethernet/mellanox/mlxsw/switchx2.c     |    2 +-
+ drivers/net/ethernet/mellanox/mlxsw/trap.h         |    2 +
+ drivers/net/ethernet/micrel/ksz884x.c              |    2 +-
+ drivers/net/ethernet/mscc/ocelot.c                 |  123 +-
+ drivers/net/ethernet/mscc/ocelot.h                 |   10 -
+ drivers/net/ethernet/mscc/ocelot_ace.c             |  619 +++--
+ drivers/net/ethernet/mscc/ocelot_ace.h             |   30 +-
+ drivers/net/ethernet/mscc/ocelot_board.c           |  163 +-
+ drivers/net/ethernet/mscc/ocelot_flower.c          |  272 +-
+ drivers/net/ethernet/mscc/ocelot_police.c          |   27 +
+ drivers/net/ethernet/mscc/ocelot_police.h          |   11 +-
+ drivers/net/ethernet/mscc/ocelot_tc.c              |   24 +-
+ drivers/net/ethernet/mscc/ocelot_vcap.h            |  403 ---
+ drivers/net/ethernet/myricom/myri10ge/myri10ge.c   |    1 +
+ drivers/net/ethernet/natsemi/jazzsonic.c           |   31 +-
+ drivers/net/ethernet/natsemi/macsonic.c            |   48 +-
+ drivers/net/ethernet/natsemi/sonic.c               |   66 +-
+ drivers/net/ethernet/natsemi/sonic.h               |    2 +-
+ drivers/net/ethernet/natsemi/xtsonic.c             |   40 +-
+ drivers/net/ethernet/netronome/nfp/bpf/fw.h        |    6 +-
+ drivers/net/ethernet/netronome/nfp/flower/action.c |    4 +
+ drivers/net/ethernet/netronome/nfp/flower/cmsg.h   |    4 +-
+ .../net/ethernet/netronome/nfp/flower/offload.c    |    3 +-
+ .../net/ethernet/netronome/nfp/flower/qos_conf.c   |    3 +-
+ drivers/net/ethernet/netronome/nfp/nfp_devlink.c   |    2 +-
+ drivers/net/ethernet/netronome/nfp/nfp_main.h      |    2 +-
+ .../net/ethernet/netronome/nfp/nfp_net_debugdump.c |    8 +-
+ .../net/ethernet/netronome/nfp/nfp_net_ethtool.c   |   22 +-
+ drivers/net/ethernet/netronome/nfp/nfp_net_repr.h  |    2 +-
+ .../ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c  |   24 +-
+ .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h   |    2 +-
+ drivers/net/ethernet/ni/nixge.c                    |   22 +-
+ drivers/net/ethernet/pensando/ionic/ionic.h        |    3 +-
+ .../net/ethernet/pensando/ionic/ionic_bus_pci.c    |   27 +-
+ .../net/ethernet/pensando/ionic/ionic_debugfs.c    |    8 +-
+ drivers/net/ethernet/pensando/ionic/ionic_dev.c    |   46 +-
+ drivers/net/ethernet/pensando/ionic/ionic_dev.h    |    1 +
+ .../net/ethernet/pensando/ionic/ionic_devlink.c    |    7 +-
+ .../net/ethernet/pensando/ionic/ionic_ethtool.c    |   61 +-
+ drivers/net/ethernet/pensando/ionic/ionic_if.h     |   38 +-
+ drivers/net/ethernet/pensando/ionic/ionic_lif.c    |  455 ++--
+ drivers/net/ethernet/pensando/ionic/ionic_lif.h    |   20 +-
+ drivers/net/ethernet/pensando/ionic/ionic_main.c   |   29 +-
+ drivers/net/ethernet/pensando/ionic/ionic_stats.c  |   20 +-
+ drivers/net/ethernet/pensando/ionic/ionic_txrx.c   |   25 +-
+ drivers/net/ethernet/pensando/ionic/ionic_txrx.h   |    1 +
+ drivers/net/ethernet/qlogic/netxen/netxen_nic.h    |    2 +-
+ .../ethernet/qlogic/netxen/netxen_nic_ethtool.c    |   21 +-
+ drivers/net/ethernet/qlogic/qed/qed_dev.c          |   38 +-
+ drivers/net/ethernet/qlogic/qed/qed_main.c         |   13 +-
+ drivers/net/ethernet/qlogic/qede/qede_ethtool.c    |   15 +-
+ drivers/net/ethernet/qlogic/qede/qede_filter.c     |   10 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic.h        |    8 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c    |   23 +-
+ drivers/net/ethernet/qualcomm/emac/emac-mac.c      |    7 +-
+ drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c |   36 +-
+ drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c    |   13 +-
+ drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h    |    3 +-
+ drivers/net/ethernet/realtek/r8169_main.c          |  444 ++-
+ drivers/net/ethernet/realtek/r8169_phy_config.c    |   18 +-
+ drivers/net/ethernet/renesas/sh_eth.c              |  104 +-
+ drivers/net/ethernet/renesas/sh_eth.h              |    2 +-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c |    1 +
+ drivers/net/ethernet/sfc/ef10_sriov.c              |   66 +-
+ drivers/net/ethernet/sfc/efx.c                     |    1 -
+ drivers/net/ethernet/sfc/efx.h                     |   18 -
+ drivers/net/ethernet/sfc/efx_channels.c            |   25 +-
+ drivers/net/ethernet/sfc/efx_common.c              |    9 +-
+ drivers/net/ethernet/sfc/ethtool.c                 |   42 +-
+ drivers/net/ethernet/sfc/falcon/ethtool.c          |    6 +-
+ drivers/net/ethernet/sfc/falcon/falcon_boards.c    |    6 +-
+ drivers/net/ethernet/sfc/falcon/net_driver.h       |    2 +-
+ drivers/net/ethernet/sfc/net_driver.h              |    8 +-
+ drivers/net/ethernet/sfc/rx.c                      |    2 +-
+ drivers/net/ethernet/sfc/rx_common.c               |    6 +-
+ drivers/net/ethernet/sfc/tx.c                      |    3 +-
+ drivers/net/ethernet/sgi/ioc3-eth.c                |   29 +-
+ drivers/net/ethernet/socionext/netsec.c            |   31 +-
+ drivers/net/ethernet/stmicro/stmmac/Kconfig        |   10 +
+ drivers/net/ethernet/stmicro/stmmac/Makefile       |    1 +
+ drivers/net/ethernet/stmicro/stmmac/common.h       |   18 +
+ drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c  |  592 ++++
+ drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c  |    4 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac4.h       |   25 +
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c  |  195 ++
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c   |   15 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c    |    7 +-
+ .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c    |   99 +
+ drivers/net/ethernet/stmicro/stmmac/dwxlgmac2.h    |   22 +
+ drivers/net/ethernet/stmicro/stmmac/hwif.c         |   45 +-
+ drivers/net/ethernet/stmicro/stmmac/hwif.h         |   27 +
+ .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c   |   16 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c  |   15 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |  165 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c  |   27 +
+ drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c   |  332 +--
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |    7 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_selftests.c |    4 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c    |    9 +-
+ drivers/net/ethernet/sun/cassini.c                 |   28 +-
+ drivers/net/ethernet/sun/sungem.c                  |   30 +-
+ drivers/net/ethernet/synopsys/dwc-xlgmac-ethtool.c |   17 +-
+ drivers/net/ethernet/tehuti/tehuti.c               |    2 +
+ drivers/net/ethernet/tehuti/tehuti.h               |    2 +-
+ drivers/net/ethernet/ti/Kconfig                    |   20 +-
+ drivers/net/ethernet/ti/Makefile                   |    3 +
+ drivers/net/ethernet/ti/am65-cpsw-ethtool.c        |  747 ++++++
+ drivers/net/ethernet/ti/am65-cpsw-nuss.c           | 1965 ++++++++++++++
+ drivers/net/ethernet/ti/am65-cpsw-nuss.h           |  142 +
+ drivers/net/ethernet/ti/cpsw.c                     |    1 +
+ drivers/net/ethernet/ti/cpsw_ale.c                 |   38 +
+ drivers/net/ethernet/ti/cpsw_ale.h                 |    4 +
+ drivers/net/ethernet/ti/cpsw_new.c                 |    1 +
+ drivers/net/ethernet/ti/davinci_emac.c             |    1 +
+ drivers/net/ethernet/ti/k3-cppi-desc-pool.c        |  126 +
+ drivers/net/ethernet/ti/k3-cppi-desc-pool.h        |   30 +
+ drivers/net/ethernet/toshiba/ps3_gelic_net.h       |    2 +-
+ drivers/net/ethernet/toshiba/ps3_gelic_wireless.h  |    2 +-
+ drivers/net/ethernet/toshiba/spider_net.h          |    2 +-
+ drivers/net/ethernet/toshiba/tc35815.c             |    2 +-
+ drivers/net/ethernet/via/via-velocity.c            |    2 +
+ drivers/net/ethernet/xilinx/Kconfig                |    1 -
+ drivers/net/ethernet/xilinx/ll_temac.h             |    8 +-
+ drivers/net/ethernet/xilinx/ll_temac_main.c        |  181 +-
+ drivers/net/ethernet/xilinx/xilinx_axienet.h       |   19 +-
+ drivers/net/ethernet/xilinx/xilinx_axienet_main.c  |  444 ++-
+ drivers/net/fddi/skfp/drvfbi.c                     |    4 +-
+ drivers/net/fddi/skfp/h/skfbi.h                    |    5 -
+ drivers/net/hyperv/netvsc.c                        |    9 +-
+ drivers/net/hyperv/netvsc_drv.c                    |   46 +-
+ drivers/net/ieee802154/ca8210.c                    |    3 +-
+ drivers/net/ipa/Kconfig                            |   19 +
+ drivers/net/ipa/Makefile                           |   12 +
+ drivers/net/ipa/gsi.c                              | 2055 ++++++++++++++
+ drivers/net/ipa/gsi.h                              |  257 ++
+ drivers/net/ipa/gsi_private.h                      |  118 +
+ drivers/net/ipa/gsi_reg.h                          |  417 +++
+ drivers/net/ipa/gsi_trans.c                        |  786 ++++++
+ drivers/net/ipa/gsi_trans.h                        |  226 ++
+ drivers/net/ipa/ipa.h                              |  148 +
+ drivers/net/ipa/ipa_clock.c                        |  313 +++
+ drivers/net/ipa/ipa_clock.h                        |   53 +
+ drivers/net/ipa/ipa_cmd.c                          |  680 +++++
+ drivers/net/ipa/ipa_cmd.h                          |  195 ++
+ drivers/net/ipa/ipa_data-sc7180.c                  |  307 +++
+ drivers/net/ipa/ipa_data-sdm845.c                  |  329 +++
+ drivers/net/ipa/ipa_data.h                         |  280 ++
+ drivers/net/ipa/ipa_endpoint.c                     | 1706 ++++++++++++
+ drivers/net/ipa/ipa_endpoint.h                     |  110 +
+ drivers/net/ipa/ipa_gsi.c                          |   54 +
+ drivers/net/ipa/ipa_gsi.h                          |   60 +
+ drivers/net/ipa/ipa_interrupt.c                    |  253 ++
+ drivers/net/ipa/ipa_interrupt.h                    |  117 +
+ drivers/net/ipa/ipa_main.c                         |  953 +++++++
+ drivers/net/ipa/ipa_mem.c                          |  314 +++
+ drivers/net/ipa/ipa_mem.h                          |   90 +
+ drivers/net/ipa/ipa_modem.c                        |  383 +++
+ drivers/net/ipa/ipa_modem.h                        |   31 +
+ drivers/net/ipa/ipa_qmi.c                          |  538 ++++
+ drivers/net/ipa/ipa_qmi.h                          |   41 +
+ drivers/net/ipa/ipa_qmi_msg.c                      |  663 +++++
+ drivers/net/ipa/ipa_qmi_msg.h                      |  252 ++
+ drivers/net/ipa/ipa_reg.c                          |   38 +
+ drivers/net/ipa/ipa_reg.h                          |  476 ++++
+ drivers/net/ipa/ipa_smp2p.c                        |  335 +++
+ drivers/net/ipa/ipa_smp2p.h                        |   48 +
+ drivers/net/ipa/ipa_table.c                        |  700 +++++
+ drivers/net/ipa/ipa_table.h                        |  103 +
+ drivers/net/ipa/ipa_uc.c                           |  211 ++
+ drivers/net/ipa/ipa_uc.h                           |   32 +
+ drivers/net/ipa/ipa_version.h                      |   23 +
+ drivers/net/macsec.c                               |  754 ++++--
+ drivers/net/netdevsim/dev.c                        |  288 +-
+ drivers/net/netdevsim/health.c                     |    4 +-
+ drivers/net/netdevsim/netdevsim.h                  |    5 +
+ drivers/net/phy/Kconfig                            |   25 +-
+ drivers/net/phy/Makefile                           |    8 +-
+ drivers/net/phy/aquantia_main.c                    |   38 +-
+ drivers/net/phy/bcm-phy-lib.c                      |   22 +
+ drivers/net/phy/bcm-phy-lib.h                      |    1 +
+ drivers/net/phy/bcm7xxx.c                          |    4 +
+ drivers/net/phy/bcm84881.c                         |   27 +-
+ drivers/net/phy/broadcom.c                         |   24 +-
+ drivers/net/phy/dp83640.c                          |    2 +-
+ drivers/net/phy/dp83867.c                          |  150 ++
+ drivers/net/phy/linkmode.c                         |   95 +
+ drivers/net/phy/marvell.c                          |   24 -
+ drivers/net/phy/marvell10g.c                       |  313 ++-
+ drivers/net/phy/mdio-ipq8064.c                     |  166 ++
+ drivers/net/phy/mdio-mux-bcm-iproc.c               |   14 +-
+ drivers/net/phy/mdio-mvusb.c                       |  120 +
+ drivers/net/phy/mdio-xpcs.c                        |  716 +++++
+ drivers/net/phy/mdio_bus.c                         |   85 +-
+ drivers/net/phy/micrel.c                           |   50 +
+ drivers/net/phy/mscc/Makefile                      |   10 +
+ drivers/net/phy/mscc/mscc.h                        |  400 +++
+ drivers/net/phy/{ => mscc}/mscc_fc_buffer.h        |    8 +-
+ drivers/net/phy/{ => mscc}/mscc_mac.h              |    8 +-
+ drivers/net/phy/mscc/mscc_macsec.c                 | 1051 ++++++++
+ drivers/net/phy/{ => mscc}/mscc_macsec.h           |   66 +-
+ drivers/net/phy/{mscc.c => mscc/mscc_main.c}       | 1589 +----------
+ drivers/net/phy/nxp-tja11xx.c                      |   16 +-
+ drivers/net/phy/phy-c45.c                          |    5 +-
+ drivers/net/phy/phy-core.c                         |   71 +-
+ drivers/net/phy/phy.c                              |   30 +-
+ drivers/net/phy/phy_device.c                       |   97 +-
+ drivers/net/phy/phylink.c                          |  522 +++-
+ drivers/net/phy/realtek.c                          |   60 +-
+ drivers/net/phy/smsc.c                             |   16 +-
+ drivers/net/slip/slip.c                            |    7 +-
+ drivers/net/tun.c                                  |  108 +-
+ drivers/net/usb/cdc-phonet.c                       |    2 +-
+ drivers/net/usb/cdc_ncm.c                          |  411 ++-
+ drivers/net/usb/huawei_cdc_ncm.c                   |    8 +-
+ drivers/net/usb/r8152.c                            |   33 +-
+ drivers/net/veth.c                                 |  257 +-
+ drivers/net/virtio_net.c                           |  109 +-
+ drivers/net/vmxnet3/vmxnet3_drv.c                  |    5 +-
+ drivers/net/vmxnet3/vmxnet3_ethtool.c              |   24 +-
+ drivers/net/vrf.c                                  |    4 +-
+ drivers/net/wan/Kconfig                            |    2 +-
+ drivers/net/wan/Makefile                           |   35 +-
+ drivers/net/wan/farsync.h                          |    2 +-
+ drivers/net/wan/wanxl.c                            |    2 +-
+ drivers/net/wireless/admtek/adm8211.h              |    2 +-
+ drivers/net/wireless/ath/ath10k/ahb.c              |    4 +-
+ drivers/net/wireless/ath/ath10k/core.c             |   82 +-
+ drivers/net/wireless/ath/ath10k/core.h             |    5 +
+ drivers/net/wireless/ath/ath10k/debug.c            |   12 +-
+ drivers/net/wireless/ath/ath10k/htt_rx.c           |    3 +-
+ drivers/net/wireless/ath/ath10k/htt_tx.c           |   12 +-
+ drivers/net/wireless/ath/ath10k/hw.c               |    1 +
+ drivers/net/wireless/ath/ath10k/hw.h               |    3 +
+ drivers/net/wireless/ath/ath10k/mac.c              |   31 +-
+ drivers/net/wireless/ath/ath10k/sdio.c             |   25 +-
+ drivers/net/wireless/ath/ath10k/wmi.c              |   19 +-
+ drivers/net/wireless/ath/ath10k/wmi.h              |    7 +
+ drivers/net/wireless/ath/ath11k/Kconfig            |    1 +
+ drivers/net/wireless/ath/ath11k/Makefile           |    1 +
+ drivers/net/wireless/ath/ath11k/ahb.c              |   11 +-
+ drivers/net/wireless/ath/ath11k/ce.h               |    1 +
+ drivers/net/wireless/ath/ath11k/core.c             |   14 +-
+ drivers/net/wireless/ath/ath11k/core.h             |   14 +-
+ drivers/net/wireless/ath/ath11k/debug.h            |   15 +-
+ drivers/net/wireless/ath/ath11k/debug_htt_stats.c  |   56 +-
+ drivers/net/wireless/ath/ath11k/debug_htt_stats.h  |   28 +
+ drivers/net/wireless/ath/ath11k/debugfs_sta.c      |   14 +-
+ drivers/net/wireless/ath/ath11k/dp.c               |   76 +-
+ drivers/net/wireless/ath/ath11k/dp.h               |   35 +-
+ drivers/net/wireless/ath/ath11k/dp_rx.c            | 1496 ++++++++---
+ drivers/net/wireless/ath/ath11k/dp_rx.h            |   14 +-
+ drivers/net/wireless/ath/ath11k/dp_tx.c            |    3 +-
+ drivers/net/wireless/ath/ath11k/hal.c              |   66 +-
+ drivers/net/wireless/ath/ath11k/hal.h              |   23 +-
+ drivers/net/wireless/ath/ath11k/hal_rx.c           |   42 +-
+ drivers/net/wireless/ath/ath11k/hal_rx.h           |   30 +
+ drivers/net/wireless/ath/ath11k/hw.h               |    1 +
+ drivers/net/wireless/ath/ath11k/mac.c              |  123 +-
+ drivers/net/wireless/ath/ath11k/mac.h              |    2 +
+ drivers/net/wireless/ath/ath11k/peer.c             |    3 +
+ drivers/net/wireless/ath/ath11k/peer.h             |    9 +
+ drivers/net/wireless/ath/ath11k/qmi.c              |    1 +
+ drivers/net/wireless/ath/ath11k/rx_desc.h          |   10 +-
+ drivers/net/wireless/ath/ath11k/thermal.c          |  224 ++
+ drivers/net/wireless/ath/ath11k/thermal.h          |   53 +
+ drivers/net/wireless/ath/ath11k/wmi.c              |  260 ++
+ drivers/net/wireless/ath/ath11k/wmi.h              |   96 +
+ drivers/net/wireless/ath/ath5k/Kconfig             |    2 +-
+ drivers/net/wireless/ath/ath5k/debug.c             |  174 +-
+ drivers/net/wireless/ath/ath9k/main.c              |    6 +
+ drivers/net/wireless/ath/ath9k/xmit.c              |    7 +-
+ drivers/net/wireless/ath/carl9170/debug.c          |    2 +-
+ drivers/net/wireless/ath/wil6210/ethtool.c         |    1 +
+ drivers/net/wireless/atmel/at76c50x-usb.h          |    2 +-
+ drivers/net/wireless/broadcom/b43/debugfs.c        |    2 +-
+ drivers/net/wireless/broadcom/b43legacy/debugfs.c  |    2 +-
+ drivers/net/wireless/broadcom/b43legacy/sysfs.c    |    6 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c         |    2 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/chip.c    |    1 +
+ .../broadcom/brcm80211/brcmfmac/firmware.h         |    2 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/fweh.c    |    2 +-
+ .../broadcom/brcm80211/brcmfmac/fwsignal.c         |    5 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/pcie.c    |    3 +
+ .../wireless/broadcom/brcm80211/brcmfmac/sdio.c    |    2 +
+ .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c |  127 +-
+ .../broadcom/brcm80211/include/brcm_hw_ids.h       |    2 +
+ drivers/net/wireless/intel/ipw2x00/ipw2100.c       |   16 +-
+ drivers/net/wireless/intel/ipw2x00/ipw2200.c       |   48 +-
+ drivers/net/wireless/intel/ipw2x00/libipw_rx.c     |    4 +-
+ drivers/net/wireless/intel/ipw2x00/libipw_wx.c     |    8 +-
+ drivers/net/wireless/intel/iwlegacy/3945-mac.c     |    4 +-
+ drivers/net/wireless/intel/iwlegacy/4965.c         |    3 +-
+ drivers/net/wireless/intel/iwlwifi/cfg/22000.c     |  347 +--
+ drivers/net/wireless/intel/iwlwifi/cfg/9000.c      |  189 +-
+ .../net/wireless/intel/iwlwifi/fw/api/commands.h   |    9 +-
+ .../net/wireless/intel/iwlwifi/fw/api/location.h   |    6 +
+ drivers/net/wireless/intel/iwlwifi/fw/api/scan.h   |   83 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/soc.h    |   87 +
+ drivers/net/wireless/intel/iwlwifi/fw/dbg.c        |   47 +-
+ drivers/net/wireless/intel/iwlwifi/fw/file.h       |   11 +-
+ drivers/net/wireless/intel/iwlwifi/fw/runtime.h    |    2 -
+ drivers/net/wireless/intel/iwlwifi/iwl-config.h    |  121 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c   |    6 +
+ drivers/net/wireless/intel/iwlwifi/iwl-drv.c       |    3 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c |    8 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.h     |    3 +
+ drivers/net/wireless/intel/iwlwifi/mvm/d3.c        |    5 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c   |    4 +
+ .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c |    9 +
+ drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h    |    1 +
+ drivers/net/wireless/intel/iwlwifi/mvm/fw.c        |   46 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c  |   12 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h       |    7 +
+ drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c     |    3 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rs.c        |    6 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/scan.c      |  169 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sf.c        |    8 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/drv.c      |  947 +++----
+ drivers/net/wireless/intel/iwlwifi/pcie/internal.h |    1 -
+ drivers/net/wireless/intel/iwlwifi/pcie/rx.c       |    2 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/trans.c    |   10 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/tx.c       |    2 +-
+ .../net/wireless/intersil/hostap/hostap_common.h   |    2 +-
+ .../net/wireless/intersil/hostap/hostap_download.c |   10 +-
+ drivers/net/wireless/intersil/hostap/hostap_wlan.h |    2 +-
+ drivers/net/wireless/intersil/orinoco/fw.c         |    2 +-
+ drivers/net/wireless/intersil/orinoco/hermes.h     |    2 +-
+ drivers/net/wireless/intersil/orinoco/hermes_dld.c |    6 +-
+ .../net/wireless/intersil/orinoco/orinoco_usb.c    |    2 +-
+ drivers/net/wireless/intersil/p54/eeprom.h         |    8 +-
+ drivers/net/wireless/intersil/p54/lmac.h           |    6 +-
+ drivers/net/wireless/intersil/p54/p54.h            |    2 +-
+ drivers/net/wireless/intersil/prism54/oid_mgt.c    |   34 +-
+ drivers/net/wireless/mac80211_hwsim.c              |  339 ++-
+ drivers/net/wireless/mac80211_hwsim.h              |   21 +
+ drivers/net/wireless/marvell/libertas/host.h       |    4 +-
+ drivers/net/wireless/marvell/libertas/if_sdio.c    |    2 +-
+ drivers/net/wireless/marvell/libertas/if_spi.c     |    5 +-
+ drivers/net/wireless/marvell/libertas/if_usb.h     |    2 +-
+ drivers/net/wireless/marvell/libertas_tf/if_usb.h  |    2 +-
+ drivers/net/wireless/marvell/mwifiex/11ac.c        |    8 +-
+ drivers/net/wireless/marvell/mwifiex/11ac.h        |    8 +-
+ drivers/net/wireless/marvell/mwifiex/11h.c         |    8 +-
+ drivers/net/wireless/marvell/mwifiex/11n.c         |    8 +-
+ drivers/net/wireless/marvell/mwifiex/11n.h         |    8 +-
+ drivers/net/wireless/marvell/mwifiex/11n_aggr.c    |    8 +-
+ drivers/net/wireless/marvell/mwifiex/11n_aggr.h    |    8 +-
+ .../net/wireless/marvell/mwifiex/11n_rxreorder.c   |    8 +-
+ .../net/wireless/marvell/mwifiex/11n_rxreorder.h   |    8 +-
+ drivers/net/wireless/marvell/mwifiex/cfg80211.c    |   10 +-
+ drivers/net/wireless/marvell/mwifiex/cfg80211.h    |    8 +-
+ drivers/net/wireless/marvell/mwifiex/cfp.c         |    8 +-
+ drivers/net/wireless/marvell/mwifiex/cmdevt.c      |    8 +-
+ drivers/net/wireless/marvell/mwifiex/debugfs.c     |    8 +-
+ drivers/net/wireless/marvell/mwifiex/decl.h        |    8 +-
+ drivers/net/wireless/marvell/mwifiex/ethtool.c     |    8 +-
+ drivers/net/wireless/marvell/mwifiex/fw.h          |   48 +-
+ drivers/net/wireless/marvell/mwifiex/ie.c          |    8 +-
+ drivers/net/wireless/marvell/mwifiex/init.c        |    8 +-
+ drivers/net/wireless/marvell/mwifiex/ioctl.h       |    8 +-
+ drivers/net/wireless/marvell/mwifiex/join.c        |    8 +-
+ drivers/net/wireless/marvell/mwifiex/main.c        |    8 +-
+ drivers/net/wireless/marvell/mwifiex/main.h        |    8 +-
+ drivers/net/wireless/marvell/mwifiex/pcie.c        |    8 +-
+ drivers/net/wireless/marvell/mwifiex/pcie.h        |    6 +-
+ drivers/net/wireless/marvell/mwifiex/scan.c        |    8 +-
+ drivers/net/wireless/marvell/mwifiex/sdio.c        |    8 +-
+ drivers/net/wireless/marvell/mwifiex/sdio.h        |    8 +-
+ drivers/net/wireless/marvell/mwifiex/sta_cmd.c     |    8 +-
+ drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c |    8 +-
+ drivers/net/wireless/marvell/mwifiex/sta_event.c   |    8 +-
+ drivers/net/wireless/marvell/mwifiex/sta_ioctl.c   |    8 +-
+ drivers/net/wireless/marvell/mwifiex/sta_rx.c      |    8 +-
+ drivers/net/wireless/marvell/mwifiex/sta_tx.c      |    8 +-
+ drivers/net/wireless/marvell/mwifiex/tdls.c        |    9 +-
+ drivers/net/wireless/marvell/mwifiex/txrx.c        |    8 +-
+ drivers/net/wireless/marvell/mwifiex/uap_cmd.c     |    8 +-
+ drivers/net/wireless/marvell/mwifiex/uap_event.c   |    8 +-
+ drivers/net/wireless/marvell/mwifiex/uap_txrx.c    |    8 +-
+ drivers/net/wireless/marvell/mwifiex/usb.c         |    8 +-
+ drivers/net/wireless/marvell/mwifiex/usb.h         |    6 +-
+ drivers/net/wireless/marvell/mwifiex/util.c        |    8 +-
+ drivers/net/wireless/marvell/mwifiex/util.h        |    8 +-
+ drivers/net/wireless/marvell/mwifiex/wmm.c         |    8 +-
+ drivers/net/wireless/marvell/mwifiex/wmm.h         |    8 +-
+ drivers/net/wireless/marvell/mwl8k.c               |    6 +-
+ drivers/net/wireless/mediatek/mt76/Makefile        |    2 +-
+ drivers/net/wireless/mediatek/mt76/agg-rx.c        |   17 +-
+ drivers/net/wireless/mediatek/mt76/airtime.c       |  326 ---
+ drivers/net/wireless/mediatek/mt76/dma.c           |   49 +-
+ drivers/net/wireless/mediatek/mt76/eeprom.c        |   20 +-
+ drivers/net/wireless/mediatek/mt76/mac80211.c      |  392 ++-
+ drivers/net/wireless/mediatek/mt76/mcu.c           |   18 +-
+ drivers/net/wireless/mediatek/mt76/mmio.c          |    3 -
+ drivers/net/wireless/mediatek/mt76/mt76.h          |  168 +-
+ drivers/net/wireless/mediatek/mt76/mt7603/core.c   |    5 +-
+ .../net/wireless/mediatek/mt76/mt7603/debugfs.c    |    4 +
+ drivers/net/wireless/mediatek/mt76/mt7603/dma.c    |   21 +-
+ drivers/net/wireless/mediatek/mt76/mt7603/init.c   |   24 +-
+ drivers/net/wireless/mediatek/mt76/mt7603/mac.c    |   45 +-
+ drivers/net/wireless/mediatek/mt76/mt7603/main.c   |   25 +-
+ drivers/net/wireless/mediatek/mt76/mt7603/mcu.c    |   23 +-
+ drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h |    9 +-
+ drivers/net/wireless/mediatek/mt76/mt7603/regs.h   |   15 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/Kconfig  |   11 +
+ drivers/net/wireless/mediatek/mt76/mt7615/Makefile |    7 +-
+ .../net/wireless/mediatek/mt76/mt7615/debugfs.c    |  120 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/dma.c    |  220 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c |   92 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h |    5 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/init.c   |  407 ++-
+ drivers/net/wireless/mediatek/mt76/mt7615/mac.c    | 1015 +++++--
+ drivers/net/wireless/mediatek/mt76/mt7615/mac.h    |   88 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/main.c   |  404 ++-
+ drivers/net/wireless/mediatek/mt76/mt7615/mcu.c    | 2818 +++++++++++++-------
+ drivers/net/wireless/mediatek/mt76/mt7615/mcu.h    |  262 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/mmio.c   |  174 ++
+ drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h |  253 +-
+ .../wireless/mediatek/mt76/mt7615/mt7615_trace.h   |   56 +
+ drivers/net/wireless/mediatek/mt76/mt7615/pci.c    |  104 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/regs.h   |  248 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/soc.c    |   77 +
+ drivers/net/wireless/mediatek/mt76/mt7615/trace.c  |   12 +
+ drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c |    4 +-
+ drivers/net/wireless/mediatek/mt76/mt76x0/init.c   |    6 +-
+ drivers/net/wireless/mediatek/mt76/mt76x0/main.c   |    8 +-
+ drivers/net/wireless/mediatek/mt76/mt76x0/pci.c    |    9 +-
+ .../net/wireless/mediatek/mt76/mt76x0/pci_mcu.c    |    2 +-
+ drivers/net/wireless/mediatek/mt76/mt76x0/phy.c    |   35 +-
+ drivers/net/wireless/mediatek/mt76/mt76x0/usb.c    |   31 +-
+ .../net/wireless/mediatek/mt76/mt76x0/usb_mcu.c    |    2 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02.h       |   13 +-
+ .../net/wireless/mediatek/mt76/mt76x02_beacon.c    |   91 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c   |   14 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_mac.c   |   43 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_mac.h   |    5 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c   |   10 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c  |   32 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_phy.c   |    4 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_phy.h   |    4 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_regs.h  |   12 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_trace.h |   46 -
+ drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c  |    7 +-
+ .../net/wireless/mediatek/mt76/mt76x02_usb_core.c  |   61 +-
+ .../net/wireless/mediatek/mt76/mt76x02_usb_mcu.c   |   34 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_util.c  |   28 +-
+ drivers/net/wireless/mediatek/mt76/mt76x2/Makefile |    2 -
+ drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c |    4 +-
+ drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.h |    2 +-
+ drivers/net/wireless/mediatek/mt76/mt76x2/init.c   |    2 +-
+ drivers/net/wireless/mediatek/mt76/mt76x2/mcu.c    |    2 +-
+ drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h |    2 +-
+ .../net/wireless/mediatek/mt76/mt76x2/pci_init.c   |    6 +-
+ .../net/wireless/mediatek/mt76/mt76x2/pci_main.c   |   25 +-
+ .../net/wireless/mediatek/mt76/mt76x2/pci_phy.c    |    8 +-
+ drivers/net/wireless/mediatek/mt76/mt76x2/phy.c    |   26 +-
+ drivers/net/wireless/mediatek/mt76/mt76x2/usb.c    |    4 +-
+ .../net/wireless/mediatek/mt76/mt76x2/usb_init.c   |   20 +-
+ .../net/wireless/mediatek/mt76/mt76x2/usb_mac.c    |    2 +-
+ .../net/wireless/mediatek/mt76/mt76x2/usb_main.c   |   19 +-
+ .../net/wireless/mediatek/mt76/mt76x2/usb_phy.c    |    6 +-
+ drivers/net/wireless/mediatek/mt76/trace.c         |    3 +
+ drivers/net/wireless/mediatek/mt76/trace.h         |   54 +-
+ drivers/net/wireless/mediatek/mt76/tx.c            |   85 +-
+ drivers/net/wireless/mediatek/mt76/usb.c           |  471 +++-
+ drivers/net/wireless/mediatek/mt76/util.c          |    8 +-
+ drivers/net/wireless/mediatek/mt76/util.h          |   14 +-
+ drivers/net/wireless/quantenna/qtnfmac/cfg80211.c  |  117 +-
+ drivers/net/wireless/quantenna/qtnfmac/commands.c  |  689 +++--
+ drivers/net/wireless/quantenna/qtnfmac/commands.h  |    6 +-
+ drivers/net/wireless/quantenna/qtnfmac/core.c      |   65 +-
+ drivers/net/wireless/quantenna/qtnfmac/core.h      |   31 +-
+ drivers/net/wireless/quantenna/qtnfmac/event.c     |  121 +-
+ .../wireless/quantenna/qtnfmac/pcie/pearl_pcie.c   |    2 +-
+ drivers/net/wireless/quantenna/qtnfmac/qlink.h     |  360 ++-
+ .../net/wireless/quantenna/qtnfmac/qlink_util.c    |    2 +
+ .../net/wireless/quantenna/qtnfmac/qlink_util.h    |   45 +-
+ drivers/net/wireless/rayctl.h                      |    2 +-
+ drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h   |   23 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c  |   85 +-
+ drivers/net/wireless/realtek/rtlwifi/wifi.h        |    6 +-
+ drivers/net/wireless/realtek/rtw88/bf.c            |    6 +-
+ drivers/net/wireless/realtek/rtw88/coex.c          |  495 ++++
+ drivers/net/wireless/realtek/rtw88/coex.h          |   10 +
+ drivers/net/wireless/realtek/rtw88/debug.c         |   62 +
+ drivers/net/wireless/realtek/rtw88/fw.c            |  276 +-
+ drivers/net/wireless/realtek/rtw88/fw.h            |   27 +-
+ drivers/net/wireless/realtek/rtw88/hci.h           |   46 +-
+ drivers/net/wireless/realtek/rtw88/mac.c           |   25 +-
+ drivers/net/wireless/realtek/rtw88/mac80211.c      |   59 +-
+ drivers/net/wireless/realtek/rtw88/main.c          |   34 +-
+ drivers/net/wireless/realtek/rtw88/main.h          |   57 +-
+ drivers/net/wireless/realtek/rtw88/pci.c           |  208 +-
+ drivers/net/wireless/realtek/rtw88/pci.h           |    8 +-
+ drivers/net/wireless/realtek/rtw88/phy.c           |   10 -
+ drivers/net/wireless/realtek/rtw88/rtw8822b.c      |   60 +-
+ drivers/net/wireless/realtek/rtw88/rtw8822c.c      |   80 +-
+ drivers/net/wireless/realtek/rtw88/rtw8822c.h      |    5 +
+ drivers/net/wireless/realtek/rtw88/tx.c            |  137 +-
+ drivers/net/wireless/realtek/rtw88/tx.h            |   16 +-
+ drivers/net/wireless/realtek/rtw88/wow.c           |   39 +-
+ drivers/net/wireless/rsi/rsi_91x_sdio.c            |    9 +-
+ drivers/net/wireless/st/cw1200/wsm.h               |    2 +-
+ drivers/net/wireless/ti/wl1251/cmd.h               |    4 +-
+ drivers/net/wireless/ti/wl1251/sdio.c              |   32 +-
+ drivers/net/wireless/ti/wl1251/wl12xx_80211.h      |    2 +-
+ drivers/net/wireless/ti/wlcore/acx.h               |    2 +-
+ drivers/net/wireless/ti/wlcore/boot.h              |    2 +-
+ drivers/net/wireless/ti/wlcore/cmd.h               |    2 +-
+ drivers/net/wireless/ti/wlcore/conf.h              |    2 +-
+ drivers/net/wireless/ti/wlcore/wl12xx_80211.h      |    2 +-
+ drivers/net/wireless/virt_wifi.c                   |   12 +-
+ drivers/net/wireless/wl3501.h                      |    2 +-
+ drivers/net/wireless/zydas/zd1211rw/zd_usb.h       |    8 +-
+ drivers/nfc/fdp/fdp.c                              |    2 +-
+ drivers/nfc/st21nfca/dep.c                         |    4 +-
+ drivers/ntb/hw/amd/ntb_hw_amd.c                    |  290 +-
+ drivers/ntb/hw/amd/ntb_hw_amd.h                    |    8 +-
+ drivers/ntb/hw/mscc/ntb_hw_switchtec.c             |    2 +-
+ drivers/ntb/ntb_transport.c                        |   58 +-
+ drivers/ntb/test/ntb_perf.c                        |   57 +-
+ drivers/ntb/test/ntb_tool.c                        |   14 +-
+ drivers/pci/pci-bridge-emul.c                      |   14 +-
+ drivers/pci/pci.c                                  |   57 +
+ drivers/phy/ti/Kconfig                             |    3 -
+ drivers/platform/x86/Kconfig                       | 1323 ++++-----
+ drivers/platform/x86/Makefile                      |  198 +-
+ drivers/platform/x86/asus-wmi.c                    |    7 +-
+ drivers/platform/x86/dell_rbu.c                    |  173 +-
+ drivers/platform/x86/gpd-pocket-fan.c              |    2 +-
+ drivers/platform/x86/i2c-multi-instantiate.c       |    2 +-
+ drivers/platform/x86/intel-hid.c                   |    2 +-
+ drivers/platform/x86/intel-uncore-frequency.c      |   51 +-
+ drivers/platform/x86/intel-vbtn.c                  |    2 +-
+ drivers/platform/x86/intel_pmc_core.c              |  343 ++-
+ drivers/platform/x86/intel_pmc_core.h              |   29 +
+ .../x86/intel_speed_select_if/isst_if_mmio.c       |    2 +-
+ drivers/platform/x86/pmc_atom.c                    |    8 +
+ drivers/platform/x86/sony-laptop.c                 |    8 +-
+ drivers/platform/x86/surface3_power.c              |  589 ++++
+ drivers/ptp/Kconfig                                |   24 +
+ drivers/ptp/Makefile                               |    2 +
+ drivers/ptp/ptp_chardev.c                          |    9 +
+ drivers/ptp/ptp_clock.c                            |   17 +-
+ drivers/ptp/ptp_idt82p33.c                         | 1008 +++++++
+ drivers/ptp/ptp_idt82p33.h                         |  171 ++
+ drivers/ptp/ptp_qoriq.c                            |   29 +-
+ drivers/ptp/ptp_vmw.c                              |  144 +
+ drivers/remoteproc/Kconfig                         |    4 +
+ drivers/remoteproc/Makefile                        |    1 +
+ drivers/remoteproc/qcom_q6v5_ipa_notify.c          |   85 +
+ drivers/remoteproc/qcom_q6v5_mss.c                 |   38 +
+ drivers/s390/cio/qdio.h                            |   11 +-
+ drivers/s390/cio/qdio_debug.c                      |    4 +-
+ drivers/s390/cio/qdio_main.c                       |   50 +-
+ drivers/s390/cio/qdio_setup.c                      |    9 +-
+ drivers/s390/cio/qdio_thinint.c                    |   38 +-
+ drivers/s390/net/Kconfig                           |   17 +
+ drivers/s390/net/qeth_core.h                       |   46 +-
+ drivers/s390/net/qeth_core_main.c                  |  398 +--
+ drivers/s390/net/qeth_core_mpc.h                   |   21 +-
+ drivers/s390/net/qeth_core_sys.c                   |   10 +-
+ drivers/s390/net/qeth_ethtool.c                    |  150 +-
+ drivers/s390/net/qeth_l2_main.c                    |   89 +-
+ drivers/s390/net/qeth_l3_main.c                    |   74 +-
+ drivers/s390/net/qeth_l3_sys.c                     |   35 -
+ drivers/scsi/qedf/qedf_main.c                      |   18 +-
+ drivers/ssb/sprom.c                                |    4 +-
+ drivers/staging/qlge/qlge_ethtool.c                |    2 +
+ drivers/tty/hvc/hvc_console.h                      |    2 +-
+ drivers/tty/mips_ejtag_fdc.c                       |    1 +
+ drivers/tty/n_gsm.c                                |  140 +-
+ drivers/tty/n_hdlc.c                               |  549 ++--
+ drivers/tty/n_tracesink.h                          |    2 +-
+ drivers/tty/n_tty.c                                |    6 +-
+ drivers/tty/nozomi.c                               |   69 +-
+ drivers/tty/serial/8250/8250.h                     |    6 +-
+ drivers/tty/serial/8250/8250_bcm2835aux.c          |   80 +-
+ drivers/tty/serial/8250/8250_core.c                |   15 +-
+ drivers/tty/serial/8250/8250_dwlib.h               |    2 +-
+ drivers/tty/serial/8250/8250_exar.c                |    2 +-
+ drivers/tty/serial/8250/8250_lpss.c                |    6 +
+ drivers/tty/serial/8250/8250_mtk.c                 |   50 +-
+ drivers/tty/serial/8250/8250_of.c                  |   67 +-
+ drivers/tty/serial/8250/8250_omap.c                |  263 +-
+ drivers/tty/serial/8250/8250_pci.c                 |    2 +-
+ drivers/tty/serial/8250/8250_port.c                |  238 +-
+ drivers/tty/serial/8250/8250_pxa.c                 |    2 +-
+ drivers/tty/serial/8250/8250_tegra.c               |  198 ++
+ drivers/tty/serial/8250/Kconfig                    |    9 +
+ drivers/tty/serial/8250/Makefile                   |    1 +
+ drivers/tty/serial/Kconfig                         |   14 +-
+ drivers/tty/serial/ar933x_uart.c                   |  113 +-
+ drivers/tty/serial/atmel_serial.c                  |   23 +-
+ drivers/tty/serial/atmel_serial.h                  |    2 +-
+ drivers/tty/serial/cpm_uart/cpm_uart.h             |    6 +-
+ drivers/tty/serial/cpm_uart/cpm_uart_core.c        |   48 +-
+ drivers/tty/serial/earlycon.c                      |   11 +
+ drivers/tty/serial/efm32-uart.c                    |    2 +-
+ drivers/tty/serial/fsl_lpuart.c                    |  228 +-
+ drivers/tty/serial/icom.h                          |    2 +-
+ drivers/tty/serial/ifx6x60.c                       |  195 +-
+ drivers/tty/serial/ifx6x60.h                       |   15 +-
+ drivers/tty/serial/imx.c                           |   44 +-
+ drivers/tty/serial/jsm/jsm.h                       |    2 +-
+ drivers/tty/serial/kgdboc.c                        |    4 +-
+ drivers/tty/serial/lantiq.c                        |    1 -
+ drivers/tty/serial/omap-serial.c                   |    2 -
+ drivers/tty/serial/pch_uart.c                      |   22 +-
+ drivers/tty/serial/pic32_uart.c                    |    8 +-
+ drivers/tty/serial/pic32_uart.h                    |    2 +-
+ drivers/tty/serial/qcom_geni_serial.c              |   59 +-
+ drivers/tty/serial/sc16is7xx.c                     |    2 +-
+ drivers/tty/serial/serial_core.c                   |  266 +-
+ drivers/tty/serial/serial_mctrl_gpio.h             |    2 +-
+ drivers/tty/serial/sifive.c                        |   55 +-
+ drivers/tty/serial/sirfsoc_uart.h                  |    2 +-
+ drivers/tty/serial/sprd_serial.c                   |   48 +-
+ drivers/tty/serial/stm32-usart.h                   |    2 +-
+ drivers/tty/serial/timbuart.h                      |    2 +-
+ drivers/tty/serial/xilinx_uartps.c                 |   20 +-
+ drivers/tty/sysrq.c                                |   12 +
+ drivers/tty/vt/selection.c                         |  199 +-
+ drivers/tty/vt/vt.c                                |  152 +-
+ drivers/tty/vt/vt_ioctl.c                          |   75 +-
+ fs/btrfs/Makefile                                  |    2 +-
+ fs/btrfs/async-thread.c                            |    8 +
+ fs/btrfs/async-thread.h                            |    1 +
+ fs/btrfs/backref.c                                 |  185 +-
+ fs/btrfs/backref.h                                 |    4 +
+ fs/btrfs/block-group.c                             |   87 +-
+ fs/btrfs/block-rsv.c                               |  105 +-
+ fs/btrfs/block-rsv.h                               |   12 +-
+ fs/btrfs/btrfs_inode.h                             |    6 +
+ fs/btrfs/check-integrity.c                         |  200 +-
+ fs/btrfs/check-integrity.h                         |    2 -
+ fs/btrfs/ctree.c                                   |   74 +-
+ fs/btrfs/ctree.h                                   |   82 +-
+ fs/btrfs/delalloc-space.c                          |  106 +-
+ fs/btrfs/delayed-inode.c                           |   24 +-
+ fs/btrfs/delayed-inode.h                           |    2 +-
+ fs/btrfs/delayed-ref.c                             |    3 +-
+ fs/btrfs/dev-replace.c                             |   44 +-
+ fs/btrfs/disk-io.c                                 |  914 ++++---
+ fs/btrfs/disk-io.h                                 |   34 +-
+ fs/btrfs/export.c                                  |   32 +-
+ fs/btrfs/export.h                                  |    5 +
+ fs/btrfs/extent-io-tree.h                          |    7 +-
+ fs/btrfs/extent-tree.c                             |  493 ++--
+ fs/btrfs/extent_io.c                               |  204 +-
+ fs/btrfs/extent_io.h                               |   11 +-
+ fs/btrfs/file-item.c                               |  131 +-
+ fs/btrfs/file.c                                    |   80 +-
+ fs/btrfs/free-space-cache.c                        |   43 +-
+ fs/btrfs/free-space-tree.c                         |    4 +-
+ fs/btrfs/inode-map.c                               |    2 +-
+ fs/btrfs/inode.c                                   |  154 +-
+ fs/btrfs/ioctl.c                                   | 1050 ++------
+ fs/btrfs/locking.c                                 |  135 +
+ fs/btrfs/locking.h                                 |   20 +
+ fs/btrfs/ordered-data.c                            |  140 +-
+ fs/btrfs/ordered-data.h                            |   10 +-
+ fs/btrfs/props.c                                   |    2 +-
+ fs/btrfs/qgroup.c                                  |   28 +-
+ fs/btrfs/raid56.c                                  |   41 +-
+ fs/btrfs/rcu-string.h                              |    2 +-
+ fs/btrfs/ref-verify.c                              |    9 +
+ fs/btrfs/reflink.c                                 |  804 ++++++
+ fs/btrfs/reflink.h                                 |   12 +
+ fs/btrfs/relocation.c                              |  661 +++--
+ fs/btrfs/root-tree.c                               |   43 +-
+ fs/btrfs/scrub.c                                   |    7 +-
+ fs/btrfs/send.c                                    |   79 +-
+ fs/btrfs/space-info.c                              |  202 +-
+ fs/btrfs/space-info.h                              |    7 +
+ fs/btrfs/super.c                                   |   35 +-
+ fs/btrfs/sysfs.c                                   |   73 +-
+ fs/btrfs/sysfs.h                                   |    4 +-
+ fs/btrfs/tests/btrfs-tests.c                       |   44 +-
+ fs/btrfs/tests/qgroup-tests.c                      |    2 +
+ fs/btrfs/transaction.c                             |  113 +-
+ fs/btrfs/transaction.h                             |   13 +
+ fs/btrfs/tree-log.c                                |  483 ++--
+ fs/btrfs/uuid-tree.c                               |   57 +-
+ fs/btrfs/volumes.c                                 |  774 +++---
+ fs/btrfs/volumes.h                                 |   12 +-
+ fs/cifs/cifsacl.c                                  |    5 +-
+ fs/cifs/cifsfs.c                                   |    4 +-
+ fs/cifs/cifsfs.h                                   |    2 +-
+ fs/cifs/cifspdu.h                                  |   19 +-
+ fs/cifs/cifsproto.h                                |    5 +
+ fs/cifs/cifssmb.c                                  |   22 +-
+ fs/cifs/connect.c                                  |   89 +-
+ fs/cifs/dfs_cache.c                                |   38 +
+ fs/cifs/dfs_cache.h                                |    4 +
+ fs/cifs/file.c                                     |    2 +-
+ fs/cifs/inode.c                                    |   47 +-
+ fs/cifs/link.c                                     |    4 +-
+ fs/cifs/misc.c                                     |   80 +
+ fs/cifs/readdir.c                                  |   82 +
+ fs/cifs/smb2file.c                                 |    9 +-
+ fs/cifs/smb2ops.c                                  |   68 +-
+ fs/cifs/smb2pdu.c                                  |  202 +-
+ fs/cifs/smb2pdu.h                                  |  138 +-
+ fs/cifs/smb2proto.h                                |    7 +-
+ fs/cifs/smb2transport.c                            |    8 +-
+ fs/cifs/smbdirect.c                                |   41 +-
+ fs/cifs/smbdirect.h                                |    1 -
+ fs/cifs/transport.c                                |   28 +-
+ fs/crypto/fscrypt_private.h                        |   20 +
+ fs/crypto/keysetup.c                               |   16 +-
+ fs/crypto/policy.c                                 |   21 +-
+ fs/ext4/ioctl.c                                    |    6 +
+ fs/f2fs/file.c                                     |   11 +
+ fs/gfs2/acl.c                                      |    7 +-
+ fs/gfs2/aops.c                                     |   11 +-
+ fs/gfs2/bmap.c                                     |    9 +-
+ fs/gfs2/dir.c                                      |    3 +-
+ fs/gfs2/file.c                                     |   43 +-
+ fs/gfs2/glock.c                                    |  137 +-
+ fs/gfs2/glops.c                                    |  157 +-
+ fs/gfs2/incore.h                                   |   27 +-
+ fs/gfs2/inode.c                                    |   53 +-
+ fs/gfs2/lock_dlm.c                                 |   52 +
+ fs/gfs2/log.c                                      |  288 +-
+ fs/gfs2/log.h                                      |    1 +
+ fs/gfs2/lops.c                                     |   14 +-
+ fs/gfs2/meta_io.c                                  |    3 +-
+ fs/gfs2/ops_fstype.c                               |   59 +-
+ fs/gfs2/quota.c                                    |   76 +-
+ fs/gfs2/quota.h                                    |    4 +-
+ fs/gfs2/recovery.c                                 |   12 +-
+ fs/gfs2/rgrp.c                                     |   88 +-
+ fs/gfs2/rgrp.h                                     |    4 +-
+ fs/gfs2/super.c                                    |  112 +-
+ fs/gfs2/super.h                                    |    1 -
+ fs/gfs2/sys.c                                      |    5 +-
+ fs/gfs2/trans.c                                    |    4 +
+ fs/gfs2/util.c                                     |  419 ++-
+ fs/gfs2/util.h                                     |   76 +-
+ fs/gfs2/xattr.c                                    |   12 +-
+ fs/nfs/getroot.c                                   |   39 +-
+ fs/nfs/nfs4proc.c                                  |   12 +-
+ fs/nfs/super.c                                     |   25 -
+ fs/nsfs.c                                          |   14 +
+ fs/sysfs/file.c                                    |  148 +
+ fs/sysfs/group.c                                   |  115 +
+ fs/ubifs/ioctl.c                                   |    4 +
+ include/asm-generic/vmlinux.lds.h                  |   15 +
+ include/linux/bitfield.h                           |   14 +
+ include/linux/bpf-cgroup.h                         |   43 +-
+ include/linux/bpf.h                                |  163 +-
+ include/linux/bpf_lsm.h                            |   33 +
+ include/linux/bpf_types.h                          |    4 +
+ include/linux/bpf_verifier.h                       |    4 +
+ include/linux/brcmphy.h                            |    2 +
+ include/linux/console.h                            |    1 +
+ include/linux/dccp.h                               |    2 +-
+ include/linux/device.h                             |    1 +
+ include/linux/ethtool.h                            |   66 +-
+ include/linux/filter.h                             |   48 +-
+ include/linux/firmware/xlnx-zynqmp.h               |    9 +-
+ include/linux/fscrypt.h                            |    6 +
+ include/linux/fsl/ptp_qoriq.h                      |    2 -
+ include/linux/ieee80211.h                          |   26 +-
+ include/linux/inet_diag.h                          |   27 +-
+ include/linux/iopoll.h                             |   40 +-
+ include/linux/ipv6.h                               |    1 +
+ include/linux/limits.h                             |    1 +
+ include/linux/linkmode.h                           |    8 +-
+ include/linux/lsm_hook_defs.h                      |  381 +++
+ include/linux/lsm_hooks.h                          |  664 +----
+ include/linux/mdio-xpcs.h                          |   41 +
+ include/linux/mdio.h                               |    4 +
+ include/linux/mii.h                                |   57 +-
+ include/linux/mlx5/driver.h                        |   22 +-
+ include/linux/mlx5/eswitch.h                       |   38 +-
+ include/linux/mlx5/fs.h                            |    1 +
+ include/linux/mlx5/mlx5_ifc.h                      |   40 +-
+ include/linux/mlx5/mlx5_ifc_fpga.h                 |    2 +-
+ include/linux/mmc/core.h                           |    3 -
+ include/linux/mmc/host.h                           |    7 +-
+ include/linux/mmc/mmc.h                            |   10 +
+ include/linux/mmc/sdio_func.h                      |    2 +-
+ include/linux/netdev_features.h                    |    3 +
+ include/linux/netdevice.h                          |   22 +-
+ include/linux/netfilter/ipset/ip_set.h             |    2 +-
+ include/linux/netfilter/x_tables.h                 |    8 +-
+ include/linux/netfilter_arp/arp_tables.h           |    2 +-
+ include/linux/netfilter_bridge/ebtables.h          |    2 +-
+ include/linux/netfilter_ipv4/ip_tables.h           |    2 +-
+ include/linux/netfilter_ipv6/ip6_tables.h          |    2 +-
+ include/linux/netlink.h                            |    4 +-
+ include/linux/nfs_xdr.h                            |    1 +
+ include/linux/pci.h                                |   14 +
+ include/linux/phy.h                                |   59 +-
+ include/linux/phylink.h                            |  182 +-
+ include/linux/platform_data/mmc-esdhc-imx.h        |    1 +
+ include/linux/proc_ns.h                            |    2 +
+ include/linux/ptp_clock_kernel.h                   |   19 +
+ include/linux/qed/qed_chain.h                      |   24 +-
+ include/linux/remoteproc/qcom_q6v5_ipa_notify.h    |   82 +
+ include/linux/security.h                           |    1 -
+ include/linux/selection.h                          |    4 +-
+ include/linux/serial_8250.h                        |    4 +
+ include/linux/serial_core.h                        |    4 +-
+ include/linux/skbuff.h                             |   16 +-
+ include/linux/skmsg.h                              |   68 +-
+ include/linux/spi/ifx_modem.h                      |    5 -
+ include/linux/stmmac.h                             |    1 +
+ include/linux/sysfs.h                              |   46 +
+ include/linux/sysrq.h                              |    7 +
+ include/linux/tcp.h                                |   26 +-
+ include/linux/tnum.h                               |   12 +
+ include/linux/usb/cdc_ncm.h                        |   15 +-
+ include/linux/uuid.h                               |   22 +-
+ include/linux/vt_kern.h                            |   64 +-
+ include/net/6lowpan.h                              |    2 +-
+ include/net/act_api.h                              |    6 +
+ include/net/addrconf.h                             |    3 +
+ include/net/af_unix.h                              |    4 +-
+ include/net/bareudp.h                              |   20 +
+ include/net/bluetooth/bluetooth.h                  |   17 +
+ include/net/bluetooth/hci.h                        |   74 +-
+ include/net/bluetooth/hci_core.h                   |   46 +
+ include/net/bluetooth/hci_sock.h                   |    6 +-
+ include/net/bluetooth/l2cap.h                      |   57 +-
+ include/net/bluetooth/mgmt.h                       |    5 +-
+ include/net/bluetooth/rfcomm.h                     |    3 +-
+ include/net/bonding.h                              |    2 +-
+ include/net/bpf_sk_storage.h                       |   27 +
+ include/net/cfg80211.h                             |  213 +-
+ include/net/cfg802154.h                            |    2 +-
+ include/net/cls_cgroup.h                           |    7 +-
+ include/net/devlink.h                              |  171 +-
+ include/net/dn_fib.h                               |    2 +-
+ include/net/drop_monitor.h                         |    5 +-
+ include/net/dsa.h                                  |   39 +-
+ include/net/dst.h                                  |    1 -
+ include/net/esp.h                                  |   16 +
+ include/net/flow_offload.h                         |  134 +-
+ include/net/inet6_hashtables.h                     |    3 +-
+ include/net/inet_connection_sock.h                 |    6 +
+ include/net/inet_hashtables.h                      |    3 +-
+ include/net/inet_sock.h                            |    2 +-
+ include/net/ip6_checksum.h                         |    9 +
+ include/net/ip6_fib.h                              |    5 +-
+ include/net/ip6_route.h                            |    2 +-
+ include/net/ip_fib.h                               |    9 +-
+ include/net/ipv6.h                                 |    6 +
+ include/net/lwtunnel.h                             |    8 +-
+ include/net/mac80211.h                             |   55 +-
+ include/net/macsec.h                               |   77 +-
+ include/net/mip6.h                                 |    2 +-
+ include/net/mld.h                                  |    6 +-
+ include/net/mpls_iptunnel.h                        |    2 +-
+ include/net/mptcp.h                                |   26 +
+ include/net/ndisc.h                                |    7 +-
+ include/net/neighbour.h                            |    2 +-
+ include/net/net_namespace.h                        |    5 +
+ include/net/netfilter/nf_conntrack_acct.h          |   11 +
+ include/net/netfilter/nf_conntrack_extend.h        |    2 +-
+ include/net/netfilter/nf_conntrack_timeout.h       |    2 +-
+ include/net/netfilter/nf_flow_table.h              |   41 +-
+ include/net/netfilter/nf_queue.h                   |    7 +-
+ include/net/netfilter/nf_tables.h                  |   39 +-
+ include/net/netfilter/nf_tables_core.h             |   13 +-
+ include/net/netlink.h                              |   15 +
+ include/net/netns/ipv4.h                           |    1 +
+ include/net/netns/mib.h                            |    3 +
+ include/net/nexthop.h                              |    2 +-
+ include/net/nfc/nci.h                              |   14 +-
+ include/net/nfc/nfc.h                              |    2 +-
+ include/net/page_pool.h                            |   36 +-
+ include/net/pie.h                                  |   31 +-
+ include/net/pkt_cls.h                              |   44 +-
+ include/net/pkt_sched.h                            |   12 +-
+ include/net/red.h                                  |   38 +
+ include/net/route.h                                |    8 +-
+ include/net/rpl.h                                  |   46 +
+ include/net/sch_generic.h                          |    3 +
+ include/net/sctp/structs.h                         |    2 +-
+ include/net/sock.h                                 |   83 +-
+ include/net/sock_reuseport.h                       |    4 +-
+ include/net/tc_act/tc_ct.h                         |   25 +-
+ include/net/tc_act/tc_police.h                     |    6 +-
+ include/net/tc_act/tc_skbedit.h                    |   41 +-
+ include/net/tc_act/tc_tunnel_key.h                 |   10 +-
+ include/net/tcp.h                                  |   15 +-
+ include/net/udp.h                                  |    5 +
+ include/soc/mscc/ocelot.h                          |  106 +-
+ include/soc/mscc/ocelot_vcap.h                     |  205 ++
+ include/trace/bpf_probe.h                          |   18 +-
+ include/trace/events/btrfs.h                       |    6 +-
+ include/uapi/linux/bpf.h                           |  324 ++-
+ include/uapi/linux/btrfs.h                         |   37 +-
+ include/uapi/linux/devlink.h                       |   16 +
+ include/uapi/linux/ethtool.h                       |   10 +-
+ include/uapi/linux/ethtool_netlink.h               |  175 ++
+ include/uapi/linux/fscrypt.h                       |    1 +
+ include/uapi/linux/if_arcnet.h                     |    6 +-
+ include/uapi/linux/if_bridge.h                     |   46 +
+ include/uapi/linux/if_link.h                       |   18 +-
+ include/uapi/linux/if_macsec.h                     |    8 +-
+ include/uapi/linux/inet_diag.h                     |    6 +-
+ include/uapi/linux/ipv6.h                          |    2 +
+ include/uapi/linux/lwtunnel.h                      |    1 +
+ include/uapi/linux/mii.h                           |    5 +
+ include/uapi/linux/mmc/ioctl.h                     |    2 +-
+ include/uapi/linux/mptcp.h                         |   89 +
+ include/uapi/linux/net_dropmon.h                   |    5 +-
+ include/uapi/linux/net_tstamp.h                    |    6 +
+ include/uapi/linux/netfilter/nf_tables.h           |   25 +
+ include/uapi/linux/netfilter/xt_IDLETIMER.h        |   12 +-
+ include/uapi/linux/netfilter_bridge/ebt_among.h    |    2 +-
+ include/uapi/linux/nl80211.h                       |  241 +-
+ include/uapi/linux/openvswitch.h                   |    7 +
+ include/uapi/linux/pkt_cls.h                       |   22 +
+ include/uapi/linux/pkt_sched.h                     |   23 +-
+ include/uapi/linux/rpl.h                           |   48 +
+ include/uapi/linux/rpl_iptunnel.h                  |   21 +
+ include/uapi/linux/sock_diag.h                     |   26 +
+ include/uapi/linux/tcp.h                           |    3 +
+ include/uapi/linux/virtio_ids.h                    |    1 +
+ include/uapi/linux/wireless.h                      |    5 +-
+ init/Kconfig                                       |   29 +-
+ kernel/audit.c                                     |    1 +
+ kernel/audit.h                                     |    8 +
+ kernel/audit_watch.c                               |    2 -
+ kernel/auditsc.c                                   |    3 -
+ kernel/bpf/Makefile                                |    1 +
+ kernel/bpf/bpf_lsm.c                               |   54 +
+ kernel/bpf/bpf_struct_ops.c                        |   12 +-
+ kernel/bpf/btf.c                                   |   62 +-
+ kernel/bpf/cgroup.c                                |  505 +++-
+ kernel/bpf/core.c                                  |  122 +-
+ kernel/bpf/dispatcher.c                            |    5 +-
+ kernel/bpf/hashtab.c                               |  174 +-
+ kernel/bpf/helpers.c                               |   63 +
+ kernel/bpf/inode.c                                 |   42 +-
+ kernel/bpf/lpm_trie.c                              |   14 +-
+ kernel/bpf/percpu_freelist.c                       |   20 +-
+ kernel/bpf/reuseport_array.c                       |    5 -
+ kernel/bpf/stackmap.c                              |   18 +-
+ kernel/bpf/syscall.c                               |  656 +++--
+ kernel/bpf/sysfs_btf.c                             |   11 +-
+ kernel/bpf/tnum.c                                  |   15 +
+ kernel/bpf/trampoline.c                            |  178 +-
+ kernel/bpf/verifier.c                              | 1649 ++++++++----
+ kernel/cgroup/cgroup.c                             |   41 +-
+ kernel/events/core.c                               |   11 +-
+ kernel/extable.c                                   |    2 -
+ kernel/printk/printk.c                             |   49 +-
+ kernel/seccomp.c                                   |    4 +-
+ kernel/sysctl.c                                    |   41 +-
+ kernel/trace/bpf_trace.c                           |   77 +-
+ kernel/trace/trace_uprobe.c                        |   11 +-
+ lib/Kconfig.debug                                  |   13 +-
+ lib/objagg.c                                       |    4 +-
+ lib/test_bpf.c                                     |    4 +-
+ lib/uuid.c                                         |   10 +
+ net/802/psnap.c                                    |    2 +-
+ net/8021q/vlan_core.c                              |    5 +-
+ net/batman-adv/distributed-arp-table.c             |    2 +-
+ net/batman-adv/main.h                              |    2 +-
+ net/batman-adv/translation-table.c                 |    8 +-
+ net/bluetooth/a2mp.h                               |   10 +-
+ net/bluetooth/bnep/bnep.h                          |    6 +-
+ net/bluetooth/hci_conn.c                           |  146 +-
+ net/bluetooth/hci_core.c                           |  143 +-
+ net/bluetooth/hci_event.c                          |  114 +-
+ net/bluetooth/hci_request.c                        |  350 ++-
+ net/bluetooth/hci_request.h                        |    2 +
+ net/bluetooth/hidp/core.c                          |    2 +-
+ net/bluetooth/l2cap_core.c                         |  734 ++++-
+ net/bluetooth/l2cap_sock.c                         |   67 +-
+ net/bluetooth/mgmt.c                               |  113 +-
+ net/bluetooth/rfcomm/core.c                        |   13 +-
+ net/bluetooth/rfcomm/tty.c                         |    4 +-
+ net/bluetooth/sco.c                                |   13 +
+ net/bluetooth/smp.c                                |   29 +-
+ net/bpf/test_run.c                                 |   76 +-
+ net/bpfilter/main.c                                |    1 -
+ net/bridge/br_netlink_tunnel.c                     |   12 +-
+ net/bridge/br_private.h                            |    4 +-
+ net/bridge/br_private_tunnel.h                     |   17 +-
+ net/bridge/br_vlan.c                               |   76 +-
+ net/bridge/br_vlan_options.c                       |  112 +-
+ net/bridge/br_vlan_tunnel.c                        |    5 +-
+ net/bridge/netfilter/ebtables.c                    |    2 +-
+ net/core/bpf_sk_storage.c                          |  285 +-
+ net/core/datagram.c                                |   39 +-
+ net/core/dev.c                                     |   47 +-
+ net/core/dev_ioctl.c                               |    6 +
+ net/core/devlink.c                                 | 1267 +++++++--
+ net/core/drop_monitor.c                            |   35 +-
+ net/core/filter.c                                  |  234 +-
+ net/core/flow_dissector.c                          |    4 +-
+ net/core/flow_offload.c                            |   34 +-
+ net/core/lwt_bpf.c                                 |    2 +-
+ net/core/lwtunnel.c                                |    6 +-
+ net/core/neighbour.c                               |    3 -
+ net/core/net-sysfs.c                               |  133 +
+ net/core/net-sysfs.h                               |    2 +
+ net/core/net_namespace.c                           |   15 +
+ net/core/page_pool.c                               |   78 +-
+ net/core/pktgen.c                                  |    4 +-
+ net/core/rtnetlink.c                               |   32 +-
+ net/core/skbuff.c                                  |   24 +-
+ net/core/skmsg.c                                   |   10 +-
+ net/core/sock.c                                    |   26 +-
+ net/core/sock_map.c                                |  306 ++-
+ net/core/sock_reuseport.c                          |   50 +-
+ net/core/xdp.c                                     |    2 +-
+ net/dccp/ccid.h                                    |    2 +-
+ net/dccp/diag.c                                    |    9 +-
+ net/dccp/minisocks.c                               |    1 +
+ net/decnet/dn_route.c                              |    4 +-
+ net/dsa/dsa.c                                      |    6 +-
+ net/dsa/dsa2.c                                     |    2 +-
+ net/dsa/dsa_priv.h                                 |   15 +
+ net/dsa/master.c                                   |   21 +-
+ net/dsa/port.c                                     |   27 +-
+ net/dsa/slave.c                                    |  429 ++-
+ net/dsa/switch.c                                   |   37 +
+ net/dsa/tag_brcm.c                                 |   23 +
+ net/dsa/tag_ocelot.c                               |    3 +-
+ net/ethtool/Makefile                               |    3 +-
+ net/ethtool/bitset.c                               |   94 +
+ net/ethtool/bitset.h                               |    4 +
+ net/ethtool/channels.c                             |  227 ++
+ net/ethtool/coalesce.c                             |  353 +++
+ net/ethtool/common.c                               |  114 +
+ net/ethtool/common.h                               |    9 +
+ net/ethtool/debug.c                                |    6 +-
+ net/ethtool/eee.c                                  |  206 ++
+ net/ethtool/features.c                             |  304 +++
+ net/ethtool/ioctl.c                                |  195 +-
+ net/ethtool/linkinfo.c                             |    6 +-
+ net/ethtool/linkmodes.c                            |    7 +-
+ net/ethtool/netlink.c                              |  152 +-
+ net/ethtool/netlink.h                              |   22 +-
+ net/ethtool/pause.c                                |  145 +
+ net/ethtool/privflags.c                            |  211 ++
+ net/ethtool/rings.c                                |  200 ++
+ net/ethtool/strset.c                               |   15 +
+ net/ethtool/tsinfo.c                               |  143 +
+ net/ethtool/wol.c                                  |    5 +-
+ net/hsr/hsr_debugfs.c                              |    5 +-
+ net/hsr/hsr_device.c                               |   64 +-
+ net/hsr/hsr_device.h                               |    3 +-
+ net/hsr/hsr_framereg.c                             |    3 +-
+ net/hsr/hsr_main.c                                 |    3 +-
+ net/hsr/hsr_main.h                                 |    1 -
+ net/hsr/hsr_netlink.c                              |   49 +-
+ net/hsr/hsr_slave.c                                |   63 +-
+ net/hsr/hsr_slave.h                                |    2 +-
+ net/ipv4/Makefile                                  |    1 +
+ net/ipv4/af_inet.c                                 |    8 +-
+ net/ipv4/ah4.c                                     |    2 +-
+ net/ipv4/arp.c                                     |    2 +-
+ net/ipv4/bpf_tcp_ca.c                              |   33 +
+ net/ipv4/devinet.c                                 |    6 +-
+ net/ipv4/esp4.c                                    |   16 -
+ net/ipv4/esp4_offload.c                            |   32 +
+ net/ipv4/fib_lookup.h                              |    2 +-
+ net/ipv4/fib_semantics.c                           |   26 +-
+ net/ipv4/fib_trie.c                                |   10 +-
+ net/ipv4/icmp.c                                    |    2 +-
+ net/ipv4/igmp.c                                    |    2 -
+ net/ipv4/inet_connection_sock.c                    |   36 +-
+ net/ipv4/inet_diag.c                               |  307 ++-
+ net/ipv4/ip_input.c                                |    3 +-
+ net/ipv4/ip_output.c                               |    4 +-
+ net/ipv4/ip_tunnel.c                               |    6 +-
+ net/ipv4/ip_tunnel_core.c                          |    4 +-
+ net/ipv4/ipmr.c                                    |    2 +-
+ net/ipv4/netfilter/arp_tables.c                    |    4 +-
+ net/ipv4/netfilter/ip_tables.c                     |    4 +-
+ net/ipv4/netfilter/nf_log_ipv4.c                   |    2 +-
+ net/ipv4/netfilter/nf_nat_pptp.c                   |    4 +-
+ net/ipv4/nexthop.c                                 |    2 +-
+ net/ipv4/proc.c                                    |    2 +
+ net/ipv4/raw.c                                     |    2 +
+ net/ipv4/raw_diag.c                                |   24 +-
+ net/ipv4/route.c                                   |   61 +-
+ net/ipv4/sysctl_net_ipv4.c                         |   33 +-
+ net/ipv4/tcp.c                                     |   29 +-
+ net/ipv4/tcp_bic.c                                 |   11 +-
+ net/ipv4/tcp_bpf.c                                 |  272 +-
+ net/ipv4/tcp_diag.c                                |    8 +-
+ net/ipv4/tcp_input.c                               |    6 +-
+ net/ipv4/tcp_ipv4.c                                |   10 +-
+ net/ipv4/tcp_minisocks.c                           |    9 +
+ net/ipv4/tcp_scalable.c                            |   17 +-
+ net/ipv4/tcp_ulp.c                                 |    9 +-
+ net/ipv4/tcp_veno.c                                |   47 +-
+ net/ipv4/tcp_yeah.c                                |   41 +-
+ net/ipv4/udp.c                                     |   24 +-
+ net/ipv4/udp_bpf.c                                 |   53 +
+ net/ipv4/udp_diag.c                                |   41 +-
+ net/ipv4/udp_offload.c                             |    1 +
+ net/ipv6/Kconfig                                   |   10 +
+ net/ipv6/Makefile                                  |    3 +-
+ net/ipv6/addrconf.c                                |   69 +-
+ net/ipv6/af_inet6.c                                |    7 +
+ net/ipv6/ah6.c                                     |    4 +-
+ net/ipv6/esp6.c                                    |   16 -
+ net/ipv6/esp6_offload.c                            |   36 +
+ net/ipv6/exthdrs.c                                 |  203 +-
+ net/ipv6/icmp.c                                    |    2 +-
+ net/ipv6/ila/ila_lwt.c                             |    2 +-
+ net/ipv6/ip6_fib.c                                 |    8 +-
+ net/ipv6/ip6_input.c                               |    3 +-
+ net/ipv6/ip6_output.c                              |   70 +
+ net/ipv6/ip6mr.c                                   |    5 +-
+ net/ipv6/ndisc.c                                   |    3 +-
+ net/ipv6/netfilter/ip6_tables.c                    |    4 +-
+ net/ipv6/netfilter/nf_log_ipv6.c                   |    2 +-
+ net/ipv6/raw.c                                     |    8 +-
+ net/ipv6/route.c                                   |   10 +-
+ net/ipv6/rpl.c                                     |  123 +
+ net/ipv6/rpl_iptunnel.c                            |  382 +++
+ net/ipv6/seg6_iptunnel.c                           |    4 +-
+ net/ipv6/seg6_local.c                              |    5 +-
+ net/ipv6/sysctl_net_ipv6.c                         |   21 +-
+ net/ipv6/tcp_ipv6.c                                |    2 +-
+ net/ipv6/udp.c                                     |    9 +-
+ net/kcm/kcmproc.c                                  |    2 +-
+ net/kcm/kcmsock.c                                  |    4 +-
+ net/l2tp/l2tp_core.h                               |    2 +-
+ net/llc/af_llc.c                                   |    2 +-
+ net/llc/llc_proc.c                                 |    2 +-
+ net/mac80211/aes_cmac.c                            |   21 +-
+ net/mac80211/aes_gmac.c                            |   24 +-
+ net/mac80211/cfg.c                                 |  193 +-
+ net/mac80211/debugfs.c                             |   56 +-
+ net/mac80211/debugfs_key.c                         |   31 +
+ net/mac80211/debugfs_key.h                         |   10 +
+ net/mac80211/debugfs_netdev.c                      |   13 +-
+ net/mac80211/debugfs_sta.c                         |    6 +-
+ net/mac80211/driver-ops.h                          |   27 +
+ net/mac80211/he.c                                  |    4 +
+ net/mac80211/ht.c                                  |   64 +-
+ net/mac80211/ieee80211_i.h                         |   32 +-
+ net/mac80211/iface.c                               |   86 +-
+ net/mac80211/key.c                                 |   59 +-
+ net/mac80211/key.h                                 |    3 +
+ net/mac80211/main.c                                |   39 +-
+ net/mac80211/mlme.c                                |  140 +-
+ net/mac80211/rx.c                                  |   96 +-
+ net/mac80211/scan.c                                |    3 +-
+ net/mac80211/sta_info.c                            |   49 +-
+ net/mac80211/sta_info.h                            |    4 +-
+ net/mac80211/status.c                              |   91 +-
+ net/mac80211/tx.c                                  |  209 +-
+ net/mac80211/util.c                                |   87 +-
+ net/mac80211/vht.c                                 |   58 +-
+ net/mac80211/wep.c                                 |    4 +-
+ net/mac80211/wep.h                                 |    2 +-
+ net/mpls/internal.h                                |    4 +-
+ net/mpls/mpls_iptunnel.c                           |    2 +-
+ net/mptcp/Makefile                                 |    3 +-
+ net/mptcp/crypto.c                                 |   17 +-
+ net/mptcp/diag.c                                   |  104 +
+ net/mptcp/mib.c                                    |   69 +
+ net/mptcp/mib.h                                    |   40 +
+ net/mptcp/options.c                                |  553 +++-
+ net/mptcp/pm.c                                     |  242 ++
+ net/mptcp/pm_netlink.c                             |  857 ++++++
+ net/mptcp/protocol.c                               | 1056 ++++++--
+ net/mptcp/protocol.h                               |  204 +-
+ net/mptcp/subflow.c                                |  403 ++-
+ net/mptcp/token.c                                  |   38 +-
+ net/netfilter/Kconfig                              |    8 -
+ net/netfilter/Makefile                             |   13 +-
+ net/netfilter/ipset/ip_set_bitmap_ip.c             |    2 +-
+ net/netfilter/ipset/ip_set_bitmap_ipmac.c          |    2 +-
+ net/netfilter/ipset/ip_set_bitmap_port.c           |    2 +-
+ net/netfilter/ipset/ip_set_hash_gen.h              |    4 +-
+ net/netfilter/ipvs/ip_vs_core.c                    |   45 +-
+ net/netfilter/nf_conntrack_core.c                  |   19 +-
+ net/netfilter/nf_conntrack_netlink.c               |    3 +-
+ net/netfilter/nf_conntrack_standalone.c            |   19 +-
+ net/netfilter/nf_flow_table_core.c                 |   59 +
+ net/netfilter/nf_flow_table_ip.c                   |   22 +-
+ net/netfilter/nf_flow_table_offload.c              |  330 ++-
+ net/netfilter/nf_queue.c                           |   96 +-
+ net/netfilter/nf_tables_api.c                      |  238 +-
+ net/netfilter/nf_tables_offload.c                  |    2 +-
+ net/netfilter/nf_tables_set_core.c                 |   31 -
+ net/netfilter/nfnetlink_acct.c                     |    2 +-
+ net/netfilter/nfnetlink_queue.c                    |   10 +-
+ net/netfilter/nft_bitwise.c                        |   14 +-
+ net/netfilter/nft_dynset.c                         |   45 +-
+ net/netfilter/nft_exthdr.c                         |    8 +-
+ net/netfilter/nft_lookup.c                         |    1 +
+ net/netfilter/nft_set_bitmap.c                     |    6 +-
+ net/netfilter/nft_set_hash.c                       |    9 +-
+ net/netfilter/nft_set_pipapo.c                     |  637 +++--
+ net/netfilter/nft_set_pipapo.h                     |  280 ++
+ net/netfilter/nft_set_pipapo_avx2.c                | 1223 +++++++++
+ net/netfilter/nft_set_pipapo_avx2.h                |   14 +
+ net/netfilter/nft_set_rbtree.c                     |    3 +-
+ net/netfilter/nft_tunnel.c                         |  110 +-
+ net/netfilter/xt_IDLETIMER.c                       |  248 +-
+ net/netfilter/xt_SECMARK.c                         |    2 -
+ net/netfilter/xt_hashlimit.c                       |    2 +-
+ net/netfilter/xt_recent.c                          |    4 +-
+ net/netlink/af_netlink.c                           |    3 +-
+ net/netrom/af_netrom.c                             |    2 +
+ net/netrom/nr_route.c                              |    4 +
+ net/nfc/digital_dep.c                              |    4 +-
+ net/openvswitch/actions.c                          |   67 +
+ net/openvswitch/datapath.c                         |    2 +-
+ net/openvswitch/flow_netlink.c                     |   70 +
+ net/qrtr/Makefile                                  |    2 +-
+ net/qrtr/ns.c                                      |  757 ++++++
+ net/qrtr/qrtr.c                                    |   43 +-
+ net/qrtr/qrtr.h                                    |    4 +
+ net/sched/Kconfig                                  |    2 +-
+ net/sched/act_api.c                                |   43 +-
+ net/sched/act_bpf.c                                |    3 +
+ net/sched/act_ct.c                                 |  569 +++-
+ net/sched/act_pedit.c                              |   11 +
+ net/sched/act_sample.c                             |    2 -
+ net/sched/act_skbedit.c                            |   11 +
+ net/sched/cls_api.c                                |  168 +-
+ net/sched/cls_flower.c                             |   70 +-
+ net/sched/cls_matchall.c                           |    8 +-
+ net/sched/em_ipt.c                                 |    2 +-
+ net/sched/em_nbyte.c                               |    2 +-
+ net/sched/sch_api.c                                |   21 +-
+ net/sched/sch_atm.c                                |    2 +-
+ net/sched/sch_fifo.c                               |   97 +-
+ net/sched/sch_fq.c                                 |   21 +-
+ net/sched/sch_fq_pie.c                             |    1 -
+ net/sched/sch_generic.c                            |    8 +
+ net/sched/sch_ingress.c                            |   11 +-
+ net/sched/sch_netem.c                              |    2 +-
+ net/sched/sch_pie.c                                |   49 +-
+ net/sched/sch_red.c                                |   69 +-
+ net/sctp/diag.c                                    |    7 +-
+ net/sctp/input.c                                   |    1 +
+ net/sctp/ipv6.c                                    |   20 +-
+ net/sctp/protocol.c                                |   28 +-
+ net/sctp/socket.c                                  |   35 +-
+ net/smc/smc_clc.c                                  |    5 +-
+ net/smc/smc_core.c                                 |   26 +-
+ net/smc/smc_core.h                                 |    8 +-
+ net/smc/smc_ib.c                                   |   63 +-
+ net/smc/smc_ib.h                                   |    1 +
+ net/smc/smc_llc.c                                  |    2 +-
+ net/smc/smc_tx.c                                   |    2 +-
+ net/switchdev/switchdev.c                          |   11 +-
+ net/tipc/monitor.c                                 |   12 +-
+ net/tipc/msg.c                                     |    3 -
+ net/tipc/msg.h                                     |    5 +
+ net/tipc/node.c                                    |    3 +-
+ net/tipc/socket.c                                  |    2 +-
+ net/tls/tls_device.c                               |    2 +-
+ net/tls/tls_main.c                                 |   31 +-
+ net/unix/af_unix.c                                 |   29 +-
+ net/vmw_vsock/virtio_transport_common.c            |    1 +
+ net/wireless/core.c                                |    6 +
+ net/wireless/core.h                                |    2 +-
+ net/wireless/mlme.c                                |   33 +-
+ net/wireless/nl80211.c                             |  420 ++-
+ net/wireless/pmsr.c                                |   32 +
+ net/wireless/rdev-ops.h                            |   37 +
+ net/wireless/reg.c                                 |    2 +
+ net/wireless/scan.c                                |   11 +-
+ net/wireless/sme.c                                 |   11 +-
+ net/wireless/trace.h                               |   54 +
+ net/wireless/util.c                                |    9 +-
+ net/x25/x25_forward.c                              |   12 +-
+ net/xdp/xsk_queue.h                                |    4 +-
+ net/xfrm/espintcp.c                                |    2 +-
+ net/xfrm/xfrm_device.c                             |   28 +-
+ net/xfrm/xfrm_output.c                             |    4 +-
+ net/xfrm/xfrm_policy.c                             |    3 +-
+ net/xfrm/xfrm_state.c                              |    2 +-
+ samples/bpf/Makefile                               |    8 +-
+ samples/bpf/bpf_load.c                             |   20 -
+ samples/bpf/bpf_load.h                             |    1 -
+ samples/bpf/sampleip_user.c                        |   98 +-
+ samples/bpf/trace_event_user.c                     |  139 +-
+ samples/bpf/tracex1_user.c                         |    1 +
+ samples/bpf/tracex5_user.c                         |    1 +
+ scripts/Makefile.dtbinst                           |   26 +-
+ scripts/Makefile.lib                               |    3 +-
+ scripts/Makefile.modpost                           |   15 +-
+ scripts/adjust_autoksyms.sh                        |   24 +-
+ scripts/basic/fixdep.c                             |   10 +-
+ scripts/bpf_helpers_doc.py                         |    4 +-
+ scripts/dtc/Makefile                               |    5 +-
+ scripts/gcc-plugins/Makefile                       |    2 +-
+ scripts/gen_autoksyms.sh                           |   52 +
+ scripts/kconfig/Makefile                           |    4 -
+ scripts/kconfig/qconf.cc                           |    2 -
+ scripts/kconfig/symbol.c                           |    9 +-
+ scripts/link-vmlinux.sh                            |   42 +-
+ scripts/mkcompile_h                                |   11 -
+ scripts/mod/modpost.c                              |   83 +-
+ scripts/mod/modpost.h                              |   14 +-
+ scripts/package/mkdebian                           |    5 +
+ scripts/selinux/genheaders/genheaders.c            |   11 +-
+ security/Kconfig                                   |   10 +-
+ security/Makefile                                  |    2 +
+ security/bpf/Makefile                              |    5 +
+ security/bpf/hooks.c                               |   26 +
+ security/security.c                                |   41 +-
+ security/selinux/Kconfig                           |    3 +
+ security/selinux/Makefile                          |    4 +-
+ security/selinux/hooks.c                           |   18 +-
+ security/selinux/include/conditional.h             |    8 +-
+ security/selinux/include/initial_sid_to_string.h   |   57 +-
+ security/selinux/include/security.h                |   12 +
+ security/selinux/selinuxfs.c                       |   19 +-
+ security/selinux/ss/avtab.c                        |    3 +-
+ security/selinux/ss/avtab.h                        |    2 +-
+ security/selinux/ss/conditional.c                  |  259 +-
+ security/selinux/ss/conditional.h                  |   29 +-
+ security/selinux/ss/hashtab.c                      |   28 +-
+ security/selinux/ss/hashtab.h                      |    2 +-
+ security/selinux/ss/policydb.c                     |  326 ++-
+ security/selinux/ss/policydb.h                     |   13 +-
+ security/selinux/ss/services.c                     |   79 +-
+ security/selinux/ss/services.h                     |    2 -
+ security/selinux/{ss => }/status.c                 |   32 +-
+ sound/pci/bt87x.c                                  |    7 +-
+ tools/bpf/bpftool/.gitignore                       |    2 +
+ .../bpf/bpftool/Documentation/bpftool-feature.rst  |   19 +-
+ tools/bpf/bpftool/Documentation/bpftool-prog.rst   |   22 +-
+ .../bpftool/Documentation/bpftool-struct_ops.rst   |  116 +
+ tools/bpf/bpftool/Makefile                         |   36 +-
+ tools/bpf/bpftool/bash-completion/bpftool          |  110 +-
+ tools/bpf/bpftool/btf.c                            |    5 +
+ tools/bpf/bpftool/btf_dumper.c                     |  199 +-
+ tools/bpf/bpftool/common.c                         |   40 +-
+ tools/bpf/bpftool/feature.c                        |  283 +-
+ tools/bpf/bpftool/main.c                           |   10 +-
+ tools/bpf/bpftool/main.h                           |   12 +-
+ tools/bpf/bpftool/map.c                            |    2 +-
+ tools/bpf/bpftool/prog.c                           |  458 +++-
+ tools/bpf/bpftool/skeleton/profiler.bpf.c          |  119 +
+ tools/bpf/bpftool/skeleton/profiler.h              |   46 +
+ tools/bpf/bpftool/struct_ops.c                     |  596 +++++
+ tools/bpf/runqslower/runqslower.bpf.c              |    4 +-
+ tools/build/feature/Makefile                       |    9 +-
+ tools/build/feature/test-clang-bpf-global-var.c    |    4 +
+ tools/include/uapi/linux/bpf.h                     |  324 ++-
+ tools/include/uapi/linux/if_link.h                 |    6 +-
+ .../selftests/bpf => }/include/uapi/linux/types.h  |    0
+ tools/lib/bpf/bpf.c                                |   37 +-
+ tools/lib/bpf/bpf.h                                |   19 +
+ tools/lib/bpf/bpf_tracing.h                        |  223 +-
+ tools/lib/bpf/btf.c                                |   20 +-
+ tools/lib/bpf/btf_dump.c                           |   10 +-
+ tools/lib/bpf/libbpf.c                             |  324 ++-
+ tools/lib/bpf/libbpf.h                             |   31 +-
+ tools/lib/bpf/libbpf.map                           |   19 +
+ tools/lib/bpf/libbpf_probes.c                      |    1 +
+ tools/lib/bpf/netlink.c                            |   34 +-
+ tools/lib/bpf/xsk.c                                |   16 +-
+ tools/power/x86/intel-speed-select/isst-config.c   |  583 +++-
+ tools/power/x86/intel-speed-select/isst-core.c     |  117 +-
+ tools/power/x86/intel-speed-select/isst-display.c  |  278 +-
+ tools/power/x86/intel-speed-select/isst.h          |   12 +-
+ tools/scripts/Makefile.include                     |    1 +
+ tools/testing/selftests/.gitignore                 |    5 +-
+ tools/testing/selftests/Makefile                   |    1 -
+ tools/testing/selftests/bpf/.gitignore             |    1 +
+ tools/testing/selftests/bpf/Makefile               |   33 +-
+ tools/testing/selftests/bpf/bpf_tcp_helpers.h      |    2 +-
+ tools/testing/selftests/bpf/bpf_trace_helpers.h    |  120 -
+ tools/testing/selftests/bpf/config                 |    2 +
+ .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c  |   39 +-
+ tools/testing/selftests/bpf/prog_tests/btf_dump.c  |    2 +-
+ .../bpf/prog_tests/cgroup_attach_autodetach.c      |    2 +-
+ .../selftests/bpf/prog_tests/cgroup_attach_multi.c |    2 +-
+ .../bpf/prog_tests/cgroup_attach_override.c        |    2 +-
+ .../testing/selftests/bpf/prog_tests/cgroup_link.c |  244 ++
+ .../selftests/bpf/prog_tests/fentry_fexit.c        |   12 +-
+ .../testing/selftests/bpf/prog_tests/fentry_test.c |   14 +-
+ .../testing/selftests/bpf/prog_tests/fexit_test.c  |   69 +-
+ .../selftests/bpf/prog_tests/get_stack_raw_tp.c    |    5 +
+ .../selftests/bpf/prog_tests/global_data_init.c    |   61 +
+ .../selftests/bpf/prog_tests/link_pinning.c        |  105 +
+ .../selftests/bpf/prog_tests/modify_return.c       |   65 +
+ .../selftests/bpf/prog_tests/ns_current_pid_tgid.c |   88 +
+ .../selftests/bpf/prog_tests/perf_branches.c       |  170 ++
+ .../selftests/bpf/prog_tests/select_reuseport.c    |   73 +-
+ tools/testing/selftests/bpf/prog_tests/sk_assign.c |  309 +++
+ tools/testing/selftests/bpf/prog_tests/skb_ctx.c   |    1 +
+ .../selftests/bpf/prog_tests/sockmap_ktls.c        |  124 +
+ .../selftests/bpf/prog_tests/sockmap_listen.c      | 1635 ++++++++++++
+ tools/testing/selftests/bpf/prog_tests/tcp_rtt.c   |   32 +-
+ tools/testing/selftests/bpf/prog_tests/test_lsm.c  |   86 +
+ .../selftests/bpf/prog_tests/trampoline_count.c    |   25 +-
+ tools/testing/selftests/bpf/prog_tests/vmlinux.c   |   43 +
+ .../testing/selftests/bpf/prog_tests/xdp_attach.c  |   62 +
+ .../testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c |   69 +-
+ tools/testing/selftests/bpf/progs/bpf_dctcp.c      |   18 +-
+ .../bpf/progs/btf_dump_test_case_syntax.c          |    2 +-
+ tools/testing/selftests/bpf/progs/fentry_test.c    |    2 +-
+ tools/testing/selftests/bpf/progs/fexit_bpf2bpf.c  |    2 +-
+ .../selftests/bpf/progs/fexit_bpf2bpf_simple.c     |    2 +-
+ tools/testing/selftests/bpf/progs/fexit_test.c     |    2 +-
+ tools/testing/selftests/bpf/progs/kfree_skb.c      |    2 +-
+ tools/testing/selftests/bpf/progs/lsm.c            |   48 +
+ tools/testing/selftests/bpf/progs/modify_return.c  |   49 +
+ .../selftests/bpf/progs/sockmap_parse_prog.c       |    1 -
+ .../selftests/bpf/progs/test_attach_probe.c        |    3 +-
+ .../testing/selftests/bpf/progs/test_cgroup_link.c |   24 +
+ .../selftests/bpf/progs/test_get_stack_rawtp_err.c |   26 +
+ .../testing/selftests/bpf/progs/test_global_data.c |    2 +-
+ .../selftests/bpf/progs/test_link_pinning.c        |   25 +
+ .../selftests/bpf/progs/test_ns_current_pid_tgid.c |   37 +
+ tools/testing/selftests/bpf/progs/test_overhead.c  |    7 +-
+ .../selftests/bpf/progs/test_perf_branches.c       |   50 +
+ .../testing/selftests/bpf/progs/test_perf_buffer.c |    2 +-
+ .../testing/selftests/bpf/progs/test_probe_user.c  |    1 -
+ tools/testing/selftests/bpf/progs/test_sk_assign.c |  204 ++
+ tools/testing/selftests/bpf/progs/test_skb_ctx.c   |    2 +
+ .../selftests/bpf/progs/test_sockmap_listen.c      |   98 +
+ .../selftests/bpf/progs/test_trampoline_count.c    |    3 +-
+ tools/testing/selftests/bpf/progs/test_vmlinux.c   |   84 +
+ .../testing/selftests/bpf/progs/test_xdp_bpf2bpf.c |   30 +-
+ tools/testing/selftests/bpf/test_bpftool.py        |  178 ++
+ tools/testing/selftests/bpf/test_bpftool.sh        |    5 +
+ .../selftests/bpf/test_current_pid_tgid_new_ns.c   |  159 ++
+ tools/testing/selftests/bpf/test_maps.c            |    6 +-
+ tools/testing/selftests/bpf/test_progs.c           |  102 +-
+ tools/testing/selftests/bpf/test_progs.h           |    9 +-
+ tools/testing/selftests/bpf/trace_helpers.c        |   23 +
+ tools/testing/selftests/bpf/trace_helpers.h        |    1 +
+ tools/testing/selftests/bpf/verifier/bounds.c      |   57 +-
+ .../testing/selftests/bpf/verifier/bpf_get_stack.c |    8 +-
+ tools/testing/selftests/bpf/verifier/ctx.c         |  105 +
+ tools/testing/selftests/bpf/verifier/ctx_skb.c     |   47 +
+ .../drivers/net/mlxsw/blackhole_routes.sh          |    5 +-
+ .../drivers/net/mlxsw/devlink_trap_acl_drops.sh    |  151 ++
+ .../drivers/net/mlxsw/devlink_trap_l2_drops.sh     |   28 +-
+ .../drivers/net/mlxsw/devlink_trap_l3_drops.sh     |   55 +-
+ .../drivers/net/mlxsw/devlink_trap_policer.sh      |  384 +++
+ .../drivers/net/mlxsw/devlink_trap_tunnel_vxlan.sh |    4 +-
+ .../testing/selftests/drivers/net/mlxsw/extack.sh  |   45 +-
+ .../selftests/drivers/net/mlxsw/mlxsw_lib.sh       |   13 +
+ .../selftests/drivers/net/mlxsw/qos_defprio.sh     |   18 +-
+ .../selftests/drivers/net/mlxsw/qos_dscp_router.sh |   30 +
+ .../selftests/drivers/net/mlxsw/router_scale.sh    |   53 +-
+ .../selftests/drivers/net/mlxsw/rtnetlink.sh       |   68 +-
+ .../testing/selftests/drivers/net/mlxsw/sch_ets.sh |   14 +-
+ .../selftests/drivers/net/mlxsw/sch_red_core.sh    |  533 ++++
+ .../selftests/drivers/net/mlxsw/sch_red_ets.sh     |   94 +
+ .../selftests/drivers/net/mlxsw/sch_red_prio.sh    |    5 +
+ .../selftests/drivers/net/mlxsw/sch_red_root.sh    |   68 +
+ .../selftests/drivers/net/mlxsw/sharedbuffer.sh    |  222 ++
+ .../net/mlxsw/sharedbuffer_configuration.py        |  416 +++
+ .../drivers/net/mlxsw/spectrum-2/resource_scale.sh |    5 +-
+ .../net/mlxsw/spectrum-2/tc_flower_scale.sh        |    4 +-
+ .../drivers/net/mlxsw/tc_action_hw_stats.sh        |  130 +
+ .../drivers/net/mlxsw/tc_flower_restrictions.sh    |  186 ++
+ .../selftests/drivers/net/mlxsw/tc_flower_scale.sh |   31 +-
+ tools/testing/selftests/drivers/net/mlxsw/vxlan.sh |  229 +-
+ .../selftests/drivers/net/netdevsim/devlink.sh     |   15 +
+ .../drivers/net/netdevsim/devlink_trap.sh          |  121 +
+ tools/testing/selftests/net/.gitignore             |    5 +
+ tools/testing/selftests/net/Makefile               |    4 +
+ tools/testing/selftests/net/config                 |    2 +
+ .../selftests/net/forwarding/devlink_lib.sh        |   72 +-
+ tools/testing/selftests/net/forwarding/lib.sh      |   88 +-
+ .../selftests/net/forwarding/pedit_dsfield.sh      |  238 ++
+ tools/testing/selftests/net/forwarding/sch_ets.sh  |    9 +-
+ .../selftests/net/forwarding/sch_ets_tests.sh      |   10 +-
+ .../selftests/net/forwarding/skbedit_priority.sh   |  168 ++
+ .../testing/selftests/net/forwarding/tc_common.sh  |   32 +-
+ .../timestamping => net}/hwtstamp_config.c         |    0
+ tools/testing/selftests/net/mptcp/.gitignore       |    1 +
+ tools/testing/selftests/net/mptcp/Makefile         |    7 +-
+ tools/testing/selftests/net/mptcp/mptcp_connect.c  |   71 +-
+ tools/testing/selftests/net/mptcp/mptcp_connect.sh |   24 +-
+ tools/testing/selftests/net/mptcp/mptcp_join.sh    |  357 +++
+ tools/testing/selftests/net/mptcp/pm_netlink.sh    |  130 +
+ tools/testing/selftests/net/mptcp/pm_nl_ctl.c      |  616 +++++
+ .../selftests/net/reuseaddr_ports_exhausted.c      |  162 ++
+ .../selftests/net/reuseaddr_ports_exhausted.sh     |   35 +
+ .../{networking/timestamping => net}/rxtimestamp.c |    0
+ .../timestamping => net}/timestamping.c            |    0
+ .../{networking/timestamping => net}/txtimestamp.c |  179 +-
+ .../timestamping => net}/txtimestamp.sh            |   33 +-
+ .../selftests/networking/timestamping/.gitignore   |    4 -
+ .../selftests/networking/timestamping/Makefile     |   11 -
+ .../selftests/networking/timestamping/config       |    2 -
+ tools/testing/selftests/tc-testing/config          |    6 +
+ .../tc-testing/tc-tests/filters/basic.json         |  902 +++++++
+ .../selftests/tc-testing/tc-tests/qdiscs/red.json  |  185 ++
+ tools/testing/vsock/vsock_test.c                   |   77 +
+ 2119 files changed, 128435 insertions(+), 35095 deletions(-)
+ create mode 100644 Documentation/ABI/obsolete/sysfs-selinux-checkreqprot
+ create mode 100644 Documentation/bpf/bpf_lsm.rst
+ create mode 100644 Documentation/bpf/drgn.rst
+ create mode 100644 Documentation/devicetree/bindings/net/dsa/ocelot.txt
+ create mode 100644 Documentation/devicetree/bindings/net/marvell,mvusb.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/qcom,ipa.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/qcom,ipq8064-mdio.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
+ create mode 100644 Documentation/devicetree/bindings/ptp/ptp-idt82p33.yaml
+ create mode 100644 Documentation/kbuild/llvm.rst
+ rename Documentation/networking/{6lowpan.txt => 6lowpan.rst} (64%)
+ create mode 100644 Documentation/networking/bareudp.rst
+ create mode 100644 Documentation/networking/devlink/devlink-flash.rst
+ create mode 100644 Documentation/networking/devlink/ice.rst
+ create mode 100644 Documentation/networking/page_pool.rst
+ create mode 100644 arch/riscv/net/bpf_jit.h
+ create mode 100644 arch/riscv/net/bpf_jit_comp32.c
+ rename arch/riscv/net/{bpf_jit_comp.c => bpf_jit_comp64.c} (69%)
+ create mode 100644 arch/riscv/net/bpf_jit_core.c
+ create mode 100644 drivers/crypto/chelsio/chcr_common.h
+ create mode 100644 drivers/crypto/chelsio/chcr_ktls.c
+ create mode 100644 drivers/crypto/chelsio/chcr_ktls.h
+ create mode 100644 drivers/mmc/host/mmc_hsq.c
+ create mode 100644 drivers/mmc/host/mmc_hsq.h
+ create mode 100644 drivers/net/bareudp.c
+ create mode 100644 drivers/net/dsa/sja1105/sja1105_flower.c
+ create mode 100644 drivers/net/dsa/sja1105/sja1105_sgmii.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_macsec.c
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_macsec.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/macsec/MSS_Egress_registers.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/macsec/MSS_Ingress_registers.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.c
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/macsec/macsec_struct.h
+ delete mode 100644 drivers/net/ethernet/aquantia/atlantic/ver.h
+ create mode 100644 drivers/net/ethernet/intel/ice/ice_devlink.c
+ create mode 100644 drivers/net/ethernet/intel/ice/ice_devlink.h
+ create mode 100644 drivers/net/ethernet/intel/igc/igc_dump.c
+ create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/devlink.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/devlink.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/mapping.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/mapping.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/esw/Makefile
+ rename drivers/net/ethernet/mellanox/mlx5/core/{eswitch_offloads_chains.c => esw/chains.c} (74%)
+ rename drivers/net/ethernet/mellanox/mlx5/core/{eswitch_offloads_chains.h => esw/chains.h} (60%)
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.h
+ delete mode 100644 drivers/net/ethernet/mscc/ocelot_vcap.h
+ create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
+ create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwxlgmac2.h
+ create mode 100644 drivers/net/ethernet/ti/am65-cpsw-ethtool.c
+ create mode 100644 drivers/net/ethernet/ti/am65-cpsw-nuss.c
+ create mode 100644 drivers/net/ethernet/ti/am65-cpsw-nuss.h
+ create mode 100644 drivers/net/ethernet/ti/k3-cppi-desc-pool.c
+ create mode 100644 drivers/net/ethernet/ti/k3-cppi-desc-pool.h
+ create mode 100644 drivers/net/ipa/Kconfig
+ create mode 100644 drivers/net/ipa/Makefile
+ create mode 100644 drivers/net/ipa/gsi.c
+ create mode 100644 drivers/net/ipa/gsi.h
+ create mode 100644 drivers/net/ipa/gsi_private.h
+ create mode 100644 drivers/net/ipa/gsi_reg.h
+ create mode 100644 drivers/net/ipa/gsi_trans.c
+ create mode 100644 drivers/net/ipa/gsi_trans.h
+ create mode 100644 drivers/net/ipa/ipa.h
+ create mode 100644 drivers/net/ipa/ipa_clock.c
+ create mode 100644 drivers/net/ipa/ipa_clock.h
+ create mode 100644 drivers/net/ipa/ipa_cmd.c
+ create mode 100644 drivers/net/ipa/ipa_cmd.h
+ create mode 100644 drivers/net/ipa/ipa_data-sc7180.c
+ create mode 100644 drivers/net/ipa/ipa_data-sdm845.c
+ create mode 100644 drivers/net/ipa/ipa_data.h
+ create mode 100644 drivers/net/ipa/ipa_endpoint.c
+ create mode 100644 drivers/net/ipa/ipa_endpoint.h
+ create mode 100644 drivers/net/ipa/ipa_gsi.c
+ create mode 100644 drivers/net/ipa/ipa_gsi.h
+ create mode 100644 drivers/net/ipa/ipa_interrupt.c
+ create mode 100644 drivers/net/ipa/ipa_interrupt.h
+ create mode 100644 drivers/net/ipa/ipa_main.c
+ create mode 100644 drivers/net/ipa/ipa_mem.c
+ create mode 100644 drivers/net/ipa/ipa_mem.h
+ create mode 100644 drivers/net/ipa/ipa_modem.c
+ create mode 100644 drivers/net/ipa/ipa_modem.h
+ create mode 100644 drivers/net/ipa/ipa_qmi.c
+ create mode 100644 drivers/net/ipa/ipa_qmi.h
+ create mode 100644 drivers/net/ipa/ipa_qmi_msg.c
+ create mode 100644 drivers/net/ipa/ipa_qmi_msg.h
+ create mode 100644 drivers/net/ipa/ipa_reg.c
+ create mode 100644 drivers/net/ipa/ipa_reg.h
+ create mode 100644 drivers/net/ipa/ipa_smp2p.c
+ create mode 100644 drivers/net/ipa/ipa_smp2p.h
+ create mode 100644 drivers/net/ipa/ipa_table.c
+ create mode 100644 drivers/net/ipa/ipa_table.h
+ create mode 100644 drivers/net/ipa/ipa_uc.c
+ create mode 100644 drivers/net/ipa/ipa_uc.h
+ create mode 100644 drivers/net/ipa/ipa_version.h
+ create mode 100644 drivers/net/phy/linkmode.c
+ create mode 100644 drivers/net/phy/mdio-ipq8064.c
+ create mode 100644 drivers/net/phy/mdio-mvusb.c
+ create mode 100644 drivers/net/phy/mdio-xpcs.c
+ create mode 100644 drivers/net/phy/mscc/Makefile
+ create mode 100644 drivers/net/phy/mscc/mscc.h
+ rename drivers/net/phy/{ => mscc}/mscc_fc_buffer.h (95%)
+ rename drivers/net/phy/{ => mscc}/mscc_mac.h (98%)
+ create mode 100644 drivers/net/phy/mscc/mscc_macsec.c
+ rename drivers/net/phy/{ => mscc}/mscc_macsec.h (90%)
+ rename drivers/net/phy/{mscc.c => mscc/mscc_main.c} (59%)
+ create mode 100644 drivers/net/wireless/ath/ath11k/thermal.c
+ create mode 100644 drivers/net/wireless/ath/ath11k/thermal.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/soc.h
+ delete mode 100644 drivers/net/wireless/mediatek/mt76/airtime.c
+ create mode 100644 drivers/net/wireless/mediatek/mt76/mt7615/mmio.c
+ create mode 100644 drivers/net/wireless/mediatek/mt76/mt7615/mt7615_trace.h
+ create mode 100644 drivers/net/wireless/mediatek/mt76/mt7615/soc.c
+ create mode 100644 drivers/net/wireless/mediatek/mt76/mt7615/trace.c
+ create mode 100644 drivers/platform/x86/surface3_power.c
+ create mode 100644 drivers/ptp/ptp_idt82p33.c
+ create mode 100644 drivers/ptp/ptp_idt82p33.h
+ create mode 100644 drivers/ptp/ptp_vmw.c
+ create mode 100644 drivers/remoteproc/qcom_q6v5_ipa_notify.c
+ create mode 100644 drivers/tty/serial/8250/8250_tegra.c
+ create mode 100644 fs/btrfs/reflink.c
+ create mode 100644 fs/btrfs/reflink.h
+ create mode 100644 include/linux/bpf_lsm.h
+ create mode 100644 include/linux/lsm_hook_defs.h
+ create mode 100644 include/linux/mdio-xpcs.h
+ create mode 100644 include/linux/remoteproc/qcom_q6v5_ipa_notify.h
+ create mode 100644 include/net/bareudp.h
+ create mode 100644 include/net/rpl.h
+ create mode 100644 include/soc/mscc/ocelot_vcap.h
+ create mode 100644 include/uapi/linux/mptcp.h
+ create mode 100644 include/uapi/linux/rpl.h
+ create mode 100644 include/uapi/linux/rpl_iptunnel.h
+ create mode 100644 kernel/bpf/bpf_lsm.c
+ create mode 100644 net/ethtool/channels.c
+ create mode 100644 net/ethtool/coalesce.c
+ create mode 100644 net/ethtool/eee.c
+ create mode 100644 net/ethtool/features.c
+ create mode 100644 net/ethtool/pause.c
+ create mode 100644 net/ethtool/privflags.c
+ create mode 100644 net/ethtool/rings.c
+ create mode 100644 net/ethtool/tsinfo.c
+ create mode 100644 net/ipv4/udp_bpf.c
+ create mode 100644 net/ipv6/rpl.c
+ create mode 100644 net/ipv6/rpl_iptunnel.c
+ create mode 100644 net/mptcp/diag.c
+ create mode 100644 net/mptcp/mib.c
+ create mode 100644 net/mptcp/mib.h
+ create mode 100644 net/mptcp/pm.c
+ create mode 100644 net/mptcp/pm_netlink.c
+ delete mode 100644 net/netfilter/nf_tables_set_core.c
+ create mode 100644 net/netfilter/nft_set_pipapo.h
+ create mode 100644 net/netfilter/nft_set_pipapo_avx2.c
+ create mode 100644 net/netfilter/nft_set_pipapo_avx2.h
+ create mode 100644 net/qrtr/ns.c
+ create mode 100755 scripts/gen_autoksyms.sh
+ create mode 100644 security/bpf/Makefile
+ create mode 100644 security/bpf/hooks.c
+ rename security/selinux/{ss => }/status.c (81%)
+ create mode 100644 tools/bpf/bpftool/Documentation/bpftool-struct_ops.rst
+ create mode 100644 tools/bpf/bpftool/skeleton/profiler.bpf.c
+ create mode 100644 tools/bpf/bpftool/skeleton/profiler.h
+ create mode 100644 tools/bpf/bpftool/struct_ops.c
+ create mode 100644 tools/build/feature/test-clang-bpf-global-var.c
+ rename tools/{testing/selftests/bpf => }/include/uapi/linux/types.h (100%)
+ delete mode 100644 tools/testing/selftests/bpf/bpf_trace_helpers.h
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_link.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/global_data_init.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/link_pinning.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/modify_return.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/perf_branches.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/sk_assign.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/test_lsm.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/vmlinux.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_attach.c
+ create mode 100644 tools/testing/selftests/bpf/progs/lsm.c
+ create mode 100644 tools/testing/selftests/bpf/progs/modify_return.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_cgroup_link.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_get_stack_rawtp_err.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_link_pinning.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_ns_current_pid_tgid.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_perf_branches.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_sk_assign.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_listen.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_vmlinux.c
+ create mode 100644 tools/testing/selftests/bpf/test_bpftool.py
+ create mode 100755 tools/testing/selftests/bpf/test_bpftool.sh
+ create mode 100644 tools/testing/selftests/bpf/test_current_pid_tgid_new_ns.c
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/devlink_trap_acl_drops.sh
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/devlink_trap_policer.sh
+ create mode 100644 tools/testing/selftests/drivers/net/mlxsw/mlxsw_lib.sh
+ create mode 100644 tools/testing/selftests/drivers/net/mlxsw/sch_red_core.sh
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/sch_red_ets.sh
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/sch_red_prio.sh
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/sch_red_root.sh
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/sharedbuffer.sh
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/sharedbuffer_configuration.py
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/tc_action_hw_stats.sh
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/tc_flower_restrictions.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/pedit_dsfield.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/skbedit_priority.sh
+ rename tools/testing/selftests/{networking/timestamping => net}/hwtstamp_config.c (100%)
+ create mode 100755 tools/testing/selftests/net/mptcp/mptcp_join.sh
+ create mode 100755 tools/testing/selftests/net/mptcp/pm_netlink.sh
+ create mode 100644 tools/testing/selftests/net/mptcp/pm_nl_ctl.c
+ create mode 100644 tools/testing/selftests/net/reuseaddr_ports_exhausted.c
+ create mode 100755 tools/testing/selftests/net/reuseaddr_ports_exhausted.sh
+ rename tools/testing/selftests/{networking/timestamping => net}/rxtimestamp.c (100%)
+ rename tools/testing/selftests/{networking/timestamping => net}/timestamping.c (100%)
+ rename tools/testing/selftests/{networking/timestamping => net}/txtimestamp.c (81%)
+ rename tools/testing/selftests/{networking/timestamping => net}/txtimestamp.sh (74%)
+ delete mode 100644 tools/testing/selftests/networking/timestamping/.gitignore
+ delete mode 100644 tools/testing/selftests/networking/timestamping/Makefile
+ delete mode 100644 tools/testing/selftests/networking/timestamping/config
+ create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/red.json
+Merging fixes/master (5ed25ddf2c86 Revert "irqchip/xilinx: Enable generic irq multi handler")
+$ git merge fixes/master
+Merge made by the 'recursive' strategy.
+ arch/microblaze/Kconfig           |  2 --
+ arch/microblaze/include/asm/irq.h |  3 +++
+ arch/microblaze/kernel/irq.c      | 21 ++++++++++++++++++++-
+ drivers/irqchip/irq-xilinx-intc.c | 35 +++++++++++++++--------------------
+ 4 files changed, 38 insertions(+), 23 deletions(-)
+Merging kbuild-current/fixes (e595dd94515e Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
+$ git merge kbuild-current/fixes
+Already up to date.
+Merging arc-current/for-curr (f09d3174f002 ARC: allow userspace DSP applications to use AGU extensions)
+$ git merge arc-current/for-curr
+Merge made by the 'recursive' strategy.
+ arch/arc/Kconfig                   |  50 ++++++++++++-
+ arch/arc/boot/dts/axs10x_mb.dtsi   |   1 -
+ arch/arc/include/asm/arcregs.h     |  26 +++++++
+ arch/arc/include/asm/asserts.h     |  34 +++++++++
+ arch/arc/include/asm/dsp-impl.h    | 150 +++++++++++++++++++++++++++++++++++++
+ arch/arc/include/asm/dsp.h         |  29 +++++++
+ arch/arc/include/asm/entry-arcv2.h |   6 ++
+ arch/arc/include/asm/processor.h   |   4 +
+ arch/arc/include/asm/ptrace.h      |   3 +
+ arch/arc/include/asm/switch_to.h   |   2 +
+ arch/arc/kernel/asm-offsets.c      |   4 +
+ arch/arc/kernel/head.S             |   4 +
+ arch/arc/kernel/setup.c            |  34 +++++----
+ 13 files changed, 332 insertions(+), 15 deletions(-)
+ create mode 100644 arch/arc/include/asm/asserts.h
+ create mode 100644 arch/arc/include/asm/dsp-impl.h
+ create mode 100644 arch/arc/include/asm/dsp.h
+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 (16fbf79b0f83 Linux 5.6-rc7)
+$ git merge s390-fixes/fixes
+Already up to date.
+Merging sparc/master (11648b8339f8 sparc64: fix adjtimex regression)
+$ 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 (d61f4d61ff7f dt-bindings: net: mvusb: Fix example errors)
+$ git merge net/master
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/net/marvell,mvusb.yaml     | 29 +++++++-------
+ drivers/net/can/slcan.c                            |  4 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c   |  3 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |  5 ++-
+ .../net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c   | 23 +++++++++++
+ .../net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.h   |  1 +
+ drivers/net/ethernet/faraday/ftgmac100.c           |  2 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  | 17 ++++++---
+ drivers/net/phy/at803x.c                           |  4 +-
+ net/ipv6/addrconf.c                                |  4 ++
+ net/sched/cls_tcindex.c                            | 44 +++++++++++++++++++---
+ 11 files changed, 102 insertions(+), 34 deletions(-)
+Merging bpf/master (b9258a2cece4 slcan: Don't transmit uninitialized stack data in padding)
+$ git merge bpf/master
+Already up to date.
+Merging ipsec/master (0141317611ab Merge branch 'hns3-fixes')
+$ git merge ipsec/master
+Already up to date.
+Merging netfilter/master (d61f4d61ff7f dt-bindings: net: mvusb: Fix example errors)
+$ 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 (0433ae556ec8 iwlwifi: don't send GEO_TX_POWER_LIMIT if no wgds table)
+$ git merge wireless-drivers/master
+Already up to date.
+Merging mac80211/master (a0ba26f37ea0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf)
+$ git merge mac80211/master
+Already up to date.
+Merging rdma-fixes/for-rc (7111951b8d49 Linux 5.6)
+$ git merge rdma-fixes/for-rc
+Already up to date.
+Merging sound-current/for-linus (5c6cd7021a05 ALSA: usb-audio: Fix case when USB MIDI interface has more than one extra endpoint descriptor)
+$ git merge sound-current/for-linus
+Auto-merging sound/soc/ti/omap-mcpdm.c
+Auto-merging sound/soc/ti/omap-mcbsp.c
+Auto-merging sound/core/pcm_native.c
+Auto-merging include/linux/usb/audio-v2.h
+Auto-merging drivers/spi/Kconfig
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt
+Removing Documentation/devicetree/bindings/sound/st,stm32-i2s.txt
+Removing Documentation/devicetree/bindings/sound/rockchip-i2s.txt
+Removing Documentation/devicetree/bindings/sound/ingenic,jz4740-i2s.txt
+Removing Documentation/devicetree/bindings/sound/google,cros-ec-codec.txt
+Removing Documentation/devicetree/bindings/sound/cs42l51.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/sound/amlogic,aiu.yaml     |  113 ++
+ .../bindings/sound/amlogic,g12a-toacodec.yaml      |   51 +
+ .../bindings/sound/amlogic,gx-sound-card.yaml      |  113 ++
+ .../devicetree/bindings/sound/amlogic,t9015.yaml   |   58 +
+ .../bindings/sound/brcm,bcm63xx-audio.txt          |   29 +
+ .../devicetree/bindings/sound/cirrus,cs42l51.yaml  |   69 +
+ .../devicetree/bindings/sound/cs42l51.txt          |   33 -
+ .../bindings/sound/google,cros-ec-codec.txt        |   44 -
+ .../bindings/sound/google,cros-ec-codec.yaml       |   67 +
+ .../devicetree/bindings/sound/ingenic,aic.yaml     |   92 ++
+ .../bindings/sound/ingenic,jz4740-i2s.txt          |   23 -
+ .../bindings/sound/nvidia,tegra-audio-wm8903.txt   |    1 +
+ .../bindings/sound/rockchip,rk3328-codec.txt       |    7 +-
+ .../devicetree/bindings/sound/rockchip-i2s.txt     |   49 -
+ .../devicetree/bindings/sound/rockchip-i2s.yaml    |  111 ++
+ Documentation/devicetree/bindings/sound/rt5682.txt |   18 +
+ .../devicetree/bindings/sound/st,stm32-i2s.txt     |   62 -
+ .../devicetree/bindings/sound/st,stm32-i2s.yaml    |   87 ++
+ .../devicetree/bindings/sound/st,stm32-spdifrx.txt |   56 -
+ .../bindings/sound/st,stm32-spdifrx.yaml           |   80 +
+ .../devicetree/bindings/sound/tas2562.txt          |    2 +-
+ .../devicetree/bindings/sound/tlv320adcx140.yaml   |   82 +
+ Documentation/sound/alsa-configuration.rst         |   13 +
+ Documentation/sound/hd-audio/index.rst             |    1 +
+ Documentation/sound/hd-audio/models.rst            |    2 -
+ Documentation/sound/hd-audio/realtek-pc-beep.rst   |  129 ++
+ Documentation/sound/soc/codec-to-codec.rst         |    9 +-
+ MAINTAINERS                                        |   15 +-
+ drivers/gpu/drm/mediatek/mtk_hdmi.c                |   54 +-
+ drivers/soundwire/qcom.c                           |    7 +-
+ drivers/soundwire/stream.c                         |   16 +-
+ drivers/spi/Kconfig                                |    2 +-
+ include/dt-bindings/sound/meson-aiu.h              |   18 +
+ include/dt-bindings/sound/meson-g12a-toacodec.h    |   10 +
+ include/linux/soundwire/sdw.h                      |    2 +
+ include/linux/usb/audio-v2.h                       |   12 +
+ include/sound/compress_driver.h                    |   40 +-
+ include/sound/core.h                               |    1 +
+ include/sound/hdaudio.h                            |    2 +
+ include/sound/pcm.h                                |   23 +-
+ include/sound/pcm_params.h                         |    7 +
+ include/sound/rt5682.h                             |   10 +
+ include/sound/soc-acpi.h                           |   39 +-
+ include/sound/soc-dai.h                            |   44 +-
+ include/sound/soc-dapm.h                           |    6 +
+ include/sound/soc-dpcm.h                           |   20 +-
+ include/sound/soc.h                                |   44 +-
+ include/sound/sof/dai-intel.h                      |   18 +-
+ include/sound/sof/header.h                         |   11 +
+ include/sound/sof/info.h                           |   22 +-
+ include/sound/sof/topology.h                       |    3 +-
+ include/uapi/sound/asoc.h                          |    1 +
+ include/uapi/sound/compress_offload.h              |    2 +-
+ include/uapi/sound/compress_params.h               |   37 +-
+ include/uapi/sound/sof/abi.h                       |    2 +-
+ sound/arm/pxa2xx-pcm-lib.c                         |    8 +-
+ sound/core/compress_offload.c                      |   42 +
+ sound/core/device.c                                |   21 +
+ sound/core/info.c                                  |    2 +-
+ sound/core/oss/pcm_oss.c                           |   23 +-
+ sound/core/oss/pcm_plugin.c                        |  120 +-
+ sound/core/oss/rate.c                              |    2 +-
+ sound/core/pcm.c                                   |    2 +-
+ sound/core/pcm_dmaengine.c                         |    8 +-
+ sound/core/pcm_misc.c                              |   35 +-
+ sound/core/pcm_native.c                            |   47 +-
+ sound/drivers/aloop.c                              |    6 +-
+ sound/drivers/dummy.c                              |    6 +-
+ sound/firewire/bebob/bebob.c                       |    2 +-
+ sound/firewire/digi00x/digi00x.c                   |    2 +-
+ sound/firewire/fireface/ff.c                       |    2 +-
+ sound/firewire/fireworks/fireworks.c               |    2 +-
+ sound/firewire/tascam/tascam-hwdep.c               |    2 +
+ sound/firewire/tascam/tascam.c                     |    2 +-
+ sound/hda/hdac_device.c                            |    2 +-
+ sound/isa/sb/emu8000_pcm.c                         |    4 +-
+ sound/pci/ali5451/ali5451.c                        |    6 +-
+ sound/pci/emu10k1/emu10k1_main.c                   |    4 +-
+ sound/pci/hda/Kconfig                              |    1 +
+ sound/pci/hda/hda_codec.c                          |    2 +-
+ sound/pci/hda/hda_controller.c                     |    2 +-
+ sound/pci/hda/patch_ca0132.c                       |    3 +-
+ sound/pci/hda/patch_hdmi.c                         |  313 ++--
+ sound/pci/hda/patch_realtek.c                      |  231 +--
+ sound/pci/korg1212/korg1212.c                      |    2 +-
+ sound/pci/rme9652/hdsp.c                           |    3 +-
+ sound/pci/via82xx.c                                |    6 +-
+ sound/pci/via82xx_modem.c                          |    6 +-
+ sound/ppc/keywest.c                                |    9 +-
+ sound/soc/amd/Kconfig                              |   10 +
+ sound/soc/amd/Makefile                             |    2 +
+ sound/soc/amd/acp-da7219-max98357a.c               |    2 +-
+ sound/soc/amd/acp-rt5645.c                         |    4 +-
+ sound/soc/amd/acp3x-rt5682-max9836.c               |  376 +++++
+ sound/soc/amd/raven/acp3x-i2s.c                    |   44 +-
+ sound/soc/amd/raven/acp3x-pcm-dma.c                |    6 +-
+ sound/soc/amd/raven/pci-acp3x.c                    |    7 +-
+ sound/soc/atmel/atmel-pcm-dma.c                    |    4 +-
+ sound/soc/atmel/atmel-pcm-pdc.c                    |    2 +-
+ sound/soc/atmel/atmel_wm8904.c                     |    2 +-
+ sound/soc/atmel/mchp-i2s-mcc.c                     |    8 +-
+ sound/soc/atmel/mikroe-proto.c                     |    2 +-
+ sound/soc/atmel/sam9g20_wm8731.c                   |    2 +-
+ sound/soc/atmel/sam9x5_wm8731.c                    |    2 +-
+ sound/soc/au1x/db1200.c                            |    2 +-
+ sound/soc/au1x/dbdma2.c                            |    2 +-
+ sound/soc/au1x/dma.c                               |    2 +-
+ sound/soc/au1x/psc-ac97.c                          |    2 +-
+ sound/soc/bcm/Kconfig                              |    9 +
+ sound/soc/bcm/Makefile                             |    4 +
+ sound/soc/bcm/bcm63xx-i2s-whistler.c               |  317 ++++
+ sound/soc/bcm/bcm63xx-i2s.h                        |   90 ++
+ sound/soc/bcm/bcm63xx-pcm-whistler.c               |  485 ++++++
+ sound/soc/bcm/cygnus-pcm.c                         |   22 +-
+ sound/soc/cirrus/edb93xx.c                         |    4 +-
+ sound/soc/cirrus/snappercl15.c                     |    4 +-
+ sound/soc/codecs/Kconfig                           |  627 ++++----
+ sound/soc/codecs/Makefile                          |    4 +
+ sound/soc/codecs/cros_ec_codec.c                   |   25 +-
+ sound/soc/codecs/cs4271.c                          |    4 +-
+ sound/soc/codecs/cs47l15.c                         |    4 +-
+ sound/soc/codecs/cs47l24.c                         |    6 +-
+ sound/soc/codecs/cs47l35.c                         |    6 +-
+ sound/soc/codecs/cs47l85.c                         |    6 +-
+ sound/soc/codecs/cs47l90.c                         |    6 +-
+ sound/soc/codecs/cs47l92.c                         |    4 +-
+ sound/soc/codecs/hdac_hdmi.c                       |    6 +-
+ sound/soc/codecs/max98357a.c                       |   37 +-
+ sound/soc/codecs/mt6660.c                          |   81 +-
+ sound/soc/codecs/rk3328_codec.c                    |   31 +-
+ sound/soc/codecs/rl6231.c                          |    1 +
+ sound/soc/codecs/rl6231.h                          |    2 +-
+ sound/soc/codecs/rt1015.c                          |   10 +-
+ sound/soc/codecs/rt1308-sdw.c                      |   38 +-
+ sound/soc/codecs/rt1308-sdw.h                      |    2 +
+ sound/soc/codecs/rt5659.c                          |    2 +-
+ sound/soc/codecs/rt5682-sdw.c                      |  333 ++++
+ sound/soc/codecs/rt5682-sdw.h                      |   20 +
+ sound/soc/codecs/rt5682.c                          | 1298 ++++++++++++++--
+ sound/soc/codecs/rt5682.h                          |  100 +-
+ sound/soc/codecs/tas2562.c                         |  121 +-
+ sound/soc/codecs/tas2562.h                         |   12 +-
+ sound/soc/codecs/tlv320adcx140.c                   |  920 +++++++++++
+ sound/soc/codecs/tlv320adcx140.h                   |  131 ++
+ sound/soc/codecs/wcd9335.c                         |   18 +-
+ sound/soc/codecs/wcd9335.h                         |    7 +-
+ sound/soc/codecs/wcd934x.c                         |   37 +-
+ sound/soc/codecs/wm0010.c                          |    2 +-
+ sound/soc/codecs/wm5110.c                          |    6 +-
+ sound/soc/codecs/wm8974.c                          |    8 -
+ sound/soc/codecs/wm_adsp.c                         |   14 +-
+ sound/soc/codecs/wsa881x.c                         |   46 +-
+ sound/soc/dwc/dwc-i2s.c                            |    8 +-
+ sound/soc/dwc/dwc-pcm.c                            |    2 +-
+ sound/soc/fsl/eukrea-tlv320.c                      |    4 +-
+ sound/soc/fsl/fsl-asoc-card.c                      |   10 +-
+ sound/soc/fsl/fsl_asrc_dma.c                       |   10 +-
+ sound/soc/fsl/fsl_spdif.c                          |   10 +-
+ sound/soc/fsl/fsl_ssi.c                            |    8 +-
+ sound/soc/fsl/imx-audmix.c                         |    8 +-
+ sound/soc/fsl/imx-mc13783.c                        |    4 +-
+ sound/soc/fsl/imx-sgtl5000.c                       |    2 +-
+ sound/soc/fsl/mpc5200_dma.c                        |   10 +-
+ sound/soc/fsl/mpc5200_psc_i2s.c                    |    2 +-
+ sound/soc/fsl/mpc8610_hpcd.c                       |    4 +-
+ sound/soc/fsl/mx27vis-aic32x4.c                    |    4 +-
+ sound/soc/fsl/p1022_ds.c                           |    4 +-
+ sound/soc/fsl/p1022_rdk.c                          |    4 +-
+ sound/soc/fsl/wm1133-ev1.c                         |    6 +-
+ sound/soc/generic/simple-card-utils.c              |   60 +-
+ sound/soc/img/img-i2s-in.c                         |    2 +-
+ sound/soc/img/img-i2s-out.c                        |    2 +-
+ sound/soc/intel/atom/sst-atom-controls.c           |    2 +-
+ sound/soc/intel/atom/sst-mfld-platform-pcm.c       |    6 +-
+ sound/soc/intel/atom/sst/sst_pci.c                 |    2 +-
+ sound/soc/intel/boards/Kconfig                     |   57 +-
+ sound/soc/intel/boards/Makefile                    |   12 +-
+ sound/soc/intel/boards/bdw-rt5650.c                |   15 +-
+ sound/soc/intel/boards/bdw-rt5677.c                |   15 +-
+ sound/soc/intel/boards/broadwell.c                 |   13 +-
+ sound/soc/intel/boards/bxt_da7219_max98357a.c      |   10 +-
+ sound/soc/intel/boards/bxt_rt298.c                 |   10 +-
+ sound/soc/intel/boards/byt-max98090.c              |    2 +-
+ sound/soc/intel/boards/byt-rt5640.c                |    4 +-
+ sound/soc/intel/boards/bytcht_cx2072x.c            |   10 +-
+ sound/soc/intel/boards/bytcht_da7213.c             |   10 +-
+ sound/soc/intel/boards/bytcht_es8316.c             |    8 +-
+ sound/soc/intel/boards/bytcht_nocodec.c            |    4 +-
+ sound/soc/intel/boards/bytcr_rt5640.c              |    8 +-
+ sound/soc/intel/boards/bytcr_rt5651.c              |    8 +-
+ sound/soc/intel/boards/cht_bsw_max98090_ti.c       |    8 +-
+ sound/soc/intel/boards/cht_bsw_nau8824.c           |    6 +-
+ sound/soc/intel/boards/cht_bsw_rt5645.c            |   16 +-
+ sound/soc/intel/boards/cht_bsw_rt5672.c            |    8 +-
+ sound/soc/intel/boards/cml_rt1011_rt5682.c         |   13 +-
+ sound/soc/intel/boards/glk_rt5682_max98357a.c      |   13 +-
+ sound/soc/intel/boards/haswell.c                   |    4 +-
+ sound/soc/intel/boards/kbl_da7219_max98357a.c      |    8 +-
+ sound/soc/intel/boards/kbl_da7219_max98927.c       |   14 +-
+ sound/soc/intel/boards/kbl_rt5660.c                |    6 +-
+ sound/soc/intel/boards/kbl_rt5663_max98927.c       |   12 +-
+ .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c  |   12 +-
+ sound/soc/intel/boards/skl_hda_dsp_common.h        |    4 +
+ sound/soc/intel/boards/skl_hda_dsp_generic.c       |   27 +-
+ sound/soc/intel/boards/skl_nau88l25_max98357a.c    |   14 +-
+ sound/soc/intel/boards/skl_nau88l25_ssm4567.c      |   19 +-
+ sound/soc/intel/boards/skl_rt286.c                 |    8 +-
+ sound/soc/intel/boards/sof_da7219_max98373.c       |   83 +-
+ sound/soc/intel/boards/sof_maxim_common.c          |   80 +
+ sound/soc/intel/boards/sof_maxim_common.h          |   24 +
+ sound/soc/intel/boards/sof_pcm512x.c               |  448 ++++++
+ sound/soc/intel/boards/sof_rt5682.c                |  137 +-
+ sound/soc/intel/boards/sof_sdw.c                   |  962 ++++++++++++
+ sound/soc/intel/boards/sof_sdw_common.h            |  114 ++
+ sound/soc/intel/boards/sof_sdw_dmic.c              |   42 +
+ sound/soc/intel/boards/sof_sdw_hdmi.c              |   97 ++
+ sound/soc/intel/boards/sof_sdw_rt1308.c            |  151 ++
+ sound/soc/intel/boards/sof_sdw_rt5682.c            |  126 ++
+ sound/soc/intel/boards/sof_sdw_rt700.c             |  125 ++
+ sound/soc/intel/boards/sof_sdw_rt711.c             |  156 ++
+ sound/soc/intel/boards/sof_sdw_rt715.c             |   42 +
+ sound/soc/intel/common/soc-acpi-intel-bxt-match.c  |    2 +-
+ sound/soc/intel/common/soc-acpi-intel-cht-match.c  |    7 +
+ sound/soc/intel/common/soc-acpi-intel-cml-match.c  |  111 +-
+ sound/soc/intel/common/soc-acpi-intel-icl-match.c  |  103 +-
+ sound/soc/intel/common/soc-acpi-intel-jsl-match.c  |   34 +-
+ sound/soc/intel/common/soc-acpi-intel-tgl-match.c  |   92 +-
+ sound/soc/intel/haswell/sst-haswell-pcm.c          |   26 +-
+ sound/soc/intel/skylake/bxt-sst.c                  |    3 -
+ sound/soc/intel/skylake/cnl-sst.c                  |   35 +-
+ sound/soc/intel/skylake/skl-nhlt.c                 |    3 +-
+ sound/soc/intel/skylake/skl-pcm.c                  |   20 +-
+ sound/soc/intel/skylake/skl-sst-dsp.h              |    2 +
+ sound/soc/intel/skylake/skl.c                      |   33 +-
+ sound/soc/jz4740/jz4740-i2s.c                      |   78 +-
+ sound/soc/kirkwood/armada-370-db.c                 |    2 +-
+ sound/soc/kirkwood/kirkwood-dma.c                  |    2 +-
+ sound/soc/mediatek/common/mtk-afe-fe-dai.c         |   10 +-
+ .../soc/mediatek/common/mtk-afe-platform-driver.c  |    2 +-
+ sound/soc/mediatek/mt2701/mt2701-afe-pcm.c         |    2 +-
+ sound/soc/mediatek/mt2701/mt2701-cs42448.c         |    4 +-
+ sound/soc/mediatek/mt2701/mt2701-wm8960.c          |    4 +-
+ sound/soc/mediatek/mt6797/mt6797-afe-pcm.c         |    2 +-
+ sound/soc/mediatek/mt8173/mt8173-afe-pcm.c         |    2 +-
+ sound/soc/mediatek/mt8173/mt8173-max98090.c        |    4 +-
+ sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c   |    4 +-
+ sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c   |    6 +-
+ sound/soc/mediatek/mt8173/mt8173-rt5650.c          |   23 +-
+ sound/soc/mediatek/mt8183/mt8183-afe-pcm.c         |    2 +-
+ sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c |  117 +-
+ .../mt8183/mt8183-mt6358-ts3a227-max98357.c        |    2 +-
+ sound/soc/meson/Kconfig                            |   41 +
+ sound/soc/meson/Makefile                           |   19 +
+ sound/soc/meson/aiu-acodec-ctrl.c                  |  203 +++
+ sound/soc/meson/aiu-codec-ctrl.c                   |  151 ++
+ sound/soc/meson/aiu-encoder-i2s.c                  |  365 +++++
+ sound/soc/meson/aiu-encoder-spdif.c                |  209 +++
+ sound/soc/meson/aiu-fifo-i2s.c                     |  153 ++
+ sound/soc/meson/aiu-fifo-spdif.c                   |  186 +++
+ sound/soc/meson/aiu-fifo.c                         |  223 +++
+ sound/soc/meson/aiu-fifo.h                         |   50 +
+ sound/soc/meson/aiu.c                              |  388 +++++
+ sound/soc/meson/aiu.h                              |   89 ++
+ sound/soc/meson/axg-card.c                         |  414 +----
+ sound/soc/meson/axg-fifo.c                         |    2 +-
+ sound/soc/meson/g12a-toacodec.c                    |  252 +++
+ sound/soc/meson/g12a-tohdmitx.c                    |  219 +--
+ sound/soc/meson/gx-card.c                          |  141 ++
+ sound/soc/meson/meson-card-utils.c                 |  385 +++++
+ sound/soc/meson/meson-card.h                       |   55 +
+ sound/soc/meson/meson-codec-glue.c                 |  149 ++
+ sound/soc/meson/meson-codec-glue.h                 |   32 +
+ sound/soc/meson/t9015.c                            |  333 ++++
+ sound/soc/mxs/mxs-sgtl5000.c                       |    4 +-
+ sound/soc/pxa/Kconfig                              |   22 +
+ sound/soc/pxa/brownstone.c                         |    4 +-
+ sound/soc/pxa/corgi.c                              |    4 +-
+ sound/soc/pxa/hx4700.c                             |    4 +-
+ sound/soc/pxa/imote2.c                             |    4 +-
+ sound/soc/pxa/magician.c                           |   14 +-
+ sound/soc/pxa/mioa701_wm9713.c                     |    4 +-
+ sound/soc/pxa/mmp-pcm.c                            |    2 +-
+ sound/soc/pxa/mmp-sspa.c                           |    2 +-
+ sound/soc/pxa/poodle.c                             |    4 +-
+ sound/soc/pxa/pxa2xx-i2s.c                         |    2 +-
+ sound/soc/pxa/spitz.c                              |    4 +-
+ sound/soc/pxa/ttc-dkb.c                            |    2 +-
+ sound/soc/pxa/z2.c                                 |    4 +-
+ sound/soc/pxa/zylonite.c                           |    6 +-
+ sound/soc/qcom/Kconfig                             |    2 +-
+ sound/soc/qcom/apq8016_sbc.c                       |    9 +-
+ sound/soc/qcom/apq8096.c                           |    6 +-
+ sound/soc/qcom/lpass-platform.c                    |    4 +-
+ sound/soc/qcom/qdsp6/q6asm-dai.c                   |  173 ++-
+ sound/soc/qcom/qdsp6/q6asm.c                       |  243 ++-
+ sound/soc/qcom/qdsp6/q6asm.h                       |   51 +-
+ sound/soc/qcom/qdsp6/q6routing.c                   |   21 +-
+ sound/soc/qcom/sdm845.c                            |  105 +-
+ sound/soc/qcom/storm.c                             |    2 +-
+ sound/soc/rockchip/rk3288_hdmi_analog.c            |    4 +-
+ sound/soc/rockchip/rk3399_gru_sound.c              |   16 +-
+ sound/soc/rockchip/rockchip_max98090.c             |    6 +-
+ sound/soc/rockchip/rockchip_rt5645.c               |    6 +-
+ sound/soc/samsung/Kconfig                          |    4 +-
+ sound/soc/samsung/arndale.c                        |   10 +-
+ sound/soc/samsung/bells.c                          |   16 +-
+ sound/soc/samsung/h1940_uda1380.c                  |    2 +-
+ sound/soc/samsung/i2s.c                            |    2 +-
+ sound/soc/samsung/jive_wm8750.c                    |    4 +-
+ sound/soc/samsung/littlemill.c                     |   16 +-
+ sound/soc/samsung/lowland.c                        |    6 +-
+ sound/soc/samsung/neo1973_wm8753.c                 |   10 +-
+ sound/soc/samsung/odroid.c                         |    6 +-
+ sound/soc/samsung/pcm.c                            |    4 +-
+ sound/soc/samsung/rx1950_uda1380.c                 |    2 +-
+ sound/soc/samsung/s3c-i2s-v2.c                     |    2 +-
+ sound/soc/samsung/s3c24xx_simtec.c                 |    4 +-
+ sound/soc/samsung/s3c24xx_uda134x.c                |    6 +-
+ sound/soc/samsung/smartq_wm8987.c                  |    4 +-
+ sound/soc/samsung/smdk_spdif.c                     |    2 +-
+ sound/soc/samsung/smdk_wm8580.c                    |    2 +-
+ sound/soc/samsung/smdk_wm8994.c                    |    4 +-
+ sound/soc/samsung/smdk_wm8994pcm.c                 |    6 +-
+ sound/soc/samsung/snow.c                           |    8 +-
+ sound/soc/samsung/spdif.c                          |    8 +-
+ sound/soc/samsung/speyside.c                       |   10 +-
+ sound/soc/samsung/tm2_wm5110.c                     |   19 +-
+ sound/soc/samsung/tobermory.c                      |   10 +-
+ sound/soc/sh/dma-sh7760.c                          |   16 +-
+ sound/soc/sh/fsi.c                                 |    5 +-
+ sound/soc/sh/migor.c                               |    6 +-
+ sound/soc/sh/rcar/core.c                           |    2 +-
+ sound/soc/soc-compress.c                           |    5 +-
+ sound/soc/soc-core.c                               |  290 ++--
+ sound/soc/soc-dai.c                                |   18 +-
+ sound/soc/soc-dapm.c                               |  220 +--
+ sound/soc/soc-generic-dmaengine-pcm.c              |   26 +-
+ sound/soc/soc-pcm.c                                | 1627 +++++++++-----------
+ sound/soc/soc-topology.c                           |   24 +-
+ sound/soc/sof/Kconfig                              |    9 +
+ sound/soc/sof/Makefile                             |    1 +
+ sound/soc/sof/compress.c                           |  146 ++
+ sound/soc/sof/compress.h                           |   31 +
+ sound/soc/sof/core.c                               |   10 +-
+ sound/soc/sof/debug.c                              |  226 +++
+ sound/soc/sof/imx/imx8.c                           |   57 +-
+ sound/soc/sof/intel/Kconfig                        |   20 +-
+ sound/soc/sof/intel/Makefile                       |    1 +
+ sound/soc/sof/intel/apl.c                          |    9 +
+ sound/soc/sof/intel/cnl.c                          |   51 +-
+ sound/soc/sof/intel/hda-codec.c                    |   11 +-
+ sound/soc/sof/intel/hda-compress.c                 |  114 ++
+ sound/soc/sof/intel/hda-ctrl.c                     |   40 +-
+ sound/soc/sof/intel/hda-dai.c                      |  130 +-
+ sound/soc/sof/intel/hda-dsp.c                      |  331 +++-
+ sound/soc/sof/intel/hda-ipc.c                      |   24 +-
+ sound/soc/sof/intel/hda-loader.c                   |   40 +-
+ sound/soc/sof/intel/hda-pcm.c                      |    8 +-
+ sound/soc/sof/intel/hda-stream.c                   |   27 +-
+ sound/soc/sof/intel/hda.c                          |  433 +++++-
+ sound/soc/sof/intel/hda.h                          |  120 +-
+ sound/soc/sof/ipc.c                                |   41 +-
+ sound/soc/sof/loader.c                             |    6 -
+ sound/soc/sof/ops.h                                |   59 +-
+ sound/soc/sof/pcm.c                                |   19 +-
+ sound/soc/sof/pm.c                                 |  176 +--
+ sound/soc/sof/probe.c                              |  290 ++++
+ sound/soc/sof/probe.h                              |   85 +
+ sound/soc/sof/sof-audio.c                          |   59 +-
+ sound/soc/sof/sof-audio.h                          |    6 +-
+ sound/soc/sof/sof-of-dev.c                         |   10 +
+ sound/soc/sof/sof-priv.h                           |   71 +-
+ sound/soc/sof/topology.c                           |   25 +-
+ sound/soc/sprd/Kconfig                             |    2 +-
+ sound/soc/sprd/sprd-mcdt.h                         |    2 +-
+ sound/soc/sprd/sprd-pcm-compress.c                 |    4 +-
+ sound/soc/sprd/sprd-pcm-dma.c                      |    2 +-
+ sound/soc/stm/stm32_adfsdm.c                       |   12 +-
+ sound/soc/stm/stm32_i2s.c                          |   75 +-
+ sound/soc/stm/stm32_sai.c                          |   26 +-
+ sound/soc/stm/stm32_sai_sub.c                      |   13 +-
+ sound/soc/stm/stm32_spdifrx.c                      |   89 +-
+ sound/soc/sunxi/sun4i-spdif.c                      |    2 +-
+ sound/soc/sunxi/sun8i-codec.c                      |    3 -
+ sound/soc/tegra/tegra_alc5632.c                    |    2 +-
+ sound/soc/tegra/tegra_max98090.c                   |    2 +-
+ sound/soc/tegra/tegra_rt5640.c                     |    2 +-
+ sound/soc/tegra/tegra_rt5677.c                     |    2 +-
+ sound/soc/tegra/tegra_sgtl5000.c                   |    2 +-
+ sound/soc/tegra/tegra_wm8753.c                     |    2 +-
+ sound/soc/tegra/tegra_wm8903.c                     |   24 +-
+ sound/soc/tegra/trimslice.c                        |    2 +-
+ sound/soc/ti/Kconfig                               |    8 +-
+ sound/soc/ti/Makefile                              |    2 +
+ sound/soc/ti/ams-delta.c                           |    4 +-
+ sound/soc/ti/davinci-evm.c                         |    4 +-
+ sound/soc/ti/davinci-mcasp.c                       |   13 +-
+ sound/soc/ti/davinci-vcif.c                        |    4 +-
+ sound/soc/ti/n810.c                                |    2 +-
+ sound/soc/ti/omap-abe-twl6040.c                    |    6 +-
+ sound/soc/ti/omap-mcbsp-st.c                       |    2 +-
+ sound/soc/ti/omap-mcbsp.c                          |    4 +-
+ sound/soc/ti/omap-mcpdm.c                          |    2 +-
+ sound/soc/ti/omap3pandora.c                        |    4 +-
+ sound/soc/ti/osk5912.c                             |    2 +-
+ sound/soc/ti/rx51.c                                |    2 +-
+ sound/soc/ti/udma-pcm.c                            |   43 +
+ sound/soc/ti/udma-pcm.h                            |   18 +
+ sound/soc/txx9/txx9aclc.c                          |    2 +-
+ sound/soc/uniphier/aio-compress.c                  |   22 +-
+ sound/soc/uniphier/aio-dma.c                       |    6 +-
+ sound/soc/ux500/mop500_ab8500.c                    |    6 +-
+ sound/soc/ux500/ux500_pcm.c                        |    8 +-
+ sound/soc/xtensa/xtfpga-i2s.c                      |    2 +-
+ sound/soc/zte/zx-spdif.c                           |    1 -
+ sound/soc/zte/zx-tdm.c                             |    3 +-
+ sound/usb/Makefile                                 |    1 +
+ sound/usb/card.c                                   |   38 +-
+ sound/usb/clock.c                                  |   59 +-
+ sound/usb/format.c                                 |   37 +
+ sound/usb/midi.c                                   |   31 +-
+ sound/usb/mixer.c                                  |   33 +-
+ sound/usb/mixer_quirks.c                           |    5 +
+ sound/usb/mixer_s1810c.c                           |  595 +++++++
+ sound/usb/mixer_s1810c.h                           |    7 +
+ sound/usb/pcm.c                                    |    7 +-
+ sound/usb/proc.c                                   |    2 +-
+ sound/usb/quirks-table.h                           |    2 +-
+ sound/usb/quirks.c                                 |   88 +-
+ sound/usb/quirks.h                                 |    2 +
+ sound/usb/stream.c                                 |    3 +
+ sound/usb/usbaudio.h                               |    1 +
+ sound/usb/usx2y/usbusx2yaudio.c                    |    9 +-
+ 433 files changed, 19014 insertions(+), 4293 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/amlogic,aiu.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/amlogic,g12a-toacodec.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/amlogic,t9015.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/brcm,bcm63xx-audio.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/cirrus,cs42l51.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/cs42l51.txt
+ delete mode 100644 Documentation/devicetree/bindings/sound/google,cros-ec-codec.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/ingenic,aic.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/ingenic,jz4740-i2s.txt
+ delete mode 100644 Documentation/devicetree/bindings/sound/rockchip-i2s.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/rockchip-i2s.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/st,stm32-i2s.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-i2s.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-spdifrx.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/tlv320adcx140.yaml
+ create mode 100644 Documentation/sound/hd-audio/realtek-pc-beep.rst
+ create mode 100644 include/dt-bindings/sound/meson-aiu.h
+ create mode 100644 include/dt-bindings/sound/meson-g12a-toacodec.h
+ create mode 100644 sound/soc/amd/acp3x-rt5682-max9836.c
+ create mode 100644 sound/soc/bcm/bcm63xx-i2s-whistler.c
+ create mode 100644 sound/soc/bcm/bcm63xx-i2s.h
+ create mode 100644 sound/soc/bcm/bcm63xx-pcm-whistler.c
+ create mode 100644 sound/soc/codecs/rt5682-sdw.c
+ create mode 100644 sound/soc/codecs/rt5682-sdw.h
+ create mode 100644 sound/soc/codecs/tlv320adcx140.c
+ create mode 100644 sound/soc/codecs/tlv320adcx140.h
+ create mode 100644 sound/soc/intel/boards/sof_maxim_common.c
+ create mode 100644 sound/soc/intel/boards/sof_maxim_common.h
+ create mode 100644 sound/soc/intel/boards/sof_pcm512x.c
+ create mode 100644 sound/soc/intel/boards/sof_sdw.c
+ create mode 100644 sound/soc/intel/boards/sof_sdw_common.h
+ create mode 100644 sound/soc/intel/boards/sof_sdw_dmic.c
+ create mode 100644 sound/soc/intel/boards/sof_sdw_hdmi.c
+ create mode 100644 sound/soc/intel/boards/sof_sdw_rt1308.c
+ create mode 100644 sound/soc/intel/boards/sof_sdw_rt5682.c
+ create mode 100644 sound/soc/intel/boards/sof_sdw_rt700.c
+ create mode 100644 sound/soc/intel/boards/sof_sdw_rt711.c
+ create mode 100644 sound/soc/intel/boards/sof_sdw_rt715.c
+ create mode 100644 sound/soc/meson/aiu-acodec-ctrl.c
+ create mode 100644 sound/soc/meson/aiu-codec-ctrl.c
+ create mode 100644 sound/soc/meson/aiu-encoder-i2s.c
+ create mode 100644 sound/soc/meson/aiu-encoder-spdif.c
+ create mode 100644 sound/soc/meson/aiu-fifo-i2s.c
+ create mode 100644 sound/soc/meson/aiu-fifo-spdif.c
+ create mode 100644 sound/soc/meson/aiu-fifo.c
+ create mode 100644 sound/soc/meson/aiu-fifo.h
+ create mode 100644 sound/soc/meson/aiu.c
+ create mode 100644 sound/soc/meson/aiu.h
+ create mode 100644 sound/soc/meson/g12a-toacodec.c
+ create mode 100644 sound/soc/meson/gx-card.c
+ create mode 100644 sound/soc/meson/meson-card-utils.c
+ create mode 100644 sound/soc/meson/meson-card.h
+ create mode 100644 sound/soc/meson/meson-codec-glue.c
+ create mode 100644 sound/soc/meson/meson-codec-glue.h
+ create mode 100644 sound/soc/meson/t9015.c
+ create mode 100644 sound/soc/sof/compress.c
+ create mode 100644 sound/soc/sof/compress.h
+ create mode 100644 sound/soc/sof/intel/hda-compress.c
+ create mode 100644 sound/soc/sof/probe.c
+ create mode 100644 sound/soc/sof/probe.h
+ create mode 100644 sound/soc/ti/udma-pcm.c
+ create mode 100644 sound/soc/ti/udma-pcm.h
+ create mode 100644 sound/usb/mixer_s1810c.c
+ create mode 100644 sound/usb/mixer_s1810c.h
+Merging sound-asoc-fixes/for-linus (52ac54e1de31 Merge branch 'asoc-5.7' into asoc-linus)
+$ git merge sound-asoc-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/sound/cirrus,cs42l51.yaml | 2 +-
+ include/sound/soc-dai.h                                     | 2 +-
+ sound/soc/amd/raven/acp3x-i2s.c                             | 1 +
+ sound/soc/amd/raven/acp3x.h                                 | 2 ++
+ sound/soc/bcm/bcm63xx-pcm-whistler.c                        | 2 +-
+ sound/soc/codecs/rt5682.c                                   | 5 ++++-
+ sound/soc/intel/boards/bdw-rt5650.c                         | 1 -
+ sound/soc/intel/boards/bdw-rt5677.c                         | 1 -
+ sound/soc/intel/boards/broadwell.c                          | 1 -
+ sound/soc/intel/boards/haswell.c                            | 1 -
+ sound/soc/qcom/qdsp6/q6asm-dai.c                            | 4 ++--
+ sound/soc/soc-dai.c                                         | 8 ++++----
+ sound/soc/soc-dapm.c                                        | 8 +++++++-
+ sound/soc/soc-ops.c                                         | 4 ++--
+ sound/soc/soc-pcm.c                                         | 6 ++++--
+ sound/soc/soc-topology.c                                    | 2 +-
+ 16 files changed, 30 insertions(+), 20 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 (16fbf79b0f83 Linux 5.6-rc7)
+$ git merge spi-fixes/for-linus
+Already up to date.
+Merging pci-current/for-linus (5901b51f3e5d MAINTAINERS: Correct Cadence PCI driver path)
+$ git merge pci-current/for-linus
+Already up to date.
+Merging driver-core.current/driver-core-linus (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
+$ git merge driver-core.current/driver-core-linus
+Already up to date.
+Merging tty.current/tty-linus (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
+$ git merge tty.current/tty-linus
+Already up to date.
+Merging usb.current/usb-linus (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
+$ 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 (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
+$ git merge staging.current/staging-linus
+Already up to date.
+Merging char-misc.current/char-misc-linus (16fbf79b0f83 Linux 5.6-rc7)
+$ git merge char-misc.current/char-misc-linus
+Already up to date.
+Merging soundwire-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1)
+$ git merge soundwire-fixes/fixes
+Already up to date.
+Merging thunderbolt-fixes/fixes (16fbf79b0f83 Linux 5.6-rc7)
+$ git merge thunderbolt-fixes/fixes
+Already up to date.
+Merging input-current/for-linus (4134252ab7e2 Input: fix stale timestamp on key autorepeat events)
+$ git merge input-current/for-linus
+Already up to date.
+Merging crypto-current/master (fcb90d51c375 crypto: af_alg - bool type cosmetics)
+$ git merge crypto-current/master
+Auto-merging include/linux/firmware/xlnx-zynqmp.h
+Auto-merging include/linux/debugfs.h
+Auto-merging fs/debugfs/file.c
+Auto-merging drivers/firmware/xilinx/zynqmp.c
+Auto-merging drivers/crypto/chelsio/chtls/chtls_io.c
+Auto-merging drivers/crypto/chelsio/chcr_core.h
+Auto-merging drivers/crypto/chelsio/chcr_core.c
+Auto-merging crypto/testmgr.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-driver-uacce       |   39 +
+ .../bindings/crypto/xlnx,zynqmp-aes.yaml           |   37 +
+ Documentation/misc-devices/uacce.rst               |  176 +
+ MAINTAINERS                                        |   17 +-
+ arch/arm/crypto/.gitignore                         |    1 +
+ arch/arm/crypto/aes-neonbs-glue.c                  |    1 +
+ arch/arm/crypto/ghash-ce-core.S                    |    5 +-
+ arch/arm64/crypto/.gitignore                       |    1 +
+ arch/arm64/crypto/aes-neonbs-glue.c                |    1 +
+ arch/arm64/crypto/sha1-ce-glue.c                   |   20 +
+ arch/arm64/crypto/sha2-ce-glue.c                   |   23 +
+ arch/x86/crypto/curve25519-x86_64.c                | 3546 +++++++-------------
+ crypto/af_alg.c                                    |   10 +-
+ crypto/algif_hash.c                                |    6 +-
+ crypto/authencesn.c                                |    2 +-
+ crypto/ccm.c                                       |   29 +-
+ crypto/cryptd.c                                    |   37 +-
+ crypto/ctr.c                                       |   29 +-
+ crypto/cts.c                                       |   27 +-
+ crypto/gcm.c                                       |   66 +-
+ crypto/geniv.c                                     |   17 +-
+ crypto/lrw.c                                       |   28 +-
+ crypto/md5.c                                       |    3 -
+ crypto/pcrypt.c                                    |   33 +-
+ crypto/proc.c                                      |    2 +-
+ crypto/rng.c                                       |    8 +-
+ crypto/rsa-pkcs1pad.c                              |   59 +-
+ crypto/tcrypt.c                                    |    4 +-
+ crypto/testmgr.c                                   |   28 +-
+ crypto/xts.c                                       |   28 +-
+ drivers/bus/fsl-mc/fsl-mc-bus.c                    |   33 +-
+ drivers/char/hw_random/Kconfig                     |   17 +-
+ drivers/char/hw_random/imx-rngc.c                  |   85 +-
+ drivers/char/hw_random/omap3-rom-rng.c             |    1 +
+ drivers/crypto/Kconfig                             |   50 +-
+ drivers/crypto/Makefile                            |    3 +-
+ drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c  |    4 +-
+ drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h       |    2 +-
+ drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h       |    2 +-
+ drivers/crypto/atmel-i2c.c                         |    3 +-
+ drivers/crypto/bcm/util.c                          |   40 +-
+ drivers/crypto/caam/Kconfig                        |    2 +
+ drivers/crypto/caam/caamalg.c                      |  415 +--
+ drivers/crypto/caam/caamalg_desc.c                 |   30 +-
+ drivers/crypto/caam/caamalg_qi.c                   |    4 +-
+ drivers/crypto/caam/caamalg_qi2.h                  |    6 +-
+ drivers/crypto/caam/caamhash.c                     |  340 +-
+ drivers/crypto/caam/caampkc.c                      |  185 +-
+ drivers/crypto/caam/caampkc.h                      |   10 +
+ drivers/crypto/caam/caamrng.c                      |  405 +--
+ drivers/crypto/caam/ctrl.c                         |   88 +-
+ drivers/crypto/caam/desc.h                         |    2 +
+ drivers/crypto/caam/intern.h                       |    9 +-
+ drivers/crypto/caam/jr.c                           |   49 +-
+ drivers/crypto/caam/key_gen.c                      |    2 +-
+ drivers/crypto/caam/qi.c                           |   60 +-
+ drivers/crypto/caam/qi.h                           |    4 +-
+ drivers/crypto/caam/regs.h                         |    7 +-
+ drivers/crypto/cavium/nitrox/nitrox_main.c         |    2 +-
+ drivers/crypto/ccp/psp-dev.c                       |    3 +
+ drivers/crypto/ccp/sev-dev.c                       |   39 +-
+ drivers/crypto/ccp/sp-dev.h                        |    1 +
+ drivers/crypto/ccp/sp-pci.c                        |    9 +
+ drivers/crypto/ccree/cc_aead.c                     |  176 +-
+ drivers/crypto/ccree/cc_aead.h                     |    3 +-
+ drivers/crypto/ccree/cc_buffer_mgr.c               |  229 +-
+ drivers/crypto/ccree/cc_buffer_mgr.h               |    5 +-
+ drivers/crypto/ccree/cc_cipher.c                   |   78 +-
+ drivers/crypto/ccree/cc_debugfs.c                  |   29 +-
+ drivers/crypto/ccree/cc_driver.c                   |  127 +-
+ drivers/crypto/ccree/cc_driver.h                   |   18 +-
+ drivers/crypto/ccree/cc_hash.c                     |  228 +-
+ drivers/crypto/ccree/cc_hash.h                     |   31 +-
+ drivers/crypto/ccree/cc_hw_queue_defs.h            |  332 +-
+ drivers/crypto/ccree/cc_pm.c                       |   60 +-
+ drivers/crypto/ccree/cc_pm.h                       |   21 -
+ drivers/crypto/ccree/cc_request_mgr.c              |   48 +-
+ drivers/crypto/ccree/cc_request_mgr.h              |   19 +-
+ drivers/crypto/ccree/cc_sram_mgr.c                 |   78 +-
+ drivers/crypto/ccree/cc_sram_mgr.h                 |   45 +-
+ drivers/crypto/chelsio/chcr_algo.c                 |  358 +-
+ drivers/crypto/chelsio/chcr_core.c                 |    3 +
+ drivers/crypto/chelsio/chcr_core.h                 |    6 +-
+ drivers/crypto/chelsio/chcr_crypto.h               |   16 +-
+ drivers/crypto/chelsio/chtls/chtls_io.c            |    7 +-
+ drivers/crypto/chelsio/chtls/chtls_main.c          |   10 +-
+ drivers/crypto/hisilicon/Kconfig                   |    2 +
+ drivers/crypto/hisilicon/hpre/hpre.h               |    3 +-
+ drivers/crypto/hisilicon/hpre/hpre_crypto.c        |   20 +-
+ drivers/crypto/hisilicon/hpre/hpre_main.c          |  160 +-
+ drivers/crypto/hisilicon/qm.c                      |  619 +++-
+ drivers/crypto/hisilicon/qm.h                      |   72 +-
+ drivers/crypto/hisilicon/sec2/sec.h                |   12 +-
+ drivers/crypto/hisilicon/sec2/sec_crypto.c         |  260 +-
+ drivers/crypto/hisilicon/sec2/sec_main.c           |  294 +-
+ drivers/crypto/hisilicon/zip/zip.h                 |    2 +-
+ drivers/crypto/hisilicon/zip/zip_crypto.c          |   54 +-
+ drivers/crypto/hisilicon/zip/zip_main.c            |  324 +-
+ drivers/crypto/img-hash.c                          |    2 +-
+ drivers/crypto/marvell/Kconfig                     |   37 +
+ drivers/crypto/marvell/Makefile                    |    7 +-
+ drivers/crypto/marvell/cesa/Makefile               |    3 +
+ drivers/crypto/marvell/{ => cesa}/cesa.c           |    0
+ drivers/crypto/marvell/{ => cesa}/cesa.h           |    5 +-
+ drivers/crypto/marvell/{ => cesa}/cipher.c         |   15 +-
+ drivers/crypto/marvell/{ => cesa}/hash.c           |   38 +-
+ drivers/crypto/marvell/{ => cesa}/tdma.c           |   10 +-
+ drivers/crypto/marvell/octeontx/Makefile           |    6 +
+ drivers/crypto/marvell/octeontx/otx_cpt_common.h   |   51 +
+ drivers/crypto/marvell/octeontx/otx_cpt_hw_types.h |  824 +++++
+ drivers/crypto/marvell/octeontx/otx_cptpf.h        |   34 +
+ drivers/crypto/marvell/octeontx/otx_cptpf_main.c   |  307 ++
+ drivers/crypto/marvell/octeontx/otx_cptpf_mbox.c   |  253 ++
+ drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c  | 1686 ++++++++++
+ drivers/crypto/marvell/octeontx/otx_cptpf_ucode.h  |  180 +
+ drivers/crypto/marvell/octeontx/otx_cptvf.h        |  104 +
+ drivers/crypto/marvell/octeontx/otx_cptvf_algs.c   | 1744 ++++++++++
+ drivers/crypto/marvell/octeontx/otx_cptvf_algs.h   |  188 ++
+ drivers/crypto/marvell/octeontx/otx_cptvf_main.c   |  985 ++++++
+ drivers/crypto/marvell/octeontx/otx_cptvf_mbox.c   |  247 ++
+ drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.c |  612 ++++
+ drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.h |  227 ++
+ drivers/crypto/mediatek/mtk-sha.c                  |    2 +-
+ drivers/crypto/mxs-dcp.c                           |   58 +-
+ drivers/crypto/nx/nx.h                             |    2 +-
+ drivers/crypto/omap-sham.c                         |    4 +-
+ drivers/crypto/qat/qat_common/qat_algs.c           |    2 +-
+ drivers/crypto/qat/qat_common/qat_crypto.c         |    3 +-
+ drivers/crypto/qce/common.c                        |    2 -
+ drivers/crypto/qce/common.h                        |    3 +
+ drivers/crypto/qce/dma.c                           |   11 +-
+ drivers/crypto/qce/dma.h                           |    2 +-
+ drivers/crypto/qce/skcipher.c                      |   30 +-
+ drivers/crypto/s5p-sss.c                           |    2 +-
+ drivers/crypto/xilinx/Makefile                     |    2 +
+ drivers/crypto/xilinx/zynqmp-aes-gcm.c             |  457 +++
+ drivers/firmware/xilinx/zynqmp.c                   |   25 +
+ drivers/misc/Kconfig                               |    1 +
+ drivers/misc/Makefile                              |    1 +
+ drivers/misc/uacce/Kconfig                         |   13 +
+ drivers/misc/uacce/Makefile                        |    2 +
+ drivers/misc/uacce/uacce.c                         |  633 ++++
+ fs/debugfs/file.c                                  |    8 +
+ include/crypto/aead.h                              |   48 +-
+ include/crypto/if_alg.h                            |    2 +-
+ include/linux/debugfs.h                            |    1 +
+ include/linux/firmware/xlnx-zynqmp.h               |    2 +
+ include/linux/fsl/mc.h                             |   16 +
+ include/linux/uacce.h                              |  163 +
+ include/uapi/misc/uacce/hisi_qm.h                  |   23 +
+ include/uapi/misc/uacce/uacce.h                    |   38 +
+ kernel/padata.c                                    |    9 +-
+ 152 files changed, 13777 insertions(+), 5297 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-uacce
+ create mode 100644 Documentation/devicetree/bindings/crypto/xlnx,zynqmp-aes.yaml
+ create mode 100644 Documentation/misc-devices/uacce.rst
+ create mode 100644 drivers/crypto/marvell/Kconfig
+ create mode 100644 drivers/crypto/marvell/cesa/Makefile
+ rename drivers/crypto/marvell/{ => cesa}/cesa.c (100%)
+ rename drivers/crypto/marvell/{ => cesa}/cesa.h (99%)
+ rename drivers/crypto/marvell/{ => cesa}/cipher.c (98%)
+ rename drivers/crypto/marvell/{ => cesa}/hash.c (98%)
+ rename drivers/crypto/marvell/{ => cesa}/tdma.c (97%)
+ create mode 100644 drivers/crypto/marvell/octeontx/Makefile
+ create mode 100644 drivers/crypto/marvell/octeontx/otx_cpt_common.h
+ create mode 100644 drivers/crypto/marvell/octeontx/otx_cpt_hw_types.h
+ create mode 100644 drivers/crypto/marvell/octeontx/otx_cptpf.h
+ create mode 100644 drivers/crypto/marvell/octeontx/otx_cptpf_main.c
+ create mode 100644 drivers/crypto/marvell/octeontx/otx_cptpf_mbox.c
+ create mode 100644 drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c
+ create mode 100644 drivers/crypto/marvell/octeontx/otx_cptpf_ucode.h
+ create mode 100644 drivers/crypto/marvell/octeontx/otx_cptvf.h
+ create mode 100644 drivers/crypto/marvell/octeontx/otx_cptvf_algs.c
+ create mode 100644 drivers/crypto/marvell/octeontx/otx_cptvf_algs.h
+ create mode 100644 drivers/crypto/marvell/octeontx/otx_cptvf_main.c
+ create mode 100644 drivers/crypto/marvell/octeontx/otx_cptvf_mbox.c
+ create mode 100644 drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.c
+ create mode 100644 drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.h
+ create mode 100644 drivers/crypto/xilinx/Makefile
+ create mode 100644 drivers/crypto/xilinx/zynqmp-aes-gcm.c
+ create mode 100644 drivers/misc/uacce/Kconfig
+ create mode 100644 drivers/misc/uacce/Makefile
+ create mode 100644 drivers/misc/uacce/uacce.c
+ create mode 100644 include/linux/uacce.h
+ create mode 100644 include/uapi/misc/uacce/hisi_qm.h
+ create mode 100644 include/uapi/misc/uacce/uacce.h
+Merging ide/master (94f2630b1897 Merge tag '5.6-rc-small-smb3-fix-for-stable' of git://git.samba.org/sfrench/cifs-2.6)
+$ 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 (f3a60268f5ce selftest/lkdtm: Use local .gitignore)
+$ 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 (018af9be3dd5 dmaengine: ti: k3-udma-glue: Fix an error handling path in 'k3_udma_glue_cfg_rx_flow()')
+$ 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 (def9d2780727 Linux 5.5-rc7)
+$ git merge mtd-fixes/mtd/fixes
+Already up to date.
+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 (f7d5f5655ef7 MAINTAINERS: Correct MIPS patchwork URL)
+$ 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 (e1be9ac8e601 KVM: X86: Narrow down the IPI fastpath to single target IPI)
+$ git merge kvm-fixes/master
+Already up to date.
+Merging kvms390-fixes/master (e93fc7b4544a KVM: s390: Also reset registers in sync regs for initial cpu reset)
+$ git merge kvms390-fixes/master
+Already up to date.
+Merging hwmon-fixes/hwmon (4eb981e97679 hwmon: (pmbus/isl68137) Fix up chip IDs)
+$ git merge hwmon-fixes/hwmon
+Merge made by the 'recursive' strategy.
+ Documentation/hwmon/isl68137.rst | 76 ++++++++++++++++-----------------
+ drivers/hwmon/pmbus/isl68137.c   | 92 +++++++++++++++++++++++++++++++++++++---
+ 2 files changed, 123 insertions(+), 45 deletions(-)
+Merging nvdimm-fixes/libnvdimm-fixes (f84afbdd3a9e libnvdimm: Out of bounds read in __nd_ioctl())
+$ git merge nvdimm-fixes/libnvdimm-fixes
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS                      |  1 +
+ drivers/acpi/nfit/core.c         | 10 ++++++----
+ drivers/acpi/nfit/nfit.h         |  1 +
+ drivers/nvdimm/bus.c             |  6 ++++--
+ tools/testing/nvdimm/test/nfit.c |  2 ++
+ 5 files changed, 14 insertions(+), 6 deletions(-)
+Merging btrfs-fixes/next-fixes (f5bf9a8fa525 Merge branch 'misc-5.6' into next-fixes)
+$ git merge btrfs-fixes/next-fixes
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging vfs-fixes/fixes (d9a9f4849fe0 cifs_atomic_open(): fix double-put on late allocation failure)
+$ 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 (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
+$ git merge drivers-x86-fixes/fixes
+Already up to date.
+Merging samsung-krzk-fixes/fixes (0d935f0bf77d ARM: dts: exynos: Fix regulator node aliasing on Midas-based boards)
+$ git merge samsung-krzk-fixes/fixes
+Merge made by the 'recursive' strategy.
+Merging pinctrl-samsung-fixes/pinctrl-fixes (bb6d3fb354c5 Linux 5.6-rc1)
+$ git merge pinctrl-samsung-fixes/pinctrl-fixes
+Already up to date.
+Merging devicetree-fixes/dt/linus (e33a814e772c scripts/dtc: Remove redundant YYLOC global declaration)
+$ git merge devicetree-fixes/dt/linus
+Already up to date.
+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 (c4b979ebcafe Merge tag 'amd-drm-fixes-5.6-2020-03-26' of git://people.freedesktop.org/~agd5f/linux into drm-fixes)
+$ git merge drm-fixes/drm-fixes
+Already up to date.
+Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
+$ git merge amdgpu-fixes/drm-fixes
+Already up to date.
+Merging drm-intel-fixes/for-linux-next-fixes (7111951b8d49 Linux 5.6)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Already up to date.
+Merging mmc-fixes/fixes (16fbf79b0f83 Linux 5.6-rc7)
+$ git merge mmc-fixes/fixes
+Already up to date.
+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 (032d4a480220 hv: hyperv_vmbus.h: Replace zero-length array with flexible-array member)
+$ git merge hyperv-fixes/hyperv-fixes
+Merge made by the 'recursive' strategy.
+ drivers/hv/hyperv_vmbus.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+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 (10dab84caf40 pid: make ENOMEM return value more obvious)
+$ git merge pidfd-fixes/fixes
+Already up to date.
+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 (71db3aa2816d ASoC: MT6660: make spdxcheck.py happy)
+$ git merge spdx/spdx-linus
+CONFLICT (modify/delete): tools/testing/selftests/networking/timestamping/.gitignore deleted in HEAD and modified in spdx/spdx-linus. Version spdx/spdx-linus of tools/testing/selftests/networking/timestamping/.gitignore left in tree.
+Auto-merging tools/testing/selftests/net/mptcp/.gitignore
+Auto-merging tools/testing/selftests/net/.gitignore
+Auto-merging tools/testing/selftests/bpf/.gitignore
+Auto-merging tools/testing/selftests/.gitignore
+Auto-merging tools/bpf/bpftool/.gitignore
+Auto-merging sound/soc/codecs/mt6660.c
+Auto-merging arch/arm64/crypto/.gitignore
+Auto-merging arch/arm/crypto/.gitignore
+Auto-merging Documentation/devicetree/bindings/.gitignore
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f tools/testing/selftests/networking/timestamping/.gitignore
+rm 'tools/testing/selftests/networking/timestamping/.gitignore'
+$ git commit --no-edit -v -a
+[master ba9d928c4e94] Merge remote-tracking branch 'spdx/spdx-linus'
+$ git diff -M --stat --summary HEAD^..
+ .gitignore                                                            | 1 +
+ Documentation/.gitignore                                              | 1 +
+ Documentation/devicetree/bindings/.gitignore                          | 1 +
+ Documentation/vm/.gitignore                                           | 1 +
+ arch/.gitignore                                                       | 1 +
+ arch/alpha/kernel/.gitignore                                          | 1 +
+ arch/arc/boot/.gitignore                                              | 1 +
+ arch/arc/kernel/.gitignore                                            | 1 +
+ arch/arm/boot/.gitignore                                              | 1 +
+ arch/arm/boot/compressed/.gitignore                                   | 1 +
+ arch/arm/crypto/.gitignore                                            | 1 +
+ arch/arm/kernel/.gitignore                                            | 1 +
+ arch/arm/mach-at91/.gitignore                                         | 1 +
+ arch/arm/mach-omap2/.gitignore                                        | 1 +
+ arch/arm/vdso/.gitignore                                              | 1 +
+ arch/arm64/boot/.gitignore                                            | 1 +
+ arch/arm64/crypto/.gitignore                                          | 1 +
+ arch/arm64/kernel/.gitignore                                          | 1 +
+ arch/arm64/kernel/vdso/.gitignore                                     | 1 +
+ arch/arm64/kernel/vdso32/.gitignore                                   | 1 +
+ arch/ia64/kernel/.gitignore                                           | 1 +
+ arch/m68k/kernel/.gitignore                                           | 1 +
+ arch/microblaze/boot/.gitignore                                       | 1 +
+ arch/microblaze/kernel/.gitignore                                     | 1 +
+ arch/mips/boot/.gitignore                                             | 1 +
+ arch/mips/boot/compressed/.gitignore                                  | 1 +
+ arch/mips/boot/tools/.gitignore                                       | 1 +
+ arch/mips/kernel/.gitignore                                           | 1 +
+ arch/mips/tools/.gitignore                                            | 1 +
+ arch/mips/vdso/.gitignore                                             | 1 +
+ arch/nds32/kernel/.gitignore                                          | 1 +
+ arch/nds32/kernel/vdso/.gitignore                                     | 1 +
+ arch/nios2/boot/.gitignore                                            | 1 +
+ arch/nios2/kernel/.gitignore                                          | 1 +
+ arch/openrisc/kernel/.gitignore                                       | 1 +
+ arch/parisc/boot/.gitignore                                           | 1 +
+ arch/parisc/boot/compressed/.gitignore                                | 1 +
+ arch/parisc/kernel/.gitignore                                         | 1 +
+ arch/powerpc/boot/.gitignore                                          | 1 +
+ arch/powerpc/kernel/.gitignore                                        | 1 +
+ arch/powerpc/kernel/vdso32/.gitignore                                 | 1 +
+ arch/powerpc/kernel/vdso64/.gitignore                                 | 1 +
+ arch/powerpc/platforms/cell/spufs/.gitignore                          | 1 +
+ arch/powerpc/purgatory/.gitignore                                     | 1 +
+ arch/riscv/boot/.gitignore                                            | 1 +
+ arch/riscv/kernel/.gitignore                                          | 1 +
+ arch/riscv/kernel/vdso/.gitignore                                     | 1 +
+ arch/s390/boot/.gitignore                                             | 1 +
+ arch/s390/boot/compressed/.gitignore                                  | 1 +
+ arch/s390/kernel/.gitignore                                           | 1 +
+ arch/s390/kernel/vdso64/.gitignore                                    | 1 +
+ arch/s390/purgatory/.gitignore                                        | 1 +
+ arch/s390/tools/.gitignore                                            | 1 +
+ arch/sh/boot/.gitignore                                               | 1 +
+ arch/sh/boot/compressed/.gitignore                                    | 1 +
+ arch/sh/kernel/.gitignore                                             | 1 +
+ arch/sh/kernel/vsyscall/.gitignore                                    | 1 +
+ arch/sparc/boot/.gitignore                                            | 1 +
+ arch/sparc/kernel/.gitignore                                          | 1 +
+ arch/sparc/vdso/.gitignore                                            | 1 +
+ arch/sparc/vdso/vdso32/.gitignore                                     | 1 +
+ arch/um/.gitignore                                                    | 1 +
+ arch/unicore32/.gitignore                                             | 1 +
+ arch/x86/.gitignore                                                   | 1 +
+ arch/x86/boot/.gitignore                                              | 1 +
+ arch/x86/boot/compressed/.gitignore                                   | 1 +
+ arch/x86/boot/tools/.gitignore                                        | 1 +
+ arch/x86/crypto/.gitignore                                            | 1 +
+ arch/x86/entry/vdso/.gitignore                                        | 1 +
+ arch/x86/entry/vdso/vdso32/.gitignore                                 | 1 +
+ arch/x86/kernel/.gitignore                                            | 1 +
+ arch/x86/kernel/cpu/.gitignore                                        | 1 +
+ arch/x86/lib/.gitignore                                               | 1 +
+ arch/x86/realmode/rm/.gitignore                                       | 1 +
+ arch/x86/tools/.gitignore                                             | 1 +
+ arch/x86/um/vdso/.gitignore                                           | 1 +
+ arch/xtensa/boot/.gitignore                                           | 1 +
+ arch/xtensa/boot/boot-elf/.gitignore                                  | 1 +
+ arch/xtensa/boot/lib/.gitignore                                       | 1 +
+ arch/xtensa/kernel/.gitignore                                         | 1 +
+ certs/.gitignore                                                      | 4 +---
+ drivers/atm/.gitignore                                                | 2 +-
+ drivers/crypto/vmx/.gitignore                                         | 1 +
+ drivers/eisa/.gitignore                                               | 1 +
+ drivers/gpu/drm/i915/.gitignore                                       | 1 +
+ drivers/gpu/drm/radeon/.gitignore                                     | 1 +
+ drivers/memory/.gitignore                                             | 1 +
+ drivers/net/wan/.gitignore                                            | 1 +
+ drivers/scsi/.gitignore                                               | 1 +
+ drivers/scsi/aic7xxx/.gitignore                                       | 1 +
+ drivers/staging/comedi/drivers/ni_routing/tools/.gitignore            | 1 +
+ drivers/staging/greybus/tools/.gitignore                              | 1 +
+ drivers/video/logo/.gitignore                                         | 4 +---
+ drivers/zorro/.gitignore                                              | 1 +
+ fs/unicode/.gitignore                                                 | 1 +
+ kernel/.gitignore                                                     | 4 +---
+ kernel/debug/kdb/.gitignore                                           | 1 +
+ lib/.gitignore                                                        | 4 +---
+ lib/raid6/.gitignore                                                  | 1 +
+ net/bpfilter/.gitignore                                               | 1 +
+ net/wireless/.gitignore                                               | 1 +
+ samples/auxdisplay/.gitignore                                         | 1 +
+ samples/bpf/.gitignore                                                | 1 +
+ samples/connector/.gitignore                                          | 1 +
+ samples/hidraw/.gitignore                                             | 1 +
+ samples/mei/.gitignore                                                | 1 +
+ samples/mic/mpssd/.gitignore                                          | 1 +
+ samples/pidfd/.gitignore                                              | 1 +
+ samples/seccomp/.gitignore                                            | 1 +
+ samples/timers/.gitignore                                             | 1 +
+ samples/vfs/.gitignore                                                | 1 +
+ samples/watchdog/.gitignore                                           | 1 +
+ scripts/.gitignore                                                    | 4 +---
+ scripts/basic/.gitignore                                              | 1 +
+ scripts/dtc/.gitignore                                                | 1 +
+ scripts/gcc-plugins/.gitignore                                        | 1 +
+ scripts/gdb/linux/.gitignore                                          | 1 +
+ scripts/genksyms/.gitignore                                           | 1 +
+ scripts/kconfig/.gitignore                                            | 4 +---
+ scripts/mod/.gitignore                                                | 1 +
+ scripts/selinux/genheaders/.gitignore                                 | 1 +
+ scripts/selinux/mdp/.gitignore                                        | 2 +-
+ security/apparmor/.gitignore                                          | 4 +---
+ security/selinux/.gitignore                                           | 1 +
+ security/tomoyo/.gitignore                                            | 1 +
+ sound/oss/.gitignore                                                  | 2 +-
+ tools/accounting/.gitignore                                           | 1 +
+ tools/bootconfig/.gitignore                                           | 1 +
+ tools/bpf/.gitignore                                                  | 1 +
+ tools/bpf/bpftool/.gitignore                                          | 1 +
+ tools/bpf/runqslower/.gitignore                                       | 1 +
+ tools/build/.gitignore                                                | 1 +
+ tools/build/feature/.gitignore                                        | 1 +
+ tools/cgroup/.gitignore                                               | 1 +
+ tools/gpio/.gitignore                                                 | 1 +
+ tools/iio/.gitignore                                                  | 1 +
+ tools/laptop/dslm/.gitignore                                          | 1 +
+ tools/leds/.gitignore                                                 | 1 +
+ tools/lib/bpf/.gitignore                                              | 1 +
+ tools/lib/lockdep/.gitignore                                          | 1 +
+ tools/lib/traceevent/.gitignore                                       | 1 +
+ tools/memory-model/.gitignore                                         | 1 +
+ tools/memory-model/litmus-tests/.gitignore                            | 1 +
+ tools/objtool/.gitignore                                              | 1 +
+ tools/pcmcia/.gitignore                                               | 1 +
+ tools/perf/.gitignore                                                 | 1 +
+ tools/perf/tests/.gitignore                                           | 1 +
+ tools/power/acpi/.gitignore                                           | 1 +
+ tools/power/cpupower/.gitignore                                       | 1 +
+ tools/power/x86/intel-speed-select/.gitignore                         | 1 +
+ tools/power/x86/turbostat/.gitignore                                  | 1 +
+ tools/spi/.gitignore                                                  | 1 +
+ tools/testing/kunit/.gitignore                                        | 1 +
+ tools/testing/radix-tree/.gitignore                                   | 1 +
+ tools/testing/selftests/.gitignore                                    | 1 +
+ tools/testing/selftests/android/ion/.gitignore                        | 1 +
+ tools/testing/selftests/arm64/signal/.gitignore                       | 1 +
+ tools/testing/selftests/arm64/tags/.gitignore                         | 1 +
+ tools/testing/selftests/bpf/.gitignore                                | 1 +
+ tools/testing/selftests/bpf/map_tests/.gitignore                      | 1 +
+ tools/testing/selftests/bpf/prog_tests/.gitignore                     | 1 +
+ tools/testing/selftests/bpf/verifier/.gitignore                       | 1 +
+ tools/testing/selftests/breakpoints/.gitignore                        | 1 +
+ tools/testing/selftests/capabilities/.gitignore                       | 1 +
+ tools/testing/selftests/cgroup/.gitignore                             | 1 +
+ tools/testing/selftests/clone3/.gitignore                             | 1 +
+ tools/testing/selftests/drivers/.gitignore                            | 1 +
+ tools/testing/selftests/efivarfs/.gitignore                           | 1 +
+ tools/testing/selftests/exec/.gitignore                               | 1 +
+ tools/testing/selftests/filesystems/.gitignore                        | 1 +
+ tools/testing/selftests/filesystems/binderfs/.gitignore               | 1 +
+ tools/testing/selftests/filesystems/epoll/.gitignore                  | 1 +
+ tools/testing/selftests/ftrace/.gitignore                             | 1 +
+ tools/testing/selftests/futex/functional/.gitignore                   | 1 +
+ tools/testing/selftests/gpio/.gitignore                               | 1 +
+ tools/testing/selftests/ia64/.gitignore                               | 1 +
+ tools/testing/selftests/intel_pstate/.gitignore                       | 1 +
+ tools/testing/selftests/ipc/.gitignore                                | 1 +
+ tools/testing/selftests/ir/.gitignore                                 | 1 +
+ tools/testing/selftests/kcmp/.gitignore                               | 1 +
+ tools/testing/selftests/kvm/.gitignore                                | 1 +
+ tools/testing/selftests/media_tests/.gitignore                        | 1 +
+ tools/testing/selftests/membarrier/.gitignore                         | 1 +
+ tools/testing/selftests/memfd/.gitignore                              | 1 +
+ tools/testing/selftests/mount/.gitignore                              | 1 +
+ tools/testing/selftests/mqueue/.gitignore                             | 1 +
+ tools/testing/selftests/net/.gitignore                                | 1 +
+ tools/testing/selftests/net/forwarding/.gitignore                     | 1 +
+ tools/testing/selftests/net/mptcp/.gitignore                          | 1 +
+ tools/testing/selftests/nsfs/.gitignore                               | 1 +
+ tools/testing/selftests/openat2/.gitignore                            | 1 +
+ tools/testing/selftests/pidfd/.gitignore                              | 1 +
+ tools/testing/selftests/powerpc/alignment/.gitignore                  | 1 +
+ tools/testing/selftests/powerpc/benchmarks/.gitignore                 | 1 +
+ tools/testing/selftests/powerpc/cache_shape/.gitignore                | 1 +
+ tools/testing/selftests/powerpc/copyloops/.gitignore                  | 1 +
+ tools/testing/selftests/powerpc/dscr/.gitignore                       | 1 +
+ tools/testing/selftests/powerpc/math/.gitignore                       | 1 +
+ tools/testing/selftests/powerpc/mm/.gitignore                         | 1 +
+ tools/testing/selftests/powerpc/pmu/.gitignore                        | 1 +
+ tools/testing/selftests/powerpc/pmu/ebb/.gitignore                    | 1 +
+ tools/testing/selftests/powerpc/primitives/.gitignore                 | 1 +
+ tools/testing/selftests/powerpc/ptrace/.gitignore                     | 1 +
+ tools/testing/selftests/powerpc/security/.gitignore                   | 1 +
+ tools/testing/selftests/powerpc/signal/.gitignore                     | 1 +
+ tools/testing/selftests/powerpc/stringloops/.gitignore                | 1 +
+ tools/testing/selftests/powerpc/switch_endian/.gitignore              | 1 +
+ tools/testing/selftests/powerpc/syscalls/.gitignore                   | 1 +
+ tools/testing/selftests/powerpc/tm/.gitignore                         | 1 +
+ tools/testing/selftests/powerpc/vphn/.gitignore                       | 1 +
+ tools/testing/selftests/prctl/.gitignore                              | 1 +
+ tools/testing/selftests/proc/.gitignore                               | 1 +
+ tools/testing/selftests/pstore/.gitignore                             | 1 +
+ tools/testing/selftests/ptp/.gitignore                                | 1 +
+ tools/testing/selftests/ptrace/.gitignore                             | 1 +
+ tools/testing/selftests/rcutorture/.gitignore                         | 1 +
+ tools/testing/selftests/rcutorture/formal/srcu-cbmc/.gitignore        | 1 +
+ .../selftests/rcutorture/formal/srcu-cbmc/include/linux/.gitignore    | 1 +
+ .../rcutorture/formal/srcu-cbmc/tests/store_buffering/.gitignore      | 1 +
+ tools/testing/selftests/rseq/.gitignore                               | 1 +
+ tools/testing/selftests/rtc/.gitignore                                | 1 +
+ tools/testing/selftests/safesetid/.gitignore                          | 1 +
+ tools/testing/selftests/seccomp/.gitignore                            | 1 +
+ tools/testing/selftests/sigaltstack/.gitignore                        | 1 +
+ tools/testing/selftests/size/.gitignore                               | 1 +
+ tools/testing/selftests/sparc64/drivers/.gitignore                    | 1 +
+ tools/testing/selftests/splice/.gitignore                             | 1 +
+ tools/testing/selftests/sync/.gitignore                               | 1 +
+ tools/testing/selftests/tc-testing/.gitignore                         | 1 +
+ tools/testing/selftests/timens/.gitignore                             | 1 +
+ tools/testing/selftests/timers/.gitignore                             | 1 +
+ tools/testing/selftests/tmpfs/.gitignore                              | 1 +
+ tools/testing/selftests/vDSO/.gitignore                               | 1 +
+ tools/testing/selftests/vm/.gitignore                                 | 1 +
+ tools/testing/selftests/watchdog/.gitignore                           | 1 +
+ tools/testing/selftests/wireguard/qemu/.gitignore                     | 1 +
+ tools/testing/selftests/x86/.gitignore                                | 1 +
+ tools/testing/vsock/.gitignore                                        | 1 +
+ tools/thermal/tmon/.gitignore                                         | 1 +
+ tools/usb/.gitignore                                                  | 1 +
+ tools/usb/usbip/.gitignore                                            | 1 +
+ tools/virtio/.gitignore                                               | 1 +
+ tools/vm/.gitignore                                                   | 1 +
+ usr/.gitignore                                                        | 1 +
+ usr/include/.gitignore                                                | 1 +
+ 245 files changed, 245 insertions(+), 24 deletions(-)
+Merging gpio-intel-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1)
+$ git merge gpio-intel-fixes/fixes
+Already up to date.
+Merging pinctrl-intel-fixes/fixes (16fbf79b0f83 Linux 5.6-rc7)
+$ git merge pinctrl-intel-fixes/fixes
+Already up to date.
+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
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 33 +++++++++++++-------
+ drivers/gpu/drm/exynos/exynos_dp.c                 | 29 +++++++++--------
+ drivers/gpu/drm/rockchip/analogix_dp-rockchip.c    | 36 ++++++++++++----------
+ include/drm/bridge/analogix_dp.h                   |  5 +--
+ 4 files changed, 61 insertions(+), 42 deletions(-)
+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/skbuff.h
+Auto-merging include/linux/sched/topology.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 (4f6d08609bb6 crypto: x86 - clean up poly1305-x86_64-cryptogams.S by 'make clean')
+$ git merge kbuild/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/process/changes.rst             |   4 +-
+ arch/x86/Kconfig                              |   2 +
+ arch/x86/Kconfig.assembler                    |  17 +++
+ arch/x86/Makefile                             |  22 ----
+ arch/x86/crypto/Makefile                      | 162 ++++++++++----------------
+ arch/x86/crypto/aesni-intel_avx-x86_64.S      |   6 -
+ arch/x86/crypto/aesni-intel_glue.c            |  21 +---
+ arch/x86/crypto/blake2s-core.S                |   2 -
+ arch/x86/crypto/chacha_glue.c                 |   6 +-
+ arch/x86/crypto/poly1305-x86_64-cryptogams.pl |  16 ---
+ arch/x86/crypto/poly1305_glue.c               |  11 +-
+ arch/x86/crypto/sha1_ssse3_asm.S              |   4 -
+ arch/x86/crypto/sha1_ssse3_glue.c             |  13 ---
+ arch/x86/crypto/sha256-avx-asm.S              |   3 -
+ arch/x86/crypto/sha256-avx2-asm.S             |   3 -
+ arch/x86/crypto/sha256_ssse3_glue.c           |  12 --
+ arch/x86/crypto/sha512-avx-asm.S              |   2 -
+ arch/x86/crypto/sha512-avx2-asm.S             |   3 -
+ arch/x86/crypto/sha512_ssse3_glue.c           |  10 --
+ arch/x86/include/asm/dwarf2.h                 |  44 -------
+ arch/x86/include/asm/xor_avx.h                |   9 --
+ drivers/gpu/drm/i915/Makefile                 |   3 -
+ drivers/gpu/drm/i915/i915_memcpy.c            |   5 -
+ include/crypto/curve25519.h                   |   6 +-
+ lib/raid6/algos.c                             |   8 +-
+ lib/raid6/avx2.c                              |   4 -
+ lib/raid6/recov_avx2.c                        |   6 -
+ lib/raid6/recov_ssse3.c                       |   6 -
+ lib/raid6/test/Makefile                       |   9 +-
+ 29 files changed, 98 insertions(+), 321 deletions(-)
+ create mode 100644 arch/x86/Kconfig.assembler
+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 (fd27a526bb38 ARM/dma-mapping: merge __dma_supported into arm_dma_supported)
+$ git merge dma-mapping/for-next
+Auto-merging kernel/dma/direct.c
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/Kconfig                     | 15 +++++---
+ arch/arm/include/asm/dma-iommu.h |  2 --
+ arch/arm/mm/dma-mapping.c        | 76 ++++++++++------------------------------
+ arch/microblaze/Kconfig          |  2 +-
+ arch/microblaze/mm/consistent.c  |  9 +----
+ arch/mips/Kconfig                |  3 +-
+ arch/mips/mm/dma-noncoherent.c   |  7 +---
+ arch/nios2/Kconfig               |  3 +-
+ arch/nios2/mm/dma-mapping.c      | 12 +------
+ arch/openrisc/Kconfig            |  2 ++
+ arch/openrisc/kernel/dma.c       | 55 ++++++-----------------------
+ arch/xtensa/Kconfig              |  2 +-
+ arch/xtensa/kernel/pci-dma.c     | 12 ++-----
+ include/linux/dma-noncoherent.h  |  4 +--
+ kernel/dma/coherent.c            | 13 +++----
+ kernel/dma/direct.c              | 25 +++++++------
+ 16 files changed, 76 insertions(+), 166 deletions(-)
+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
+Auto-merging arch/arm/boot/compressed/head.S
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/compressed/head.S          | 136 +++++++++++++++----------------
+ arch/arm/boot/compressed/vmlinux.lds.S   |   1 -
+ arch/arm/kernel/relocate_kernel.S        |   8 +-
+ arch/arm/kernel/unwind.c                 |   2 +-
+ arch/arm/mach-ebsa110/core.c             |  12 ++-
+ arch/arm/mach-footbridge/dc21285-timer.c |  11 +--
+ arch/arm/mach-footbridge/isa-irq.c       |  10 +--
+ arch/arm/mach-footbridge/isa-timer.c     |  11 +--
+ arch/arm/mach-rpc/time.c                 |   8 +-
+ 9 files changed, 88 insertions(+), 111 deletions(-)
+Merging arm64/for-next/core (15cd0e675f3f arm64: Kconfig: ptrauth: Add binutils version check to fix mismatch)
+$ git merge arm64/for-next/core
+Auto-merging init/Kconfig
+Auto-merging arch/arm64/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arm64/Kconfig | 5 ++++-
+ init/Kconfig       | 4 ++++
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+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
+Auto-merging include/linux/firmware/xlnx-zynqmp.h
+Auto-merging arch/arm64/configs/defconfig
+Auto-merging arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
+Auto-merging arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
+Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+Auto-merging arch/arm64/Kconfig.platforms
+Removing arch/arm/mach-tegra/cpuidle.h
+Removing arch/arm/mach-tegra/cpuidle.c
+Removing arch/arm/mach-tegra/cpuidle-tegra30.c
+Removing arch/arm/mach-tegra/cpuidle-tegra20.c
+Removing arch/arm/mach-tegra/cpuidle-tegra114.c
+Auto-merging arch/arm/boot/dts/imx6qdl-apalis.dtsi
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/arm/vexpress.txt
+Removing Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.txt
+Removing Documentation/devicetree/bindings/arm/bcm/brcm,vulcan-soc.txt
+Removing Documentation/devicetree/bindings/arm/bcm/brcm,stingray.txt
+Removing Documentation/devicetree/bindings/arm/bcm/brcm,nsp.txt
+Removing Documentation/devicetree/bindings/arm/bcm/brcm,nsp-cpu-method.txt
+Removing Documentation/devicetree/bindings/arm/bcm/brcm,ns2.txt
+Removing Documentation/devicetree/bindings/arm/bcm/brcm,hr2.txt
+Removing Documentation/devicetree/bindings/arm/bcm/brcm,cygnus.txt
+Removing Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.txt
+Removing Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550.txt
+Removing Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550-cpu-method.txt
+Removing Documentation/devicetree/bindings/arm/bcm/brcm,bcm21664.txt
+Removing Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351.txt
+Removing Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351-cpu-method.txt
+Removing Documentation/devicetree/bindings/arm/arm-boards
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/arm,integrator.yaml    |   86 ++
+ .../devicetree/bindings/arm/arm,realview.yaml      |  123 +++
+ .../devicetree/bindings/arm/arm,versatile.yaml     |   71 ++
+ .../devicetree/bindings/arm/arm,vexpress-juno.yaml |  223 ++++
+ Documentation/devicetree/bindings/arm/arm-boards   |  237 -----
+ .../bindings/arm/bcm/brcm,bcm11351-cpu-method.txt  |   36 -
+ .../devicetree/bindings/arm/bcm/brcm,bcm11351.txt  |   10 -
+ .../devicetree/bindings/arm/bcm/brcm,bcm11351.yaml |   21 +
+ .../devicetree/bindings/arm/bcm/brcm,bcm21664.txt  |   15 -
+ .../devicetree/bindings/arm/bcm/brcm,bcm21664.yaml |   21 +
+ .../bindings/arm/bcm/brcm,bcm23550-cpu-method.txt  |   36 -
+ .../devicetree/bindings/arm/bcm/brcm,bcm23550.txt  |   15 -
+ .../devicetree/bindings/arm/bcm/brcm,bcm23550.yaml |   21 +
+ .../devicetree/bindings/arm/bcm/brcm,bcm4708.txt   |   15 -
+ .../devicetree/bindings/arm/bcm/brcm,bcm4708.yaml  |   88 ++
+ .../devicetree/bindings/arm/bcm/brcm,cygnus.txt    |   31 -
+ .../devicetree/bindings/arm/bcm/brcm,cygnus.yaml   |   29 +
+ .../devicetree/bindings/arm/bcm/brcm,hr2.txt       |   14 -
+ .../devicetree/bindings/arm/bcm/brcm,hr2.yaml      |   28 +
+ .../devicetree/bindings/arm/bcm/brcm,ns2.txt       |    9 -
+ .../devicetree/bindings/arm/bcm/brcm,ns2.yaml      |   23 +
+ .../bindings/arm/bcm/brcm,nsp-cpu-method.txt       |   39 -
+ .../devicetree/bindings/arm/bcm/brcm,nsp.txt       |   34 -
+ .../devicetree/bindings/arm/bcm/brcm,nsp.yaml      |   36 +
+ .../devicetree/bindings/arm/bcm/brcm,stingray.txt  |   12 -
+ .../devicetree/bindings/arm/bcm/brcm,stingray.yaml |   24 +
+ .../bindings/arm/bcm/brcm,vulcan-soc.txt           |   10 -
+ .../bindings/arm/bcm/brcm,vulcan-soc.yaml          |   22 +
+ Documentation/devicetree/bindings/arm/cpus.yaml    |   35 +
+ Documentation/devicetree/bindings/arm/fsl.yaml     |   69 ++
+ Documentation/devicetree/bindings/arm/qcom.yaml    |    8 +
+ Documentation/devicetree/bindings/arm/renesas.yaml |    1 +
+ .../devicetree/bindings/arm/rockchip.yaml          |   12 +-
+ Documentation/devicetree/bindings/arm/sunxi.yaml   |   26 +
+ .../arm/sunxi/allwinner,sun4i-a10-mbus.yaml        |    1 +
+ .../bindings/arm/tegra/nvidia,tegra20-pmc.txt      |  300 ------
+ .../bindings/arm/tegra/nvidia,tegra20-pmc.yaml     |  354 +++++++
+ Documentation/devicetree/bindings/arm/vexpress.txt |  229 ----
+ Documentation/devicetree/bindings/bus/ti-sysc.txt  |    1 +
+ .../devicetree/bindings/crypto/fsl-dcp.txt         |    2 +-
+ .../devicetree/bindings/crypto/fsl-imx-sahara.txt  |    2 +-
+ .../devicetree/bindings/crypto/fsl-sec4.txt        |    2 +-
+ .../devicetree/bindings/firmware/qcom,scm.txt      |    1 +
+ .../bindings/pci/nvidia,tegra194-pcie.txt          |    2 +-
+ .../bindings/phy/nvidia,tegra124-xusb-padctl.txt   |   24 +
+ .../bindings/power/amlogic,meson-sec-pwrc.yaml     |   40 +
+ .../devicetree/bindings/soc/mediatek/pwrap.txt     |    1 +
+ .../devicetree/bindings/soc/qcom/qcom,apr.txt      |   50 +
+ .../bindings/spi/allwinner,sun6i-a31-spi.yaml      |   11 +-
+ .../devicetree/bindings/usb/nvidia,tegra-xudc.yaml |  190 ++++
+ MAINTAINERS                                        |    2 +-
+ arch/arm/Kconfig.debug                             |   42 +-
+ arch/arm/arm-soc-for-next-contents.txt             |  201 ++++
+ arch/arm/boot/dts/Makefile                         |   20 +-
+ arch/arm/boot/dts/am33xx-l4.dtsi                   |   21 +-
+ arch/arm/boot/dts/am33xx.dtsi                      |  133 ++-
+ arch/arm/boot/dts/am4372.dtsi                      |  191 ++--
+ arch/arm/boot/dts/am437x-l4.dtsi                   |   77 +-
+ arch/arm/boot/dts/am57-pruss.dtsi                  |   50 +
+ arch/arm/boot/dts/am5718.dtsi                      |    1 +
+ arch/arm/boot/dts/am5728.dtsi                      |    1 +
+ arch/arm/boot/dts/am5748.dtsi                      |    1 +
+ arch/arm/boot/dts/arm-realview-pbx.dtsi            |    2 +-
+ arch/arm/boot/dts/at91-dvk_su60_somc_lcm.dtsi      |    2 +-
+ arch/arm/boot/dts/at91-sam9x60ek.dts               |    5 +
+ arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts      |   12 +
+ arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts          |   33 +-
+ arch/arm/boot/dts/at91-sama5d2_xplained.dts        |   33 +-
+ arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts        |    2 +-
+ arch/arm/boot/dts/at91sam9n12ek.dts                |    2 +-
+ arch/arm/boot/dts/at91sam9x5dm.dtsi                |    2 +-
+ arch/arm/boot/dts/bcm2711-rpi-4-b.dts              |   74 ++
+ arch/arm/boot/dts/bcm2711.dtsi                     |   25 +-
+ arch/arm/boot/dts/dm814x-clocks.dtsi               |   14 +
+ arch/arm/boot/dts/dm814x.dtsi                      |  260 +++--
+ arch/arm/boot/dts/dm816x.dtsi                      |  148 ++-
+ arch/arm/boot/dts/dra62x.dtsi                      |    6 +-
+ arch/arm/boot/dts/dra7.dtsi                        |  219 ++--
+ arch/arm/boot/dts/dra72x.dtsi                      |    6 +-
+ arch/arm/boot/dts/dra74x.dtsi                      |   10 +-
+ arch/arm/boot/dts/ecx-2000.dts                     |    6 +-
+ arch/arm/boot/dts/ecx-common.dtsi                  |   17 +-
+ arch/arm/boot/dts/exynos3250-artik5.dtsi           |    2 +-
+ arch/arm/boot/dts/exynos4210-universal_c210.dts    |    4 +-
+ arch/arm/boot/dts/exynos4412-odroid-common.dtsi    |    9 +
+ arch/arm/boot/dts/exynos5250-arndale.dts           |   10 +-
+ arch/arm/boot/dts/exynos5420-arndale-octa.dts      |    2 +
+ arch/arm/boot/dts/exynos5422-cpus.dtsi             |    8 +
+ arch/arm/boot/dts/exynos5422-odroid-core.dtsi      |    1 +
+ arch/arm/boot/dts/exynos5422-odroidhc1.dts         |   30 +
+ arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi |   59 ++
+ arch/arm/boot/dts/gemini-dlink-dir-685.dts         |   50 +-
+ arch/arm/boot/dts/gemini-dlink-dns-313.dts         |    2 +-
+ arch/arm/boot/dts/gemini-nas4220b.dts              |    4 +-
+ arch/arm/boot/dts/gemini-sl93512r.dts              |    4 +-
+ arch/arm/boot/dts/gemini-sq201.dts                 |    2 +-
+ arch/arm/boot/dts/gemini.dtsi                      |    8 +-
+ arch/arm/boot/dts/highbank.dts                     |   11 +-
+ arch/arm/boot/dts/imx23-olinuxino.dts              |    2 +-
+ arch/arm/boot/dts/imx23.dtsi                       |   10 +-
+ arch/arm/boot/dts/imx25-pinfunc.h                  |    8 +
+ arch/arm/boot/dts/imx25.dtsi                       |    4 +-
+ arch/arm/boot/dts/imx27.dtsi                       |    2 +-
+ arch/arm/boot/dts/imx28-apx4devkit.dts             |   10 +
+ arch/arm/boot/dts/imx28.dtsi                       |    2 +-
+ arch/arm/boot/dts/imx31.dtsi                       |    4 +-
+ arch/arm/boot/dts/imx35.dtsi                       |    4 +-
+ arch/arm/boot/dts/imx50.dtsi                       |    4 +-
+ arch/arm/boot/dts/imx51-zii-rdu1.dts               |    5 +-
+ arch/arm/boot/dts/imx51.dtsi                       |   17 +-
+ arch/arm/boot/dts/imx53.dtsi                       |    4 +-
+ arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts       |   40 +-
+ arch/arm/boot/dts/imx6dl-pico-dwarf.dts            |   17 +
+ arch/arm/boot/dts/imx6dl-pico-hobbit.dts           |   17 +
+ arch/arm/boot/dts/imx6dl-pico-nymph.dts            |   17 +
+ arch/arm/boot/dts/imx6dl-pico-pi.dts               |   17 +
+ arch/arm/boot/dts/imx6dl-riotboard.dts             |   16 +-
+ arch/arm/boot/dts/imx6dl-yapp4-common.dtsi         |    2 +
+ arch/arm/boot/dts/imx6dl.dtsi                      |    8 +-
+ arch/arm/boot/dts/imx6q-apalis-eval.dts            |   40 +-
+ arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts      |   40 +-
+ arch/arm/boot/dts/imx6q-apalis-ixora.dts           |   40 +-
+ arch/arm/boot/dts/imx6q-marsboard.dts              |   16 +-
+ arch/arm/boot/dts/imx6q-novena.dts                 |    2 +-
+ arch/arm/boot/dts/imx6q-pico-dwarf.dts             |   17 +
+ arch/arm/boot/dts/imx6q-pico-hobbit.dts            |   17 +
+ arch/arm/boot/dts/imx6q-pico-nymph.dts             |   17 +
+ arch/arm/boot/dts/imx6q-pico-pi.dts                |   17 +
+ arch/arm/boot/dts/imx6q.dtsi                       |    6 +-
+ arch/arm/boot/dts/imx6qdl-apalis.dtsi              |   40 +-
+ arch/arm/boot/dts/imx6qdl-colibri.dtsi             |   40 +-
+ arch/arm/boot/dts/imx6qdl-gw52xx.dtsi              |    5 +
+ arch/arm/boot/dts/imx6qdl-gw53xx.dtsi              |    5 +
+ arch/arm/boot/dts/imx6qdl-gw54xx.dtsi              |    5 +
+ arch/arm/boot/dts/imx6qdl-gw553x.dtsi              |   31 +
+ arch/arm/boot/dts/imx6qdl-gw5910.dtsi              |   25 +
+ arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi  |    5 +-
+ arch/arm/boot/dts/imx6qdl-pico-dwarf.dtsi          |   45 +
+ arch/arm/boot/dts/imx6qdl-pico-hobbit.dtsi         |   37 +
+ arch/arm/boot/dts/imx6qdl-pico-nymph.dtsi          |   54 +
+ arch/arm/boot/dts/imx6qdl-pico-pi.dtsi             |   31 +
+ arch/arm/boot/dts/imx6qdl-pico.dtsi                |  617 +++++++++++
+ arch/arm/boot/dts/imx6qdl-sr-som-ti.dtsi           |    1 +
+ arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi            |    7 +
+ arch/arm/boot/dts/imx6qdl.dtsi                     |   30 +-
+ arch/arm/boot/dts/imx6qp.dtsi                      |    2 +-
+ arch/arm/boot/dts/imx6sl.dtsi                      |   28 +-
+ arch/arm/boot/dts/imx6sll.dtsi                     |   12 +-
+ arch/arm/boot/dts/imx6sx-nitrogen6sx.dts           |   20 +-
+ arch/arm/boot/dts/imx6sx-pinfunc.h                 |  286 +++--
+ arch/arm/boot/dts/imx6sx-sabreauto.dts             |    4 +-
+ arch/arm/boot/dts/imx6sx-sdb.dtsi                  |   12 +-
+ arch/arm/boot/dts/imx6sx-softing-vining-2000.dts   |   22 +-
+ arch/arm/boot/dts/imx6sx-udoo-neo.dtsi             |   28 +-
+ arch/arm/boot/dts/imx6sx.dtsi                      |   34 +-
+ arch/arm/boot/dts/imx6ul-ccimx6ulsbcpro.dts        |    2 +-
+ arch/arm/boot/dts/imx6ul-pico-dwarf.dts            |   52 +
+ arch/arm/boot/dts/imx6ul-pico.dtsi                 |   39 +-
+ arch/arm/boot/dts/imx6ul.dtsi                      |   28 +-
+ arch/arm/boot/dts/imx6ull.dtsi                     |    2 +-
+ arch/arm/boot/dts/imx7-colibri-aster.dtsi          |  169 +++
+ arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi        |   46 +-
+ arch/arm/boot/dts/imx7-colibri.dtsi                |  230 +++-
+ arch/arm/boot/dts/imx7d-cl-som-imx7.dts            |    4 +-
+ arch/arm/boot/dts/imx7d-colibri-aster.dts          |   20 +
+ arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts     |   20 +
+ arch/arm/boot/dts/imx7d-colibri-emmc.dtsi          |   26 +
+ arch/arm/boot/dts/imx7d-colibri-eval-v3.dts        |   41 +-
+ arch/arm/boot/dts/imx7d-colibri.dtsi               |   41 +-
+ arch/arm/boot/dts/imx7d-pico-dwarf.dts             |   87 ++
+ arch/arm/boot/dts/imx7d-pico-nymph.dts             |   84 ++
+ arch/arm/boot/dts/imx7s-colibri-aster.dts          |   15 +
+ arch/arm/boot/dts/imx7s-colibri-eval-v3.dts        |   41 +-
+ arch/arm/boot/dts/imx7s-colibri.dtsi               |   41 +-
+ arch/arm/boot/dts/imx7s.dtsi                       |   38 +-
+ arch/arm/boot/dts/imx7ulp-evk.dts                  |    3 +-
+ arch/arm/boot/dts/imx7ulp.dtsi                     |    4 +-
+ arch/arm/boot/dts/integratorap.dts                 |    1 -
+ arch/arm/boot/dts/mt2701.dtsi                      |    2 +-
+ arch/arm/boot/dts/mt7623.dtsi                      |    2 +-
+ arch/arm/boot/dts/mt7629.dtsi                      |   16 +-
+ arch/arm/boot/dts/omap4-l4.dtsi                    |    1 +
+ arch/arm/boot/dts/omap4.dtsi                       |  279 +++--
+ arch/arm/boot/dts/omap5-l4-abe.dtsi                |   16 +-
+ arch/arm/boot/dts/omap5.dtsi                       |  241 +++--
+ arch/arm/boot/dts/qcom-apq8064.dtsi                |    1 +
+ arch/arm/boot/dts/qcom-apq8084.dtsi                |    1 +
+ arch/arm/boot/dts/qcom-ipq4019.dtsi                |    1 +
+ arch/arm/boot/dts/qcom-ipq8064.dtsi                |    1 +
+ arch/arm/boot/dts/qcom-mdm9615.dtsi                |    1 +
+ arch/arm/boot/dts/qcom-msm8660.dtsi                |    1 +
+ arch/arm/boot/dts/qcom-msm8960.dtsi                |    1 +
+ .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts     |   71 ++
+ .../boot/dts/qcom-msm8974-sony-xperia-honami.dts   |   25 +
+ arch/arm/boot/dts/qcom-msm8974.dtsi                |   10 +
+ arch/arm/boot/dts/r7s72100-gr-peach.dts            |    3 +
+ arch/arm/boot/dts/r7s72100.dtsi                    |    5 +-
+ arch/arm/boot/dts/r8a73a4-ape6evm.dts              |    7 +-
+ arch/arm/boot/dts/r8a7743.dtsi                     |    5 +-
+ arch/arm/boot/dts/r8a7744.dtsi                     |    5 +-
+ .../arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dts |    6 +
+ arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts        |   93 ++
+ arch/arm/boot/dts/r8a7745.dtsi                     |    3 +-
+ arch/arm/boot/dts/r8a77470.dtsi                    |    5 +-
+ arch/arm/boot/dts/r8a7790-lager.dts                |    1 +
+ arch/arm/boot/dts/r8a7790-stout.dts                |    1 +
+ arch/arm/boot/dts/r8a7790.dtsi                     |    2 +
+ arch/arm/boot/dts/r8a7791-koelsch.dts              |    1 +
+ arch/arm/boot/dts/r8a7791-porter.dts               |    1 +
+ arch/arm/boot/dts/r8a7791.dtsi                     |    5 +-
+ arch/arm/boot/dts/r8a7792.dtsi                     |    5 +-
+ arch/arm/boot/dts/r8a7793-gose.dts                 |    1 +
+ arch/arm/boot/dts/r8a7793.dtsi                     |    5 +-
+ arch/arm/boot/dts/r8a7794-alt.dts                  |    1 +
+ arch/arm/boot/dts/r8a7794-silk.dts                 |    1 +
+ arch/arm/boot/dts/r8a7794.dtsi                     |    2 +
+ arch/arm/boot/dts/rk3036-kylin.dts                 |    2 +-
+ arch/arm/boot/dts/rk3036.dtsi                      |    8 +-
+ arch/arm/boot/dts/rk3066a.dtsi                     |   18 +-
+ arch/arm/boot/dts/rk3188-bqedison2qc.dts           |   29 +-
+ arch/arm/boot/dts/rk3188.dtsi                      |   10 +-
+ arch/arm/boot/dts/rk322x.dtsi                      |   17 +-
+ arch/arm/boot/dts/rk3288-evb-act8846.dts           |    1 +
+ arch/arm/boot/dts/rk3288-evb-rk808.dts             |    1 +
+ arch/arm/boot/dts/rk3288-firefly-reload.dts        |    1 +
+ arch/arm/boot/dts/rk3288-r89.dts                   |    1 +
+ arch/arm/boot/dts/rk3288-tinker.dtsi               |    1 +
+ arch/arm/boot/dts/rk3288-vyasa.dts                 |   28 +-
+ arch/arm/boot/dts/rk3288.dtsi                      |   26 +-
+ arch/arm/boot/dts/rk3xxx.dtsi                      |    4 +-
+ arch/arm/boot/dts/rv1108.dtsi                      |   12 +-
+ arch/arm/boot/dts/sam9x60.dtsi                     |    8 +
+ arch/arm/boot/dts/sama5d2.dtsi                     |    2 +-
+ arch/arm/boot/dts/sama5d3.dtsi                     |   33 +-
+ arch/arm/boot/dts/sama5d4.dtsi                     |   35 +-
+ arch/arm/boot/dts/sh73a0-kzm9g.dts                 |    9 +-
+ arch/arm/boot/dts/socfpga_arria10.dtsi             |   12 +-
+ arch/arm/boot/dts/socfpga_arria10_socdk_nand.dts   |    4 +-
+ arch/arm/boot/dts/ste-ab8500.dtsi                  |    6 +-
+ arch/arm/boot/dts/ste-ab8505.dtsi                  |    6 +-
+ arch/arm/boot/dts/ste-dbx5x0.dtsi                  |    6 +-
+ arch/arm/boot/dts/ste-href-stuib.dtsi              |    2 +-
+ arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi      |    2 +-
+ arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi      |    2 +-
+ arch/arm/boot/dts/ste-ux500-samsung-skomer.dts     |  581 +++++++++++
+ arch/arm/boot/dts/stm32746g-eval.dts               |    2 +-
+ arch/arm/boot/dts/stm32mp15-pinctrl.dtsi           |   93 ++
+ arch/arm/boot/dts/stm32mp151.dtsi                  |   16 +-
+ arch/arm/boot/dts/stm32mp153.dtsi                  |    1 +
+ arch/arm/boot/dts/stm32mp157a-avenger96.dts        |   11 +-
+ arch/arm/boot/dts/stm32mp157c-dhcom-pdk2.dts       |  265 +++++
+ arch/arm/boot/dts/stm32mp157c-dhcom-som.dtsi       |  368 +++++++
+ arch/arm/boot/dts/stm32mp157c-ed1.dts              |   16 +-
+ arch/arm/boot/dts/stm32mp157c-ev1.dts              |   13 +-
+ arch/arm/boot/dts/stm32mp15xx-dkx.dtsi             |   10 +-
+ .../boot/dts/sun5i-a13-pocketbook-touch-lux-3.dts  |  257 +++++
+ arch/arm/boot/dts/sun5i.dtsi                       |    3 -
+ arch/arm/boot/dts/sun6i-a31.dtsi                   |   12 -
+ .../boot/dts/sun7i-a20-linutronix-testbox-v2.dts   |   47 +
+ arch/arm/boot/dts/sun7i-a20.dtsi                   |   25 +-
+ arch/arm/boot/dts/sun8i-a23-a33.dtsi               |    3 -
+ arch/arm/boot/dts/sun8i-a33.dtsi                   |    2 -
+ arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts          |    1 -
+ arch/arm/boot/dts/sun8i-a83t.dtsi                  |   73 +-
+ arch/arm/boot/dts/sun8i-h3.dtsi                    |   25 +
+ arch/arm/boot/dts/sun8i-r40.dtsi                   |   30 +-
+ arch/arm/boot/dts/sun8i-v3s.dtsi                   |    2 +-
+ arch/arm/boot/dts/sunxi-h3-h5.dtsi                 |   17 +-
+ arch/arm/boot/dts/tegra114-dalmore.dts             |    8 +-
+ arch/arm/boot/dts/tegra114.dtsi                    |    4 +-
+ arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi        |    8 +-
+ arch/arm/boot/dts/tegra124-apalis.dtsi             |    8 +-
+ arch/arm/boot/dts/tegra124-jetson-tk1.dts          |   14 +-
+ arch/arm/boot/dts/tegra124-nyan.dtsi               |    8 +-
+ arch/arm/boot/dts/tegra124-venice2.dts             |    8 +-
+ arch/arm/boot/dts/tegra124.dtsi                    |    4 +-
+ arch/arm/boot/dts/tegra20.dtsi                     |    4 +-
+ arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi         |    8 +-
+ arch/arm/boot/dts/tegra30-apalis.dtsi              |    8 +-
+ arch/arm/boot/dts/tegra30-beaver.dts               |    8 +-
+ arch/arm/boot/dts/tegra30-cardhu.dtsi              |    8 +-
+ arch/arm/boot/dts/tegra30-colibri.dtsi             |    8 +-
+ arch/arm/boot/dts/tegra30.dtsi                     |    4 +-
+ arch/arm/boot/dts/uniphier-ld4.dtsi                |   10 +-
+ arch/arm/boot/dts/uniphier-pro4.dtsi               |   12 +-
+ arch/arm/boot/dts/uniphier-pro5.dtsi               |  164 ++-
+ arch/arm/boot/dts/uniphier-pxs2.dtsi               |   14 +-
+ arch/arm/boot/dts/uniphier-ref-daughter.dtsi       |    2 +-
+ arch/arm/boot/dts/uniphier-sld8.dtsi               |   10 +-
+ arch/arm/boot/dts/versatile-ab-ib2.dts             |    2 +-
+ arch/arm/boot/dts/vexpress-v2m-rs1.dtsi            |    2 +-
+ arch/arm/boot/dts/vexpress-v2m.dtsi                |    2 +-
+ arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts        |    2 +-
+ arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts         |    2 +-
+ arch/arm/boot/dts/vexpress-v2p-ca5s.dts            |    2 +-
+ arch/arm/boot/dts/vexpress-v2p-ca9.dts             |    2 +-
+ arch/arm/boot/dts/vf-colibri-eval-v3.dtsi          |   40 +-
+ arch/arm/boot/dts/vf-colibri.dtsi                  |   39 +-
+ arch/arm/boot/dts/vf500-colibri-eval-v3.dts        |   40 +-
+ arch/arm/boot/dts/vf500-colibri.dtsi               |   40 +-
+ arch/arm/boot/dts/vf500.dtsi                       |    4 +-
+ arch/arm/boot/dts/vf610-colibri-eval-v3.dts        |   40 +-
+ arch/arm/boot/dts/vf610-colibri.dtsi               |   40 +-
+ arch/arm/boot/dts/vf610-zii-cfu1.dts               |    8 +
+ arch/arm/boot/dts/vf610-zii-dev.dtsi               |    8 +
+ arch/arm/boot/dts/vf610-zii-spb4.dts               |    8 +
+ arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts           |    8 +
+ arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts          |    8 +
+ arch/arm/boot/dts/vf610m4-colibri.dts              |   39 +-
+ arch/arm/boot/dts/vfxxx.dtsi                       |    4 +-
+ arch/arm/configs/at91_dt_defconfig                 |    1 +
+ arch/arm/configs/bcm2835_defconfig                 |    5 +
+ arch/arm/configs/exynos_defconfig                  |   11 +-
+ arch/arm/configs/imx_v6_v7_defconfig               |    3 +
+ arch/arm/configs/multi_v7_defconfig                |    7 +
+ arch/arm/configs/omap2plus_defconfig               |   20 +-
+ arch/arm/configs/qcom_defconfig                    |    6 +
+ arch/arm/configs/tegra_defconfig                   |    1 +
+ arch/arm/include/debug/stm32.S                     |    9 +-
+ arch/arm/mach-at91/Kconfig                         |    1 -
+ arch/arm/mach-at91/pm.c                            |   35 +-
+ arch/arm/mach-at91/pm.h                            |    2 +
+ arch/arm/mach-at91/pm_data-offsets.c               |    4 +
+ arch/arm/mach-at91/pm_suspend.S                    |  189 +++-
+ arch/arm/mach-bcm/Kconfig                          |    8 -
+ arch/arm/mach-cns3xxx/core.c                       |   10 +-
+ arch/arm/mach-dove/common.c                        |    2 +-
+ arch/arm/mach-ep93xx/timer-ep93xx.c                |   14 +-
+ arch/arm/mach-imx/Kconfig                          |   10 +-
+ arch/arm/mach-imx/anatop.c                         |    7 +-
+ arch/arm/mach-imx/gpc.c                            |    4 +-
+ arch/arm/mach-imx/mach-imx6q.c                     |   13 -
+ arch/arm/mach-imx/mach-imx6sl.c                    |    1 -
+ arch/arm/mach-imx/mach-imx6ul.c                    |    1 -
+ arch/arm/mach-imx/platsmp.c                        |    1 +
+ arch/arm/mach-imx/pm-imx6.c                        |    2 +
+ arch/arm/mach-imx/pm-imx7ulp.c                     |    1 +
+ arch/arm/mach-imx/src.c                            |    3 -
+ arch/arm/mach-iop32x/time.c                        |   12 +-
+ arch/arm/mach-mmp/time.c                           |   11 +-
+ arch/arm/mach-omap1/pm.c                           |   13 +-
+ arch/arm/mach-omap1/time.c                         |   10 +-
+ arch/arm/mach-omap1/timer32k.c                     |   10 +-
+ arch/arm/mach-omap2/omap_hwmod.c                   |   19 +-
+ .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h  |   10 -
+ .../omap_hwmod_33xx_43xx_interconnect_data.c       |   40 -
+ .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c |  115 --
+ arch/arm/mach-omap2/omap_hwmod_33xx_data.c         |   14 -
+ arch/arm/mach-omap2/omap_hwmod_43xx_data.c         |  114 --
+ arch/arm/mach-omap2/omap_hwmod_44xx_data.c         |  531 ----------
+ arch/arm/mach-omap2/omap_hwmod_54xx_data.c         |  288 -----
+ arch/arm/mach-omap2/omap_hwmod_7xx_data.c          |  251 -----
+ arch/arm/mach-omap2/omap_hwmod_81xx_data.c         |  231 -----
+ arch/arm/mach-omap2/pdata-quirks.c                 |    6 +
+ arch/arm/mach-omap2/pm33xx-core.c                  |  137 ++-
+ arch/arm/mach-omap2/timer.c                        |   11 +-
+ arch/arm/mach-orion5x/Kconfig                      |    2 -
+ arch/arm/mach-orion5x/ts78xx-setup.c               |    3 +-
+ arch/arm/mach-shmobile/setup-r8a7779.c             |    1 -
+ arch/arm/mach-shmobile/setup-rcar-gen2.c           |    2 +-
+ arch/arm/mach-shmobile/setup-sh73a0.c              |    1 -
+ arch/arm/mach-spear/time.c                         |    9 +-
+ arch/arm/mach-sunxi/sunxi.c                        |    2 +-
+ arch/arm/mach-tegra/Makefile                       |   19 +-
+ arch/arm/mach-tegra/cpuidle-tegra114.c             |   89 --
+ arch/arm/mach-tegra/cpuidle-tegra20.c              |  212 ----
+ arch/arm/mach-tegra/cpuidle-tegra30.c              |  132 ---
+ arch/arm/mach-tegra/cpuidle.c                      |   50 -
+ arch/arm/mach-tegra/cpuidle.h                      |   21 -
+ arch/arm/mach-tegra/irq.c                          |    3 +-
+ arch/arm/mach-tegra/pm.c                           |   54 +-
+ arch/arm/mach-tegra/pm.h                           |    4 -
+ arch/arm/mach-tegra/reset-handler.S                |   11 -
+ arch/arm/mach-tegra/reset.h                        |    9 +-
+ arch/arm/mach-tegra/sleep-tegra20.S                |  170 ---
+ arch/arm/mach-tegra/sleep-tegra30.S                |    6 +-
+ arch/arm/mach-tegra/sleep.h                        |   15 -
+ arch/arm/mach-tegra/tegra.c                        |    7 +-
+ arch/arm/mach-zynq/common.c                        |    2 +-
+ arch/arm/plat-orion/time.c                         |   10 +-
+ arch/arm64/Kconfig.platforms                       |    2 -
+ arch/arm64/boot/dts/allwinner/Makefile             |    3 +
+ .../boot/dts/allwinner/sun50i-a64-olinuxino.dts    |   17 +
+ .../boot/dts/allwinner/sun50i-a64-pinebook.dts     |  170 +--
+ .../dts/allwinner/sun50i-a64-pinephone-1.0.dts     |   11 +
+ .../dts/allwinner/sun50i-a64-pinephone-1.1.dts     |   11 +
+ .../boot/dts/allwinner/sun50i-a64-pinephone.dtsi   |  379 +++++++
+ .../boot/dts/allwinner/sun50i-a64-pinetab.dts      |  460 ++++++++
+ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi      |   44 +-
+ .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts  |   21 +
+ arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi       |    3 +-
+ .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts   |   11 +
+ .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts    |   20 +
+ .../dts/allwinner/sun50i-h6-orangepi-one-plus.dts  |   33 +
+ .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi     |   37 +
+ .../boot/dts/allwinner/sun50i-h6-pine-h64.dts      |   30 +
+ arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi       |   66 +-
+ .../boot/dts/altera/socfpga_stratix10_socdk.dts    |    6 +-
+ arch/arm64/boot/dts/amlogic/meson-a1.dtsi          |    6 +
+ arch/arm64/boot/dts/amlogic/meson-axg-s400.dts     |    6 +-
+ arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi  |  136 ++-
+ arch/arm64/boot/dts/amlogic/meson-g12.dtsi         |    2 +
+ arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts  |    4 +-
+ arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts    |    2 +-
+ arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts |    2 +-
+ .../boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi   |    4 +-
+ .../boot/dts/amlogic/meson-g12b-odroid-n2.dts      |   25 +-
+ .../boot/dts/amlogic/meson-g12b-ugoos-am6.dts      |    2 +-
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi          |   52 +
+ .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts |    1 +
+ .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi      |    3 +
+ .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi     |    9 +-
+ .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts     |   87 +-
+ arch/arm64/boot/dts/amlogic/meson-gxm.dtsi         |   28 +
+ arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi |   24 +-
+ arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts   |    2 +-
+ arch/arm64/boot/dts/amlogic/meson-sm1.dtsi         |    1 +
+ arch/arm64/boot/dts/arm/foundation-v8.dtsi         |    2 +-
+ arch/arm64/boot/dts/arm/fvp-base-revc.dts          |    2 +-
+ arch/arm64/boot/dts/arm/juno-base.dtsi             |    2 +-
+ arch/arm64/boot/dts/arm/juno-motherboard.dtsi      |    2 +-
+ arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts         |    2 +-
+ .../boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi      |    2 +-
+ arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi   |    2 +-
+ .../boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts      |    2 +-
+ arch/arm64/boot/dts/freescale/Makefile             |    6 +
+ .../fsl-ls1028a-kontron-kbox-a-230-ls.dts          |   91 ++
+ .../freescale/fsl-ls1028a-kontron-sl28-var2.dts    |   72 ++
+ .../fsl-ls1028a-kontron-sl28-var3-ads2.dts         |  117 +++
+ .../freescale/fsl-ls1028a-kontron-sl28-var4.dts    |   51 +
+ .../dts/freescale/fsl-ls1028a-kontron-sl28.dts     |  187 ++++
+ arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts  |    1 +
+ arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts  |   65 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi     |  184 +++-
+ arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts  |    1 +
+ arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi     |    4 +
+ arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi     |    4 +
+ .../arm64/boot/dts/freescale/fsl-lx2160a-cex7.dtsi |   37 +
+ arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts  |   15 +
+ arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts  |    4 +-
+ arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi     |  168 +++
+ arch/arm64/boot/dts/freescale/imx8mm-evk.dts       |    2 +
+ arch/arm64/boot/dts/freescale/imx8mm.dtsi          |   74 +-
+ arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi      |   21 +
+ arch/arm64/boot/dts/freescale/imx8mn.dtsi          |   81 +-
+ arch/arm64/boot/dts/freescale/imx8mp-evk.dts       |  270 +++++
+ arch/arm64/boot/dts/freescale/imx8mp-pinfunc.h     |  931 +++++++++++++++++
+ arch/arm64/boot/dts/freescale/imx8mp.dtsi          |  654 ++++++++++++
+ arch/arm64/boot/dts/freescale/imx8mq-evk.dts       |    2 +
+ .../boot/dts/freescale/imx8mq-librem5-devkit.dts   |  148 ++-
+ arch/arm64/boot/dts/freescale/imx8mq-phanbell.dts  |  104 ++
+ arch/arm64/boot/dts/freescale/imx8mq.dtsi          |   18 +-
+ arch/arm64/boot/dts/freescale/imx8qxp.dtsi         |   39 +
+ arch/arm64/boot/dts/freescale/s32v234.dtsi         |    4 +-
+ arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts |    6 +-
+ arch/arm64/boot/dts/marvell/Makefile               |    3 +
+ .../dts/marvell/armada-3720-espressobin-emmc.dts   |    2 +
+ .../marvell/armada-3720-espressobin-v7-emmc.dts    |    2 +
+ .../dts/marvell/armada-3720-espressobin-v7.dts     |    2 +
+ .../boot/dts/marvell/armada-3720-espressobin.dtsi  |    8 +-
+ .../dts/marvell/armada-8040-clearfog-gt-8k.dts     |    1 +
+ arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi |    3 +
+ arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi |    5 +
+ arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi |    8 +-
+ arch/arm64/boot/dts/mediatek/Makefile              |    1 +
+ arch/arm64/boot/dts/mediatek/mt2712e.dtsi          |    8 +-
+ arch/arm64/boot/dts/mediatek/mt6797.dtsi           |    2 +-
+ arch/arm64/boot/dts/mediatek/mt7622.dtsi           |    2 +-
+ arch/arm64/boot/dts/mediatek/mt8173.dtsi           |    3 +-
+ arch/arm64/boot/dts/mediatek/mt8183.dtsi           |   53 +
+ arch/arm64/boot/dts/mediatek/mt8516-pinfunc.h      |  663 ++++++++++++
+ arch/arm64/boot/dts/mediatek/mt8516-pumpkin.dts    |   20 +
+ arch/arm64/boot/dts/mediatek/mt8516.dtsi           |  457 ++++++++
+ arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi   |  221 ++++
+ arch/arm64/boot/dts/nvidia/tegra132.dtsi           |    4 +-
+ arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts |   26 +-
+ arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi     |    1 +
+ arch/arm64/boot/dts/nvidia/tegra186.dtsi           |   19 +
+ arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi     |   36 +-
+ arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts |   81 ++
+ arch/arm64/boot/dts/nvidia/tegra194.dtsi           |  250 ++++-
+ arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi     |    3 +
+ arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts |    2 +
+ arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi     |   45 +-
+ arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts |   24 +-
+ arch/arm64/boot/dts/nvidia/tegra210-smaug.dts      |    2 +-
+ arch/arm64/boot/dts/nvidia/tegra210.dtsi           |   25 +-
+ arch/arm64/boot/dts/qcom/Makefile                  |    2 +
+ arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi          |    1 -
+ arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi       |    6 -
+ arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts       |   64 ++
+ arch/arm64/boot/dts/qcom/ipq6018.dtsi              |  443 ++++++++
+ arch/arm64/boot/dts/qcom/ipq8074.dtsi              |    1 +
+ .../dts/qcom/msm8916-samsung-a2015-common.dtsi     |    8 +
+ arch/arm64/boot/dts/qcom/msm8916.dtsi              |   21 +-
+ arch/arm64/boot/dts/qcom/msm8992.dtsi              |    1 +
+ arch/arm64/boot/dts/qcom/msm8994.dtsi              |    1 +
+ arch/arm64/boot/dts/qcom/msm8996.dtsi              |   33 +-
+ arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi          |    8 +-
+ arch/arm64/boot/dts/qcom/msm8998.dtsi              |   16 +-
+ arch/arm64/boot/dts/qcom/pm6150.dtsi               |    2 +-
+ arch/arm64/boot/dts/qcom/pm8998.dtsi               |    2 +-
+ arch/arm64/boot/dts/qcom/qcs404-evb.dtsi           |    1 +
+ arch/arm64/boot/dts/qcom/qcs404.dtsi               |    4 +-
+ arch/arm64/boot/dts/qcom/sc7180-idp.dts            |   64 +-
+ arch/arm64/boot/dts/qcom/sc7180.dtsi               |  605 ++++++++++-
+ arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi         |   15 +
+ arch/arm64/boot/dts/qcom/sdm845-db845c.dts         |  283 +++++
+ arch/arm64/boot/dts/qcom/sdm845-mtp.dts            |   89 ++
+ arch/arm64/boot/dts/qcom/sdm845.dtsi               |  672 +++++++++++-
+ .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts      |  114 ++
+ arch/arm64/boot/dts/qcom/sm8250-mtp.dts            |   29 +
+ arch/arm64/boot/dts/qcom/sm8250.dtsi               |  444 ++++++++
+ arch/arm64/boot/dts/renesas/Makefile               |    6 +-
+ .../r8a774a1-hihope-rzg2m-ex-idk-1110wr.dts        |   52 +
+ arch/arm64/boot/dts/renesas/r8a774a1.dtsi          |    7 +-
+ arch/arm64/boot/dts/renesas/r8a774b1.dtsi          |    7 +-
+ arch/arm64/boot/dts/renesas/r8a774c0.dtsi          |    8 +-
+ arch/arm64/boot/dts/renesas/r8a77950.dtsi          |    2 +-
+ arch/arm64/boot/dts/renesas/r8a77951.dtsi          |   11 +-
+ arch/arm64/boot/dts/renesas/r8a77960.dtsi          |   16 +-
+ .../boot/dts/renesas/r8a77961-salvator-xs.dts      |    2 +-
+ arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts      |   32 +
+ arch/arm64/boot/dts/renesas/r8a77961.dtsi          |   89 ++
+ arch/arm64/boot/dts/renesas/r8a77965.dtsi          |   31 +-
+ arch/arm64/boot/dts/renesas/r8a77970.dtsi          |    4 +-
+ arch/arm64/boot/dts/renesas/r8a77980.dtsi          |    7 +-
+ arch/arm64/boot/dts/renesas/r8a77990.dtsi          |   29 +-
+ arch/arm64/boot/dts/renesas/r8a77995.dtsi          |   14 +-
+ arch/arm64/boot/dts/rockchip/Makefile              |    1 +
+ arch/arm64/boot/dts/rockchip/px30.dtsi             |   32 +-
+ arch/arm64/boot/dts/rockchip/rk3308.dtsi           |   10 +-
+ arch/arm64/boot/dts/rockchip/rk3328-a1.dts         |    1 +
+ arch/arm64/boot/dts/rockchip/rk3328-rock64.dts     |    1 +
+ arch/arm64/boot/dts/rockchip/rk3328.dtsi           |    7 +-
+ arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts    |    1 -
+ arch/arm64/boot/dts/rockchip/rk3368.dtsi           |    3 +-
+ arch/arm64/boot/dts/rockchip/rk3399-evb.dts        |  270 ++++-
+ .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi   |    4 +-
+ arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi       |    4 +-
+ arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts |   39 +-
+ arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts   |   43 +-
+ .../boot/dts/rockchip/rk3399-pinebook-pro.dts      | 1096 ++++++++++++++++++++
+ arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi      |    2 +-
+ arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi   |    2 +-
+ .../dts/rockchip/rk3399-sapphire-excavator.dts     |    2 -
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi           |   11 +-
+ .../boot/dts/rockchip/rk3399pro-rock-pi-n10.dts    |    3 +-
+ arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi   |   10 +-
+ arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi   |   20 +-
+ .../arm64/boot/dts/socionext/uniphier-pxs3-ref.dts |   10 +
+ arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi   |   55 +-
+ arch/arm64/boot/dts/ti/k3-am65-main.dtsi           |    4 +
+ arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi            |   12 +
+ arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi    |   20 +
+ arch/arm64/configs/defconfig                       |   98 +-
+ drivers/bus/hisi_lpc.c                             |   27 +-
+ drivers/bus/ti-sysc.c                              |  604 +++++++++--
+ drivers/clk/at91/clk-sam9x60-pll.c                 |   91 +-
+ drivers/clk/imx/clk-imx8mn.c                       |    1 +
+ drivers/clk/ti/clk-814x.c                          |    7 +-
+ drivers/cpuidle/Kconfig.arm                        |    8 +
+ drivers/cpuidle/Makefile                           |    1 +
+ drivers/cpuidle/cpuidle-tegra.c                    |  392 +++++++
+ drivers/firmware/arm_scmi/Makefile                 |    3 +-
+ drivers/firmware/arm_scmi/common.h                 |  115 +-
+ drivers/firmware/arm_scmi/driver.c                 |  293 +-----
+ drivers/firmware/arm_scmi/mailbox.c                |  184 ++++
+ drivers/firmware/arm_scmi/perf.c                   |    2 +-
+ drivers/firmware/arm_scmi/shmem.c                  |   83 ++
+ drivers/firmware/arm_scpi.c                        |    4 +-
+ drivers/firmware/imx/Kconfig                       |    2 +-
+ drivers/firmware/imx/scu-pd.c                      |   13 +-
+ drivers/firmware/meson/meson_sm.c                  |    2 +
+ drivers/firmware/tegra/Kconfig                     |    2 +-
+ drivers/firmware/xilinx/Kconfig                    |    2 +
+ drivers/gpu/drm/omapdrm/dss/dss.c                  |   25 +-
+ drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c    |   25 +-
+ drivers/memory/tegra/tegra124-emc.c                |    5 +
+ drivers/memory/tegra/tegra20-emc.c                 |    5 +
+ drivers/memory/tegra/tegra30-emc.c                 |    5 +
+ drivers/misc/vexpress-syscfg.c                     |    2 +-
+ drivers/soc/Makefile                               |    2 +-
+ drivers/soc/amlogic/Kconfig                        |   13 +
+ drivers/soc/amlogic/Makefile                       |    1 +
+ drivers/soc/amlogic/meson-secure-pwrc.c            |  204 ++++
+ drivers/soc/fsl/dpio/dpio-service.c                |   69 +-
+ drivers/soc/fsl/dpio/qbman-portal.c                |  767 ++++++++++++--
+ drivers/soc/fsl/dpio/qbman-portal.h                |  158 ++-
+ drivers/soc/fsl/qe/qe.c                            |    4 +-
+ drivers/soc/fsl/qe/qe_common.c                     |    2 +-
+ drivers/soc/fsl/qe/qe_ic.c                         |    2 +-
+ drivers/soc/fsl/qe/ucc.c                           |    2 +-
+ drivers/soc/fsl/qe/ucc_slow.c                      |   33 +-
+ drivers/soc/imx/Kconfig                            |   11 +-
+ drivers/soc/imx/Makefile                           |    2 +-
+ drivers/soc/imx/gpc.c                              |   24 +-
+ drivers/soc/imx/gpcv2.c                            |    1 +
+ drivers/soc/imx/{soc-imx8.c => soc-imx8m.c}        |    0
+ drivers/soc/mediatek/mtk-cmdq-helper.c             |    1 +
+ drivers/soc/mediatek/mtk-pmic-wrap.c               |  128 +++
+ drivers/soc/qcom/Kconfig                           |    7 +-
+ drivers/soc/qcom/Makefile                          |    1 +
+ drivers/soc/qcom/apr.c                             |  123 ++-
+ drivers/soc/qcom/pdr_interface.c                   |  757 ++++++++++++++
+ drivers/soc/qcom/pdr_internal.h                    |  379 +++++++
+ drivers/soc/qcom/qcom_aoss.c                       |    6 +-
+ drivers/soc/qcom/rpmh-internal.h                   |    1 +
+ drivers/soc/qcom/rpmh-rsc.c                        |    2 +-
+ drivers/soc/qcom/rpmh.c                            |   22 +-
+ drivers/soc/qcom/socinfo.c                         |    2 +-
+ drivers/soc/renesas/Kconfig                        |   18 +-
+ drivers/soc/renesas/rcar-sysc.h                    |    4 +-
+ drivers/soc/renesas/renesas-soc.c                  |    2 +-
+ drivers/soc/tegra/pmc.c                            |  688 +++++++++---
+ drivers/soc/ti/pm33xx.c                            |   21 +-
+ drivers/tee/tee_core.c                             |    1 -
+ drivers/tee/tee_private.h                          |    3 +-
+ drivers/tee/tee_shm.c                              |   85 +-
+ include/dt-bindings/bus/ti-sysc.h                  |    4 +
+ include/dt-bindings/clock/dm814.h                  |    5 +
+ include/dt-bindings/clock/g12a-clkc.h              |    2 +
+ include/dt-bindings/clock/gxbb-clkc.h              |    1 +
+ include/dt-bindings/clock/imx8mn-clock.h           |    4 +-
+ include/dt-bindings/clock/tegra114-car.h           |    4 +-
+ include/dt-bindings/clock/tegra124-car-common.h    |    4 +-
+ include/dt-bindings/clock/tegra210-car.h           |    4 +-
+ include/dt-bindings/clock/tegra30-car.h            |    4 +-
+ include/dt-bindings/power/meson-a1-power.h         |   32 +
+ include/dt-bindings/soc/tegra-pmc.h                |   16 +
+ include/linux/clk/at91_pmc.h                       |   23 +
+ include/linux/firmware/imx/ipc.h                   |    1 -
+ include/linux/firmware/meson/meson_sm.h            |    2 +
+ include/linux/firmware/xlnx-zynqmp.h               |    2 +-
+ include/linux/platform_data/pm33xx.h               |    6 +-
+ include/linux/platform_data/ti-sysc.h              |    5 +
+ include/linux/soc/qcom/apr.h                       |    1 +
+ include/linux/soc/qcom/pdr.h                       |   29 +
+ include/linux/soc/qcom/qmi.h                       |    1 +
+ include/linux/tee_drv.h                            |   19 +-
+ include/soc/fsl/dpaa2-io.h                         |    6 +-
+ include/soc/fsl/qe/ucc_fast.h                      |    6 +-
+ include/soc/fsl/qe/ucc_slow.h                      |   13 +-
+ include/soc/qcom/rpmh.h                            |    5 -
+ include/soc/tegra/cpuidle.h                        |    2 +-
+ {arch/arm/mach-tegra => include/soc/tegra}/irq.h   |    8 +-
+ include/soc/tegra/pm.h                             |   31 +
+ include/soc/tegra/pmc.h                            |    3 +-
+ 648 files changed, 25231 insertions(+), 6620 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/arm,integrator.yaml
+ create mode 100644 Documentation/devicetree/bindings/arm/arm,realview.yaml
+ create mode 100644 Documentation/devicetree/bindings/arm/arm,versatile.yaml
+ create mode 100644 Documentation/devicetree/bindings/arm/arm,vexpress-juno.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/arm-boards
+ delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351-cpu-method.txt
+ delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm21664.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm21664.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550-cpu-method.txt
+ delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,cygnus.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,cygnus.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,hr2.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,hr2.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,ns2.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,ns2.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,nsp-cpu-method.txt
+ delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,nsp.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,nsp.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,stingray.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,stingray.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,vulcan-soc.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,vulcan-soc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/vexpress.txt
+ create mode 100644 Documentation/devicetree/bindings/power/amlogic,meson-sec-pwrc.yaml
+ create mode 100644 Documentation/devicetree/bindings/usb/nvidia,tegra-xudc.yaml
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 arch/arm/boot/dts/am57-pruss.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6dl-pico-dwarf.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-pico-hobbit.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-pico-nymph.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-pico-pi.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-pico-dwarf.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-pico-hobbit.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-pico-nymph.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-pico-pi.dts
+ create mode 100644 arch/arm/boot/dts/imx6qdl-pico-dwarf.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-pico-hobbit.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-pico-nymph.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-pico-pi.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-pico.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ul-pico-dwarf.dts
+ create mode 100644 arch/arm/boot/dts/imx7-colibri-aster.dtsi
+ create mode 100644 arch/arm/boot/dts/imx7d-colibri-aster.dts
+ create mode 100644 arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts
+ create mode 100644 arch/arm/boot/dts/imx7d-pico-dwarf.dts
+ create mode 100644 arch/arm/boot/dts/imx7d-pico-nymph.dts
+ create mode 100644 arch/arm/boot/dts/imx7s-colibri-aster.dts
+ create mode 100644 arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
+ create mode 100644 arch/arm/boot/dts/stm32mp157c-dhcom-pdk2.dts
+ create mode 100644 arch/arm/boot/dts/stm32mp157c-dhcom-som.dtsi
+ create mode 100644 arch/arm/boot/dts/sun5i-a13-pocketbook-touch-lux-3.dts
+ create mode 100644 arch/arm/boot/dts/sun7i-a20-linutronix-testbox-v2.dts
+ delete mode 100644 arch/arm/mach-tegra/cpuidle-tegra114.c
+ delete mode 100644 arch/arm/mach-tegra/cpuidle-tegra20.c
+ delete mode 100644 arch/arm/mach-tegra/cpuidle-tegra30.c
+ delete mode 100644 arch/arm/mach-tegra/cpuidle.c
+ delete mode 100644 arch/arm/mach-tegra/cpuidle.h
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var3-ads2.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var4.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-evk.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-pinfunc.h
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8516-pinfunc.h
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8516-pumpkin.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8516.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/ipq6018.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sm8250-mtp.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sm8250.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex-idk-1110wr.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
+ create mode 100644 drivers/cpuidle/cpuidle-tegra.c
+ create mode 100644 drivers/firmware/arm_scmi/mailbox.c
+ create mode 100644 drivers/firmware/arm_scmi/shmem.c
+ create mode 100644 drivers/soc/amlogic/meson-secure-pwrc.c
+ rename drivers/soc/imx/{soc-imx8.c => soc-imx8m.c} (100%)
+ create mode 100644 drivers/soc/qcom/pdr_interface.c
+ create mode 100644 drivers/soc/qcom/pdr_internal.h
+ create mode 100644 include/dt-bindings/power/meson-a1-power.h
+ create mode 100644 include/dt-bindings/soc/tegra-pmc.h
+ create mode 100644 include/linux/soc/qcom/pdr.h
+ rename {arch/arm/mach-tegra => include/soc/tegra}/irq.h (59%)
+Merging amlogic/for-next (e304af8727dd 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
+Removing Documentation/devicetree/bindings/clock/imx8mq-clock.txt
+Removing Documentation/devicetree/bindings/clock/imx8mm-clock.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/clock/imx8mm-clock.txt     | 29 ---------
+ .../devicetree/bindings/clock/imx8mm-clock.yaml    | 68 ++++++++++++++++++++
+ .../devicetree/bindings/clock/imx8mn-clock.yaml    | 48 +--------------
+ .../devicetree/bindings/clock/imx8mq-clock.txt     | 20 ------
+ .../devicetree/bindings/clock/imx8mq-clock.yaml    | 72 ++++++++++++++++++++++
+ drivers/clk/imx/clk-composite-8m.c                 | 20 ++++--
+ drivers/clk/imx/clk-fixup-div.c                    |  2 +-
+ drivers/clk/imx/clk-fixup-mux.c                    |  2 +-
+ drivers/clk/imx/clk-gate2.c                        |  8 +--
+ drivers/clk/imx/clk-imx6sl.c                       |  1 +
+ drivers/clk/imx/clk-imx7d.c                        |  1 +
+ drivers/clk/imx/clk-imx7ulp.c                      |  2 +-
+ drivers/clk/imx/clk-imx8mm.c                       | 63 ++++++++++++-------
+ drivers/clk/imx/clk-imx8mn.c                       | 40 +++++++-----
+ drivers/clk/imx/clk-imx8mp.c                       | 24 +++++---
+ drivers/clk/imx/clk-imx8mq.c                       | 53 ++++++++++------
+ drivers/clk/imx/clk-pfdv2.c                        | 61 ++++++++++++------
+ drivers/clk/imx/clk-pll14xx.c                      |  4 ++
+ drivers/clk/imx/clk-pllv4.c                        | 12 ++--
+ drivers/clk/imx/clk-sscg-pll.c                     | 14 ++---
+ drivers/clk/imx/clk.h                              | 13 +++-
+ include/dt-bindings/clock/imx7d-clock.h            |  3 +-
+ include/dt-bindings/clock/imx8mm-clock.h           | 11 +++-
+ include/dt-bindings/clock/imx8mn-clock.h           |  6 +-
+ include/dt-bindings/clock/imx8mp-clock.h           |  5 +-
+ include/dt-bindings/clock/imx8mq-clock.h           |  9 ++-
+ 26 files changed, 380 insertions(+), 211 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/clock/imx8mm-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/imx8mm-clock.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/imx8mq-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/imx8mq-clock.yaml
+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 (6906847e14b5 Merge branch 'v5.6-next/soc' into for-next)
+$ git merge mediatek/for-next
+Auto-merging drivers/gpu/drm/mediatek/mtk_hdmi.c
+Auto-merging drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+Merge made by the 'recursive' strategy.
+ .../bindings/arm/mediatek/mediatek,mmsys.txt       |   7 +-
+ 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 ++
+ 21 files changed, 592 insertions(+), 411 deletions(-)
+ 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 e92bfa65cf2f] 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 (45698e00d5a9 Merge branch 'v5.6/dt' into next)
+$ git merge realtek/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging arch/arm/Makefile
+Auto-merging arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+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 (5c1cb4ae848e Merge branch 'next/dt-late' 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                  |   2 +
+ 15 files changed, 915 insertions(+), 49 deletions(-)
+ create mode 100644 arch/arm/boot/dts/exynos4210-i9100.dts
+Merging scmi/for-linux-next (7111951b8d49 Linux 5.6)
+$ git merge scmi/for-linux-next
+Already up to date.
+Merging sunxi/sunxi/for-next (8afff9da61ea Merge branch 'sunxi/dt-for-5.7' into sunxi/for-next)
+$ git merge sunxi/sunxi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/clk/sunxi-ng/ccu-sun50i-a64.h      |   4 -
+ drivers/clk/sunxi-ng/ccu-sun8i-de2.c       | 115 +++++++++++++++++++----------
+ include/dt-bindings/clock/sun50i-a64-ccu.h |   2 +-
+ 3 files changed, 75 insertions(+), 46 deletions(-)
+Merging tegra/for-next (df0a178cf2df Merge branch for-5.7/usb into for-next)
+$ git merge tegra/for-next
+Removing drivers/clk/tegra/clk-tegra-pmc.c
+Merge made by the 'recursive' strategy.
+ drivers/clk/tegra/Makefile          |   1 -
+ drivers/clk/tegra/clk-id.h          |  12 +---
+ drivers/clk/tegra/clk-tegra-fixed.c |  37 ++++++-----
+ drivers/clk/tegra/clk-tegra-pmc.c   | 122 ------------------------------------
+ drivers/clk/tegra/clk-tegra114.c    |  43 ++++---------
+ drivers/clk/tegra/clk-tegra124.c    |  48 ++++++--------
+ drivers/clk/tegra/clk-tegra20.c     |   9 +--
+ drivers/clk/tegra/clk-tegra210.c    |  32 ++++------
+ drivers/clk/tegra/clk-tegra30.c     |  33 ++++------
+ drivers/clk/tegra/clk.h             |   1 -
+ 10 files changed, 77 insertions(+), 261 deletions(-)
+ delete mode 100644 drivers/clk/tegra/clk-tegra-pmc.c
+Merging clk/clk-next (fe3419f5acf0 Merge branch 'clk-imx' into clk-next)
+$ git merge clk/clk-next
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt
+Removing Documentation/devicetree/bindings/clock/marvell,mmp2.txt
+Removing Documentation/devicetree/bindings/clock/arm-syscon-icst.txt
+Removing Documentation/devicetree/bindings/clock/arm-integrator.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/clock/arm,syscon-icst.yaml |  103 +
+ .../devicetree/bindings/clock/arm-integrator.txt   |   34 -
+ .../devicetree/bindings/clock/arm-syscon-icst.txt  |   70 -
+ .../devicetree/bindings/clock/imx8mm-clock.yaml    |    2 +-
+ .../devicetree/bindings/clock/imx8mq-clock.yaml    |    2 +-
+ .../bindings/clock/marvell,mmp2-clock.yaml         |   64 +
+ .../devicetree/bindings/clock/marvell,mmp2.txt     |   21 -
+ .../devicetree/bindings/clock/qcom,gcc-sm8250.yaml |   72 +
+ .../devicetree/bindings/clock/qcom,rpmcc.txt       |    2 +
+ .../devicetree/bindings/clock/qcom,rpmhcc.yaml     |    1 +
+ .../devicetree/bindings/clock/qcom,sc7180-mss.yaml |   62 +
+ .../devicetree/bindings/clock/renesas,cpg-mssr.txt |  100 -
+ .../bindings/clock/renesas,cpg-mssr.yaml           |  119 +
+ .../bindings/clock/renesas,rcar-usb2-clock-sel.txt |   17 +-
+ .../clock/{sprd.txt => sprd,sc9860-clk.txt}        |    2 +-
+ .../bindings/clock/sprd,sc9863a-clk.yaml           |  105 +
+ .../bindings/clock/ti,am654-ehrpwm-tbclk.yaml      |   35 +
+ MAINTAINERS                                        |    2 +-
+ drivers/clk/at91/Makefile                          |    4 +
+ drivers/clk/at91/at91rm9200.c                      |  199 ++
+ drivers/clk/at91/at91sam9g45.c                     |  220 ++
+ drivers/clk/at91/at91sam9n12.c                     |  238 ++
+ drivers/clk/at91/clk-usb.c                         |    9 +-
+ drivers/clk/at91/sam9x60.c                         |   14 +-
+ drivers/clk/at91/sama5d3.c                         |  240 ++
+ drivers/clk/clk-si5341.c                           |  212 +-
+ drivers/clk/clk.c                                  |  127 +-
+ drivers/clk/ingenic/jz4770-cgu.c                   |    4 +-
+ drivers/clk/ingenic/jz4780-cgu.c                   |   55 +-
+ drivers/clk/ingenic/tcu.c                          |   10 +-
+ drivers/clk/keystone/Kconfig                       |    8 +
+ drivers/clk/keystone/Makefile                      |    1 +
+ drivers/clk/keystone/syscon-clk.c                  |  172 +
+ drivers/clk/meson/g12a.c                           |  129 +
+ drivers/clk/meson/g12a.h                           |    6 +-
+ drivers/clk/meson/gxbb.c                           |   21 +-
+ drivers/clk/meson/gxbb.h                           |    2 +-
+ drivers/clk/meson/meson8b.c                        |   21 +-
+ drivers/clk/mmp/Makefile                           |    2 +-
+ drivers/clk/mmp/clk-mix.c                          |    2 +-
+ drivers/clk/mmp/clk-of-mmp2.c                      |  146 +-
+ drivers/clk/mmp/clk-pll.c                          |  139 +
+ drivers/clk/mmp/clk.c                              |   31 +
+ drivers/clk/mmp/clk.h                              |   31 +-
+ drivers/clk/qcom/Kconfig                           |   16 +
+ drivers/clk/qcom/Makefile                          |    2 +
+ drivers/clk/qcom/clk-alpha-pll.c                   |  277 +-
+ drivers/clk/qcom/clk-alpha-pll.h                   |   12 +
+ drivers/clk/qcom/clk-rpm.c                         |   35 +
+ drivers/clk/qcom/clk-rpmh.c                        |   79 +-
+ drivers/clk/qcom/clk-smd-rpm.c                     |   50 +
+ drivers/clk/qcom/gcc-ipq806x.c                     |    2 +
+ drivers/clk/qcom/gcc-sc7180.c                      |   72 +-
+ drivers/clk/qcom/gcc-sm8150.c                      |   52 +
+ drivers/clk/qcom/gcc-sm8250.c                      | 3690 ++++++++++++++++++++
+ drivers/clk/qcom/gpucc-sc7180.c                    |   37 +
+ drivers/clk/qcom/mss-sc7180.c                      |  143 +
+ drivers/clk/renesas/Kconfig                        |    3 +-
+ drivers/clk/renesas/r8a7795-cpg-mssr.c             |    8 +
+ drivers/clk/renesas/r8a7796-cpg-mssr.c             |   10 +
+ drivers/clk/renesas/r8a77965-cpg-mssr.c            |   12 +-
+ drivers/clk/renesas/r8a77990-cpg-mssr.c            |    2 +
+ drivers/clk/renesas/r8a77995-cpg-mssr.c            |    2 +
+ drivers/clk/renesas/rcar-usb2-clock-sel.c          |   40 +-
+ drivers/clk/rockchip/clk-mmc-phase.c               |    4 +-
+ drivers/clk/samsung/clk.c                          |    4 -
+ drivers/clk/socfpga/clk-gate-s10.c                 |   40 +-
+ drivers/clk/socfpga/clk-periph-s10.c               |   42 +-
+ drivers/clk/socfpga/clk-pll-s10.c                  |   17 +-
+ drivers/clk/socfpga/clk-s10.c                      |   29 +-
+ drivers/clk/socfpga/stratix10-clk.h                |   25 +-
+ drivers/clk/sprd/Kconfig                           |    8 +
+ drivers/clk/sprd/Makefile                          |    1 +
+ drivers/clk/sprd/common.c                          |   10 +-
+ drivers/clk/sprd/composite.h                       |   39 +-
+ drivers/clk/sprd/div.h                             |   20 +-
+ drivers/clk/sprd/gate.c                            |   17 +
+ drivers/clk/sprd/gate.h                            |  120 +-
+ drivers/clk/sprd/mux.h                             |   28 +-
+ drivers/clk/sprd/pll.h                             |   55 +-
+ drivers/clk/sprd/sc9863a-clk.c                     | 1772 ++++++++++
+ drivers/clk/tegra/clk-tegra210.c                   |    2 +-
+ drivers/clk/versatile/clk-icst.c                   |   25 +-
+ drivers/clk/versatile/clk-icst.h                   |   22 +
+ drivers/clk/versatile/clk-impd1.c                  |   79 +
+ include/dt-bindings/clock/marvell,mmp2.h           |   13 +
+ include/dt-bindings/clock/qcom,gcc-sc7180.h        |    7 +-
+ include/dt-bindings/clock/qcom,gcc-sm8150.h        |    4 +
+ include/dt-bindings/clock/qcom,gcc-sm8250.h        |  271 ++
+ include/dt-bindings/clock/qcom,gpucc-sc7180.h      |    3 +-
+ include/dt-bindings/clock/qcom,mss-sc7180.h        |   12 +
+ include/dt-bindings/clock/qcom,rpmcc.h             |    4 +
+ include/dt-bindings/clock/qcom,rpmh.h              |    4 +-
+ include/dt-bindings/clock/sprd,sc9863a-clk.h       |  334 ++
+ 94 files changed, 9799 insertions(+), 612 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/arm-integrator.txt
+ delete mode 100644 Documentation/devicetree/bindings/clock/arm-syscon-icst.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/marvell,mmp2-clock.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/marvell,mmp2.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-sm8250.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-mss.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/renesas,cpg-mssr.yaml
+ rename Documentation/devicetree/bindings/clock/{sprd.txt => sprd,sc9860-clk.txt} (98%)
+ create mode 100644 Documentation/devicetree/bindings/clock/sprd,sc9863a-clk.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/ti,am654-ehrpwm-tbclk.yaml
+ create mode 100644 drivers/clk/at91/at91rm9200.c
+ create mode 100644 drivers/clk/at91/at91sam9g45.c
+ create mode 100644 drivers/clk/at91/at91sam9n12.c
+ create mode 100644 drivers/clk/at91/sama5d3.c
+ create mode 100644 drivers/clk/keystone/syscon-clk.c
+ create mode 100644 drivers/clk/mmp/clk-pll.c
+ create mode 100644 drivers/clk/qcom/gcc-sm8250.c
+ create mode 100644 drivers/clk/qcom/mss-sc7180.c
+ create mode 100644 drivers/clk/sprd/sc9863a-clk.c
+ create mode 100644 include/dt-bindings/clock/qcom,gcc-sm8250.h
+ create mode 100644 include/dt-bindings/clock/qcom,mss-sc7180.h
+ create mode 100644 include/dt-bindings/clock/sprd,sc9863a-clk.h
+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 (0ef5b782a807 csky: Enable the gcov function in csky achitecture)
+$ git merge csky/linux-next
+Merge made by the 'recursive' strategy.
+ arch/csky/Kconfig             | 1 +
+ arch/csky/abiv2/fpu.c         | 5 -----
+ arch/csky/abiv2/inc/abi/fpu.h | 3 ++-
+ arch/csky/kernel/smp.c        | 3 +++
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+Merging h8300/h8300-next (a5de8865cb3e h8300: move definition of __kernel_size_t etc. to posix_types.h)
+$ git merge h8300/h8300-next
+Removing arch/h8300/include/uapi/asm/bitsperlong.h
+Auto-merging arch/h8300/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/h8300/Kconfig                        |  3 +++
+ arch/h8300/include/uapi/asm/bitsperlong.h | 15 ---------------
+ arch/h8300/include/uapi/asm/posix_types.h | 13 +++++++++++++
+ arch/h8300/lib/memset.S                   | 17 ++++++++++-------
+ 4 files changed, 26 insertions(+), 22 deletions(-)
+ delete mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h
+ create mode 100644 arch/h8300/include/uapi/asm/posix_types.h
+Merging ia64/next (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
+Merge made by the 'recursive' strategy.
+ arch/m68k/68000/timers.c      | 16 +++++++---------
+ arch/m68k/coldfire/pit.c      | 16 +++++++---------
+ arch/m68k/coldfire/sltimers.c | 29 +++++++++++++++--------------
+ arch/m68k/coldfire/timers.c   | 31 +++++++++++++++----------------
+ 4 files changed, 44 insertions(+), 48 deletions(-)
+Merging microblaze/next (9fd1a1c9b3f2 microblaze: Replace setup_irq() by request_irq())
+$ git merge microblaze/next
+Already up to date.
+Merging mips/mips-next (ba15533275dd Merge tag 'v5.6' into mips-next)
+$ 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 (051d75d3bb31 MAINTAINERS: Update Ley Foon Tan's email address)
+$ 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
+Auto-merging arch/openrisc/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/openrisc/openrisc_port.rst   |  4 ++--
+ arch/openrisc/Kconfig                      |  1 +
+ arch/openrisc/configs/or1ksim_defconfig    |  1 -
+ arch/openrisc/configs/simple_smp_defconfig |  1 -
+ arch/openrisc/include/uapi/asm/unistd.h    |  1 +
+ arch/openrisc/kernel/process.c             | 18 ++++++------------
+ arch/openrisc/kernel/smp.c                 |  3 ++-
+ arch/openrisc/kernel/traps.c               |  7 -------
+ 8 files changed, 12 insertions(+), 24 deletions(-)
+Merging parisc-hd/for-next (8a29e21d8cb0 parisc: Replace setup_irq() by request_irq())
+$ git merge parisc-hd/for-next
+Merge made by the 'recursive' strategy.
+ arch/parisc/kernel/irq.c | 22 ++++++----------------
+ drivers/parisc/eisa.c    |  8 ++------
+ 2 files changed, 8 insertions(+), 22 deletions(-)
+Merging powerpc/next (c17eb4dca5a3 powerpc: Make setjmp/longjmp signature standard)
+$ git merge powerpc/next
+Auto-merging tools/testing/selftests/powerpc/tm/.gitignore
+Auto-merging tools/testing/selftests/powerpc/signal/.gitignore
+Auto-merging tools/testing/selftests/powerpc/mm/.gitignore
+Auto-merging include/linux/sysfs.h
+Auto-merging fs/sysfs/group.c
+CONFLICT (content): Merge conflict in fs/sysfs/group.c
+Auto-merging arch/powerpc/mm/kasan/kasan_init_32.c
+Auto-merging arch/powerpc/kernel/vmlinux.lds.S
+Removing arch/powerpc/kernel/ptrace.c
+Auto-merging MAINTAINERS
+Resolved 'fs/sysfs/group.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 1ef50e2de1a3] Merge remote-tracking branch 'powerpc/next'
+$ git diff -M --stat --summary HEAD^..
+ .../ABI/obsolete/sysfs-kernel-fadump_enabled       |    9 +
+ .../ABI/obsolete/sysfs-kernel-fadump_registered    |   10 +
+ .../ABI/obsolete/sysfs-kernel-fadump_release_mem   |   10 +
+ .../removed/sysfs-kernel-fadump_release_opalcore   |    9 +
+ .../ABI/testing/sysfs-firmware-opal-sensor-groups  |   21 +
+ Documentation/ABI/testing/sysfs-kernel-fadump      |   40 +
+ Documentation/powerpc/firmware-assisted-dump.rst   |   32 +-
+ MAINTAINERS                                        |   49 +-
+ arch/powerpc/Makefile                              |   12 +-
+ arch/powerpc/boot/Makefile                         |    2 +
+ arch/powerpc/boot/crt0.S                           |    3 -
+ arch/powerpc/include/asm/asm-prototypes.h          |   15 +-
+ arch/powerpc/include/asm/book3s/32/hash.h          |    8 +-
+ arch/powerpc/include/asm/book3s/32/pgtable.h       |    6 +-
+ arch/powerpc/include/asm/book3s/64/hash-4k.h       |    6 +
+ arch/powerpc/include/asm/book3s/64/hash-64k.h      |    8 +-
+ arch/powerpc/include/asm/book3s/64/kup-radix.h     |   24 +-
+ arch/powerpc/include/asm/book3s/64/pgtable.h       |    4 +-
+ arch/powerpc/include/asm/book3s/64/radix.h         |    5 +
+ arch/powerpc/include/asm/cache.h                   |    2 +-
+ arch/powerpc/include/asm/cacheflush.h              |    6 +-
+ arch/powerpc/include/asm/cputime.h                 |   33 +
+ arch/powerpc/include/asm/dma.h                     |    3 +-
+ arch/powerpc/include/asm/drmem.h                   |    4 +-
+ arch/powerpc/include/asm/eeh.h                     |   26 +-
+ arch/powerpc/include/asm/exception-64s.h           |    4 -
+ arch/powerpc/include/asm/hw_irq.h                  |    6 +-
+ arch/powerpc/include/asm/kvm_host.h                |    3 -
+ arch/powerpc/include/asm/mce.h                     |    2 +
+ arch/powerpc/include/asm/nohash/32/pgtable.h       |    6 +-
+ arch/powerpc/include/asm/opal-api.h                |    1 +
+ arch/powerpc/include/asm/perf_event.h              |    2 +-
+ arch/powerpc/include/asm/pgtable.h                 |   19 +
+ arch/powerpc/include/asm/ptrace.h                  |    5 +
+ arch/powerpc/include/asm/reg.h                     |    4 +-
+ arch/powerpc/include/asm/setjmp.h                  |    6 +-
+ arch/powerpc/include/asm/signal.h                  |    3 +
+ arch/powerpc/include/asm/switch_to.h               |   11 +
+ arch/powerpc/include/asm/time.h                    |    4 +-
+ arch/powerpc/include/asm/topology.h                |   10 +-
+ arch/powerpc/include/asm/vdso.h                    |   24 -
+ arch/powerpc/kernel/Makefile                       |   11 +-
+ arch/powerpc/kernel/btext.c                        |    2 +-
+ arch/powerpc/kernel/cputable.c                     |    1 -
+ arch/powerpc/kernel/dt_cpu_ftrs.c                  |    1 -
+ arch/powerpc/kernel/eeh.c                          |  145 +-
+ arch/powerpc/kernel/entry_32.S                     |   38 +-
+ arch/powerpc/kernel/entry_64.S                     |  895 ++---
+ arch/powerpc/kernel/exceptions-64e.S               |  287 +-
+ arch/powerpc/kernel/exceptions-64s.S               | 2043 ++++++++----
+ arch/powerpc/kernel/fadump.c                       |  134 +-
+ arch/powerpc/kernel/head_32.S                      |    9 +-
+ arch/powerpc/kernel/head_32.h                      |   28 +-
+ arch/powerpc/kernel/head_64.S                      |    4 +-
+ arch/powerpc/kernel/head_booke.h                   |    5 +-
+ arch/powerpc/kernel/hw_breakpoint.c                |   16 +
+ arch/powerpc/kernel/irq.c                          |  192 +-
+ arch/powerpc/kernel/kprobes.c                      |   84 +-
+ arch/powerpc/kernel/mce.c                          |   14 +
+ arch/powerpc/kernel/mce_power.c                    |    8 +-
+ arch/powerpc/kernel/misc.S                         |    4 +-
+ arch/powerpc/kernel/of_platform.c                  |   12 +-
+ arch/powerpc/kernel/paca.c                         |   14 +-
+ arch/powerpc/kernel/pci-common.c                   |    6 -
+ arch/powerpc/kernel/pci-hotplug.c                  |    2 -
+ arch/powerpc/kernel/process.c                      |  124 +-
+ arch/powerpc/kernel/prom_init.c                    |    4 +-
+ arch/powerpc/kernel/ptrace.c                       | 3468 --------------------
+ arch/powerpc/kernel/ptrace/Makefile                |   20 +
+ arch/powerpc/kernel/ptrace/ptrace-adv.c            |  492 +++
+ arch/powerpc/kernel/ptrace/ptrace-altivec.c        |  128 +
+ arch/powerpc/kernel/ptrace/ptrace-decl.h           |  184 ++
+ arch/powerpc/kernel/ptrace/ptrace-noadv.c          |  265 ++
+ arch/powerpc/kernel/ptrace/ptrace-novsx.c          |   57 +
+ arch/powerpc/kernel/ptrace/ptrace-spe.c            |   68 +
+ arch/powerpc/kernel/ptrace/ptrace-tm.c             |  851 +++++
+ arch/powerpc/kernel/ptrace/ptrace-view.c           |  904 +++++
+ arch/powerpc/kernel/ptrace/ptrace-vsx.c            |  151 +
+ arch/powerpc/kernel/ptrace/ptrace.c                |  481 +++
+ arch/powerpc/kernel/{ => ptrace}/ptrace32.c        |   11 -
+ arch/powerpc/kernel/setup-common.c                 |    3 +-
+ arch/powerpc/kernel/setup.h                        |    6 +
+ arch/powerpc/kernel/setup_32.c                     |    1 -
+ arch/powerpc/kernel/setup_64.c                     |   32 +-
+ arch/powerpc/kernel/signal.h                       |    2 -
+ arch/powerpc/kernel/signal_64.c                    |    4 +-
+ arch/powerpc/kernel/smp.c                          |   31 +-
+ arch/powerpc/kernel/stacktrace.c                   |    6 +-
+ arch/powerpc/kernel/syscall_64.c                   |  379 +++
+ arch/powerpc/kernel/syscalls/syscall.tbl           |   22 +-
+ arch/powerpc/kernel/sysfs.c                        |  381 ++-
+ arch/powerpc/kernel/systbl.S                       |    9 +-
+ arch/powerpc/kernel/time.c                         |    9 -
+ arch/powerpc/kernel/traps.c                        |   25 +-
+ arch/powerpc/kernel/vdso.c                         |    5 -
+ arch/powerpc/kernel/vector.S                       |    2 +-
+ arch/powerpc/kernel/vmlinux.lds.S                  |    1 +
+ arch/powerpc/kexec/Makefile                        |    3 -
+ arch/powerpc/kvm/book3s_64_mmu_hv.c                |    5 +-
+ arch/powerpc/kvm/book3s_64_mmu_radix.c             |    5 +-
+ arch/powerpc/kvm/book3s_hv.c                       |    9 +-
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S            |   11 -
+ arch/powerpc/kvm/book3s_segment.S                  |    7 -
+ arch/powerpc/kvm/timing.c                          |   17 +-
+ arch/powerpc/lib/sstep.c                           |    5 +-
+ arch/powerpc/lib/test_emulate_step.c               |    7 +-
+ arch/powerpc/mm/book3s32/hash_low.S                |   27 +-
+ arch/powerpc/mm/book3s32/mmu.c                     |    2 +-
+ arch/powerpc/mm/book3s32/tlb.c                     |   11 +-
+ arch/powerpc/mm/book3s64/hash_utils.c              |    7 +-
+ arch/powerpc/mm/book3s64/iommu_api.c               |   39 +-
+ arch/powerpc/mm/book3s64/radix_pgtable.c           |    1 +
+ arch/powerpc/mm/book3s64/radix_tlb.c               |    7 +-
+ arch/powerpc/mm/kasan/kasan_init_32.c              |   10 +-
+ arch/powerpc/mm/mem.c                              |    6 -
+ arch/powerpc/mm/nohash/40x.c                       |    4 +-
+ arch/powerpc/mm/nohash/tlb_low.S                   |   12 +-
+ arch/powerpc/mm/numa.c                             |   97 +-
+ arch/powerpc/mm/pgtable_32.c                       |   41 +-
+ arch/powerpc/mm/ptdump/bats.c                      |    8 +-
+ arch/powerpc/mm/ptdump/hashpagetable.c             |    7 +-
+ arch/powerpc/mm/ptdump/ptdump.c                    |    8 +-
+ arch/powerpc/mm/ptdump/segment_regs.c              |    8 +-
+ arch/powerpc/platforms/44x/warp.c                  |    3 -
+ arch/powerpc/platforms/52xx/efika.c                |    1 -
+ arch/powerpc/platforms/83xx/km83xx.c               |    9 +-
+ arch/powerpc/platforms/85xx/mpc85xx_cds.c          |   11 +-
+ arch/powerpc/platforms/8xx/cpm1.c                  |    9 +-
+ arch/powerpc/platforms/8xx/m8xx_setup.c            |    9 +-
+ arch/powerpc/platforms/Kconfig.cputype             |    8 +-
+ arch/powerpc/platforms/amigaone/setup.c            |    1 -
+ arch/powerpc/platforms/cell/axon_msi.c             |    6 +-
+ arch/powerpc/platforms/cell/spufs/switch.c         |    2 +-
+ arch/powerpc/platforms/chrp/setup.c                |   15 +-
+ arch/powerpc/platforms/maple/setup.c               |   34 +-
+ arch/powerpc/platforms/powermac/pic.c              |   29 +-
+ arch/powerpc/platforms/powermac/setup.c            |    1 -
+ arch/powerpc/platforms/powermac/smp.c              |   20 +-
+ arch/powerpc/platforms/powernv/eeh-powernv.c       |   37 +-
+ arch/powerpc/platforms/powernv/memtrace.c          |    7 -
+ arch/powerpc/platforms/powernv/opal-core.c         |   55 +-
+ arch/powerpc/platforms/powernv/opal-imc.c          |   24 +-
+ arch/powerpc/platforms/powernv/pci-ioda.c          |    5 -
+ arch/powerpc/platforms/powernv/setup.c             |    4 +-
+ arch/powerpc/platforms/powernv/vas-debug.c         |   37 +-
+ arch/powerpc/platforms/pseries/Makefile            |    2 -
+ arch/powerpc/platforms/pseries/eeh_pseries.c       |   87 +-
+ arch/powerpc/platforms/pseries/hotplug-memory.c    |    8 +-
+ arch/powerpc/platforms/pseries/lpar.c              |   10 +-
+ arch/powerpc/platforms/pseries/of_helpers.c        |    2 +-
+ arch/powerpc/platforms/pseries/papr_scm.c          |    5 +-
+ arch/powerpc/platforms/pseries/pci_dlpar.c         |    2 +-
+ arch/powerpc/platforms/pseries/ras.c               |    3 +
+ arch/powerpc/platforms/pseries/vio.c               |    2 -
+ arch/powerpc/platforms/pseries/vphn.c              |    3 +-
+ arch/powerpc/sysdev/xive/common.c                  |  126 +-
+ arch/powerpc/sysdev/xive/native.c                  |    7 +-
+ arch/powerpc/sysdev/xive/spapr.c                   |   23 +-
+ arch/powerpc/sysdev/xive/xive-internal.h           |    9 +
+ arch/powerpc/xmon/Makefile                         |    3 -
+ arch/powerpc/xmon/xmon.c                           |   14 +-
+ drivers/cpufreq/powernv-cpufreq.c                  |   30 +-
+ drivers/pci/hotplug/rpadlpar_core.c                |    2 +-
+ drivers/pci/hotplug/rpaphp_core.c                  |    5 +-
+ drivers/pci/hotplug/rpaphp_pci.c                   |    4 +-
+ drivers/tty/ehv_bytechan.c                         |   21 +-
+ fs/sysfs/group.c                                   |   28 +-
+ include/linux/sysfs.h                              |   12 +
+ .../testing/selftests/powerpc/benchmarks/Makefile  |    2 +
+ .../testing/selftests/powerpc/benchmarks/settings  |    1 +
+ tools/testing/selftests/powerpc/dscr/Makefile      |    2 +
+ tools/testing/selftests/powerpc/dscr/settings      |    1 +
+ tools/testing/selftests/powerpc/mm/.gitignore      |    1 +
+ tools/testing/selftests/powerpc/pmu/ebb/Makefile   |    1 +
+ tools/testing/selftests/powerpc/signal/.gitignore  |    1 +
+ tools/testing/selftests/powerpc/signal/Makefile    |    4 +-
+ tools/testing/selftests/powerpc/signal/settings    |    1 +
+ .../selftests/powerpc/signal/sigreturn_vdso.c      |  127 +
+ tools/testing/selftests/powerpc/tm/.gitignore      |    1 +
+ tools/testing/selftests/powerpc/tm/Makefile        |    5 +-
+ tools/testing/selftests/powerpc/tm/settings        |    1 +
+ .../powerpc/tm/tm-signal-context-force-tm.c        |   74 +-
+ .../selftests/powerpc/tm/tm-signal-pagefault.c     |  284 ++
+ 183 files changed, 7989 insertions(+), 6154 deletions(-)
+ create mode 100644 Documentation/ABI/obsolete/sysfs-kernel-fadump_enabled
+ create mode 100644 Documentation/ABI/obsolete/sysfs-kernel-fadump_registered
+ create mode 100644 Documentation/ABI/obsolete/sysfs-kernel-fadump_release_mem
+ create mode 100644 Documentation/ABI/removed/sysfs-kernel-fadump_release_opalcore
+ create mode 100644 Documentation/ABI/testing/sysfs-firmware-opal-sensor-groups
+ create mode 100644 Documentation/ABI/testing/sysfs-kernel-fadump
+ delete mode 100644 arch/powerpc/kernel/ptrace.c
+ create mode 100644 arch/powerpc/kernel/ptrace/Makefile
+ create mode 100644 arch/powerpc/kernel/ptrace/ptrace-adv.c
+ create mode 100644 arch/powerpc/kernel/ptrace/ptrace-altivec.c
+ create mode 100644 arch/powerpc/kernel/ptrace/ptrace-decl.h
+ create mode 100644 arch/powerpc/kernel/ptrace/ptrace-noadv.c
+ create mode 100644 arch/powerpc/kernel/ptrace/ptrace-novsx.c
+ create mode 100644 arch/powerpc/kernel/ptrace/ptrace-spe.c
+ create mode 100644 arch/powerpc/kernel/ptrace/ptrace-tm.c
+ create mode 100644 arch/powerpc/kernel/ptrace/ptrace-view.c
+ create mode 100644 arch/powerpc/kernel/ptrace/ptrace-vsx.c
+ create mode 100644 arch/powerpc/kernel/ptrace/ptrace.c
+ rename arch/powerpc/kernel/{ => ptrace}/ptrace32.c (96%)
+ create mode 100644 arch/powerpc/kernel/syscall_64.c
+ create mode 100644 tools/testing/selftests/powerpc/benchmarks/settings
+ create mode 100644 tools/testing/selftests/powerpc/dscr/settings
+ create mode 100644 tools/testing/selftests/powerpc/signal/settings
+ create mode 100644 tools/testing/selftests/powerpc/signal/sigreturn_vdso.c
+ create mode 100644 tools/testing/selftests/powerpc/tm/settings
+ create mode 100644 tools/testing/selftests/powerpc/tm/tm-signal-pagefault.c
+Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges)
+$ git merge fsl/next
+Already up to date.
+Merging soc-fsl/next (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 (f1e58583b9c7 RISC-V: Support cpu hotplug)
+$ git merge risc-v/for-next
+Auto-merging arch/riscv/mm/init.c
+Auto-merging arch/riscv/kernel/traps.c
+Auto-merging arch/riscv/kernel/entry.S
+Auto-merging arch/riscv/include/asm/pgtable.h
+CONFLICT (content): Merge conflict in arch/riscv/include/asm/pgtable.h
+Auto-merging arch/riscv/configs/rv32_defconfig
+Auto-merging arch/riscv/configs/defconfig
+Auto-merging arch/riscv/Kconfig
+Resolved 'arch/riscv/include/asm/pgtable.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master b18d074cb186] Merge remote-tracking branch 'risc-v/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/riscv/Kconfig                   |  26 +-
+ arch/riscv/configs/defconfig         |   1 +
+ arch/riscv/configs/rv32_defconfig    |   1 +
+ arch/riscv/include/asm/bug.h         |   8 +
+ arch/riscv/include/asm/cacheflush.h  |   2 +-
+ arch/riscv/include/asm/cpu_ops.h     |  46 +++
+ arch/riscv/include/asm/current.h     |   5 +-
+ arch/riscv/include/asm/fixmap.h      |   2 +
+ arch/riscv/include/asm/kasan.h       |   2 +-
+ arch/riscv/include/asm/patch.h       |  12 +
+ arch/riscv/include/asm/pgtable.h     |  10 +
+ arch/riscv/include/asm/ptdump.h      |  11 +
+ arch/riscv/include/asm/sbi.h         | 195 +++++++-----
+ arch/riscv/include/asm/set_memory.h  |  48 +++
+ arch/riscv/include/asm/smp.h         |  24 ++
+ arch/riscv/kernel/Makefile           |  10 +-
+ arch/riscv/kernel/cpu-hotplug.c      |  87 ++++++
+ arch/riscv/kernel/cpu_ops.c          |  46 +++
+ arch/riscv/kernel/cpu_ops_sbi.c      | 115 +++++++
+ arch/riscv/kernel/cpu_ops_spinwait.c |  43 +++
+ arch/riscv/kernel/entry.S            | 143 ++++-----
+ arch/riscv/kernel/ftrace.c           |  13 +-
+ arch/riscv/kernel/head.S             | 179 ++++++-----
+ arch/riscv/kernel/patch.c            | 120 ++++++++
+ arch/riscv/kernel/process.c          |   5 +-
+ arch/riscv/kernel/sbi.c              | 575 ++++++++++++++++++++++++++++++++++-
+ arch/riscv/kernel/setup.c            |  32 +-
+ arch/riscv/kernel/smpboot.c          |  53 ++--
+ arch/riscv/kernel/stacktrace.c       |   7 +-
+ arch/riscv/kernel/traps.c            |   5 +-
+ arch/riscv/kernel/vmlinux.lds.S      |  17 +-
+ arch/riscv/lib/uaccess.S             |   6 +-
+ arch/riscv/mm/Makefile               |   3 +-
+ arch/riscv/mm/hugetlbpage.c          |   6 +-
+ arch/riscv/mm/init.c                 |  44 +++
+ arch/riscv/mm/pageattr.c             | 187 ++++++++++++
+ arch/riscv/mm/ptdump.c               | 317 +++++++++++++++++++
+ 37 files changed, 2119 insertions(+), 287 deletions(-)
+ create mode 100644 arch/riscv/include/asm/cpu_ops.h
+ create mode 100644 arch/riscv/include/asm/patch.h
+ create mode 100644 arch/riscv/include/asm/ptdump.h
+ create mode 100644 arch/riscv/include/asm/set_memory.h
+ create mode 100644 arch/riscv/kernel/cpu-hotplug.c
+ create mode 100644 arch/riscv/kernel/cpu_ops.c
+ create mode 100644 arch/riscv/kernel/cpu_ops_sbi.c
+ create mode 100644 arch/riscv/kernel/cpu_ops_spinwait.c
+ create mode 100644 arch/riscv/kernel/patch.c
+ create mode 100644 arch/riscv/mm/pageattr.c
+ create mode 100644 arch/riscv/mm/ptdump.c
+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 (1058c163dc31 s390/mm: cleanup init_new_context() callback)
+$ git merge s390/features
+Auto-merging kernel/power/snapshot.c
+Auto-merging drivers/s390/crypto/zcrypt_ep11misc.c
+Auto-merging drivers/s390/cio/qdio_thinint.c
+Auto-merging drivers/s390/cio/qdio_setup.c
+Auto-merging drivers/s390/cio/qdio_main.c
+Auto-merging drivers/s390/cio/qdio_debug.c
+Auto-merging drivers/s390/cio/qdio.h
+Auto-merging arch/s390/pci/pci.c
+Removing arch/s390/numa/toptree.h
+Removing arch/s390/numa/toptree.c
+Removing arch/s390/numa/numa_mode.h
+Removing arch/s390/numa/mode_emu.c
+Removing arch/s390/kernel/swsusp.S
+Removing arch/s390/kernel/suspend.c
+Auto-merging arch/s390/include/asm/processor.h
+Auto-merging arch/s390/include/asm/page.h
+Auto-merging arch/s390/configs/defconfig
+Auto-merging arch/s390/configs/debug_defconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS                            |   4 +-
+ arch/s390/Kconfig                      |  73 +----
+ arch/s390/appldata/appldata_os.c       |   2 +-
+ arch/s390/boot/install.sh              |  17 +-
+ arch/s390/configs/debug_defconfig      |   1 +
+ arch/s390/configs/defconfig            |   1 +
+ arch/s390/crypto/aes_s390.c            |   3 +
+ arch/s390/include/asm/hw_irq.h         |   1 -
+ arch/s390/include/asm/ipl.h            |   1 +
+ arch/s390/include/asm/lowcore.h        |   4 +-
+ arch/s390/include/asm/mmu.h            |   2 -
+ arch/s390/include/asm/mmu_context.h    |  44 +--
+ arch/s390/include/asm/numa.h           |  13 +-
+ arch/s390/include/asm/page.h           |  18 +-
+ arch/s390/include/asm/pci.h            |   6 +
+ arch/s390/include/asm/pgalloc.h        |  39 +--
+ arch/s390/include/asm/processor.h      |  10 +-
+ arch/s390/include/asm/setup.h          |   7 +
+ arch/s390/include/asm/smp.h            |   1 +
+ arch/s390/include/asm/topology.h       |  15 +-
+ arch/s390/kernel/Makefile              |   1 -
+ arch/s390/kernel/asm-offsets.c         |   2 +
+ arch/s390/kernel/diag.c                |   2 +-
+ arch/s390/kernel/entry.S               |  65 ++--
+ arch/s390/kernel/ipl.c                 |  73 ++++-
+ arch/s390/kernel/irq.c                 |  26 +-
+ arch/s390/kernel/machine_kexec.c       |  31 --
+ arch/s390/kernel/perf_cpum_cf_events.c | 123 ++++++-
+ arch/s390/kernel/perf_cpum_sf.c        |  44 +--
+ arch/s390/kernel/process.c             |   1 +
+ arch/s390/kernel/processor.c           |  34 +-
+ arch/s390/kernel/setup.c               |   4 +
+ arch/s390/kernel/signal.c              |   4 +-
+ arch/s390/kernel/smp.c                 |  13 +-
+ arch/s390/kernel/suspend.c             | 240 --------------
+ arch/s390/kernel/swsusp.S              | 276 ----------------
+ arch/s390/kernel/topology.c            |  34 +-
+ arch/s390/kernel/traps.c               |   2 +-
+ arch/s390/mm/cmm.c                     |  46 +--
+ arch/s390/mm/fault.c                   |  21 +-
+ arch/s390/mm/hugetlbpage.c             |  11 +-
+ arch/s390/mm/mmap.c                    |  40 +--
+ arch/s390/mm/pageattr.c                |  16 -
+ arch/s390/mm/pgalloc.c                 | 108 +++---
+ arch/s390/mm/vmem.c                    |   4 +
+ arch/s390/numa/Makefile                |   2 -
+ arch/s390/numa/mode_emu.c              | 577 ---------------------------------
+ arch/s390/numa/numa.c                  | 147 +--------
+ arch/s390/numa/numa_mode.h             |  25 --
+ arch/s390/numa/toptree.c               | 351 --------------------
+ arch/s390/numa/toptree.h               |  61 ----
+ arch/s390/pci/pci.c                    |  83 ++---
+ arch/s390/pci/pci_clp.c                |   2 +-
+ drivers/pci/hotplug/s390_pci_hpc.c     |  99 ++----
+ drivers/s390/block/dasd_diag.c         |   2 +-
+ drivers/s390/block/dasd_eckd.h         |   2 +-
+ drivers/s390/char/con3215.c            |   2 +-
+ drivers/s390/char/hmcdrv_ftp.c         |   2 +-
+ drivers/s390/char/raw3270.h            |   2 +-
+ drivers/s390/char/sclp_cmd.c           |   2 +-
+ drivers/s390/char/sclp_pci.c           |   2 +-
+ drivers/s390/char/sclp_sdias.c         |   2 +-
+ drivers/s390/char/tape_core.c          |   6 +-
+ drivers/s390/cio/airq.c                |   8 +-
+ drivers/s390/cio/ccwgroup.c            |  69 ----
+ drivers/s390/cio/chsc.c                |   5 +-
+ drivers/s390/cio/chsc.h                |   3 +-
+ drivers/s390/cio/cio.c                 |   8 +-
+ drivers/s390/cio/device.c              |   4 +-
+ drivers/s390/cio/idset.c               |   2 +-
+ drivers/s390/cio/qdio.h                |   9 +-
+ drivers/s390/cio/qdio_debug.c          |  59 ++--
+ drivers/s390/cio/qdio_debug.h          |   3 +-
+ drivers/s390/cio/qdio_main.c           |  23 +-
+ drivers/s390/cio/qdio_setup.c          |  29 +-
+ drivers/s390/cio/qdio_thinint.c        |   2 +-
+ drivers/s390/crypto/ap_bus.c           | 212 +++---------
+ drivers/s390/crypto/ap_bus.h           |   5 -
+ drivers/s390/crypto/ap_card.c          |  17 +-
+ drivers/s390/crypto/ap_queue.c         |  75 +----
+ drivers/s390/crypto/pkey_api.c         |   2 +-
+ drivers/s390/crypto/vfio_ap_ops.c      |   2 +-
+ drivers/s390/crypto/zcrypt_card.c      |   6 +-
+ drivers/s390/crypto/zcrypt_ccamisc.c   |  33 +-
+ drivers/s390/crypto/zcrypt_ccamisc.h   |   2 +-
+ drivers/s390/crypto/zcrypt_cex2a.c     |   2 -
+ drivers/s390/crypto/zcrypt_cex2c.c     |   2 -
+ drivers/s390/crypto/zcrypt_cex4.c      |  76 ++---
+ drivers/s390/crypto/zcrypt_ep11misc.c  |  10 +-
+ drivers/s390/crypto/zcrypt_msgtype6.c  |  10 +-
+ drivers/s390/crypto/zcrypt_queue.c     |   4 +-
+ drivers/s390/net/ism_drv.c             |  20 --
+ include/linux/suspend.h                |  34 --
+ kernel/power/Kconfig                   |   3 -
+ kernel/power/snapshot.c                |  18 -
+ 95 files changed, 800 insertions(+), 2809 deletions(-)
+ delete mode 100644 arch/s390/kernel/suspend.c
+ delete mode 100644 arch/s390/kernel/swsusp.S
+ delete mode 100644 arch/s390/numa/mode_emu.c
+ delete mode 100644 arch/s390/numa/numa_mode.h
+ delete mode 100644 arch/s390/numa/toptree.c
+ delete mode 100644 arch/s390/numa/toptree.h
+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/bitops-op32.h |  8 +++-----
+ 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 +
+ 5 files changed, 22 insertions(+), 8 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
+Removing arch/um/include/shared/timer-internal.h
+Auto-merging arch/um/drivers/vector_kern.c
+Merge made by the 'recursive' strategy.
+ arch/um/Kconfig                         |   9 +-
+ arch/um/configs/i386_defconfig          |   2 +-
+ arch/um/configs/x86_64_defconfig        |   2 +-
+ arch/um/drivers/Kconfig                 |   3 +
+ arch/um/drivers/net_kern.c              |  13 -
+ arch/um/drivers/ubd_kern.c              |  12 +-
+ arch/um/drivers/vector_kern.c           |   5 +-
+ arch/um/drivers/vector_user.c           |  15 +-
+ arch/um/drivers/vhost_user.h            |  12 +-
+ arch/um/drivers/virtio_uml.c            | 153 +++++++--
+ arch/um/include/asm/Kbuild              |   1 -
+ arch/um/include/asm/delay.h             |  30 ++
+ arch/um/include/linux/time-internal.h   |  84 +++++
+ arch/um/include/shared/os.h             |   1 +
+ arch/um/include/shared/timer-internal.h |  76 -----
+ arch/um/kernel/kmsg_dump.c              |   9 +-
+ arch/um/kernel/process.c                |  39 +--
+ arch/um/kernel/skas/syscall.c           |   5 +-
+ arch/um/kernel/time.c                   | 538 ++++++++++++++++++++++++++++++--
+ arch/um/kernel/uml.lds.S                |   2 +-
+ arch/um/os-Linux/file.c                 |  31 ++
+ arch/um/os-Linux/time.c                 |   1 -
+ arch/um/os-Linux/umid.c                 |   5 +-
+ arch/x86/um/asm/processor.h             |  12 +-
+ fs/hostfs/hostfs_kern.c                 |  12 +-
+ include/uapi/linux/um_timetravel.h      | 128 ++++++++
+ 26 files changed, 986 insertions(+), 214 deletions(-)
+ create mode 100644 arch/um/include/asm/delay.h
+ create mode 100644 arch/um/include/linux/time-internal.h
+ delete mode 100644 arch/um/include/shared/timer-internal.h
+ create mode 100644 include/uapi/linux/um_timetravel.h
+Merging xtensa/xtensa-for-next (adc044bf2320 Merge branch 'xtensa-5.7-fixes' into xtensa-for-next)
+$ git merge xtensa/xtensa-for-next
+Auto-merging arch/xtensa/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/xtensa/Kconfig       |  2 +-
+ arch/xtensa/boot/Makefile |  1 -
+ arch/xtensa/kernel/smp.c  |  8 ++------
+ arch/xtensa/kernel/time.c | 12 +++++-------
+ 4 files changed, 8 insertions(+), 15 deletions(-)
+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 (3e10eb7331c7 rbd: don't mess with a page vector in rbd_notify_op_lock())
+$ git merge ceph/master
+Auto-merging Documentation/filesystems/ceph.rst
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/ceph.rst |   6 +-
+ drivers/block/rbd.c                | 244 +++++++----------
+ fs/ceph/addr.c                     |  90 ++++++-
+ fs/ceph/cache.c                    |   2 +-
+ fs/ceph/caps.c                     | 536 ++++++++++++++++++++-----------------
+ fs/ceph/debugfs.c                  |  16 +-
+ fs/ceph/dir.c                      | 132 ++++++++-
+ fs/ceph/export.c                   |   5 +
+ fs/ceph/file.c                     | 486 +++++++++++++++++++++++++--------
+ fs/ceph/inode.c                    |  84 +++---
+ fs/ceph/ioctl.c                    |   2 +
+ fs/ceph/locks.c                    |  31 ++-
+ fs/ceph/mds_client.c               | 240 ++++++++++++++---
+ fs/ceph/mds_client.h               |  30 ++-
+ fs/ceph/super.c                    |  28 ++
+ fs/ceph/super.h                    |  70 +++--
+ include/linux/ceph/ceph_fs.h       |  18 +-
+ include/linux/ceph/debugfs.h       |  14 -
+ include/linux/ceph/libceph.h       |   1 +
+ include/linux/ceph/osd_client.h    |  17 --
+ net/ceph/debugfs.c                 |  20 +-
+ net/ceph/mon_client.c              |   8 +-
+ net/ceph/osd_client.c              |  82 ------
+ 23 files changed, 1395 insertions(+), 767 deletions(-)
+Merging cifs/for-next (c037725d043e cifs: ignore cached share root handle closing errors)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/cifs_debug.c    |   6 +-
+ fs/cifs/cifsglob.h      |   3 +-
+ fs/cifs/smb2misc.c      |   6 ++
+ fs/cifs/smb2proto.h     |   6 +-
+ fs/cifs/smb2transport.c |  87 +++++++++------
+ fs/cifs/smbdirect.c     | 282 +++++++++++++++++-------------------------------
+ fs/cifs/smbdirect.h     |   7 +-
+ 7 files changed, 167 insertions(+), 230 deletions(-)
+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 (20741a6e146c MAINTAINERS: erofs: update my email address)
+$ git merge erofs/dev
+Already up to date.
+Merging ext3/for_next (a32f0ecd79b4 Merge fanotify fix from Nathan Chancellor.)
+$ git merge ext3/for_next
+Auto-merging kernel/audit_watch.c
+Merge made by the 'recursive' strategy.
+ fs/ext2/xattr.c                      |  18 ++-
+ fs/ext2/xattr.h                      |   2 +-
+ fs/notify/fanotify/fanotify.c        | 302 ++++++++++++++++++++++++++---------
+ fs/notify/fanotify/fanotify.h        | 189 +++++++++++++++-------
+ fs/notify/fanotify/fanotify_user.c   | 220 ++++++++++++++++---------
+ fs/notify/fsnotify.c                 |  22 +--
+ fs/notify/inotify/inotify_fsnotify.c |  12 +-
+ fs/notify/inotify/inotify_user.c     |   2 +-
+ fs/udf/udf_sb.h                      |   2 +-
+ include/linux/fanotify.h             |   3 +-
+ include/linux/fsnotify.h             | 138 +++++++---------
+ include/linux/fsnotify_backend.h     |  70 +++++---
+ include/uapi/linux/fanotify.h        |  13 +-
+ kernel/audit_fsnotify.c              |  13 +-
+ kernel/audit_watch.c                 |  16 +-
+ 15 files changed, 652 insertions(+), 370 deletions(-)
+Merging ext4/dev (54d3adbc29f0 ext4: save all error info in save_error_info() and drop ext4_set_errno())
+$ git merge ext4/dev
+Auto-merging fs/ext4/super.c
+Auto-merging fs/ext4/ioctl.c
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/fiemap.txt |   6 +-
+ fs/ext4/balloc.c                     |   7 +-
+ fs/ext4/block_validity.c             |  18 +-
+ fs/ext4/dir.c                        |   2 +-
+ fs/ext4/ext4.h                       |  59 +++--
+ fs/ext4/ext4_jbd2.c                  |  14 +-
+ fs/ext4/ext4_jbd2.h                  |   3 +
+ fs/ext4/extents.c                    | 480 ++++++++---------------------------
+ fs/ext4/file.c                       |   1 +
+ fs/ext4/ialloc.c                     |  36 ++-
+ fs/ext4/indirect.c                   |   2 +-
+ fs/ext4/inline.c                     |  54 +---
+ fs/ext4/inode.c                      |  57 +++--
+ fs/ext4/ioctl.c                      |  12 -
+ fs/ext4/mballoc.c                    |  38 +--
+ fs/ext4/mmp.c                        |  13 +-
+ fs/ext4/move_extent.c                |   4 +-
+ fs/ext4/namei.c                      |  28 +-
+ fs/ext4/super.c                      | 212 ++++++++--------
+ fs/ext4/xattr.c                      |  10 +-
+ fs/ext4/xattr.h                      |   4 +-
+ fs/jbd2/commit.c                     |   7 +-
+ 22 files changed, 392 insertions(+), 675 deletions(-)
+Merging f2fs/dev (8a1ca11a95e2 f2fs: keep inline_data when compression conversion)
+$ git merge f2fs/dev
+Auto-merging fs/f2fs/super.c
+Auto-merging fs/f2fs/file.c
+Auto-merging fs/f2fs/f2fs.h
+Auto-merging Documentation/filesystems/f2fs.rst
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-fs-f2fs |   5 +
+ Documentation/filesystems/f2fs.rst      |   4 +-
+ fs/f2fs/Kconfig                         |   9 +
+ fs/f2fs/checkpoint.c                    |  42 ++---
+ fs/f2fs/compress.c                      | 319 ++++++++++++++++++++++++++------
+ fs/f2fs/data.c                          | 141 ++++++++------
+ fs/f2fs/debug.c                         |   3 +
+ fs/f2fs/dir.c                           |  16 +-
+ fs/f2fs/f2fs.h                          | 206 ++++++++++++---------
+ fs/f2fs/file.c                          |  91 +++++----
+ fs/f2fs/gc.c                            |  51 +++--
+ fs/f2fs/inode.c                         |  29 ++-
+ fs/f2fs/namei.c                         |  12 +-
+ fs/f2fs/node.c                          |  33 ++--
+ fs/f2fs/recovery.c                      |  12 +-
+ fs/f2fs/segment.c                       |  54 +++---
+ fs/f2fs/segment.h                       |   2 +-
+ fs/f2fs/shrinker.c                      |   2 +-
+ fs/f2fs/super.c                         |  89 +++++----
+ fs/f2fs/sysfs.c                         |  50 +++--
+ fs/f2fs/xattr.c                         |  67 +++++--
+ fs/f2fs/xattr.h                         |   9 +-
+ include/linux/f2fs_fs.h                 |   1 +
+ include/trace/events/f2fs.h             |   3 +-
+ 24 files changed, 822 insertions(+), 428 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 (f764a1e1cb8b Merge tag 'nfs-rdma-for-5.7-1' of git://git.linux-nfs.org/projects/anna/linux-nfs)
+$ git merge nfs/linux-next
+Auto-merging include/linux/nfs_xdr.h
+Auto-merging fs/nfs/super.c
+Auto-merging fs/nfs/nfs4proc.c
+Auto-merging fs/nfs/dir.c
+Merge made by the 'recursive' strategy.
+ fs/nfs/blocklayout/blocklayout.c       |   2 +-
+ fs/nfs/callback.h                      |   4 +-
+ fs/nfs/callback_proc.c                 |  69 ++--
+ fs/nfs/delegation.c                    | 310 +++++++--------
+ fs/nfs/dir.c                           |  74 ++--
+ fs/nfs/direct.c                        | 176 +++------
+ fs/nfs/filelayout/filelayout.c         | 165 +++-----
+ fs/nfs/flexfilelayout/flexfilelayout.c | 229 +++++------
+ fs/nfs/flexfilelayout/flexfilelayout.h |   2 +-
+ fs/nfs/fs_context.c                    |   4 +-
+ fs/nfs/inode.c                         |  10 +-
+ fs/nfs/internal.h                      |  30 +-
+ fs/nfs/namespace.c                     |   5 +-
+ fs/nfs/nfs4_fs.h                       |   4 +-
+ fs/nfs/nfs4file.c                      |   3 +
+ fs/nfs/nfs4namespace.c                 |   2 +-
+ fs/nfs/nfs4proc.c                      |  15 +-
+ fs/nfs/nfs4state.c                     |  24 +-
+ fs/nfs/nfs4trace.h                     |   8 +-
+ fs/nfs/nfsroot.c                       |   2 +-
+ fs/nfs/pagelist.c                      |  17 +-
+ fs/nfs/pnfs.c                          | 187 +++++++--
+ fs/nfs/pnfs.h                          | 143 +++++--
+ fs/nfs/pnfs_nfs.c                      | 514 ++++++++++++++++++-------
+ fs/nfs/super.c                         |  35 ++
+ fs/nfs/unlink.c                        |   4 +-
+ fs/nfs/write.c                         |  18 +-
+ include/linux/nfs_xdr.h                |  32 +-
+ include/linux/sunrpc/sched.h           |   1 +
+ include/linux/sunrpc/xdr.h             |   1 -
+ include/trace/events/rpcrdma.h         | 153 +++-----
+ net/sunrpc/auth_gss/auth_gss.c         |  94 +++--
+ net/sunrpc/clnt.c                      |   8 +-
+ net/sunrpc/sched.c                     |   3 +-
+ net/sunrpc/xdr.c                       |  55 ---
+ net/sunrpc/xprtrdma/backchannel.c      |   8 +-
+ net/sunrpc/xprtrdma/frwr_ops.c         | 154 ++++----
+ net/sunrpc/xprtrdma/rpc_rdma.c         |  32 +-
+ net/sunrpc/xprtrdma/transport.c        |  72 ++--
+ net/sunrpc/xprtrdma/verbs.c            | 683 ++++++++++++---------------------
+ net/sunrpc/xprtrdma/xprt_rdma.h        |  89 ++---
+ net/sunrpc/xprtsock.c                  |   2 +-
+ 42 files changed, 1787 insertions(+), 1656 deletions(-)
+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
+Merge made by the 'recursive' strategy.
+ fs/nfsd/filecache.c               | 2 +-
+ fs/nfsd/netns.h                   | 2 ++
+ fs/nfsd/nfs4state.c               | 3 ++-
+ fs/nfsd/nfs4xdr.c                 | 9 +++++----
+ fs/nfsd/nfssvc.c                  | 3 +++
+ include/linux/sunrpc/svc.h        | 2 +-
+ net/sunrpc/cache.c                | 3 ++-
+ net/sunrpc/xprtrdma/svc_rdma_rw.c | 2 +-
+ 8 files changed, 17 insertions(+), 9 deletions(-)
+Merging orangefs/for-next (9f198a2ac543 help_next should increase position index)
+$ git merge orangefs/for-next
+Already up to date.
+Merging overlayfs/overlayfs-next (2eda9eaa6d7e ovl: document xino expected behavior)
+$ git merge overlayfs/overlayfs-next
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/overlayfs.rst |  82 +++++++++-
+ fs/overlayfs/copy_up.c                  |  16 +-
+ fs/overlayfs/dir.c                      |  31 +++-
+ fs/overlayfs/export.c                   |  40 ++---
+ fs/overlayfs/inode.c                    |  99 ++++++++----
+ fs/overlayfs/namei.c                    |   5 +-
+ fs/overlayfs/overlayfs.h                |  25 +++-
+ fs/overlayfs/ovl_entry.h                |   2 +
+ fs/overlayfs/readdir.c                  |  25 +++-
+ fs/overlayfs/super.c                    | 258 ++++++++++++++++++++++----------
+ fs/overlayfs/util.c                     |  40 +++--
+ 11 files changed, 460 insertions(+), 163 deletions(-)
+Merging ubifs/linux-next (3676f32a98cd ubi: ubi-media.h: Replace zero-length array with flexible-array member)
+$ git merge ubifs/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/mtd/ubi/fastmap-wl.c | 15 +++++++++++++--
+ drivers/mtd/ubi/ubi-media.h  |  2 +-
+ drivers/mtd/ubi/wl.c         |  3 ++-
+ fs/ubifs/io.c                | 16 ++++++++++++++--
+ fs/ubifs/journal.c           |  1 +
+ fs/ubifs/orphan.c            | 13 +++++++++----
+ 6 files changed, 40 insertions(+), 10 deletions(-)
+Merging v9fs/9p-next (43657496e466 net/9p: remove unused p9_req_t aux field)
+$ git merge v9fs/9p-next
+Merge made by the 'recursive' strategy.
+ fs/9p/Kconfig           |  20 ++++----
+ fs/9p/vfs_file.c        |   5 +-
+ fs/9p/vfs_inode.c       |   2 +-
+ include/net/9p/client.h |   4 +-
+ net/9p/client.c         | 134 ++++++++++++++++++++++++++----------------------
+ 5 files changed, 90 insertions(+), 75 deletions(-)
+Merging xfs/for-next (d8fcb6f1346c xfs: remove redundant variable assignment in xfs_symlink())
+$ git merge xfs/for-next
+Merge made by the 'recursive' strategy.
+ fs/xfs/Makefile                    |   1 +
+ fs/xfs/libxfs/xfs_ag.c             |  16 +-
+ fs/xfs/libxfs/xfs_alloc.c          |  99 +++--
+ fs/xfs/libxfs/xfs_alloc.h          |   9 +
+ fs/xfs/libxfs/xfs_alloc_btree.c    | 119 +++--
+ fs/xfs/libxfs/xfs_alloc_btree.h    |   7 +
+ fs/xfs/libxfs/xfs_attr.c           | 351 +++++----------
+ fs/xfs/libxfs/xfs_attr.h           | 114 +----
+ fs/xfs/libxfs/xfs_attr_leaf.c      | 130 +++---
+ fs/xfs/libxfs/xfs_attr_leaf.h      |   1 -
+ fs/xfs/libxfs/xfs_attr_remote.c    |   2 +-
+ fs/xfs/libxfs/xfs_bmap.c           |  88 ++--
+ fs/xfs/libxfs/xfs_bmap.h           |   3 +-
+ fs/xfs/libxfs/xfs_bmap_btree.c     |  50 +--
+ fs/xfs/libxfs/xfs_btree.c          |  93 ++--
+ fs/xfs/libxfs/xfs_btree.h          |  82 +++-
+ fs/xfs/libxfs/xfs_btree_staging.c  | 879 +++++++++++++++++++++++++++++++++++++
+ fs/xfs/libxfs/xfs_btree_staging.h  | 123 ++++++
+ fs/xfs/libxfs/xfs_da_btree.c       |  17 +-
+ fs/xfs/libxfs/xfs_da_btree.h       |  11 +-
+ fs/xfs/libxfs/xfs_da_format.h      |  12 -
+ fs/xfs/libxfs/xfs_dir2_block.c     |  33 +-
+ fs/xfs/libxfs/xfs_dir2_data.c      |  32 +-
+ fs/xfs/libxfs/xfs_dir2_leaf.c      |   2 +-
+ fs/xfs/libxfs/xfs_dir2_node.c      |  11 +-
+ fs/xfs/libxfs/xfs_format.h         |  48 +-
+ fs/xfs/libxfs/xfs_fs.h             |  32 +-
+ fs/xfs/libxfs/xfs_ialloc.c         |  35 +-
+ fs/xfs/libxfs/xfs_ialloc_btree.c   | 104 ++++-
+ fs/xfs/libxfs/xfs_ialloc_btree.h   |   6 +
+ fs/xfs/libxfs/xfs_inode_buf.c      |  43 +-
+ fs/xfs/libxfs/xfs_inode_buf.h      |   5 -
+ fs/xfs/libxfs/xfs_inode_fork.c     |   2 +-
+ fs/xfs/libxfs/xfs_inode_fork.h     |   9 +-
+ fs/xfs/libxfs/xfs_log_format.h     |  10 +-
+ fs/xfs/libxfs/xfs_refcount.c       | 110 ++---
+ fs/xfs/libxfs/xfs_refcount_btree.c | 104 +++--
+ fs/xfs/libxfs/xfs_refcount_btree.h |   6 +
+ fs/xfs/libxfs/xfs_rmap.c           | 123 +++---
+ fs/xfs/libxfs/xfs_rmap_btree.c     |  99 +++--
+ fs/xfs/libxfs/xfs_rmap_btree.h     |   5 +
+ fs/xfs/libxfs/xfs_sb.c             |  49 ++-
+ fs/xfs/libxfs/xfs_trans_resv.c     |   2 +-
+ fs/xfs/scrub/agheader.c            |  20 +-
+ fs/xfs/scrub/agheader_repair.c     |  78 ++--
+ fs/xfs/scrub/alloc.c               |   2 +-
+ fs/xfs/scrub/attr.c                |  20 +-
+ fs/xfs/scrub/bitmap.c              |  87 ++--
+ fs/xfs/scrub/bitmap.h              |  23 +-
+ fs/xfs/scrub/bmap.c                |   4 +-
+ fs/xfs/scrub/dabtree.c             |  42 +-
+ fs/xfs/scrub/dir.c                 |  13 +-
+ fs/xfs/scrub/ialloc.c              |   8 +-
+ fs/xfs/scrub/refcount.c            |   2 +-
+ fs/xfs/scrub/repair.c              |  28 +-
+ fs/xfs/scrub/repair.h              |   6 +-
+ fs/xfs/scrub/rmap.c                |   2 +-
+ fs/xfs/scrub/scrub.c               |   9 +
+ fs/xfs/scrub/trace.c               |   4 +-
+ fs/xfs/scrub/trace.h               |   4 +-
+ fs/xfs/xfs_acl.c                   | 132 +++---
+ fs/xfs/xfs_acl.h                   |   6 +-
+ fs/xfs/xfs_aops.c                  |   2 +-
+ fs/xfs/xfs_attr_inactive.c         |   6 +-
+ fs/xfs/xfs_attr_list.c             | 169 +------
+ fs/xfs/xfs_bmap_util.c             |  73 +--
+ fs/xfs/xfs_buf.c                   |  40 +-
+ fs/xfs/xfs_buf.h                   |   2 +
+ fs/xfs/xfs_buf_item.c              |   2 +-
+ fs/xfs/xfs_dir2_readdir.c          |  12 +-
+ fs/xfs/xfs_discard.c               |   7 +-
+ fs/xfs/xfs_dquot.c                 |  10 +-
+ fs/xfs/xfs_dquot_item.c            |  47 +-
+ fs/xfs/xfs_dquot_item.h            |   1 +
+ fs/xfs/xfs_error.c                 |   7 +-
+ fs/xfs/xfs_error.h                 |   2 +-
+ fs/xfs/xfs_fsmap.c                 |  13 +-
+ fs/xfs/xfs_icache.c                |   4 +
+ fs/xfs/xfs_inode.c                 | 212 +++++----
+ fs/xfs/xfs_inode_item.c            |  47 +-
+ fs/xfs/xfs_ioctl.c                 | 355 +++++++++------
+ fs/xfs/xfs_ioctl.h                 |  35 +-
+ fs/xfs/xfs_ioctl32.c               |  99 +----
+ fs/xfs/xfs_iops.c                  |  25 +-
+ fs/xfs/xfs_itable.c                |   6 +-
+ fs/xfs/xfs_linux.h                 |  27 +-
+ fs/xfs/xfs_log.c                   | 818 +++++++++++++---------------------
+ fs/xfs/xfs_log.h                   |   9 +-
+ fs/xfs/xfs_log_cil.c               | 113 +++--
+ fs/xfs/xfs_log_priv.h              |  84 ++--
+ fs/xfs/xfs_log_recover.c           |  18 +-
+ fs/xfs/xfs_mount.c                 |   2 +-
+ fs/xfs/xfs_mount.h                 |   1 +
+ fs/xfs/xfs_qm.c                    |  69 +--
+ fs/xfs/xfs_qm_syscalls.c           |  13 +-
+ fs/xfs/xfs_quota.h                 |   4 +-
+ fs/xfs/xfs_stats.c                 |  10 +-
+ fs/xfs/xfs_super.c                 |  17 +-
+ fs/xfs/xfs_symlink.c               |   7 +-
+ fs/xfs/xfs_trace.c                 |   2 +
+ fs/xfs/xfs_trace.h                 | 224 ++++++++--
+ fs/xfs/xfs_trans.c                 |  34 +-
+ fs/xfs/xfs_trans_ail.c             |  93 ++--
+ fs/xfs/xfs_trans_priv.h            |   6 +-
+ fs/xfs/xfs_xattr.c                 |  92 ++--
+ 105 files changed, 3786 insertions(+), 2600 deletions(-)
+ create mode 100644 fs/xfs/libxfs/xfs_btree_staging.c
+ create mode 100644 fs/xfs/libxfs/xfs_btree_staging.h
+Merging zonefs/for-next (0dda2ddb7ded zonefs: select FS_IOMAP)
+$ git merge zonefs/for-next
+Already up to date.
+Merging iomap/iomap-for-next (d9973ce2fe5b iomap: fix comments in iomap_dio_rw)
+$ git merge iomap/iomap-for-next
+Merge made by the 'recursive' strategy.
+ fs/iomap/buffered-io.c |  7 ++++---
+ fs/iomap/direct-io.c   |  4 ++--
+ fs/iomap/trace.h       | 27 +++++++++++----------------
+ 3 files changed, 17 insertions(+), 21 deletions(-)
+Merging djw-vfs/vfs-for-next (56939e014a6c hibernate: Allow uswsusp to write to swap)
+$ git merge djw-vfs/vfs-for-next
+Auto-merging fs/block_dev.c
+Merge made by the 'recursive' strategy.
+ fs/block_dev.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+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 (575beddbd7f4 Merge branches 'work.exfat' and 'work.dotdot' into for-next)
+$ git merge vfs/for-next
+Auto-merging fs/open.c
+Auto-merging fs/internal.h
+Auto-merging fs/erofs/zdata.c
+Auto-merging fs/erofs/super.c
+Auto-merging fs/erofs/internal.h
+CONFLICT (modify/delete): drivers/staging/exfat/Kconfig deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of drivers/staging/exfat/Kconfig left in tree.
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Resolved 'MAINTAINERS' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/staging/exfat/Kconfig
+rm 'drivers/staging/exfat/Kconfig'
+$ git commit --no-edit -v -a
+[master ea5bd2d4aa24] Merge remote-tracking branch 'vfs/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/path-lookup.rst |    7 +-
+ MAINTAINERS                               |    7 +
+ fs/Kconfig                                |    3 +-
+ fs/Makefile                               |    1 +
+ fs/autofs/dev-ioctl.c                     |    6 +-
+ fs/erofs/internal.h                       |   27 +-
+ fs/erofs/super.c                          |  251 +++--
+ fs/erofs/xattr.c                          |    4 +-
+ fs/erofs/zdata.c                          |    4 +-
+ fs/exfat/Kconfig                          |   21 +
+ fs/exfat/Makefile                         |    8 +
+ fs/exfat/balloc.c                         |  280 ++++++
+ fs/exfat/cache.c                          |  325 +++++++
+ fs/exfat/dir.c                            | 1238 ++++++++++++++++++++++++
+ fs/exfat/exfat_fs.h                       |  519 ++++++++++
+ fs/exfat/exfat_raw.h                      |  184 ++++
+ fs/exfat/fatent.c                         |  463 +++++++++
+ fs/exfat/file.c                           |  360 +++++++
+ fs/exfat/inode.c                          |  671 +++++++++++++
+ fs/exfat/misc.c                           |  163 ++++
+ fs/exfat/namei.c                          | 1448 ++++++++++++++++++++++++++++
+ fs/exfat/nls.c                            |  831 ++++++++++++++++
+ fs/exfat/super.c                          |  722 ++++++++++++++
+ fs/internal.h                             |    1 -
+ fs/namei.c                                | 1488 ++++++++++++-----------------
+ fs/namespace.c                            |  101 +-
+ fs/open.c                                 |    4 +-
+ fs/super.c                                |    2 +-
+ include/linux/namei.h                     |    4 +-
+ 29 files changed, 8064 insertions(+), 1079 deletions(-)
+ create mode 100644 fs/exfat/Kconfig
+ create mode 100644 fs/exfat/Makefile
+ create mode 100644 fs/exfat/balloc.c
+ create mode 100644 fs/exfat/cache.c
+ create mode 100644 fs/exfat/dir.c
+ create mode 100644 fs/exfat/exfat_fs.h
+ create mode 100644 fs/exfat/exfat_raw.h
+ create mode 100644 fs/exfat/fatent.c
+ create mode 100644 fs/exfat/file.c
+ create mode 100644 fs/exfat/inode.c
+ create mode 100644 fs/exfat/misc.c
+ create mode 100644 fs/exfat/namei.c
+ create mode 100644 fs/exfat/nls.c
+ create mode 100644 fs/exfat/super.c
+Merging printk/for-next (d34f14ae521f Merge branch 'for-5.7-preferred-console' into for-next)
+$ git merge printk/for-next
+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 (505d60df2623 Merge branch 'remotes/lorenzo/pci/vmd')
+$ git merge pci/next
+Auto-merging include/linux/pci_ids.h
+Auto-merging include/linux/pci.h
+Auto-merging drivers/pci/pcie/Kconfig
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/pci/controller/pcie-brcmstb.c
+Auto-merging drivers/net/ethernet/intel/ice/ice_main.c
+CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/ice/ice_main.c
+Auto-merging drivers/acpi/pci_root.c
+Auto-merging arch/x86/include/asm/mshyperv.h
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/pci/nvidia,tegra194-pcie.txt
+Removing Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.txt
+Removing Documentation/devicetree/bindings/pci/cdns,cdns-pcie-ep.txt
+Resolved 'MAINTAINERS' using previous resolution.
+Resolved 'drivers/net/ethernet/intel/ice/ice_main.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 0fcf4fe058b2] Merge remote-tracking branch 'pci/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/PCI/boot-interrupts.rst              | 155 +++++
+ Documentation/PCI/index.rst                        |   1 +
+ Documentation/PCI/pcieaer-howto.rst                |  23 +-
+ .../devicetree/bindings/pci/amlogic,meson-pcie.txt |  22 +-
+ .../devicetree/bindings/pci/cdns,cdns-pcie-ep.txt  |  27 -
+ .../devicetree/bindings/pci/cdns,cdns-pcie-ep.yaml |  49 ++
+ .../bindings/pci/cdns,cdns-pcie-host.txt           |  66 --
+ .../bindings/pci/cdns,cdns-pcie-host.yaml          |  76 +++
+ .../devicetree/bindings/pci/cdns-pcie-host.yaml    |  27 +
+ .../devicetree/bindings/pci/cdns-pcie.yaml         |  31 +
+ .../bindings/pci/layerscape-pcie-gen4.txt          |  52 ++
+ .../bindings/pci/nvidia,tegra194-pcie.txt          | 125 +++-
+ Documentation/devicetree/bindings/pci/pci-ep.yaml  |  41 ++
+ .../phy/amlogic,meson-axg-mipi-pcie-analog.yaml    |  35 +
+ .../bindings/phy/amlogic,meson-axg-pcie.yaml       |  52 ++
+ MAINTAINERS                                        |  12 +-
+ arch/alpha/kernel/sys_nautilus.c                   |  52 +-
+ arch/x86/include/asm/hyperv-tlfs.h                 |  41 ++
+ arch/x86/include/asm/mshyperv.h                    |   8 +
+ drivers/acpi/pci_root.c                            |  15 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c           |  31 +-
+ .../gpu/drm/nouveau/nvkm/subdev/bios/shadowpci.c   |  17 +-
+ drivers/gpu/drm/radeon/radeon_bios.c               |  30 +-
+ drivers/misc/pci_endpoint_test.c                   | 213 +++++-
+ drivers/net/ethernet/intel/ice/ice_main.c          |   4 +-
+ drivers/ntb/hw/idt/ntb_hw_idt.c                    |   4 +-
+ drivers/pci/controller/Kconfig                     |  11 +-
+ drivers/pci/controller/Makefile                    |   2 +-
+ drivers/pci/controller/dwc/Kconfig                 |  29 +-
+ drivers/pci/controller/dwc/pci-dra7xx.c            | 231 +++++--
+ drivers/pci/controller/dwc/pci-keystone.c          |   5 +-
+ drivers/pci/controller/dwc/pci-meson.c             | 116 +---
+ drivers/pci/controller/dwc/pcie-designware-ep.c    | 144 +++--
+ drivers/pci/controller/dwc/pcie-designware.h       |  12 +
+ drivers/pci/controller/dwc/pcie-qcom.c             |   8 +-
+ drivers/pci/controller/dwc/pcie-tegra194.c         | 712 ++++++++++++++++++++-
+ drivers/pci/controller/mobiveil/Kconfig            |  34 +
+ drivers/pci/controller/mobiveil/Makefile           |   5 +
+ .../pci/controller/mobiveil/pcie-layerscape-gen4.c | 267 ++++++++
+ .../pcie-mobiveil-host.c}                          | 564 ++++------------
+ .../pci/controller/mobiveil/pcie-mobiveil-plat.c   |  61 ++
+ drivers/pci/controller/mobiveil/pcie-mobiveil.c    | 231 +++++++
+ drivers/pci/controller/mobiveil/pcie-mobiveil.h    | 226 +++++++
+ drivers/pci/controller/pci-hyperv.c                | 260 +++++---
+ drivers/pci/controller/pci-tegra.c                 | 187 ++----
+ drivers/pci/controller/pcie-brcmstb.c              |   4 +-
+ drivers/pci/endpoint/functions/pci-epf-test.c      | 402 ++++++++++--
+ drivers/pci/endpoint/pci-ep-cfs.c                  |  28 +-
+ drivers/pci/endpoint/pci-epc-core.c                | 137 ++--
+ drivers/pci/endpoint/pci-epc-mem.c                 |  10 +-
+ drivers/pci/endpoint/pci-epf-core.c                |  35 +-
+ drivers/pci/hotplug/pciehp.h                       |   1 +
+ drivers/pci/hotplug/pciehp_hpc.c                   |  93 ++-
+ drivers/pci/p2pdma.c                               |   3 +
+ drivers/pci/pci-acpi.c                             |   4 +-
+ drivers/pci/pci-sysfs.c                            |  33 +-
+ drivers/pci/pci.c                                  |  25 +-
+ drivers/pci/pci.h                                  |  32 +-
+ drivers/pci/pcie/Kconfig                           |  10 +
+ drivers/pci/pcie/Makefile                          |   1 +
+ drivers/pci/pcie/aer.c                             |  40 +-
+ drivers/pci/pcie/aspm.c                            |   6 +-
+ drivers/pci/pcie/dpc.c                             | 137 ++--
+ drivers/pci/pcie/edr.c                             | 239 +++++++
+ drivers/pci/pcie/err.c                             |  66 +-
+ drivers/pci/pcie/portdrv.h                         |   5 -
+ drivers/pci/pcie/portdrv_core.c                    |  21 -
+ drivers/pci/probe.c                                |  42 ++
+ drivers/pci/quirks.c                               | 120 +++-
+ drivers/pci/rom.c                                  |  17 -
+ drivers/pci/setup-bus.c                            |  34 +-
+ drivers/pci/slot.c                                 |  38 +-
+ drivers/phy/amlogic/Kconfig                        |  22 +
+ drivers/phy/amlogic/Makefile                       |  12 +-
+ .../phy/amlogic/phy-meson-axg-mipi-pcie-analog.c   | 188 ++++++
+ drivers/phy/amlogic/phy-meson-axg-pcie.c           | 192 ++++++
+ drivers/scsi/lpfc/lpfc_attr.c                      |   4 +-
+ include/linux/acpi.h                               |   6 +-
+ include/linux/aer.h                                |   9 +-
+ include/linux/pci-acpi.h                           |   8 +
+ include/linux/pci-epc.h                            |  27 +-
+ include/linux/pci-epf.h                            |  29 +-
+ include/linux/pci.h                                |  10 +-
+ include/linux/pci_ids.h                            |   2 +
+ include/soc/tegra/bpmp-abi.h                       |  10 +-
+ include/uapi/linux/pci_regs.h                      |   2 +
+ include/uapi/linux/pcitest.h                       |   8 +
+ tools/pci/pcitest.c                                |  37 +-
+ 88 files changed, 4832 insertions(+), 1631 deletions(-)
+ create mode 100644 Documentation/PCI/boot-interrupts.rst
+ delete mode 100644 Documentation/devicetree/bindings/pci/cdns,cdns-pcie-ep.txt
+ create mode 100644 Documentation/devicetree/bindings/pci/cdns,cdns-pcie-ep.yaml
+ delete mode 100644 Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.txt
+ create mode 100644 Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml
+ create mode 100644 Documentation/devicetree/bindings/pci/cdns-pcie-host.yaml
+ create mode 100644 Documentation/devicetree/bindings/pci/cdns-pcie.yaml
+ create mode 100644 Documentation/devicetree/bindings/pci/layerscape-pcie-gen4.txt
+ create mode 100644 Documentation/devicetree/bindings/pci/pci-ep.yaml
+ create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-axg-mipi-pcie-analog.yaml
+ create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yaml
+ create mode 100644 drivers/pci/controller/mobiveil/Kconfig
+ create mode 100644 drivers/pci/controller/mobiveil/Makefile
+ create mode 100644 drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c
+ rename drivers/pci/controller/{pcie-mobiveil.c => mobiveil/pcie-mobiveil-host.c} (54%)
+ create mode 100644 drivers/pci/controller/mobiveil/pcie-mobiveil-plat.c
+ create mode 100644 drivers/pci/controller/mobiveil/pcie-mobiveil.c
+ create mode 100644 drivers/pci/controller/mobiveil/pcie-mobiveil.h
+ create mode 100644 drivers/pci/pcie/edr.c
+ create mode 100644 drivers/phy/amlogic/phy-meson-axg-mipi-pcie-analog.c
+ create mode 100644 drivers/phy/amlogic/phy-meson-axg-pcie.c
+Merging pstore/for-next/pstore (8128d3aac0ee pstore/ram: Replace zero-length array with flexible-array member)
+$ git merge pstore/for-next/pstore
+Already up to date.
+Merging hid/for-next (c2320c3ee0e6 Merge branch 'for-5.6/upstream-fixes' into for-next)
+$ git merge hid/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS                                 |   7 +
+ drivers/hid/Kconfig                         |  17 +
+ drivers/hid/Makefile                        |   2 +
+ drivers/hid/hid-appleir.c                   |  12 +-
+ drivers/hid/hid-glorious.c                  |  86 ++++
+ drivers/hid/hid-ids.h                       |   5 +
+ drivers/hid/hid-lg-g15.c                    |   6 +-
+ drivers/hid/hid-logitech-dj.c               |  11 +-
+ drivers/hid/hid-mcp2221.c                   | 742 ++++++++++++++++++++++++++++
+ drivers/hid/hid-quirks.c                    |   3 -
+ drivers/hid/hid-rmi.c                       |   1 -
+ drivers/hid/intel-ish-hid/ishtp/hbm.h       |   2 +-
+ drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h |   2 +-
+ 13 files changed, 878 insertions(+), 18 deletions(-)
+ create mode 100644 drivers/hid/hid-glorious.c
+ create mode 100644 drivers/hid/hid-mcp2221.c
+Merging i2c/i2c/for-next (ae7a83a5275b Merge branch 'i2c/for-5.7' into i2c/for-next)
+$ git merge i2c/i2c/for-next
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/i2c/i2c-brcmstb.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml  |  97 ++++++++
+ Documentation/devicetree/bindings/i2c/i2c-at91.txt |  10 +
+ .../devicetree/bindings/i2c/i2c-brcmstb.txt        |  26 ---
+ Documentation/i2c/smbus-protocol.rst               |   2 +-
+ MAINTAINERS                                        |   2 +-
+ drivers/i2c/algos/i2c-algo-pca.c                   |   6 +-
+ drivers/i2c/busses/i2c-altera.c                    |   6 +-
+ drivers/i2c/busses/i2c-amd-mp2-plat.c              |  27 ++-
+ drivers/i2c/busses/i2c-aspeed.c                    |   2 +-
+ drivers/i2c/busses/i2c-at91-master.c               |  78 +++++++
+ drivers/i2c/busses/i2c-at91.h                      |   4 +
+ drivers/i2c/busses/i2c-axxia.c                     |   4 +-
+ drivers/i2c/busses/i2c-bcm-iproc.c                 |  14 +-
+ drivers/i2c/busses/i2c-bcm-kona.c                  |   8 +-
+ drivers/i2c/busses/i2c-bcm2835.c                   |   2 +-
+ drivers/i2c/busses/i2c-brcmstb.c                   |  33 +++
+ drivers/i2c/busses/i2c-cadence.c                   |   7 +-
+ drivers/i2c/busses/i2c-designware-baytrail.c       |   2 +-
+ drivers/i2c/busses/i2c-designware-common.c         |  36 ++-
+ drivers/i2c/busses/i2c-designware-core.h           |   2 +-
+ drivers/i2c/busses/i2c-designware-master.c         |   4 +-
+ drivers/i2c/busses/i2c-designware-pcidrv.c         |   2 +-
+ drivers/i2c/busses/i2c-designware-platdrv.c        |  61 ++---
+ drivers/i2c/busses/i2c-designware-slave.c          |   4 +-
+ drivers/i2c/busses/i2c-digicolor.c                 |   3 +-
+ drivers/i2c/busses/i2c-diolan-u2c.c                |  12 +-
+ drivers/i2c/busses/i2c-efm32.c                     |   2 +-
+ drivers/i2c/busses/i2c-exynos5.c                   |  18 +-
+ drivers/i2c/busses/i2c-hix5hd2.c                   |  10 +-
+ drivers/i2c/busses/i2c-img-scb.c                   |   4 +-
+ drivers/i2c/busses/i2c-imx-lpi2c.c                 |  16 +-
+ drivers/i2c/busses/i2c-imx.c                       | 155 +++++++++----
+ drivers/i2c/busses/i2c-lpc2k.c                     |   6 +-
+ drivers/i2c/busses/i2c-mt65xx.c                    |  21 +-
+ drivers/i2c/busses/i2c-mt7621.c                    |   2 +-
+ drivers/i2c/busses/i2c-mv64xxx.c                   |   6 +-
+ drivers/i2c/busses/i2c-mxs.c                       |  10 +-
+ drivers/i2c/busses/i2c-nomadik.c                   |   8 +-
+ drivers/i2c/busses/i2c-omap.c                      |   6 +-
+ drivers/i2c/busses/i2c-owl.c                       |   9 +-
+ drivers/i2c/busses/i2c-parport.c                   |  12 +-
+ drivers/i2c/busses/i2c-powermac.c                  |  15 +-
+ drivers/i2c/busses/i2c-qcom-geni.c                 |  58 +++--
+ drivers/i2c/busses/i2c-qup.c                       |  11 +-
+ drivers/i2c/busses/i2c-rcar.c                      |  24 +-
+ drivers/i2c/busses/i2c-riic.c                      |   6 +-
+ drivers/i2c/busses/i2c-rk3x.c                      |  12 +-
+ drivers/i2c/busses/i2c-s3c2410.c                   |   4 +-
+ drivers/i2c/busses/i2c-sh_mobile.c                 |   9 +-
+ drivers/i2c/busses/i2c-sirf.c                      |   3 +-
+ drivers/i2c/busses/i2c-sprd.c                      |   9 +-
+ drivers/i2c/busses/i2c-st.c                        |   6 +-
+ drivers/i2c/busses/i2c-stm32f4.c                   |  10 +-
+ drivers/i2c/busses/i2c-stm32f7.c                   | 245 +++++++++++++++------
+ drivers/i2c/busses/i2c-stu300.c                    |   6 +-
+ drivers/i2c/busses/i2c-sun6i-p2wi.c                |   2 +-
+ drivers/i2c/busses/i2c-synquacer.c                 |   6 +-
+ drivers/i2c/busses/i2c-tegra.c                     |  18 +-
+ drivers/i2c/busses/i2c-thunderx-pcidrv.c           |  13 +-
+ drivers/i2c/busses/i2c-uniphier-f.c                |   6 +-
+ drivers/i2c/busses/i2c-uniphier.c                  |   7 +-
+ drivers/i2c/busses/i2c-wmt.c                       |   2 +-
+ drivers/i2c/busses/i2c-xlp9xx.c                    |  18 +-
+ drivers/i2c/busses/i2c-xlr.c                       |   2 +-
+ drivers/i2c/i2c-core-acpi.c                        |   2 +-
+ drivers/i2c/i2c-core-base.c                        |  38 ++--
+ drivers/i2c/i2c-core-smbus.c                       |  26 +--
+ drivers/i2c/i2c-dev.c                              |  50 +++--
+ drivers/i2c/i2c-slave-eeprom.c                     |   4 +-
+ drivers/i2c/i2c-smbus.c                            |   2 +-
+ drivers/macintosh/therm_windtunnel.c               |   4 +-
+ drivers/misc/eeprom/at24.c                         |   1 +
+ include/linux/i2c-smbus.h                          |   9 +-
+ include/linux/i2c.h                                |   8 +
+ 74 files changed, 855 insertions(+), 520 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml
+ delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-brcmstb.txt
+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 (12028f913eb9 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 (5b10a8194664 docs: hwmon: Update documentation for isl68137 pmbus driver)
+$ git merge hwmon-staging/hwmon-next
+Already up to date.
+Merging jc_docs/docs-next (abcb1e021ae5 Documentation: x86: exception-tables: document CONFIG_BUILDTIME_TABLE_SORT)
+$ 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 (e2402957dd37 Merge branch 'acpi-cppc' into linux-next)
+$ git merge pm/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/acpi/acpica/acnamesp.h |  2 ++
+ drivers/acpi/acpica/dbinput.c  | 16 +++++++---------
+ drivers/acpi/acpica/dbxface.c  |  1 +
+ drivers/acpi/acpica/dswexec.c  | 33 +++++++++++++++++++++++++++++++++
+ drivers/acpi/acpica/dswload.c  |  2 --
+ drivers/acpi/acpica/dswload2.c | 35 +++++++++++++++++++++++++++++++++++
+ drivers/acpi/acpica/nsnames.c  |  6 +-----
+ drivers/acpi/acpica/utdecode.c |  2 +-
+ drivers/acpi/acpica/utdelete.c |  9 +++++----
+ drivers/acpi/acpica/utprint.c  |  7 ++++++-
+ drivers/acpi/cppc_acpi.c       | 33 +++++++--------------------------
+ drivers/acpi/tables.c          |  2 +-
+ include/acpi/acpixf.h          |  2 +-
+ include/acpi/actbl2.h          | 21 ++++++++++++++++++---
+ include/acpi/actbl3.h          |  6 +++---
+ include/acpi/acuuid.h          |  2 +-
+ 16 files changed, 122 insertions(+), 57 deletions(-)
+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 (2de7fb60a474 cpupower: avoid multiple definition with gcc -fno-common)
+$ git merge cpupower/cpupower
+Already up to date.
+Merging opp/opp/linux-next (03758d60265c opp: Replace list_kref with a local counter)
+$ git merge opp/opp/linux-next
+Already up to date.
+Merging thermal/thermal/linux-next (76a5c400aae5 thermal: imx8mm: Fix build warning of incorrect argument type)
+$ git merge thermal/thermal/linux-next
+Auto-merging drivers/thermal/intel/x86_pkg_temp_thermal.c
+Auto-merging drivers/thermal/cpufreq_cooling.c
+CONFLICT (content): Merge conflict in drivers/thermal/cpufreq_cooling.c
+Resolved 'drivers/thermal/cpufreq_cooling.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 45008f8c2b0f] Merge remote-tracking branch 'thermal/thermal/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/arm/freescale/fsl,scu.txt  |  16 +
+ .../devicetree/bindings/thermal/imx8mm-thermal.txt |  15 +
+ .../devicetree/bindings/thermal/qcom-tsens.yaml    |   2 +-
+ .../bindings/thermal/rcar-gen3-thermal.txt         |   1 +
+ .../devicetree/bindings/thermal/sprd-thermal.yaml  | 107 ++++
+ .../devicetree/bindings/thermal/thermal.txt        |   2 +-
+ drivers/thermal/Kconfig                            |  42 +-
+ drivers/thermal/Makefile                           |   3 +
+ drivers/thermal/cpufreq_cooling.c                  |   4 +-
+ drivers/thermal/imx8mm_thermal.c                   | 236 +++++++++
+ drivers/thermal/imx_sc_thermal.c                   | 148 ++++++
+ drivers/thermal/imx_thermal.c                      |  16 +-
+ .../intel/int340x_thermal/int3400_thermal.c        |   2 +-
+ .../int340x_thermal/processor_thermal_device.c     |   5 +
+ drivers/thermal/of-thermal.c                       |  62 ++-
+ drivers/thermal/qcom/tsens-8960.c                  |   4 +-
+ drivers/thermal/qcom/tsens-common.c                | 194 +++++++-
+ drivers/thermal/qcom/tsens-v0_1.c                  |   6 +-
+ drivers/thermal/qcom/tsens-v1.c                    |   6 +-
+ drivers/thermal/qcom/tsens-v2.c                    |  24 +-
+ drivers/thermal/qcom/tsens.c                       |  65 ++-
+ drivers/thermal/qcom/tsens.h                       | 105 +++-
+ drivers/thermal/qoriq_thermal.c                    |  40 +-
+ drivers/thermal/rcar_gen3_thermal.c                |  31 +-
+ drivers/thermal/rcar_thermal.c                     |  53 +-
+ drivers/thermal/samsung/exynos_tmu.c               |   4 +-
+ drivers/thermal/sprd_thermal.c                     | 552 +++++++++++++++++++++
+ drivers/thermal/st/stm_thermal.c                   |   3 +-
+ drivers/thermal/ti-soc-thermal/ti-bandgap.c        |  44 +-
+ drivers/thermal/ti-soc-thermal/ti-bandgap.h        |   4 +-
+ include/linux/thermal.h                            |  10 +
+ tools/thermal/tmon/tmon.c                          |  26 +-
+ 32 files changed, 1594 insertions(+), 238 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/thermal/imx8mm-thermal.txt
+ create mode 100644 Documentation/devicetree/bindings/thermal/sprd-thermal.yaml
+ create mode 100644 drivers/thermal/imx8mm_thermal.c
+ create mode 100644 drivers/thermal/imx_sc_thermal.c
+ create mode 100644 drivers/thermal/sprd_thermal.c
+Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1)
+$ git merge thermal-rzhang/next
+Already up to date.
+Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor)
+$ git merge thermal-soc/next
+Already up to date.
+Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid')
+$ git merge ieee1394/for-next
+Auto-merging drivers/firewire/net.c
+Merge made by the 'recursive' strategy.
+ drivers/firewire/net.c | 2 --
+ 1 file changed, 2 deletions(-)
+Merging dlm/next (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 (b4d8ddf8356d RDMA/bnxt_re: make bnxt_re_ib_init static)
+$ git merge rdma/for-next
+Auto-merging include/linux/mlx5/mlx5_ifc.h
+Auto-merging include/linux/mlx5/fs.h
+Auto-merging include/linux/mlx5/driver.h
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+Auto-merging drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
+Auto-merging drivers/infiniband/hw/mlx5/qp.c
+Auto-merging drivers/infiniband/hw/mlx5/mlx5_ib.h
+Auto-merging drivers/infiniband/hw/mlx5/main.c
+Auto-merging drivers/infiniband/hw/mlx5/cq.c
+Merge made by the 'recursive' strategy.
+ drivers/infiniband/core/cache.c                    |   19 +-
+ drivers/infiniband/core/cm.c                       |  746 ++++----
+ drivers/infiniband/core/cma.c                      |  114 +-
+ drivers/infiniband/core/cma_configfs.c             |    6 +-
+ drivers/infiniband/core/cma_priv.h                 |    6 +-
+ drivers/infiniband/core/mad_priv.h                 |    4 +-
+ drivers/infiniband/core/multicast.c                |    2 +-
+ drivers/infiniband/core/rw.c                       |   12 +-
+ drivers/infiniband/core/sa_query.c                 |    2 +-
+ drivers/infiniband/core/ucma.c                     |   61 +-
+ drivers/infiniband/core/umem.c                     |   11 +-
+ drivers/infiniband/core/verbs.c                    |   24 +-
+ drivers/infiniband/hw/bnxt_re/bnxt_re.h            |   26 +-
+ drivers/infiniband/hw/bnxt_re/ib_verbs.c           |  926 ++++++----
+ drivers/infiniband/hw/bnxt_re/main.c               |  492 +++---
+ drivers/infiniband/hw/bnxt_re/qplib_fp.c           |  489 +++---
+ drivers/infiniband/hw/bnxt_re/qplib_fp.h           |   95 +-
+ drivers/infiniband/hw/bnxt_re/qplib_rcfw.c         |  463 +++--
+ drivers/infiniband/hw/bnxt_re/qplib_rcfw.h         |   85 +-
+ drivers/infiniband/hw/bnxt_re/qplib_res.c          |  470 +++--
+ drivers/infiniband/hw/bnxt_re/qplib_res.h          |  145 +-
+ drivers/infiniband/hw/bnxt_re/qplib_sp.c           |   48 +-
+ drivers/infiniband/hw/cxgb4/iw_cxgb4.h             |    4 +-
+ drivers/infiniband/hw/cxgb4/qp.c                   |    2 +-
+ drivers/infiniband/hw/cxgb4/t4fw_ri_api.h          |    8 +-
+ drivers/infiniband/hw/efa/efa_admin_cmds_defs.h    |    7 +-
+ drivers/infiniband/hw/efa/efa_admin_defs.h         |    4 +-
+ drivers/infiniband/hw/efa/efa_com.c                |  158 +-
+ drivers/infiniband/hw/efa/efa_com_cmd.c            |   29 +-
+ drivers/infiniband/hw/efa/efa_common_defs.h        |   13 +-
+ drivers/infiniband/hw/efa/efa_regs_defs.h          |   25 +-
+ drivers/infiniband/hw/efa/efa_verbs.c              |   51 +-
+ drivers/infiniband/hw/hfi1/fault.c                 |    4 +-
+ drivers/infiniband/hw/hfi1/file_ops.c              |    4 +-
+ drivers/infiniband/hw/hfi1/hfi.h                   |    2 -
+ drivers/infiniband/hw/hfi1/init.c                  |   26 +-
+ drivers/infiniband/hw/hfi1/mad.c                   |    4 +-
+ drivers/infiniband/hw/hfi1/mad.h                   |    2 +-
+ drivers/infiniband/hw/hfi1/pio.h                   |    4 +-
+ drivers/infiniband/hw/hfi1/sdma.c                  |    2 +-
+ drivers/infiniband/hw/hfi1/sdma.h                  |    4 +-
+ drivers/infiniband/hw/hfi1/sysfs.c                 |   26 +-
+ drivers/infiniband/hw/hfi1/user_exp_rcv.h          |    2 +-
+ drivers/infiniband/hw/hns/hns_roce_cq.c            |    8 +-
+ drivers/infiniband/hw/hns/hns_roce_device.h        |   54 +-
+ drivers/infiniband/hw/hns/hns_roce_hem.c           |  474 ++---
+ drivers/infiniband/hw/hns/hns_roce_hw_v1.c         |   46 +-
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.c         | 1851 +++++++-------------
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.h         |   16 +-
+ drivers/infiniband/hw/hns/hns_roce_mr.c            |    2 +-
+ drivers/infiniband/hw/hns/hns_roce_pd.c            |    6 +-
+ drivers/infiniband/hw/hns/hns_roce_qp.c            |  977 ++++++-----
+ drivers/infiniband/hw/hns/hns_roce_srq.c           |    3 +-
+ drivers/infiniband/hw/i40iw/i40iw.h                |   22 +-
+ drivers/infiniband/hw/i40iw/i40iw_cm.h             |    4 +-
+ drivers/infiniband/hw/i40iw/i40iw_ctrl.c           |   96 +
+ drivers/infiniband/hw/i40iw/i40iw_d.h              |   26 +-
+ drivers/infiniband/hw/i40iw/i40iw_main.c           |   24 +-
+ drivers/infiniband/hw/i40iw/i40iw_p.h              |    1 +
+ drivers/infiniband/hw/i40iw/i40iw_status.h         |    3 +-
+ drivers/infiniband/hw/i40iw/i40iw_type.h           |   12 +
+ drivers/infiniband/hw/i40iw/i40iw_verbs.c          |   12 +-
+ drivers/infiniband/hw/mlx4/main.c                  |    9 +-
+ drivers/infiniband/hw/mlx4/qp.c                    |    2 +-
+ drivers/infiniband/hw/mlx5/Makefile                |    1 +
+ drivers/infiniband/hw/mlx5/cong.c                  |   20 +
+ drivers/infiniband/hw/mlx5/cq.c                    |   21 +-
+ drivers/infiniband/hw/mlx5/flow.c                  |    3 +
+ drivers/infiniband/hw/mlx5/main.c                  |  265 ++-
+ drivers/infiniband/hw/mlx5/mem.c                   |    2 +-
+ drivers/infiniband/hw/mlx5/mlx5_ib.h               |   89 +-
+ drivers/infiniband/hw/mlx5/mr.c                    |  608 ++++---
+ drivers/infiniband/hw/mlx5/odp.c                   |    2 +-
+ drivers/infiniband/hw/mlx5/qos.c                   |  136 ++
+ drivers/infiniband/hw/mlx5/qp.c                    |   35 +-
+ drivers/infiniband/hw/mthca/mthca_memfree.c        |    2 +-
+ drivers/infiniband/hw/mthca/mthca_memfree.h        |    2 +-
+ drivers/infiniband/hw/mthca/mthca_provider.c       |    2 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_verbs.c        |    2 +-
+ drivers/infiniband/hw/qedr/verbs.c                 |    2 +-
+ drivers/infiniband/hw/qib/qib_verbs.c              |    2 -
+ drivers/infiniband/hw/qib/qib_verbs.h              |    1 -
+ drivers/infiniband/hw/usnic/usnic_ib_verbs.c       |    2 +-
+ drivers/infiniband/hw/usnic/usnic_uiom.h           |    2 +-
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c       |    2 +-
+ drivers/infiniband/sw/rdmavt/qp.c                  |    2 +-
+ drivers/infiniband/sw/rdmavt/vt.c                  |    6 -
+ drivers/infiniband/sw/rxe/rxe.c                    |    2 +
+ drivers/infiniband/sw/rxe/rxe_qp.c                 |    7 +-
+ drivers/infiniband/sw/rxe/rxe_queue.h              |    2 +-
+ drivers/infiniband/sw/siw/siw_cm.c                 |  137 +-
+ drivers/infiniband/sw/siw/siw_qp_rx.c              |    2 +-
+ drivers/infiniband/sw/siw/siw_verbs.c              |   11 +-
+ drivers/infiniband/ulp/ipoib/ipoib.h               |    2 -
+ drivers/infiniband/ulp/ipoib/ipoib_ethtool.c       |    3 -
+ drivers/infiniband/ulp/ipoib/ipoib_main.c          |    4 -
+ drivers/infiniband/ulp/iser/iser_memory.c          |   21 +-
+ drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.h   |    6 +-
+ drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c |    2 -
+ .../infiniband/ulp/opa_vnic/opa_vnic_internal.h    |    1 -
+ drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c    |    5 -
+ drivers/infiniband/ulp/srp/ib_srp.h                |    2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c   |    1 +
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.c  |   53 +
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.h  |    7 +-
+ include/linux/mlx5/device.h                        |    6 +
+ include/linux/mlx5/driver.h                        |   17 -
+ include/linux/mlx5/fs.h                            |    1 +
+ include/linux/mlx5/mlx5_ifc.h                      |    8 +-
+ include/rdma/ib_cache.h                            |    1 +
+ include/rdma/ib_cm.h                               |    1 -
+ include/rdma/ib_fmr_pool.h                         |    2 +-
+ include/rdma/ib_verbs.h                            |   49 +-
+ include/rdma/opa_vnic.h                            |    2 +-
+ include/rdma/rdmavt_mr.h                           |    2 +-
+ include/rdma/rdmavt_qp.h                           |    2 +-
+ include/rdma/uverbs_ioctl.h                        |    2 +-
+ include/uapi/rdma/mlx5-abi.h                       |    6 +
+ include/uapi/rdma/mlx5_user_ioctl_cmds.h           |   35 +
+ include/uapi/rdma/mlx5_user_ioctl_verbs.h          |   10 +
+ 120 files changed, 5401 insertions(+), 4495 deletions(-)
+ create mode 100644 drivers/infiniband/hw/mlx5/qos.c
+Merging net-next/master (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
+$ 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 (5a470b1a63ac Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
+$ 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 (d7a448d5da88 Bluetooth: Always request for user confirmation for Just Works)
+$ 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/hci_qca.c                        |  40 ++++--
+ include/net/bluetooth/bluetooth.h                  |   8 ++
+ net/bluetooth/l2cap_sock.c                         | 138 ++++++++++++++++++++-
+ net/bluetooth/smp.c                                |  12 +-
+ 7 files changed, 200 insertions(+), 20 deletions(-)
+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
+Removing drivers/mtd/spi-nor/spi-nor.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mtd/brcm,brcmnand.txt      |   10 +-
+ .../devicetree/bindings/mtd/nand-macronix.txt      |   27 +
+ MAINTAINERS                                        |    8 +-
+ arch/arm/mach-omap1/board-ams-delta.c              |   47 +-
+ arch/mips/boot/dts/brcm/bcm7425.dtsi               |    4 +-
+ drivers/mtd/chips/cfi_cmdset_0001.c                |    4 +-
+ drivers/mtd/chips/cfi_cmdset_0002.c                |    5 +-
+ drivers/mtd/chips/cfi_cmdset_0020.c                |   17 +-
+ drivers/mtd/chips/cfi_util.c                       |   12 +-
+ drivers/mtd/devices/block2mtd.c                    |    4 +-
+ drivers/mtd/devices/phram.c                        |   19 +-
+ drivers/mtd/hyperbus/hbmc-am654.c                  |   12 +
+ drivers/mtd/hyperbus/hyperbus-core.c               |   15 +-
+ drivers/mtd/inftlmount.c                           |    2 +-
+ drivers/mtd/lpddr/lpddr_cmds.c                     |    4 +-
+ drivers/mtd/maps/sa1100-flash.c                    |    5 +-
+ drivers/mtd/mtdblock.c                             |    5 +-
+ drivers/mtd/mtdchar.c                              |   12 +-
+ drivers/mtd/mtdcore.c                              |  250 +-
+ drivers/mtd/mtdpart.c                              |  695 +--
+ drivers/mtd/nand/onenand/onenand_base.c            |    2 +-
+ drivers/mtd/nand/raw/ams-delta.c                   |  237 +-
+ drivers/mtd/nand/raw/brcmnand/brcmnand.c           |  293 +-
+ drivers/mtd/nand/raw/cadence-nand-controller.c     |   34 +-
+ drivers/mtd/nand/raw/denali.c                      |    1 +
+ drivers/mtd/nand/raw/denali.h                      |    2 +-
+ drivers/mtd/nand/raw/diskonchip.c                  |    4 +-
+ drivers/mtd/nand/raw/fsl_elbc_nand.c               |    3 +-
+ drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c         |   21 +-
+ drivers/mtd/nand/raw/ingenic/Kconfig               |    1 +
+ drivers/mtd/nand/raw/ingenic/ingenic_ecc.c         |    4 +-
+ drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c    |    2 +-
+ drivers/mtd/nand/raw/ingenic/jz4725b_bch.c         |    4 +-
+ drivers/mtd/nand/raw/ingenic/jz4780_bch.c          |    4 +-
+ drivers/mtd/nand/raw/internals.h                   |    1 +
+ drivers/mtd/nand/raw/marvell_nand.c                |   40 +-
+ drivers/mtd/nand/raw/meson_nand.c                  |    2 +-
+ drivers/mtd/nand/raw/mtk_nand.c                    |    2 +-
+ drivers/mtd/nand/raw/nand_base.c                   |   71 +-
+ drivers/mtd/nand/raw/nand_hynix.c                  |    2 +-
+ drivers/mtd/nand/raw/nand_legacy.c                 |    6 +-
+ drivers/mtd/nand/raw/nand_macronix.c               |  227 +
+ drivers/mtd/nand/raw/nand_toshiba.c                |   58 +-
+ drivers/mtd/nand/raw/nandsim.c                     |    4 +-
+ drivers/mtd/nand/raw/omap_elm.c                    |    8 +-
+ drivers/mtd/nand/raw/qcom_nandc.c                  |  105 +-
+ drivers/mtd/nand/raw/stm32_fmc2_nand.c             |   44 +-
+ drivers/mtd/nand/raw/sunxi_nand.c                  |   17 +-
+ drivers/mtd/nand/spi/core.c                        |  104 +-
+ drivers/mtd/nand/spi/gigadevice.c                  |   45 +-
+ drivers/mtd/nand/spi/macronix.c                    |   30 +-
+ drivers/mtd/nand/spi/micron.c                      |  172 +-
+ drivers/mtd/nand/spi/paragon.c                     |   28 +-
+ drivers/mtd/nand/spi/toshiba.c                     |  208 +-
+ drivers/mtd/nand/spi/winbond.c                     |   34 +-
+ drivers/mtd/spi-nor/Kconfig                        |   75 +-
+ drivers/mtd/spi-nor/Makefile                       |   25 +-
+ drivers/mtd/spi-nor/atmel.c                        |   46 +
+ drivers/mtd/spi-nor/catalyst.c                     |   29 +
+ drivers/mtd/spi-nor/controllers/Kconfig            |   75 +
+ drivers/mtd/spi-nor/controllers/Makefile           |    8 +
+ drivers/mtd/spi-nor/{ => controllers}/aspeed-smc.c |    4 +-
+ .../spi-nor/{ => controllers}/cadence-quadspi.c    |    0
+ drivers/mtd/spi-nor/{ => controllers}/hisi-sfc.c   |    0
+ .../mtd/spi-nor/{ => controllers}/intel-spi-pci.c  |    0
+ .../spi-nor/{ => controllers}/intel-spi-platform.c |    0
+ drivers/mtd/spi-nor/{ => controllers}/intel-spi.c  |    0
+ drivers/mtd/spi-nor/{ => controllers}/intel-spi.h  |    0
+ drivers/mtd/spi-nor/{ => controllers}/nxp-spifi.c  |    0
+ drivers/mtd/spi-nor/core.c                         | 3466 +++++++++++++
+ drivers/mtd/spi-nor/core.h                         |  441 ++
+ drivers/mtd/spi-nor/eon.c                          |   34 +
+ drivers/mtd/spi-nor/esmt.c                         |   25 +
+ drivers/mtd/spi-nor/everspin.c                     |   27 +
+ drivers/mtd/spi-nor/fujitsu.c                      |   20 +
+ drivers/mtd/spi-nor/gigadevice.c                   |   59 +
+ drivers/mtd/spi-nor/intel.c                        |   32 +
+ drivers/mtd/spi-nor/issi.c                         |   83 +
+ drivers/mtd/spi-nor/macronix.c                     |   98 +
+ drivers/mtd/spi-nor/micron-st.c                    |  157 +
+ drivers/mtd/spi-nor/sfdp.c                         | 1204 +++++
+ drivers/mtd/spi-nor/sfdp.h                         |   98 +
+ drivers/mtd/spi-nor/spansion.c                     |   95 +
+ drivers/mtd/spi-nor/spi-nor.c                      | 5434 --------------------
+ drivers/mtd/spi-nor/sst.c                          |  151 +
+ drivers/mtd/spi-nor/winbond.c                      |  112 +
+ drivers/mtd/spi-nor/xilinx.c                       |   94 +
+ drivers/mtd/spi-nor/xmc.c                          |   23 +
+ drivers/mtd/ubi/attach.c                           |    2 +-
+ drivers/mtd/ubi/build.c                            |    4 +-
+ include/linux/mtd/mtd.h                            |  125 +-
+ include/linux/mtd/partitions.h                     |    1 -
+ include/linux/mtd/rawnand.h                        |   11 +-
+ include/linux/mtd/spi-nor.h                        |  285 +-
+ include/linux/mtd/spinand.h                        |   67 +-
+ 95 files changed, 8455 insertions(+), 6932 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mtd/nand-macronix.txt
+ create mode 100644 drivers/mtd/spi-nor/atmel.c
+ create mode 100644 drivers/mtd/spi-nor/catalyst.c
+ create mode 100644 drivers/mtd/spi-nor/controllers/Kconfig
+ create mode 100644 drivers/mtd/spi-nor/controllers/Makefile
+ rename drivers/mtd/spi-nor/{ => controllers}/aspeed-smc.c (99%)
+ rename drivers/mtd/spi-nor/{ => controllers}/cadence-quadspi.c (100%)
+ rename drivers/mtd/spi-nor/{ => controllers}/hisi-sfc.c (100%)
+ rename drivers/mtd/spi-nor/{ => controllers}/intel-spi-pci.c (100%)
+ rename drivers/mtd/spi-nor/{ => controllers}/intel-spi-platform.c (100%)
+ rename drivers/mtd/spi-nor/{ => controllers}/intel-spi.c (100%)
+ rename drivers/mtd/spi-nor/{ => controllers}/intel-spi.h (100%)
+ rename drivers/mtd/spi-nor/{ => controllers}/nxp-spifi.c (100%)
+ create mode 100644 drivers/mtd/spi-nor/core.c
+ create mode 100644 drivers/mtd/spi-nor/core.h
+ create mode 100644 drivers/mtd/spi-nor/eon.c
+ create mode 100644 drivers/mtd/spi-nor/esmt.c
+ create mode 100644 drivers/mtd/spi-nor/everspin.c
+ create mode 100644 drivers/mtd/spi-nor/fujitsu.c
+ create mode 100644 drivers/mtd/spi-nor/gigadevice.c
+ create mode 100644 drivers/mtd/spi-nor/intel.c
+ create mode 100644 drivers/mtd/spi-nor/issi.c
+ create mode 100644 drivers/mtd/spi-nor/macronix.c
+ create mode 100644 drivers/mtd/spi-nor/micron-st.c
+ create mode 100644 drivers/mtd/spi-nor/sfdp.c
+ create mode 100644 drivers/mtd/spi-nor/sfdp.h
+ create mode 100644 drivers/mtd/spi-nor/spansion.c
+ delete mode 100644 drivers/mtd/spi-nor/spi-nor.c
+ create mode 100644 drivers/mtd/spi-nor/sst.c
+ create mode 100644 drivers/mtd/spi-nor/winbond.c
+ create mode 100644 drivers/mtd/spi-nor/xilinx.c
+ create mode 100644 drivers/mtd/spi-nor/xmc.c
+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 (59e7a8cc2dcf Merge tag 'drm-msm-next-2020-03-22' of https://gitlab.freedesktop.org/drm/msm into drm-next)
+$ git merge drm/drm-next
+Auto-merging drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c
+Auto-merging drivers/gpu/drm/omapdrm/dss/dss.c
+Removing drivers/gpu/drm/omapdrm/dss/dss-of.c
+Removing drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
+Removing drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
+Removing drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
+Removing drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+Auto-merging drivers/gpu/drm/mediatek/mtk_hdmi.c
+Auto-merging drivers/gpu/drm/mediatek/mtk_dsi.c
+Auto-merging drivers/gpu/drm/mediatek/mtk_dpi.c
+Auto-merging drivers/gpu/drm/i915/intel_sideband.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.c
+Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/Makefile
+Auto-merging drivers/gpu/drm/exynos/exynos_dp.c
+Removing drivers/gpu/drm/bridge/dumb-vga-dac.c
+Auto-merging drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+Auto-merging arch/arm/configs/omap2plus_defconfig
+CONFLICT (content): Merge conflict in arch/arm/configs/omap2plus_defconfig
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/gpu/i915.rst
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Removing Documentation/devicetree/bindings/display/sitronix,st7735r.txt
+Removing Documentation/devicetree/bindings/display/rockchip/rockchip-drm.txt
+Removing Documentation/devicetree/bindings/display/panel/winstar,wf35ltiacd.txt
+Removing Documentation/devicetree/bindings/display/panel/vl050_8048nt_c01.txt
+Removing Documentation/devicetree/bindings/display/panel/urt,umsh-8596md.txt
+Removing Documentation/devicetree/bindings/display/panel/tpk,f10a-0102.txt
+Removing Documentation/devicetree/bindings/display/panel/tpk,f07a-0102.txt
+Removing Documentation/devicetree/bindings/display/panel/toshiba,lt089ac29000.txt
+Removing Documentation/devicetree/bindings/display/panel/tianma,tm070rvhg71.txt
+Removing Documentation/devicetree/bindings/display/panel/tianma,tm070jdhg30.txt
+Removing Documentation/devicetree/bindings/display/panel/starry,kr122ea0sra.txt
+Removing Documentation/devicetree/bindings/display/panel/shelly,sca07010-bfn-lnn.txt
+Removing Documentation/devicetree/bindings/display/panel/sharp,lq123p1jx31.txt
+Removing Documentation/devicetree/bindings/display/panel/sharp,lq101k1ly04.txt
+Removing Documentation/devicetree/bindings/display/panel/sharp,lq070y3dg3b.txt
+Removing Documentation/devicetree/bindings/display/panel/sharp,lq035q7db03.txt
+Removing Documentation/devicetree/bindings/display/panel/samsung,ltn140at29-301.txt
+Removing Documentation/devicetree/bindings/display/panel/samsung,ltn101nt05.txt
+Removing Documentation/devicetree/bindings/display/panel/samsung,lsn122dl01-c01.txt
+Removing Documentation/devicetree/bindings/display/panel/rocktech,rk070er9427.txt
+Removing Documentation/devicetree/bindings/display/panel/raydium,rm68200.txt
+Removing Documentation/devicetree/bindings/display/panel/qiaodian,qd43003c0-40.txt
+Removing Documentation/devicetree/bindings/display/panel/panel-dpi.txt
+Removing Documentation/devicetree/bindings/display/panel/panasonic,vvx10f034n00.txt
+Removing Documentation/devicetree/bindings/display/panel/panasonic,vvx10f004b00.txt
+Removing Documentation/devicetree/bindings/display/panel/osddisplays,osd101t2045-53ts.txt
+Removing Documentation/devicetree/bindings/display/panel/osddisplays,osd070t1718-19ts.txt
+Removing Documentation/devicetree/bindings/display/panel/ortustech,com43h4m85ulc.txt
+Removing Documentation/devicetree/bindings/display/panel/ortustech,com37h3m99dtc.txt
+Removing Documentation/devicetree/bindings/display/panel/ortustech,com37h3m05dtc.txt
+Removing Documentation/devicetree/bindings/display/panel/orisetech,otm8009a.txt
+Removing Documentation/devicetree/bindings/display/panel/ontat,yx700wv03.txt
+Removing Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino-43-ts.txt
+Removing Documentation/devicetree/bindings/display/panel/okaya,rs800480t-7x0gp.txt
+Removing Documentation/devicetree/bindings/display/panel/nvd,9128.txt
+Removing Documentation/devicetree/bindings/display/panel/nlt,nl192108ac18-02d.txt
+Removing Documentation/devicetree/bindings/display/panel/newhaven,nhd-4.3-480272ef-atxl.txt
+Removing Documentation/devicetree/bindings/display/panel/netron-dy,e231732.txt
+Removing Documentation/devicetree/bindings/display/panel/nec,nl4827hc19-05b.txt
+Removing Documentation/devicetree/bindings/display/panel/nec,nl12880b20-05.txt
+Removing Documentation/devicetree/bindings/display/panel/mitsubishi,aa070mc01.txt
+Removing Documentation/devicetree/bindings/display/panel/lg,lp129qe.txt
+Removing Documentation/devicetree/bindings/display/panel/lg,lp120up1.txt
+Removing Documentation/devicetree/bindings/display/panel/lg,lp097qx1-spa1.txt
+Removing Documentation/devicetree/bindings/display/panel/lg,lp079qx1-sp0v.txt
+Removing Documentation/devicetree/bindings/display/panel/lg,lb070wv8.txt
+Removing Documentation/devicetree/bindings/display/panel/lemaker,bl035-rgb-002.txt
+Removing Documentation/devicetree/bindings/display/panel/kyo,tcg121xglp.txt
+Removing Documentation/devicetree/bindings/display/panel/koe,tx31d200vm0baa.txt
+Removing Documentation/devicetree/bindings/display/panel/koe,tx14d24vm1bpa.txt
+Removing Documentation/devicetree/bindings/display/panel/innolux,zj070na-01p.txt
+Removing Documentation/devicetree/bindings/display/panel/innolux,n156bge-l21.txt
+Removing Documentation/devicetree/bindings/display/panel/innolux,n116bge.txt
+Removing Documentation/devicetree/bindings/display/panel/innolux,g121x1-l03.txt
+Removing Documentation/devicetree/bindings/display/panel/innolux,g121i1-l01.txt
+Removing Documentation/devicetree/bindings/display/panel/innolux,g101ice-l01.txt
+Removing Documentation/devicetree/bindings/display/panel/innolux,g070y2-l01.txt
+Removing Documentation/devicetree/bindings/display/panel/innolux,at070tn92.txt
+Removing Documentation/devicetree/bindings/display/panel/innolux,at043tn24.txt
+Removing Documentation/devicetree/bindings/display/panel/hit,tx23d38vm0caa.txt
+Removing Documentation/devicetree/bindings/display/panel/hannstar,hsd100pxn1.txt
+Removing Documentation/devicetree/bindings/display/panel/hannstar,hsd070pww1.txt
+Removing Documentation/devicetree/bindings/display/panel/giantplus,gpg482739qs5.txt
+Removing Documentation/devicetree/bindings/display/panel/friendlyarm,hd702e.txt
+Removing Documentation/devicetree/bindings/display/panel/foxlink,fl500wvr00-a0t.txt
+Removing Documentation/devicetree/bindings/display/panel/evervision,vgg804821.txt
+Removing Documentation/devicetree/bindings/display/panel/edt,et-series.txt
+Removing Documentation/devicetree/bindings/display/panel/dlc,dlc1010gig.txt
+Removing Documentation/devicetree/bindings/display/panel/dataimage,scf0700c48ggu18.txt
+Removing Documentation/devicetree/bindings/display/panel/chunghwa,claa101wb03.txt
+Removing Documentation/devicetree/bindings/display/panel/chunghwa,claa101wa01a.txt
+Removing Documentation/devicetree/bindings/display/panel/chunghwa,claa070wp03xg.txt
+Removing Documentation/devicetree/bindings/display/panel/cdtech,s070wv95-ct16.txt
+Removing Documentation/devicetree/bindings/display/panel/cdtech,s043wq26h-ct7.txt
+Removing Documentation/devicetree/bindings/display/panel/boe,tv080wum-nl0.txt
+Removing Documentation/devicetree/bindings/display/panel/boe,nv101wxmn51.txt
+Removing Documentation/devicetree/bindings/display/panel/boe,hv070wsa-100.txt
+Removing Documentation/devicetree/bindings/display/panel/avic,tm070ddh03.txt
+Removing Documentation/devicetree/bindings/display/panel/auo,t215hvn01.txt
+Removing Documentation/devicetree/bindings/display/panel/auo,p320hvn03.txt
+Removing Documentation/devicetree/bindings/display/panel/auo,g185han01.txt
+Removing Documentation/devicetree/bindings/display/panel/auo,g133han01.txt
+Removing Documentation/devicetree/bindings/display/panel/auo,g104sn02.txt
+Removing Documentation/devicetree/bindings/display/panel/auo,g101evn010.txt
+Removing Documentation/devicetree/bindings/display/panel/auo,g070vvn01.txt
+Removing Documentation/devicetree/bindings/display/panel/auo,b133xtn01.txt
+Removing Documentation/devicetree/bindings/display/panel/auo,b133htn01.txt
+Removing Documentation/devicetree/bindings/display/panel/auo,b116xw03.txt
+Removing Documentation/devicetree/bindings/display/panel/auo,b101xtn01.txt
+Removing Documentation/devicetree/bindings/display/panel/auo,b101ean01.txt
+Removing Documentation/devicetree/bindings/display/panel/auo,b101aw03.txt
+Removing Documentation/devicetree/bindings/display/panel/auo,b080uan01.txt
+Removing Documentation/devicetree/bindings/display/msm/gmu.txt
+Resolved 'arch/arm/configs/omap2plus_defconfig' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master a4f11611a9e5] Merge remote-tracking branch 'drm/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/display/allwinner,sun4i-a10-tcon.yaml |    6 +
+ .../bindings/display/bridge/adi,adv7511.txt        |   23 +-
+ .../devicetree/bindings/display/bridge/ps8640.yaml |  112 +
+ .../bindings/display/bridge/toshiba,tc358768.yaml  |  159 +
+ .../bindings/display/ilitek,ili9486.yaml           |   73 +
+ .../bindings/display/mediatek/mediatek,dpi.txt     |    1 +
+ .../devicetree/bindings/display/msm/gmu.txt        |  116 -
+ .../devicetree/bindings/display/msm/gmu.yaml       |  123 +
+ .../devicetree/bindings/display/msm/gpu.txt        |   55 +-
+ .../display/panel/advantech,idk-1110wr.yaml        |   69 +
+ .../display/panel/advantech,idk-2121wr.yaml        |  122 +
+ .../bindings/display/panel/auo,b080uan01.txt       |    7 -
+ .../bindings/display/panel/auo,b101aw03.txt        |    7 -
+ .../bindings/display/panel/auo,b101ean01.txt       |    7 -
+ .../bindings/display/panel/auo,b101xtn01.txt       |    7 -
+ .../bindings/display/panel/auo,b116xw03.txt        |    7 -
+ .../bindings/display/panel/auo,b133htn01.txt       |    7 -
+ .../bindings/display/panel/auo,b133xtn01.txt       |    7 -
+ .../bindings/display/panel/auo,g070vvn01.txt       |   29 -
+ .../bindings/display/panel/auo,g101evn010.txt      |   12 -
+ .../bindings/display/panel/auo,g104sn02.txt        |   12 -
+ .../bindings/display/panel/auo,g133han01.txt       |    7 -
+ .../bindings/display/panel/auo,g185han01.txt       |    7 -
+ .../bindings/display/panel/auo,p320hvn03.txt       |    8 -
+ .../bindings/display/panel/auo,t215hvn01.txt       |    7 -
+ .../bindings/display/panel/avic,tm070ddh03.txt     |    7 -
+ .../bindings/display/panel/boe,hv070wsa-100.txt    |   28 -
+ .../bindings/display/panel/boe,nv101wxmn51.txt     |    7 -
+ .../bindings/display/panel/boe,tv080wum-nl0.txt    |    7 -
+ .../bindings/display/panel/boe,tv101wum-nl6.yaml   |   80 +
+ .../display/panel/cdtech,s043wq26h-ct7.txt         |   12 -
+ .../display/panel/cdtech,s070wv95-ct16.txt         |   12 -
+ .../display/panel/chunghwa,claa070wp03xg.txt       |    7 -
+ .../display/panel/chunghwa,claa101wa01a.txt        |    7 -
+ .../display/panel/chunghwa,claa101wb03.txt         |    7 -
+ .../display/panel/dataimage,scf0700c48ggu18.txt    |    8 -
+ .../bindings/display/panel/display-timing.txt      |  124 +-
+ .../bindings/display/panel/display-timings.yaml    |   77 +
+ .../bindings/display/panel/dlc,dlc1010gig.txt      |   12 -
+ .../bindings/display/panel/edt,et-series.txt       |   55 -
+ .../bindings/display/panel/elida,kd35t133.yaml     |   49 +
+ .../display/panel/evervision,vgg804821.txt         |   12 -
+ .../display/panel/feixin,k101-im2ba02.yaml         |   55 +
+ .../display/panel/foxlink,fl500wvr00-a0t.txt       |    7 -
+ .../bindings/display/panel/friendlyarm,hd702e.txt  |   32 -
+ .../display/panel/giantplus,gpg482739qs5.txt       |    7 -
+ .../bindings/display/panel/hannstar,hsd070pww1.txt |    7 -
+ .../bindings/display/panel/hannstar,hsd100pxn1.txt |    7 -
+ .../bindings/display/panel/hit,tx23d38vm0caa.txt   |    7 -
+ .../bindings/display/panel/innolux,at043tn24.txt   |    7 -
+ .../bindings/display/panel/innolux,at070tn92.txt   |    7 -
+ .../bindings/display/panel/innolux,g070y2-l01.txt  |   12 -
+ .../bindings/display/panel/innolux,g101ice-l01.txt |    7 -
+ .../bindings/display/panel/innolux,g121i1-l01.txt  |    7 -
+ .../bindings/display/panel/innolux,g121x1-l03.txt  |    7 -
+ .../bindings/display/panel/innolux,n116bge.txt     |    7 -
+ .../bindings/display/panel/innolux,n156bge-l21.txt |    7 -
+ .../bindings/display/panel/innolux,zj070na-01p.txt |    7 -
+ .../bindings/display/panel/koe,tx14d24vm1bpa.txt   |   42 -
+ .../bindings/display/panel/koe,tx31d200vm0baa.txt  |   25 -
+ .../bindings/display/panel/kyo,tcg121xglp.txt      |    7 -
+ .../display/panel/leadtek,ltk500hd1829.yaml        |    2 +-
+ .../display/panel/lemaker,bl035-rgb-002.txt        |   12 -
+ .../bindings/display/panel/lg,lb070wv8.txt         |    7 -
+ .../bindings/display/panel/lg,lp079qx1-sp0v.txt    |    7 -
+ .../bindings/display/panel/lg,lp097qx1-spa1.txt    |    7 -
+ .../bindings/display/panel/lg,lp120up1.txt         |    7 -
+ .../bindings/display/panel/lg,lp129qe.txt          |    7 -
+ .../display/panel/mitsubishi,aa070mc01.txt         |    7 -
+ .../bindings/display/panel/nec,nl12880b20-05.txt   |    8 -
+ .../bindings/display/panel/nec,nl4827hc19-05b.txt  |    7 -
+ .../bindings/display/panel/netron-dy,e231732.txt   |    7 -
+ .../panel/newhaven,nhd-4.3-480272ef-atxl.txt       |    7 -
+ .../display/panel/nlt,nl192108ac18-02d.txt         |    8 -
+ .../bindings/display/panel/novatek,nt35510.yaml    |   56 +
+ .../devicetree/bindings/display/panel/nvd,9128.txt |    7 -
+ .../display/panel/okaya,rs800480t-7x0gp.txt        |    7 -
+ .../display/panel/olimex,lcd-olinuxino-43-ts.txt   |    7 -
+ .../bindings/display/panel/ontat,yx700wv03.txt     |    7 -
+ .../bindings/display/panel/orisetech,otm8009a.txt  |   23 -
+ .../bindings/display/panel/orisetech,otm8009a.yaml |   53 +
+ .../display/panel/ortustech,com37h3m05dtc.txt      |   12 -
+ .../display/panel/ortustech,com37h3m99dtc.txt      |   12 -
+ .../display/panel/ortustech,com43h4m85ulc.txt      |    7 -
+ .../display/panel/osddisplays,osd070t1718-19ts.txt |   12 -
+ .../display/panel/osddisplays,osd101t2045-53ts.txt |   11 -
+ .../display/panel/panasonic,vvx10f004b00.txt       |    7 -
+ .../display/panel/panasonic,vvx10f034n00.txt       |   20 -
+ .../bindings/display/panel/panel-common.yaml       |   15 +-
+ .../bindings/display/panel/panel-dpi.txt           |   50 -
+ .../bindings/display/panel/panel-dpi.yaml          |   81 +
+ .../bindings/display/panel/panel-simple-dsi.yaml   |   67 +
+ .../bindings/display/panel/panel-simple.yaml       |  209 ++
+ .../bindings/display/panel/panel-timing.yaml       |  227 ++
+ .../display/panel/qiaodian,qd43003c0-40.txt        |    7 -
+ .../bindings/display/panel/raydium,rm68200.txt     |   25 -
+ .../bindings/display/panel/raydium,rm68200.yaml    |   56 +
+ .../display/panel/rocktech,rk070er9427.txt         |   25 -
+ .../display/panel/samsung,lsn122dl01-c01.txt       |    7 -
+ .../bindings/display/panel/samsung,ltn101nt05.txt  |    7 -
+ .../display/panel/samsung,ltn140at29-301.txt       |    7 -
+ .../display/panel/samsung,s6e88a0-ams452ef01.yaml  |   50 +
+ .../bindings/display/panel/sharp,lq035q7db03.txt   |   12 -
+ .../bindings/display/panel/sharp,lq070y3dg3b.txt   |   12 -
+ .../bindings/display/panel/sharp,lq101k1ly04.txt   |    7 -
+ .../bindings/display/panel/sharp,lq123p1jx31.txt   |    7 -
+ .../display/panel/shelly,sca07010-bfn-lnn.txt      |    7 -
+ .../bindings/display/panel/starry,kr122ea0sra.txt  |    7 -
+ .../bindings/display/panel/tianma,tm070jdhg30.txt  |    7 -
+ .../bindings/display/panel/tianma,tm070rvhg71.txt  |   29 -
+ .../display/panel/toshiba,lt089ac29000.txt         |    8 -
+ .../bindings/display/panel/tpk,f07a-0102.txt       |    8 -
+ .../bindings/display/panel/tpk,f10a-0102.txt       |    8 -
+ .../bindings/display/panel/urt,umsh-8596md.txt     |   16 -
+ .../bindings/display/panel/vl050_8048nt_c01.txt    |   12 -
+ .../bindings/display/panel/winstar,wf35ltiacd.txt  |   48 -
+ .../bindings/display/panel/xinpeng,xpp055c272.yaml |    2 +-
+ .../bindings/display/rockchip/rockchip-drm.txt     |   19 -
+ .../bindings/display/rockchip/rockchip-drm.yaml    |   40 +
+ .../bindings/display/sitronix,st7735r.txt          |   35 -
+ .../bindings/display/sitronix,st7735r.yaml         |   78 +
+ .../bindings/display/ti/ti,am65x-dss.yaml          |  152 +
+ .../bindings/display/ti/ti,j721e-dss.yaml          |  208 ++
+ .../devicetree/bindings/display/ti/ti,k2g-dss.yaml |  106 +
+ .../devicetree/bindings/vendor-prefixes.yaml       |   10 +
+ Documentation/gpu/drm-kms-helpers.rst              |   18 +-
+ Documentation/gpu/i915.rst                         |    4 +-
+ Documentation/gpu/todo.rst                         |   53 +-
+ MAINTAINERS                                        |   44 +-
+ arch/arm/configs/davinci_all_defconfig             |    2 +-
+ arch/arm/configs/integrator_defconfig              |    2 +-
+ arch/arm/configs/multi_v7_defconfig                |    2 +-
+ arch/arm/configs/omap2plus_defconfig               |    7 +-
+ arch/arm/configs/shmobile_defconfig                |    2 +-
+ arch/arm/configs/sunxi_defconfig                   |    2 +-
+ arch/arm/configs/versatile_defconfig               |    2 +-
+ drivers/dma-buf/Kconfig                            |   12 +-
+ drivers/dma-buf/dma-buf.c                          |  110 +-
+ drivers/gpu/drm/Kconfig                            |    8 +-
+ drivers/gpu/drm/Makefile                           |    4 +-
+ drivers/gpu/drm/amd/acp/Kconfig                    |    1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h                |   10 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c         |   51 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h         |   13 +-
+ .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c    |    3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c |   34 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c  |   26 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c  |   26 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c  |   24 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h  |    2 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c   |   95 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c     |   17 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             |   20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c            |  169 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c        |  177 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h        |    3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |  152 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c      |    2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c        |   16 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c        |  124 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c            |   17 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h            |    5 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            |   78 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c             |    5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c          |    3 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c            |   11 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h            |   17 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c             |    7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.c            |    6 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c            |   35 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c          |    1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h          |    1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h           |    5 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c           |    1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c         |   51 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h         |    4 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c             |   12 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h             |    2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c            |  214 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h            |   14 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c            |  120 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h            |    2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c     |   98 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h     |    2 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c           |   93 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h           |   12 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h            |    3 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c           |    4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h           |    1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c           |   51 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h           |   15 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c            |  119 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h            |    2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c            |    1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c            |    3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c            |   13 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h           |    3 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             |  191 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h             |    5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c         |   29 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c        |   35 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c           |  250 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h           |   12 +-
+ drivers/gpu/drm/amd/amdgpu/atom.c                  |    4 +-
+ drivers/gpu/drm/amd/amdgpu/atombios_dp.c           |   10 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v10_0.c             |    5 +
+ drivers/gpu/drm/amd/amdgpu/dce_v11_0.c             |    5 +
+ drivers/gpu/drm/amd/amdgpu/dce_v6_0.c              |    5 +
+ drivers/gpu/drm/amd/amdgpu/dce_v8_0.c              |    5 +
+ drivers/gpu/drm/amd/amdgpu/dce_virtual.c           |    6 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c             |  187 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c              |   24 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c              |  148 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c              |  476 ++-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c              |    5 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_4.h              |    2 +
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c           |   67 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c              |  109 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c            |   12 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c            |   29 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c            |   12 +
+ drivers/gpu/drm/amd/amdgpu/mmsch_v2_0.h            |  338 ++
+ drivers/gpu/drm/amd/amdgpu/navi10_ih.c             |   36 +
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c             |   15 +-
+ drivers/gpu/drm/amd/amdgpu/nv.c                    |    3 +-
+ drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h            |    3 +
+ drivers/gpu/drm/amd/amdgpu/psp_v11_0.c             |   90 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c             |   20 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c             |    6 +-
+ drivers/gpu/drm/amd/amdgpu/si_dpm.c                |    1 -
+ drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c         |   14 +-
+ drivers/gpu/drm/amd/amdgpu/soc15.c                 |   14 +
+ drivers/gpu/drm/amd/amdgpu/soc15.h                 |    7 +
+ drivers/gpu/drm/amd/amdgpu/soc15_common.h          |    5 +-
+ drivers/gpu/drm/amd/amdgpu/umc_v6_1.c              |   23 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c              |  257 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c              |   35 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c           |    4 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c            |   32 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  |  152 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h  |    7 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_events.c            |    2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c       |    2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c    |   18 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c    |    9 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_priv.h              |   11 +
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c           |  150 +-
+ .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c |   27 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.c          |    5 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.h          |    1 +
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |  310 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h  |   37 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c  |   91 +
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c |  242 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h |    9 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c  |   30 +-
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c    |   49 +-
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c |    4 +-
+ .../gpu/drm/amd/display/dc/bios/command_table2.c   |    4 +-
+ .../amd/display/dc/bios/command_table_helper2.c    |   13 +-
+ drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c   |   46 +-
+ drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c   |   25 +-
+ drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c   |   26 +-
+ .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c   |   13 +-
+ .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c  |   21 +-
+ drivers/gpu/drm/amd/display/dc/core/dc.c           |  162 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c      |  197 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c  |   60 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c   |  298 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c |   58 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c  |  200 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c |    5 +-
+ drivers/gpu/drm/amd/display/dc/dc.h                |   39 +-
+ drivers/gpu/drm/amd/display/dc/dc_dp_types.h       |   48 +
+ drivers/gpu/drm/amd/display/dc/dc_link.h           |   20 +
+ drivers/gpu/drm/amd/display/dc/dc_stream.h         |    1 +
+ drivers/gpu/drm/amd/display/dc/dc_types.h          |    4 +-
+ drivers/gpu/drm/amd/display/dc/dce/Makefile        |    2 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_aux.c       |    2 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c      |   16 +
+ drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c    |   23 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c |    2 +-
+ .../gpu/drm/amd/display/dc/dce/dce_scl_filters.c   | 2204 ++++++------
+ .../drm/amd/display/dc/dce/dce_scl_filters_old.c   |   25 +
+ drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c      |   92 +-
+ drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h      |   11 +-
+ .../amd/display/dc/dce110/dce110_hw_sequencer.c    |   58 +-
+ .../amd/display/dc/dce110/dce110_hw_sequencer.h    |    4 +
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c |   13 +
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c    |  168 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h    |    8 +-
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c  |  129 +-
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h  |    7 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c  |    4 +
+ .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c  |    5 +
+ .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h  |    2 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c  |    8 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c  |    8 +-
+ .../amd/display/dc/dcn10/dcn10_stream_encoder.c    |    1 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c  |    2 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c   |   78 -
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c   |    2 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c    |   11 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c |  125 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h |    7 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c  |    5 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_mmhubbub.h  |   20 -
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.c   |    8 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.h   |    9 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c  |  204 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h  |   11 +-
+ .../amd/display/dc/dcn20/dcn20_stream_encoder.c    |    1 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_vmid.h  |    7 -
+ .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c    |  138 +-
+ .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.h    |    8 +-
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c  |   39 +-
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c |   22 +
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.h |    3 +
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c  |    6 +-
+ .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c  |  208 +-
+ drivers/gpu/drm/amd/display/dc/dm_cp_psp.h         |    1 +
+ .../display/dc/dml/dcn20/display_mode_vba_20v2.c   |    8 +
+ .../drm/amd/display/dc/dml/display_mode_structs.h  |   12 +-
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.c  |   11 +-
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.h  |    4 -
+ drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c   |    2 +-
+ drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c |    2 +-
+ drivers/gpu/drm/amd/display/dc/inc/core_types.h    |    2 +-
+ drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h    |    2 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h    |    2 +
+ .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h   |    4 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h       |    3 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h   |    2 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h        |    1 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h        |    3 +-
+ .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h   |    1 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/opp.h        |    3 +-
+ .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h |    1 +
+ drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h  |    6 +-
+ .../drm/amd/display/dc/inc/hw_sequencer_private.h  |    7 +
+ drivers/gpu/drm/amd/display/dc/inc/resource.h      |    3 +
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h    |   72 +-
+ .../gpu/drm/amd/display/dmub/inc/dmub_cmd_dal.h    |   13 +-
+ .../gpu/drm/amd/display/dmub/inc/dmub_gpint_cmd.h  |   75 +
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_srv.h    |   51 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c  |   69 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h  |    9 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c    |   67 +-
+ drivers/gpu/drm/amd/display/include/dal_asic_id.h  |   28 +-
+ drivers/gpu/drm/amd/display/include/dpcd_defs.h    |    8 +
+ drivers/gpu/drm/amd/display/include/logger_types.h |   63 +-
+ .../drm/amd/display/modules/freesync/freesync.c    |    8 +-
+ drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c    |   69 +-
+ drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h    |   60 +-
+ .../drm/amd/display/modules/hdcp/hdcp1_execution.c |    6 +-
+ .../amd/display/modules/hdcp/hdcp1_transition.c    |   15 +-
+ .../drm/amd/display/modules/hdcp/hdcp2_execution.c |   12 +-
+ .../amd/display/modules/hdcp/hdcp2_transition.c    |    6 +-
+ .../gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c    |   36 +-
+ .../gpu/drm/amd/display/modules/hdcp/hdcp_log.c    |    4 +
+ .../gpu/drm/amd/display/modules/hdcp/hdcp_log.h    |   17 +-
+ .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c    |  183 +-
+ .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.h    |   32 +-
+ drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h |   10 +-
+ .../drm/amd/display/modules/inc/mod_info_packet.h  |    3 +-
+ .../amd/display/modules/info_packet/info_packet.c  |   20 +-
+ drivers/gpu/drm/amd/display/modules/vmid/vmid.c    |   16 +-
+ .../include/asic_reg/wafl/wafl2_4_0_0_sh_mask.h    |   69 +
+ .../amd/include/asic_reg/wafl/wafl2_4_0_0_smn.h    |   29 +
+ .../amd/include/asic_reg/xgmi/xgmi_4_0_0_sh_mask.h |   69 +
+ .../drm/amd/include/asic_reg/xgmi/xgmi_4_0_0_smn.h |   29 +
+ drivers/gpu/drm/amd/include/kgd_kfd_interface.h    |   31 +-
+ drivers/gpu/drm/amd/powerplay/amdgpu_smu.c         |  199 +-
+ drivers/gpu/drm/amd/powerplay/arcturus_ppt.c       |   56 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c   |    6 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c |    4 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c |    7 +-
+ drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h     |   12 +-
+ drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h |    6 +-
+ drivers/gpu/drm/amd/powerplay/inc/pp_debug.h       |    4 +-
+ .../drm/amd/powerplay/inc/smu11_driver_if_navi10.h |    3 +-
+ drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h      |   13 +-
+ drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h      |    5 +-
+ drivers/gpu/drm/amd/powerplay/navi10_ppt.c         |   59 +-
+ drivers/gpu/drm/amd/powerplay/renoir_ppt.c         |   43 +-
+ drivers/gpu/drm/amd/powerplay/smu_internal.h       |   14 +-
+ drivers/gpu/drm/amd/powerplay/smu_v11_0.c          |  155 +-
+ drivers/gpu/drm/amd/powerplay/smu_v12_0.c          |   88 +-
+ .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c   |   11 +
+ drivers/gpu/drm/amd/powerplay/vega20_ppt.c         |   70 +-
+ drivers/gpu/drm/arc/arcpgu_crtc.c                  |   16 -
+ drivers/gpu/drm/arc/arcpgu_hdmi.c                  |    2 +-
+ drivers/gpu/drm/armada/armada_fbdev.c              |    8 +-
+ drivers/gpu/drm/ast/ast_drv.h                      |    6 +-
+ drivers/gpu/drm/ast/ast_main.c                     |   24 +-
+ drivers/gpu/drm/ast/ast_mode.c                     |   27 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c   |    2 +-
+ drivers/gpu/drm/bochs/bochs_drv.c                  |    6 +-
+ drivers/gpu/drm/bochs/bochs_hw.c                   |   24 +-
+ drivers/gpu/drm/bochs/bochs_kms.c                  |   34 +-
+ drivers/gpu/drm/bridge/Kconfig                     |   51 +-
+ drivers/gpu/drm/bridge/Makefile                    |    6 +-
+ drivers/gpu/drm/bridge/adv7511/Kconfig             |   13 +-
+ drivers/gpu/drm/bridge/adv7511/Makefile            |    3 +-
+ drivers/gpu/drm/bridge/adv7511/adv7511.h           |   40 +-
+ drivers/gpu/drm/bridge/adv7511/adv7511_drv.c       |   28 +-
+ drivers/gpu/drm/bridge/analogix/analogix-anx6345.c |   20 +-
+ drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c |   13 +-
+ drivers/gpu/drm/bridge/analogix/analogix_dp_core.c |   54 +-
+ drivers/gpu/drm/bridge/cdns-dsi.c                  |    6 +-
+ drivers/gpu/drm/bridge/display-connector.c         |  295 ++
+ drivers/gpu/drm/bridge/dumb-vga-dac.c              |  300 --
+ drivers/gpu/drm/bridge/lvds-codec.c                |   21 +-
+ .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c   |    8 +-
+ drivers/gpu/drm/bridge/nxp-ptn3460.c               |    8 +-
+ drivers/gpu/drm/bridge/panel.c                     |   23 +-
+ drivers/gpu/drm/bridge/parade-ps8622.c             |    8 +-
+ drivers/gpu/drm/bridge/parade-ps8640.c             |  349 ++
+ drivers/gpu/drm/bridge/sii902x.c                   |    8 +-
+ drivers/gpu/drm/bridge/sil-sii8620.c               |    3 +-
+ drivers/gpu/drm/bridge/simple-bridge.c             |  342 ++
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c          |  329 +-
+ drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c      |   11 +-
+ drivers/gpu/drm/bridge/tc358764.c                  |   11 +-
+ drivers/gpu/drm/bridge/tc358767.c                  |    9 +-
+ drivers/gpu/drm/bridge/tc358768.c                  | 1046 ++++++
+ drivers/gpu/drm/bridge/thc63lvd1024.c              |    5 +-
+ drivers/gpu/drm/bridge/ti-sn65dsi86.c              |  267 +-
+ drivers/gpu/drm/bridge/ti-tfp410.c                 |  235 +-
+ drivers/gpu/drm/bridge/ti-tpd12s015.c              |  211 ++
+ drivers/gpu/drm/cirrus/cirrus.c                    |   51 +-
+ drivers/gpu/drm/drm_atomic.c                       |  117 +
+ drivers/gpu/drm/drm_atomic_helper.c                |   83 +-
+ drivers/gpu/drm/drm_atomic_state_helper.c          |  102 +
+ drivers/gpu/drm/drm_auth.c                         |    8 -
+ drivers/gpu/drm/drm_bridge.c                       |  751 ++++-
+ drivers/gpu/drm/drm_bridge_connector.c             |  379 +++
+ drivers/gpu/drm/drm_bufs.c                         |   40 +-
+ drivers/gpu/drm/drm_client.c                       |    2 +-
+ drivers/gpu/drm/drm_client_modeset.c               |   12 +-
+ drivers/gpu/drm/drm_connector.c                    |   96 +-
+ drivers/gpu/drm/drm_context.c                      |   28 +-
+ drivers/gpu/drm/drm_crtc_helper.c                  |    4 -
+ drivers/gpu/drm/drm_crtc_internal.h                |    2 +
+ drivers/gpu/drm/drm_debugfs.c                      |    3 +-
+ drivers/gpu/drm/drm_debugfs_crc.c                  |    2 +-
+ drivers/gpu/drm/drm_dma.c                          |   21 +-
+ drivers/gpu/drm/drm_dp_helper.c                    |  141 +-
+ drivers/gpu/drm/drm_dp_mst_topology.c              |  200 +-
+ drivers/gpu/drm/drm_drv.c                          |   20 +-
+ drivers/gpu/drm/drm_edid.c                         |  211 +-
+ drivers/gpu/drm/drm_fb_helper.c                    |   22 +-
+ drivers/gpu/drm/drm_file.c                         |   90 +-
+ drivers/gpu/drm/drm_format_helper.c                |    2 +-
+ drivers/gpu/drm/drm_framebuffer.c                  |  122 +
+ drivers/gpu/drm/drm_gem.c                          |    2 +-
+ drivers/gpu/drm/drm_gem_vram_helper.c              |   61 +
+ drivers/gpu/drm/drm_hdcp.c                         |  158 +-
+ drivers/gpu/drm/drm_internal.h                     |    5 +-
+ drivers/gpu/drm/drm_ioctl.c                        |    1 +
+ drivers/gpu/drm/drm_irq.c                          |    4 -
+ drivers/gpu/drm/drm_lock.c                         |   11 +-
+ drivers/gpu/drm/drm_mipi_dbi.c                     |   39 +-
+ drivers/gpu/drm/drm_mm.c                           |   10 +-
+ drivers/gpu/drm/drm_pci.c                          |   82 +-
+ drivers/gpu/drm/drm_scatter.c                      |    3 +
+ drivers/gpu/drm/drm_simple_kms_helper.c            |   46 +-
+ drivers/gpu/drm/drm_syncobj.c                      |   87 +-
+ drivers/gpu/drm/drm_sysfs.c                        |    4 +-
+ drivers/gpu/drm/drm_vblank.c                       |  177 +-
+ drivers/gpu/drm/drm_vm.c                           |   26 +-
+ drivers/gpu/drm/etnaviv/etnaviv_buffer.c           |   60 +-
+ drivers/gpu/drm/etnaviv/etnaviv_drv.c              |    1 +
+ drivers/gpu/drm/etnaviv/etnaviv_drv.h              |    1 +
+ drivers/gpu/drm/etnaviv/etnaviv_gem.c              |    4 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem.h              |    2 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.c              |   52 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.h              |    6 +-
+ drivers/gpu/drm/etnaviv/etnaviv_hwdb.c             |   42 +-
+ drivers/gpu/drm/etnaviv/etnaviv_perfmon.c          |   59 +-
+ drivers/gpu/drm/etnaviv/state_blt.xml.h            |    2 +
+ drivers/gpu/drm/etnaviv/state_hi.xml.h             |   36 +-
+ drivers/gpu/drm/exynos/exynos7_drm_decon.c         |    2 +-
+ drivers/gpu/drm/exynos/exynos_dp.c                 |    3 +-
+ drivers/gpu/drm/exynos/exynos_drm_drv.c            |    5 +-
+ drivers/gpu/drm/exynos/exynos_drm_dsi.c            |    5 +-
+ drivers/gpu/drm/exynos/exynos_drm_fbdev.c          |   10 +-
+ drivers/gpu/drm/exynos/exynos_hdmi.c               |    2 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c          |    2 +-
+ drivers/gpu/drm/gma500/cdv_intel_display.c         |    3 +
+ drivers/gpu/drm/gma500/framebuffer.c               |    6 +-
+ drivers/gpu/drm/gma500/intel_bios.h                |    2 +-
+ drivers/gpu/drm/gma500/psb_drv.c                   |    4 -
+ drivers/gpu/drm/gma500/psb_drv.h                   |    6 +-
+ drivers/gpu/drm/gma500/psb_intel_display.c         |    3 +
+ drivers/gpu/drm/gma500/psb_irq.c                   |   12 +-
+ drivers/gpu/drm/gma500/psb_irq.h                   |    7 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c     |   79 +
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c    |    9 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_regs.h   |   13 +
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c   |   11 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c        |    1 +
+ drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c       |    2 +-
+ drivers/gpu/drm/i2c/tda998x_drv.c                  |   10 +-
+ drivers/gpu/drm/i915/Kconfig                       |    7 -
+ drivers/gpu/drm/i915/Kconfig.profile               |   25 +-
+ drivers/gpu/drm/i915/Makefile                      |   19 +-
+ drivers/gpu/drm/i915/display/icl_dsi.c             |  406 ++-
+ drivers/gpu/drm/i915/display/intel_acpi.c          |   89 +
+ drivers/gpu/drm/i915/display/intel_acpi.h          |    5 +
+ drivers/gpu/drm/i915/display/intel_atomic.c        |   57 +-
+ drivers/gpu/drm/i915/display/intel_atomic.h        |    5 +-
+ drivers/gpu/drm/i915/display/intel_atomic_plane.c  |   97 +-
+ drivers/gpu/drm/i915/display/intel_atomic_plane.h  |    8 +-
+ drivers/gpu/drm/i915/display/intel_audio.c         |  255 +-
+ drivers/gpu/drm/i915/display/intel_bios.c          |  444 ++-
+ drivers/gpu/drm/i915/display/intel_bios.h          |   13 +-
+ drivers/gpu/drm/i915/display/intel_bw.c            |   63 +-
+ drivers/gpu/drm/i915/display/intel_bw.h            |    4 +-
+ drivers/gpu/drm/i915/display/intel_cdclk.c         | 1106 +++---
+ drivers/gpu/drm/i915/display/intel_cdclk.h         |   73 +-
+ drivers/gpu/drm/i915/display/intel_color.c         |  602 ++--
+ drivers/gpu/drm/i915/display/intel_combo_phy.c     |  163 +-
+ drivers/gpu/drm/i915/display/intel_connector.c     |    5 +-
+ drivers/gpu/drm/i915/display/intel_crt.c           |  128 +-
+ drivers/gpu/drm/i915/{ => display}/intel_csr.c     |   46 +-
+ drivers/gpu/drm/i915/{ => display}/intel_csr.h     |    0
+ drivers/gpu/drm/i915/display/intel_ddi.c           | 1385 +++-----
+ drivers/gpu/drm/i915/display/intel_ddi.h           |    4 -
+ drivers/gpu/drm/i915/display/intel_de.h            |   72 +
+ drivers/gpu/drm/i915/display/intel_display.c       | 3546 +++++++++++---------
+ drivers/gpu/drm/i915/display/intel_display.h       |   17 +-
+ .../gpu/drm/i915/display/intel_display_debugfs.c   | 2134 ++++++++++++
+ .../gpu/drm/i915/display/intel_display_debugfs.h   |   20 +
+ drivers/gpu/drm/i915/display/intel_display_power.c |  754 +++--
+ drivers/gpu/drm/i915/display/intel_display_power.h |    6 +
+ drivers/gpu/drm/i915/display/intel_display_types.h |  119 +-
+ drivers/gpu/drm/i915/display/intel_dp.c            |  876 +++--
+ drivers/gpu/drm/i915/display/intel_dp.h            |    2 -
+ .../gpu/drm/i915/display/intel_dp_aux_backlight.c  |  193 +-
+ .../gpu/drm/i915/display/intel_dp_link_training.c  |   75 +-
+ drivers/gpu/drm/i915/display/intel_dp_mst.c        |   96 +-
+ drivers/gpu/drm/i915/display/intel_dpio_phy.c      |  108 +-
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.c      | 1521 ++++++---
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.h      |   14 +-
+ drivers/gpu/drm/i915/display/intel_dsb.c           |   58 +-
+ .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c |    6 +-
+ drivers/gpu/drm/i915/display/intel_dsi_vbt.c       |  168 +-
+ drivers/gpu/drm/i915/display/intel_dvo.c           |   50 +-
+ drivers/gpu/drm/i915/display/intel_fbc.c           |  264 +-
+ drivers/gpu/drm/i915/display/intel_fbc.h           |   13 +-
+ drivers/gpu/drm/i915/display/intel_fbdev.c         |   18 +-
+ drivers/gpu/drm/i915/display/intel_fifo_underrun.c |   66 +-
+ drivers/gpu/drm/i915/display/intel_global_state.c  |  223 ++
+ drivers/gpu/drm/i915/display/intel_global_state.h  |   87 +
+ drivers/gpu/drm/i915/display/intel_gmbus.c         |  111 +-
+ drivers/gpu/drm/i915/display/intel_hdcp.c          |  527 +--
+ drivers/gpu/drm/i915/display/intel_hdcp.h          |    7 +-
+ drivers/gpu/drm/i915/display/intel_hdmi.c          |  433 +--
+ drivers/gpu/drm/i915/display/intel_hdmi.h          |    2 -
+ drivers/gpu/drm/i915/display/intel_hotplug.c       |  203 +-
+ drivers/gpu/drm/i915/display/intel_hotplug.h       |    2 -
+ drivers/gpu/drm/i915/display/intel_lpe_audio.c     |   39 +-
+ drivers/gpu/drm/i915/display/intel_lvds.c          |  108 +-
+ drivers/gpu/drm/i915/display/intel_opregion.c      |  223 +-
+ drivers/gpu/drm/i915/display/intel_overlay.c       |   69 +-
+ drivers/gpu/drm/i915/display/intel_panel.c         |  407 ++-
+ drivers/gpu/drm/i915/display/intel_pipe_crc.c      |   51 +-
+ drivers/gpu/drm/i915/display/intel_pipe_crc.h      |    4 +-
+ drivers/gpu/drm/i915/display/intel_psr.c           |  363 +-
+ drivers/gpu/drm/i915/display/intel_quirks.c        |   20 +-
+ drivers/gpu/drm/i915/display/intel_sdvo.c          |  114 +-
+ drivers/gpu/drm/i915/display/intel_sdvo.h          |    2 -
+ drivers/gpu/drm/i915/display/intel_sprite.c        |  465 +--
+ drivers/gpu/drm/i915/display/intel_tc.c            |   51 +-
+ drivers/gpu/drm/i915/display/intel_tv.c            |  165 +-
+ drivers/gpu/drm/i915/display/intel_vbt_defs.h      |    2 +-
+ drivers/gpu/drm/i915/display/intel_vdsc.c          |  445 ++-
+ drivers/gpu/drm/i915/display/intel_vga.c           |   14 +-
+ drivers/gpu/drm/i915/display/vlv_dsi.c             |  494 ++-
+ drivers/gpu/drm/i915/display/vlv_dsi_pll.c         |   96 +-
+ drivers/gpu/drm/i915/gem/i915_gem_client_blt.c     |    2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_context.c        |  504 ++-
+ drivers/gpu/drm/i915/gem/i915_gem_context.h        |    9 +-
+ drivers/gpu/drm/i915/gem/i915_gem_context_types.h  |   13 +-
+ drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c         |    8 +-
+ drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c     |  789 ++---
+ drivers/gpu/drm/i915/gem/i915_gem_internal.c       |    2 -
+ drivers/gpu/drm/i915/gem/i915_gem_mman.c           |    5 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object.h         |    6 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object_blt.c     |   18 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object_types.h   |    2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_pages.c          |    4 +-
+ drivers/gpu/drm/i915/gem/i915_gem_phys.c           |    7 +-
+ drivers/gpu/drm/i915/gem/i915_gem_pm.c             |    3 +-
+ drivers/gpu/drm/i915/gem/i915_gem_shmem.c          |    3 +-
+ drivers/gpu/drm/i915/gem/i915_gem_shrinker.c       |   14 +-
+ drivers/gpu/drm/i915/gem/i915_gem_stolen.c         |  136 +-
+ drivers/gpu/drm/i915/gem/i915_gem_stolen.h         |    1 -
+ drivers/gpu/drm/i915/gem/i915_gem_tiling.c         |    1 -
+ drivers/gpu/drm/i915/gem/i915_gem_userptr.c        |   21 +-
+ drivers/gpu/drm/i915/gem/selftests/huge_pages.c    |  102 -
+ .../gpu/drm/i915/gem/selftests/i915_gem_context.c  |  178 +-
+ .../drm/i915/gem/selftests/i915_gem_object_blt.c   |   74 +-
+ drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c |    2 +-
+ drivers/gpu/drm/i915/gem/selftests/mock_context.c  |    8 +-
+ drivers/gpu/drm/i915/gt/gen7_renderclear.c         |  402 +++
+ drivers/gpu/drm/i915/gt/gen7_renderclear.h         |   15 +
+ drivers/gpu/drm/i915/gt/gen8_ppgtt.c               |   27 +
+ drivers/gpu/drm/i915/gt/hsw_clear_kernel.c         |   61 +
+ drivers/gpu/drm/i915/gt/intel_context.c            |   16 +-
+ drivers/gpu/drm/i915/gt/intel_context.h            |   25 +
+ drivers/gpu/drm/i915/gt/intel_context_param.c      |   63 +
+ drivers/gpu/drm/i915/gt/intel_context_param.h      |   14 +
+ drivers/gpu/drm/i915/gt/intel_context_sseu.c       |   98 +
+ drivers/gpu/drm/i915/gt/intel_context_types.h      |   25 +-
+ drivers/gpu/drm/i915/gt/intel_engine.h             |   37 +-
+ drivers/gpu/drm/i915/gt/intel_engine_cs.c          |  174 +-
+ drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c   |    8 +-
+ drivers/gpu/drm/i915/gt/intel_engine_pm.c          |    4 +-
+ drivers/gpu/drm/i915/gt/intel_engine_types.h       |   13 +-
+ drivers/gpu/drm/i915/gt/intel_engine_user.c        |    3 +-
+ drivers/gpu/drm/i915/gt/intel_ggtt.c               |  106 +-
+ drivers/gpu/drm/i915/gt/intel_gpu_commands.h       |   17 +-
+ drivers/gpu/drm/i915/gt/intel_gt.c                 |   68 +-
+ drivers/gpu/drm/i915/gt/intel_gt.h                 |    2 +-
+ drivers/gpu/drm/i915/gt/intel_gt_irq.c             |  117 +-
+ drivers/gpu/drm/i915/gt/intel_gt_irq.h             |    3 +-
+ drivers/gpu/drm/i915/gt/intel_gt_pm.c              |    2 +-
+ drivers/gpu/drm/i915/gt/intel_gtt.c                |   65 +-
+ drivers/gpu/drm/i915/gt/intel_gtt.h                |   11 +-
+ drivers/gpu/drm/i915/gt/intel_llc.c                |    6 +-
+ drivers/gpu/drm/i915/gt/intel_lrc.c                |  386 ++-
+ drivers/gpu/drm/i915/gt/intel_lrc_reg.h            |    1 +
+ drivers/gpu/drm/i915/gt/intel_mocs.c               |   76 +-
+ drivers/gpu/drm/i915/gt/intel_rc6.c                |   29 +-
+ drivers/gpu/drm/i915/gt/intel_reset.c              |  109 +-
+ drivers/gpu/drm/i915/gt/intel_ring.c               |    6 +-
+ drivers/gpu/drm/i915/gt/intel_ring_submission.c    |  236 +-
+ drivers/gpu/drm/i915/gt/intel_rps.c                |   78 +-
+ drivers/gpu/drm/i915/gt/intel_timeline.c           |    6 +-
+ drivers/gpu/drm/i915/gt/intel_workarounds.c        |  244 +-
+ drivers/gpu/drm/i915/gt/intel_workarounds_types.h  |    4 +-
+ drivers/gpu/drm/i915/gt/ivb_clear_kernel.c         |   61 +
+ drivers/gpu/drm/i915/gt/mock_engine.c              |    7 +-
+ .../gpu/drm/i915/gt/selftest_engine_heartbeat.c    |   30 +-
+ drivers/gpu/drm/i915/gt/selftest_hangcheck.c       |    4 +-
+ drivers/gpu/drm/i915/gt/selftest_llc.c             |   11 +-
+ drivers/gpu/drm/i915/gt/selftest_lrc.c             | 1924 +++++++++--
+ drivers/gpu/drm/i915/gt/selftest_mocs.c            |   24 +-
+ drivers/gpu/drm/i915/gt/selftest_rc6.c             |   28 +-
+ drivers/gpu/drm/i915/gt/selftest_reset.c           |    2 +-
+ drivers/gpu/drm/i915/gt/selftest_ring_submission.c |  296 ++
+ drivers/gpu/drm/i915/gt/selftest_timeline.c        |  188 +-
+ drivers/gpu/drm/i915/gt/selftest_workarounds.c     |    9 +
+ drivers/gpu/drm/i915/gt/sysfs_engines.c            |  445 +++
+ drivers/gpu/drm/i915/gt/sysfs_engines.h            |   13 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc.c             |   30 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc.h             |   23 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c          |  255 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h          |    7 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c  |   13 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h  |   19 +-
+ drivers/gpu/drm/i915/gt/uc/intel_huc.c             |    7 +-
+ drivers/gpu/drm/i915/gt/uc/intel_huc.h             |    8 +-
+ drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c          |    2 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc.c              |   69 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc.h              |   62 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c           |   11 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h           |   18 +-
+ drivers/gpu/drm/i915/gvt/aperture_gm.c             |   84 +-
+ drivers/gpu/drm/i915/gvt/cfg_space.c               |   27 +-
+ drivers/gpu/drm/i915/gvt/cmd_parser.c              |  208 +-
+ drivers/gpu/drm/i915/gvt/debugfs.c                 |   45 +-
+ drivers/gpu/drm/i915/gvt/display.c                 |   26 +-
+ drivers/gpu/drm/i915/gvt/dmabuf.c                  |    8 +-
+ drivers/gpu/drm/i915/gvt/edid.c                    |   25 +-
+ drivers/gpu/drm/i915/gvt/execlist.c                |  103 +-
+ drivers/gpu/drm/i915/gvt/execlist.h                |    5 +-
+ drivers/gpu/drm/i915/gvt/fb_decoder.c              |    6 +-
+ drivers/gpu/drm/i915/gvt/firmware.c                |   16 +-
+ drivers/gpu/drm/i915/gvt/gtt.c                     |   63 +-
+ drivers/gpu/drm/i915/gvt/gvt.c                     |   43 +-
+ drivers/gpu/drm/i915/gvt/gvt.h                     |   62 +-
+ drivers/gpu/drm/i915/gvt/handlers.c                |  211 +-
+ drivers/gpu/drm/i915/gvt/interrupt.c               |   21 +-
+ drivers/gpu/drm/i915/gvt/kvmgt.c                   |  309 +-
+ drivers/gpu/drm/i915/gvt/mmio.c                    |   32 +-
+ drivers/gpu/drm/i915/gvt/mmio.h                    |    4 +-
+ drivers/gpu/drm/i915/gvt/mmio_context.c            |  127 +-
+ drivers/gpu/drm/i915/gvt/mmio_context.h            |    5 +-
+ drivers/gpu/drm/i915/gvt/sched_policy.c            |   25 +-
+ drivers/gpu/drm/i915/gvt/scheduler.c               |  256 +-
+ drivers/gpu/drm/i915/gvt/scheduler.h               |    9 +-
+ drivers/gpu/drm/i915/gvt/vgpu.c                    |   18 +-
+ drivers/gpu/drm/i915/i915_active.c                 |  139 +-
+ drivers/gpu/drm/i915/i915_active.h                 |   11 +-
+ drivers/gpu/drm/i915/i915_buddy.c                  |    3 +-
+ drivers/gpu/drm/i915/i915_cmd_parser.c             |   29 +-
+ drivers/gpu/drm/i915/i915_debugfs.c                | 2560 +-------------
+ drivers/gpu/drm/i915/i915_debugfs.h                |    8 +-
+ drivers/gpu/drm/i915/i915_debugfs_params.c         |  250 ++
+ drivers/gpu/drm/i915/i915_debugfs_params.h         |   14 +
+ drivers/gpu/drm/i915/i915_drv.c                    | 1203 +------
+ drivers/gpu/drm/i915/i915_drv.h                    |  235 +-
+ drivers/gpu/drm/i915/i915_gem.c                    |   19 +-
+ drivers/gpu/drm/i915/i915_gem_evict.c              |   17 +-
+ drivers/gpu/drm/i915/i915_gem_fence_reg.c          |   16 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c                |    5 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c              |   31 +-
+ drivers/gpu/drm/i915/i915_gpu_error.h              |    5 +
+ drivers/gpu/drm/i915/i915_ioc32.c                  |    7 +-
+ drivers/gpu/drm/i915/i915_ioc32.h                  |   17 +
+ drivers/gpu/drm/i915/i915_irq.c                    |  287 +-
+ drivers/gpu/drm/i915/i915_irq.h                    |    6 +-
+ drivers/gpu/drm/i915/i915_params.c                 |   11 +-
+ drivers/gpu/drm/i915/i915_params.h                 |   74 +-
+ drivers/gpu/drm/i915/i915_pci.c                    |   18 +-
+ drivers/gpu/drm/i915/i915_perf.c                   |  103 +-
+ drivers/gpu/drm/i915/i915_pmu.c                    |    6 +-
+ drivers/gpu/drm/i915/i915_pmu.h                    |    2 +-
+ drivers/gpu/drm/i915/i915_reg.h                    |   67 +-
+ drivers/gpu/drm/i915/i915_request.c                |  258 +-
+ drivers/gpu/drm/i915/i915_request.h                |   14 +-
+ drivers/gpu/drm/i915/i915_scheduler.c              |   22 +-
+ drivers/gpu/drm/i915/i915_suspend.c                |    2 -
+ drivers/gpu/drm/i915/i915_sw_fence.c               |   17 +-
+ drivers/gpu/drm/i915/i915_sw_fence.h               |    2 +-
+ drivers/gpu/drm/i915/i915_switcheroo.c             |    2 +-
+ drivers/gpu/drm/i915/i915_sysfs.c                  |   22 +-
+ drivers/gpu/drm/i915/i915_trace.h                  |   66 +-
+ drivers/gpu/drm/i915/i915_utils.c                  |    1 -
+ drivers/gpu/drm/i915/i915_utils.h                  |   22 +-
+ drivers/gpu/drm/i915/i915_vgpu.c                   |   72 +-
+ drivers/gpu/drm/i915/i915_vgpu.h                   |   25 +-
+ drivers/gpu/drm/i915/i915_vma.c                    |   98 +-
+ drivers/gpu/drm/i915/i915_vma.h                    |    2 +
+ drivers/gpu/drm/i915/i915_vma_types.h              |   11 -
+ drivers/gpu/drm/i915/intel_device_info.c           |   45 +-
+ drivers/gpu/drm/i915/intel_device_info.h           |    4 +
+ drivers/gpu/drm/i915/intel_dram.c                  |  500 +++
+ drivers/gpu/drm/i915/intel_dram.h                  |   14 +
+ drivers/gpu/drm/i915/intel_gvt.c                   |   21 +-
+ drivers/gpu/drm/i915/intel_memory_region.c         |    4 +-
+ drivers/gpu/drm/i915/intel_pch.c                   |   66 +-
+ drivers/gpu/drm/i915/intel_pm.c                    |  765 +++--
+ drivers/gpu/drm/i915/intel_pm.h                    |    5 +-
+ drivers/gpu/drm/i915/intel_sideband.c              |   11 +-
+ drivers/gpu/drm/i915/intel_uncore.c                |   54 +-
+ drivers/gpu/drm/i915/selftests/i915_active.c       |   78 +-
+ drivers/gpu/drm/i915/selftests/i915_buddy.c        |   25 +-
+ drivers/gpu/drm/i915/selftests/i915_gem.c          |    6 +-
+ .../gpu/drm/i915/selftests/i915_live_selftests.h   |    1 +
+ .../gpu/drm/i915/selftests/i915_perf_selftests.h   |    1 +
+ drivers/gpu/drm/i915/selftests/igt_spinner.c       |    2 +-
+ .../gpu/drm/i915/selftests/intel_memory_region.c   |  203 ++
+ drivers/gpu/drm/i915/selftests/mock_gem_device.c   |    1 -
+ drivers/gpu/drm/i915/vlv_suspend.c                 |  489 +++
+ drivers/gpu/drm/i915/vlv_suspend.h                 |   18 +
+ drivers/gpu/drm/imx/imx-ldb.c                      |    2 +-
+ drivers/gpu/drm/imx/ipuv3-plane.c                  |    2 +-
+ drivers/gpu/drm/imx/parallel-display.c             |  176 +-
+ drivers/gpu/drm/ingenic/ingenic-drm.c              |    2 +-
+ drivers/gpu/drm/lima/lima_drv.c                    |   16 +-
+ drivers/gpu/drm/lima/lima_drv.h                    |    1 +
+ drivers/gpu/drm/lima/lima_gem.c                    |  134 +-
+ drivers/gpu/drm/lima/lima_gem.h                    |    4 +
+ drivers/gpu/drm/lima/lima_gp.c                     |   63 +-
+ drivers/gpu/drm/lima/lima_mmu.c                    |    5 +
+ drivers/gpu/drm/lima/lima_mmu.h                    |    1 +
+ drivers/gpu/drm/lima/lima_regs.h                   |    1 +
+ drivers/gpu/drm/lima/lima_sched.c                  |   35 +-
+ drivers/gpu/drm/lima/lima_sched.h                  |    6 +
+ drivers/gpu/drm/lima/lima_vm.c                     |   46 +-
+ drivers/gpu/drm/lima/lima_vm.h                     |    1 +
+ drivers/gpu/drm/mcde/mcde_drv.c                    |    9 +-
+ drivers/gpu/drm/mcde/mcde_dsi.c                    |    5 +-
+ drivers/gpu/drm/mediatek/mtk_dpi.c                 |   20 +-
+ drivers/gpu/drm/mediatek/mtk_dsi.c                 |    2 +-
+ drivers/gpu/drm/mediatek/mtk_hdmi.c                |   10 +-
+ drivers/gpu/drm/meson/meson_dw_hdmi.c              |  180 +-
+ drivers/gpu/drm/meson/meson_vclk.c                 |   93 +-
+ drivers/gpu/drm/meson/meson_vclk.h                 |    7 +-
+ drivers/gpu/drm/meson/meson_venc.c                 |   10 +-
+ drivers/gpu/drm/meson/meson_venc.h                 |    4 +-
+ drivers/gpu/drm/meson/meson_venc_cvbs.c            |    6 +-
+ drivers/gpu/drm/mgag200/mgag200_drv.h              |    9 +-
+ drivers/gpu/drm/mgag200/mgag200_mode.c             |   86 +-
+ drivers/gpu/drm/msm/adreno/a5xx_gpu.c              |   27 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gmu.c              |  115 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gmu.h              |    6 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h        |    2 +-
+ drivers/gpu/drm/msm/adreno/adreno_gpu.c            |    2 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c           |    2 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c        |  119 +-
+ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c   |    4 +-
+ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c   |    4 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h        |   10 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h    |   10 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c            |   98 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h            |   26 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c             |  620 ++--
+ drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h             |   71 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c           |    6 +-
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c          |    2 +
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c          |   82 +
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c           |   95 -
+ drivers/gpu/drm/msm/dsi/dsi_manager.c              |    4 +-
+ drivers/gpu/drm/msm/edp/edp.c                      |    4 -
+ drivers/gpu/drm/msm/edp/edp_bridge.c               |    2 +-
+ drivers/gpu/drm/msm/hdmi/hdmi.c                    |    4 -
+ drivers/gpu/drm/msm/hdmi/hdmi_bridge.c             |    2 +-
+ drivers/gpu/drm/msm/msm_drv.c                      |   16 +-
+ drivers/gpu/drm/msm/msm_drv.h                      |    3 +
+ drivers/gpu/drm/msm/msm_fbdev.c                    |    6 +-
+ drivers/gpu/drm/msm/msm_gem.h                      |   12 +-
+ drivers/gpu/drm/msm/msm_gpu.c                      |   28 +-
+ drivers/gpu/drm/msm/msm_rd.c                       |    8 +-
+ drivers/gpu/drm/nouveau/dispnv04/crtc.c            |    4 +
+ drivers/gpu/drm/nouveau/dispnv50/disp.c            |   26 -
+ drivers/gpu/drm/nouveau/dispnv50/head.c            |    5 +
+ drivers/gpu/drm/nouveau/nouveau_bo.c               |    8 -
+ drivers/gpu/drm/nouveau/nouveau_display.c          |   28 +-
+ drivers/gpu/drm/nouveau/nouveau_display.h          |   11 +-
+ drivers/gpu/drm/nouveau/nouveau_drm.c              |    5 -
+ drivers/gpu/drm/nouveau/nouveau_fbcon.c            |    6 +-
+ drivers/gpu/drm/nouveau/nouveau_vga.c              |    2 +-
+ drivers/gpu/drm/omapdrm/displays/Kconfig           |   22 -
+ drivers/gpu/drm/omapdrm/displays/Makefile          |    4 -
+ .../gpu/drm/omapdrm/displays/connector-analog-tv.c |   97 -
+ drivers/gpu/drm/omapdrm/displays/connector-hdmi.c  |  183 -
+ drivers/gpu/drm/omapdrm/displays/encoder-opa362.c  |  137 -
+ .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c   |  217 --
+ drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c    |    6 +-
+ drivers/gpu/drm/omapdrm/dss/Makefile               |    2 +-
+ drivers/gpu/drm/omapdrm/dss/base.c                 |   55 +-
+ drivers/gpu/drm/omapdrm/dss/display.c              |    9 -
+ drivers/gpu/drm/omapdrm/dss/dpi.c                  |  349 +-
+ drivers/gpu/drm/omapdrm/dss/dsi.c                  |    4 +-
+ drivers/gpu/drm/omapdrm/dss/dss-of.c               |   28 -
+ drivers/gpu/drm/omapdrm/dss/dss.c                  |   46 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi.h                 |    4 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi4.c                |  313 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi4_core.c           |   59 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi4_core.h           |    4 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi5.c                |  295 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi5_core.c           |   48 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi5_core.h           |    5 +-
+ drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c    |    9 +-
+ drivers/gpu/drm/omapdrm/dss/omapdss.h              |   46 +-
+ drivers/gpu/drm/omapdrm/dss/output.c               |   53 +-
+ drivers/gpu/drm/omapdrm/dss/sdi.c                  |  178 +-
+ drivers/gpu/drm/omapdrm/dss/venc.c                 |  269 +-
+ drivers/gpu/drm/omapdrm/omap_connector.c           |  247 +-
+ drivers/gpu/drm/omapdrm/omap_connector.h           |    3 -
+ drivers/gpu/drm/omapdrm/omap_crtc.c                |    2 +-
+ drivers/gpu/drm/omapdrm/omap_dmm_tiler.c           |    4 +-
+ drivers/gpu/drm/omapdrm/omap_drv.c                 |   88 +-
+ drivers/gpu/drm/omapdrm/omap_encoder.c             |   83 +-
+ drivers/gpu/drm/omapdrm/omap_fbdev.c               |    6 +-
+ drivers/gpu/drm/panel/Kconfig                      |   44 +
+ drivers/gpu/drm/panel/Makefile                     |    5 +
+ drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c     |  854 +++++
+ drivers/gpu/drm/panel/panel-elida-kd35t133.c       |  352 ++
+ drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c  |  526 +++
+ drivers/gpu/drm/panel/panel-ilitek-ili9322.c       |   14 +-
+ drivers/gpu/drm/panel/panel-lg-lg4573.c            |    2 +-
+ drivers/gpu/drm/panel/panel-novatek-nt35510.c      | 1098 ++++++
+ drivers/gpu/drm/panel/panel-samsung-ld9040.c       |    6 +
+ .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c   |  293 ++
+ drivers/gpu/drm/panel/panel-simple.c               |  332 +-
+ drivers/gpu/drm/panel/panel-sony-acx424akp.c       |    4 +-
+ drivers/gpu/drm/panel/panel-tpo-td028ttec1.c       |   17 +-
+ drivers/gpu/drm/panfrost/panfrost_device.c         |  123 +-
+ drivers/gpu/drm/panfrost/panfrost_device.h         |   26 +-
+ drivers/gpu/drm/panfrost/panfrost_drv.c            |   30 +-
+ drivers/gpu/drm/panfrost/panfrost_gpu.c            |   18 +-
+ drivers/gpu/drm/panfrost/panfrost_job.c            |    2 +-
+ drivers/gpu/drm/panfrost/panfrost_mmu.c            |    6 +-
+ drivers/gpu/drm/pl111/pl111_versatile.c            |   73 +
+ drivers/gpu/drm/qxl/qxl_cmd.c                      |    2 +-
+ drivers/gpu/drm/qxl/qxl_display.c                  |   43 +-
+ drivers/gpu/drm/qxl/qxl_drv.c                      |   26 +-
+ drivers/gpu/drm/qxl/qxl_kms.c                      |    4 +-
+ drivers/gpu/drm/qxl/qxl_ttm.c                      |    6 -
+ drivers/gpu/drm/radeon/atombios_crtc.c             |    1 +
+ drivers/gpu/drm/radeon/radeon_device.c             |    2 +-
+ drivers/gpu/drm/radeon/radeon_display.c            |   25 +-
+ drivers/gpu/drm/radeon/radeon_dp_mst.c             |   27 -
+ drivers/gpu/drm/radeon/radeon_drv.c                |   18 -
+ drivers/gpu/drm/radeon/radeon_fb.c                 |   19 +-
+ drivers/gpu/drm/radeon/radeon_kms.c                |   29 +-
+ drivers/gpu/drm/radeon/radeon_legacy_crtc.c        |    3 +-
+ drivers/gpu/drm/radeon/radeon_mode.h               |    9 +-
+ drivers/gpu/drm/radeon/radeon_ttm.c                |    6 -
+ drivers/gpu/drm/radeon/si_dpm.c                    |    1 -
+ drivers/gpu/drm/rcar-du/rcar_du_encoder.c          |    2 +-
+ drivers/gpu/drm/rcar-du/rcar_lvds.c                |   22 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c      |    9 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_gem.c        |    1 +
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c        |    2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.h        |    2 +-
+ drivers/gpu/drm/rockchip/rockchip_lvds.c           |    2 +-
+ drivers/gpu/drm/rockchip/rockchip_rgb.c            |    5 +-
+ drivers/gpu/drm/scheduler/gpu_scheduler_trace.h    |   27 +
+ drivers/gpu/drm/scheduler/sched_entity.c           |   56 +-
+ drivers/gpu/drm/scheduler/sched_main.c             |   86 +-
+ drivers/gpu/drm/sti/sti_crtc.c                     |   11 +-
+ drivers/gpu/drm/sti/sti_crtc.h                     |    2 -
+ drivers/gpu/drm/sti/sti_drv.c                      |    4 -
+ drivers/gpu/drm/sti/sti_dvo.c                      |    2 +-
+ drivers/gpu/drm/sti/sti_hda.c                      |    2 +-
+ drivers/gpu/drm/sti/sti_hdmi.c                     |    2 +-
+ drivers/gpu/drm/stm/drv.c                          |    2 -
+ drivers/gpu/drm/stm/dw_mipi_dsi-stm.c              |    4 +-
+ drivers/gpu/drm/stm/ltdc.c                         |  103 +-
+ drivers/gpu/drm/stm/ltdc.h                         |    6 +-
+ drivers/gpu/drm/sun4i/sun4i_lvds.c                 |    2 +-
+ drivers/gpu/drm/sun4i/sun4i_rgb.c                  |    2 +-
+ drivers/gpu/drm/sun4i/sun4i_tcon.c                 |  104 +-
+ drivers/gpu/drm/sun4i/sun4i_tcon.h                 |   14 +
+ drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c             |  129 +-
+ drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h             |    2 +-
+ drivers/gpu/drm/tegra/dc.c                         |   20 +-
+ drivers/gpu/drm/tegra/fb.c                         |    8 +-
+ drivers/gpu/drm/tegra/hdmi.c                       |   34 +-
+ drivers/gpu/drm/tidss/Kconfig                      |   14 +
+ drivers/gpu/drm/tidss/Makefile                     |   12 +
+ drivers/gpu/drm/tidss/tidss_crtc.c                 |  432 +++
+ drivers/gpu/drm/tidss/tidss_crtc.h                 |   48 +
+ drivers/gpu/drm/tidss/tidss_dispc.c                | 2753 +++++++++++++++
+ drivers/gpu/drm/tidss/tidss_dispc.h                |  137 +
+ drivers/gpu/drm/tidss/tidss_dispc_regs.h           |  243 ++
+ drivers/gpu/drm/tidss/tidss_drv.c                  |  285 ++
+ drivers/gpu/drm/tidss/tidss_drv.h                  |   39 +
+ drivers/gpu/drm/tidss/tidss_encoder.c              |   88 +
+ drivers/gpu/drm/tidss/tidss_encoder.h              |   17 +
+ drivers/gpu/drm/tidss/tidss_irq.c                  |  146 +
+ drivers/gpu/drm/tidss/tidss_irq.h                  |   77 +
+ drivers/gpu/drm/tidss/tidss_kms.c                  |  299 ++
+ drivers/gpu/drm/tidss/tidss_kms.h                  |   15 +
+ drivers/gpu/drm/tidss/tidss_plane.c                |  217 ++
+ drivers/gpu/drm/tidss/tidss_plane.h                |   25 +
+ drivers/gpu/drm/tidss/tidss_scale_coefs.c          |  202 ++
+ drivers/gpu/drm/tidss/tidss_scale_coefs.h          |   22 +
+ drivers/gpu/drm/tilcdc/tilcdc_external.c           |    2 +-
+ drivers/gpu/drm/tiny/Kconfig                       |   22 +-
+ drivers/gpu/drm/tiny/Makefile                      |    1 +
+ drivers/gpu/drm/tiny/gm12u320.c                    |    9 -
+ drivers/gpu/drm/tiny/ili9225.c                     |    9 -
+ drivers/gpu/drm/tiny/ili9486.c                     |  286 ++
+ drivers/gpu/drm/tiny/repaper.c                     |   21 +-
+ drivers/gpu/drm/tiny/st7586.c                      |    9 -
+ drivers/gpu/drm/tiny/st7735r.c                     |   76 +-
+ drivers/gpu/drm/ttm/ttm_bo.c                       |  271 +-
+ drivers/gpu/drm/ttm/ttm_bo_util.c                  |    3 +-
+ drivers/gpu/drm/ttm/ttm_page_alloc_dma.c           |    2 +-
+ drivers/gpu/drm/udl/udl_connector.c                |    1 -
+ drivers/gpu/drm/udl/udl_modeset.c                  |   11 -
+ drivers/gpu/drm/v3d/v3d_drv.h                      |   41 +-
+ drivers/gpu/drm/vboxvideo/vbox_mode.c              |   13 +-
+ drivers/gpu/drm/vboxvideo/vboxvideo.h              |    2 +-
+ drivers/gpu/drm/vc4/vc4_crtc.c                     |   13 +-
+ drivers/gpu/drm/vc4/vc4_dpi.c                      |    2 +-
+ drivers/gpu/drm/vc4/vc4_drv.c                      |    3 -
+ drivers/gpu/drm/vc4/vc4_drv.h                      |   49 +-
+ drivers/gpu/drm/vc4/vc4_dsi.c                      |    2 +-
+ drivers/gpu/drm/vc4/vc4_plane.c                    |    2 +-
+ drivers/gpu/drm/virtio/virtgpu_debugfs.c           |    1 +
+ drivers/gpu/drm/virtio/virtgpu_display.c           |   12 +-
+ drivers/gpu/drm/virtio/virtgpu_drv.c               |    6 +-
+ drivers/gpu/drm/virtio/virtgpu_drv.h               |   36 +-
+ drivers/gpu/drm/virtio/virtgpu_gem.c               |    2 +
+ drivers/gpu/drm/virtio/virtgpu_ioctl.c             |   90 +-
+ drivers/gpu/drm/virtio/virtgpu_kms.c               |   41 +-
+ drivers/gpu/drm/virtio/virtgpu_object.c            |  109 +-
+ drivers/gpu/drm/virtio/virtgpu_plane.c             |    7 +-
+ drivers/gpu/drm/virtio/virtgpu_vq.c                |  369 +-
+ drivers/gpu/drm/vkms/vkms_crtc.c                   |    9 +-
+ drivers/gpu/drm/vkms/vkms_drv.c                    |    1 -
+ drivers/gpu/drm/vkms/vkms_drv.h                    |    4 -
+ drivers/gpu/drm/vkms/vkms_plane.c                  |    2 +-
+ drivers/gpu/drm/vmwgfx/Makefile                    |    2 +-
+ drivers/gpu/drm/vmwgfx/device_include/svga3d_cmd.h |  161 +-
+ .../gpu/drm/vmwgfx/device_include/svga3d_devcaps.h |  787 ++---
+ drivers/gpu/drm/vmwgfx/device_include/svga3d_dx.h  |  466 ++-
+ .../gpu/drm/vmwgfx/device_include/svga3d_limits.h  |   36 +-
+ .../drm/vmwgfx/device_include/svga3d_surfacedefs.h |   58 +-
+ .../gpu/drm/vmwgfx/device_include/svga3d_types.h   |  347 +-
+ drivers/gpu/drm/vmwgfx/device_include/svga_reg.h   |  382 ++-
+ drivers/gpu/drm/vmwgfx/device_include/svga_types.h |    1 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_binding.c            |  213 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_binding.h            |   33 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c             |    3 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_context.c            |   28 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c            |    6 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c                |   73 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h                |  172 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c            |  429 ++-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c               |    2 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c              |   18 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c                |  130 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c                |    3 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_mob.c                |    2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c            |   31 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c         |    2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c               |    3 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_so.c                 |   12 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_so.h                 |    7 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c               |   66 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_streamoutput.c       |  387 +++
+ drivers/gpu/drm/vmwgfx/vmwgfx_surface.c            |  610 ++--
+ drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c         |    6 -
+ drivers/gpu/drm/xen/xen_drm_front_kms.c            |   19 +
+ drivers/gpu/drm/zte/zx_plane.c                     |    4 +-
+ drivers/video/backlight/Kconfig                    |    8 +-
+ drivers/video/console/Kconfig                      |   76 +-
+ drivers/video/fbdev/Kconfig                        |    9 +-
+ drivers/video/fbdev/aty/mach64_gx.c                |    3 +-
+ drivers/video/fbdev/aty/radeon_base.c              |   26 +-
+ drivers/video/fbdev/cg14.c                         |    3 +-
+ drivers/video/fbdev/core/Makefile                  |    1 -
+ drivers/video/fbdev/core/fbcon.c                   |   27 +-
+ drivers/video/fbdev/core/fbmem.c                   |   38 +-
+ drivers/video/fbdev/hyperv_fb.c                    |    4 +-
+ drivers/video/fbdev/kyro/STG4000OverlayDevice.c    |    3 +-
+ drivers/video/fbdev/matrox/matroxfb_base.c         |   15 +
+ drivers/video/fbdev/mmp/hw/mmp_ctrl.h              |    2 +-
+ drivers/video/fbdev/nvidia/nvidia.c                |   41 +-
+ drivers/video/fbdev/omap2/omapfb/omapfb-main.c     |    4 -
+ drivers/video/fbdev/pxa168fb.c                     |    5 +-
+ drivers/video/fbdev/s1d13xxxfb.c                   |   16 +-
+ drivers/video/fbdev/sa1100fb.c                     |    2 +-
+ drivers/video/fbdev/sh_mobile_lcdcfb.c             |    4 +-
+ drivers/video/fbdev/ssd1307fb.c                    |    4 +-
+ drivers/video/fbdev/w100fb.c                       |   18 +-
+ drivers/video/fbdev/wm8505fb.c                     |    2 +-
+ drivers/video/hdmi.c                               |   11 +-
+ include/drm/bridge/dw_hdmi.h                       |    1 +
+ include/drm/bridge/mhl.h                           |    4 +-
+ include/drm/drm_atomic.h                           |   76 +
+ include/drm/drm_atomic_helper.h                    |    8 +
+ include/drm/drm_atomic_state_helper.h              |   13 +
+ include/drm/drm_bridge.h                           |  405 ++-
+ include/drm/drm_bridge_connector.h                 |   18 +
+ include/drm/drm_client.h                           |    7 +-
+ include/drm/drm_connector.h                        |   46 +-
+ include/drm/drm_crtc.h                             |   80 +-
+ include/drm/drm_device.h                           |    2 +-
+ include/drm/drm_dp_helper.h                        |   26 +-
+ include/drm/drm_dp_mst_helper.h                    |   17 +-
+ include/drm/drm_drv.h                              |  194 +-
+ include/drm/drm_edid.h                             |    5 +
+ include/drm/drm_encoder.h                          |    3 +-
+ include/drm/drm_fb_helper.h                        |   27 +-
+ include/drm/drm_file.h                             |    1 +
+ include/drm/drm_gem_vram_helper.h                  |    9 +
+ include/drm/drm_hdcp.h                             |    6 +-
+ include/drm/drm_legacy.h                           |    6 -
+ include/drm/drm_mipi_dbi.h                         |   12 +
+ include/drm/drm_mm.h                               |    2 +-
+ include/drm/drm_modes.h                            |   11 +-
+ include/drm/drm_modeset_helper_vtables.h           |   63 +-
+ include/drm/drm_panel.h                            |    3 +-
+ include/drm/drm_pci.h                              |   11 -
+ include/drm/drm_print.h                            |   78 +-
+ include/drm/drm_simple_kms_helper.h                |   11 +-
+ include/drm/drm_vblank.h                           |   36 +-
+ include/drm/gpu_scheduler.h                        |   13 +-
+ include/drm/i915_mei_hdcp_interface.h              |    1 -
+ include/drm/ttm/ttm_bo_api.h                       |   11 +-
+ include/drm/ttm/ttm_bo_driver.h                    |   15 -
+ include/linux/dma-buf.h                            |   97 +-
+ include/linux/hdmi.h                               |    2 +-
+ include/linux/platform_data/simplefb.h             |    2 +-
+ include/uapi/drm/amdgpu_drm.h                      |    5 +-
+ include/uapi/drm/drm.h                             |    2 +
+ include/uapi/drm/i915_drm.h                        |   21 +
+ include/uapi/drm/lima_drm.h                        |    9 +-
+ include/uapi/drm/vmwgfx_drm.h                      |   16 +-
+ include/video/mmp_disp.h                           |    2 +-
+ include/video/samsung_fimd.h                       |    2 +-
+ 1082 files changed, 57075 insertions(+), 27790 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/ps8640.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/toshiba,tc358768.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/ilitek,ili9486.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/msm/gmu.txt
+ create mode 100644 Documentation/devicetree/bindings/display/msm/gmu.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/panel/advantech,idk-1110wr.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/panel/advantech,idk-2121wr.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,b080uan01.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,b101aw03.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,b101ean01.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,b101xtn01.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,b116xw03.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,b133htn01.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,b133xtn01.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,g070vvn01.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,g101evn010.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,g104sn02.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,g133han01.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,g185han01.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,p320hvn03.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/auo,t215hvn01.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/avic,tm070ddh03.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/boe,hv070wsa-100.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/boe,nv101wxmn51.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/boe,tv080wum-nl0.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/boe,tv101wum-nl6.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/cdtech,s043wq26h-ct7.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/cdtech,s070wv95-ct16.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/chunghwa,claa070wp03xg.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/chunghwa,claa101wa01a.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/chunghwa,claa101wb03.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/dataimage,scf0700c48ggu18.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/display-timings.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/dlc,dlc1010gig.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/edt,et-series.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/elida,kd35t133.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/evervision,vgg804821.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/feixin,k101-im2ba02.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/foxlink,fl500wvr00-a0t.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/friendlyarm,hd702e.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/giantplus,gpg482739qs5.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/hannstar,hsd070pww1.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/hannstar,hsd100pxn1.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/hit,tx23d38vm0caa.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,at043tn24.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,at070tn92.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,g070y2-l01.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,g101ice-l01.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,g121i1-l01.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,g121x1-l03.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,n116bge.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,n156bge-l21.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,zj070na-01p.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/koe,tx14d24vm1bpa.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/koe,tx31d200vm0baa.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/kyo,tcg121xglp.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/lemaker,bl035-rgb-002.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/lg,lb070wv8.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/lg,lp079qx1-sp0v.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/lg,lp097qx1-spa1.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/lg,lp120up1.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/lg,lp129qe.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa070mc01.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/nec,nl12880b20-05.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/nec,nl4827hc19-05b.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/netron-dy,e231732.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/newhaven,nhd-4.3-480272ef-atxl.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/nlt,nl192108ac18-02d.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/novatek,nt35510.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/nvd,9128.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/okaya,rs800480t-7x0gp.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino-43-ts.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/ontat,yx700wv03.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/orisetech,otm8009a.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/orisetech,otm8009a.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/ortustech,com37h3m05dtc.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/ortustech,com37h3m99dtc.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/ortustech,com43h4m85ulc.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/osddisplays,osd070t1718-19ts.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/osddisplays,osd101t2045-53ts.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/panasonic,vvx10f004b00.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/panasonic,vvx10f034n00.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/panel-dpi.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/panel-dpi.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/panel/panel-simple-dsi.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/panel/panel-timing.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/qiaodian,qd43003c0-40.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/raydium,rm68200.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/raydium,rm68200.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/rocktech,rk070er9427.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/samsung,lsn122dl01-c01.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/samsung,ltn101nt05.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/samsung,ltn140at29-301.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,s6e88a0-ams452ef01.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/sharp,lq035q7db03.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/sharp,lq070y3dg3b.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/sharp,lq101k1ly04.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/sharp,lq123p1jx31.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/shelly,sca07010-bfn-lnn.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/starry,kr122ea0sra.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/tianma,tm070jdhg30.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/tianma,tm070rvhg71.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/toshiba,lt089ac29000.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/tpk,f07a-0102.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/tpk,f10a-0102.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/urt,umsh-8596md.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/vl050_8048nt_c01.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/panel/winstar,wf35ltiacd.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-drm.txt
+ create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-drm.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/sitronix,st7735r.txt
+ create mode 100644 Documentation/devicetree/bindings/display/sitronix,st7735r.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/ti/ti,j721e-dss.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/ti/ti,k2g-dss.yaml
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/mmsch_v2_0.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_scl_filters_old.c
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_gpint_cmd.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/wafl/wafl2_4_0_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/wafl/wafl2_4_0_0_smn.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/xgmi/xgmi_4_0_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/xgmi/xgmi_4_0_0_smn.h
+ create mode 100644 drivers/gpu/drm/bridge/display-connector.c
+ delete mode 100644 drivers/gpu/drm/bridge/dumb-vga-dac.c
+ create mode 100644 drivers/gpu/drm/bridge/parade-ps8640.c
+ create mode 100644 drivers/gpu/drm/bridge/simple-bridge.c
+ create mode 100644 drivers/gpu/drm/bridge/tc358768.c
+ create mode 100644 drivers/gpu/drm/bridge/ti-tpd12s015.c
+ create mode 100644 drivers/gpu/drm/drm_bridge_connector.c
+ rename drivers/gpu/drm/i915/{ => display}/intel_csr.c (94%)
+ rename drivers/gpu/drm/i915/{ => display}/intel_csr.h (100%)
+ create mode 100644 drivers/gpu/drm/i915/display/intel_de.h
+ create mode 100644 drivers/gpu/drm/i915/display/intel_display_debugfs.c
+ create mode 100644 drivers/gpu/drm/i915/display/intel_display_debugfs.h
+ create mode 100644 drivers/gpu/drm/i915/display/intel_global_state.c
+ create mode 100644 drivers/gpu/drm/i915/display/intel_global_state.h
+ create mode 100644 drivers/gpu/drm/i915/gt/gen7_renderclear.c
+ create mode 100644 drivers/gpu/drm/i915/gt/gen7_renderclear.h
+ create mode 100644 drivers/gpu/drm/i915/gt/hsw_clear_kernel.c
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_context_param.c
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_context_param.h
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_context_sseu.c
+ create mode 100644 drivers/gpu/drm/i915/gt/ivb_clear_kernel.c
+ create mode 100644 drivers/gpu/drm/i915/gt/selftest_ring_submission.c
+ create mode 100644 drivers/gpu/drm/i915/gt/sysfs_engines.c
+ create mode 100644 drivers/gpu/drm/i915/gt/sysfs_engines.h
+ create mode 100644 drivers/gpu/drm/i915/i915_debugfs_params.c
+ create mode 100644 drivers/gpu/drm/i915/i915_debugfs_params.h
+ create mode 100644 drivers/gpu/drm/i915/i915_ioc32.h
+ create mode 100644 drivers/gpu/drm/i915/intel_dram.c
+ create mode 100644 drivers/gpu/drm/i915/intel_dram.h
+ create mode 100644 drivers/gpu/drm/i915/vlv_suspend.c
+ create mode 100644 drivers/gpu/drm/i915/vlv_suspend.h
+ delete mode 100644 drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
+ delete mode 100644 drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
+ delete mode 100644 drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
+ delete mode 100644 drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
+ delete mode 100644 drivers/gpu/drm/omapdrm/dss/dss-of.c
+ create mode 100644 drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c
+ create mode 100644 drivers/gpu/drm/panel/panel-elida-kd35t133.c
+ create mode 100644 drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c
+ create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt35510.c
+ create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6e88a0-ams452ef01.c
+ create mode 100644 drivers/gpu/drm/tidss/Kconfig
+ create mode 100644 drivers/gpu/drm/tidss/Makefile
+ create mode 100644 drivers/gpu/drm/tidss/tidss_crtc.c
+ create mode 100644 drivers/gpu/drm/tidss/tidss_crtc.h
+ create mode 100644 drivers/gpu/drm/tidss/tidss_dispc.c
+ create mode 100644 drivers/gpu/drm/tidss/tidss_dispc.h
+ create mode 100644 drivers/gpu/drm/tidss/tidss_dispc_regs.h
+ create mode 100644 drivers/gpu/drm/tidss/tidss_drv.c
+ create mode 100644 drivers/gpu/drm/tidss/tidss_drv.h
+ create mode 100644 drivers/gpu/drm/tidss/tidss_encoder.c
+ create mode 100644 drivers/gpu/drm/tidss/tidss_encoder.h
+ create mode 100644 drivers/gpu/drm/tidss/tidss_irq.c
+ create mode 100644 drivers/gpu/drm/tidss/tidss_irq.h
+ create mode 100644 drivers/gpu/drm/tidss/tidss_kms.c
+ create mode 100644 drivers/gpu/drm/tidss/tidss_kms.h
+ create mode 100644 drivers/gpu/drm/tidss/tidss_plane.c
+ create mode 100644 drivers/gpu/drm/tidss/tidss_plane.h
+ create mode 100644 drivers/gpu/drm/tidss/tidss_scale_coefs.c
+ create mode 100644 drivers/gpu/drm/tidss/tidss_scale_coefs.h
+ create mode 100644 drivers/gpu/drm/tiny/ili9486.c
+ create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_streamoutput.c
+ create mode 100644 include/drm/drm_bridge_connector.h
+Merging amdgpu/drm-next (03eab26d6a9a drm/amdgpu/display: fix logic inversion in program_timing_sync())
+$ git merge amdgpu/drm-next
+Merge made by the 'recursive' strategy.
+ Documentation/gpu/amdgpu.rst                       |  88 +++++
+ drivers/gpu/drm/amd/amdgpu/Makefile                |   2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h                |  28 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c      |   2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             |   2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         | 149 +++++++-
+ 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     | 174 +++++++++
+ 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_gmc.c            |  35 ++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h            |   4 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c             |  66 +++-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.c            |   5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.h            |   5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c           |   3 +-
+ 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            |   6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c            |  24 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h            |   4 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h           |   6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h           |   5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_test.c           |   4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c            | 320 +++++++++-------
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h            |   8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c          |   4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c            |   3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c            |   6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c            |  75 ++--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h            |  27 ++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c           |  49 ++-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h           |  11 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             |   4 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h             |   3 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c        |   6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c           |  30 ++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h           |   1 +
+ drivers/gpu/drm/amd/amdgpu/cik.c                   |   8 -
+ drivers/gpu/drm/amd/amdgpu/cik_sdma.c              |   8 +-
+ drivers/gpu/drm/amd/amdgpu/dce_virtual.c           |  10 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c             |  56 ++-
+ drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c              |  24 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c              |  44 ++-
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c              |  30 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c              |  61 +--
+ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c             |   2 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.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             |  20 +-
+ drivers/gpu/drm/amd/amdgpu/nv.c                    |  17 +-
+ drivers/gpu/drm/amd/amdgpu/nvd.h                   |  49 +++
+ drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c             |   8 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c             |   8 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c             |  34 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c             | 124 +++---
+ drivers/gpu/drm/amd/amdgpu/si.c                    |   8 -
+ drivers/gpu/drm/amd/amdgpu/si_dma.c                |   7 +-
+ drivers/gpu/drm/amd/amdgpu/soc15.c                 |   3 +-
+ drivers/gpu/drm/amd/amdgpu/soc15d.h                |  26 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c              |   3 -
+ drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c              |   3 -
+ drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c              |   9 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c              |  15 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v4_0.c              |   4 -
+ drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c              |   3 -
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c              |  71 +++-
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c              |  83 +++-
+ drivers/gpu/drm/amd/amdgpu/vi.c                    |  24 --
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c           |  41 ++
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c            |  44 ++-
+ 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  |  48 ++-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c |  14 +-
+ .../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           |  37 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c      | 358 +++++++++---------
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c  |   1 +
+ drivers/gpu/drm/amd/display/dc/dc.h                |   5 +-
+ drivers/gpu/drm/amd/display/dc/dce/Makefile        |   2 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_abm.c       |   1 +
+ drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c      | 417 +++++++++++++++++++++
+ .../dc/{basics/log_helpers.c => dce/dmub_abm.h}    |  25 +-
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c  |   6 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c  |  18 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h  |   3 +
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c  |   3 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c  |   5 +-
+ .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c  |  81 ++--
+ drivers/gpu/drm/amd/display/dc/dml/dc_features.h   |   2 +-
+ .../drm/amd/display/dc/dml/display_mode_structs.h  |   7 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/abm.h        |   4 +
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h    |  11 +
+ .../gpu/drm/amd/display/include/logger_interface.h |   4 -
+ .../drm/amd/display/modules/freesync/freesync.c    |  34 +-
+ drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c    |   5 +-
+ drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h    |  28 +-
+ .../drm/amd/display/modules/hdcp/hdcp1_execution.c |   2 +-
+ .../drm/amd/display/modules/hdcp/hdcp2_execution.c |   2 +-
+ .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c    |  39 +-
+ drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h |   1 +
+ .../drm/amd/display/modules/power/power_helpers.c  |  21 +-
+ .../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/powerplay/amd_powerplay.c      |   3 +
+ drivers/gpu/drm/amd/powerplay/arcturus_ppt.c       |  15 +-
+ 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   | 135 ++++---
+ .../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/smumgr.h         |   7 +-
+ drivers/gpu/drm/amd/powerplay/navi10_ppt.c         |  18 +-
+ drivers/gpu/drm/amd/powerplay/smu_v11_0.c          |  24 +-
+ 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/amd/powerplay/vega20_ppt.c         |  14 +-
+ drivers/gpu/drm/radeon/Makefile                    |  35 +-
+ include/uapi/drm/amdgpu_drm.h                      |  15 +-
+ include/uapi/linux/kfd_ioctl.h                     |  19 +-
+ 165 files changed, 4058 insertions(+), 1774 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
+Merging drm-intel/for-linux-next (17d0c1062a0c Merge tag 'gvt-next-fixes-2020-03-31' of https://github.com/intel/gvt-linux into drm-intel-next-fixes)
+$ git merge drm-intel/for-linux-next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/gvt/cmd_parser.c | 16 ++++------------
+ drivers/gpu/drm/i915/gvt/display.c    |  6 +++---
+ drivers/gpu/drm/i915/gvt/handlers.c   |  8 ++++++--
+ drivers/gpu/drm/i915/gvt/scheduler.c  |  4 ++--
+ 4 files changed, 15 insertions(+), 19 deletions(-)
+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 (d8a26d8fc37c drm/mm: revert "Break long searches in fragmented address spaces")
+$ git merge drm-misc/for-linux-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/display/panel/panel-dpi.yaml | 10 ----------
+ .../devicetree/bindings/display/ti/ti,am65x-dss.yaml |  4 ++--
+ .../devicetree/bindings/display/ti/ti,j721e-dss.yaml |  4 ++--
+ .../devicetree/bindings/display/ti/ti,k2g-dss.yaml   |  4 ++--
+ drivers/dma-buf/Kconfig                              | 11 ++++++-----
+ drivers/gpu/drm/drm_mm.c                             |  8 +-------
+ drivers/gpu/drm/panel/panel-simple.c                 | 11 -----------
+ drivers/gpu/drm/vboxvideo/vbox_drv.c                 |  4 ++++
+ drivers/gpu/drm/vc4/vc4_hdmi.c                       | 20 ++++++++++++++++----
+ drivers/gpu/drm/xen/xen_drm_front.c                  |  2 +-
+ drivers/video/fbdev/core/fbcon.c                     |  3 +++
+ 11 files changed, 37 insertions(+), 44 deletions(-)
+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 (5c6cd7021a05 ALSA: usb-audio: Fix case when USB MIDI interface has more than one extra endpoint descriptor)
+$ git merge sound/for-next
+Already up to date.
+Merging sound-asoc/for-next (52ac54e1de31 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
+Merge made by the 'recursive' strategy.
+ kernel/module.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging input/next (c9c20ee3cfce Input: goodix - fix compilation when ACPI support is disabled)
+$ git merge input/next
+Auto-merging Documentation/devicetree/bindings/input/touchscreen/goodix.yaml
+Removing Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/input/touchscreen/edt-ft5x06.txt      |  77 ---
+ .../bindings/input/touchscreen/edt-ft5x06.yaml     | 125 +++++
+ .../bindings/input/touchscreen/goodix.yaml         |   2 +
+ drivers/input/touchscreen/elants_i2c.c             |   1 +
+ drivers/input/touchscreen/goodix.c                 | 608 +++++++++++++++++----
+ drivers/input/touchscreen/of_touchscreen.c         |  35 +-
+ 6 files changed, 639 insertions(+), 209 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.yaml
+Merging block/for-next (d9e92da49f29 Merge branch 'for-5.7/block' into for-next)
+$ git merge block/for-next
+Auto-merging include/linux/genhd.h
+CONFLICT (content): Merge conflict in include/linux/genhd.h
+Resolved 'include/linux/genhd.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master ce6be762882e] Merge remote-tracking branch 'block/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging device-mapper/for-next (81d5553d1288 dm clone metadata: Fix return type of dm_clone_nr_of_hydrated_regions())
+$ git merge device-mapper/for-next
+Merge made by the 'recursive' strategy.
+ drivers/md/dm-clone-metadata.c |  15 +-
+ drivers/md/dm-clone-metadata.h |   2 +-
+ drivers/md/dm-clone-target.c   |  66 ++++++---
+ drivers/md/dm-crypt.c          |   6 +-
+ drivers/md/dm-integrity.c      | 304 +++++++++++++++++++++++++++++++----------
+ drivers/md/dm-verity-fec.c     |   1 +
+ drivers/md/dm-writecache.c     | 138 +++++++++++++++++--
+ drivers/md/dm-zoned-metadata.c |   1 -
+ 8 files changed, 431 insertions(+), 102 deletions(-)
+Merging pcmcia/pcmcia-next (af741b0bad23 pcmcia: soc_common.h: Replace zero-length array with flexible-array member)
+$ git merge pcmcia/pcmcia-next
+Merge made by the 'recursive' strategy.
+ drivers/pcmcia/cs_internal.h    |  2 +-
+ drivers/pcmcia/omap_cf.c        |  2 +-
+ drivers/pcmcia/rsrc_nonstatic.c |  6 +++---
+ drivers/pcmcia/soc_common.h     |  2 +-
+ drivers/pcmcia/yenta_socket.c   | 10 +++++-----
+ 5 files changed, 11 insertions(+), 11 deletions(-)
+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 (1129d6145ed5 mfd: Add support for Azoteq IQS620A/621/622/624/625)
+$ git merge mfd/for-mfd-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/input/iqs62x-keys.yaml     |  132 +++
+ Documentation/devicetree/bindings/mfd/iqs62x.yaml  |  179 ++++
+ .../devicetree/bindings/pwm/iqs620a-pwm.yaml       |   32 +
+ drivers/mfd/Kconfig                                |   22 +-
+ drivers/mfd/Makefile                               |    1 +
+ drivers/mfd/cros_ec_dev.c                          |    2 +-
+ drivers/mfd/iqs62x.c                               | 1063 ++++++++++++++++++++
+ drivers/mfd/omap-usb-tll.c                         |    2 +-
+ drivers/mfd/qcom-pm8xxx.c                          |    2 +-
+ include/linux/mfd/iqs62x.h                         |  139 +++
+ 10 files changed, 1567 insertions(+), 7 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/iqs62x-keys.yaml
+ create mode 100644 Documentation/devicetree/bindings/mfd/iqs62x.yaml
+ create mode 100644 Documentation/devicetree/bindings/pwm/iqs620a-pwm.yaml
+ create mode 100644 drivers/mfd/iqs62x.c
+ create mode 100644 include/linux/mfd/iqs62x.h
+Merging backlight/for-backlight-next (ee0c8e494cc3 backlight: corgi: Convert to use GPIO descriptors)
+$ git merge backlight/for-backlight-next
+Merge made by the 'recursive' strategy.
+ arch/arm/mach-pxa/cm-x300.c               |  1 -
+ arch/arm/mach-pxa/colibri-pxa270-income.c |  1 -
+ arch/arm/mach-pxa/corgi.c                 | 12 +++++-
+ arch/arm/mach-pxa/ezx.c                   |  1 -
+ arch/arm/mach-pxa/hx4700.c                |  1 -
+ arch/arm/mach-pxa/lpd270.c                |  1 -
+ arch/arm/mach-pxa/magician.c              |  1 -
+ arch/arm/mach-pxa/mainstone.c             |  1 -
+ arch/arm/mach-pxa/mioa701.c               |  1 -
+ arch/arm/mach-pxa/palm27x.c               |  1 -
+ arch/arm/mach-pxa/palmtc.c                | 11 ++++-
+ arch/arm/mach-pxa/palmte2.c               |  1 -
+ arch/arm/mach-pxa/pcm990-baseboard.c      |  1 -
+ arch/arm/mach-pxa/spitz.c                 | 34 ++++++++++++----
+ arch/arm/mach-pxa/tavorevb.c              |  2 -
+ arch/arm/mach-pxa/viper.c                 |  1 -
+ arch/arm/mach-pxa/z2.c                    |  2 -
+ arch/arm/mach-pxa/zylonite.c              |  1 -
+ arch/arm/mach-s3c24xx/mach-h1940.c        |  1 -
+ arch/arm/mach-s3c24xx/mach-rx1950.c       |  1 -
+ arch/arm/mach-s3c64xx/dev-backlight.c     |  3 --
+ arch/arm/mach-s3c64xx/mach-crag6410.c     |  1 -
+ arch/arm/mach-s3c64xx/mach-hmt.c          |  1 -
+ arch/arm/mach-s3c64xx/mach-smartq.c       |  1 -
+ arch/arm/mach-s3c64xx/mach-smdk6410.c     |  2 +-
+ arch/unicore32/kernel/puv3-nb0916.c       |  1 -
+ drivers/video/backlight/corgi_lcd.c       | 68 ++++++++-----------------------
+ drivers/video/backlight/pwm_bl.c          | 19 ---------
+ include/linux/pwm_backlight.h             |  2 -
+ include/linux/spi/corgi_lcd.h             |  3 --
+ 30 files changed, 65 insertions(+), 112 deletions(-)
+Merging battery/for-next (f78c55e3b480 power: reset: sc27xx: Allow the SC27XX poweroff driver building into a module)
+$ git merge battery/for-next
+Merge made by the 'recursive' strategy.
+ drivers/power/reset/Kconfig              |   2 +-
+ drivers/power/reset/at91-reset.c         | 190 +++++++++++++++----------------
+ drivers/power/reset/sc27xx-poweroff.c    |  21 +++-
+ drivers/power/supply/Kconfig             |   2 +-
+ drivers/power/supply/ab8500_charger.c    |  35 +++---
+ drivers/power/supply/axp288_charger.c    |  57 +++++++++-
+ drivers/power/supply/axp288_fuel_gauge.c |   4 +-
+ drivers/power/supply/bq27xxx_battery.c   |   5 +-
+ drivers/power/supply/ingenic-battery.c   |   3 +-
+ drivers/power/supply/sc27xx_fuel_gauge.c |  12 ++
+ drivers/power/supply/twl4030_charger.c   |   4 +-
+ include/linux/power/charger-manager.h    |   2 +-
+ 12 files changed, 211 insertions(+), 126 deletions(-)
+$ git am -3 ../patches/0001-power-reset-sc27xx-use-remove_cpu-instead-of-cpu_dow.patch
+Applying: power: reset: sc27xx: use remove_cpu instead of cpu_down
+$ git reset HEAD^
+Unstaged changes after reset:
+M	drivers/power/reset/sc27xx-poweroff.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 4de51e4a5692] Merge remote-tracking branch 'battery/for-next'
+ Date: Thu Apr 2 11:24:58 2020 +1100
+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
+Auto-merging arch/x86/kernel/Makefile
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/s390/kernel/Makefile
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/powerpc/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/powerpc/Kconfig                         | 1 +
+ arch/s390/Kconfig                            | 1 +
+ arch/s390/kernel/Makefile                    | 2 +-
+ arch/x86/Kconfig                             | 1 +
+ arch/x86/kernel/Makefile                     | 4 +---
+ include/linux/ima.h                          | 3 +--
+ security/integrity/digsig.c                  | 2 --
+ security/integrity/digsig_asymmetric.c       | 2 --
+ security/integrity/evm/evm_crypto.c          | 2 --
+ security/integrity/evm/evm_main.c            | 2 --
+ security/integrity/evm/evm_secfs.c           | 2 --
+ security/integrity/ima/Kconfig               | 7 +++++++
+ security/integrity/ima/Makefile              | 6 +++---
+ security/integrity/ima/ima_asymmetric_keys.c | 2 --
+ security/integrity/ima/ima_crypto.c          | 2 --
+ security/integrity/ima/ima_fs.c              | 2 --
+ security/integrity/ima/ima_init.c            | 2 --
+ security/integrity/ima/ima_kexec.c           | 1 -
+ security/integrity/ima/ima_main.c            | 5 +++--
+ security/integrity/ima/ima_policy.c          | 2 --
+ security/integrity/ima/ima_queue.c           | 2 --
+ security/integrity/ima/ima_queue_keys.c      | 2 --
+ security/integrity/ima/ima_template.c        | 2 --
+ security/integrity/ima/ima_template_lib.c    | 2 --
+ security/integrity/integrity.h               | 6 ++++++
+ 25 files changed, 25 insertions(+), 40 deletions(-)
+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/keyctl.c
+Auto-merging security/keys/key.c
+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 c718472b8a8d] 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 8f6c0bb174c2] Merge remote-tracking branch 'keys/keys-next'
+ Date: Thu Apr 2 11:30:45 2020 +1100
+$ 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 2142327f7d19] Merge remote-tracking branch 'keys/keys-next'
+ Date: Thu Apr 2 11:30:45 2020 +1100
+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 (9efcc4a12936 afs: Fix unpinned address list during probing)
+$ git merge tomoyo/master
+Already up to date.
+Merging tpmdd/next (2e356101e72a KEYS: reaching the keys quotas correctly)
+$ git merge tpmdd/next
+Already up to date.
+Merging watchdog/master (2d63908bdbfb watchdog: Add K3 RTI watchdog support)
+$ git merge watchdog/master
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/watchdog/ti,rti-wdt.yaml   |  65 ++++++
+ drivers/watchdog/Kconfig                           |   8 +
+ drivers/watchdog/Makefile                          |   1 +
+ drivers/watchdog/imx2_wdt.c                        |  37 +--
+ drivers/watchdog/imx7ulp_wdt.c                     |   1 -
+ drivers/watchdog/imx_sc_wdt.c                      |   2 -
+ drivers/watchdog/npcm_wdt.c                        |  19 +-
+ drivers/watchdog/orion_wdt.c                       |   2 +-
+ drivers/watchdog/pm8916_wdt.c                      |  25 ++
+ drivers/watchdog/qcom-wdt.c                        |  34 ++-
+ drivers/watchdog/rti_wdt.c                         | 255 +++++++++++++++++++++
+ drivers/watchdog/watchdog_core.c                   |  12 +
+ drivers/watchdog/watchdog_dev.c                    |   1 +
+ drivers/watchdog/wm831x_wdt.c                      |  27 ---
+ drivers/watchdog/ziirave_wdt.c                     |   2 +-
+ include/linux/mfd/wm831x/pdata.h                   |   1 -
+ 16 files changed, 412 insertions(+), 80 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml
+ create mode 100644 drivers/watchdog/rti_wdt.c
+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
+Auto-merging include/linux/device.h
+Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS                              |   1 +
+ drivers/acpi/arm64/iort.c                |   6 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c |   2 +-
+ drivers/iommu/Kconfig                    |  21 +--
+ drivers/iommu/amd_iommu_types.h          |   2 +-
+ drivers/iommu/arm-smmu-v3.c              | 214 ++++++++++++++++++++++++++-----
+ drivers/iommu/arm-smmu.c                 |  55 ++++----
+ drivers/iommu/intel-iommu.c              |   3 +-
+ drivers/iommu/intel-svm.c                |   9 +-
+ drivers/iommu/iommu.c                    |  46 ++++---
+ drivers/iommu/ipmmu-vmsa.c               |   7 +-
+ drivers/iommu/mtk_iommu.c                |  13 +-
+ drivers/iommu/mtk_iommu_v1.c             |  14 +-
+ drivers/iommu/omap-iommu.c               |  10 +-
+ drivers/iommu/omap-iopgtable.h           |   3 +-
+ drivers/iommu/qcom_iommu.c               |  63 +++++----
+ drivers/iommu/tegra-gart.c               |   2 +-
+ drivers/iommu/virtio-iommu.c             |  42 +++---
+ drivers/pci/ats.c                        |   4 +
+ include/linux/device.h                   |   9 +-
+ include/linux/iommu.h                    |  35 +++--
+ include/uapi/linux/virtio_iommu.h        |  12 +-
+ 22 files changed, 386 insertions(+), 187 deletions(-)
+Merging vfio/next (f44efca0493d vfio: Ignore -ENODEV when getting MSI cookie)
+$ git merge vfio/next
+Merge made by the 'recursive' strategy.
+ drivers/vfio/pci/vfio_pci.c           | 390 +++++++++++++++++++++++++++++++---
+ drivers/vfio/pci/vfio_pci_nvlink2.c   |  10 +-
+ drivers/vfio/pci/vfio_pci_private.h   |  10 +
+ drivers/vfio/platform/vfio_platform.c |   2 +-
+ drivers/vfio/vfio.c                   | 198 ++++++++++++++++-
+ drivers/vfio/vfio_iommu_type1.c       |  78 ++++++-
+ include/linux/vfio.h                  |  17 ++
+ include/uapi/linux/vfio.h             |  37 ++++
+ 8 files changed, 710 insertions(+), 32 deletions(-)
+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
+Removing scripts/dtc/libfdt/Makefile.libfdt
+Removing scripts/dtc/Makefile.dtc
+Auto-merging drivers/of/property.c
+Auto-merging arch/powerpc/kernel/pci-common.c
+Auto-merging arch/arm/boot/dts/sunxi-h3-h5.dtsi
+Auto-merging arch/arm/boot/dts/sun8i-r40.dtsi
+Auto-merging arch/arm/boot/dts/sun5i.dtsi
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/watchdog/st,stpmic1-wdt.txt
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging Documentation/devicetree/bindings/usb/generic.txt
+CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/usb/generic.txt
+Auto-merging Documentation/devicetree/bindings/usb/dwc2.yaml
+Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml
+CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/trivial-devices.yaml
+Removing Documentation/devicetree/bindings/thermal/rcar-thermal.txt
+Auto-merging Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
+Removing Documentation/devicetree/bindings/spi/qcom,spi-qcom-qspi.txt
+Removing Documentation/devicetree/bindings/serial/uniphier-uart.txt
+Removing Documentation/devicetree/bindings/serial/slave-device.txt
+Removing Documentation/devicetree/bindings/serial/serial.txt
+Removing Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
+Auto-merging Documentation/devicetree/bindings/serial/fsl-imx-uart.txt
+Removing Documentation/devicetree/bindings/rng/brcm,bcm2835.txt
+Removing Documentation/devicetree/bindings/reset/renesas,rst.txt
+Removing Documentation/devicetree/bindings/regulator/st,stpmic1-regulator.txt
+Removing Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt
+Removing Documentation/devicetree/bindings/power/renesas,apmu.txt
+Removing Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.txt
+Removing Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.txt
+Removing Documentation/devicetree/bindings/phy/phy-mmp3-usb.txt
+Removing Documentation/devicetree/bindings/net/can/m_can.txt
+Removing Documentation/devicetree/bindings/net/can/can-transceiver.txt
+Removing Documentation/devicetree/bindings/mtd/denali-nand.txt
+Removing Documentation/devicetree/bindings/mmc/uniphier-sd.txt
+Removing Documentation/devicetree/bindings/mmc/sdhci-cadence.txt
+Removing Documentation/devicetree/bindings/mfd/st,stpmic1.txt
+Removing Documentation/devicetree/bindings/media/renesas,vin.txt
+Removing Documentation/devicetree/bindings/interrupt-controller/socionext,uniphier-aidet.txt
+Removing Documentation/devicetree/bindings/input/st,stpmic1-onkey.txt
+Auto-merging Documentation/devicetree/bindings/iio/proximity/devantech-srf04.yaml
+Removing Documentation/devicetree/bindings/i2c/i2c-uniphier.txt
+Removing Documentation/devicetree/bindings/i2c/i2c-uniphier-f.txt
+Removing Documentation/devicetree/bindings/i2c/i2c-rk3x.txt
+Removing Documentation/devicetree/bindings/gpio/gpio-uniphier.txt
+Removing Documentation/devicetree/bindings/dma/uniphier-mio-dmac.txt
+Removing Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt
+Removing Documentation/devicetree/bindings/connector/usb-connector.txt
+Removing Documentation/devicetree/bindings/clock/uniphier-clock.txt
+Auto-merging Documentation/devicetree/bindings/clock/qcom,rpmhcc.yaml
+Auto-merging Documentation/devicetree/bindings/clock/imx8mn-clock.yaml
+Removing Documentation/devicetree/bindings/bus/uniphier-system-bus.txt
+Removing Documentation/devicetree/bindings/ata/sata_rcar.txt
+Removing Documentation/devicetree/bindings/arm/socionext/uniphier.txt
+Removing Documentation/devicetree/bindings/arm/socionext/cache-uniphier.txt
+Auto-merging Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
+Auto-merging Documentation/devicetree/bindings/arm/cpus.yaml
+Resolved 'Documentation/devicetree/bindings/trivial-devices.yaml' using previous resolution.
+Resolved 'Documentation/devicetree/bindings/usb/generic.txt' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 57f1208cc321] Merge remote-tracking branch 'devicetree/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/arm/altera/socfpga-clk-manager.yaml   |   2 +
+ .../arm/amlogic/amlogic,meson-gx-ao-secure.yaml    |   2 +
+ Documentation/devicetree/bindings/arm/cpus.yaml    |  11 +
+ .../devicetree/bindings/arm/freescale/fsl,scu.txt  |   2 +-
+ Documentation/devicetree/bindings/arm/l2c2x0.yaml  |  45 +-
+ .../devicetree/bindings/arm/mrvl/mrvl.yaml         |   5 +-
+ .../devicetree/bindings/arm/msm/qcom,llcc.yaml     |   2 +
+ Documentation/devicetree/bindings/arm/pmu.yaml     |  41 +-
+ Documentation/devicetree/bindings/arm/psci.yaml    |   5 +
+ .../devicetree/bindings/arm/renesas,prr.yaml       |   2 +
+ .../bindings/arm/samsung/exynos-chipid.yaml        |   2 +
+ .../devicetree/bindings/arm/samsung/pmu.yaml       |   2 +
+ .../arm/samsung/samsung-secure-firmware.yaml       |   2 +
+ .../bindings/arm/socionext/cache-uniphier.txt      |  60 --
+ .../socionext/socionext,uniphier-system-cache.yaml | 102 ++++
+ .../devicetree/bindings/arm/socionext/uniphier.txt |  47 --
+ .../bindings/arm/socionext/uniphier.yaml           |  61 ++
+ .../bindings/arm/stm32/st,stm32-syscon.yaml        |   2 +
+ .../devicetree/bindings/ata/renesas,rcar-sata.yaml |  71 +++
+ .../devicetree/bindings/ata/sata_rcar.txt          |  36 --
+ .../bus/socionext,uniphier-system-bus.yaml         |  96 +++
+ .../bindings/bus/uniphier-system-bus.txt           |  66 --
+ .../bindings/chrome/google,cros-ec-typec.yaml      |  54 ++
+ .../devicetree/bindings/clock/clock-bindings.txt   |   2 +-
+ .../devicetree/bindings/clock/fsl,plldig.yaml      |   5 +
+ .../devicetree/bindings/clock/imx8mn-clock.yaml    |   2 +
+ .../devicetree/bindings/clock/imx8mp-clock.yaml    |   2 +
+ .../devicetree/bindings/clock/milbeaut-clock.yaml  |   2 +
+ .../bindings/clock/qcom,gcc-apq8064.yaml           |   2 +
+ .../bindings/clock/qcom,gcc-ipq8074.yaml           |   2 +
+ .../bindings/clock/qcom,gcc-msm8996.yaml           |   2 +
+ .../bindings/clock/qcom,gcc-msm8998.yaml           |   2 +
+ .../devicetree/bindings/clock/qcom,gcc-qcs404.yaml |   2 +
+ .../devicetree/bindings/clock/qcom,gcc-sc7180.yaml |   2 +
+ .../devicetree/bindings/clock/qcom,gcc-sm8150.yaml |   2 +
+ .../devicetree/bindings/clock/qcom,gcc.yaml        |   2 +
+ .../devicetree/bindings/clock/qcom,mmcc.yaml       |   2 +
+ .../bindings/clock/qcom,msm8998-gpucc.yaml         |   2 +
+ .../devicetree/bindings/clock/qcom,rpmhcc.yaml     |   2 +
+ .../bindings/clock/qcom,sc7180-dispcc.yaml         |   2 +
+ .../bindings/clock/qcom,sc7180-gpucc.yaml          |   2 +
+ .../bindings/clock/qcom,sc7180-videocc.yaml        |   2 +
+ .../bindings/clock/qcom,sdm845-dispcc.yaml         |   2 +
+ .../bindings/clock/qcom,sdm845-gpucc.yaml          |   2 +
+ .../bindings/clock/qcom,sdm845-videocc.yaml        |   2 +
+ .../bindings/clock/socionext,uniphier-clock.yaml   |  94 +++
+ .../devicetree/bindings/clock/uniphier-clock.txt   | 132 ----
+ .../connector/samsung,usb-connector-11pin.txt      |   2 +-
+ .../bindings/connector/usb-connector.txt           | 135 -----
+ .../bindings/connector/usb-connector.yaml          | 206 +++++++
+ .../bindings/display/amlogic,meson-vpu.yaml        |   8 +-
+ .../bindings/display/etnaviv/etnaviv-drm.txt       |  36 --
+ .../bindings/dma/sifive,fu540-c000-pdma.yaml       |   2 +
+ .../bindings/dma/socionext,uniphier-mio-dmac.yaml  |  63 ++
+ .../devicetree/bindings/dma/uniphier-mio-dmac.txt  |  25 -
+ Documentation/devicetree/bindings/dsp/fsl,dsp.yaml |   2 +
+ Documentation/devicetree/bindings/eeprom/at24.yaml |   2 +
+ .../devicetree/bindings/example-schema.yaml        |   4 +-
+ .../intel,ixp4xx-network-processing-engine.yaml    |   3 +
+ Documentation/devicetree/bindings/gnss/gnss.txt    |   2 +-
+ .../bindings/gpio/brcm,xgs-iproc-gpio.yaml         |   2 +
+ .../devicetree/bindings/gpio/gpio-mvebu.txt        |   2 +-
+ .../devicetree/bindings/gpio/gpio-uniphier.txt     |  51 --
+ .../bindings/gpio/socionext,uniphier-gpio.yaml     |  94 +++
+ .../bindings/gpio/xylon,logicvc-gpio.yaml          |   2 +
+ .../devicetree/bindings/gpu/arm,mali-bifrost.yaml  |   8 +-
+ .../devicetree/bindings/gpu/arm,mali-midgard.yaml  |   5 +
+ .../devicetree/bindings/gpu/arm,mali-utgard.yaml   |   2 +
+ .../devicetree/bindings/gpu/samsung-rotator.yaml   |   2 +
+ .../devicetree/bindings/gpu/vivante,gc.yaml        |  69 +++
+ .../devicetree/bindings/hwmon/adi,adm1177.yaml     |   2 +
+ .../devicetree/bindings/hwmon/adi,ltc2947.yaml     |   2 +
+ .../bindings/hwmon/pmbus/ti,ucd90320.yaml          |   2 +
+ .../devicetree/bindings/hwmon/ti,tmp513.yaml       |   2 +
+ Documentation/devicetree/bindings/i2c/i2c-rk3x.txt |  68 ---
+ .../devicetree/bindings/i2c/i2c-rk3x.yaml          | 136 +++++
+ .../devicetree/bindings/i2c/i2c-uniphier-f.txt     |  25 -
+ .../devicetree/bindings/i2c/i2c-uniphier.txt       |  25 -
+ .../bindings/i2c/socionext,uniphier-fi2c.yaml      |  50 ++
+ .../bindings/i2c/socionext,uniphier-i2c.yaml       |  50 ++
+ .../devicetree/bindings/iio/accel/adi,adxl345.yaml |  10 +-
+ .../bindings/iio/accel/bosch,bma400.yaml           |   2 +
+ .../devicetree/bindings/iio/adc/adi,ad7192.yaml    |   1 -
+ .../devicetree/bindings/iio/adc/adi,ad7780.yaml    |   2 +
+ .../devicetree/bindings/iio/adc/avia-hx711.yaml    |   2 +
+ .../devicetree/bindings/iio/adc/lltc,ltc2496.yaml  |   2 +
+ .../bindings/iio/adc/microchip,mcp3911.yaml        |   2 +
+ .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml       |   2 +
+ .../bindings/iio/chemical/plantower,pms7003.yaml   |   2 +
+ .../bindings/iio/chemical/sensirion,sps30.yaml     |   2 +
+ .../devicetree/bindings/iio/dac/lltc,ltc1660.yaml  |   2 +
+ .../devicetree/bindings/iio/light/adux1020.yaml    |   2 +
+ .../devicetree/bindings/iio/light/bh1750.yaml      |   2 +
+ .../devicetree/bindings/iio/light/isl29018.yaml    |   2 +
+ .../devicetree/bindings/iio/light/noa1305.yaml     |   2 +
+ .../devicetree/bindings/iio/light/stk33xx.yaml     |   2 +
+ .../devicetree/bindings/iio/light/tsl2583.yaml     |   2 +
+ .../devicetree/bindings/iio/light/tsl2772.yaml     |   2 +
+ .../devicetree/bindings/iio/light/veml6030.yaml    |   2 +
+ .../bindings/iio/pressure/asc,dlhl60d.yaml         |   2 +
+ .../devicetree/bindings/iio/pressure/bmp085.yaml   |   5 +
+ .../bindings/iio/proximity/devantech-srf04.yaml    |   2 +
+ .../bindings/iio/proximity/parallax-ping.yaml      |   2 +
+ .../bindings/iio/temperature/adi,ltc2983.yaml      |  40 +-
+ .../devicetree/bindings/input/gpio-vibrator.yaml   |   2 +
+ .../devicetree/bindings/input/max77650-onkey.yaml  |   3 +
+ .../devicetree/bindings/input/st,stpmic1-onkey.txt |  28 -
+ .../intel,ixp4xx-interrupt.yaml                    |   2 +
+ .../bindings/interrupt-controller/msi.txt          |   2 +-
+ .../socionext,uniphier-aidet.txt                   |  32 -
+ .../socionext,uniphier-aidet.yaml                  |  61 ++
+ .../devicetree/bindings/iommu/samsung,sysmmu.yaml  |   2 +
+ Documentation/devicetree/bindings/leds/common.yaml |   4 +-
+ .../devicetree/bindings/leds/leds-max77650.yaml    |   3 +
+ .../bindings/leds/rohm,bd71828-leds.yaml           |   3 +
+ .../bindings/mailbox/amlogic,meson-gxbb-mhu.yaml   |   2 +
+ .../devicetree/bindings/media/amlogic,gx-vdec.yaml |   2 +
+ .../bindings/media/amlogic,meson-gx-ao-cec.yaml    |  11 +-
+ .../devicetree/bindings/media/renesas,ceu.yaml     |   2 +
+ .../devicetree/bindings/media/renesas,vin.txt      | 217 -------
+ .../devicetree/bindings/media/renesas,vin.yaml     | 402 +++++++++++++
+ .../devicetree/bindings/mfd/max77650.yaml          |   2 +
+ .../devicetree/bindings/mfd/rohm,bd71828-pmic.yaml |   5 +
+ .../devicetree/bindings/mfd/st,stpmic1.txt         |  61 --
+ .../devicetree/bindings/mfd/st,stpmic1.yaml        | 339 +++++++++++
+ .../misc/intel,ixp4xx-ahb-queue-manager.yaml       |   2 +
+ .../devicetree/bindings/mmc/cdns,sdhci.yaml        | 143 +++++
+ .../devicetree/bindings/mmc/sdhci-cadence.txt      |  80 ---
+ .../bindings/mmc/socionext,uniphier-sd.yaml        |  99 +++
+ .../devicetree/bindings/mmc/uniphier-sd.txt        |  55 --
+ .../devicetree/bindings/mtd/denali,nand.yaml       | 148 +++++
+ .../devicetree/bindings/mtd/denali-nand.txt        |  61 --
+ .../devicetree/bindings/net/broadcom-bluetooth.txt |   2 +-
+ .../devicetree/bindings/net/can/bosch,m_can.yaml   | 144 +++++
+ .../bindings/net/can/can-transceiver.txt           |  24 -
+ .../bindings/net/can/can-transceiver.yaml          |  18 +
+ .../devicetree/bindings/net/can/m_can.txt          |  75 ---
+ .../devicetree/bindings/net/can/tcan4x5x.txt       |   2 +-
+ .../devicetree/bindings/net/mediatek-bluetooth.txt |   2 +-
+ .../devicetree/bindings/net/qca,qca7000.txt        |   2 +-
+ .../devicetree/bindings/net/ti,cpsw-switch.yaml    |  25 +-
+ .../devicetree/bindings/net/ti-bluetooth.txt       |   3 +-
+ .../bindings/phy/allwinner,sun50i-h6-usb3-phy.yaml |   2 +
+ .../phy/amlogic,meson-g12a-usb3-pcie-phy.yaml      |   2 +
+ .../bindings/phy/intel,lgm-emmc-phy.yaml           |   2 +
+ .../bindings/phy/marvell,mmp3-hsic-phy.yaml        |   2 +
+ .../bindings/phy/marvell,mmp3-usb-phy.yaml         |  42 ++
+ .../devicetree/bindings/phy/phy-mmp3-usb.txt       |  13 -
+ .../bindings/phy/phy-rockchip-inno-usb2.txt        |  81 ---
+ .../bindings/phy/phy-rockchip-inno-usb2.yaml       | 155 +++++
+ .../devicetree/bindings/phy/ti,phy-j721e-wiz.yaml  |   2 +
+ .../bindings/pinctrl/aspeed,ast2400-pinctrl.yaml   |   2 +
+ .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml   |   2 +
+ .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml   |   2 +
+ .../pinctrl/socionext,uniphier-pinctrl.txt         |  27 -
+ .../pinctrl/socionext,uniphier-pinctrl.yaml        |  42 ++
+ .../bindings/pinctrl/st,stm32-pinctrl.yaml         |   2 +
+ .../bindings/power/amlogic,meson-ee-pwrc.yaml      |   2 +
+ .../devicetree/bindings/power/power-domain.yaml    |  28 +-
+ .../devicetree/bindings/power/renesas,apmu.txt     |  35 --
+ .../devicetree/bindings/power/renesas,apmu.yaml    |  55 ++
+ .../bindings/power/renesas,rcar-sysc.txt           |  62 --
+ .../bindings/power/renesas,rcar-sysc.yaml          |  73 +++
+ .../bindings/power/reset/syscon-poweroff.yaml      |   2 +
+ .../bindings/power/reset/syscon-reboot.yaml        |   2 +
+ .../bindings/power/supply/max77650-charger.yaml    |   3 +
+ .../devicetree/bindings/ptp/ptp-idtcm.yaml         |   2 +
+ .../devicetree/bindings/pwm/pwm-mediatek.txt       |   5 +
+ .../devicetree/bindings/pwm/renesas,tpu-pwm.yaml   |   4 +
+ .../bindings/regulator/max77650-regulator.yaml     |   5 +-
+ .../bindings/regulator/st,stpmic1-regulator.txt    |  64 --
+ .../bindings/reset/amlogic,meson-reset.yaml        |   2 +
+ .../reset/brcm,bcm7216-pcie-sata-rescal.yaml       |   2 +
+ .../devicetree/bindings/reset/renesas,rst.txt      |  48 --
+ .../devicetree/bindings/reset/renesas,rst.yaml     |  63 ++
+ .../devicetree/bindings/rng/amlogic,meson-rng.yaml |   2 +
+ .../devicetree/bindings/rng/brcm,bcm2835.txt       |  40 --
+ .../devicetree/bindings/rng/brcm,bcm2835.yaml      |  61 ++
+ .../devicetree/bindings/rtc/renesas,sh-rtc.yaml    |   2 +
+ .../devicetree/bindings/rtc/st,stm32-rtc.yaml      |   2 +
+ .../bindings/serial/amlogic,meson-uart.yaml        |   2 +
+ .../devicetree/bindings/serial/fsl-imx-uart.txt    |   2 +-
+ .../devicetree/bindings/serial/renesas,hscif.yaml  | 135 +++++
+ .../bindings/serial/renesas,sci-serial.txt         | 150 -----
+ .../devicetree/bindings/serial/renesas,sci.yaml    |  69 +++
+ .../devicetree/bindings/serial/renesas,scif.yaml   | 172 ++++++
+ .../devicetree/bindings/serial/renesas,scifa.yaml  | 107 ++++
+ .../devicetree/bindings/serial/renesas,scifb.yaml  |  98 +++
+ .../devicetree/bindings/serial/serial.txt          |  56 --
+ .../devicetree/bindings/serial/serial.yaml         | 131 ++++
+ .../devicetree/bindings/serial/slave-device.txt    |  45 --
+ .../bindings/serial/snps-dw-apb-uart.yaml          |   1 +
+ .../bindings/serial/socionext,uniphier-uart.yaml   |  46 ++
+ .../devicetree/bindings/serial/uniphier-uart.txt   |  22 -
+ .../bindings/soc/amlogic/amlogic,canvas.yaml       |   2 +
+ .../devicetree/bindings/soc/imx/fsl,aips-bus.yaml  |  47 ++
+ .../devicetree/bindings/sound/adi,adau7118.yaml    |   2 +
+ .../devicetree/bindings/sound/qcom,wcd934x.yaml    |   2 +
+ .../devicetree/bindings/sound/renesas,fsi.yaml     |   2 +
+ .../devicetree/bindings/sound/samsung,odroid.yaml  |   2 +
+ .../devicetree/bindings/sound/samsung-i2s.yaml     |   2 +
+ .../devicetree/bindings/spi/qcom,spi-qcom-qspi.txt |  36 --
+ .../bindings/spi/qcom,spi-qcom-qspi.yaml           |  88 +++
+ .../devicetree/bindings/sram/qcom,ocmem.yaml       |  14 +-
+ .../bindings/thermal/amlogic,thermal.yaml          |   4 +
+ .../devicetree/bindings/thermal/armada-thermal.txt |   2 +-
+ .../devicetree/bindings/thermal/qcom-tsens.yaml    |  37 +-
+ .../devicetree/bindings/thermal/rcar-thermal.txt   |  78 ---
+ .../devicetree/bindings/thermal/rcar-thermal.yaml  | 139 +++++
+ .../devicetree/bindings/timer/arm,arch_timer.yaml  |   2 +
+ .../bindings/timer/arm,arch_timer_mmio.yaml        |   4 +
+ .../bindings/timer/arm,global_timer.yaml           |   2 +
+ .../bindings/timer/intel,ixp4xx-timer.yaml         |   2 +
+ .../bindings/timer/samsung,exynos4210-mct.yaml     |   2 +
+ .../devicetree/bindings/trivial-devices.yaml       |   6 +-
+ Documentation/devicetree/bindings/usb/dwc2.yaml    |  19 +-
+ .../devicetree/bindings/usb/exynos-usb.txt         |   9 +-
+ .../devicetree/bindings/usb/fcs,fusb302.txt        |   2 +-
+ Documentation/devicetree/bindings/usb/generic.txt  |   2 +-
+ .../devicetree/bindings/usb/mediatek,mtu3.txt      |   2 +-
+ .../devicetree/bindings/usb/mediatek,musb.txt      |   2 +-
+ .../devicetree/bindings/usb/richtek,rt1711h.txt    |   2 +-
+ .../devicetree/bindings/usb/ti,hd3ss3220.txt       |   2 +-
+ .../devicetree/bindings/usb/typec-tcpci.txt        |   2 +-
+ .../devicetree/bindings/usb/usb-conn-gpio.txt      |   4 +-
+ .../devicetree/bindings/vendor-prefixes.yaml       |  27 +
+ .../bindings/watchdog/st,stpmic1-wdt.txt           |  11 -
+ MAINTAINERS                                        |  18 +-
+ arch/arm/boot/dts/sun5i.dtsi                       |   2 +
+ arch/arm/boot/dts/sun8i-r40.dtsi                   |   2 +
+ arch/arm/boot/dts/sunxi-h3-h5.dtsi                 |   2 +
+ arch/microblaze/pci/pci-common.c                   |   7 +-
+ arch/powerpc/kernel/pci-common.c                   |   2 +-
+ drivers/of/address.c                               | 273 +++++----
+ drivers/of/of_private.h                            |   2 +-
+ drivers/of/of_reserved_mem.c                       |   2 +-
+ drivers/of/property.c                              |   4 +
+ drivers/of/resolver.c                              |   5 +-
+ drivers/of/unittest-data/Makefile                  |   8 +-
+ drivers/of/unittest-data/overlay_gpio_01.dts       |  23 +
+ drivers/of/unittest-data/overlay_gpio_02a.dts      |  16 +
+ drivers/of/unittest-data/overlay_gpio_02b.dts      |  16 +
+ drivers/of/unittest-data/overlay_gpio_03.dts       |  23 +
+ drivers/of/unittest-data/overlay_gpio_04a.dts      |  16 +
+ drivers/of/unittest-data/overlay_gpio_04b.dts      |  16 +
+ drivers/of/unittest.c                              | 669 +++++++++++++++++++--
+ include/linux/of_address.h                         |  13 +-
+ scripts/dtc/Makefile.dtc                           |  23 -
+ scripts/dtc/checks.c                               |  25 +-
+ scripts/dtc/libfdt/Makefile.libfdt                 |  18 -
+ scripts/dtc/libfdt/fdt.c                           |  99 +--
+ scripts/dtc/libfdt/fdt_ro.c                        | 143 ++---
+ scripts/dtc/libfdt/fdt_rw.c                        |  42 +-
+ scripts/dtc/libfdt/fdt_sw.c                        |  19 +-
+ scripts/dtc/libfdt/libfdt.h                        |   9 +-
+ scripts/dtc/libfdt/libfdt_internal.h               | 122 ++++
+ scripts/dtc/update-dtc-source.sh                   |   4 +-
+ scripts/dtc/version_gen.h                          |   2 +-
+ 258 files changed, 5749 insertions(+), 2659 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/arm/socionext/cache-uniphier.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/socionext/socionext,uniphier-system-cache.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/socionext/uniphier.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
+ create mode 100644 Documentation/devicetree/bindings/ata/renesas,rcar-sata.yaml
+ delete mode 100644 Documentation/devicetree/bindings/ata/sata_rcar.txt
+ create mode 100644 Documentation/devicetree/bindings/bus/socionext,uniphier-system-bus.yaml
+ delete mode 100644 Documentation/devicetree/bindings/bus/uniphier-system-bus.txt
+ create mode 100644 Documentation/devicetree/bindings/chrome/google,cros-ec-typec.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/socionext,uniphier-clock.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/uniphier-clock.txt
+ delete mode 100644 Documentation/devicetree/bindings/connector/usb-connector.txt
+ create mode 100644 Documentation/devicetree/bindings/connector/usb-connector.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt
+ create mode 100644 Documentation/devicetree/bindings/dma/socionext,uniphier-mio-dmac.yaml
+ delete mode 100644 Documentation/devicetree/bindings/dma/uniphier-mio-dmac.txt
+ delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-uniphier.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/socionext,uniphier-gpio.yaml
+ create mode 100644 Documentation/devicetree/bindings/gpu/vivante,gc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-rk3x.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml
+ delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-uniphier-f.txt
+ delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-uniphier.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/socionext,uniphier-fi2c.yaml
+ create mode 100644 Documentation/devicetree/bindings/i2c/socionext,uniphier-i2c.yaml
+ delete mode 100644 Documentation/devicetree/bindings/input/st,stpmic1-onkey.txt
+ delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/socionext,uniphier-aidet.txt
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/socionext,uniphier-aidet.yaml
+ delete mode 100644 Documentation/devicetree/bindings/media/renesas,vin.txt
+ create mode 100644 Documentation/devicetree/bindings/media/renesas,vin.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mfd/st,stpmic1.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/st,stpmic1.yaml
+ create mode 100644 Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-cadence.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/socionext,uniphier-sd.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mmc/uniphier-sd.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/denali,nand.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mtd/denali-nand.txt
+ create mode 100644 Documentation/devicetree/bindings/net/can/bosch,m_can.yaml
+ delete mode 100644 Documentation/devicetree/bindings/net/can/can-transceiver.txt
+ create mode 100644 Documentation/devicetree/bindings/net/can/can-transceiver.yaml
+ delete mode 100644 Documentation/devicetree/bindings/net/can/m_can.txt
+ create mode 100644 Documentation/devicetree/bindings/phy/marvell,mmp3-usb-phy.yaml
+ delete mode 100644 Documentation/devicetree/bindings/phy/phy-mmp3-usb.txt
+ delete mode 100644 Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.txt
+ create mode 100644 Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml
+ delete mode 100644 Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.yaml
+ delete mode 100644 Documentation/devicetree/bindings/power/renesas,apmu.txt
+ create mode 100644 Documentation/devicetree/bindings/power/renesas,apmu.yaml
+ delete mode 100644 Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt
+ create mode 100644 Documentation/devicetree/bindings/power/renesas,rcar-sysc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/regulator/st,stpmic1-regulator.txt
+ delete mode 100644 Documentation/devicetree/bindings/reset/renesas,rst.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/renesas,rst.yaml
+ delete mode 100644 Documentation/devicetree/bindings/rng/brcm,bcm2835.txt
+ create mode 100644 Documentation/devicetree/bindings/rng/brcm,bcm2835.yaml
+ create mode 100644 Documentation/devicetree/bindings/serial/renesas,hscif.yaml
+ delete mode 100644 Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
+ create mode 100644 Documentation/devicetree/bindings/serial/renesas,sci.yaml
+ create mode 100644 Documentation/devicetree/bindings/serial/renesas,scif.yaml
+ create mode 100644 Documentation/devicetree/bindings/serial/renesas,scifa.yaml
+ create mode 100644 Documentation/devicetree/bindings/serial/renesas,scifb.yaml
+ delete mode 100644 Documentation/devicetree/bindings/serial/serial.txt
+ create mode 100644 Documentation/devicetree/bindings/serial/serial.yaml
+ delete mode 100644 Documentation/devicetree/bindings/serial/slave-device.txt
+ create mode 100644 Documentation/devicetree/bindings/serial/socionext,uniphier-uart.yaml
+ delete mode 100644 Documentation/devicetree/bindings/serial/uniphier-uart.txt
+ create mode 100644 Documentation/devicetree/bindings/soc/imx/fsl,aips-bus.yaml
+ delete mode 100644 Documentation/devicetree/bindings/spi/qcom,spi-qcom-qspi.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/qcom,spi-qcom-qspi.yaml
+ delete mode 100644 Documentation/devicetree/bindings/thermal/rcar-thermal.txt
+ create mode 100644 Documentation/devicetree/bindings/thermal/rcar-thermal.yaml
+ delete mode 100644 Documentation/devicetree/bindings/watchdog/st,stpmic1-wdt.txt
+ create mode 100644 drivers/of/unittest-data/overlay_gpio_01.dts
+ create mode 100644 drivers/of/unittest-data/overlay_gpio_02a.dts
+ create mode 100644 drivers/of/unittest-data/overlay_gpio_02b.dts
+ create mode 100644 drivers/of/unittest-data/overlay_gpio_03.dts
+ create mode 100644 drivers/of/unittest-data/overlay_gpio_04a.dts
+ create mode 100644 drivers/of/unittest-data/overlay_gpio_04b.dts
+ delete mode 100644 scripts/dtc/Makefile.dtc
+ delete mode 100644 scripts/dtc/libfdt/Makefile.libfdt
+Merging mailbox/mailbox-for-next (0a67003b1985 mailbox: imx: add SCU MU support)
+$ git merge mailbox/mailbox-for-next
+Merge made by the 'recursive' strategy.
+ .../mailbox/allwinner,sun6i-a31-msgbox.yaml        |  80 +++++
+ .../devicetree/bindings/mailbox/fsl,mu.txt         |   2 +
+ .../devicetree/bindings/mailbox/mtk-gce.txt        |  10 +-
+ drivers/mailbox/Kconfig                            |   9 +
+ drivers/mailbox/Makefile                           |   2 +
+ drivers/mailbox/armada-37xx-rwtm-mailbox.c         |   8 +-
+ drivers/mailbox/bcm-flexrm-mailbox.c               |   2 +
+ drivers/mailbox/bcm-pdc-mailbox.c                  |  20 +-
+ drivers/mailbox/imx-mailbox.c                      | 288 ++++++++++++++----
+ drivers/mailbox/mtk-cmdq-mailbox.c                 | 128 ++++----
+ drivers/mailbox/sun6i-msgbox.c                     | 326 +++++++++++++++++++++
+ 11 files changed, 733 insertions(+), 142 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mailbox/allwinner,sun6i-a31-msgbox.yaml
+ create mode 100644 drivers/mailbox/sun6i-msgbox.c
+Merging spi/for-next (1ba0b52ea73b Merge branch 'spi-5.7' into spi-next)
+$ git merge spi/for-next
+Already up to date.
+Merging tip/auto-latest (e5ff49d1dfba Merge branch 'locking/kcsan')
+$ git merge tip/auto-latest
+Auto-merging scripts/Makefile.lib
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/Makefile
+Auto-merging arch/x86/kernel/Makefile
+Auto-merging arch/x86/include/asm/sighandling.h
+CONFLICT (content): Merge conflict in arch/x86/include/asm/sighandling.h
+Auto-merging arch/x86/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/Kconfig
+Auto-merging Makefile
+Auto-merging MAINTAINERS
+Resolved 'arch/x86/Kconfig' using previous resolution.
+Resolved 'arch/x86/include/asm/sighandling.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master c913224ec980] Merge remote-tracking branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ 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                      |  10 +-
+ arch/x86/kernel/Makefile                           |   4 +
+ arch/x86/kernel/cpu/Makefile                       |   3 +
+ arch/x86/kernel/e820.c                             |  10 +-
+ 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 +
+ 79 files changed, 3868 insertions(+), 769 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.
+ drivers/clocksource/timer-vf-pit.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+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
+Auto-merging arch/microblaze/include/asm/irq.h
+Auto-merging arch/microblaze/Kconfig
+Merge made by the 'recursive' strategy.
+Merging ftrace/for-next (2ab2a0924b99 tracing: Add documentation on set_ftrace_notrace_pid and set_event_notrace_pid)
+$ git merge ftrace/for-next
+Auto-merging kernel/trace/ftrace.c
+Auto-merging init/main.c
+Auto-merging drivers/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/trace/ftrace.rst                     |  82 ++++--
+ drivers/Kconfig                                    |   2 +
+ drivers/gpu/Makefile                               |   1 +
+ drivers/gpu/trace/Kconfig                          |   4 +
+ drivers/gpu/trace/Makefile                         |   3 +
+ drivers/gpu/trace/trace_gpu_mem.c                  |  13 +
+ include/linux/bootconfig.h                         |   3 +-
+ include/linux/ring_buffer.h                        |   4 +-
+ include/linux/trace_events.h                       |   2 +
+ include/trace/events/gpu_mem.h                     |  57 +++++
+ init/main.c                                        |  14 +-
+ kernel/trace/ftrace.c                              | 200 +++++++++++++--
+ kernel/trace/ring_buffer.c                         | 239 ++++++++++++------
+ kernel/trace/trace.c                               |  91 +++++--
+ kernel/trace/trace.h                               |  39 ++-
+ kernel/trace/trace_entries.h                       |   4 +-
+ kernel/trace/trace_events.c                        | 280 ++++++++++++++++-----
+ kernel/trace/trace_functions_graph.c               |   2 +-
+ kernel/trace/trace_hwlat.c                         |  24 +-
+ kernel/trace/trace_kprobe.c                        |   2 +
+ kernel/trace/trace_output.c                        |  19 +-
+ lib/bootconfig.c                                   |  35 ++-
+ tools/bootconfig/Makefile                          |  27 +-
+ tools/bootconfig/main.c                            |  35 ++-
+ tools/bootconfig/test-bootconfig.sh                |  14 +-
+ .../selftests/ftrace/test.d/event/event-no-pid.tc  | 125 +++++++++
+ .../test.d/ftrace/func-filter-notrace-pid.tc       | 108 ++++++++
+ .../test.d/ftrace/func_traceonoff_triggers.tc      |   2 +-
+ 28 files changed, 1175 insertions(+), 256 deletions(-)
+ create mode 100644 drivers/gpu/trace/Kconfig
+ create mode 100644 drivers/gpu/trace/Makefile
+ create mode 100644 drivers/gpu/trace/trace_gpu_mem.c
+ create mode 100644 include/trace/events/gpu_mem.h
+ create mode 100644 tools/testing/selftests/ftrace/test.d/event/event-no-pid.tc
+ create mode 100644 tools/testing/selftests/ftrace/test.d/ftrace/func-filter-notrace-pid.tc
+Merging rcu/rcu/next (1503af98f54d rcutorture: Add test of holding scheduler locks across rcu_read_unlock())
+$ git merge rcu/rcu/next
+Auto-merging tools/memory-model/litmus-tests/.gitignore
+CONFLICT (content): Merge conflict in tools/memory-model/litmus-tests/.gitignore
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/rcu/update.c
+Auto-merging kernel/rcu/tree.c
+Auto-merging kernel/fork.c
+Auto-merging include/linux/wait.h
+Auto-merging include/linux/sched.h
+Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c
+Auto-merging arch/x86/mm/pat/set_memory.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Resolved 'tools/memory-model/litmus-tests/.gitignore' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 13705f930896] Merge remote-tracking branch 'rcu/rcu/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/kernel-parameters.txt    |   12 +
+ ...b__after_atomic-is-stronger-than-acquire.litmus |   32 +
+ ...Atomic-RMW-ops-are-atomic-WRT-atomic_set.litmus |   24 +
+ Documentation/atomic-tests/README                  |   16 +
+ Documentation/atomic_t.txt                         |   24 +-
+ Documentation/dev-tools/kcsan.rst                  |  227 ++--
+ Documentation/litmus-tests/README                  |   14 +
+ .../rcu}/MP+onceassign+derefonce.litmus            |    0
+ .../litmus-tests/rcu/RCU+sync+free.litmus          |   42 +
+ .../litmus-tests/rcu/RCU+sync+read.litmus          |   37 +
+ MAINTAINERS                                        |    3 +
+ arch/x86/mm/pat/set_memory.c                       |    2 +-
+ drivers/gpu/drm/drm_dp_mst_topology.c              |    2 +-
+ include/linux/kcsan-checks.h                       |   98 +-
+ include/linux/rculist.h                            |    6 +-
+ include/linux/rcupdate.h                           |   48 +-
+ include/linux/rcupdate_trace.h                     |   88 ++
+ include/linux/rcupdate_wait.h                      |   19 +
+ include/linux/rcutiny.h                            |    2 +-
+ include/linux/sched.h                              |   10 +-
+ include/linux/torture.h                            |    2 +-
+ include/linux/wait.h                               |    2 +
+ init/init_task.c                                   |    5 +
+ kernel/fork.c                                      |   13 +-
+ kernel/kcsan/atomic.h                              |   21 +-
+ kernel/kcsan/core.c                                |   93 +-
+ kernel/kcsan/debugfs.c                             |   27 +-
+ kernel/kcsan/kcsan.h                               |    8 +-
+ kernel/kcsan/report.c                              |  382 ++++---
+ kernel/rcu/Kconfig                                 |   46 +-
+ kernel/rcu/Kconfig.debug                           |   15 +-
+ kernel/rcu/rcu.h                                   |    5 +
+ kernel/rcu/rcuperf.c                               |    5 +-
+ kernel/rcu/rcutorture.c                            |  113 +-
+ kernel/rcu/srcutree.c                              |    8 +-
+ kernel/rcu/tasks.h                                 | 1183 ++++++++++++++++++++
+ kernel/rcu/tree.c                                  |  137 ++-
+ kernel/rcu/tree.h                                  |    3 +
+ kernel/rcu/tree_exp.h                              |   50 +-
+ kernel/rcu/tree_plugin.h                           |   82 +-
+ kernel/rcu/tree_stall.h                            |   80 +-
+ kernel/rcu/update.c                                |  375 +------
+ kernel/sched/core.c                                |   48 +
+ lib/Kconfig.kcsan                                  |   24 +
+ tools/memory-model/Documentation/explanation.txt   |   83 +-
+ tools/memory-model/Documentation/references.txt    |   21 +-
+ tools/memory-model/README                          |   10 +-
+ tools/memory-model/litmus-tests/.gitignore         |    2 +-
+ tools/memory-model/litmus-tests/README             |    3 -
+ tools/memory-model/scripts/README                  |   16 +-
+ tools/memory-model/scripts/checkalllitmus.sh       |   29 +-
+ tools/memory-model/scripts/checkghlitmus.sh        |   11 +-
+ tools/memory-model/scripts/checklitmus.sh          |   25 +-
+ tools/memory-model/scripts/checklitmushist.sh      |    2 +-
+ tools/memory-model/scripts/checktheselitmus.sh     |   43 +
+ tools/memory-model/scripts/cmplitmushist.sh        |   49 +-
+ tools/memory-model/scripts/hwfnseg.sh              |   20 +
+ tools/memory-model/scripts/initlitmushist.sh       |    2 +-
+ tools/memory-model/scripts/judgelitmus.sh          |  120 +-
+ tools/memory-model/scripts/newlitmushist.sh        |    4 +-
+ tools/memory-model/scripts/parseargs.sh            |   21 +-
+ tools/memory-model/scripts/runlitmus.sh            |   80 ++
+ tools/memory-model/scripts/runlitmushist.sh        |   29 +-
+ tools/memory-model/scripts/simpletest.sh           |   35 +
+ .../selftests/rcutorture/bin/kvm-recheck-rcu.sh    |   16 +-
+ .../selftests/rcutorture/configs/rcu/CFLIST        |    3 +
+ .../selftests/rcutorture/configs/rcu/RUDE01        |   10 +
+ .../selftests/rcutorture/configs/rcu/RUDE01.boot   |    1 +
+ .../selftests/rcutorture/configs/rcu/TRACE01       |   11 +
+ .../selftests/rcutorture/configs/rcu/TRACE01.boot  |    1 +
+ .../selftests/rcutorture/configs/rcu/TRACE02       |   11 +
+ .../selftests/rcutorture/configs/rcu/TRACE02.boot  |    1 +
+ 72 files changed, 3089 insertions(+), 1003 deletions(-)
+ create mode 100644 Documentation/atomic-tests/Atomic-RMW+mb__after_atomic-is-stronger-than-acquire.litmus
+ create mode 100644 Documentation/atomic-tests/Atomic-RMW-ops-are-atomic-WRT-atomic_set.litmus
+ create mode 100644 Documentation/atomic-tests/README
+ create mode 100644 Documentation/litmus-tests/README
+ rename {tools/memory-model/litmus-tests => Documentation/litmus-tests/rcu}/MP+onceassign+derefonce.litmus (100%)
+ create mode 100644 Documentation/litmus-tests/rcu/RCU+sync+free.litmus
+ create mode 100644 Documentation/litmus-tests/rcu/RCU+sync+read.litmus
+ create mode 100644 include/linux/rcupdate_trace.h
+ create mode 100644 kernel/rcu/tasks.h
+ create mode 100755 tools/memory-model/scripts/checktheselitmus.sh
+ create mode 100755 tools/memory-model/scripts/hwfnseg.sh
+ create mode 100755 tools/memory-model/scripts/runlitmus.sh
+ create mode 100755 tools/memory-model/scripts/simpletest.sh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/RUDE01
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/RUDE01.boot
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TRACE01
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TRACE01.boot
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TRACE02
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TRACE02.boot
+Merging kvm/linux-next (32bd3422a90a KVM: SVM: Split svm_vcpu_run inline assembly to separate file)
+$ git merge kvm/linux-next
+Auto-merging tools/testing/selftests/kvm/.gitignore
+CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/.gitignore
+Auto-merging arch/x86/kvm/x86.c
+Auto-merging arch/x86/kvm/vmx/vmx.h
+Auto-merging arch/x86/kvm/vmx/vmx.c
+Auto-merging arch/x86/kvm/trace.h
+Auto-merging arch/x86/kvm/svm/svm.c
+CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c
+Auto-merging arch/x86/kvm/mmu/paging_tmpl.h
+Auto-merging arch/x86/kvm/lapic.c
+Auto-merging arch/x86/kvm/kvm_emulate.h
+Auto-merging arch/x86/kvm/emulate.c
+Auto-merging arch/s390/mm/fault.c
+Auto-merging arch/s390/kvm/kvm-s390.c
+Auto-merging arch/s390/kernel/setup.c
+Auto-merging arch/s390/kernel/Makefile
+Auto-merging arch/s390/include/asm/pgtable.h
+Auto-merging arch/s390/include/asm/page.h
+Auto-merging arch/s390/include/asm/mmu_context.h
+Auto-merging arch/s390/include/asm/mmu.h
+Auto-merging arch/powerpc/kvm/powerpc.c
+Auto-merging arch/powerpc/kvm/book3s_pr.c
+Auto-merging arch/powerpc/kvm/book3s_hv.c
+Auto-merging arch/powerpc/kvm/book3s_64_mmu_radix.c
+Auto-merging arch/powerpc/kvm/book3s_64_mmu_hv.c
+Auto-merging arch/powerpc/include/asm/kvm_host.h
+Auto-merging arch/arm64/kvm/sys_regs.c
+Auto-merging arch/arm64/kvm/hyp/switch.c
+Removing arch/arm/kvm/vgic-v3-coproc.c
+Removing arch/arm/kvm/trace.h
+Removing arch/arm/kvm/reset.c
+Removing arch/arm/kvm/irq.h
+Removing arch/arm/kvm/interrupts.S
+Removing arch/arm/kvm/init.S
+Removing arch/arm/kvm/hyp/vfp.S
+Removing arch/arm/kvm/hyp/tlb.c
+Removing arch/arm/kvm/hyp/switch.c
+Removing arch/arm/kvm/hyp/s2-setup.c
+Removing arch/arm/kvm/hyp/hyp-entry.S
+Removing arch/arm/kvm/hyp/entry.S
+Removing arch/arm/kvm/hyp/cp15-sr.c
+Removing arch/arm/kvm/hyp/banked-sr.c
+Removing arch/arm/kvm/hyp/Makefile
+Removing arch/arm/kvm/handle_exit.c
+Removing arch/arm/kvm/guest.c
+Removing arch/arm/kvm/emulate.c
+Removing arch/arm/kvm/coproc_a7.c
+Removing arch/arm/kvm/coproc_a15.c
+Removing arch/arm/kvm/coproc.h
+Removing arch/arm/kvm/coproc.c
+Removing arch/arm/kvm/Makefile
+Removing arch/arm/kvm/Kconfig
+Removing arch/arm/include/uapi/asm/kvm.h
+Removing arch/arm/include/asm/stage2_pgtable.h
+Removing arch/arm/include/asm/kvm_ras.h
+Removing arch/arm/include/asm/kvm_mmu.h
+Removing arch/arm/include/asm/kvm_hyp.h
+Removing arch/arm/include/asm/kvm_host.h
+Removing arch/arm/include/asm/kvm_emulate.h
+Removing arch/arm/include/asm/kvm_coproc.h
+Removing arch/arm/include/asm/kvm_asm.h
+Removing arch/arm/include/asm/kvm_arm.h
+Auto-merging arch/arm/Makefile
+Auto-merging arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Recorded preimage for 'arch/x86/kvm/svm/svm.c'
+Resolved 'tools/testing/selftests/kvm/.gitignore' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'arch/x86/kvm/svm/svm.c'.
+[master fb43fdd08317] Merge remote-tracking branch 'kvm/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/kernel-parameters.txt    |    5 +
+ Documentation/virt/kvm/api.rst                     |  128 +-
+ Documentation/virt/kvm/arm/hyp-abi.rst             |    5 +
+ Documentation/virt/kvm/devices/s390_flic.rst       |   11 +-
+ Documentation/virt/kvm/index.rst                   |    2 +
+ Documentation/virt/kvm/locking.rst                 |   11 +-
+ Documentation/virt/kvm/s390-pv-boot.rst            |   84 +
+ Documentation/virt/kvm/s390-pv.rst                 |  116 +
+ MAINTAINERS                                        |    6 +-
+ arch/arm/Kconfig                                   |    2 -
+ arch/arm/Makefile                                  |    1 -
+ arch/arm/configs/axm55xx_defconfig                 |    2 -
+ arch/arm/include/asm/arch_gicv3.h                  |  114 -
+ arch/arm/include/asm/kvm_arm.h                     |  239 -
+ arch/arm/include/asm/kvm_asm.h                     |   77 -
+ arch/arm/include/asm/kvm_coproc.h                  |   36 -
+ arch/arm/include/asm/kvm_emulate.h                 |  372 --
+ arch/arm/include/asm/kvm_host.h                    |  456 --
+ arch/arm/include/asm/kvm_hyp.h                     |  127 -
+ arch/arm/include/asm/kvm_mmu.h                     |  435 --
+ arch/arm/include/asm/kvm_ras.h                     |   14 -
+ arch/arm/include/asm/pgtable-3level.h              |   20 -
+ arch/arm/include/asm/pgtable.h                     |    9 -
+ arch/arm/include/asm/sections.h                    |    6 +-
+ arch/arm/include/asm/stage2_pgtable.h              |   75 -
+ arch/arm/include/asm/virt.h                        |   17 -
+ arch/arm/include/uapi/asm/kvm.h                    |  314 -
+ arch/arm/kernel/asm-offsets.c                      |   11 -
+ arch/arm/kernel/hyp-stub.S                         |   39 +-
+ arch/arm/kernel/vmlinux-xip.lds.S                  |    8 -
+ arch/arm/kernel/vmlinux.lds.S                      |    8 -
+ arch/arm/kernel/vmlinux.lds.h                      |   10 -
+ arch/arm/kvm/Kconfig                               |   59 -
+ arch/arm/kvm/Makefile                              |   43 -
+ arch/arm/kvm/coproc.c                              | 1455 -----
+ arch/arm/kvm/coproc.h                              |  130 -
+ arch/arm/kvm/coproc_a15.c                          |   39 -
+ arch/arm/kvm/coproc_a7.c                           |   42 -
+ arch/arm/kvm/emulate.c                             |  166 -
+ arch/arm/kvm/guest.c                               |  387 --
+ arch/arm/kvm/handle_exit.c                         |  175 -
+ arch/arm/kvm/hyp/Makefile                          |   34 -
+ arch/arm/kvm/hyp/banked-sr.c                       |   70 -
+ arch/arm/kvm/hyp/cp15-sr.c                         |   72 -
+ arch/arm/kvm/hyp/entry.S                           |  121 -
+ arch/arm/kvm/hyp/hyp-entry.S                       |  295 -
+ arch/arm/kvm/hyp/s2-setup.c                        |   22 -
+ arch/arm/kvm/hyp/switch.c                          |  242 -
+ arch/arm/kvm/hyp/tlb.c                             |   68 -
+ arch/arm/kvm/hyp/vfp.S                             |   57 -
+ arch/arm/kvm/init.S                                |  157 -
+ arch/arm/kvm/interrupts.S                          |   36 -
+ arch/arm/kvm/irq.h                                 |   16 -
+ arch/arm/kvm/reset.c                               |   86 -
+ arch/arm/kvm/trace.h                               |   86 -
+ arch/arm/kvm/vgic-v3-coproc.c                      |   27 -
+ arch/arm/mach-exynos/Kconfig                       |    2 +-
+ arch/arm/mm/mmu.c                                  |   26 -
+ arch/arm64/include/asm/kvm_emulate.h               |    3 +-
+ arch/arm64/include/asm/kvm_host.h                  |    1 +
+ arch/arm64/kvm/fpsimd.c                            |    1 -
+ arch/arm64/kvm/guest.c                             |    1 -
+ arch/arm64/kvm/hyp/switch.c                        |    1 -
+ arch/arm64/kvm/sys_regs.c                          |    1 -
+ arch/arm64/kvm/sys_regs_generic_v8.c               |    1 -
+ arch/mips/include/asm/kvm_host.h                   |    2 +-
+ arch/mips/kvm/mips.c                               |   75 +-
+ arch/powerpc/include/asm/kvm_asm.h                 |    3 +
+ arch/powerpc/include/asm/kvm_book3s_uvmem.h        |    6 +
+ arch/powerpc/include/asm/kvm_host.h                |    1 +
+ arch/powerpc/include/asm/kvm_ppc.h                 |   21 +-
+ arch/powerpc/kvm/book3s.c                          |   25 +-
+ arch/powerpc/kvm/book3s.h                          |    1 +
+ arch/powerpc/kvm/book3s_32_mmu.c                   |    2 +-
+ arch/powerpc/kvm/book3s_32_mmu_host.c              |    2 +-
+ arch/powerpc/kvm/book3s_64_mmu.c                   |    2 +-
+ arch/powerpc/kvm/book3s_64_mmu_host.c              |    2 +-
+ arch/powerpc/kvm/book3s_64_mmu_hv.c                |  119 +-
+ arch/powerpc/kvm/book3s_64_mmu_radix.c             |    2 +-
+ arch/powerpc/kvm/book3s_64_vio.c                   |    1 -
+ arch/powerpc/kvm/book3s_64_vio_hv.c                |    1 -
+ arch/powerpc/kvm/book3s_hv.c                       |   90 +-
+ arch/powerpc/kvm/book3s_hv_tm.c                    |   28 +-
+ arch/powerpc/kvm/book3s_hv_tm_builtin.c            |   16 +-
+ arch/powerpc/kvm/book3s_hv_uvmem.c                 |   19 +-
+ arch/powerpc/kvm/book3s_pr.c                       |   25 +-
+ arch/powerpc/kvm/booke.c                           |   26 +-
+ arch/powerpc/kvm/booke.h                           |    2 -
+ arch/powerpc/kvm/e500.c                            |    1 -
+ arch/powerpc/kvm/e500_mmu.c                        |    4 -
+ arch/powerpc/kvm/e500mc.c                          |    1 -
+ arch/powerpc/kvm/mpic.c                            |    1 -
+ arch/powerpc/kvm/powerpc.c                         |   35 +-
+ arch/powerpc/kvm/timing.h                          |    1 -
+ arch/s390/boot/Makefile                            |    2 +-
+ arch/s390/boot/uv.c                                |   20 +
+ arch/s390/include/asm/gmap.h                       |    6 +
+ arch/s390/include/asm/kvm_host.h                   |  117 +-
+ arch/s390/include/asm/mmu.h                        |    2 +
+ arch/s390/include/asm/mmu_context.h                |    1 +
+ arch/s390/include/asm/page.h                       |    5 +
+ arch/s390/include/asm/pgtable.h                    |   35 +-
+ arch/s390/include/asm/uv.h                         |  251 +-
+ arch/s390/kernel/Makefile                          |    1 +
+ arch/s390/kernel/entry.h                           |    2 +
+ arch/s390/kernel/pgm_check.S                       |    4 +-
+ arch/s390/kernel/setup.c                           |    9 +-
+ arch/s390/kernel/uv.c                              |  414 ++
+ arch/s390/kvm/Makefile                             |    2 +-
+ arch/s390/kvm/diag.c                               |    6 +-
+ arch/s390/kvm/gaccess.c                            |   23 +-
+ arch/s390/kvm/intercept.c                          |  123 +-
+ arch/s390/kvm/interrupt.c                          |  401 +-
+ arch/s390/kvm/kvm-s390.c                           |  597 +-
+ arch/s390/kvm/kvm-s390.h                           |   51 +-
+ arch/s390/kvm/priv.c                               |   13 +-
+ arch/s390/kvm/pv.c                                 |  303 +
+ arch/s390/mm/fault.c                               |   78 +
+ arch/s390/mm/gmap.c                                |   72 +-
+ arch/x86/include/asm/kvm_host.h                    |  105 +-
+ arch/x86/include/asm/kvm_page_track.h              |    3 +-
+ arch/x86/include/asm/vmx.h                         |   12 +
+ arch/x86/kvm/Makefile                              |    2 +-
+ arch/x86/kvm/cpuid.c                               |  944 ++-
+ arch/x86/kvm/cpuid.h                               |  151 +-
+ arch/x86/kvm/emulate.c                             |   57 +-
+ arch/x86/kvm/hyperv.c                              |    8 +-
+ arch/x86/kvm/i8254.c                               |    2 +-
+ arch/x86/kvm/kvm_cache_regs.h                      |   10 +-
+ arch/x86/{include/asm => kvm}/kvm_emulate.h        |   43 +-
+ arch/x86/kvm/lapic.c                               |   85 +-
+ arch/x86/kvm/lapic.h                               |    2 +
+ arch/x86/kvm/mmu.h                                 |   10 +-
+ arch/x86/kvm/mmu/mmu.c                             |  209 +-
+ arch/x86/kvm/mmu/page_track.c                      |   16 +-
+ arch/x86/kvm/mmu/paging_tmpl.h                     |    4 +-
+ arch/x86/kvm/pmu.c                                 |   34 +-
+ arch/x86/kvm/pmu.h                                 |   11 +-
+ arch/x86/kvm/svm/avic.c                            | 1027 ++++
+ arch/x86/kvm/svm/nested.c                          |  823 +++
+ arch/x86/kvm/{pmu_amd.c => svm/pmu.c}              |    0
+ arch/x86/kvm/svm/sev.c                             | 1178 ++++
+ arch/x86/kvm/{ => svm}/svm.c                       | 6041 ++++----------------
+ arch/x86/kvm/svm/svm.h                             |  491 ++
+ arch/x86/kvm/svm/vmenter.S                         |  162 +
+ arch/x86/kvm/trace.h                               |   50 +-
+ arch/x86/kvm/vmx/capabilities.h                    |   25 +-
+ arch/x86/kvm/vmx/evmcs.h                           |    7 +
+ arch/x86/kvm/vmx/nested.c                          |  183 +-
+ arch/x86/kvm/vmx/nested.h                          |    8 +-
+ arch/x86/kvm/vmx/ops.h                             |   28 +-
+ arch/x86/kvm/vmx/pmu_intel.c                       |    8 +-
+ arch/x86/kvm/vmx/vmenter.S                         |   72 +-
+ arch/x86/kvm/vmx/vmx.c                             |  665 ++-
+ arch/x86/kvm/vmx/vmx.h                             |    8 +-
+ arch/x86/kvm/x86.c                                 |  787 +--
+ arch/x86/kvm/x86.h                                 |   28 +-
+ include/kvm/arm_vgic.h                             |    3 +
+ include/linux/kvm_host.h                           |   71 +-
+ include/uapi/linux/kvm.h                           |   47 +-
+ tools/arch/x86/include/asm/unistd_64.h             |    3 +
+ tools/kvm/kvm_stat/kvm_stat                        |  256 +-
+ tools/kvm/kvm_stat/kvm_stat.txt                    |   44 +-
+ tools/testing/selftests/kvm/.gitignore             |    7 +-
+ tools/testing/selftests/kvm/Makefile               |   12 +-
+ tools/testing/selftests/kvm/clear_dirty_log_test.c |    4 +
+ tools/testing/selftests/kvm/demand_paging_test.c   |  661 +++
+ tools/testing/selftests/kvm/dirty_log_test.c       |  107 +-
+ tools/testing/selftests/kvm/include/evmcs.h        |    2 +
+ tools/testing/selftests/kvm/include/kvm_util.h     |  126 +-
+ tools/testing/selftests/kvm/include/test_util.h    |   28 +-
+ tools/testing/selftests/kvm/kvm_create_max_vcpus.c |    8 +-
+ .../testing/selftests/kvm/lib/aarch64/processor.c  |   41 +-
+ tools/testing/selftests/kvm/lib/aarch64/ucall.c    |    2 +-
+ tools/testing/selftests/kvm/lib/assert.c           |    6 +-
+ tools/testing/selftests/kvm/lib/io.c               |   12 +-
+ tools/testing/selftests/kvm/lib/kvm_util.c         |  170 +-
+ .../testing/selftests/kvm/lib/kvm_util_internal.h  |   59 +-
+ tools/testing/selftests/kvm/lib/s390x/processor.c  |   78 +-
+ tools/testing/selftests/kvm/lib/test_util.c        |   93 +
+ tools/testing/selftests/kvm/lib/x86_64/processor.c |  201 +-
+ tools/testing/selftests/kvm/lib/x86_64/svm.c       |    2 +-
+ tools/testing/selftests/kvm/lib/x86_64/vmx.c       |    4 +-
+ tools/testing/selftests/kvm/s390x/memop.c          |    2 +-
+ tools/testing/selftests/kvm/s390x/resets.c         |  138 +-
+ tools/testing/selftests/kvm/s390x/sync_regs_test.c |   13 +-
+ tools/testing/selftests/kvm/steal_time.c           |  352 ++
+ .../selftests/kvm/x86_64/cr4_cpuid_sync_test.c     |    6 +-
+ tools/testing/selftests/kvm/x86_64/evmcs_test.c    |   35 +-
+ tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c  |    8 +-
+ .../selftests/kvm/x86_64/mmio_warning_test.c       |    6 +-
+ .../selftests/kvm/x86_64/platform_info_test.c      |    6 +-
+ .../selftests/kvm/x86_64/set_memory_region_test.c  |  141 +
+ tools/testing/selftests/kvm/x86_64/smm_test.c      |    2 +-
+ tools/testing/selftests/kvm/x86_64/state_test.c    |   10 +-
+ .../testing/selftests/kvm/x86_64/svm_vmcall_test.c |    6 +-
+ .../testing/selftests/kvm/x86_64/sync_regs_test.c  |    4 +-
+ .../kvm/x86_64/vmx_close_while_nested_test.c       |    4 +-
+ .../selftests/kvm/x86_64/vmx_dirty_log_test.c      |   17 +-
+ .../kvm/x86_64/vmx_set_nested_state_test.c         |    4 +-
+ .../selftests/kvm/x86_64/vmx_tsc_adjust_test.c     |    8 +-
+ tools/testing/selftests/kvm/x86_64/xss_msr_test.c  |    2 +-
+ virt/kvm/arm/arch_timer.c                          |    2 +-
+ virt/kvm/arm/arm.c                                 |   60 +-
+ virt/kvm/arm/mmu.c                                 |   20 +-
+ virt/kvm/arm/psci.c                                |    1 -
+ virt/kvm/arm/vgic/vgic-debug.c                     |   14 +-
+ virt/kvm/arm/vgic/vgic-mmio-v3.c                   |   81 +-
+ virt/kvm/arm/vgic/vgic-mmio.c                      |   88 +-
+ virt/kvm/arm/vgic/vgic-v3.c                        |    2 +
+ virt/kvm/arm/vgic/vgic-v4.c                        |  107 +-
+ virt/kvm/arm/vgic/vgic.h                           |    1 +
+ virt/kvm/kvm_main.c                                |  663 ++-
+ 213 files changed, 12633 insertions(+), 14250 deletions(-)
+ create mode 100644 Documentation/virt/kvm/s390-pv-boot.rst
+ create mode 100644 Documentation/virt/kvm/s390-pv.rst
+ delete mode 100644 arch/arm/include/asm/kvm_arm.h
+ delete mode 100644 arch/arm/include/asm/kvm_asm.h
+ delete mode 100644 arch/arm/include/asm/kvm_coproc.h
+ delete mode 100644 arch/arm/include/asm/kvm_emulate.h
+ delete mode 100644 arch/arm/include/asm/kvm_host.h
+ delete mode 100644 arch/arm/include/asm/kvm_hyp.h
+ delete mode 100644 arch/arm/include/asm/kvm_mmu.h
+ delete mode 100644 arch/arm/include/asm/kvm_ras.h
+ delete mode 100644 arch/arm/include/asm/stage2_pgtable.h
+ delete mode 100644 arch/arm/include/uapi/asm/kvm.h
+ delete mode 100644 arch/arm/kvm/Kconfig
+ delete mode 100644 arch/arm/kvm/Makefile
+ delete mode 100644 arch/arm/kvm/coproc.c
+ delete mode 100644 arch/arm/kvm/coproc.h
+ delete mode 100644 arch/arm/kvm/coproc_a15.c
+ delete mode 100644 arch/arm/kvm/coproc_a7.c
+ delete mode 100644 arch/arm/kvm/emulate.c
+ delete mode 100644 arch/arm/kvm/guest.c
+ delete mode 100644 arch/arm/kvm/handle_exit.c
+ delete mode 100644 arch/arm/kvm/hyp/Makefile
+ delete mode 100644 arch/arm/kvm/hyp/banked-sr.c
+ delete mode 100644 arch/arm/kvm/hyp/cp15-sr.c
+ delete mode 100644 arch/arm/kvm/hyp/entry.S
+ delete mode 100644 arch/arm/kvm/hyp/hyp-entry.S
+ delete mode 100644 arch/arm/kvm/hyp/s2-setup.c
+ delete mode 100644 arch/arm/kvm/hyp/switch.c
+ delete mode 100644 arch/arm/kvm/hyp/tlb.c
+ delete mode 100644 arch/arm/kvm/hyp/vfp.S
+ delete mode 100644 arch/arm/kvm/init.S
+ delete mode 100644 arch/arm/kvm/interrupts.S
+ delete mode 100644 arch/arm/kvm/irq.h
+ delete mode 100644 arch/arm/kvm/reset.c
+ delete mode 100644 arch/arm/kvm/trace.h
+ delete mode 100644 arch/arm/kvm/vgic-v3-coproc.c
+ create mode 100644 arch/s390/kernel/uv.c
+ create mode 100644 arch/s390/kvm/pv.c
+ rename arch/x86/{include/asm => kvm}/kvm_emulate.h (93%)
+ create mode 100644 arch/x86/kvm/svm/avic.c
+ create mode 100644 arch/x86/kvm/svm/nested.c
+ rename arch/x86/kvm/{pmu_amd.c => svm/pmu.c} (100%)
+ create mode 100644 arch/x86/kvm/svm/sev.c
+ rename arch/x86/kvm/{ => svm}/svm.c (53%)
+ create mode 100644 arch/x86/kvm/svm/svm.h
+ create mode 100644 arch/x86/kvm/svm/vmenter.S
+ create mode 100644 tools/testing/selftests/kvm/demand_paging_test.c
+ create mode 100644 tools/testing/selftests/kvm/lib/test_util.c
+ create mode 100644 tools/testing/selftests/kvm/steal_time.c
+ create mode 100644 tools/testing/selftests/kvm/x86_64/set_memory_region_test.c
+$ git am -3 ../patches/0001-KVM-SVM-merge-fixups.patch
+Applying: KVM: SVM: merge fixups
+$ git reset HEAD^
+Unstaged changes after reset:
+M	arch/x86/kvm/svm/sev.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 5a6fa5442213] Merge remote-tracking branch 'kvm/linux-next'
+ Date: Thu Apr 2 13:24:41 2020 +1100
+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 (c3881eb58d56 x86/xen: Make the secondary CPU idle tasks reliable)
+$ git merge xen-tip/linux-next
+Merge made by the 'recursive' strategy.
+ arch/x86/xen/smp_pv.c                |   3 +-
+ arch/x86/xen/xen-head.S              |  18 ++++-
+ drivers/xen/xen-pciback/conf_space.c |   2 +-
+ drivers/xen/xen-pciback/conf_space.h |   8 +--
+ drivers/xen/xenbus/xenbus_client.c   | 126 ++++++++++++-----------------------
+ include/xen/xenbus.h                 |   7 --
+ 6 files changed, 65 insertions(+), 99 deletions(-)
+Merging percpu/for-next (dedac37ea96b Merge branch 'for-5.7' into for-next)
+$ git merge percpu/for-next
+Merge made by the 'recursive' strategy.
+ include/linux/bitmap.h | 8 +++++++-
+ lib/percpu-refcount.c  | 7 ++++---
+ mm/percpu-stats.c      | 2 +-
+ mm/percpu.c            | 2 +-
+ 4 files changed, 13 insertions(+), 6 deletions(-)
+Merging workqueues/for-next (4acf8a423cd3 Merge branch 'for-5.7' into for-next)
+$ git merge workqueues/for-next
+Merge made by the 'recursive' strategy.
+ include/linux/workqueue.h |  4 ++--
+ kernel/workqueue.c        | 12 ++++--------
+ 2 files changed, 6 insertions(+), 10 deletions(-)
+Merging drivers-x86/for-next (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
+$ git merge drivers-x86/for-next
+Already up to date.
+Merging chrome-platform/for-next (317a0ebe53f4 iio: cros_ec: Use Hertz as unit for sampling frequency)
+$ git merge chrome-platform/for-next
+Auto-merging include/linux/platform_data/wilco-ec.h
+Auto-merging include/linux/iio/iio.h
+Auto-merging drivers/power/supply/Kconfig
+Auto-merging drivers/iio/industrialio-core.c
+Merge made by the 'recursive' strategy.
+ drivers/iio/accel/cros_ec_accel_legacy.c           |    8 +-
+ .../iio/common/cros_ec_sensors/cros_ec_lid_angle.c |    3 +-
+ .../iio/common/cros_ec_sensors/cros_ec_sensors.c   |   13 +-
+ .../common/cros_ec_sensors/cros_ec_sensors_core.c  |  375 +++++--
+ drivers/iio/industrialio-core.c                    |    8 +-
+ drivers/iio/light/cros_ec_light_prox.c             |   15 +-
+ drivers/iio/pressure/cros_ec_baro.c                |   14 +-
+ drivers/platform/chrome/Kconfig                    |   27 +-
+ drivers/platform/chrome/Makefile                   |    5 +-
+ drivers/platform/chrome/chromeos_laptop.c          |    2 +-
+ drivers/platform/chrome/cros_ec.c                  |   32 +-
+ drivers/platform/chrome/cros_ec_chardev.c          |    4 +-
+ drivers/platform/chrome/cros_ec_lightbar.c         |   50 +-
+ drivers/platform/chrome/cros_ec_proto.c            |    9 +-
+ drivers/platform/chrome/cros_ec_rpmsg.c            |   16 +-
+ drivers/platform/chrome/cros_ec_sensorhub.c        |  111 ++-
+ drivers/platform/chrome/cros_ec_sensorhub_ring.c   | 1046 ++++++++++++++++++++
+ drivers/platform/chrome/cros_ec_spi.c              |    6 +-
+ drivers/platform/chrome/cros_ec_sysfs.c            |   36 +-
+ drivers/platform/chrome/cros_ec_typec.c            |  357 +++++++
+ drivers/platform/chrome/cros_ec_vbc.c              |    4 +-
+ drivers/platform/chrome/cros_usbpd_notify.c        |  306 ++++++
+ drivers/platform/chrome/wilco_ec/event.c           |    4 +-
+ drivers/platform/chrome/wilco_ec/properties.c      |    3 +
+ drivers/platform/chrome/wilco_ec/sysfs.c           |    4 +
+ drivers/power/supply/Kconfig                       |    2 +-
+ drivers/power/supply/cros_usbpd-charger.c          |   50 +-
+ include/linux/iio/common/cros_ec_sensors_core.h    |  104 +-
+ include/linux/iio/iio.h                            |    2 +
+ include/linux/platform_data/cros_ec_proto.h        |    4 +
+ include/linux/platform_data/cros_ec_sensorhub.h    |  163 +++
+ include/linux/platform_data/cros_usbpd_notify.h    |   17 +
+ include/linux/platform_data/wilco-ec.h             |    8 +-
+ 33 files changed, 2466 insertions(+), 342 deletions(-)
+ create mode 100644 drivers/platform/chrome/cros_ec_sensorhub_ring.c
+ create mode 100644 drivers/platform/chrome/cros_ec_typec.c
+ create mode 100644 drivers/platform/chrome/cros_usbpd_notify.c
+ create mode 100644 include/linux/platform_data/cros_usbpd_notify.h
+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
+Removing include/linux/platform_data/leds-kirkwood-ns2.h
+Removing include/linux/leds_pwm.h
+Merge made by the 'recursive' strategy.
+ drivers/leds/Kconfig                            |  25 ++
+ drivers/leds/Makefile                           | 100 ++++----
+ drivers/leds/leds-bd2802.c                      |   2 -
+ drivers/leds/leds-ip30.c                        |  86 +++++++
+ drivers/leds/leds-is31fl32xx.c                  |   2 +-
+ drivers/leds/leds-lm3532.c                      |   2 +-
+ drivers/leds/leds-lm3697.c                      |   2 +-
+ drivers/leds/leds-ns2.c                         |  99 ++++----
+ drivers/leds/leds-pwm.c                         |  55 ++---
+ drivers/leds/leds-turris-omnia.c                | 295 ++++++++++++++++++++++++
+ include/dt-bindings/leds/common.h               |  36 ++-
+ include/linux/leds.h                            |   1 +
+ include/linux/leds_pwm.h                        |  22 --
+ include/linux/platform_data/leds-kirkwood-ns2.h |  38 ---
+ 14 files changed, 563 insertions(+), 202 deletions(-)
+ create mode 100644 drivers/leds/leds-ip30.c
+ create mode 100644 drivers/leds/leds-turris-omnia.c
+ delete mode 100644 include/linux/leds_pwm.h
+ delete mode 100644 include/linux/platform_data/leds-kirkwood-ns2.h
+Merging ipmi/for-next (26455d00ee58 drivers: char: ipmi: ipmi_msghandler: Pass lockdep expression to RCU lists)
+$ git merge ipmi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/char/ipmi/ipmi_msghandler.c | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+Merging driver-core/driver-core-next (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
+$ git merge driver-core/driver-core-next
+Already up to date.
+Merging usb/usb-next (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
+$ 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 (86b17c7f14ed usb: chipidea: core: show the real pointer value for register)
+$ git merge usb-chipidea-next/ci-for-usb-next
+Merge made by the 'recursive' strategy.
+ drivers/usb/chipidea/core.c | 42 ++++++++----------------------------------
+ drivers/usb/chipidea/udc.h  |  5 +----
+ 2 files changed, 9 insertions(+), 38 deletions(-)
+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 (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
+$ git merge tty/tty-next
+Already up to date.
+Merging char-misc/char-misc-next (885a64715fd8 Revert "driver core: platform: Initialize dma_parms for platform devices")
+$ git merge char-misc/char-misc-next
+Auto-merging scripts/mod/file2alias.c
+Auto-merging scripts/mod/devicetable-offsets.c
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/power/user.c
+Auto-merging include/linux/mod_devicetable.h
+Auto-merging drivers/tty/serial/Kconfig
+Auto-merging drivers/staging/speakup/speakup_soft.c
+Auto-merging drivers/soundwire/qcom.c
+Removing drivers/nvmem/nvmem.h
+Removing drivers/nvmem/nvmem-sysfs.c
+Auto-merging drivers/firmware/imx/Kconfig
+Auto-merging drivers/extcon/extcon-axp288.c
+Removing drivers/char/rtc.c
+Removing drivers/char/efirtc.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/index.rst
+Removing Documentation/devicetree/bindings/interconnect/qcom,sdm845.txt
+Removing Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.txt
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/debugfs-driver-habanalabs          |   14 +
+ .../ABI/testing/sysfs-bus-coresight-devices-cti    |  241 +++
+ .../ABI/testing/sysfs-bus-intel_th-devices-msc     |    8 +
+ .../ABI/testing/sysfs-driver-jz4780-efuse          |   16 +
+ Documentation/admin-guide/dynamic-debug-howto.rst  |    3 +
+ .../devicetree/bindings/arm/coresight-cti.yaml     |  336 +++++
+ .../devicetree/bindings/arm/coresight.txt          |    7 +
+ .../bindings/extcon/extcon-usbc-cros-ec.txt        |   24 -
+ .../bindings/extcon/extcon-usbc-cros-ec.yaml       |   56 +
+ .../bindings/interconnect/qcom,bcm-voter.yaml      |   45 +
+ .../bindings/interconnect/qcom,osm-l3.yaml         |   62 +
+ .../bindings/interconnect/qcom,sc7180.yaml         |   85 ++
+ .../bindings/interconnect/qcom,sdm845.txt          |   24 -
+ .../bindings/interconnect/qcom,sdm845.yaml         |   74 +
+ .../bindings/nvmem/ingenic,jz4780-efuse.yaml       |   45 +
+ Documentation/driver-api/soundwire/stream.rst      |   61 +-
+ Documentation/index.rst                            |    1 +
+ Documentation/mhi/index.rst                        |   18 +
+ Documentation/mhi/mhi.rst                          |  218 +++
+ Documentation/mhi/topology.rst                     |   60 +
+ .../process/embargoed-hardware-issues.rst          |    3 +-
+ Documentation/trace/coresight/coresight-ect.rst    |  222 +++
+ Documentation/trace/coresight/coresight.rst        |   13 +
+ MAINTAINERS                                        |   13 +
+ arch/alpha/configs/defconfig                       |    3 +-
+ arch/arm/include/asm/nwflash.h                     |    1 -
+ arch/ia64/configs/bigsur_defconfig                 |    3 +-
+ arch/ia64/configs/generic_defconfig                |    3 +-
+ arch/ia64/configs/gensparse_defconfig              |    3 +-
+ arch/ia64/configs/tiger_defconfig                  |    3 +-
+ arch/ia64/configs/zx1_defconfig                    |    3 +-
+ arch/um/drivers/random.c                           |    4 +-
+ drivers/android/binderfs.c                         |  200 +--
+ drivers/auxdisplay/charlcd.c                       |    2 -
+ drivers/auxdisplay/panel.c                         |    2 -
+ drivers/bus/Kconfig                                |    1 +
+ drivers/bus/Makefile                               |    3 +
+ drivers/bus/mhi/Kconfig                            |   14 +
+ drivers/bus/mhi/Makefile                           |    2 +
+ drivers/bus/mhi/core/Makefile                      |    3 +
+ drivers/bus/mhi/core/boot.c                        |  507 +++++++
+ drivers/bus/mhi/core/init.c                        | 1293 +++++++++++++++++
+ drivers/bus/mhi/core/internal.h                    |  687 +++++++++
+ drivers/bus/mhi/core/main.c                        | 1529 ++++++++++++++++++++
+ drivers/bus/mhi/core/pm.c                          |  969 +++++++++++++
+ drivers/char/Kconfig                               |  165 +--
+ drivers/char/Makefile                              |    5 -
+ drivers/char/applicom.c                            |    1 -
+ drivers/char/efirtc.c                              |  366 -----
+ drivers/char/mspec.c                               |    2 +-
+ drivers/char/nwbutton.h                            |    1 -
+ drivers/char/nwflash.c                             |    2 +-
+ drivers/char/pcmcia/cm4000_cs.c                    |    4 +-
+ drivers/char/ppdev.c                               |   20 +-
+ drivers/char/rtc.c                                 | 1311 -----------------
+ drivers/char/toshiba.c                             |    2 -
+ drivers/char/virtio_console.c                      |    2 +-
+ drivers/extcon/extcon-axp288.c                     |   32 +
+ drivers/extcon/extcon-palmas.c                     |    8 +-
+ drivers/extcon/extcon.c                            |    1 +
+ drivers/firmware/Kconfig                           |    2 +-
+ drivers/firmware/imx/Kconfig                       |    2 +-
+ drivers/firmware/stratix10-svc.c                   |    1 +
+ drivers/hwtracing/coresight/Kconfig                |   21 +
+ drivers/hwtracing/coresight/Makefile               |    3 +
+ .../hwtracing/coresight/coresight-cti-platform.c   |  485 +++++++
+ drivers/hwtracing/coresight/coresight-cti-sysfs.c  | 1206 +++++++++++++++
+ drivers/hwtracing/coresight/coresight-cti.c        |  745 ++++++++++
+ drivers/hwtracing/coresight/coresight-cti.h        |  235 +++
+ drivers/hwtracing/coresight/coresight-platform.c   |   20 +
+ drivers/hwtracing/coresight/coresight-priv.h       |   15 +
+ drivers/hwtracing/coresight/coresight.c            |   86 +-
+ drivers/hwtracing/intel_th/intel_th.h              |    2 +
+ drivers/hwtracing/intel_th/msu.c                   |   49 +-
+ drivers/hwtracing/intel_th/pci.c                   |    8 +-
+ drivers/interconnect/qcom/Kconfig                  |   25 +
+ drivers/interconnect/qcom/Makefile                 |    8 +
+ drivers/interconnect/qcom/bcm-voter.c              |  366 +++++
+ drivers/interconnect/qcom/bcm-voter.h              |   27 +
+ drivers/interconnect/qcom/icc-rpmh.c               |  150 ++
+ drivers/interconnect/qcom/icc-rpmh.h               |  149 ++
+ drivers/interconnect/qcom/osm-l3.c                 |  276 ++++
+ drivers/interconnect/qcom/sc7180.c                 |  641 ++++++++
+ drivers/interconnect/qcom/sc7180.h                 |  151 ++
+ drivers/interconnect/qcom/sdm845.c                 | 1055 +++++---------
+ drivers/interconnect/qcom/sdm845.h                 |  142 ++
+ drivers/macintosh/ans-lcd.c                        |    2 +-
+ drivers/macintosh/ans-lcd.h                        |    2 -
+ drivers/macintosh/via-pmu.c                        |    3 -
+ drivers/misc/cardreader/rts5227.c                  |    1 +
+ drivers/misc/habanalabs/command_submission.c       |   51 +-
+ drivers/misc/habanalabs/debugfs.c                  |   92 +-
+ drivers/misc/habanalabs/device.c                   |    2 +-
+ drivers/misc/habanalabs/goya/goya.c                |  204 ++-
+ drivers/misc/habanalabs/goya/goya_coresight.c      |    4 +-
+ drivers/misc/habanalabs/goya/goya_hwmgr.c          |    2 +-
+ drivers/misc/habanalabs/habanalabs.h               |   62 +-
+ drivers/misc/habanalabs/habanalabs_drv.c           |   11 +-
+ drivers/misc/habanalabs/hwmon.c                    |  106 +-
+ drivers/misc/habanalabs/include/armcp_if.h         |   20 +-
+ .../habanalabs/include/goya/goya_async_events.h    |    4 +
+ .../misc/habanalabs/include/goya/goya_reg_map.h    |   39 +-
+ drivers/misc/habanalabs/include/hl_boot_if.h       |   39 +-
+ drivers/misc/habanalabs/memory.c                   |  222 ++-
+ drivers/misc/habanalabs/mmu.c                      |  110 +-
+ drivers/misc/lkdtm/stackleak.c                     |   25 +-
+ drivers/misc/mei/bus-fixup.c                       |    4 +-
+ drivers/misc/mei/client.c                          |    4 +-
+ drivers/misc/mei/hw-me-regs.h                      |    6 +-
+ drivers/misc/mei/hw.h                              |    5 +-
+ drivers/misc/mei/mei_dev.h                         |    2 +-
+ drivers/misc/mei/pci-me.c                          |   17 +-
+ drivers/misc/mei/pci-txe.c                         |    5 +-
+ drivers/misc/mic/host/mic_boot.c                   |    2 +-
+ drivers/misc/mic/host/mic_x100.c                   |    4 +-
+ drivers/misc/sgi-gru/grulib.h                      |    2 +-
+ drivers/misc/sgi-gru/grutables.h                   |    2 +-
+ drivers/nvmem/Kconfig                              |   12 +
+ drivers/nvmem/Makefile                             |    5 +-
+ drivers/nvmem/core.c                               |  365 ++++-
+ drivers/nvmem/imx-ocotp.c                          |   29 +-
+ drivers/nvmem/jz4780-efuse.c                       |  239 +++
+ drivers/nvmem/mxs-ocotp.c                          |   30 +-
+ drivers/nvmem/nvmem-sysfs.c                        |  263 ----
+ drivers/nvmem/nvmem.h                              |   64 -
+ drivers/nvmem/sprd-efuse.c                         |   27 +-
+ drivers/sbus/char/envctrl.c                        |    2 -
+ drivers/sbus/char/flash.c                          |    4 +-
+ drivers/sbus/char/uctrl.c                          |    2 -
+ drivers/soundwire/bus.c                            |  537 ++++++-
+ drivers/soundwire/bus.h                            |    9 +
+ drivers/soundwire/bus_type.c                       |    5 +
+ drivers/soundwire/cadence_master.c                 |  282 +++-
+ drivers/soundwire/cadence_master.h                 |   17 +-
+ drivers/soundwire/intel.c                          |  200 ++-
+ drivers/soundwire/qcom.c                           |    8 +
+ drivers/soundwire/slave.c                          |    4 +
+ drivers/soundwire/stream.c                         |   99 +-
+ drivers/staging/speakup/devsynth.c                 |   10 +-
+ drivers/staging/speakup/speakup_soft.c             |   14 +-
+ drivers/tty/Kconfig                                |  173 +--
+ drivers/tty/hvc/Kconfig                            |    3 -
+ drivers/tty/serial/Kconfig                         |    4 -
+ drivers/uio/uio.c                                  |   38 +
+ drivers/uio/uio_pdrv_genirq.c                      |   34 +-
+ drivers/video/fbdev/pxa3xx-gcu.c                   |    7 +-
+ drivers/virt/vboxguest/vboxguest_core.c            |    2 +-
+ drivers/virt/vboxguest/vboxguest_utils.c           |    2 +-
+ include/dt-bindings/arm/coresight-cti-dt.h         |   37 +
+ include/dt-bindings/interconnect/qcom,osm-l3.h     |   12 +
+ include/dt-bindings/interconnect/qcom,sc7180.h     |  161 +++
+ include/dt-bindings/interconnect/qcom,sdm845.h     |  263 ++--
+ include/linux/coresight.h                          |   27 +
+ include/linux/extcon-provider.h                    |   28 +-
+ include/linux/extcon.h                             |    5 +
+ include/linux/mhi.h                                |  700 +++++++++
+ include/linux/miscdevice.h                         |   14 +-
+ include/linux/mod_devicetable.h                    |   13 +
+ include/linux/nvmem-consumer.h                     |    7 +
+ include/linux/soundwire/sdw.h                      |   47 +
+ include/linux/uio_driver.h                         |   33 +-
+ include/uapi/linux/coresight-stm.h                 |    6 +-
+ kernel/power/user.c                                |    2 -
+ lib/Kconfig.debug                                  |    7 +-
+ lib/dynamic_debug.c                                |   28 +-
+ scripts/mod/devicetable-offsets.c                  |    3 +
+ scripts/mod/file2alias.c                           |   10 +
+ scripts/ver_linux                                  |   24 +-
+ .../selftests/filesystems/binderfs/Makefile        |    4 +-
+ .../selftests/filesystems/binderfs/binderfs_test.c |  498 +++++--
+ 170 files changed, 16139 insertions(+), 4010 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-coresight-devices-cti
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-jz4780-efuse
+ create mode 100644 Documentation/devicetree/bindings/arm/coresight-cti.yaml
+ delete mode 100644 Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.txt
+ create mode 100644 Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.yaml
+ create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,bcm-voter.yaml
+ create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,osm-l3.yaml
+ create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sc7180.yaml
+ delete mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sdm845.txt
+ create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sdm845.yaml
+ create mode 100644 Documentation/devicetree/bindings/nvmem/ingenic,jz4780-efuse.yaml
+ create mode 100644 Documentation/mhi/index.rst
+ create mode 100644 Documentation/mhi/mhi.rst
+ create mode 100644 Documentation/mhi/topology.rst
+ create mode 100644 Documentation/trace/coresight/coresight-ect.rst
+ create mode 100644 drivers/bus/mhi/Kconfig
+ create mode 100644 drivers/bus/mhi/Makefile
+ create mode 100644 drivers/bus/mhi/core/Makefile
+ create mode 100644 drivers/bus/mhi/core/boot.c
+ create mode 100644 drivers/bus/mhi/core/init.c
+ create mode 100644 drivers/bus/mhi/core/internal.h
+ create mode 100644 drivers/bus/mhi/core/main.c
+ create mode 100644 drivers/bus/mhi/core/pm.c
+ delete mode 100644 drivers/char/efirtc.c
+ delete mode 100644 drivers/char/rtc.c
+ create mode 100644 drivers/hwtracing/coresight/coresight-cti-platform.c
+ create mode 100644 drivers/hwtracing/coresight/coresight-cti-sysfs.c
+ create mode 100644 drivers/hwtracing/coresight/coresight-cti.c
+ create mode 100644 drivers/hwtracing/coresight/coresight-cti.h
+ create mode 100644 drivers/interconnect/qcom/bcm-voter.c
+ create mode 100644 drivers/interconnect/qcom/bcm-voter.h
+ create mode 100644 drivers/interconnect/qcom/icc-rpmh.c
+ create mode 100644 drivers/interconnect/qcom/icc-rpmh.h
+ create mode 100644 drivers/interconnect/qcom/osm-l3.c
+ create mode 100644 drivers/interconnect/qcom/sc7180.c
+ create mode 100644 drivers/interconnect/qcom/sc7180.h
+ create mode 100644 drivers/interconnect/qcom/sdm845.h
+ create mode 100644 drivers/nvmem/jz4780-efuse.c
+ delete mode 100644 drivers/nvmem/nvmem-sysfs.c
+ delete mode 100644 drivers/nvmem/nvmem.h
+ create mode 100644 include/dt-bindings/arm/coresight-cti-dt.h
+ create mode 100644 include/dt-bindings/interconnect/qcom,osm-l3.h
+ create mode 100644 include/dt-bindings/interconnect/qcom,sc7180.h
+ create mode 100644 include/linux/mhi.h
+Merging extcon/extcon-next (9c94553099ef extcon: axp288: Add wakeup support)
+$ git merge extcon/extcon-next
+Already up to date.
+Merging soundwire/next (39ec6f992131 soundwire: qcom: add support for get_sdw_stream())
+$ 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 (1a323ea5356e x86: get rid of 'errret' argument to __get_user_xyz() macross)
+$ git merge staging/staging-next
+Already up to date.
+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 (cea582b5ee56 dt-bindings: dma: renesas,usb-dmac: add r8a77961 support)
+$ git merge slave-dma/next
+Auto-merging drivers/dma/ti/k3-udma.c
+CONFLICT (content): Merge conflict in drivers/dma/ti/k3-udma.c
+Auto-merging drivers/dma/ti/k3-udma-glue.c
+Auto-merging drivers/dma/tegra20-apb-dma.c
+Auto-merging drivers/dma/idxd/sysfs.c
+Auto-merging drivers/dma/idxd/cdev.c
+Auto-merging drivers/dma/dmaengine.c
+Auto-merging Documentation/devicetree/bindings/dma/ti/k3-udma.yaml
+Resolved 'drivers/dma/ti/k3-udma.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master da9ae0c51d9c] Merge remote-tracking branch 'slave-dma/next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/dma/renesas,usb-dmac.txt   |   1 +
+ .../bindings/dma/socionext,uniphier-xdmac.yaml     |  63 +++
+ Documentation/devicetree/bindings/dma/ti-edma.txt  |   2 +-
+ .../devicetree/bindings/dma/ti/k3-udma.yaml        |  19 +-
+ drivers/dma/Kconfig                                |  15 +-
+ drivers/dma/Makefile                               |   1 +
+ drivers/dma/at_hdmac.c                             | 121 ++--
+ drivers/dma/at_hdmac_regs.h                        |   2 -
+ drivers/dma/at_xdmac.c                             |  44 +-
+ drivers/dma/bcm-sba-raid.c                         |   2 +-
+ drivers/dma/dmaengine.c                            | 102 +++-
+ drivers/dma/dmaengine.h                            |  16 +
+ drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c            |  15 +
+ drivers/dma/fsl-dpaa2-qdma/dpdmai.c                |  21 +
+ drivers/dma/fsl-dpaa2-qdma/dpdmai.h                |   2 +
+ drivers/dma/idxd/cdev.c                            |   4 +-
+ drivers/dma/idxd/device.c                          |   4 +-
+ drivers/dma/idxd/sysfs.c                           |  19 +-
+ drivers/dma/ioat/dca.c                             |   2 +-
+ drivers/dma/ppc4xx/adma.c                          |   2 +-
+ drivers/dma/sa11x0-dma.c                           |   2 +-
+ drivers/dma/sh/rcar-dmac.c                         |   2 +-
+ drivers/dma/sh/shdma-base.c                        |   2 +-
+ drivers/dma/sprd-dma.c                             |  26 +-
+ drivers/dma/stm32-dma.c                            |  96 +++-
+ drivers/dma/stm32-dmamux.c                         |  93 +++-
+ drivers/dma/stm32-mdma.c                           |  78 ++-
+ drivers/dma/sun4i-dma.c                            |   4 +-
+ drivers/dma/tegra20-apb-dma.c                      | 546 +++++++++---------
+ drivers/dma/tegra210-adma.c                        |   2 +-
+ drivers/dma/ti/dma-crossbar.c                      |   8 +-
+ drivers/dma/ti/edma.c                              |  79 +++
+ drivers/dma/ti/k3-udma-glue.c                      |  18 +-
+ drivers/dma/ti/k3-udma.c                           | 113 +++-
+ drivers/dma/ti/omap-dma.c                          |   2 +-
+ drivers/dma/uniphier-mdmac.c                       |   2 +-
+ drivers/dma/uniphier-xdmac.c                       | 609 +++++++++++++++++++++
+ drivers/dma/xilinx/xilinx_dma.c                    |  65 +--
+ include/linux/dmaengine.h                          |  68 +--
+ include/uapi/linux/idxd.h                          |  21 +-
+ 40 files changed, 1749 insertions(+), 544 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dma/socionext,uniphier-xdmac.yaml
+ create mode 100644 drivers/dma/uniphier-xdmac.c
+Merging cgroup/for-next (6fc331767f41 Merge branch 'for-5.7' into for-next)
+$ git merge cgroup/for-next
+Auto-merging mm/shmem.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/cgroup/cgroup.c
+Auto-merging include/linux/xattr.h
+Merge made by the 'recursive' strategy.
+ fs/kernfs/inode.c                                 |  91 +++++-
+ fs/kernfs/kernfs-internal.h                       |   2 +
+ fs/xattr.c                                        |  17 +-
+ include/linux/cgroup-defs.h                       |   5 +-
+ include/linux/cgroup.h                            |  23 +-
+ include/linux/cpuset.h                            |   3 -
+ include/linux/kernfs.h                            |  11 +-
+ include/linux/sched/task.h                        |   4 +
+ include/linux/xattr.h                             |   3 +-
+ include/uapi/linux/sched.h                        |   5 +
+ kernel/cgroup/cgroup-v1.c                         |  34 +-
+ kernel/cgroup/cgroup.c                            | 361 ++++++++++++++++------
+ kernel/cgroup/cpuset.c                            |  31 +-
+ kernel/cgroup/pids.c                              |  15 +-
+ kernel/fork.c                                     |  19 +-
+ kernel/power/process.c                            |   2 -
+ mm/shmem.c                                        |   2 +-
+ tools/testing/selftests/cgroup/Makefile           |   6 +-
+ tools/testing/selftests/cgroup/cgroup_util.c      | 126 ++++++++
+ tools/testing/selftests/cgroup/cgroup_util.h      |   4 +
+ tools/testing/selftests/cgroup/test_core.c        | 177 +++++++++++
+ tools/testing/selftests/clone3/clone3_selftests.h |  19 +-
+ 22 files changed, 797 insertions(+), 163 deletions(-)
+Merging scsi/for-next (9dfce4c4d3cd Merge branch 'misc' into for-next)
+$ git merge scsi/for-next
+Auto-merging scripts/documentation-file-ref-check
+Auto-merging drivers/scsi/lpfc/lpfc_attr.c
+Auto-merging drivers/scsi/arcmsr/arcmsr_hba.c
+Auto-merging drivers/scsi/aacraid/linit.c
+Auto-merging drivers/scsi/Kconfig
+Auto-merging drivers/scsi/BusLogic.c
+Auto-merging drivers/s390/scsi/zfcp_fsf.c
+Auto-merging drivers/nvme/target/rdma.c
+Auto-merging drivers/nvme/host/rdma.c
+Auto-merging arch/x86/configs/x86_64_defconfig
+Auto-merging arch/x86/configs/i386_defconfig
+Auto-merging arch/mips/configs/jazz_defconfig
+Auto-merging arch/m68k/configs/sun3x_defconfig
+Auto-merging arch/m68k/configs/sun3_defconfig
+Auto-merging arch/m68k/configs/q40_defconfig
+Auto-merging arch/m68k/configs/mvme16x_defconfig
+Auto-merging arch/m68k/configs/mvme147_defconfig
+Auto-merging arch/m68k/configs/multi_defconfig
+Auto-merging arch/m68k/configs/mac_defconfig
+Auto-merging arch/m68k/configs/hp300_defconfig
+Auto-merging arch/m68k/configs/bvme6000_defconfig
+Auto-merging arch/m68k/configs/atari_defconfig
+Auto-merging arch/m68k/configs/apollo_defconfig
+Auto-merging arch/m68k/configs/amiga_defconfig
+Auto-merging arch/ia64/configs/zx1_defconfig
+Auto-merging arch/alpha/configs/defconfig
+Auto-merging MAINTAINERS
+Removing Documentation/scsi/wd719x.txt
+Removing Documentation/scsi/sd-parameters.txt
+Removing Documentation/scsi/scsi_transport_srp/Makefile
+CONFLICT (modify/delete): Documentation/scsi/scsi_mid_low_api.txt deleted in scsi/for-next and modified in HEAD. Version HEAD of Documentation/scsi/scsi_mid_low_api.txt left in tree.
+Removing Documentation/scsi/ppa.txt
+Removing Documentation/scsi/g_NCR5380.txt
+Removing Documentation/scsi/dpti.txt
+Removing Documentation/scsi/arcmsr_spec.txt
+Removing Documentation/scsi/aic7xxx.txt
+Removing Documentation/scsi/aic79xx.txt
+Removing Documentation/scsi/NinjaSCSI.txt
+Removing Documentation/scsi/FlashPoint.txt
+Auto-merging Documentation/index.rst
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f Documentation/scsi/scsi_mid_low_api.txt
+rm 'Documentation/scsi/scsi_mid_low_api.txt'
+$ git commit --no-edit -v -a
+[master bb81cab08137] Merge remote-tracking branch 'scsi/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/driver-api/libata.rst                |    2 +-
+ Documentation/index.rst                            |    1 +
+ Documentation/scsi/{53c700.txt => 53c700.rst}      |   61 +-
+ Documentation/scsi/{BusLogic.txt => BusLogic.rst}  |   89 +-
+ Documentation/scsi/FlashPoint.rst                  |  176 ++
+ Documentation/scsi/FlashPoint.txt                  |  163 --
+ Documentation/scsi/NinjaSCSI.rst                   |  164 ++
+ Documentation/scsi/NinjaSCSI.txt                   |  128 --
+ Documentation/scsi/{aacraid.txt => aacraid.rst}    |   59 +-
+ Documentation/scsi/{advansys.txt => advansys.rst}  |  129 +-
+ Documentation/scsi/{aha152x.txt => aha152x.rst}    |   73 +-
+ Documentation/scsi/aic79xx.rst                     |  593 +++++++
+ Documentation/scsi/aic79xx.txt                     |  497 ------
+ Documentation/scsi/aic7xxx.rst                     |  458 +++++
+ Documentation/scsi/aic7xxx.txt                     |  394 -----
+ Documentation/scsi/arcmsr_spec.rst                 |  907 ++++++++++
+ Documentation/scsi/arcmsr_spec.txt                 |  574 ------
+ Documentation/scsi/{bfa.txt => bfa.rst}            |   28 +-
+ Documentation/scsi/{bnx2fc.txt => bnx2fc.rst}      |   18 +-
+ Documentation/scsi/{cxgb3i.txt => cxgb3i.rst}      |   22 +-
+ Documentation/scsi/{dc395x.txt => dc395x.rst}      |   79 +-
+ Documentation/scsi/dpti.rst                        |   92 +
+ Documentation/scsi/dpti.txt                        |   83 -
+ Documentation/scsi/g_NCR5380.rst                   |   93 +
+ Documentation/scsi/g_NCR5380.txt                   |   68 -
+ Documentation/scsi/{hpsa.txt => hpsa.rst}          |   79 +-
+ Documentation/scsi/{hptiop.txt => hptiop.rst}      |   45 +-
+ Documentation/scsi/index.rst                       |   51 +
+ Documentation/scsi/{libsas.txt => libsas.rst}      |  352 ++--
+ ...policy.txt => link_power_management_policy.rst} |   12 +-
+ Documentation/scsi/{lpfc.txt => lpfc.rst}          |   16 +-
+ Documentation/scsi/{megaraid.txt => megaraid.rst}  |   47 +-
+ .../scsi/{ncr53c8xx.txt => ncr53c8xx.rst}          | 1871 ++++++++++++--------
+ Documentation/scsi/ppa.rst                         |   18 +
+ Documentation/scsi/ppa.txt                         |   14 -
+ .../scsi/{qlogicfas.txt => qlogicfas.rst}          |   17 +-
+ .../scsi/{scsi-changer.txt => scsi-changer.rst}    |   36 +-
+ .../scsi/{scsi-generic.txt => scsi-generic.rst}    |   75 +-
+ .../{scsi-parameters.txt => scsi-parameters.rst}   |   28 +-
+ Documentation/scsi/{scsi.txt => scsi.rst}          |   31 +-
+ Documentation/scsi/{scsi_eh.txt => scsi_eh.rst}    |  213 ++-
+ ...scsi_fc_transport.txt => scsi_fc_transport.rst} |  242 ++-
+ Documentation/scsi/scsi_mid_low_api.rst            | 1334 ++++++++++++++
+ Documentation/scsi/scsi_mid_low_api.txt            | 1259 -------------
+ Documentation/scsi/scsi_transport_srp/Makefile     |    7 -
+ Documentation/scsi/scsi_transport_srp/figures.rst  |    6 +
+ Documentation/scsi/sd-parameters.rst               |   27 +
+ Documentation/scsi/sd-parameters.txt               |   22 -
+ Documentation/scsi/{smartpqi.txt => smartpqi.rst}  |   52 +-
+ Documentation/scsi/{st.txt => st.rst}              |  301 ++--
+ .../scsi/{sym53c500_cs.txt => sym53c500_cs.rst}    |    8 +-
+ .../scsi/{sym53c8xx_2.txt => sym53c8xx_2.rst}      | 1131 +++++++-----
+ .../scsi/{tcm_qla2xxx.txt => tcm_qla2xxx.rst}      |   26 +-
+ Documentation/scsi/{ufs.txt => ufs.rst}            |   84 +-
+ Documentation/scsi/wd719x.rst                      |   24 +
+ Documentation/scsi/wd719x.txt                      |   21 -
+ MAINTAINERS                                        |   28 +-
+ arch/alpha/configs/defconfig                       |    1 -
+ arch/arm/configs/rpc_defconfig                     |    1 -
+ arch/arm/configs/s3c2410_defconfig                 |    1 -
+ arch/c6x/include/asm/unaligned.h                   |   65 +-
+ arch/ia64/configs/zx1_defconfig                    |    1 -
+ arch/m68k/configs/amiga_defconfig                  |    1 -
+ arch/m68k/configs/apollo_defconfig                 |    1 -
+ arch/m68k/configs/atari_defconfig                  |    1 -
+ arch/m68k/configs/bvme6000_defconfig               |    1 -
+ arch/m68k/configs/hp300_defconfig                  |    1 -
+ arch/m68k/configs/mac_defconfig                    |    1 -
+ arch/m68k/configs/multi_defconfig                  |    1 -
+ arch/m68k/configs/mvme147_defconfig                |    1 -
+ arch/m68k/configs/mvme16x_defconfig                |    1 -
+ arch/m68k/configs/q40_defconfig                    |    1 -
+ arch/m68k/configs/sun3_defconfig                   |    1 -
+ arch/m68k/configs/sun3x_defconfig                  |    1 -
+ arch/mips/configs/bigsur_defconfig                 |    1 -
+ arch/mips/configs/fuloong2e_defconfig              |    1 -
+ arch/mips/configs/ip27_defconfig                   |    1 -
+ arch/mips/configs/ip32_defconfig                   |    1 -
+ arch/mips/configs/jazz_defconfig                   |    1 -
+ arch/mips/configs/malta_defconfig                  |    1 -
+ arch/mips/configs/malta_kvm_defconfig              |    1 -
+ arch/mips/configs/malta_kvm_guest_defconfig        |    1 -
+ arch/mips/configs/maltaup_xpa_defconfig            |    1 -
+ arch/mips/configs/rm200_defconfig                  |    1 -
+ arch/powerpc/configs/85xx-hw.config                |    1 -
+ arch/powerpc/configs/amigaone_defconfig            |    1 -
+ arch/powerpc/configs/chrp32_defconfig              |    1 -
+ arch/powerpc/configs/g5_defconfig                  |    1 -
+ arch/powerpc/configs/maple_defconfig               |    1 -
+ arch/powerpc/configs/pasemi_defconfig              |    1 -
+ arch/powerpc/configs/pmac32_defconfig              |    1 -
+ arch/powerpc/configs/powernv_defconfig             |    1 -
+ arch/powerpc/configs/ppc64_defconfig               |    1 -
+ arch/powerpc/configs/ppc64e_defconfig              |    1 -
+ arch/powerpc/configs/ppc6xx_defconfig              |    1 -
+ arch/powerpc/configs/pseries_defconfig             |    1 -
+ arch/powerpc/configs/skiroot_defconfig             |    1 -
+ arch/sh/configs/sh03_defconfig                     |    1 -
+ arch/sparc/configs/sparc64_defconfig               |    1 -
+ arch/x86/configs/i386_defconfig                    |    1 -
+ arch/x86/configs/x86_64_defconfig                  |    1 -
+ block/scsi_ioctl.c                                 |    4 +
+ drivers/message/fusion/mptlan.h                    |    5 +-
+ drivers/message/fusion/mptsas.h                    |    2 +-
+ drivers/nvme/host/rdma.c                           |    8 -
+ drivers/nvme/target/rdma.c                         |    6 -
+ drivers/s390/scsi/zfcp_dbf.c                       |   44 +-
+ drivers/s390/scsi/zfcp_dbf.h                       |   32 +-
+ drivers/s390/scsi/zfcp_def.h                       |    6 +-
+ drivers/s390/scsi/zfcp_erp.c                       |    2 +-
+ drivers/s390/scsi/zfcp_ext.h                       |   12 +-
+ drivers/s390/scsi/zfcp_fsf.c                       |  290 ++-
+ drivers/s390/scsi/zfcp_fsf.h                       |   23 +-
+ drivers/s390/scsi/zfcp_scsi.c                      |    5 +
+ drivers/s390/scsi/zfcp_sysfs.c                     |   70 +-
+ drivers/scsi/BusLogic.c                            |    2 +-
+ drivers/scsi/Kconfig                               |   51 +-
+ drivers/scsi/aacraid/aachba.c                      |   83 +-
+ drivers/scsi/aacraid/comminit.c                    |   35 +-
+ drivers/scsi/aacraid/commsup.c                     |   48 +-
+ drivers/scsi/aacraid/linit.c                       |  171 +-
+ drivers/scsi/advansys.c                            |    2 +-
+ drivers/scsi/aha152x.c                             |    4 +-
+ drivers/scsi/aha1740.c                             |    1 -
+ drivers/scsi/aic7xxx/Kconfig.aic79xx               |    2 +-
+ drivers/scsi/aic7xxx/Kconfig.aic7xxx               |    2 +-
+ drivers/scsi/aic7xxx/aic79xx_core.c                |   22 +-
+ drivers/scsi/arcmsr/arcmsr_attr.c                  |    2 +-
+ drivers/scsi/arcmsr/arcmsr_hba.c                   |    2 +-
+ drivers/scsi/be2iscsi/be_mgmt.c                    |   20 +-
+ drivers/scsi/bnx2fc/bnx2fc.h                       |   13 +-
+ drivers/scsi/bnx2fc/bnx2fc_fcoe.c                  |    8 +-
+ drivers/scsi/bnx2fc/bnx2fc_hwi.c                   |  103 +-
+ drivers/scsi/bnx2fc/bnx2fc_io.c                    |   34 +-
+ drivers/scsi/ch.c                                  |   40 +-
+ drivers/scsi/dc395x.c                              |   34 -
+ drivers/scsi/dpt/dpti_ioctl.h                      |    2 +-
+ drivers/scsi/dpt_i2o.c                             |   27 +-
+ drivers/scsi/dpti.h                                |    5 +-
+ drivers/scsi/fnic/fnic_trace.c                     |   58 +-
+ drivers/scsi/fnic/vnic_devcmd.h                    |    2 +-
+ drivers/scsi/g_NCR5380.c                           |    2 +-
+ drivers/scsi/gdth_proc.c                           |    2 +-
+ drivers/scsi/hisi_sas/hisi_sas_v3_hw.c             |    3 +-
+ drivers/scsi/hosts.c                               |   65 +
+ drivers/scsi/hpsa.c                                |   80 +-
+ drivers/scsi/ibmvscsi/ibmvfc.c                     |  207 ++-
+ drivers/scsi/ibmvscsi/ibmvfc.h                     |    3 +-
+ drivers/scsi/ipr.c                                 |    6 +-
+ drivers/scsi/ipr.h                                 |    6 +-
+ drivers/scsi/isci/sas.h                            |    2 +-
+ drivers/scsi/libfc/fc_rport.c                      |   10 +-
+ drivers/scsi/libiscsi.c                            |    9 +-
+ drivers/scsi/lpfc/lpfc.h                           |   58 +-
+ drivers/scsi/lpfc/lpfc_attr.c                      |   78 +-
+ drivers/scsi/lpfc/lpfc_crtn.h                      |    6 +-
+ drivers/scsi/lpfc/lpfc_ct.c                        |  141 +-
+ drivers/scsi/lpfc/lpfc_debugfs.c                   |  333 ++--
+ drivers/scsi/lpfc/lpfc_debugfs.h                   |    3 +-
+ drivers/scsi/lpfc/lpfc_els.c                       |  519 +++---
+ drivers/scsi/lpfc/lpfc_hbadisc.c                   |   65 +-
+ drivers/scsi/lpfc/lpfc_hw.h                        |   82 +-
+ drivers/scsi/lpfc/lpfc_hw4.h                       |   19 +
+ drivers/scsi/lpfc/lpfc_init.c                      |  146 +-
+ drivers/scsi/lpfc/lpfc_mbox.c                      |    2 -
+ drivers/scsi/lpfc/lpfc_nvme.c                      |  147 +-
+ drivers/scsi/lpfc/lpfc_nvmet.c                     |   62 +-
+ drivers/scsi/lpfc/lpfc_scsi.c                      |   96 +-
+ drivers/scsi/lpfc/lpfc_sli.c                       |   63 +-
+ drivers/scsi/lpfc/lpfc_sli.h                       |    2 +-
+ drivers/scsi/lpfc/lpfc_sli4.h                      |   19 +-
+ drivers/scsi/lpfc/lpfc_version.h                   |    4 +-
+ drivers/scsi/megaraid/megaraid_sas_base.c          |   11 +-
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c               |    2 +-
+ drivers/scsi/mvsas/mv_sas.h                        |    2 +-
+ drivers/scsi/mvumi.h                               |    4 +-
+ drivers/scsi/ncr53c8xx.c                           |    2 +-
+ drivers/scsi/pcmcia/Kconfig                        |    2 +-
+ drivers/scsi/pm8001/pm8001_ctl.c                   |   51 +-
+ drivers/scsi/pm8001/pm8001_defs.h                  |    5 +-
+ drivers/scsi/pm8001/pm8001_hwi.c                   |   22 +-
+ drivers/scsi/pm8001/pm8001_init.c                  |   80 +-
+ drivers/scsi/pm8001/pm8001_sas.h                   |    7 +-
+ drivers/scsi/pm8001/pm80xx_hwi.c                   |  155 +-
+ drivers/scsi/pmcraid.h                             |    2 +-
+ drivers/scsi/qedi/qedi.h                           |    3 +
+ drivers/scsi/qedi/qedi_gbl.h                       |    1 +
+ drivers/scsi/qedi/qedi_iscsi.c                     |   18 +
+ drivers/scsi/qedi/qedi_iscsi.h                     |    1 +
+ drivers/scsi/qedi/qedi_main.c                      |  104 +-
+ drivers/scsi/qla2xxx/qla_attr.c                    |  133 +-
+ drivers/scsi/qla2xxx/qla_bsg.c                     |   36 +-
+ drivers/scsi/qla2xxx/qla_dbg.c                     |   23 +-
+ drivers/scsi/qla2xxx/qla_def.h                     |  387 ++--
+ drivers/scsi/qla2xxx/qla_dfs.c                     |   11 +-
+ drivers/scsi/qla2xxx/qla_fw.h                      |  173 +-
+ drivers/scsi/qla2xxx/qla_gbl.h                     |   23 +-
+ drivers/scsi/qla2xxx/qla_gs.c                      | 1707 ++++++++----------
+ drivers/scsi/qla2xxx/qla_init.c                    |  202 +--
+ drivers/scsi/qla2xxx/qla_iocb.c                    |   42 +-
+ drivers/scsi/qla2xxx/qla_isr.c                     |  295 ++-
+ drivers/scsi/qla2xxx/qla_mbx.c                     |  388 +++-
+ drivers/scsi/qla2xxx/qla_mid.c                     |   13 +-
+ drivers/scsi/qla2xxx/qla_mr.c                      |   13 +-
+ drivers/scsi/qla2xxx/qla_nvme.c                    |    2 +-
+ drivers/scsi/qla2xxx/qla_os.c                      |  722 +++++++-
+ drivers/scsi/qla2xxx/qla_sup.c                     |   13 +-
+ drivers/scsi/qla2xxx/qla_target.c                  |   38 +-
+ drivers/scsi/qla2xxx/qla_target.h                  |    2 +
+ drivers/scsi/qla2xxx/qla_tmpl.c                    |   17 +-
+ drivers/scsi/qla2xxx/qla_tmpl.h                    |    4 +-
+ drivers/scsi/qla2xxx/qla_version.h                 |    2 +-
+ drivers/scsi/qla2xxx/tcm_qla2xxx.c                 |   25 +
+ drivers/scsi/scsi.c                                |   18 -
+ drivers/scsi/scsi_error.c                          |    1 -
+ drivers/scsi/scsi_lib.c                            |   98 +-
+ drivers/scsi/scsi_priv.h                           |    3 -
+ drivers/scsi/scsi_scan.c                           |    1 -
+ drivers/scsi/scsi_sysfs.c                          |   18 +-
+ drivers/scsi/scsi_trace.c                          |    6 +-
+ drivers/scsi/scsi_transport_iscsi.c                |  135 +-
+ drivers/scsi/smartpqi/Kconfig                      |    2 +-
+ drivers/scsi/smartpqi/smartpqi_init.c              |   22 +-
+ drivers/scsi/snic/vnic_devcmd.h                    |    2 +-
+ drivers/scsi/sr.c                                  |   20 +-
+ drivers/scsi/sr.h                                  |    2 +
+ drivers/scsi/sr_vendor.c                           |    8 -
+ drivers/scsi/st.c                                  |    6 +-
+ drivers/scsi/stex.c                                |    2 +-
+ drivers/scsi/ufs/Kconfig                           |    2 +-
+ drivers/scsi/ufs/cdns-pltfrm.c                     |    2 +-
+ drivers/scsi/ufs/ufs-hisi.c                        |    2 +-
+ drivers/scsi/ufs/ufs-mediatek.c                    |  154 +-
+ drivers/scsi/ufs/ufs-mediatek.h                    |   15 +
+ drivers/scsi/ufs/ufs-qcom.c                        |  146 +-
+ drivers/scsi/ufs/ufs-sysfs.c                       |   28 +-
+ drivers/scsi/ufs/ufs.h                             |    3 +
+ drivers/scsi/ufs/ufs_quirks.h                      |    1 +
+ drivers/scsi/ufs/ufshcd-pci.c                      |    2 +-
+ drivers/scsi/ufs/ufshcd.c                          |  430 ++---
+ drivers/scsi/ufs/ufshcd.h                          |  206 +--
+ drivers/scsi/ufs/unipro.h                          |    7 +
+ drivers/scsi/virtio_scsi.c                         |    1 -
+ drivers/scsi/zorro_esp.c                           |    5 +-
+ drivers/target/iscsi/iscsi_target.c                |   82 +-
+ drivers/target/iscsi/iscsi_target.h                |    1 -
+ drivers/target/iscsi/iscsi_target_configfs.c       |    5 +-
+ drivers/target/iscsi/iscsi_target_login.c          |    5 +-
+ drivers/target/target_core_configfs.c              |    4 +-
+ drivers/target/target_core_device.c                |    4 +-
+ drivers/target/target_core_spc.c                   |   13 +-
+ drivers/target/target_core_tmr.c                   |    6 +-
+ drivers/target/target_core_transport.c             |    3 +-
+ drivers/target/target_core_ua.c                    |    8 +-
+ drivers/target/target_core_xcopy.c                 |  187 +-
+ drivers/target/target_core_xcopy.h                 |    9 +-
+ drivers/usb/gadget/function/f_mass_storage.c       |    1 +
+ drivers/usb/gadget/function/storage_common.h       |    5 -
+ include/linux/unaligned/be_byteshift.h             |    6 +-
+ include/linux/unaligned/generic.h                  |   46 +
+ include/linux/unaligned/le_byteshift.h             |    6 +-
+ include/scsi/iscsi_if.h                            |   11 +-
+ include/scsi/scsi_bsg_iscsi.h                      |    2 +-
+ include/scsi/scsi_cmnd.h                           |    1 -
+ include/scsi/scsi_device.h                         |    8 +-
+ include/scsi/scsi_host.h                           |   17 +-
+ include/scsi/scsi_ioctl.h                          |    2 +-
+ include/scsi/scsi_transport_iscsi.h                |   10 +
+ include/scsi/sg.h                                  |    2 +-
+ include/scsi/srp.h                                 |    8 +-
+ include/target/iscsi/iscsi_target_core.h           |    2 +-
+ include/target/target_core_backend.h               |    6 -
+ include/target/target_core_base.h                  |   45 +-
+ include/trace/events/qla.h                         |   39 +
+ include/trace/events/target.h                      |   11 +-
+ include/uapi/scsi/fc/fc_els.h                      |  211 ++-
+ include/uapi/scsi/scsi_bsg_fc.h                    |    2 +-
+ scripts/documentation-file-ref-check               |    2 +-
+ 278 files changed, 13702 insertions(+), 9217 deletions(-)
+ rename Documentation/scsi/{53c700.txt => 53c700.rst} (75%)
+ rename Documentation/scsi/{BusLogic.txt => BusLogic.rst} (93%)
+ create mode 100644 Documentation/scsi/FlashPoint.rst
+ delete mode 100644 Documentation/scsi/FlashPoint.txt
+ create mode 100644 Documentation/scsi/NinjaSCSI.rst
+ delete mode 100644 Documentation/scsi/NinjaSCSI.txt
+ rename Documentation/scsi/{aacraid.txt => aacraid.rst} (83%)
+ rename Documentation/scsi/{advansys.txt => advansys.rst} (73%)
+ rename Documentation/scsi/{aha152x.txt => aha152x.rst} (76%)
+ create mode 100644 Documentation/scsi/aic79xx.rst
+ delete mode 100644 Documentation/scsi/aic79xx.txt
+ create mode 100644 Documentation/scsi/aic7xxx.rst
+ delete mode 100644 Documentation/scsi/aic7xxx.txt
+ create mode 100644 Documentation/scsi/arcmsr_spec.rst
+ delete mode 100644 Documentation/scsi/arcmsr_spec.txt
+ rename Documentation/scsi/{bfa.txt => bfa.rst} (72%)
+ rename Documentation/scsi/{bnx2fc.txt => bnx2fc.rst} (91%)
+ rename Documentation/scsi/{cxgb3i.txt => cxgb3i.rst} (86%)
+ rename Documentation/scsi/{dc395x.txt => dc395x.rst} (64%)
+ create mode 100644 Documentation/scsi/dpti.rst
+ delete mode 100644 Documentation/scsi/dpti.txt
+ create mode 100644 Documentation/scsi/g_NCR5380.rst
+ delete mode 100644 Documentation/scsi/g_NCR5380.txt
+ rename Documentation/scsi/{hpsa.txt => hpsa.rst} (77%)
+ rename Documentation/scsi/{hptiop.txt => hptiop.rst} (78%)
+ create mode 100644 Documentation/scsi/index.rst
+ rename Documentation/scsi/{libsas.txt => libsas.rst} (57%)
+ rename Documentation/scsi/{link_power_management_policy.txt => link_power_management_policy.rst} (65%)
+ rename Documentation/scsi/{lpfc.txt => lpfc.rst} (93%)
+ rename Documentation/scsi/{megaraid.txt => megaraid.rst} (66%)
+ rename Documentation/scsi/{ncr53c8xx.txt => ncr53c8xx.rst} (55%)
+ create mode 100644 Documentation/scsi/ppa.rst
+ delete mode 100644 Documentation/scsi/ppa.txt
+ rename Documentation/scsi/{qlogicfas.txt => qlogicfas.rst} (92%)
+ rename Documentation/scsi/{scsi-changer.txt => scsi-changer.rst} (87%)
+ rename Documentation/scsi/{scsi-generic.txt => scsi-generic.rst} (70%)
+ rename Documentation/scsi/{scsi-parameters.txt => scsi-parameters.rst} (81%)
+ rename Documentation/scsi/{scsi.txt => scsi.rst} (82%)
+ rename Documentation/scsi/{scsi_eh.txt => scsi_eh.rst} (73%)
+ rename Documentation/scsi/{scsi_fc_transport.txt => scsi_fc_transport.rst} (74%)
+ create mode 100644 Documentation/scsi/scsi_mid_low_api.rst
+ delete mode 100644 Documentation/scsi/scsi_mid_low_api.txt
+ delete mode 100644 Documentation/scsi/scsi_transport_srp/Makefile
+ create mode 100644 Documentation/scsi/scsi_transport_srp/figures.rst
+ create mode 100644 Documentation/scsi/sd-parameters.rst
+ delete mode 100644 Documentation/scsi/sd-parameters.txt
+ rename Documentation/scsi/{smartpqi.txt => smartpqi.rst} (67%)
+ rename Documentation/scsi/{st.txt => st.rst} (79%)
+ rename Documentation/scsi/{sym53c500_cs.txt => sym53c500_cs.rst} (89%)
+ rename Documentation/scsi/{sym53c8xx_2.txt => sym53c8xx_2.rst} (53%)
+ rename Documentation/scsi/{tcm_qla2xxx.txt => tcm_qla2xxx.rst} (57%)
+ rename Documentation/scsi/{ufs.txt => ufs.rst} (79%)
+ create mode 100644 Documentation/scsi/wd719x.rst
+ delete mode 100644 Documentation/scsi/wd719x.txt
+ create mode 100644 include/trace/events/qla.h
+$ git am -3 ../patches/0001-scsi-fix-up-for-scsi-simplify-scsi_partsize.patch
+Applying: scsi: fix up for "scsi: simplify scsi_partsize"
+$ git reset HEAD^
+Unstaged changes after reset:
+M	Documentation/scsi/scsi_mid_low_api.rst
+$ git add -A .
+$ git commit -v -a --amend
+[master eafde88fb49f] Merge remote-tracking branch 'scsi/for-next'
+ Date: Thu Apr 2 14:33:04 2020 +1100
+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
+Auto-merging drivers/scsi/ufs/ufshcd.h
+Auto-merging drivers/scsi/ufs/ufshcd.c
+Auto-merging drivers/scsi/sr.c
+Auto-merging drivers/scsi/lpfc/lpfc_attr.c
+Auto-merging drivers/scsi/bnx2fc/bnx2fc_hwi.c
+CONFLICT (content): Merge conflict in drivers/scsi/bnx2fc/bnx2fc_hwi.c
+Auto-merging drivers/s390/scsi/zfcp_fsf.c
+Resolved 'drivers/scsi/bnx2fc/bnx2fc_hwi.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 9ecc9f103ccb] Merge remote-tracking branch 'scsi-mkp/for-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/s390/scsi/zfcp_erp.c         | 10 +++++-----
+ drivers/s390/scsi/zfcp_fsf.c         | 23 +++++++++++------------
+ drivers/scsi/aacraid/commsup.c       |  7 ++++---
+ drivers/scsi/aic7xxx/aic7xxx_core.c  | 23 -----------------------
+ drivers/scsi/bnx2fc/bnx2fc_hwi.c     |  6 +++---
+ drivers/scsi/constants.c             |  2 +-
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c |  8 ++++----
+ drivers/scsi/scsi_transport_iscsi.c  |  4 +++-
+ drivers/scsi/sr.c                    |  4 +++-
+ drivers/scsi/ufs/ufshcd.c            | 19 ++-----------------
+ drivers/scsi/ufs/ufshcd.h            | 14 ++++++++++++++
+ 11 files changed, 50 insertions(+), 70 deletions(-)
+Merging vhost/linux-next (09880f689ab3 vdpa: move to drivers/vdpa)
+$ git merge vhost/linux-next
+Removing drivers/vhost/Kconfig.vringh
+Auto-merging drivers/Makefile
+Auto-merging drivers/Kconfig
+CONFLICT (modify/delete): arch/arm/kvm/Kconfig deleted in HEAD and modified in vhost/linux-next. Version vhost/linux-next of arch/arm/kvm/Kconfig left in tree.
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/arm/kvm/Kconfig
+rm 'arch/arm/kvm/Kconfig'
+$ git commit --no-edit -v -a
+[master 4ae76eb8fbaf] Merge remote-tracking branch 'vhost/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS                      |   3 +
+ arch/arm64/kvm/Kconfig           |   2 -
+ arch/mips/kvm/Kconfig            |   2 -
+ arch/powerpc/kvm/Kconfig         |   2 -
+ arch/s390/kvm/Kconfig            |   4 -
+ arch/x86/kvm/Kconfig             |   4 -
+ drivers/Kconfig                  |   4 +
+ drivers/Makefile                 |   1 +
+ drivers/misc/mic/Kconfig         |   4 -
+ drivers/net/caif/Kconfig         |   4 -
+ drivers/vdpa/Kconfig             |  37 ++
+ drivers/vdpa/Makefile            |   4 +
+ drivers/vdpa/ifcvf/Makefile      |   3 +
+ drivers/vdpa/ifcvf/ifcvf_base.c  | 389 +++++++++++++++++
+ drivers/vdpa/ifcvf/ifcvf_base.h  | 118 ++++++
+ drivers/vdpa/ifcvf/ifcvf_main.c  | 435 +++++++++++++++++++
+ drivers/vdpa/vdpa.c              | 180 ++++++++
+ drivers/vdpa/vdpa_sim/Makefile   |   2 +
+ drivers/vdpa/vdpa_sim/vdpa_sim.c | 629 ++++++++++++++++++++++++++++
+ drivers/vhost/Kconfig            |  44 +-
+ drivers/vhost/Kconfig.vringh     |   6 -
+ drivers/vhost/Makefile           |   6 +
+ drivers/vhost/iotlb.c            | 177 ++++++++
+ drivers/vhost/net.c              |   5 +-
+ drivers/vhost/scsi.c             |   2 +-
+ drivers/vhost/vdpa.c             | 883 +++++++++++++++++++++++++++++++++++++++
+ drivers/vhost/vhost.c            | 233 ++++-------
+ drivers/vhost/vhost.h            |  45 +-
+ drivers/vhost/vringh.c           | 421 ++++++++++++++++++-
+ drivers/vhost/vsock.c            |   2 +-
+ drivers/virtio/Kconfig           |  13 +
+ drivers/virtio/Makefile          |   1 +
+ drivers/virtio/virtio_balloon.c  | 107 ++---
+ drivers/virtio/virtio_vdpa.c     | 396 ++++++++++++++++++
+ include/linux/vdpa.h             | 253 +++++++++++
+ include/linux/vhost_iotlb.h      |  47 +++
+ include/linux/vringh.h           |  36 ++
+ include/uapi/linux/vhost.h       |  24 ++
+ include/uapi/linux/vhost_types.h |   8 +
+ include/uapi/linux/virtio_net.h  | 102 ++++-
+ tools/virtio/Makefile            |  27 +-
+ 41 files changed, 4353 insertions(+), 312 deletions(-)
+ create mode 100644 drivers/vdpa/Kconfig
+ create mode 100644 drivers/vdpa/Makefile
+ create mode 100644 drivers/vdpa/ifcvf/Makefile
+ create mode 100644 drivers/vdpa/ifcvf/ifcvf_base.c
+ create mode 100644 drivers/vdpa/ifcvf/ifcvf_base.h
+ create mode 100644 drivers/vdpa/ifcvf/ifcvf_main.c
+ create mode 100644 drivers/vdpa/vdpa.c
+ create mode 100644 drivers/vdpa/vdpa_sim/Makefile
+ create mode 100644 drivers/vdpa/vdpa_sim/vdpa_sim.c
+ delete mode 100644 drivers/vhost/Kconfig.vringh
+ create mode 100644 drivers/vhost/iotlb.c
+ create mode 100644 drivers/vhost/vdpa.c
+ create mode 100644 drivers/virtio/virtio_vdpa.c
+ create mode 100644 include/linux/vdpa.h
+ create mode 100644 include/linux/vhost_iotlb.h
+$ git am -3 ../patches/0001-Revert-virtio-balloon-Switch-back-to-OOM-handler-for.patch
+Applying: Revert "virtio-balloon: Switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM"
+$ git reset HEAD^
+Unstaged changes after reset:
+M	drivers/virtio/virtio_balloon.c
+$ git add -A .
+$ git commit -v -a --amend
+[master f7c2814a75c5] Merge remote-tracking branch 'vhost/linux-next'
+ Date: Thu Apr 2 14:40:29 2020 +1100
+Merging rpmsg/for-next (45c2824de341 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
+$ git merge rpmsg/for-next
+Removing include/linux/platform_data/remoteproc-omap.h
+Auto-merging drivers/remoteproc/qcom_q6v5_mss.c
+Auto-merging drivers/remoteproc/Kconfig
+Merge made by the 'recursive' strategy.
+ .../bindings/remoteproc/ti,omap-remoteproc.yaml    |  324 ++++++
+ Documentation/remoteproc.txt                       |    2 +-
+ drivers/hwspinlock/Kconfig                         |   12 +-
+ drivers/hwspinlock/hwspinlock_internal.h           |    2 +-
+ drivers/remoteproc/Kconfig                         |   14 +-
+ drivers/remoteproc/imx_rproc.c                     |   11 +-
+ drivers/remoteproc/keystone_remoteproc.c           |    4 +-
+ drivers/remoteproc/mtk_scp.c                       |    2 +-
+ drivers/remoteproc/omap_remoteproc.c               | 1200 +++++++++++++++++++-
+ drivers/remoteproc/omap_remoteproc.h               |   50 +-
+ drivers/remoteproc/qcom_q6v5.c                     |   20 +
+ drivers/remoteproc/qcom_q6v5.h                     |    1 +
+ drivers/remoteproc/qcom_q6v5_adsp.c                |   10 +-
+ drivers/remoteproc/qcom_q6v5_mss.c                 |  133 ++-
+ drivers/remoteproc/qcom_q6v5_pas.c                 |   10 +-
+ drivers/remoteproc/qcom_q6v5_wcss.c                |    2 +-
+ drivers/remoteproc/qcom_wcnss.c                    |    2 +-
+ drivers/remoteproc/remoteproc_core.c               |  161 ++-
+ drivers/remoteproc/remoteproc_debugfs.c            |   16 +-
+ drivers/remoteproc/remoteproc_elf_helpers.h        |   96 ++
+ drivers/remoteproc/remoteproc_elf_loader.c         |  189 ++-
+ drivers/remoteproc/remoteproc_internal.h           |   16 +-
+ drivers/remoteproc/remoteproc_virtio.c             |    8 +
+ drivers/remoteproc/st_remoteproc.c                 |    4 +-
+ drivers/remoteproc/st_slim_rproc.c                 |    6 +-
+ drivers/remoteproc/stm32_rproc.c                   |    4 +-
+ drivers/remoteproc/wkup_m3_rproc.c                 |    4 +-
+ include/linux/platform_data/remoteproc-omap.h      |   51 -
+ include/linux/remoteproc.h                         |   16 +-
+ 29 files changed, 2087 insertions(+), 283 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/remoteproc/ti,omap-remoteproc.yaml
+ create mode 100644 drivers/remoteproc/remoteproc_elf_helpers.h
+ delete mode 100644 include/linux/platform_data/remoteproc-omap.h
+$ git am -3 ../patches/Build-failure-in-omap_remoteproc-due-to-02e6d546e3bd.patch
+Applying: Build failure in omap_remoteproc due to 02e6d546e3bd
+$ git reset HEAD^
+Unstaged changes after reset:
+M	drivers/remoteproc/omap_remoteproc.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 7a97cdf4706d] Merge remote-tracking branch 'rpmsg/for-next'
+ Date: Thu Apr 2 14:42:32 2020 +1100
+Merging gpio/for-next (33dd88826319 gpio: export of_pinctrl_get to modules)
+$ git merge gpio/for-next
+Auto-merging tools/gpio/.gitignore
+Auto-merging drivers/pinctrl/devicetree.c
+Auto-merging drivers/gpio/gpiolib.c
+CONFLICT (content): Merge conflict in drivers/gpio/gpiolib.c
+Resolved 'drivers/gpio/gpiolib.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master e4310318b06b] Merge remote-tracking branch 'gpio/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/driver-api/gpio/driver.rst |    4 +-
+ arch/arm/mach-integrator/impd1.c         |   11 +-
+ arch/arm/mach-omap2/cpuidle34xx.c        |    9 +-
+ arch/arm/mach-omap2/cpuidle44xx.c        |   26 +-
+ arch/arm/mach-omap2/pm34xx.c             |    8 +-
+ drivers/gpio/Kconfig                     |   11 +-
+ drivers/gpio/Makefile                    |    1 +
+ drivers/gpio/gpio-brcmstb.c              |   44 +
+ drivers/gpio/gpio-mlxbf2.c               |  335 ++++++++
+ drivers/gpio/gpio-mmio.c                 |   23 +-
+ drivers/gpio/gpio-mockup.c               |    2 +-
+ drivers/gpio/gpio-mt7621.c               |    4 +-
+ drivers/gpio/gpio-mvebu.c                |    2 +-
+ drivers/gpio/gpio-omap.c                 |   29 +-
+ drivers/gpio/gpio-pl061.c                |    6 +-
+ drivers/gpio/gpio-pxa.c                  |    4 +-
+ drivers/gpio/gpio-rcar.c                 |    4 +-
+ drivers/gpio/gpio-siox.c                 |   28 +-
+ drivers/gpio/gpio-tegra186.c             |   64 ++
+ drivers/gpio/gpio-uniphier.c             |    2 +-
+ drivers/gpio/gpio-wcd934x.c              |    9 +-
+ drivers/gpio/gpiolib-devres.c            |   46 ++
+ drivers/gpio/gpiolib-of.c                |  139 +++-
+ drivers/gpio/gpiolib-of.h                |    2 +
+ drivers/gpio/gpiolib.c                   | 1299 +++++++++++++++++-------------
+ drivers/gpio/gpiolib.h                   |    4 +
+ drivers/pinctrl/devicetree.c             |    1 +
+ include/asm-generic/gpio.h               |    4 +-
+ include/linux/gpio.h                     |    2 -
+ include/linux/gpio/consumer.h            |   13 +-
+ include/linux/gpio/driver.h              |  139 ++--
+ include/linux/kfifo.h                    |   73 ++
+ include/linux/of_gpio.h                  |    9 +-
+ include/linux/pinctrl/pinctrl.h          |    2 +-
+ include/uapi/linux/gpio.h                |   38 +-
+ tools/gpio/.gitignore                    |    1 +
+ tools/gpio/Build                         |    1 +
+ tools/gpio/Makefile                      |   13 +-
+ tools/gpio/gpio-hammer.c                 |   19 +-
+ tools/gpio/gpio-utils.c                  |    6 +-
+ tools/gpio/gpio-watch.c                  |   99 +++
+ 41 files changed, 1794 insertions(+), 742 deletions(-)
+ create mode 100644 drivers/gpio/gpio-mlxbf2.c
+ create mode 100644 tools/gpio/gpio-watch.c
+Merging gpio-brgl/gpio/for-next (975516250253 tools: gpio: Fix typo in gpio-utils)
+$ git merge gpio-brgl/gpio/for-next
+Already up to date.
+Merging gpio-intel/for-next (bb6d3fb354c5 Linux 5.6-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
+Auto-merging drivers/pinctrl/stm32/pinctrl-stm32.c
+Auto-merging drivers/pinctrl/qcom/pinctrl-msm.c
+Auto-merging drivers/pinctrl/meson/pinctrl-meson-gxl.c
+Auto-merging drivers/pinctrl/core.c
+Auto-merging drivers/gpio/gpiolib.c
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/pinctrl/fsl,imx8mq-pinctrl.txt
+Removing Documentation/devicetree/bindings/pinctrl/fsl,imx8mn-pinctrl.txt
+Removing Documentation/devicetree/bindings/pinctrl/fsl,imx8mm-pinctrl.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/pinctrl/atmel,at91-pinctrl.txt        |    2 +-
+ .../bindings/pinctrl/fsl,imx8mm-pinctrl.txt        |   36 -
+ .../bindings/pinctrl/fsl,imx8mm-pinctrl.yaml       |   82 ++
+ .../bindings/pinctrl/fsl,imx8mn-pinctrl.txt        |   39 -
+ .../bindings/pinctrl/fsl,imx8mn-pinctrl.yaml       |   82 ++
+ .../bindings/pinctrl/fsl,imx8mp-pinctrl.yaml       |   25 +-
+ .../bindings/pinctrl/fsl,imx8mq-pinctrl.txt        |   36 -
+ .../bindings/pinctrl/fsl,imx8mq-pinctrl.yaml       |   82 ++
+ .../bindings/pinctrl/qcom,ipq6018-pinctrl.yaml     |  153 +++
+ MAINTAINERS                                        |   37 +-
+ drivers/gpio/gpiolib.c                             |    1 +
+ drivers/pinctrl/Kconfig                            |   12 +
+ drivers/pinctrl/Makefile                           |    1 +
+ drivers/pinctrl/actions/pinctrl-s700.c             |  510 ++++-----
+ drivers/pinctrl/bcm/pinctrl-bcm2835.c              |  111 +-
+ drivers/pinctrl/bcm/pinctrl-iproc-gpio.c           |    5 +-
+ drivers/pinctrl/core.c                             |    1 +
+ drivers/pinctrl/freescale/Kconfig                  |    8 +-
+ drivers/pinctrl/mediatek/pinctrl-mt6765.c          |   11 +-
+ drivers/pinctrl/mediatek/pinctrl-mt8183.c          |    7 +-
+ drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c   |  264 ++++-
+ drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h   |   16 +
+ drivers/pinctrl/mediatek/pinctrl-mtk-common.c      |    5 +-
+ drivers/pinctrl/mediatek/pinctrl-paris.c           |  363 ++++---
+ drivers/pinctrl/mediatek/pinctrl-paris.h           |    3 +
+ drivers/pinctrl/meson/pinctrl-meson-gxbb.c         |   35 +
+ drivers/pinctrl/meson/pinctrl-meson-gxl.c          |   27 +
+ drivers/pinctrl/mvebu/pinctrl-armada-37xx.c        |   17 +-
+ drivers/pinctrl/nomadik/pinctrl-nomadik.c          |    7 +-
+ drivers/pinctrl/pinconf-generic.c                  |    1 +
+ drivers/pinctrl/pinctrl-amd.c                      |    5 +-
+ drivers/pinctrl/pinctrl-at91.c                     |    5 +-
+ drivers/pinctrl/pinctrl-axp209.c                   |    7 +-
+ drivers/pinctrl/pinctrl-da9062.c                   |  300 ++++++
+ drivers/pinctrl/pinctrl-ingenic.c                  |   55 +-
+ drivers/pinctrl/pinctrl-ocelot.c                   |    5 +-
+ drivers/pinctrl/pinctrl-oxnas.c                    |    5 +-
+ drivers/pinctrl/pinctrl-pic32.c                    |    5 +-
+ drivers/pinctrl/pinctrl-pistachio.c                |    5 +-
+ drivers/pinctrl/pinctrl-rk805.c                    |    7 +-
+ drivers/pinctrl/pinctrl-rockchip.c                 |    5 +-
+ drivers/pinctrl/pinctrl-rza1.c                     |    5 +-
+ drivers/pinctrl/pinctrl-rza2.c                     |    6 +-
+ drivers/pinctrl/pinctrl-st.c                       |   14 +-
+ drivers/pinctrl/pinctrl-stmfx.c                    |   17 +-
+ drivers/pinctrl/pinctrl-sx150x.c                   |    9 +-
+ drivers/pinctrl/qcom/Kconfig                       |   10 +
+ drivers/pinctrl/qcom/Makefile                      |    1 +
+ drivers/pinctrl/qcom/pinctrl-ipq6018.c             | 1107 ++++++++++++++++++++
+ drivers/pinctrl/qcom/pinctrl-ipq8064.c             |   10 +-
+ drivers/pinctrl/qcom/pinctrl-msm.c                 |   46 +-
+ drivers/pinctrl/sh-pfc/Kconfig                     |    4 +-
+ drivers/pinctrl/sh-pfc/core.c                      |  307 ++++--
+ drivers/pinctrl/sh-pfc/gpio.c                      |    5 +-
+ drivers/pinctrl/sirf/pinctrl-atlas7.c              |    2 +-
+ drivers/pinctrl/sprd/Kconfig                       |   10 +-
+ drivers/pinctrl/sprd/pinctrl-sprd.c                |   25 +-
+ drivers/pinctrl/stm32/pinctrl-stm32.c              |    4 +-
+ drivers/pinctrl/sunxi/pinctrl-sunxi.c              |   16 +-
+ drivers/pinctrl/tegra/pinctrl-tegra.c              |   52 +-
+ drivers/pinctrl/tegra/pinctrl-tegra.h              |    5 +-
+ drivers/pinctrl/tegra/pinctrl-tegra194.c           |   47 +-
+ drivers/pinctrl/uniphier/pinctrl-uniphier-core.c   |    2 +-
+ drivers/pinctrl/vt8500/pinctrl-wmt.c               |    6 +-
+ 64 files changed, 3350 insertions(+), 743 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx8mm-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx8mm-pinctrl.yaml
+ delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx8mn-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx8mn-pinctrl.yaml
+ delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx8mq-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx8mq-pinctrl.yaml
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq6018-pinctrl.yaml
+ create mode 100644 drivers/pinctrl/pinctrl-da9062.c
+ create mode 100644 drivers/pinctrl/qcom/pinctrl-ipq6018.c
+Merging pinctrl-intel/for-next (16fbf79b0f83 Linux 5.6-rc7)
+$ git merge pinctrl-intel/for-next
+Already up to date.
+Merging pinctrl-samsung/for-next (bb6d3fb354c5 Linux 5.6-rc1)
+$ git merge pinctrl-samsung/for-next
+Already up to date.
+Merging pwm/for-next (a2005fc79179 pwm: jz4740: Allow selection of PWM channels 0 and 1)
+$ git merge pwm/for-next
+Removing include/linux/platform_data/pwm_omap_dmtimer.h
+Removing Documentation/devicetree/bindings/pwm/google,cros-ec-pwm.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/pwm/google,cros-ec-pwm.txt |  23 ---
+ .../bindings/pwm/google,cros-ec-pwm.yaml           |  40 ++++
+ .../devicetree/bindings/pwm/nvidia,tegra20-pwm.txt |   1 +
+ drivers/pwm/Kconfig                                |  58 +++---
+ drivers/pwm/core.c                                 | 135 ++++++++++++-
+ drivers/pwm/pwm-bcm2835.c                          |   1 +
+ drivers/pwm/pwm-imx-tpm.c                          |   2 -
+ drivers/pwm/pwm-imx27.c                            |  32 +--
+ drivers/pwm/pwm-jz4740.c                           | 162 ++++++++++-----
+ drivers/pwm/pwm-meson.c                            |   2 +-
+ drivers/pwm/pwm-mxs.c                              |   1 -
+ drivers/pwm/pwm-omap-dmtimer.c                     | 219 ++++++++++++++-------
+ drivers/pwm/pwm-pca9685.c                          |  12 +-
+ drivers/pwm/pwm-rcar.c                             |  10 +-
+ drivers/pwm/pwm-renesas-tpu.c                      |  11 +-
+ drivers/pwm/pwm-sun4i.c                            |  13 +-
+ drivers/pwm/pwm-tegra.c                            |   6 +
+ include/clocksource/timer-ti-dm.h                  |   3 +-
+ include/linux/platform_data/pwm_omap_dmtimer.h     |  90 ---------
+ include/linux/pwm.h                                |   4 +-
+ 20 files changed, 514 insertions(+), 311 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/pwm/google,cros-ec-pwm.txt
+ create mode 100644 Documentation/devicetree/bindings/pwm/google,cros-ec-pwm.yaml
+ delete mode 100644 include/linux/platform_data/pwm_omap_dmtimer.h
+Merging userns/for-next (d1e7fd6462ca signal: Extend exec_id to 64bits)
+$ git merge userns/for-next
+Auto-merging kernel/signal.c
+Auto-merging kernel/pid.c
+CONFLICT (content): Merge conflict in kernel/pid.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/exit.c
+Auto-merging kernel/events/core.c
+Auto-merging init/init_task.c
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/proc_ns.h
+Auto-merging fs/proc/base.c
+Auto-merging fs/exec.c
+Resolved 'kernel/pid.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master a730a47f847f] Merge remote-tracking branch 'userns/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/um/drivers/mconsole_kern.c           |  28 ++++++-
+ fs/exec.c                                 |  80 ++++++++++++++------
+ fs/proc/base.c                            | 121 ++++++++++--------------------
+ fs/proc/inode.c                           |  73 ++++++++++++++++--
+ fs/proc/internal.h                        |   4 +-
+ fs/proc/proc_sysctl.c                     |  45 ++---------
+ fs/proc/root.c                            |  36 ---------
+ include/linux/binfmts.h                   |   8 +-
+ include/linux/pid.h                       |   1 +
+ include/linux/pid_namespace.h             |   2 -
+ include/linux/proc_fs.h                   |   4 +-
+ include/linux/proc_ns.h                   |   5 --
+ include/linux/sched.h                     |   4 +-
+ include/linux/sched/signal.h              |   9 ++-
+ init/init_task.c                          |   1 +
+ kernel/cred.c                             |   2 -
+ kernel/events/core.c                      |  12 +--
+ kernel/exit.c                             |   4 +-
+ kernel/fork.c                             |   5 +-
+ kernel/kcmp.c                             |   8 +-
+ kernel/pid.c                              |  13 +---
+ kernel/pid_namespace.c                    |  38 +++++-----
+ kernel/signal.c                           |   2 +-
+ mm/process_vm_access.c                    |   2 +-
+ tools/testing/selftests/ptrace/Makefile   |   4 +-
+ tools/testing/selftests/ptrace/vmaccess.c |  86 +++++++++++++++++++++
+ 26 files changed, 349 insertions(+), 248 deletions(-)
+ create mode 100644 tools/testing/selftests/ptrace/vmaccess.c
+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
+Auto-merging drivers/char/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arm64/include/asm/archrandom.h | 14 +++++++
+ drivers/char/Kconfig                |  2 +-
+ drivers/char/random.c               | 84 ++++++++++++++++++++++---------------
+ include/linux/random.h              | 22 ++++++++++
+ 4 files changed, 87 insertions(+), 35 deletions(-)
+Merging kselftest/next (1056d3d2c97e selftests: enforce local header dependency in lib.mk)
+$ git merge kselftest/next
+Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c
+Auto-merging tools/testing/selftests/lib.mk
+Auto-merging tools/testing/selftests/Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS                                        |   1 +
+ tools/testing/selftests/Makefile                   |   4 +-
+ tools/testing/selftests/android/Makefile           |   2 +-
+ tools/testing/selftests/android/ion/Makefile       |   2 +-
+ .../ftrace/test.d/trigger/trigger-multihist.tc     |   2 +-
+ tools/testing/selftests/kselftest_harness.h        | 144 ++--
+ tools/testing/selftests/lib.mk                     |   3 +-
+ tools/testing/selftests/memfd/Makefile             |   9 +-
+ tools/testing/selftests/resctrl/Makefile           |  17 +
+ tools/testing/selftests/resctrl/README             |  53 ++
+ tools/testing/selftests/resctrl/cache.c            | 272 ++++++++
+ tools/testing/selftests/resctrl/cat_test.c         | 250 +++++++
+ tools/testing/selftests/resctrl/cqm_test.c         | 176 +++++
+ tools/testing/selftests/resctrl/fill_buf.c         | 213 ++++++
+ tools/testing/selftests/resctrl/mba_test.c         | 171 +++++
+ tools/testing/selftests/resctrl/mbm_test.c         | 145 ++++
+ tools/testing/selftests/resctrl/resctrl.h          | 107 +++
+ tools/testing/selftests/resctrl/resctrl_tests.c    | 202 ++++++
+ tools/testing/selftests/resctrl/resctrl_val.c      | 744 +++++++++++++++++++++
+ tools/testing/selftests/resctrl/resctrlfs.c        | 722 ++++++++++++++++++++
+ tools/testing/selftests/seccomp/Makefile           |  17 +-
+ tools/testing/selftests/seccomp/seccomp_bpf.c      |  10 +-
+ tools/testing/selftests/timens/exec.c              |   1 -
+ tools/testing/selftests/timens/procfs.c            |   1 -
+ tools/testing/selftests/timens/timens.c            |   1 -
+ tools/testing/selftests/timens/timer.c             |   1 -
+ 26 files changed, 3191 insertions(+), 79 deletions(-)
+ create mode 100644 tools/testing/selftests/resctrl/Makefile
+ create mode 100644 tools/testing/selftests/resctrl/README
+ create mode 100644 tools/testing/selftests/resctrl/cache.c
+ create mode 100644 tools/testing/selftests/resctrl/cat_test.c
+ create mode 100644 tools/testing/selftests/resctrl/cqm_test.c
+ create mode 100644 tools/testing/selftests/resctrl/fill_buf.c
+ create mode 100644 tools/testing/selftests/resctrl/mba_test.c
+ create mode 100644 tools/testing/selftests/resctrl/mbm_test.c
+ create mode 100644 tools/testing/selftests/resctrl/resctrl.h
+ create mode 100644 tools/testing/selftests/resctrl/resctrl_tests.c
+ create mode 100644 tools/testing/selftests/resctrl/resctrl_val.c
+ create mode 100644 tools/testing/selftests/resctrl/resctrlfs.c
+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 (ed0efaa66ad8 docs: trace: coresight-ect.rst: fix a build warning)
+$ 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      |  52 +++++-
+ 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 +++
+ 9 files changed, 429 insertions(+), 32 deletions(-)
+ create mode 100644 drivers/hwtracing/coresight/coresight-sysfs.c
+Merging rtc/rtc-next (04b3f5186e8b rtc: remove rtc_time_to_tm and rtc_tm_to_time)
+$ git merge rtc/rtc-next
+Auto-merging drivers/rtc/rtc-cmos.c
+Removing drivers/rtc/hctosys.c
+Auto-merging drivers/rtc/Makefile
+Auto-merging drivers/rtc/Kconfig
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/rtc/ingenic,jz4740-rtc.txt |  37 --
+ .../devicetree/bindings/rtc/ingenic,rtc.yaml       |  83 ++++
+ .../devicetree/bindings/rtc/rtc-mt2712.txt         |  14 +
+ MAINTAINERS                                        |   2 +
+ drivers/rtc/Kconfig                                |  17 +-
+ drivers/rtc/Makefile                               |   2 +-
+ drivers/rtc/class.c                                |  49 +++
+ drivers/rtc/hctosys.c                              |  69 ----
+ drivers/rtc/rtc-88pm860x.c                         | 104 +----
+ drivers/rtc/rtc-ab8500.c                           |  10 +-
+ drivers/rtc/rtc-au1xxx.c                           |  29 +-
+ drivers/rtc/rtc-bd70528.c                          |   4 +-
+ drivers/rtc/rtc-cmos.c                             |   5 +-
+ drivers/rtc/rtc-cpcap.c                            |  13 +-
+ drivers/rtc/rtc-da9052.c                           |  18 +-
+ drivers/rtc/rtc-davinci.c                          |  58 +--
+ drivers/rtc/rtc-ds1305.c                           |  10 +-
+ drivers/rtc/rtc-ds1307.c                           | 124 ++++++
+ drivers/rtc/rtc-ds1374.c                           |  27 +-
+ drivers/rtc/rtc-fsl-ftm-alarm.c                    |  23 +-
+ drivers/rtc/rtc-imx-sc.c                           |   2 +-
+ drivers/rtc/rtc-jz4740.c                           |   9 +-
+ drivers/rtc/rtc-m48t35.c                           |   7 +-
+ drivers/rtc/rtc-mpc5121.c                          |  61 +--
+ drivers/rtc/rtc-mt2712.c                           | 423 +++++++++++++++++++++
+ drivers/rtc/rtc-mxc.c                              |  46 +--
+ drivers/rtc/rtc-omap.c                             |   1 -
+ drivers/rtc/rtc-pcf85063.c                         | 157 ++++++++
+ drivers/rtc/rtc-pl030.c                            |  27 +-
+ drivers/rtc/rtc-pl031.c                            |  53 +--
+ drivers/rtc/rtc-pm8xxx.c                           |  40 +-
+ drivers/rtc/rtc-puv3.c                             |  14 +-
+ drivers/rtc/rtc-sa1100.c                           |  40 +-
+ drivers/rtc/rtc-sh.c                               |   3 +-
+ drivers/rtc/rtc-sirfsoc.c                          |  44 +--
+ drivers/rtc/rtc-snvs.c                             |  28 +-
+ drivers/rtc/rtc-starfire.c                         |  10 +-
+ drivers/rtc/rtc-sun6i.c                            |  22 +-
+ drivers/rtc/rtc-zynqmp.c                           |  27 +-
+ drivers/rtc/sysfs.c                                |   2 +-
+ include/linux/rtc.h                                |  12 -
+ include/uapi/linux/rtc.h                           |  11 +-
+ 42 files changed, 1179 insertions(+), 558 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/rtc/ingenic,jz4740-rtc.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/ingenic,rtc.yaml
+ create mode 100644 Documentation/devicetree/bindings/rtc/rtc-mt2712.txt
+ delete mode 100644 drivers/rtc/hctosys.c
+ create mode 100644 drivers/rtc/rtc-mt2712.c
+Merging nvdimm/libnvdimm-for-next (6ab3463a5fcd Merge branch 'for-5.6/libnvdimm-space-align' into libnvdimm-for-next)
+$ git merge nvdimm/libnvdimm-for-next
+Auto-merging include/linux/acpi.h
+Auto-merging drivers/acpi/nfit/core.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/powerpc/platforms/pseries/papr_scm.c
+Auto-merging arch/powerpc/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/powerpc/Kconfig                      |   1 +
+ arch/powerpc/mm/ioremap.c                 |  21 +++++
+ arch/powerpc/platforms/pseries/papr_scm.c |  23 +-----
+ arch/x86/Kconfig                          |   1 +
+ arch/x86/mm/numa.c                        |  67 +++++++++++----
+ drivers/acpi/nfit/core.c                  |   4 +-
+ drivers/acpi/numa/srat.c                  |  41 ----------
+ drivers/nvdimm/dimm.c                     |   2 +-
+ drivers/nvdimm/dimm_devs.c                |  95 ++++++++++++++++-----
+ drivers/nvdimm/e820.c                     |  18 +---
+ drivers/nvdimm/namespace_devs.c           |  28 ++++++-
+ drivers/nvdimm/nd.h                       |   3 +-
+ drivers/nvdimm/pfn.h                      |  12 +++
+ drivers/nvdimm/pfn_devs.c                 |  40 +++++++--
+ drivers/nvdimm/region_devs.c              | 132 ++++++++++++++++++++++++++----
+ include/linux/acpi.h                      |  23 +++++-
+ include/linux/io.h                        |   2 -
+ include/linux/libnvdimm.h                 |   2 +
+ include/linux/memremap.h                  |   8 ++
+ include/linux/mmzone.h                    |   1 +
+ include/linux/numa.h                      |  30 ++++++-
+ lib/Kconfig                               |   3 +
+ mm/Kconfig                                |   5 ++
+ mm/mempolicy.c                            |  26 ++++++
+ mm/memremap.c                             |  23 ++++++
+ 25 files changed, 470 insertions(+), 141 deletions(-)
+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 (b9fc54c38e2e NTB: ntb_test: Fix bug when counting remote files)
+$ git merge ntb/ntb-next
+Auto-merging drivers/ntb/hw/idt/ntb_hw_idt.c
+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             | 29 ++++++++++++++++++++++-------
+ drivers/ntb/test/ntb_pingpong.c         | 14 ++++++--------
+ drivers/ntb/test/ntb_tool.c             |  9 ++++-----
+ tools/testing/selftests/ntb/ntb_test.sh |  2 +-
+ 8 files changed, 35 insertions(+), 42 deletions(-)
+Merging kspp/for-next/kspp (c79f46a28239 Linux 5.5-rc5)
+$ git merge kspp/for-next/kspp
+Already up to date.
+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 e756a7876896] 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 1bd65461ce43] Merge remote-tracking branch 'nvmem/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging xarray/xarray (ba44af6f2609 XArray: Handle retry entries within xas_find_marked)
+$ git merge xarray/xarray
+Auto-merging mm/memremap.c
+Auto-merging include/linux/memremap.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+Auto-merging arch/powerpc/kvm/book3s_hv_uvmem.c
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/binfmt-misc.rst          |   4 +-
+ Documentation/core-api/xarray.rst                  |  13 +-
+ Documentation/dev-tools/kunit/index.rst            |  40 +-
+ Documentation/dev-tools/kunit/kunit-tool.rst       |   7 +
+ Documentation/dev-tools/kunit/start.rst            |  80 +++-
+ Documentation/dev-tools/kunit/usage.rst            |  14 +
+ Documentation/vm/hmm.rst                           |  12 +-
+ arch/powerpc/kvm/book3s_hv_uvmem.c                 |   3 +
+ arch/sh/include/mach-common/mach/highlander.h      |   4 +-
+ arch/x86/boot/apm.c                                |   2 +-
+ arch/x86/include/asm/uaccess.h                     |  64 +--
+ block/blk-mq-virtio.c                              |   2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c            |   3 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c             |   4 +-
+ drivers/gpu/drm/nouveau/nouveau_dmem.c             |  19 +-
+ drivers/gpu/drm/nouveau/nouveau_svm.c              |   3 +-
+ drivers/hid/Kconfig                                |   2 +-
+ drivers/infiniband/core/device.c                   |   6 +-
+ drivers/s390/block/dasd_3990_erp.c                 |   2 +-
+ include/kunit/test.h                               |  63 ++-
+ include/linux/err.h                                |   3 -
+ include/linux/hashtable.h                          |   4 +-
+ include/linux/hmm.h                                | 125 +-----
+ include/linux/irqdesc.h                            |   2 +-
+ include/linux/list.h                               |   2 +-
+ include/linux/memremap.h                           |   4 +
+ include/linux/mfd/wm8994/pdata.h                   |   2 +-
+ include/linux/migrate.h                            |   8 +
+ include/linux/xarray.h                             |  31 +-
+ lib/kunit/Kconfig                                  |   8 +
+ lib/kunit/Makefile                                 |   4 +
+ lib/kunit/assert.c                                 |  79 ++--
+ lib/kunit/debugfs.c                                | 116 +++++
+ lib/kunit/debugfs.h                                |  30 ++
+ lib/kunit/kunit-test.c                             |  44 +-
+ lib/kunit/test.c                                   | 148 +++++--
+ lib/list-test.c                                    |   4 +-
+ lib/radix-tree.c                                   |   8 -
+ lib/test_xarray.c                                  |  75 ++++
+ lib/xarray.c                                       |  46 +-
+ mm/hmm.c                                           | 470 ++++++++-------------
+ mm/memremap.c                                      |   4 +
+ mm/migrate.c                                       |   9 +-
+ tools/testing/kunit/.gitattributes                 |   1 +
+ tools/testing/kunit/configs/broken_on_uml.config   |  41 ++
+ tools/testing/kunit/kunit.py                       |  38 +-
+ tools/testing/kunit/kunit_config.py                |  41 +-
+ tools/testing/kunit/kunit_kernel.py                |  84 ++--
+ tools/testing/kunit/kunit_parser.py                |  51 +--
+ tools/testing/kunit/kunit_tool_test.py             | 108 ++++-
+ .../kunit/test_data/test_config_printk_time.log    | Bin 0 -> 1584 bytes
+ .../test_data/test_interrupted_tap_output.log      | Bin 0 -> 1982 bytes
+ .../test_data/test_kernel_panic_interrupt.log      | Bin 0 -> 1321 bytes
+ .../kunit/test_data/test_multiple_prefixes.log     | Bin 0 -> 1832 bytes
+ .../test_output_with_prefix_isolated_correctly.log | Bin 0 -> 1655 bytes
+ .../kunit/test_data/test_pound_no_prefix.log       | Bin 0 -> 1193 bytes
+ tools/testing/kunit/test_data/test_pound_sign.log  | Bin 0 -> 1656 bytes
+ tools/testing/radix-tree/Makefile                  |   4 +-
+ tools/testing/radix-tree/iteration_check_2.c       |  87 ++++
+ tools/testing/radix-tree/linux.c                   |  32 +-
+ tools/testing/radix-tree/linux/slab.h              |   6 +-
+ tools/testing/radix-tree/main.c                    |   1 +
+ tools/testing/radix-tree/test.h                    |   1 +
+ 63 files changed, 1341 insertions(+), 727 deletions(-)
+ create mode 100644 lib/kunit/debugfs.c
+ create mode 100644 lib/kunit/debugfs.h
+ create mode 100644 tools/testing/kunit/.gitattributes
+ create mode 100644 tools/testing/kunit/configs/broken_on_uml.config
+ create mode 100644 tools/testing/kunit/test_data/test_config_printk_time.log
+ create mode 100644 tools/testing/kunit/test_data/test_interrupted_tap_output.log
+ create mode 100644 tools/testing/kunit/test_data/test_kernel_panic_interrupt.log
+ create mode 100644 tools/testing/kunit/test_data/test_multiple_prefixes.log
+ create mode 100644 tools/testing/kunit/test_data/test_output_with_prefix_isolated_correctly.log
+ create mode 100644 tools/testing/kunit/test_data/test_pound_no_prefix.log
+ create mode 100644 tools/testing/kunit/test_data/test_pound_sign.log
+ create mode 100644 tools/testing/radix-tree/iteration_check_2.c
+Merging hyperv/hyperv-next (86fd319b9240 x86/Hyper-V: Report crash register data when sysctl_record_panic_msg is not set)
+$ git merge hyperv/hyperv-next
+Merge made by the 'recursive' strategy.
+ arch/x86/kernel/cpu/mshyperv.c | 10 +++++++
+ drivers/hv/channel_mgmt.c      |  3 +++
+ drivers/hv/vmbus_drv.c         | 61 +++++++++++++++++++++++++++++-------------
+ 3 files changed, 56 insertions(+), 18 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.
+ kernel/debug/kdb/kdb_main.c | 20 ++++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
+Merging pidfd/for-next (6952a4f64644 selftests: add pid namespace ENOMEM regression test)
+$ git merge pidfd/for-next
+Auto-merging tools/testing/selftests/Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS                                        |  1 +
+ tools/testing/selftests/Makefile                   |  1 +
+ tools/testing/selftests/pid_namespace/.gitignore   |  1 +
+ tools/testing/selftests/pid_namespace/Makefile     |  8 ++++
+ tools/testing/selftests/pid_namespace/config       |  2 +
+ .../selftests/pid_namespace/regression_enomem.c    | 45 ++++++++++++++++++++++
+ tools/testing/selftests/pidfd/pidfd.h              |  2 +
+ 7 files changed, 60 insertions(+)
+ create mode 100644 tools/testing/selftests/pid_namespace/.gitignore
+ create mode 100644 tools/testing/selftests/pid_namespace/Makefile
+ create mode 100644 tools/testing/selftests/pid_namespace/config
+ create mode 100644 tools/testing/selftests/pid_namespace/regression_enomem.c
+Merging devfreq/devfreq-next (7a51320ecd39 PM / devfreq: Get rid of some doc warnings)
+$ git merge devfreq/devfreq-next
+Already up to date.
+Merging hmm/hmm (bd5d3587b218 mm/hmm: return error for non-vma snapshots)
+$ 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 (bb6d3fb354c5 Linux 5.6-rc1)
+$ git merge kunit/test
+Already up to date.
+Merging cel/cel-next (1a33d8a284b1 svcrdma: Fix leak of transport addresses)
+$ git merge cel/cel-next
+Auto-merging net/sunrpc/xprtsock.c
+Auto-merging net/sunrpc/xprtrdma/svc_rdma_rw.c
+Auto-merging net/sunrpc/xprtrdma/rpc_rdma.c
+Auto-merging net/sunrpc/clnt.c
+Auto-merging net/sunrpc/cache.c
+CONFLICT (content): Merge conflict in net/sunrpc/cache.c
+Auto-merging net/sunrpc/auth_gss/auth_gss.c
+Auto-merging include/trace/events/rpcrdma.h
+Auto-merging include/linux/sunrpc/xdr.h
+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 a894b789c712] Merge remote-tracking branch 'cel/cel-next'
+$ git diff -M --stat --summary HEAD^..
+ fs/nfs/dns_resolve.c                       |  11 +-
+ fs/nfsd/Kconfig                            |   2 +-
+ fs/nfsd/export.c                           |  45 ++-
+ fs/nfsd/nfs4idmap.c                        |  14 +
+ fs/nfsd/nfs4state.c                        |  84 ++---
+ fs/nfsd/nfs4xdr.c                          |  29 +-
+ fs/nfsd/nfsctl.c                           |   1 +
+ fs/nfsd/nfsfh.c                            |  13 +-
+ fs/nfsd/trace.h                            | 122 +++++++
+ include/linux/sunrpc/cache.h               |   9 +-
+ include/linux/sunrpc/rpc_rdma.h            |   3 +-
+ include/linux/sunrpc/svc.h                 |   3 +
+ include/linux/sunrpc/svc_rdma.h            |  24 +-
+ include/linux/sunrpc/svc_xprt.h            |   2 +
+ include/linux/sunrpc/xdr.h                 |  67 +++-
+ include/trace/events/rpcgss.h              |  59 +++-
+ include/trace/events/rpcrdma.h             |  67 ++--
+ include/trace/events/sunrpc.h              |  76 +++++
+ net/sunrpc/auth_gss/auth_gss.c             |   2 +-
+ net/sunrpc/auth_gss/svcauth_gss.c          |  60 ++--
+ net/sunrpc/cache.c                         | 125 ++++---
+ net/sunrpc/clnt.c                          |   1 +
+ net/sunrpc/socklib.c                       | 141 ++++++++
+ net/sunrpc/socklib.h                       |  15 +
+ net/sunrpc/sunrpc.h                        |   4 -
+ net/sunrpc/svc.c                           |  20 +-
+ net/sunrpc/svc_xprt.c                      |  22 +-
+ net/sunrpc/svcauth_unix.c                  |  12 +
+ net/sunrpc/svcsock.c                       | 202 ++++--------
+ net/sunrpc/xprt.c                          |   3 +-
+ net/sunrpc/xprtrdma/rpc_rdma.c             |  36 +-
+ net/sunrpc/xprtrdma/svc_rdma_backchannel.c |  17 +-
+ net/sunrpc/xprtrdma/svc_rdma_recvfrom.c    | 244 +++++++++-----
+ net/sunrpc/xprtrdma/svc_rdma_rw.c          |  55 ++--
+ net/sunrpc/xprtrdma/svc_rdma_sendto.c      | 512 +++++++++++++++++------------
+ net/sunrpc/xprtrdma/svc_rdma_transport.c   |   8 +-
+ net/sunrpc/xprtsock.c                      | 188 ++---------
+ 37 files changed, 1394 insertions(+), 904 deletions(-)
+ create mode 100644 net/sunrpc/socklib.h
+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 (e23349af9ee2 kunit: tool: add missing test data file content)
+$ 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 akpm-current/current (588c2d2fdd18 ipc/mqueue.c: fix a brace coding style issue)
+$ git merge --no-ff akpm-current/current
+Auto-merging tools/testing/selftests/vm/.gitignore
+Auto-merging mm/shmem.c
+Auto-merging mm/migrate.c
+Auto-merging mm/memremap.c
+Auto-merging mm/mempolicy.c
+Auto-merging mm/Makefile
+Auto-merging mm/Kconfig
+Auto-merging lib/dynamic_debug.c
+Auto-merging lib/Makefile
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/module.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/events/core.c
+Auto-merging kernel/cgroup/cgroup.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/wait.h
+Auto-merging include/linux/swap.h
+Auto-merging include/linux/sched/signal.h
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/proc_fs.h
+Auto-merging include/linux/mmzone.h
+Auto-merging include/linux/memremap.h
+Auto-merging include/linux/memcontrol.h
+Auto-merging include/linux/list.h
+Auto-merging include/linux/compiler.h
+Auto-merging include/linux/cgroup-defs.h
+Auto-merging fs/proc/internal.h
+Auto-merging fs/proc/inode.c
+Auto-merging fs/pipe.c
+Auto-merging fs/exec.c
+Auto-merging drivers/virtio/Kconfig
+Auto-merging arch/x86/configs/x86_64_defconfig
+Auto-merging arch/x86/configs/i386_defconfig
+Auto-merging arch/x86/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/Kconfig
+Auto-merging arch/s390/mm/fault.c
+Auto-merging arch/powerpc/platforms/pseries/hotplug-memory.c
+Auto-merging arch/powerpc/platforms/powernv/memtrace.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Resolved 'arch/x86/Kconfig' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f2ff8b616399] Merge branch 'akpm-current/current'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/cgroup-v1/hugetlb.rst    | 103 ++-
+ Documentation/admin-guide/cgroup-v2.rst            |  11 +
+ Documentation/admin-guide/kernel-parameters.txt    |  20 +-
+ Documentation/admin-guide/mm/transhuge.rst         |  14 +
+ Documentation/admin-guide/mm/userfaultfd.rst       |  51 ++
+ Documentation/admin-guide/sysctl/vm.rst            |   3 +
+ Documentation/core-api/mm-api.rst                  |   3 +
+ Documentation/core-api/pin_user_pages.rst          |  86 +-
+ Documentation/dev-tools/kcov.rst                   |  17 +-
+ Documentation/vm/free_page_reporting.rst           |  41 +
+ Documentation/vm/zswap.rst                         |  20 +-
+ MAINTAINERS                                        |  42 +-
+ arch/alpha/include/asm/Kbuild                      |  11 -
+ arch/alpha/include/asm/mmzone.h                    |   2 -
+ arch/alpha/kernel/syscalls/syscallhdr.sh           |   2 +-
+ arch/alpha/mm/fault.c                              |   6 +-
+ arch/arc/include/asm/Kbuild                        |  21 -
+ arch/arc/mm/fault.c                                |  35 +-
+ arch/arm/include/asm/Kbuild                        |  12 -
+ arch/arm/mm/fault.c                                |   7 +-
+ arch/arm64/include/asm/Kbuild                      |  18 -
+ arch/arm64/mm/fault.c                              |  26 +-
+ arch/arm64/mm/init.c                               |   6 +
+ arch/c6x/include/asm/Kbuild                        |  37 -
+ arch/csky/include/asm/Kbuild                       |  36 -
+ arch/csky/mm/fault.c                               |   2 +-
+ arch/h8300/include/asm/Kbuild                      |  46 --
+ arch/hexagon/include/asm/Kbuild                    |  33 -
+ arch/hexagon/mm/vm_fault.c                         |   5 +-
+ arch/ia64/include/asm/Kbuild                       |   7 -
+ arch/ia64/kernel/syscalls/syscallhdr.sh            |   2 +-
+ arch/ia64/kernel/vmlinux.lds.S                     |   2 +
+ arch/ia64/mm/fault.c                               |   5 +-
+ arch/m68k/include/asm/Kbuild                       |  24 -
+ arch/m68k/mm/fault.c                               |   9 +-
+ arch/microblaze/include/asm/Kbuild                 |  29 -
+ arch/microblaze/kernel/syscalls/syscallhdr.sh      |   2 +-
+ arch/microblaze/mm/fault.c                         |   5 +-
+ arch/mips/include/asm/Kbuild                       |  13 -
+ arch/mips/kernel/syscalls/syscallhdr.sh            |   3 +-
+ arch/mips/mm/fault.c                               |   7 +-
+ arch/nds32/include/asm/Kbuild                      |  37 -
+ arch/nds32/kernel/vmlinux.lds.S                    |   1 +
+ arch/nds32/mm/fault.c                              |   5 +-
+ arch/nios2/include/asm/Kbuild                      |  38 -
+ arch/nios2/mm/fault.c                              |   7 +-
+ arch/openrisc/include/asm/Kbuild                   |  36 -
+ arch/openrisc/mm/fault.c                           |   5 +-
+ arch/parisc/include/asm/Kbuild                     |  18 -
+ arch/parisc/kernel/syscalls/syscallhdr.sh          |   2 +-
+ arch/parisc/mm/fault.c                             |   8 +-
+ arch/powerpc/include/asm/Kbuild                    |   4 -
+ arch/powerpc/kernel/syscalls/syscallhdr.sh         |   3 +-
+ arch/powerpc/kvm/e500_mmu_host.c                   |   2 +-
+ arch/powerpc/mm/book3s64/pkeys.c                   |  12 -
+ arch/powerpc/mm/fault.c                            |  22 +-
+ arch/powerpc/platforms/powernv/memtrace.c          |  14 +-
+ arch/powerpc/platforms/pseries/hotplug-memory.c    |   2 +-
+ arch/riscv/include/asm/Kbuild                      |  28 -
+ arch/riscv/mm/fault.c                              |   9 +-
+ arch/s390/include/asm/Kbuild                       |  15 -
+ arch/s390/mm/fault.c                               |  10 +-
+ arch/sh/include/asm/Kbuild                         |  16 -
+ arch/sh/kernel/syscalls/syscallhdr.sh              |   2 +-
+ arch/sh/mm/fault.c                                 |  15 +-
+ arch/sparc/include/asm/Kbuild                      |  14 -
+ arch/sparc/kernel/syscalls/syscallhdr.sh           |   2 +-
+ arch/sparc/mm/fault_32.c                           |   5 +-
+ arch/sparc/mm/fault_64.c                           |   5 +-
+ arch/sparc/vdso/vdso32/vclock_gettime.c            |   4 -
+ arch/um/kernel/trap.c                              |   3 +-
+ arch/unicore32/include/asm/Kbuild                  |  34 -
+ arch/unicore32/mm/fault.c                          |   8 +-
+ arch/x86/Kconfig                                   |   3 +-
+ arch/x86/configs/i386_defconfig                    |   1 -
+ arch/x86/configs/x86_64_defconfig                  |   1 -
+ arch/x86/entry/vdso/vdso32/vclock_gettime.c        |   4 -
+ arch/x86/include/asm/Kbuild                        |   2 -
+ arch/x86/include/asm/mmu_context.h                 |  15 -
+ arch/x86/include/asm/pgtable.h                     |  67 ++
+ arch/x86/include/asm/pgtable_64.h                  |   8 +-
+ arch/x86/include/asm/pgtable_types.h               |  12 +-
+ arch/x86/kernel/setup.c                            |   4 +
+ arch/x86/mm/fault.c                                |  32 +-
+ arch/xtensa/include/asm/Kbuild                     |  26 -
+ arch/xtensa/kernel/syscalls/syscallhdr.sh          |   2 +-
+ arch/xtensa/mm/fault.c                             |   5 +-
+ drivers/base/memory.c                              | 174 ++--
+ drivers/base/node.c                                |   2 +-
+ drivers/gpu/drm/ttm/ttm_bo_vm.c                    |  12 +-
+ drivers/hv/hv_balloon.c                            |  25 +-
+ drivers/misc/lkdtm/bugs.c                          |  75 ++
+ drivers/misc/lkdtm/core.c                          |   3 +
+ drivers/misc/lkdtm/lkdtm.h                         |   3 +
+ drivers/tty/serial/sh-sci.c                        |   2 +-
+ drivers/usb/core/hcd.c                             |   3 +
+ drivers/virtio/Kconfig                             |   1 +
+ drivers/virtio/virtio_balloon.c                    | 180 ++--
+ fs/aio.c                                           |   9 +-
+ fs/binfmt_elf.c                                    |  48 +-
+ fs/buffer.c                                        |  56 +-
+ fs/eventpoll.c                                     |  64 +-
+ fs/exec.c                                          |  14 +-
+ fs/fs_parser.c                                     |   2 -
+ fs/hfsplus/attributes.c                            |   4 +
+ fs/hugetlbfs/inode.c                               |  30 +-
+ fs/ocfs2/alloc.c                                   |   3 +-
+ fs/ocfs2/cluster/heartbeat.c                       |  12 +-
+ fs/ocfs2/cluster/netdebug.c                        |   4 +-
+ fs/ocfs2/cluster/tcp.c                             |  27 +-
+ fs/ocfs2/cluster/tcp.h                             |   2 +-
+ fs/ocfs2/dir.c                                     |   4 +-
+ fs/ocfs2/dlm/dlmcommon.h                           |   8 +-
+ fs/ocfs2/dlm/dlmdebug.c                            | 100 +--
+ fs/ocfs2/dlm/dlmmaster.c                           |   2 -
+ fs/ocfs2/dlm/dlmthread.c                           |   3 -
+ fs/ocfs2/dlmglue.c                                 |   2 +-
+ fs/ocfs2/journal.c                                 |   2 +-
+ fs/ocfs2/namei.c                                   |  15 +-
+ fs/ocfs2/ocfs2_fs.h                                |  18 +-
+ fs/ocfs2/refcounttree.c                            |   2 +
+ fs/ocfs2/reservations.c                            |   3 -
+ fs/ocfs2/stackglue.c                               |   2 -
+ fs/ocfs2/suballoc.c                                |   5 -
+ fs/ocfs2/super.c                                   |  46 +-
+ fs/pipe.c                                          |   2 +-
+ fs/proc/array.c                                    |  39 +-
+ fs/proc/cpuinfo.c                                  |   1 +
+ fs/proc/generic.c                                  |  31 +-
+ fs/proc/inode.c                                    | 188 +++--
+ fs/proc/internal.h                                 |   6 +
+ fs/proc/kmsg.c                                     |   1 +
+ fs/proc/page.c                                     |  40 +-
+ fs/proc/stat.c                                     |   1 +
+ fs/proc/task_mmu.c                                 |  95 +--
+ fs/ramfs/inode.c                                   |  12 +
+ fs/reiserfs/do_balan.c                             |   2 +-
+ fs/reiserfs/ioctl.c                                |  11 +-
+ fs/reiserfs/namei.c                                |  10 +-
+ fs/seq_file.c                                      |  28 -
+ fs/userfaultfd.c                                   | 168 ++--
+ include/asm-generic/Kbuild                         |  52 ++
+ include/asm-generic/pgtable.h                      |   1 +
+ include/asm-generic/pgtable_uffd.h                 |  66 ++
+ include/asm-generic/tlb.h                          |   3 +-
+ include/linux/bitops.h                             |   4 +-
+ include/linux/bits.h                               |  22 +-
+ include/linux/cgroup-defs.h                        |   5 +
+ include/linux/compiler.h                           |   2 +-
+ include/linux/compiler_types.h                     |  11 +-
+ include/linux/fs.h                                 |   5 +
+ include/linux/gfp.h                                |   6 +
+ include/linux/huge_mm.h                            |  12 +-
+ include/linux/hugetlb.h                            |  84 +-
+ include/linux/hugetlb_cgroup.h                     | 169 +++-
+ include/linux/kasan.h                              |   2 +-
+ include/linux/kthread.h                            |   3 +-
+ include/linux/list.h                               |  50 +-
+ include/linux/memcontrol.h                         |  42 +-
+ include/linux/memory.h                             |   1 -
+ include/linux/memory_hotplug.h                     |  13 +-
+ include/linux/mempolicy.h                          |  29 +-
+ include/linux/memremap.h                           |   8 +-
+ include/linux/mm.h                                 | 263 ++++--
+ include/linux/mm_inline.h                          |  15 +-
+ include/linux/mm_types.h                           |  11 +-
+ include/linux/mmzone.h                             |  53 +-
+ include/linux/nmi.h                                |   1 +
+ include/linux/page-flags.h                         |  16 +
+ include/linux/page_ref.h                           |   9 +
+ include/linux/page_reporting.h                     |  26 +
+ include/linux/pagemap.h                            |  29 +-
+ include/linux/percpu_counter.h                     |   4 +-
+ include/linux/proc_fs.h                            |  17 +-
+ include/linux/sched.h                              |  11 +
+ include/linux/sched/signal.h                       |  16 +
+ include/linux/seq_file.h                           |   1 -
+ include/linux/shmem_fs.h                           |  10 +-
+ include/linux/stackdepot.h                         |   2 +
+ include/linux/swap.h                               |   1 -
+ include/linux/swapops.h                            |   5 +-
+ include/linux/topology.h                           |  17 -
+ include/linux/userfaultfd_k.h                      |  42 +-
+ include/linux/vm_event_item.h                      |   5 +
+ include/linux/wait.h                               |   4 +-
+ include/trace/events/huge_memory.h                 |   1 +
+ include/trace/events/mmap.h                        |  48 ++
+ include/trace/events/mmflags.h                     |   1 +
+ include/trace/events/vmscan.h                      |   2 +-
+ include/uapi/linux/mman.h                          |   5 +-
+ include/uapi/linux/userfaultfd.h                   |  40 +-
+ include/uapi/linux/virtio_balloon.h                |   1 +
+ init/Kconfig                                       |   8 +-
+ ipc/mqueue.c                                       |  39 +-
+ ipc/util.c                                         |   1 +
+ kernel/cgroup/cgroup.c                             |  17 +-
+ kernel/configs/tiny.config                         |   1 -
+ kernel/events/core.c                               |   3 +-
+ kernel/extable.c                                   |   3 +-
+ kernel/fork.c                                      |  19 +-
+ kernel/gcov/fs.c                                   |   2 +-
+ kernel/gcov/gcc_3_4.c                              |   6 +-
+ kernel/gcov/gcc_4_7.c                              |   2 +-
+ kernel/hung_task.c                                 |  44 +
+ kernel/kallsyms.c                                  |   2 -
+ kernel/kcov.c                                      | 266 ++++--
+ kernel/module.c                                    |   1 +
+ kernel/relay.c                                     |  17 +-
+ kernel/sched/fair.c                                |   2 +-
+ kernel/sysctl.c                                    |  29 +-
+ kernel/watchdog.c                                  |  22 +
+ kernel/watchdog_hld.c                              |   1 +
+ lib/Kconfig.debug                                  |  39 +-
+ lib/Kconfig.ubsan                                  |  49 +-
+ lib/Makefile                                       |   8 +
+ lib/bch.c                                          |   2 +-
+ lib/cpumask.c                                      | 102 ++-
+ lib/dynamic_debug.c                                |   2 +-
+ lib/rbtree.c                                       |   4 +-
+ lib/scatterlist.c                                  |   2 +-
+ lib/stackdepot.c                                   |  39 +-
+ lib/test_bitmap.c                                  |   2 +
+ lib/test_kasan.c                                   |  19 +
+ lib/test_kmod.c                                    |   2 +-
+ lib/test_lockup.c                                  | 599 ++++++++++++++
+ lib/test_stackinit.c                               |  28 +-
+ lib/ts_bm.c                                        |   2 +-
+ lib/ts_fsm.c                                       |   2 +-
+ lib/ts_kmp.c                                       |   2 +-
+ lib/ubsan.c                                        |  47 +-
+ mm/Kconfig                                         | 135 ++-
+ mm/Makefile                                        |   2 +
+ mm/compaction.c                                    |  32 +-
+ mm/debug.c                                         |  44 +-
+ mm/dmapool.c                                       |   4 +-
+ mm/filemap.c                                       |  85 +-
+ mm/gup.c                                           | 667 +++++++++++----
+ mm/gup_benchmark.c                                 |  71 +-
+ mm/huge_memory.c                                   |  65 +-
+ mm/hugetlb.c                                       | 919 ++++++++++++++++-----
+ mm/hugetlb_cgroup.c                                | 317 +++++--
+ mm/internal.h                                      |  34 +-
+ mm/kasan/common.c                                  |  49 +-
+ mm/kasan/generic.c                                 |   9 +-
+ mm/kasan/generic_report.c                          |  11 +
+ mm/kasan/kasan.h                                   |   2 +-
+ mm/kasan/report.c                                  |  15 +-
+ mm/kasan/tags.c                                    |   9 +-
+ mm/kasan/tags_report.c                             |  11 +
+ mm/khugepaged.c                                    |  43 +-
+ mm/kmemleak.c                                      |   2 +-
+ mm/ksm.c                                           |   5 +-
+ mm/list_lru.c                                      |  14 +-
+ mm/mapping_dirty_helpers.c                         |  42 +-
+ mm/memblock.c                                      |   2 +-
+ mm/memcontrol.c                                    | 401 +++++----
+ mm/memory-failure.c                                |  31 +-
+ mm/memory.c                                        |  42 +-
+ mm/memory_hotplug.c                                |  49 +-
+ mm/mempolicy.c                                     |  84 +-
+ mm/memremap.c                                      |  20 +
+ mm/migrate.c                                       | 143 ++--
+ mm/mm_init.c                                       |   2 +-
+ mm/mmap.c                                          |  81 +-
+ mm/mprotect.c                                      |  76 +-
+ mm/mremap.c                                        |  92 ++-
+ mm/page-writeback.c                                |  19 +-
+ mm/page_alloc.c                                    | 260 ++++--
+ mm/page_counter.c                                  |  23 +-
+ mm/page_ext.c                                      |   5 +-
+ mm/page_isolation.c                                |   6 +-
+ mm/page_reporting.c                                | 364 ++++++++
+ mm/page_reporting.h                                |  54 ++
+ mm/rmap.c                                          |  62 +-
+ mm/shmem.c                                         | 166 ++--
+ mm/shuffle.c                                       |  14 +-
+ mm/shuffle.h                                       |   6 +
+ mm/slab.h                                          |  22 +-
+ mm/slab_common.c                                   |   3 +-
+ mm/slub.c                                          |  30 +-
+ mm/sparse.c                                        | 163 ++--
+ mm/swap.c                                          |  25 +-
+ mm/swap_slots.c                                    |  12 +-
+ mm/swap_state.c                                    |   2 +-
+ mm/swapfile.c                                      |  11 +-
+ mm/userfaultfd.c                                   | 105 ++-
+ mm/vmpressure.c                                    |   8 +-
+ mm/vmscan.c                                        | 123 +--
+ mm/vmstat.c                                        |   5 +
+ mm/zsmalloc.c                                      |  10 +-
+ mm/zswap.c                                         |  24 +-
+ samples/hw_breakpoint/data_breakpoint.c            |  11 +-
+ scripts/Makefile.ubsan                             |  16 +-
+ scripts/checkpatch.pl                              | 155 +++-
+ scripts/spelling.txt                               |  21 +-
+ tools/accounting/getdelays.c                       |   2 +-
+ tools/lib/rbtree.c                                 |   4 +-
+ .../filesystems/epoll/epoll_wakeup_test.c          |  67 +-
+ tools/testing/selftests/vm/.gitignore              |   1 +
+ tools/testing/selftests/vm/Makefile                |   2 +
+ .../selftests/vm/charge_reserved_hugetlb.sh        | 575 +++++++++++++
+ tools/testing/selftests/vm/gup_benchmark.c         |  15 +-
+ .../selftests/vm/hugetlb_reparenting_test.sh       | 244 ++++++
+ tools/testing/selftests/vm/map_hugetlb.c           |  14 +-
+ tools/testing/selftests/vm/mlock2-tests.c          | 233 +-----
+ tools/testing/selftests/vm/mremap_dontunmap.c      | 313 +++++++
+ tools/testing/selftests/vm/run_vmtests             |  37 +
+ tools/testing/selftests/vm/userfaultfd.c           | 225 +++--
+ tools/testing/selftests/vm/write_hugetlb_memory.sh |  23 +
+ tools/testing/selftests/vm/write_to_hugetlbfs.c    | 242 ++++++
+ 310 files changed, 9357 insertions(+), 3650 deletions(-)
+ create mode 100644 Documentation/vm/free_page_reporting.rst
+ create mode 100644 include/asm-generic/pgtable_uffd.h
+ create mode 100644 include/linux/page_reporting.h
+ create mode 100644 include/trace/events/mmap.h
+ create mode 100644 lib/test_lockup.c
+ create mode 100644 mm/page_reporting.c
+ create mode 100644 mm/page_reporting.h
+ create mode 100644 tools/testing/selftests/vm/charge_reserved_hugetlb.sh
+ create mode 100644 tools/testing/selftests/vm/hugetlb_reparenting_test.sh
+ create mode 100644 tools/testing/selftests/vm/mremap_dontunmap.c
+ create mode 100644 tools/testing/selftests/vm/write_hugetlb_memory.sh
+ create mode 100644 tools/testing/selftests/vm/write_to_hugetlbfs.c
+$ git clone -s -l -n -q . ../rebase-tmp
+$ cd ../rebase-tmp
+$ git checkout -b akpm remotes/origin/akpm/master
+Switched to a new branch 'akpm'
+$ git rebase --onto master remotes/origin/akpm/master-base
+First, rewinding head to replay your work on top of it...
+Applying: Change email address for Pali Rohár
+Applying: mm/kmemleak: silence KCSAN splats in checksum
+Applying: drivers/dma/tegra20-apb-dma.c: fix platform_get_irq.cocci warnings
+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: mm/memory.c: refactor insert_page to prepare for batched-lock insert
+Applying: mm: bring sparc pte_index() semantics inline with other platforms
+Applying: mm: define pte_index as macro for x86
+Applying: mm/memory.c: add vm_insert_pages()
+Applying: mm-add-vm_insert_pages-fix
+Applying: add missing page_count() check to vm_insert_pages().
+Applying: mm: vm_insert_pages() checks if pte_index defined.
+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/vma: define a default value for VM_DATA_DEFAULT_FLAGS
+Applying: mm/vma: introduce VM_ACCESS_FLAGS
+Applying: mm/special: create generic fallbacks for pte_special() and pte_mkspecial()
+Applying: mm-special-create-generic-fallbacks-for-pte_special-and-pte_mkspecial-v3
+Applying: mm/debug: add tests validating architecture page table helpers
+Applying: mm/memory_hotplug: drop the flags field from struct mhp_restrictions
+Applying: mm/memory_hotplug: rename mhp_restrictions to mhp_params
+Applying: x86/mm: thread pgprot_t through init_memory_mapping()
+Applying: x86/mm: introduce __set_memory_prot()
+Applying: powerpc/mm: thread pgprot_t through create_section_mapping()
+Applying: mm/memory_hotplug: add pgprot_t to mhp_params
+Applying: mm/memremap: set caching mode for PCI P2PDMA memory to WC
+Applying: mm/madvise: pass task and mm to do_madvise
+Applying: mm/madvise: introduce process_madvise() syscall: an external memory hinting API
+Using index info to reconstruct a base tree...
+M	arch/powerpc/kernel/syscalls/syscall.tbl
+Falling back to patching base and 3-way merge...
+Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl
+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: kmod: make request_module() return an error when autoloading is disabled
+Applying: fs/filesystems.c: downgrade user-reachable WARN_ONCE() to pr_warn_once()
+Applying: docs: admin-guide: document the kernel.modprobe sysctl
+Applying: docs-admin-guide-document-the-kernelmodprobe-sysctl-v5
+Applying: selftests: kmod: fix handling test numbers above 9
+Applying: selftests: kmod: test disabling module autoloading
+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: fs/seq_file.c: seq_read(): add info message about buggy .next functions
+Applying: seq_read-info-message-about-buggy-next-functions-fix
+Applying: kernel/gcov/fs.c: gcov_seq_next() should increase position index
+Applying: ipc/util.c: sysvipc_find_ipc() should increase position index
+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
+ + 194e688ca3f8...cd36aa879b73 akpm       -> akpm/master  (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (cd36aa879b73 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/sysfs-platform-dell-laptop         |   8 +-
+ Documentation/admin-guide/sysctl/kernel.rst        |  21 ++
+ .../debug/debug-vm-pgtable/arch-support.txt        |  34 ++
+ MAINTAINERS                                        |  16 +-
+ arch/alpha/include/asm/page.h                      |   3 -
+ arch/alpha/include/asm/pgtable.h                   |   2 -
+ arch/alpha/kernel/syscalls/syscall.tbl             |   1 +
+ arch/arc/Kconfig                                   |   1 +
+ arch/arc/include/asm/page.h                        |   2 +-
+ arch/arm/include/asm/page.h                        |   4 +-
+ arch/arm/include/asm/pgtable-2level.h              |   2 -
+ arch/arm/include/asm/pgtable.h                     |  15 +-
+ arch/arm/mach-omap2/omap-secure.c                  |   2 +-
+ arch/arm/mach-omap2/omap-secure.h                  |   2 +-
+ arch/arm/mach-omap2/omap-smc.S                     |   2 +-
+ arch/arm/mm/fault.c                                |   2 +-
+ arch/arm/mm/mmu.c                                  |  14 +
+ arch/arm/tools/syscall.tbl                         |   1 +
+ arch/arm64/Kconfig                                 |   1 +
+ arch/arm64/include/asm/memory.h                    |  11 +
+ arch/arm64/include/asm/page.h                      |   4 +-
+ arch/arm64/include/asm/unistd.h                    |   2 +-
+ arch/arm64/include/asm/unistd32.h                  |   2 +
+ arch/arm64/mm/fault.c                              |   2 +-
+ arch/arm64/mm/mmu.c                                |   7 +-
+ arch/c6x/include/asm/page.h                        |   5 +-
+ arch/csky/include/asm/page.h                       |   3 -
+ arch/csky/include/asm/pgtable.h                    |   3 -
+ arch/h8300/include/asm/page.h                      |   2 -
+ arch/hexagon/include/asm/page.h                    |   3 +-
+ arch/hexagon/include/asm/pgtable.h                 |   2 -
+ arch/ia64/include/asm/page.h                       |   5 +-
+ arch/ia64/include/asm/pgtable.h                    |   2 -
+ arch/ia64/kernel/syscalls/syscall.tbl              |   1 +
+ arch/ia64/mm/init.c                                |   7 +-
+ arch/m68k/include/asm/mcf_pgtable.h                |  10 -
+ arch/m68k/include/asm/motorola_pgtable.h           |   2 -
+ arch/m68k/include/asm/page.h                       |   3 -
+ arch/m68k/include/asm/sun3_pgtable.h               |   2 -
+ arch/m68k/kernel/syscalls/syscall.tbl              |   1 +
+ arch/microblaze/include/asm/page.h                 |   2 -
+ arch/microblaze/include/asm/pgtable.h              |   4 -
+ arch/microblaze/kernel/syscalls/syscall.tbl        |   1 +
+ arch/mips/include/asm/page.h                       |   5 +-
+ arch/mips/include/asm/pgtable.h                    |  44 ++-
+ arch/mips/kernel/syscalls/syscall_n32.tbl          |   1 +
+ arch/mips/kernel/syscalls/syscall_n64.tbl          |   1 +
+ arch/nds32/include/asm/page.h                      |   3 -
+ arch/nds32/include/asm/pgtable.h                   |   9 -
+ arch/nds32/mm/fault.c                              |   2 +-
+ arch/nios2/include/asm/page.h                      |   3 +-
+ arch/nios2/include/asm/pgtable.h                   |   3 -
+ arch/openrisc/include/asm/page.h                   |   5 -
+ arch/openrisc/include/asm/pgtable.h                |   2 -
+ arch/parisc/include/asm/page.h                     |   3 -
+ arch/parisc/include/asm/pgtable.h                  |   2 -
+ arch/parisc/kernel/syscalls/syscall.tbl            |   1 +
+ arch/powerpc/Kconfig                               |   1 +
+ arch/powerpc/include/asm/book3s/64/hash.h          |   3 +-
+ arch/powerpc/include/asm/book3s/64/radix.h         |   3 +-
+ arch/powerpc/include/asm/page.h                    |   9 +-
+ arch/powerpc/include/asm/page_64.h                 |   7 +-
+ arch/powerpc/include/asm/sparsemem.h               |   3 +-
+ arch/powerpc/kernel/syscalls/syscall.tbl           |   1 +
+ arch/powerpc/mm/book3s64/hash_utils.c              |   5 +-
+ arch/powerpc/mm/book3s64/pgtable.c                 |   7 +-
+ arch/powerpc/mm/book3s64/pkeys.c                   |   2 +-
+ arch/powerpc/mm/book3s64/radix_pgtable.c           |  18 +-
+ arch/powerpc/mm/mem.c                              |  10 +-
+ arch/riscv/include/asm/page.h                      |   3 +-
+ arch/s390/Kconfig                                  |   1 +
+ arch/s390/include/asm/page.h                       |   3 +-
+ arch/s390/kernel/syscalls/syscall.tbl              |   1 +
+ arch/s390/mm/fault.c                               |   2 +-
+ arch/s390/mm/init.c                                |   9 +-
+ arch/sh/include/asm/page.h                         |   3 -
+ arch/sh/kernel/syscalls/syscall.tbl                |   1 +
+ arch/sh/mm/init.c                                  |   7 +-
+ arch/sparc/include/asm/page_32.h                   |   3 -
+ arch/sparc/include/asm/page_64.h                   |   3 -
+ arch/sparc/include/asm/pgtable_32.h                |   7 -
+ arch/sparc/include/asm/pgtable_64.h                |  10 +-
+ arch/sparc/kernel/syscalls/syscall.tbl             |   1 +
+ arch/um/include/asm/pgtable.h                      |  10 -
+ arch/unicore32/include/asm/page.h                  |   3 -
+ arch/unicore32/include/asm/pgtable.h               |   3 -
+ arch/unicore32/mm/fault.c                          |   2 +-
+ arch/x86/Kconfig                                   |   1 +
+ arch/x86/entry/syscalls/syscall_32.tbl             |   1 +
+ arch/x86/entry/syscalls/syscall_64.tbl             |   1 +
+ arch/x86/include/asm/page_types.h                  |   7 +-
+ arch/x86/include/asm/pgtable.h                     |   6 +
+ arch/x86/include/asm/pgtable_64.h                  |   6 +
+ arch/x86/include/asm/set_memory.h                  |   1 +
+ arch/x86/kernel/amd_gart_64.c                      |   3 +-
+ arch/x86/mm/init.c                                 |   9 +-
+ arch/x86/mm/init_32.c                              |  19 +-
+ arch/x86/mm/init_64.c                              |  40 ++-
+ arch/x86/mm/mm_internal.h                          |   3 +-
+ arch/x86/mm/pat/set_memory.c                       |  13 +
+ arch/x86/mm/pkeys.c                                |   2 +-
+ arch/x86/platform/uv/bios_uv.c                     |   3 +-
+ arch/x86/um/asm/vm-flags.h                         |  10 +-
+ arch/xtensa/include/asm/page.h                     |   3 -
+ arch/xtensa/include/asm/pgtable.h                  |   3 -
+ arch/xtensa/kernel/syscalls/syscall.tbl            |   1 +
+ drivers/char/hw_random/omap3-rom-rng.c             |   4 +-
+ drivers/dma/tegra20-apb-dma.c                      |   1 -
+ drivers/hwmon/dell-smm-hwmon.c                     |   4 +-
+ drivers/media/platform/sti/delta/delta-ipc.c       |   4 +-
+ drivers/platform/x86/dell-laptop.c                 |   4 +-
+ drivers/platform/x86/dell-rbtn.c                   |   4 +-
+ drivers/platform/x86/dell-rbtn.h                   |   2 +-
+ drivers/platform/x86/dell-smbios-base.c            |   4 +-
+ drivers/platform/x86/dell-smbios-smm.c             |   2 +-
+ drivers/platform/x86/dell-smbios.h                 |   2 +-
+ drivers/platform/x86/dell-smo8800.c                |   2 +-
+ drivers/platform/x86/dell-wmi.c                    |   4 +-
+ drivers/power/supply/bq2415x_charger.c             |   4 +-
+ drivers/power/supply/bq27xxx_battery.c             |   2 +-
+ drivers/power/supply/isp1704_charger.c             |   2 +-
+ drivers/power/supply/rx51_battery.c                |   4 +-
+ drivers/staging/gasket/gasket_core.c               |   2 +-
+ fs/filesystems.c                                   |   4 +-
+ fs/io_uring.c                                      |   2 +-
+ fs/seq_file.c                                      |   7 +-
+ fs/udf/ecma_167.h                                  |   2 +-
+ fs/udf/osta_udf.h                                  |   2 +-
+ include/linux/memcontrol.h                         |   2 +-
+ include/linux/memory_hotplug.h                     |  21 +-
+ include/linux/mm.h                                 |  38 +-
+ include/linux/mmdebug.h                            |   5 +
+ include/linux/pid.h                                |   1 +
+ include/linux/power/bq2415x_charger.h              |   2 +-
+ include/linux/syscalls.h                           |   3 +
+ include/uapi/asm-generic/unistd.h                  |   4 +-
+ init/main.c                                        |   2 +
+ ipc/util.c                                         |   2 +-
+ kernel/exit.c                                      |  17 -
+ kernel/gcov/fs.c                                   |   2 +-
+ kernel/kexec_core.c                                |  56 +++
+ kernel/kmod.c                                      |   4 +-
+ 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                                        | 172 ++++++++-
+ mm/memory_hotplug.c                                |  17 +-
+ mm/mempool.c                                       |   2 +-
+ mm/memremap.c                                      |  17 +-
+ mm/mmap.c                                          |   2 +-
+ mm/mprotect.c                                      |   4 +-
+ 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 +++-
+ tools/laptop/freefall/freefall.c                   |   2 +-
+ tools/testing/selftests/kmod/kmod.sh               |  43 ++-
+ 168 files changed, 1364 insertions(+), 452 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 0000000000000..60ec6cc9b3036
--- /dev/null
+++ b/Next/quilt-import.log
@@ -0,0 +1,2 @@
+Importing dmi based on 5.5
+Unchanged quilt series dmi
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 0000000000000..321f83a58ae4e
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20200402
-- 
GitLab