From 6014cfa5bf32cf8c5c58b3cfd5ee0e1542c8a825 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 15 Jul 2022 22:50:52 +1000
Subject: [PATCH] Add linux-next specific files for 20220715

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 Next/SHA1s        |   358 ++
 Next/Trees        |   360 ++
 Next/merge.log    | 15148 ++++++++++++++++++++++++++++++++++++++++++++
 localversion-next |     1 +
 4 files changed, 15867 insertions(+)
 create mode 100644 Next/SHA1s
 create mode 100644 Next/Trees
 create mode 100644 Next/merge.log
 create mode 100644 localversion-next

diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 0000000000000..97d1b1c489921
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,358 @@
+Name		SHA1
+----		----
+origin		db886979683a8360ced9b24ab1125ad0c4d2cf76
+fixes		4a57a8400075bc5287c5c877702c68aeae2a033d
+mm-hotfixes	cb84e28edaa4ed77e9571192839407a8bdc95561
+kbuild-current	32346491ddf24599decca06190ebca03ff9de7f8
+arc-current	952deecb065e23784fd6fcab3020de397d51d296
+arm-current	29589ca09a74cfc0c50ad002e298bf4b8e69e0bd
+arm64-fixes	410982303772993a86bb7a9cfa7ece34522b2636
+arm-soc-fixes	d332a1f6b4c4b07bf984f04df897818c7c7fce8f
+drivers-memory-fixes	1332661e09304b7b8e84e5edc11811ba08d12abe
+tee-fixes	98268f2a2a9f1dddf20984f79fdc7b655d0e35fe
+m68k-current	30b5e6ef4a32ea4985b99200e06d6660a69f9246
+powerpc-fixes	887502826549caa7e4215fd9e628f48f14c0825a
+s390-fixes	1fcbcc6d803aefa11cb4a4116036ee7108cae97e
+sparc		05a59d79793d482f628a31753c671f2e92178a21
+fscrypt-current	80f6e3080bfcf865062a926817b3ca6c4a137a57
+net		db886979683a8360ced9b24ab1125ad0c4d2cf76
+bpf		f946964a9f79f8dcb5a6329265281eebfc23aee5
+ipsec		e79b9473e9b59e83e23db9b7411c6080b5a6826d
+netfilter	7fb0269720d7d5359bc8349eef908a1c96866b65
+ipvs		7fb0269720d7d5359bc8349eef908a1c96866b65
+wireless	b11e5f6a3a5c170d16c2cf0b1d8053bbf1f6b7de
+rdma-fixes	cc0315564d6eec91c716d314b743321be24c70b3
+sound-current	9b043a8f386485c74c0f8eea2c287d5bdbdf3279
+sound-asoc-fixes	efb2b2097c62c7707ec4622c9e66115e6f703ad8
+regmap-fixes	3f05010f243be06478a9b11cfce0ce994f5a0890
+regulator-fixes	122e951eb8045338089b086c8bd9b0b9afb04a92
+spi-fixes	73d5fe046270281a46344e06bf986c607632f7ea
+pci-current	a2b36ffbf5b6ec301e61249c8b09e610bc80772f
+driver-core.current	f2906aa863381afb0015a9eb7fefad885d4e5a56
+tty.current	a501ab75e7624d133a5a3c7ec010687c8b961d23
+usb.current	3486af89dd3c0b0bef194c4bccf17c31ef16b99f
+usb-gadget-fixes	e49d033bddf5b565044e2abe4241353959bc9120
+usb-serial-fixes	7c239a071d1f04b7137789810807b4108d475c72
+phy		f2906aa863381afb0015a9eb7fefad885d4e5a56
+staging.current	32346491ddf24599decca06190ebca03ff9de7f8
+iio-fixes	315f7e15c261167ea71c1a4cce2a18ca30e990ea
+counter-fixes	f2906aa863381afb0015a9eb7fefad885d4e5a56
+char-misc.current	32346491ddf24599decca06190ebca03ff9de7f8
+soundwire-fixes	f2906aa863381afb0015a9eb7fefad885d4e5a56
+thunderbolt-fixes	03c765b0e3b4cb5063276b086c76f7a612856a9a
+input-current	2a96271fb66c499e4a89d76a89d3d01170c10bef
+crypto-current	87d044096ea62f1f230e8c4679ee8abf03266f64
+vfio-fixes	afe4e376ac5d568367b447ca90c12858d0935b86
+kselftest-fixes	9b4d5c01eb234f66a15a746b1c73e10209edb199
+modules-fixes	e69a66147d49506062cd837f3b230ee3e98102ab
+dmaengine-fixes	607a48c78e6b427b0b684d24e61c19e846ad65d6
+backlight-fixes	a38fd8748464831584a19438cbb3082b5a2dab15
+mtd-fixes	06781a5026350cde699d2d10c9914a25c1524f45
+mfd-fixes	a61f4661fba404418a7c77e86586dc52a58a93c6
+v4l-dvb-fixes	3bcc2c1eade4e95ee494c30684d0157fba27c824
+reset-fixes	a57f68ddc8865d59a19783080cc52fb4a11dc209
+mips-fixes	88084a3df1672e131ddc1b4e39eeacfd39864acf
+at91-fixes	2fdf15b50a46e366740df4cccbe2343269b4ff55
+omap-fixes	2eb502f496f7764027b7958d4e74356fed918059
+kvm-fixes	8a414f943f8b5f94bbaafdec863d6f3dbef33f8a
+kvms390-fixes	242c04f01377122b137e13313190303a27773f70
+hwmon-fixes	88084a3df1672e131ddc1b4e39eeacfd39864acf
+nvdimm-fixes	69053101e096c01a4c8e3d2497e3cd5716e43cec
+cxl-fixes	e35f5718903b093be4b1d3833aa8a32f864a3ef1
+btrfs-fixes	7531ec5954ab276fd01134b0baca72492a0f41e4
+vfs-fixes	c3497fd009ef2c59eea60d21c3ac22de3585ed7d
+dma-mapping-fixes	3be4562584bba603f33863a00c1c32eecf772ee6
+i3c-fixes	fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8
+drivers-x86-fixes	5ad26161a371e4aa2d2553286f0cac580987a493
+samsung-krzk-fixes	c4c79525042a4a7df96b73477feaf232fe44ae81
+pinctrl-samsung-fixes	f2906aa863381afb0015a9eb7fefad885d4e5a56
+devicetree-fixes	0b9431c8221cfe73d06f6b9cd37b813fa52be8ce
+dt-krzk-fixes	f2906aa863381afb0015a9eb7fefad885d4e5a56
+scsi-fixes	355bf2e036c954317ddc4a9618b4f7e38ea5a970
+drm-fixes	3590b44b9434af1b9c81c3f40189087ed4fe3635
+amdgpu-fixes	2c409ba81be25516afe05ae27a4a15da01740b01
+drm-intel-fixes	333991c4e66b3d4b5613315f18016da80344f659
+mmc-fixes	51189eb9ddc88851edc42f539a0f9862fd0630c2
+rtc-fixes	bd33335aa93d615cac77d991c448b986761e7a8d
+gnss-fixes	a111daf0c53ae91e71fd2bfe7497862d14132e3e
+hyperv-fixes	49d6a3c062a1026a5ba957c46f3603c372288ab6
+soc-fsl-fixes	4b0986a3613c92f4ec1bdc7f60ec66fea135991f
+risc-v-fixes	7fccd723912702acfc2d75e8f0596982534f7f24
+risc-v-mc-fixes	efa310ba00716d7a872bdc5fa1f5545edc9efd69
+pidfd-fixes	03ba0fe4d09f2eb0a91888caaa057ed67462ae2d
+fpga-fixes	f2906aa863381afb0015a9eb7fefad885d4e5a56
+spdx		58301e1c15db89c0edc6a122c8f6fb5af271954b
+gpio-brgl-fixes	7329b071729645e243b6207e76bca2f4951c991b
+gpio-intel-fixes	b93a8b2c5161696e732185311d309e0aaf0575be
+pinctrl-intel-fixes	ba79c5e45eecb9e009eca7f5da224f6e42bd4fcb
+erofs-fixes	8b1ac84dcf2cf0fc86f29e92e5c63c4862de6e55
+integrity-fixes	8433856947217ebb5697a8ff9c4c9cad4639a2cf
+kunit-fixes	f2906aa863381afb0015a9eb7fefad885d4e5a56
+ubifs-fixes	c3c07fc25f37c157fde041b3a0c3dfcb1590cbce
+memblock-fixes	c94afc46cae7ad41b2ad6a99368147879f4b0e56
+cel-fixes	1197eb5906a5464dbaea24cac296dfc38499cc00
+irqchip-fixes	1357d2a65601bc0afb221672d5a8f1649063a141
+renesas-fixes	432b52eea3dcf48083bafa4b2b6ef5b054ead609
+broadcom-fixes	a26f045984e7ff9e26e1352f823c9f115dc946d4
+perf-current	ff898552fb32d255517fb0676f9fa500664c484d
+efi-fixes	aa6d1ed107eba26f49933216cffe797253914132
+zstd-fixes	88a309465b3f05a100c3b81966982c0f9f5d23a6
+battery-fixes	093d27bb6f2d1963f927ef59c9a2d37059175426
+drm-misc-fixes	925b6e59138cefa47275c67891c65d48d3266d57
+kbuild		be66c181264a47fb60e1064a9dd38447863c3478
+clang-format	781121a7f6d11d7cae44982f174ea82adeec7db0
+perf		0d2997f750d1de394231bc22768dab94a5b5db2f
+compiler-attributes	7c00621dcaeea206d7489b3e8b50b1864841ae69
+dma-mapping	20347fca71a387a3751f7bb270062616ddc5317a
+asm-generic	4313a24985f00340eeb591fd66aa2b257b9e0a69
+arc		f2906aa863381afb0015a9eb7fefad885d4e5a56
+arm		e035a96f253675656039598230827230160f0940
+arm64		eff044f1b04e046e8a94a03817d21043ba9e54d6
+arm-perf	aaaee7b55c9e58410abcef6e3e2fd80e4135d02e
+arm-soc		f3eade9adec6f591a12d0b75d447697ce642333d
+actions		444d018d8d3874c9c3784a5df3ad2e5f554fbdb6
+amlogic		147c83586707d7b33c0e147b572fe53b0267165a
+aspeed		bfcbea2c93e56bc5a0d7db6528fcce8243433c12
+at91		4dd1a613e464e9036d5163fc8ec5f7dc6e394b53
+broadcom	8cd8892b775745874e72ba29d226971e088de495
+drivers-memory	0d97f2176dec9c1e070215c4e28ba87e036458c9
+imx-mxs		37960df982d09ae119dc7664008cafd34a3c107d
+keystone	cb293d3b430e35dbc1e8425869f27624355ff10a
+mediatek	5281655db0e1f6a5898c4c26815eb816eead2699
+mvebu		58ec0844bd13e3ee6d462024db9b30652cf8ca58
+omap		ad2fe4582c483bfd5609662b8e876066fa912697
+qcom		ca48adcc40b09d7f26a7754d4d54cfc4bd611f38
+raspberrypi	c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca
+renesas		b5468cb7909f0068dd977e1f63ea39132098dbb7
+reset		096e772b1cdcc201ea10a5bd83f280f665444704
+rockchip	2e1170c71ec0c0fb785ce76fca7c682e930af2b8
+samsung-krzk	5642cb8ce0f10369d110a384f1e2be56d9f49e00
+scmi		1a5c74382bceccdfc2b9180bb11b812ee8af08ce
+stm32		4b43ff02d2a4b809a2e8cfa628a54f9e39a87381
+sunxi		3a83b092dd598344f4e721eadd32306ec16d8d3a
+tee		db30e53bf897670e11fdfa199a3ca7079db20fd2
+tegra		393c6c3a6152aab9bacf37727a4a6309982194ff
+ti		62b9e4033c13da9e70b35073168fcdfc4e164dfc
+xilinx		516de80d448fa39782be26491d04ed505bba653f
+clk		16615b92d4dcc6bcd7d211c51cdef3513ba8dd0a
+clk-imx		c196175acdd3ab06114bde2955971bc7282f2b85
+clk-renesas	0e704f6c42dc64f081d0b1738d06b2dee9524f27
+clk-samsung	b35f27fe73d8c86fe40125e063b28007e961b862
+csky		f5ac0fb05b2334040591ecbbe85b6fa73d75736e
+loongarch	a111daf0c53ae91e71fd2bfe7497862d14132e3e
+m68k		b508128bb0d1e243beb56cca5d819bcbb5c269b1
+m68knommu	7ede4785ea97f0d3461261b4008357107d61f7fc
+microblaze	78b5f52ab6f6074a6fe2f27122e2165f32d6a143
+mips		d3164e2f3b0ac003c401d419cda2da0571724352
+nios2		7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae
+openrisc	48bddb89d59eec27c3305d179b1832d5292e285d
+parisc-hd	03c765b0e3b4cb5063276b086c76f7a612856a9a
+powerpc		ac2a2303016baed1a60343500e265519cc45e4d2
+soc-fsl		4b0986a3613c92f4ec1bdc7f60ec66fea135991f
+risc-v		b49816611eaceb66a00c8b18e6d7bcee63eba86b
+risc-v-mc	88d319c6abaeb37f0e2323275eaf57a8388e0265
+s390		d1a22ff346f3da5ae9a32ed7d8fcb2cac6dca9d7
+sh		8518e694203d0bfd202ea4a80356785b6992322e
+sparc-next	dd0d718152e4c65b173070d48ea9dfc06894c3e5
+uml		2a4a62a14be1947fa945c5c11ebf67326381a568
+xtensa		0847d167d0f9bdc8f61e5e5d32831fa8fdcd150f
+pidfd		f70417005a89482dc30136591bc8b06c95b35a16
+fscrypt		218d921b581eadf312c8ef0e09113b111f104eeb
+fscache		0885eacdc81f920c3e0554d5615e69a66504a28d
+afs		26291c54e111ff6ba87a164d85d4a4e134b7315c
+btrfs		3f0dabb4090c13bddec8908984653c5559c2d44d
+ceph		91c08da8e7fc4269de542500519c4df1d93a2731
+cifs		2987372a321e9341417991f588a884229cc4acb4
+configfs	84ec758fb2daa236026506868c8796b0500c047d
+ecryptfs	682a8e2b41effcaf2e80697e395d47f77c91273f
+erofs		2c13554cafe7e1e308b9c086710431062ad1ea29
+exfat		204e6ceaa1035cb7b92b156517e88842ebb4c7ff
+ext3		7fd0dbb80f46b122c3723ac8ad02a2d84468e342
+ext4		f8dc286e4d942dab79d1814e0708ac91052a34fa
+f2fs		785c1904b28d928a0b7c84e05e624434746ecd0c
+fsverity	e6af1bb07704b53bad7771db1b05ee17abad11cb
+fuse		6b49bc9d8a5fe64369680f821b8788ec08d4470c
+gfs2		44dab005fd4298c209ea32ffda6131cad4358d21
+jfs		e471e5942c006532a013eefde239ce1e783ac2d9
+ksmbd		732f30694325ab586a4d90412ace81e50dfe448e
+nfs		32346491ddf24599decca06190ebca03ff9de7f8
+nfs-anna	4f40a5b5544618b096d1611a18219dd91fd57f80
+nfsd		05eaba9bd8c0658004f71e781568f55263da8a64
+ntfs3		604a9d272dc3802d880e0510b9d145b1090b3f8a
+orangefs	40a74870b2d1d3d44e13b3b73c6571dd34f5614d
+overlayfs	4a47c6385bb4e0786826e75bd4555aba32953653
+ubifs		8c03a1c21d72210f81cb369cc528e3fde4b45411
+v9fs		89a9ef3e8d022dee326e7daf9139ff5fce669d87
+xfs		95ff0363f3f6ae70c21a0f2b0603e54438e5988b
+zonefs		6bac30bb8ff8195cbcfc177b3b6b0732929170c1
+iomap		f8189d5d5fbf082786fb91c549f5127f23daec09
+djw-vfs		49df34221804cfd6384135b28b03c9461a31d024
+file-locks	80d8e4d3f3133d2ce8ac83db6806b7bf62e3a1e1
+vfs		51d1c3ac528bd0b2a15ac3c9967ff350791529ee
+printk		7f6fa2d4a510bd9006e4e2e2f99ef6e33916b0a8
+pci		946aac7af90b8dc15f9cbc5021eb0ccb91367b07
+pstore		2c09d1443b9b8b6e25bfb2acf51ad442cf9b314e
+hid		6c55e6cce170ac99f33cbdbabde2c0c36d1051f2
+i2c		b91756cecc549ca3b1332ff5ad75d7bcfcce68be
+i3c		f2906aa863381afb0015a9eb7fefad885d4e5a56
+dmi		f97a2103f1a75ca70f23deadb4d96a16c4d85e7d
+hwmon-staging	9992b19d756ab8f0889fcaf3e71ff93852e74694
+jc_docs		bb6279d8ed25824df9427a367a3f42c7a389346a
+v4l-dvb		d8e8aa866ed8636fd6c1017c3d9453eab2922496
+v4l-dvb-next	e670f5d672ef3d00b0b8c69eff09a019e6dd4ef9
+pm		524b6b1a1288721f687931cf457a3216ad14742a
+cpufreq-arm	0d0771e1d7492b4499bd3cce8d76b718b8dc4e6e
+cpupower	f2906aa863381afb0015a9eb7fefad885d4e5a56
+devfreq		98ebac384ad278efbcf3efb086e557854e734770
+opp		1e5fb38442ebaabb65057c2e58355ee36c2a178f
+thermal		4768f717d85c67c5158331c6b6bc661994462948
+ieee1394	54b3bd99f094b3b919de4078f60d722e62a767e3
+dlm		0f24debbb84758c45ad34bd6f7f0665f632bd66f
+rdma		2635d2a8d4664b665bc12e15eee88e9b1b40ae7b
+net-next	b126047f43f11f61f1dd64802979765d71795dae
+bpf-next	96a233e600df351bcb06e3c20efe048855552926
+ipsec-next	5e25c25aa2c08fb9a79476e029c0b1e3dcd70566
+mlx5-next	cdcdce948d64139aea1c6dfea4b04f5c8ad2784e
+netfilter-next	677fb7525331375ba2f90f4bc94a80b9b6e697a3
+ipvs-next	677fb7525331375ba2f90f4bc94a80b9b6e697a3
+bluetooth	b28a31ebc74fc72acbc9cb9d865c14000d420773
+wireless-next	6a605eb1d71ea8cec50bdf7151c772c599a5fb70
+mtd		ad9b10d1eaada169bd764abcab58f08538877e26
+nand		e16eceea863b417fd328588b1be1a79de0bc937f
+spi-nor		77d4ac6d38487c2ab2688335b2a904469f5b16a4
+crypto		79e6e2f3f3ff345947075341781e900e4f70db81
+drm		0180290abb5ce5c870f84a00ffeda5802f641dce
+drm-misc	c96cfaf8fc02d4bb70727dfa7ce7841a3cff9be2
+amdgpu		b7be3ae759160aa3355ebeb0583f67fb9bda4dae
+drm-intel	81cb44274c654e49f55e6690079540b0bd177db0
+drm-tegra	135f4c551d51065ee2d0677bf5344a89767e9d9b
+drm-msm		cb77085b1f0a86ef9dfba86b5f3ed6c3340c2ea3
+drm-msm-lumag	1ff1da40d6fc9b0125e1c0fcceb09f1d3bca9f05
+imx-drm		927d8fd465adbaaad6cce82f840d489d7c378f29
+etnaviv		2829a9fcb738f742baad9d15de4c6eac84bcfd08
+fbdev		7ae7b9c5e47dbfd60d9f2c22e427c204e8c64943
+regmap		cf39ed2e8ecddbee38e02691d6293b812e98e397
+sound		63f4b99f0089a9719aa4441015fe30ff4b6f10e5
+sound-asoc	c9a866cf4a53ad1b5e42b43180c541bc48717098
+modules		6f1dae1d84b6d08541d8e12edd1c8677ab279dea
+input		39636805cab2d46aa645f389f3fca8040afd4c4f
+block		f46c4db86bee760a24f38093a76a2a2688a6b76e
+device-mapper	2ee73ef60db4d79b9f9b8cd501e8188b5179449f
+libata		0184898dd14d53e81cc439b6735260f19750e3c1
+pcmcia		2ef4bb24ff39ae4af89b80bcc5d516f55368e8ae
+mmc		b3fa3e6dccc465969721b8bd2824213bd235efeb
+mfd		30f8f57ce7aeb6bfd29671a55dfa2d31116069d1
+backlight	023a8830a62846e1cecc8da07e00c801dd0d7598
+battery		a578cc3af5cea5c7a912d2cfb8601875eb8ce451
+regulator	91de5eb17c100b3ab9192c36d99761e9da8536da
+security	ed56f4b5173efba00e3dcd736c18bce43255cf7a
+apparmor	524d8e14258a3c31bcaf915db5762e41249eb924
+integrity	077c63ca4e722aa8d9a008f8e9aeaf3f13635e60
+keys		2d743660786ec51f5c1fefd5782bbdee7b227db0
+safesetid	1b8b719229197b7afa1b1191e083fb41ace095c5
+selinux		ef54ccb61616d8293bc68220d88a8e74271141b5
+smack		b50503990d8889a73bc412fd976ef00951cdb2b5
+tomoyo		b047602d579b4fb028128a525f056bbdc890e7f0
+tpmdd		1679eb4a6194649e48d729f9e53eb47f9b6a8fdb
+watchdog	a111daf0c53ae91e71fd2bfe7497862d14132e3e
+iommu		70f57b51402c7ca8d1a6fecba0858a5f1a185b74
+audit		546093206ba16623c18e344630dbfdd71a4327e0
+devicetree	d17e37c41b7ed38459957a5d2968ba61516fd5c2
+dt-krzk		ad0d6ea39195e609d90b483d819f6f690ba8a7cc
+mailbox		79f9fbe303520d2c32b70f04f2bb02cc2baaa4c3
+spi		6e9966d920616dd22c6cc7e814d33c5988c51965
+tip		3c1ec304a1bc621ae646b1425975210f9594218c
+clockevents	ff714ee7191b55c26540550cebd4c28589e06de1
+edac		92705c9f99563adb33a7e9ea72ed3d17971fc2bc
+irqchip		5d796a6dbe0afc98ce0b2fcfd0df422737fcda8e
+ftrace		01dca6d03bb3c6efad9a68626eb0f3d98f02d1b9
+rcu		88cea4e18ed430aa1187063450236fc00408eaac
+kvm		4b88b1a518b337de1252b8180519ca4c00015c9e
+kvm-arm		df6b5b914e0c9ed8476d766722b2ae37861683e7
+kvms390		ff63b9bfa56d0a06a5a40975abadb00b739d9ebe
+xen-tip		a47336535f0f7981ac3a8a5af2b705671c5fb6e6
+percpu		a111daf0c53ae91e71fd2bfe7497862d14132e3e
+workqueues	8bee9dd953b69c634d1c9a3241a8b357469ad4aa
+drivers-x86	fe16ecaa0e629ade1e1cc09781c7cc77e5d2c8bc
+chrome-platform	3de7203115af2f3a76ffdb0c90a89ad99f4c4e04
+hsi		43c14f8d18a7ab26e8f0e960bfd8f4d0a9c57c4d
+leds		f2906aa863381afb0015a9eb7fefad885d4e5a56
+ipmi		a508e33956b538e034ed5df619a73ec7c15bda72
+driver-core	4a4e8f7f625b48c79ec9f3b5c219a09a6c71fd83
+usb		8affe37c525d800a2628c4ecfaed13b77dc5634a
+thunderbolt	34b9715b7caee2e2b7d74bb4230f2be2c2765c0a
+usb-gadget	e49d033bddf5b565044e2abe4241353959bc9120
+usb-serial	9ec7e8d5fae34b3da52b4b0a7a47877bc6aa8416
+tty		7e5b4322cde067e1d0f1bf8f490e93f664a7c843
+char-misc	c524193f1cfb9ac5f2c56effa4a01bf8bdcfaa35
+coresight	4d45bc82df667ad9e9cb8361830e54fc1264e993
+fpga		ee794221a6f66d054beb1cbc151d8de4083e634e
+icc		a6339ac8a1048f316c95c3fcbe22497cfdcc8da0
+iio		568f6869e680c7492c5e38df9094af86fe9d6364
+phy-next	08fd292fdffcf5fbca6301ff43aa1ad3cf9d69da
+soundwire	3f4a70268d54c41117bc4e1bed0ba4be756735a8
+extcon		3a06ed80265fa62eecaf519d92f1633e4f9510c7
+gnss		c0c725d7350ec8b8453257676a440bb4b2df2422
+vfio		2a8ed7ef00b939fbcc98b948f780bd03bafed227
+staging		042f1a6f434ad1fb49fca59d76b5203ce432c36c
+mux		0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1
+dmaengine	4348d99efa01fe030eb625495de8b9f3578b5c7d
+cgroup		27924b13fcce42222e836394711fe1e7ec010cc6
+scsi		9009b3dfd4a20f6bb31e8f40100392f19fc149a7
+scsi-mkp	f095c3cd1b694a73a5de276dae919f05a8dd1811
+vhost		6a9720576cd00d30722c5f755bd17d4cfa9df636
+rpmsg		c6a669485125145afd22230df6e0e6c37f19ad41
+gpio		e73f0f0ee7541171d89f2e2491130c7771ba58d3
+gpio-brgl	63e90bf077788750191298f7ad9351badb25de3c
+gpio-intel	b65bb2c148913c4020d06c9798e5e1bc18105f4f
+gpio-sim	0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1
+pinctrl		2ec1aa95dafb97290d1623ba0646e31b5dbe9e6a
+pinctrl-intel	25097de7b2369625994793b788fa6ed4cad664cd
+pinctrl-renesas	36611d28f5130d8bb9aa36ec64d4ebcd736e8dba
+pinctrl-samsung	c98ebe065e07dc6c6c82bcbfd2a0351a7bde68da
+pwm		394b517585da9fbb2eea2f2103ff47d37321e976
+userns		9aafa63eb9f526ef2b8b499ba32faa681170b64d
+ktest		170f4869e66275f498ae4736106fb54c0fdcd036
+kselftest	a917dd94b832c8f4ad458d0ca2bd1007466c5643
+livepatching	df44b1ee72f4fa345d6749048878ed7ac1f785e8
+rtc		592ff0c8d0648610511f4e4fb532f100168e6e0d
+nvdimm		f42e8e5088b9e791c8f7ac661f68e29a4996a4e3
+at24		3123109284176b1532874591f7c81f3837bbdc17
+ntb		ca151bc47cf23e53dd85d832e55d79251f430dec
+seccomp		73a8dbafd31adc3f35a8e04e80f81e991df355d3
+cisco		9e98c678c2d6ae3a17cb2de55d17f69dddaa231b
+fsi		04823dd2af87341ddf58e9903874e8db6e212670
+slimbus		4ad3deabeea21f9fda6a49de10fd417c4199ffaf
+nvmem		432ee5a3cfcf8676448b0e11f1e800fc49c008d0
+xarray		69cb69ea55420388b444ee30b1530ec15ab584f7
+hyperv		e237eed373cc3ce433e2222f9cfc85e50ad785d7
+auxdisplay	13de23494f387315c6cfab6fe78fbed7d1b25586
+kgdb		c1cb81429df462eca1b6ba615cddd21dd3103c46
+hmm		efa0855c5b846c25e7cda02159ee35647ab6530e
+kunit		f2906aa863381afb0015a9eb7fefad885d4e5a56
+cfi		3123109284176b1532874591f7c81f3837bbdc17
+kunit-next	94681e289bf5d10c9db9db143d1a22d8717205c5
+trivial		081c8919b02bc1077279cd03972d7ec6f53a6c6b
+mhi		9df125af0822d3e2bde7508e9536d67ab541a166
+memblock	fe833b4edc594a4a6f1ce2d68975733e17b8f8ed
+init		38b082236e77d403fed23ac2d30d570598744ec3
+counters	e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62
+cxl		a111daf0c53ae91e71fd2bfe7497862d14132e3e
+folio-iomap	4d7bd0eb72e5831ddb1288786a96448b48440825
+zstd		88a309465b3f05a100c3b81966982c0f9f5d23a6
+efi		df3c9072ef90b19ee317afbef185b65537c701cf
+unicode		b500d6d7243d2e0807a39a09c52fbe668b59b2c1
+slab		b77d5b1b83e3e14870224de7c63f115a2dc44e9a
+random		9ddd36047681f976ca5fe88fbb726bf976b96354
+landlock	b13baccc3850ca8b8cccbf8ed9912dbaa0fdf7f3
+rust		9a5fe747d99e1d562dde1f39259bbe2d098262ae
+sysctl		acdc07ace871d307fb19550bfcdd47ac1a896e64
+folio		03b33c09ea22fa89dd204ad0a2058e512c691b9f
+execve		5036793d7dbd0b14aec51526441a50b01c7bf66d
+bitmap		ae3f9b7057099258cdba1990c777d47fc87dcc8a
+hte		85ff37e302efdf173cff6d1a310c2f7f38f1d069
+kspp		e1d3373352077f3be9cc1c8adb5fd59d0aa96e7a
+kspp-gustavo	94dfc73e7cf4a31da66b8843f0b9283ddd6b8381
+mm-stable	4f2930c6718afbb6c5904cda6f6781a70c52a042
+mm-nonmm-stable	ee56c3e8eec166f4e4a2ca842b7804d14f3a0208
+mm		1c4730066710e3a3fa8c4d373a5e9489d30801dc
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 0000000000000..f87221ba337e8
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,360 @@
+Trees included into this release:
+
+Name		Type	URL
+----		----	---
+origin		git	git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master
+fixes		git	git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes
+mm-hotfixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable
+kbuild-current	git	git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes
+arc-current	git	git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr
+arm-current	git	git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes
+arm64-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes
+arm-soc-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes
+drivers-memory-fixes	git	https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes
+tee-fixes	git	https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes
+m68k-current	git	git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus
+powerpc-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes
+s390-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes
+sparc		git	git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master
+fscrypt-current	git	git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable
+net		git	git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master
+bpf		git	git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master
+ipsec		git	git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master
+netfilter	git	git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master
+ipvs		git	git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master
+wireless	git	git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next
+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
+phy		git	git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes
+staging.current	git	git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus
+iio-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg
+counter-fixes	git	https://gitlab.com/vilhelmgray/counter.git#fixes-togreg
+char-misc.current	git	git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus
+soundwire-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes
+thunderbolt-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes
+input-current	git	git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus
+crypto-current	git	git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master
+vfio-fixes	git	git://github.com/awilliam/linux-vfio.git#for-linus
+kselftest-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes
+modules-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-linus
+dmaengine-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes
+backlight-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes
+mtd-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes
+mfd-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes
+v4l-dvb-fixes	git	git://linuxtv.org/mchehab/media-next.git#fixes
+reset-fixes	git	https://git.pengutronix.de/git/pza/linux#reset/fixes
+mips-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes
+at91-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes
+omap-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes
+kvm-fixes	git	git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master
+kvms390-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master
+hwmon-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon
+nvdimm-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes
+cxl-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes
+btrfs-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes
+vfs-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes
+dma-mapping-fixes	git	git://git.infradead.org/users/hch/dma-mapping.git#for-linus
+i3c-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/fixes
+drivers-x86-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes
+samsung-krzk-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes
+pinctrl-samsung-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes
+devicetree-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus
+dt-krzk-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes
+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
+risc-v-mc-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#dt-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/fpga/linux-fpga.git#fixes
+spdx		git	git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus
+gpio-brgl-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current
+gpio-intel-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes
+pinctrl-intel-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes
+erofs-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes
+integrity-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#fixes
+kunit-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes
+ubifs-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes
+memblock-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes
+cel-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-rc
+irqchip-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-fixes
+renesas-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes
+broadcom-fixes	git	https://github.com/Broadcom/stblinux.git#fixes
+perf-current	git	git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/urgent
+efi-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent
+zstd-fixes	git	https://github.com/terrelln/linux.git#zstd-linus
+battery-fixes	git	git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes
+drm-misc-fixes	git	git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes
+kbuild		git	git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next
+clang-format	git	https://github.com/ojeda/linux.git#clang-format
+perf		git	git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/core
+compiler-attributes	git	https://github.com/ojeda/linux.git#compiler-attributes
+dma-mapping	git	git://git.infradead.org/users/hch/dma-mapping.git#for-next
+asm-generic	git	git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master
+arc		git	git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next
+arm		git	git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next
+arm64		git	git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core
+arm-perf	git	git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf
+arm-soc		git	git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next
+actions		git	git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git#for-next
+amlogic		git	git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next
+aspeed		git	git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next
+at91		git	git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next
+broadcom	git	https://github.com/Broadcom/stblinux.git#next
+drivers-memory	git	https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next
+imx-mxs		git	git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next
+keystone	git	git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next
+mediatek	git	git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next
+mvebu		git	git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next
+omap		git	git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next
+qcom		git	git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next
+raspberrypi	git	git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next
+renesas		git	git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next
+reset		git	https://git.pengutronix.de/git/pza/linux#reset/next
+rockchip	git	git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next
+samsung-krzk	git	git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next
+scmi		git	git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next
+stm32		git	git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next
+sunxi		git	git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next
+tee		git	https://git.linaro.org/people/jens.wiklander/linux-tee.git#next
+tegra		git	git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next
+ti		git	git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next
+xilinx		git	git://github.com/Xilinx/linux-xlnx.git#for-next
+clk		git	git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next
+clk-imx		git	git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next
+clk-renesas	git	git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk
+clk-samsung	git	git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next
+csky		git	git://github.com/c-sky/csky-linux.git#linux-next
+loongarch	git	git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-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
+nios2		git	git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next
+openrisc	git	git://github.com/openrisc/linux.git#for-next
+parisc-hd	git	git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next
+powerpc		git	git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next
+soc-fsl		git	git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next
+risc-v		git	git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next
+risc-v-mc	git	git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#dt-for-next
+s390		git	git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next
+sh		git	git://git.libc.org/linux-sh#for-next
+sparc-next	git	git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master
+uml		git	git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next
+xtensa		git	git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next
+pidfd		git	git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next
+fscrypt		git	git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master
+fscache		git	git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next
+afs		git	git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next
+btrfs		git	git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next
+ceph		git	git://github.com/ceph/ceph-client.git#master
+cifs		git	git://git.samba.org/sfrench/cifs-2.6.git#for-next
+configfs	git	git://git.infradead.org/users/hch/configfs.git#for-next
+ecryptfs	git	git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next
+erofs		git	git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev
+exfat		git	git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev
+ext3		git	git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next
+ext4		git	git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev
+f2fs		git	git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev
+fsverity	git	git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity
+fuse		git	git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next
+gfs2		git	git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next
+jfs		git	git://github.com/kleikamp/linux-shaggy.git#jfs-next
+ksmbd		git	https://github.com/smfrench/smb3-kernel.git#ksmbd-for-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.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-next
+ntfs3		git	https://github.com/Paragon-Software-Group/linux-ntfs3.git#master
+orangefs	git	git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next
+overlayfs	git	git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next
+ubifs		git	git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next
+v9fs		git	git://github.com/martinetd/linux#9p-next
+xfs		git	git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next
+zonefs		git	git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next
+iomap		git	git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next
+djw-vfs		git	git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next
+file-locks	git	git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next
+vfs		git	git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next
+printk		git	git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next
+pci		git	git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next
+pstore		git	git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore
+hid		git	git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next
+i2c		git	git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next
+i3c		git	git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next
+dmi		git	git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next
+hwmon-staging	git	git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next
+jc_docs		git	git://git.lwn.net/linux.git#docs-next
+v4l-dvb		git	git://linuxtv.org/media_tree.git#master
+v4l-dvb-next	git	git://linuxtv.org/mchehab/media-next.git#master
+pm		git	git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next
+cpufreq-arm	git	git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next
+cpupower	git	git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower
+devfreq		git	git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next
+opp		git	git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next
+thermal		git	git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next
+ieee1394	git	git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next
+dlm		git	git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next
+rdma		git	git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next
+net-next	git	git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master
+bpf-next	git	git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next
+ipsec-next	git	git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master
+mlx5-next	git	git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next
+netfilter-next	git	git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master
+ipvs-next	git	git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master
+bluetooth	git	git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master
+wireless-next	git	git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next
+mtd		git	git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next
+nand		git	git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next
+spi-nor		git	git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next
+crypto		git	git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master
+drm		git	git://git.freedesktop.org/git/drm/drm.git#drm-next
+drm-misc	git	git://anongit.freedesktop.org/drm/drm-misc#for-linux-next
+amdgpu		git	https://gitlab.freedesktop.org/agd5f/linux#drm-next
+drm-intel	git	git://anongit.freedesktop.org/drm-intel#for-linux-next
+drm-tegra	git	https://gitlab.freedesktop.org/drm/tegra.git#for-next
+drm-msm		git	https://gitlab.freedesktop.org/drm/msm.git#msm-next
+drm-msm-lumag	git	https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag
+imx-drm		git	https://git.pengutronix.de/git/pza/linux#imx-drm/next
+etnaviv		git	https://git.pengutronix.de/git/lst/linux#etnaviv/next
+fbdev		git	git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-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/mcgrof/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
+libata		git	git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#for-next
+pcmcia		git	git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next
+mmc		git	git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next
+mfd		git	git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next
+backlight	git	git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next
+battery		git	git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next
+regulator	git	git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next
+security	git	git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next
+apparmor	git	git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next
+integrity	git	git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity
+keys		git	git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next
+safesetid	git	https://github.com/micah-morton/linux.git#safesetid-next
+selinux		git	git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next
+smack		git	git://github.com/cschaufler/smack-next#next
+tomoyo		git	https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master
+tpmdd		git	git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next
+watchdog	git	git://www.linux-watchdog.org/linux-watchdog-next.git#master
+iommu		git	git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next
+audit		git	git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next
+devicetree	git	git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next
+dt-krzk		git	git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.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#master
+clockevents	git	git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next
+edac		git	git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next
+irqchip		git	git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next
+ftrace		git	git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next
+rcu		git	git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next
+kvm		git	git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next
+kvm-arm		git	git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next
+kvms390		git	git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next
+xen-tip		git	git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next
+percpu		git	git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next
+workqueues	git	git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next
+drivers-x86	git	git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next
+chrome-platform	git	git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next
+hsi		git	git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next
+leds		git	git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next
+ipmi		git	git://github.com/cminyard/linux-ipmi.git#for-next
+driver-core	git	git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next
+usb		git	git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next
+thunderbolt	git	git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#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
+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
+coresight	git	git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next
+fpga		git	git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next
+icc		git	git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next
+iio		git	git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg
+phy-next	git	git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next
+soundwire	git	git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next
+extcon		git	git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next
+gnss		git	git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next
+vfio		git	git://github.com/awilliam/linux-vfio.git#next
+staging		git	git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next
+mux		git	https://gitlab.com/peda-linux/mux.git#for-next
+dmaengine	git	git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next
+cgroup		git	git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next
+scsi		git	git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next
+scsi-mkp	git	git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next
+vhost		git	git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next
+rpmsg		git	git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.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
+gpio-sim	git	git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/gpio-sim
+pinctrl		git	git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next
+pinctrl-intel	git	git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next
+pinctrl-renesas	git	git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl
+pinctrl-samsung	git	git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next
+pwm		git	git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next
+userns		git	git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next
+ktest		git	git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next
+kselftest	git	git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next
+livepatching	git	git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next
+rtc		git	git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next
+nvdimm		git	git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next
+at24		git	git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next
+ntb		git	https://github.com/jonmason/ntb.git#ntb-next
+seccomp		git	git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp
+cisco		git	https://github.com/daniel-walker/cisco-linux.git#for-next
+fsi		git	git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next
+slimbus		git	git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next
+nvmem		git	git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next
+xarray		git	git://git.infradead.org/users/willy/xarray.git#main
+hyperv		git	git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next
+auxdisplay	git	https://github.com/ojeda/linux.git#auxdisplay
+kgdb		git	git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next
+hmm		git	git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm
+kunit		git	git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test
+cfi		git	git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next
+kunit-next	git	git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit
+trivial		git	git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next
+mhi		git	git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next
+memblock	git	git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next
+init		git	git://git.infradead.org/users/hch/misc.git#init-user-pointers
+counters	git	git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#counters
+cxl		git	git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next
+folio-iomap	git	git://git.infradead.org/users/willy/linux.git#folio-iomap
+zstd		git	https://github.com/terrelln/linux.git#zstd-next
+efi		git	git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next
+unicode		git	git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next
+slab		git	git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#for-next
+random		git	git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master
+landlock	git	git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next
+rust		git	https://github.com/Rust-for-Linux/linux.git#rust-next
+sysctl		git	git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#sysctl-next
+folio		git	git://git.infradead.org/users/willy/pagecache.git#for-next
+execve		git	git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve
+bitmap		git	https://github.com/norov/linux.git#bitmap-for-next
+hte		git	git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#hte/for-next
+kspp		git	git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp
+kspp-gustavo	git	git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp
+mm-stable	git	git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable
+mm-nonmm-stable	git	git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable
+mm		git	git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-everything
diff --git a/Next/merge.log b/Next/merge.log
new file mode 100644
index 0000000000000..d37b44a22af0a
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,15148 @@
+$ date -R
+Fri, 15 Jul 2022 08:56:28 +1000
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+Updating files:  64% (6542/10214)
Updating files:  65% (6640/10214)
Updating files:  66% (6742/10214)
Updating files:  67% (6844/10214)
Updating files:  68% (6946/10214)
Updating files:  69% (7048/10214)
Updating files:  70% (7150/10214)
Updating files:  71% (7252/10214)
Updating files:  72% (7355/10214)
Updating files:  73% (7457/10214)
Updating files:  74% (7559/10214)
Updating files:  75% (7661/10214)
Updating files:  76% (7763/10214)
Updating files:  77% (7865/10214)
Updating files:  78% (7967/10214)
Updating files:  79% (8070/10214)
Updating files:  80% (8172/10214)
Updating files:  81% (8274/10214)
Updating files:  82% (8376/10214)
Updating files:  83% (8478/10214)
Updating files:  84% (8580/10214)
Updating files:  85% (8682/10214)
Updating files:  86% (8785/10214)
Updating files:  87% (8887/10214)
Updating files:  88% (8989/10214)
Updating files:  89% (9091/10214)
Updating files:  90% (9193/10214)
Updating files:  91% (9295/10214)
Updating files:  92% (9397/10214)
Updating files:  93% (9500/10214)
Updating files:  94% (9602/10214)
Updating files:  95% (9704/10214)
Updating files:  96% (9806/10214)
Updating files:  97% (9908/10214)
Updating files:  98% (10010/10214)
Updating files:  99% (10112/10214)
Updating files: 100% (10214/10214)
Updating files: 100% (10214/10214), done.
+HEAD is now at 4a57a8400075 vf/remap: return the amount of bytes actually deduplicated
+Merging origin/master (db886979683a x86/speculation: Use DECLARE_PER_CPU for x86_spec_ctrl_current)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master
+Updating 4a57a8400075..db886979683a
+Fast-forward (no commit created; -m option ignored)
+ .../bindings/net/wireless/qca,ath9k.yaml           |   2 +-
+ .../bindings/net/wireless/qcom,ath11k.yaml         |   2 +-
+ .../devicetree/bindings/sound/qcom,lpass-cpu.yaml  |   8 +-
+ Documentation/networking/ip-sysctl.rst             |   4 +-
+ Documentation/sound/soc/dai.rst                    |   2 +-
+ MAINTAINERS                                        |   1 +
+ arch/arm/include/asm/domain.h                      |  13 ---
+ arch/arm/include/asm/mach/map.h                    |   1 +
+ arch/arm/include/asm/ptrace.h                      |  26 +++++
+ arch/arm/kernel/entry-common.S                     |   1 +
+ arch/arm/mm/Kconfig                                |   6 +-
+ arch/arm/mm/alignment.c                            |   3 +
+ arch/arm/mm/mmu.c                                  |  15 ++-
+ arch/arm/mm/proc-v7-bugs.c                         |   9 +-
+ arch/arm/probes/decode.h                           |  26 +----
+ arch/um/include/asm/page.h                         |   4 +-
+ arch/um/include/shared/mem.h                       |   4 +-
+ arch/um/os-Linux/skas/process.c                    |   6 +-
+ arch/x86/include/asm/nospec-branch.h               |   3 +-
+ drivers/amba/bus.c                                 |   8 +-
+ drivers/gpu/drm/amd/display/Kconfig                |   2 +-
+ .../net/ethernet/aquantia/atlantic/aq_pci_func.c   |  23 ++--
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c          |   5 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.h          |   1 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c  |   8 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c      |  13 ++-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c    |   7 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c      |  10 +-
+ .../chelsio/inline_crypto/chtls/chtls_cm.c         |   2 +-
+ drivers/net/ethernet/faraday/ftgmac100.c           |  15 ++-
+ drivers/net/ethernet/intel/ice/ice_devids.h        |   1 +
+ drivers/net/ethernet/intel/ice/ice_devlink.c       |  59 ++++++----
+ drivers/net/ethernet/intel/ice/ice_fw_update.c     |  96 ++++++++++++++++-
+ drivers/net/ethernet/intel/ice/ice_main.c          |   1 +
+ .../ethernet/marvell/prestera/prestera_router.c    |   1 +
+ drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c |  20 ++--
+ .../ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c |   3 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c |   3 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_stats.c |   2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c    |   2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tx.c    |  39 +++++--
+ .../net/ethernet/mellanox/mlx5/core/esw/legacy.c   |   5 +-
+ .../net/ethernet/mellanox/mlx5/core/lag/debugfs.c  |  14 ++-
+ drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c  |  18 ++--
+ drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h  |   3 +-
+ .../net/ethernet/mellanox/mlx5/core/lag/mpesw.c    |   5 +-
+ drivers/net/ethernet/mscc/ocelot_fdma.c            |  17 ++-
+ .../ethernet/netronome/nfp/flower/tunnel_conf.c    |  18 +++-
+ drivers/net/ethernet/netronome/nfp/nfdk/dp.c       |  33 ++++--
+ drivers/net/ethernet/sfc/ef10.c                    |   3 +
+ drivers/net/ethernet/sfc/ef10_sriov.c              |  10 +-
+ .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c    |   1 +
+ .../net/ethernet/stmicro/stmmac/dwmac-ingenic.c    |   6 +-
+ drivers/net/ethernet/sun/sunhme.c                  |  43 +++-----
+ drivers/net/ethernet/ti/am65-cpsw-nuss.c           |  17 +--
+ drivers/net/usb/r8152.c                            |  14 +--
+ drivers/net/wireless/ath/ath11k/wmi.c              |   3 +-
+ drivers/net/wireless/mac80211_hwsim.c              |   2 +
+ drivers/net/wireless/realtek/rtw88/main.h          |   6 +-
+ drivers/net/wireless/realtek/rtw88/rtw8821c.c      |  14 +--
+ drivers/net/xen-netback/rx.c                       |   1 +
+ fs/cifs/connect.c                                  |   2 -
+ fs/cifs/sess.c                                     |  11 +-
+ fs/cifs/smb2pdu.c                                  |  13 +--
+ fs/lockd/svcsubs.c                                 |  14 +--
+ fs/nfsd/nfs4xdr.c                                  |   9 ++
+ fs/nfsd/nfsd.h                                     |   3 +-
+ include/linux/kexec.h                              |   6 ++
+ include/net/cfg80211.h                             |   5 +-
+ include/net/mac80211.h                             |   3 +-
+ include/net/netfilter/nf_tables.h                  |  14 ++-
+ include/net/raw.h                                  |   2 +-
+ include/net/sock.h                                 |   2 +-
+ include/net/tls.h                                  |   4 +-
+ include/trace/events/sock.h                        |   6 +-
+ include/uapi/linux/bpf.h                           |  11 +-
+ kernel/bpf/core.c                                  |   8 +-
+ kernel/bpf/helpers.c                               |  12 ++-
+ kernel/kexec_file.c                                |  11 +-
+ kernel/sysctl.c                                    |  37 ++++---
+ net/8021q/vlan_netlink.c                           |  10 +-
+ net/core/dev.c                                     |   8 +-
+ net/core/filter.c                                  |   1 -
+ net/ipv4/af_inet.c                                 |   4 +-
+ net/ipv4/cipso_ipv4.c                              |  12 ++-
+ net/ipv4/fib_semantics.c                           |   4 +-
+ net/ipv4/fib_trie.c                                |   2 +-
+ net/ipv4/icmp.c                                    |  20 ++--
+ net/ipv4/inet_timewait_sock.c                      |   3 +-
+ net/ipv4/inetpeer.c                                |  12 ++-
+ net/ipv4/nexthop.c                                 |   5 +-
+ net/ipv4/syncookies.c                              |   2 +-
+ net/ipv4/sysctl_net_ipv4.c                         |  12 +++
+ net/ipv4/tcp.c                                     |   3 +-
+ net/ipv4/tcp_input.c                               |   2 +-
+ net/ipv4/tcp_output.c                              |   4 +-
+ net/ipv6/icmp.c                                    |   2 +-
+ net/ipv6/route.c                                   |   2 +-
+ net/ipv6/seg6_iptunnel.c                           |   5 +-
+ net/ipv6/seg6_local.c                              |   2 -
+ net/mac80211/cfg.c                                 |   4 +-
+ net/mac80211/iface.c                               |   2 +
+ net/mac80211/rx.c                                  |   3 +-
+ net/mac80211/tx.c                                  |  36 +++----
+ net/mac80211/util.c                                |   3 +
+ net/mac80211/wme.c                                 |   4 +-
+ net/mptcp/protocol.c                               |   4 +-
+ net/netfilter/nf_conntrack_core.c                  |  22 ++++
+ net/netfilter/nf_conntrack_netlink.c               |   1 +
+ net/netfilter/nf_conntrack_standalone.c            |   3 +
+ net/netfilter/nf_log_syslog.c                      |   8 +-
+ net/netfilter/nf_tables_api.c                      |  72 +++++++++----
+ net/tls/tls_device.c                               |   4 +-
+ net/tls/tls_main.c                                 |   7 +-
+ net/wireless/sme.c                                 |   3 +-
+ security/integrity/evm/evm_crypto.c                |   7 +-
+ security/integrity/ima/ima_appraise.c              |   3 +-
+ security/integrity/ima/ima_crypto.c                |   1 +
+ security/integrity/ima/ima_efi.c                   |   2 +
+ security/integrity/ima/ima_template_lib.c          |   6 +-
+ sound/pci/hda/patch_conexant.c                     |   1 +
+ sound/pci/hda/patch_realtek.c                      |  20 ++++
+ sound/soc/codecs/arizona.c                         |   4 +-
+ sound/soc/codecs/cs47l92.c                         |   8 +-
+ sound/soc/codecs/max98396.c                        |  10 +-
+ sound/soc/codecs/rt5640.c                          |  30 ++++--
+ sound/soc/codecs/sgtl5000.c                        |   9 ++
+ sound/soc/codecs/sgtl5000.h                        |   1 +
+ sound/soc/codecs/tas2764.c                         |  46 ++++----
+ sound/soc/codecs/tas2764.h                         |   6 +-
+ sound/soc/codecs/tlv320adcx140.c                   |  13 ++-
+ sound/soc/codecs/wcd9335.c                         |  17 +--
+ sound/soc/codecs/wm5102.c                          |  21 +++-
+ sound/soc/codecs/wm8998.c                          |  21 ++--
+ sound/soc/generic/audio-graph-card2.c              |   6 +-
+ sound/soc/intel/boards/sof_rt5682.c                |  10 +-
+ sound/soc/intel/skylake/skl-nhlt.c                 |  40 ++++---
+ sound/soc/qcom/qdsp6/q6apm.c                       |   1 +
+ sound/soc/ti/omap-mcbsp-priv.h                     |   2 -
+ sound/soc/ti/omap-mcbsp-st.c                       |  14 +--
+ sound/soc/ti/omap-mcbsp.c                          |  19 +---
+ tools/include/uapi/linux/bpf.h                     |  11 +-
+ tools/testing/selftests/bpf/progs/dynptr_fail.c    |  10 +-
+ tools/testing/selftests/bpf/progs/dynptr_success.c |   4 +-
+ tools/testing/selftests/net/.gitignore             |   1 +
+ tools/testing/selftests/net/Makefile               |   2 +-
+ tools/testing/selftests/net/fib_nexthop_nongw.sh   | 119 +++++++++++++++++++++
+ tools/testing/selftests/net/forwarding/Makefile    |   2 +
+ tools/testing/selftests/net/mptcp/Makefile         |   2 +-
+ 149 files changed, 1084 insertions(+), 539 deletions(-)
+ create mode 100755 tools/testing/selftests/net/fib_nexthop_nongw.sh
+Merging fixes/fixes (4a57a8400075 vf/remap: return the amount of bytes actually deduplicated)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes
+Already up to date.
+Merging mm-hotfixes/mm-hotfixes-unstable (cb84e28edaa4 userfaultfd: provide properly masked address for huge-pages)
+$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable
+Auto-merging .mailmap
+Auto-merging fs/read_write.c
+Merge made by the 'ort' strategy.
+ .mailmap            |  1 +
+ fs/ntfs/attrib.c    |  8 ++++++--
+ fs/ocfs2/ocfs2.h    |  4 +---
+ fs/ocfs2/slot_map.c | 46 +++++++++++++++++++---------------------------
+ fs/ocfs2/super.c    | 21 ---------------------
+ fs/read_write.c     |  3 +++
+ fs/userfaultfd.c    | 12 +++++++-----
+ include/linux/mm.h  | 14 +++++++++-----
+ mm/gup.c            |  6 ++++--
+ mm/hugetlb.c        | 12 +++++++++---
+ mm/kfence/core.c    | 18 +++++++++---------
+ mm/memory.c         |  7 +++++--
+ mm/memremap.c       |  6 +++---
+ mm/secretmem.c      | 21 ++++++++++++++++-----
+ mm/shmem.c          |  7 ++-----
+ 15 files changed, 94 insertions(+), 92 deletions(-)
+Merging kbuild-current/fixes (32346491ddf2 Linux 5.19-rc6)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes
+Already up to date.
+Merging arc-current/for-curr (952deecb065e arc: dts: Harmonize EHCI/OHCI DT nodes name)
+$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr
+Merge made by the 'ort' strategy.
+ arch/arc/boot/dts/axc003.dtsi        | 4 ++--
+ arch/arc/boot/dts/axc003_idu.dtsi    | 4 ++--
+ arch/arc/boot/dts/axs10x_mb.dtsi     | 4 ++--
+ arch/arc/boot/dts/hsdk.dts           | 4 ++--
+ arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 2 +-
+ arch/arc/include/asm/bitops.h        | 4 ++--
+ arch/arc/include/asm/entry-compact.h | 2 +-
+ arch/arc/kernel/smp.c                | 2 +-
+ arch/arc/mm/cache.c                  | 4 ++--
+ 9 files changed, 15 insertions(+), 15 deletions(-)
+Merging arm-current/fixes (29589ca09a74 ARM: 9208/1: entry: add .ltorg directive to keep literals in range)
+$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes
+Already up to date.
+Merging arm64-fixes/for-next/fixes (410982303772 arm64: hugetlb: Restore TLB invalidation for BBM on contiguous ptes)
+$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes
+Already up to date.
+Merging arm-soc-fixes/arm/fixes (d332a1f6b4c4 Merge tag 'qcom-dts-fixes-for-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes)
+$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ CREDITS                                            |  4 +++
+ .../allwinner,sun4i-a10-display-engine.yaml        |  1 +
+ MAINTAINERS                                        |  9 ++++---
+ arch/arm/boot/dts/imx6qdl-ts7970.dtsi              |  2 +-
+ arch/arm/boot/dts/imx6ull-colibri.dtsi             |  9 +++++--
+ .../boot/dts/lan966x-kontron-kswitch-d10-mmt.dtsi  |  8 +++---
+ arch/arm/boot/dts/qcom-msm8974.dtsi                | 30 +++++++++++++++++++---
+ arch/arm/boot/dts/sama5d2.dtsi                     |  2 +-
+ arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts  |  2 +-
+ arch/arm/mach-rockchip/pm.c                        |  7 +++--
+ arch/arm64/boot/dts/broadcom/bcm4908/bcm4906.dtsi  |  8 ++++++
+ arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi  |  2 ++
+ arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi     |  5 +++-
+ .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi      |  4 ++-
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi           |  6 +++--
+ arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts |  1 +
+ arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts |  2 +-
+ drivers/tee/optee/optee_smc.h                      |  2 +-
+ drivers/tee/optee/smc_abi.c                        |  4 +--
+ drivers/tee/tee_core.c                             |  2 +-
+ include/linux/reset.h                              |  2 +-
+ 21 files changed, 83 insertions(+), 29 deletions(-)
+Merging drivers-memory-fixes/fixes (1332661e0930 memory: samsung: exynos5422-dmc: Fix refcount leak in of_get_dram_timings)
+$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes
+Already up to date.
+Merging tee-fixes/fixes (98268f2a2a9f Merge branch 'optee_ffa_probe_fix_for_v5.18' into fixes)
+$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes
+Merge made by the 'ort' strategy.
+Merging m68k-current/for-linus (30b5e6ef4a32 m68k: atari: Make Atari ROM port I/O write macros return void)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus
+Already up to date.
+Merging powerpc-fixes/fixes (887502826549 powerpc/powernv: delay rng platform device creation until later in boot)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes
+Already up to date.
+Merging s390-fixes/fixes (1fcbcc6d803a s390/ap: fixes bug in the AP bus's __verify_queue_reservations function)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes
+Merge made by the 'ort' strategy.
+ arch/s390/Makefile                      | 8 +++++++-
+ arch/s390/include/asm/nospec-insn.h     | 2 --
+ arch/s390/lib/Makefile                  | 3 ++-
+ arch/s390/lib/expoline/Makefile         | 3 +++
+ arch/s390/lib/{ => expoline}/expoline.S | 0
+ drivers/s390/crypto/ap_bus.c            | 2 +-
+ 6 files changed, 13 insertions(+), 5 deletions(-)
+ create mode 100644 arch/s390/lib/expoline/Makefile
+ rename arch/s390/lib/{ => expoline}/expoline.S (100%)
+Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master
+Already up to date.
+Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX)
+$ git merge -m Merge branch 'for-stable' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt-current/for-stable
+Already up to date.
+Merging net/master (db886979683a x86/speculation: Use DECLARE_PER_CPU for x86_spec_ctrl_current)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master
+Already up to date.
+Merging bpf/master (f946964a9f79 net: marvell: prestera: fix missed deinit sequence)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master
+Already up to date.
+Merging ipsec/master (e79b9473e9b5 net: ipv4: fix clang -Wformat warnings)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master
+Merge made by the 'ort' strategy.
+ net/ipv4/ah4.c         | 2 +-
+ net/ipv4/esp4.c        | 2 +-
+ net/xfrm/xfrm_policy.c | 5 ++++-
+ 3 files changed, 6 insertions(+), 3 deletions(-)
+Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master
+Already up to date.
+Merging ipvs/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master
+Already up to date.
+Merging wireless/for-next (b11e5f6a3a5c net: sunhme: output link status with a single print.)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next
+Already up to date.
+Merging rdma-fixes/for-rc (cc0315564d6e RDMA/irdma: Fix sleep from invalid context BUG)
+$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc
+Merge made by the 'ort' strategy.
+ drivers/infiniband/hw/irdma/cm.c        | 50 ---------------------------------
+ drivers/infiniband/hw/irdma/i40iw_hw.c  |  1 +
+ drivers/infiniband/hw/irdma/icrdma_hw.c |  1 +
+ drivers/infiniband/hw/irdma/irdma.h     |  1 +
+ drivers/infiniband/hw/irdma/verbs.c     |  4 +--
+ 5 files changed, 5 insertions(+), 52 deletions(-)
+Merging sound-current/for-linus (9b043a8f3864 ALSA: hda/realtek - Enable the headset-mic on a Xiaomi's laptop)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus
+Already up to date.
+Merging sound-asoc-fixes/for-linus (efb2b2097c62 Merge remote-tracking branch 'asoc/for-5.18' into asoc-linus)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus
+Merge made by the 'ort' strategy.
+ sound/soc/codecs/tlv320adc3xxx.c  |   3 +
+ sound/soc/fsl/fsl_micfil.c        |  19 +++++
+ sound/soc/rockchip/rockchip_i2s.c | 160 ++++++++------------------------------
+ sound/soc/soc-ops.c               |   8 +-
+ 4 files changed, 60 insertions(+), 130 deletions(-)
+Merging regmap-fixes/for-linus (3f05010f243b regmap-irq: Fix offset/index mismatch in read_sub_irq_data())
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus
+Already up to date.
+Merging regulator-fixes/for-linus (122e951eb804 regulator: qcom_smd: correct MP5496 ranges)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus
+Already up to date.
+Merging spi-fixes/for-linus (73d5fe046270 spi: cadence-quadspi: Remove spi_master_put() in probe failure path)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS                       |  3 ++-
+ drivers/spi/spi-amd.c             |  8 ++++++++
+ drivers/spi/spi-aspeed-smc.c      | 12 +++++++++++-
+ drivers/spi/spi-cadence-quadspi.c | 19 +++++++------------
+ 4 files changed, 28 insertions(+), 14 deletions(-)
+Merging pci-current/for-linus (a2b36ffbf5b6 x86/PCI: Revert "x86/PCI: Clip only host bridge windows for E820 regions")
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus
+Already up to date.
+Merging driver-core.current/driver-core-linus (f2906aa86338 Linux 5.19-rc1)
+$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus
+Already up to date.
+Merging tty.current/tty-linus (a501ab75e762 tty: use new tty_insert_flip_string_and_push_buffer() in pty_write())
+$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus
+Merge made by the 'ort' strategy.
+ drivers/tty/pty.c                   | 14 ++---------
+ drivers/tty/serial/8250/8250_core.c |  4 ++++
+ drivers/tty/serial/8250/8250_dma.c  |  6 ++---
+ drivers/tty/serial/8250/8250_dw.c   | 26 ++++++++++-----------
+ drivers/tty/serial/8250/8250_port.c |  6 +++--
+ drivers/tty/serial/amba-pl011.c     | 23 +++++++++++++++++--
+ drivers/tty/serial/mvebu-uart.c     | 25 ++++++++++----------
+ drivers/tty/serial/samsung_tty.c    |  5 ++--
+ drivers/tty/serial/serial_core.c    |  5 ----
+ drivers/tty/serial/stm32-usart.c    |  2 ++
+ drivers/tty/tty.h                   |  3 +++
+ drivers/tty/tty_buffer.c            | 46 +++++++++++++++++++++++++++++++++----
+ drivers/tty/vt/vt.c                 |  2 +-
+ include/linux/serial_core.h         |  5 ++++
+ include/uapi/linux/tty.h            |  3 ++-
+ 15 files changed, 116 insertions(+), 59 deletions(-)
+Merging usb.current/usb-linus (3486af89dd3c Merge tag 'usb-serial-5.19-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus)
+$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus
+Merge made by the 'ort' strategy.
+ drivers/usb/dwc3/dwc3-am62.c               |  8 ++------
+ drivers/usb/dwc3/gadget.c                  |  4 +++-
+ drivers/usb/gadget/function/uvc_configfs.c |  6 ++++--
+ drivers/usb/host/ehci-fsl.c                | 11 +++--------
+ drivers/usb/host/fsl-mph-dr-of.c           |  3 +++
+ drivers/usb/serial/ftdi_sio.c              |  3 +++
+ drivers/usb/serial/ftdi_sio_ids.h          |  6 ++++++
+ drivers/usb/typec/class.c                  |  1 +
+ 8 files changed, 25 insertions(+), 17 deletions(-)
+Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes
+Already up to date.
+Merging usb-serial-fixes/usb-linus (7c239a071d1f USB: serial: ftdi_sio: add Belimo device ids)
+$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus
+Already up to date.
+Merging phy/fixes (f2906aa86338 Linux 5.19-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes
+Already up to date.
+Merging staging.current/staging-linus (32346491ddf2 Linux 5.19-rc6)
+$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus
+Already up to date.
+Merging iio-fixes/fixes-togreg (315f7e15c261 Merge tag 'iio-fixes-for-5.19a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-next)
+$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg
+Already up to date.
+Merging counter-fixes/fixes-togreg (f2906aa86338 Linux 5.19-rc1)
+$ git merge -m Merge branch 'fixes-togreg' of https://gitlab.com/vilhelmgray/counter.git counter-fixes/fixes-togreg
+Already up to date.
+Merging char-misc.current/char-misc-linus (32346491ddf2 Linux 5.19-rc6)
+$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus
+Already up to date.
+Merging soundwire-fixes/fixes (f2906aa86338 Linux 5.19-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes
+Already up to date.
+Merging thunderbolt-fixes/fixes (03c765b0e3b4 Linux 5.19-rc4)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes
+Already up to date.
+Merging input-current/for-linus (2a96271fb66c Input: document the units for resolution of size axes)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus
+Auto-merging drivers/input/touchscreen/wm97xx-core.c
+Auto-merging include/uapi/linux/input.h
+Merge made by the 'ort' strategy.
+ drivers/input/touchscreen/goodix.c         |  5 +++++
+ drivers/input/touchscreen/usbtouchscreen.c |  3 +++
+ drivers/input/touchscreen/wm97xx-core.c    |  4 +++-
+ include/uapi/linux/input.h                 | 11 +++++++----
+ 4 files changed, 18 insertions(+), 5 deletions(-)
+Merging crypto-current/master (87d044096ea6 crypto: ccp - Fix device IRQ counting by using platform_irq_count())
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master
+Already up to date.
+Merging vfio-fixes/for-linus (afe4e376ac5d vfio: Move IOMMU_CAP_CACHE_COHERENCY test to after we know we have a group)
+$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus
+Already up to date.
+Merging kselftest-fixes/fixes (9b4d5c01eb23 selftests: make use of GUP_TEST_FILE macro)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes
+Already up to date.
+Merging modules-fixes/modules-linus (e69a66147d49 module: kallsyms: Ensure preemption in add_kallsyms() with PREEMPT_RT)
+$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus
+Already up to date.
+Merging dmaengine-fixes/fixes (607a48c78e6b dt-bindings: dma: allwinner,sun50i-a64-dma: Fix min/max typo)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes
+Already up to date.
+Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2)
+$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes
+Already up to date.
+Merging mtd-fixes/mtd/fixes (06781a502635 mtd: rawnand: gpmi: Fix setting busy timeout setting)
+$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes
+Already up to date.
+Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources")
+$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes
+Already up to date.
+Merging v4l-dvb-fixes/fixes (3bcc2c1eade4 media: rkvdec: Disable H.264 error detection)
+$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes
+Merge made by the 'ort' strategy.
+ drivers/media/dvb-core/dvb_vb2.c                   | 11 +++++++++
+ drivers/media/i2c/Kconfig                          |  1 +
+ .../platform/mediatek/vcodec/mtk_vcodec_enc_drv.c  |  9 +++-----
+ drivers/media/v4l2-core/v4l2-compat-ioctl32.c      |  2 ++
+ drivers/media/v4l2-core/v4l2-ioctl.c               | 26 ++++++++++------------
+ drivers/staging/media/rkvdec/rkvdec-h264.c         |  4 ++--
+ 6 files changed, 31 insertions(+), 22 deletions(-)
+Merging reset-fixes/reset/fixes (a57f68ddc886 reset: Fix devm bulk optional exclusive control getter)
+$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes
+Already up to date.
+Merging mips-fixes/mips-fixes (88084a3df167 Linux 5.19-rc5)
+$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes
+Already up to date.
+Merging at91-fixes/at91-fixes (2fdf15b50a46 ARM: dts: at91: sama5d2: Fix typo in i2s1 node)
+$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes
+Already up to date.
+Merging omap-fixes/fixes (2eb502f496f7 ARM: dts: am33xx: Fix MMCHS0 dma properties)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes
+Merge made by the 'ort' strategy.
+ arch/arm/boot/dts/am33xx-l4.dtsi | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+Merging kvm-fixes/master (8a414f943f8b KVM: x86: Fully initialize 'struct kvm_lapic_irq' in kvm_pv_kick_cpu_op())
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master
+Merge made by the 'ort' strategy.
+ Documentation/virt/kvm/api.rst      | 17 +++++++++++++----
+ arch/riscv/include/asm/pgtable-64.h | 12 ++++++------
+ arch/riscv/include/asm/pgtable.h    |  6 +++---
+ arch/riscv/kvm/mmu.c                |  2 +-
+ arch/riscv/kvm/vcpu.c               |  2 ++
+ arch/x86/kvm/emulate.c              | 10 ++++++----
+ arch/x86/kvm/vmx/nested.c           |  1 -
+ arch/x86/kvm/x86.c                  | 20 +++++++++++---------
+ include/linux/kvm_host.h            | 11 ++++++++++-
+ include/uapi/linux/kvm.h            |  1 +
+ 10 files changed, 53 insertions(+), 29 deletions(-)
+Merging kvms390-fixes/master (242c04f01377 KVM: s390: selftests: Use TAP interface in the reset test)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master
+Auto-merging arch/x86/kvm/vmx/vmx.c
+Auto-merging arch/x86/kvm/x86.c
+Auto-merging virt/kvm/kvm_main.c
+Merge made by the 'ort' strategy.
+ arch/x86/kvm/vmx/vmx.c                             |   8 +-
+ arch/x86/kvm/x86.c                                 |   7 +-
+ include/linux/kvm_types.h                          |   2 +
+ tools/testing/selftests/kvm/s390x/memop.c          |  95 +++++++--
+ tools/testing/selftests/kvm/s390x/resets.c         |  38 +++-
+ tools/testing/selftests/kvm/s390x/sync_regs_test.c |  87 ++++++--
+ tools/testing/selftests/kvm/s390x/tprot.c          |  29 ++-
+ virt/kvm/kvm_main.c                                |   9 +
+ virt/kvm/pfncache.c                                | 231 +++++++++++++--------
+ 9 files changed, 368 insertions(+), 138 deletions(-)
+Merging hwmon-fixes/hwmon (88084a3df167 Linux 5.19-rc5)
+$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon
+Already up to date.
+Merging nvdimm-fixes/libnvdimm-fixes (69053101e096 ndtest: Cleanup all of blk namespace specific code)
+$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes
+Merge made by the 'ort' strategy.
+ drivers/nvdimm/pmem.c              |  6 +--
+ tools/testing/nvdimm/test/ndtest.c | 77 --------------------------------------
+ 2 files changed, 3 insertions(+), 80 deletions(-)
+Merging cxl-fixes/fixes (e35f5718903b cxl/mbox: Fix missing variable payload checks in cmd size validation)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes
+Already up to date.
+Merging btrfs-fixes/next-fixes (7531ec5954ab Merge branch 'misc-5.19' into next-fixes)
+$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/btrfs/zoned.c
+Merge made by the 'ort' strategy.
+Merging vfs-fixes/fixes (c3497fd009ef fix short copy handling in copy_mc_pipe_to_iter())
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes
+Merge made by the 'ort' strategy.
+ include/linux/pipe_fs_i.h |  9 +++++++++
+ lib/iov_iter.c            | 15 +++++++++++----
+ 2 files changed, 20 insertions(+), 4 deletions(-)
+Merging dma-mapping-fixes/for-linus (3be4562584bb dma-direct: use the correct size for dma_set_encrypted())
+$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus
+Already up to date.
+Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1)
+$ git merge -m Merge branch 'i3c/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c-fixes/i3c/fixes
+Already up to date.
+Merging drivers-x86-fixes/fixes (5ad26161a371 ACPI: video: Fix acpi_video_handles_brightness_key_presses())
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes
+Merge made by the 'ort' strategy.
+ drivers/acpi/acpi_video.c                  | 11 +++++++----
+ drivers/firmware/efi/reboot.c              | 21 +++++++++++----------
+ drivers/platform/x86/amd-pmc.c             | 14 ++++++++++++--
+ drivers/platform/x86/asus-nb-wmi.c         |  2 ++
+ drivers/platform/x86/gigabyte-wmi.c        |  1 +
+ drivers/platform/x86/intel/atomisp2/led.c  |  3 ++-
+ drivers/platform/x86/intel/ifs/Kconfig     |  3 +++
+ drivers/platform/x86/x86-android-tablets.c | 17 +++++++++++++----
+ 8 files changed, 51 insertions(+), 21 deletions(-)
+Merging samsung-krzk-fixes/fixes (c4c79525042a ARM: exynos: Fix refcount leak in exynos_map_pmu)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes
+Already up to date.
+Merging pinctrl-samsung-fixes/fixes (f2906aa86338 Linux 5.19-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes
+Already up to date.
+Merging devicetree-fixes/dt/linus (0b9431c8221c dt-bindings: display: arm,malidp: remove bogus RQOS property)
+$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus
+Already up to date.
+Merging dt-krzk-fixes/fixes (f2906aa86338 Linux 5.19-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes
+Already up to date.
+Merging scsi-fixes/fixes (355bf2e036c9 scsi: pm80xx: Set stopped phy's linkrate to Disabled)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes
+Merge made by the 'ort' strategy.
+ drivers/scsi/megaraid/megaraid_sas_base.c |  3 +++
+ drivers/scsi/pm8001/pm8001_hwi.c          | 19 +++----------------
+ drivers/scsi/pm8001/pm8001_init.c         |  2 ++
+ drivers/scsi/pm8001/pm80xx_hwi.c          |  6 +++++-
+ drivers/target/target_core_file.c         |  3 +++
+ drivers/target/target_core_iblock.c       |  4 ++++
+ drivers/target/target_core_sbc.c          |  6 ++++++
+ drivers/ufs/core/ufshcd.c                 |  4 ++--
+ 8 files changed, 28 insertions(+), 19 deletions(-)
+Merging drm-fixes/drm-fixes (3590b44b9434 Merge tag 'drm-misc-fixes-2022-07-07-1' of ssh://git.freedesktop.org/git/drm/drm-misc into drm-fixes)
+$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git 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 -m Merge branch 'drm-fixes' of git://people.freedesktop.org/~agd5f/linux amdgpu-fixes/drm-fixes
+Already up to date.
+Merging drm-intel-fixes/for-linux-next-fixes (333991c4e66b drm/i915/selftests: fix subtraction overflow bug)
+$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/i915/gem/i915_gem_ttm.c            | 11 +++++--
+ drivers/gpu/drm/i915/gem/i915_gem_wait.c           | 34 ++++++++++++++++++++
+ drivers/gpu/drm/i915/gt/intel_gt.c                 | 15 ++++++++-
+ drivers/gpu/drm/i915/gt/intel_reset.c              | 37 ++++++++++++++++------
+ drivers/gpu/drm/i915/gt/selftest_lrc.c             |  8 ++---
+ drivers/gpu/drm/i915/gvt/cmd_parser.c              |  6 ++--
+ drivers/gpu/drm/i915/i915_scatterlist.c            | 19 ++++++++---
+ drivers/gpu/drm/i915/i915_scatterlist.h            |  6 ++--
+ drivers/gpu/drm/i915/intel_region_ttm.c            | 10 ++++--
+ drivers/gpu/drm/i915/intel_region_ttm.h            |  3 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_gtt.c      |  2 +-
+ .../gpu/drm/i915/selftests/intel_memory_region.c   | 21 ++++++++++--
+ drivers/gpu/drm/i915/selftests/mock_region.c       |  3 +-
+ 13 files changed, 142 insertions(+), 33 deletions(-)
+$ git am -3 ../patches/0001-Revert-drm-i915-ttm-fix-sg_table-construction.patch
+Applying: Revert "drm/i915/ttm: fix sg_table construction"
+$ git reset HEAD^
+Unstaged changes after reset:
+M	drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+M	drivers/gpu/drm/i915/i915_scatterlist.c
+M	drivers/gpu/drm/i915/i915_scatterlist.h
+M	drivers/gpu/drm/i915/intel_region_ttm.c
+M	drivers/gpu/drm/i915/intel_region_ttm.h
+M	drivers/gpu/drm/i915/selftests/intel_memory_region.c
+M	drivers/gpu/drm/i915/selftests/mock_region.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 47485f6feb63] Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel
+ Date: Fri Jul 15 09:13:13 2022 +1000
+Merging mmc-fixes/fixes (51189eb9ddc8 mmc: sdhci-omap: Fix a lockdep warning for PM runtime init)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes
+Merge made by the 'ort' strategy.
+ drivers/mmc/host/sdhci-omap.c | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt())
+$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes
+Auto-merging drivers/rtc/rtc-cmos.c
+Merge made by the 'ort' strategy.
+Merging gnss-fixes/gnss-linus (a111daf0c53a Linux 5.19-rc3)
+$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus
+Already up to date.
+Merging hyperv-fixes/hyperv-fixes (49d6a3c062a1 x86/Hyper-V: Add SEV negotiate protocol support in Isolation VM)
+$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes
+Already up to date.
+Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18)
+$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix
+Already up to date.
+Merging risc-v-fixes/fixes (7fccd7239127 Merge tag 'dt-fixes-for-palmer-5.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git into fixes)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes
+Merge made by the 'ort' strategy.
+ arch/riscv/boot/dts/microchip/mpfs.dtsi | 4 ++++
+ arch/riscv/errata/sifive/errata.c       | 3 ++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+Merging risc-v-mc-fixes/dt-fixes (efa310ba0071 riscv: dts: microchip: hook up the mpfs' l2cache)
+$ git merge -m Merge branch 'dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git risc-v-mc-fixes/dt-fixes
+Already up to date.
+Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range())
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd-fixes/fixes
+Already up to date.
+Merging fpga-fixes/fixes (f2906aa86338 Linux 5.19-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes
+Already up to date.
+Merging spdx/spdx-linus (58301e1c15db Documentation: samsung-s3c24xx: Add blank line after SPDX directive)
+$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus
+Auto-merging arch/arm/mach-spear/time.c
+Merge made by the 'ort' strategy.
+ Documentation/arm/samsung-s3c24xx/cpufreq.rst      |  3 ++-
+ Documentation/driver-api/vfio-mediated-device.rst  |  4 +---
+ arch/arm/boot/bootp/bootp.lds                      |  5 +----
+ arch/arm/boot/dts/am33xx.dtsi                      |  5 +----
+ arch/arm/boot/dts/am3517.dtsi                      |  5 +----
+ arch/arm/boot/dts/am4372.dtsi                      |  5 +----
+ arch/arm/boot/dts/artpec6-devboard.dts             |  9 ++------
+ arch/arm/boot/dts/bcm11351.dtsi                    | 14 ++-----------
+ arch/arm/boot/dts/bcm21664-garnet.dts              | 14 ++-----------
+ arch/arm/boot/dts/bcm21664.dtsi                    | 14 ++-----------
+ arch/arm/boot/dts/bcm28155-ap.dts                  | 14 ++-----------
+ arch/arm/boot/dts/dm814x.dtsi                      |  6 +-----
+ arch/arm/boot/dts/dm816x.dtsi                      |  6 +-----
+ arch/arm/boot/dts/dra62x.dtsi                      |  6 +-----
+ arch/arm/boot/dts/dra7-dspeve-thermal.dtsi         |  5 +----
+ arch/arm/boot/dts/dra7-iva-thermal.dtsi            |  5 +----
+ arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi          | 10 +--------
+ arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi          | 10 +--------
+ arch/arm/boot/dts/imx23-pinfunc.h                  |  8 +-------
+ arch/arm/boot/dts/imx28-pinfunc.h                  |  8 +-------
+ arch/arm/boot/dts/imx6q-gk802.dts                  |  9 ++------
+ arch/arm/boot/dts/mxs-pinfunc.h                    |  8 +-------
+ arch/arm/boot/dts/omap2.dtsi                       |  5 +----
+ arch/arm/boot/dts/omap2420.dtsi                    |  5 +----
+ arch/arm/boot/dts/omap2430.dtsi                    |  5 +----
+ arch/arm/boot/dts/omap3-cpu-thermal.dtsi           |  5 +----
+ arch/arm/boot/dts/omap3.dtsi                       |  5 +----
+ arch/arm/boot/dts/omap34xx.dtsi                    |  5 +----
+ arch/arm/boot/dts/omap36xx.dtsi                    |  5 +----
+ arch/arm/boot/dts/omap4-cpu-thermal.dtsi           |  5 +----
+ arch/arm/boot/dts/omap443x.dtsi                    |  5 +----
+ arch/arm/boot/dts/omap4460.dtsi                    |  5 +----
+ arch/arm/boot/dts/omap5-core-thermal.dtsi          |  5 +----
+ arch/arm/boot/dts/omap5-gpu-thermal.dtsi           |  5 +----
+ arch/arm/boot/dts/orion5x-lacie-d2-network.dts     |  5 +----
+ .../dts/orion5x-lacie-ethernet-disk-mini-v2.dts    |  9 ++------
+ .../boot/dts/orion5x-maxtor-shared-storage-2.dts   |  5 +----
+ arch/arm/boot/dts/orion5x-mv88f5181.dtsi           |  9 ++------
+ arch/arm/boot/dts/orion5x-mv88f5182.dtsi           |  9 ++------
+ arch/arm/boot/dts/orion5x-netgear-wnr854t.dts      |  9 ++------
+ arch/arm/boot/dts/orion5x-rd88f5182-nas.dts        |  9 ++------
+ arch/arm/boot/dts/orion5x.dtsi                     |  9 ++------
+ arch/arm/include/asm/hardware/cache-aurora-l2.h    |  5 +----
+ arch/arm/include/asm/hardware/cache-feroceon-l2.h  |  6 +-----
+ arch/arm/include/asm/hardware/cache-tauros2.h      |  5 +----
+ arch/arm/include/debug/brcmstb.S                   | 14 ++-----------
+ arch/arm/mach-bcm/Makefile                         |  9 +-------
+ arch/arm/mach-bcm/bcm63xx.c                        | 14 ++-----------
+ arch/arm/mach-bcm/bcm_cygnus.c                     | 14 ++-----------
+ arch/arm/mach-bcm/bcm_hr2.c                        | 14 ++-----------
+ arch/arm/mach-bcm/bcm_kona_smc.c                   | 14 ++-----------
+ arch/arm/mach-bcm/bcm_kona_smc.h                   | 14 ++-----------
+ arch/arm/mach-bcm/bcm_nsp.c                        | 14 ++-----------
+ arch/arm/mach-bcm/board_bcm21664.c                 | 14 ++-----------
+ arch/arm/mach-bcm/board_bcm23550.c                 | 14 ++-----------
+ arch/arm/mach-bcm/board_bcm281xx.c                 | 14 ++-----------
+ arch/arm/mach-bcm/brcmstb.c                        | 14 ++-----------
+ arch/arm/mach-bcm/kona_l2_cache.c                  | 14 ++-----------
+ arch/arm/mach-bcm/kona_l2_cache.h                  | 14 ++-----------
+ arch/arm/mach-bcm/platsmp-brcmstb.c                | 10 +--------
+ arch/arm/mach-davinci/board-da830-evm.c            |  6 ++----
+ arch/arm/mach-davinci/board-da850-evm.c            |  6 ++----
+ arch/arm/mach-davinci/board-dm355-evm.c            |  6 ++----
+ arch/arm/mach-davinci/board-dm355-leopard.c        |  5 +----
+ arch/arm/mach-davinci/board-dm365-evm.c            | 11 +---------
+ arch/arm/mach-davinci/board-dm644x-evm.c           |  6 ++----
+ arch/arm/mach-davinci/board-dm646x-evm.c           |  7 +------
+ arch/arm/mach-davinci/board-mityomapl138.c         |  5 +----
+ arch/arm/mach-davinci/board-neuros-osd2.c          |  5 +----
+ arch/arm/mach-davinci/board-omapl138-hawk.c        |  5 +----
+ arch/arm/mach-davinci/common.c                     |  6 ++----
+ arch/arm/mach-davinci/common.h                     |  6 ++----
+ arch/arm/mach-davinci/cpuidle.h                    |  5 +----
+ arch/arm/mach-davinci/cputype.h                    |  6 ++----
+ arch/arm/mach-davinci/da830.c                      |  6 ++----
+ arch/arm/mach-davinci/da850.c                      |  6 ++----
+ arch/arm/mach-davinci/da8xx.h                      |  6 ++----
+ arch/arm/mach-davinci/davinci.h                    | 10 +--------
+ arch/arm/mach-davinci/dm355.c                      |  6 ++----
+ arch/arm/mach-davinci/dm365.c                      | 10 +--------
+ arch/arm/mach-davinci/dm644x.c                     |  6 ++----
+ arch/arm/mach-davinci/dm646x.c                     |  6 ++----
+ arch/arm/mach-davinci/hardware.h                   |  6 ++----
+ arch/arm/mach-davinci/mux.c                        |  6 ++----
+ arch/arm/mach-davinci/mux.h                        |  6 ++----
+ arch/arm/mach-davinci/pm.h                         | 10 +--------
+ arch/arm/mach-davinci/pm_domain.c                  |  5 +----
+ arch/arm/mach-davinci/serial.h                     |  6 ++----
+ arch/arm/mach-dove/bridge-regs.h                   |  9 ++------
+ arch/arm/mach-dove/cm-a510.c                       |  5 +----
+ arch/arm/mach-dove/common.c                        |  5 +----
+ arch/arm/mach-dove/common.h                        |  5 +----
+ arch/arm/mach-dove/dove-db-setup.c                 |  5 +----
+ arch/arm/mach-dove/dove.h                          |  9 ++------
+ arch/arm/mach-dove/irq.c                           |  5 +----
+ arch/arm/mach-dove/irqs.h                          |  9 ++------
+ arch/arm/mach-dove/mpp.c                           |  5 +----
+ arch/arm/mach-dove/pcie.c                          |  5 +----
+ arch/arm/mach-dove/pm.h                            |  6 +-----
+ arch/arm/mach-lpc18xx/board-dt.c                   |  5 +----
+ arch/arm/mach-lpc32xx/pm.c                         |  6 ++----
+ arch/arm/mach-lpc32xx/suspend.S                    |  6 ++----
+ arch/arm/mach-mv78xx0/bridge-regs.h                |  6 +-----
+ arch/arm/mach-mv78xx0/buffalo-wxl-setup.c          |  5 +----
+ arch/arm/mach-mv78xx0/common.c                     |  5 +----
+ arch/arm/mach-mv78xx0/common.h                     |  5 +----
+ arch/arm/mach-mv78xx0/db78x00-bp-setup.c           |  5 +----
+ arch/arm/mach-mv78xx0/irq.c                        |  5 +----
+ arch/arm/mach-mv78xx0/irqs.h                       |  9 ++------
+ arch/arm/mach-mv78xx0/mpp.c                        |  5 +----
+ arch/arm/mach-mv78xx0/mpp.h                        |  6 +-----
+ arch/arm/mach-mv78xx0/mv78xx0.h                    |  5 +----
+ arch/arm/mach-mv78xx0/pcie.c                       |  5 +----
+ arch/arm/mach-mv78xx0/rd78x00-masa-setup.c         |  5 +----
+ arch/arm/mach-mvebu/armada-370-xp.h                |  5 +----
+ arch/arm/mach-mvebu/board-v7.c                     |  5 +----
+ arch/arm/mach-mvebu/coherency.c                    |  5 +----
+ arch/arm/mach-mvebu/coherency.h                    |  6 +-----
+ arch/arm/mach-mvebu/coherency_ll.S                 |  5 +----
+ arch/arm/mach-mvebu/common.h                       |  5 +----
+ arch/arm/mach-mvebu/cpu-reset.c                    |  5 +----
+ arch/arm/mach-mvebu/dove.c                         |  5 +----
+ arch/arm/mach-mvebu/headsmp-a9.S                   |  5 +----
+ arch/arm/mach-mvebu/headsmp.S                      |  5 +----
+ arch/arm/mach-mvebu/kirkwood.c                     |  5 +----
+ arch/arm/mach-mvebu/kirkwood.h                     |  5 +----
+ arch/arm/mach-mvebu/mvebu-soc-id.c                 |  5 +----
+ arch/arm/mach-mvebu/mvebu-soc-id.h                 |  5 +----
+ arch/arm/mach-mvebu/platsmp-a9.c                   |  5 +----
+ arch/arm/mach-mvebu/platsmp.c                      |  5 +----
+ arch/arm/mach-mvebu/pm-board.c                     |  5 +----
+ arch/arm/mach-mvebu/pm.c                           |  5 +----
+ arch/arm/mach-mvebu/pmsu.c                         |  5 +----
+ arch/arm/mach-mvebu/pmsu.h                         |  5 +----
+ arch/arm/mach-mvebu/pmsu_ll.S                      |  5 +----
+ arch/arm/mach-mvebu/system-controller.c            |  5 +----
+ arch/arm/mach-omap1/board-sx1.h                    |  9 +-------
+ arch/arm/mach-omap1/gpio15xx.c                     | 10 +--------
+ arch/arm/mach-omap1/gpio16xx.c                     | 10 +--------
+ arch/arm/mach-omap1/gpio7xx.c                      | 10 +--------
+ arch/arm/mach-omap1/mtd-xip.h                      |  6 ++----
+ arch/arm/mach-omap1/pm_bus.c                       |  6 +-----
+ arch/arm/mach-omap1/timer.c                        | 10 +--------
+ arch/arm/mach-omap2/am33xx.h                       | 10 +--------
+ arch/arm/mach-omap2/clockdomains33xx_data.c        | 10 +--------
+ arch/arm/mach-omap2/clockdomains81xx_data.c        | 10 +--------
+ arch/arm/mach-omap2/cm-regbits-33xx.h              | 10 +--------
+ arch/arm/mach-omap2/cm33xx.c                       | 10 +--------
+ arch/arm/mach-omap2/cm33xx.h                       | 10 +--------
+ arch/arm/mach-omap2/cm81xx.h                       | 10 +--------
+ arch/arm/mach-omap2/display.c                      | 10 +--------
+ arch/arm/mach-omap2/omap_hwmod_81xx_data.c         | 11 +---------
+ arch/arm/mach-omap2/omap_opp_data.h                | 10 +--------
+ arch/arm/mach-omap2/opp3xxx_data.c                 | 10 +--------
+ arch/arm/mach-omap2/opp4xxx_data.c                 | 10 +--------
+ arch/arm/mach-omap2/powerdomains33xx_data.c        | 10 +--------
+ arch/arm/mach-omap2/prcm43xx.h                     |  5 +----
+ arch/arm/mach-omap2/prm-regbits-33xx.h             | 10 +--------
+ arch/arm/mach-omap2/prm33xx.c                      | 10 +--------
+ arch/arm/mach-omap2/prm33xx.h                      | 10 +--------
+ arch/arm/mach-omap2/ti81xx.h                       | 10 +--------
+ arch/arm/mach-omap2/vc.c                           |  6 +-----
+ arch/arm/mach-orion5x/board-d2net.c                |  5 +----
+ arch/arm/mach-orion5x/board-dt.c                   |  5 +----
+ arch/arm/mach-orion5x/board-rd88f5182.c            |  5 +----
+ arch/arm/mach-orion5x/bridge-regs.h                |  9 ++------
+ arch/arm/mach-orion5x/common.c                     |  5 +----
+ arch/arm/mach-orion5x/db88f5281-setup.c            |  5 +----
+ arch/arm/mach-orion5x/irq.c                        |  5 +----
+ arch/arm/mach-orion5x/irqs.h                       |  5 +----
+ arch/arm/mach-orion5x/kurobox_pro-setup.c          |  5 +----
+ arch/arm/mach-orion5x/ls_hgl-setup.c               |  5 +----
+ arch/arm/mach-orion5x/mpp.c                        |  5 +----
+ arch/arm/mach-orion5x/net2big-setup.c              |  6 +-----
+ arch/arm/mach-orion5x/orion5x.h                    |  5 +----
+ arch/arm/mach-orion5x/pci.c                        |  5 +----
+ arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c       |  5 +----
+ arch/arm/mach-orion5x/rd88f5181l-ge-setup.c        |  5 +----
+ arch/arm/mach-orion5x/rd88f5182-setup.c            |  5 +----
+ arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c       |  5 +----
+ arch/arm/mach-orion5x/ts78xx-setup.c               |  5 +----
+ arch/arm/mach-orion5x/wnr854t-setup.c              |  9 ++------
+ arch/arm/mach-orion5x/wrt350n-v2-setup.c           |  9 ++------
+ arch/arm/mach-pxa/eseries.c                        |  7 +------
+ arch/arm/mach-pxa/standby.S                        |  6 ++----
+ arch/arm/mach-spear/generic.h                      |  5 +----
+ arch/arm/mach-spear/misc_regs.h                    |  5 +----
+ arch/arm/mach-spear/pl080.c                        |  5 +----
+ arch/arm/mach-spear/pl080.h                        |  5 +----
+ arch/arm/mach-spear/restart.c                      |  5 +----
+ arch/arm/mach-spear/spear.h                        |  5 +----
+ arch/arm/mach-spear/spear1310.c                    |  5 +----
+ arch/arm/mach-spear/spear1340.c                    |  5 +----
+ arch/arm/mach-spear/spear13xx.c                    |  5 +----
+ arch/arm/mach-spear/spear300.c                     |  5 +----
+ arch/arm/mach-spear/spear310.c                     |  5 +----
+ arch/arm/mach-spear/spear320.c                     |  5 +----
+ arch/arm/mach-spear/spear3xx.c                     |  5 +----
+ arch/arm/mach-spear/spear6xx.c                     |  5 +----
+ arch/arm/mach-spear/time.c                         |  5 +----
+ arch/arm/mach-versatile/spc.c                      | 10 +--------
+ arch/arm/mm/cache-feroceon-l2.c                    |  5 +----
+ arch/arm/mm/cache-tauros2.c                        |  5 +----
+ arch/arm64/boot/dts/mediatek/mt6755.dtsi           |  9 +-------
+ arch/arm64/boot/dts/mediatek/mt6795.dtsi           |  9 +-------
+ arch/arm64/boot/dts/mediatek/mt8173.dtsi           |  9 +-------
+ arch/powerpc/kernel/kgdb.c                         |  5 +----
+ arch/sparc/vdso/vdso2c.c                           |  2 +-
+ arch/x86/crypto/crc32-pclmul_asm.S                 | 24 +---------------------
+ arch/x86/entry/vdso/vdso2c.c                       |  2 +-
+ drivers/bluetooth/btmrvl_debugfs.c                 | 15 +-------------
+ drivers/bluetooth/btmrvl_drv.h                     | 16 +--------------
+ drivers/bluetooth/btmrvl_main.c                    | 15 +-------------
+ drivers/bluetooth/btmrvl_sdio.c                    | 15 +-------------
+ drivers/bluetooth/btmrvl_sdio.h                    | 16 +--------------
+ drivers/bus/mvebu-mbus.c                           |  5 +----
+ drivers/bus/omap_l3_noc.c                          | 10 +--------
+ drivers/bus/omap_l3_noc.h                          | 10 +--------
+ drivers/bus/sunxi-rsb.c                            |  6 +-----
+ drivers/bus/tegra-gmi.c                            |  5 +----
+ drivers/bus/ts-nbus.c                              |  5 +----
+ drivers/char/hw_random/iproc-rng200.c              |  9 +-------
+ drivers/clk/axs10x/i2s_pll_clock.c                 |  5 +----
+ drivers/clk/axs10x/pll_clock.c                     |  5 +----
+ drivers/clk/bcm/clk-bcm21664.c                     | 10 +--------
+ drivers/clk/bcm/clk-bcm281xx.c                     | 10 +--------
+ drivers/clk/bcm/clk-bcm63xx.c                      | 14 ++-----------
+ drivers/clk/bcm/clk-cygnus.c                       | 14 ++-----------
+ drivers/clk/bcm/clk-hr2.c                          | 14 ++-----------
+ drivers/clk/bcm/clk-iproc-armpll.c                 | 14 ++-----------
+ drivers/clk/bcm/clk-iproc-asiu.c                   | 14 ++-----------
+ drivers/clk/bcm/clk-iproc-pll.c                    | 14 ++-----------
+ drivers/clk/bcm/clk-iproc.h                        | 14 ++-----------
+ drivers/clk/bcm/clk-kona-setup.c                   | 10 +--------
+ drivers/clk/bcm/clk-kona.c                         | 10 +--------
+ drivers/clk/bcm/clk-kona.h                         | 10 +--------
+ drivers/clk/bcm/clk-ns2.c                          | 14 ++-----------
+ drivers/clk/bcm/clk-nsp.c                          | 14 ++-----------
+ drivers/clk/clk-hsdk-pll.c                         |  5 +----
+ drivers/clk/clk-moxart.c                           |  5 +----
+ drivers/clk/keystone/sci-clk.c                     | 10 +--------
+ drivers/clk/mmp/clk-apbc.c                         |  5 +----
+ drivers/clk/mmp/clk-apmu.c                         |  5 +----
+ drivers/clk/mmp/clk-frac.c                         |  5 +----
+ drivers/clk/mmp/clk-gate.c                         |  5 +----
+ drivers/clk/mmp/clk-mix.c                          |  5 +----
+ drivers/clk/mmp/clk-mmp2.c                         |  5 +----
+ drivers/clk/mmp/clk-of-mmp2.c                      |  5 +----
+ drivers/clk/mmp/clk-of-pxa168.c                    |  5 +----
+ drivers/clk/mmp/clk-of-pxa1928.c                   |  5 +----
+ drivers/clk/mmp/clk-of-pxa910.c                    |  5 +----
+ drivers/clk/mmp/clk-pxa168.c                       |  5 +----
+ drivers/clk/mmp/clk-pxa910.c                       |  5 +----
+ drivers/clk/nxp/clk-lpc18xx-ccu.c                  |  5 +----
+ drivers/clk/nxp/clk-lpc18xx-cgu.c                  |  5 +----
+ drivers/clk/nxp/clk-lpc18xx-creg.c                 |  5 +----
+ drivers/clk/spear/clk-aux-synth.c                  |  5 +----
+ drivers/clk/spear/clk-frac-synth.c                 |  5 +----
+ drivers/clk/spear/clk-gpt-synth.c                  |  5 +----
+ drivers/clk/spear/clk-vco-pll.c                    |  5 +----
+ drivers/clk/spear/clk.c                            |  5 +----
+ drivers/clk/spear/clk.h                            |  5 +----
+ drivers/clk/spear/spear1310_clock.c                |  5 +----
+ drivers/clk/spear/spear1340_clock.c                |  5 +----
+ drivers/clk/spear/spear3xx_clock.c                 |  5 +----
+ drivers/clk/spear/spear6xx_clock.c                 |  5 +----
+ drivers/clk/ti/adpll.c                             | 11 +---------
+ drivers/clk/ti/apll.c                              | 10 +--------
+ drivers/clk/ti/autoidle.c                          | 10 +--------
+ drivers/clk/ti/clk-2xxx.c                          | 10 +--------
+ drivers/clk/ti/clk-33xx.c                          | 10 +--------
+ drivers/clk/ti/clk-3xxx.c                          | 10 +--------
+ drivers/clk/ti/clk-43xx.c                          | 10 +--------
+ drivers/clk/ti/clk-816x.c                          | 11 +---------
+ drivers/clk/ti/clk-dra7-atl.c                      | 10 +--------
+ drivers/clk/ti/clk.c                               | 10 +--------
+ drivers/clk/ti/clkctrl.c                           | 10 +--------
+ drivers/clk/ti/clkt_dflt.c                         | 10 +--------
+ drivers/clk/ti/clock.h                             | 10 +--------
+ drivers/clk/ti/clockdomain.c                       | 10 +--------
+ drivers/clk/ti/composite.c                         | 10 +--------
+ drivers/clk/ti/divider.c                           | 10 +--------
+ drivers/clk/ti/dpll.c                              | 10 +--------
+ drivers/clk/ti/fapll.c                             | 11 +---------
+ drivers/clk/ti/fixed-factor.c                      | 10 +--------
+ drivers/clk/ti/gate.c                              | 10 +--------
+ drivers/clk/ti/interface.c                         | 10 +--------
+ drivers/clk/ti/mux.c                               | 10 +--------
+ drivers/cpufreq/mvebu-cpufreq.c                    |  5 +----
+ drivers/cpufreq/scpi-cpufreq.c                     | 10 +--------
+ drivers/cpuidle/cpuidle-at91.c                     |  5 +----
+ drivers/cpuidle/cpuidle-kirkwood.c                 |  5 +----
+ drivers/dma/bcm-sba-raid.c                         | 14 ++-----------
+ drivers/dma/bestcomm/ata.c                         |  7 +------
+ drivers/dma/bestcomm/bestcomm.c                    |  7 +------
+ drivers/dma/bestcomm/fec.c                         |  7 +------
+ drivers/dma/bestcomm/sram.c                        |  7 +------
+ drivers/dma/moxart-dma.c                           |  5 +----
+ drivers/dma/ppc4xx/adma.h                          |  5 +----
+ drivers/dma/ppc4xx/dma.h                           |  5 +----
+ drivers/dma/ppc4xx/xor.h                           |  5 +----
+ drivers/dma/ti/edma.c                              | 10 +--------
+ drivers/edac/edac_pci.c                            |  7 ++-----
+ drivers/edac/fsl_ddr_edac.c                        |  6 ++----
+ drivers/edac/fsl_ddr_edac.h                        |  7 ++-----
+ drivers/edac/mpc85xx_edac.h                        |  7 ++-----
+ drivers/gpio/gpio-bcm-kona.c                       | 10 +--------
+ drivers/gpio/gpio-brcmstb.c                        | 14 ++-----------
+ drivers/gpio/gpio-lp873x.c                         | 10 +--------
+ drivers/gpio/gpio-lp87565.c                        | 10 +--------
+ drivers/gpio/gpio-mpc8xxx.c                        |  5 +----
+ drivers/gpio/gpio-mvebu.c                          |  5 +----
+ drivers/gpio/gpio-pisosr.c                         | 10 +--------
+ drivers/gpio/gpio-spear-spics.c                    |  5 +----
+ drivers/gpio/gpio-tpic2810.c                       | 10 +--------
+ drivers/gpio/gpio-ts4800.c                         |  5 +----
+ drivers/i2c/busses/i2c-bcm-iproc.c                 | 14 ++-----------
+ drivers/i2c/busses/i2c-bcm-kona.c                  | 14 ++-----------
+ drivers/i2c/busses/i2c-brcmstb.c                   | 14 ++-----------
+ drivers/input/keyboard/bcm-keypad.c                | 14 ++-----------
+ drivers/input/misc/gpio_decoder.c                  | 10 +--------
+ drivers/input/misc/palmas-pwrbutton.c              | 10 +--------
+ drivers/input/misc/tps65218-pwrbutton.c            | 10 +--------
+ drivers/input/touchscreen/bcm_iproc_tsc.c          |  9 +-------
+ drivers/irqchip/irq-keystone.c                     | 10 +--------
+ drivers/mailbox/bcm-flexrm-mailbox.c               | 14 ++-----------
+ drivers/media/i2c/adv7343_regs.h                   | 10 +--------
+ drivers/media/i2c/adv7393_regs.h                   | 10 +--------
+ drivers/media/platform/ti/davinci/vpif.h           | 11 +---------
+ drivers/media/platform/ti/davinci/vpif_display.h   | 10 +--------
+ drivers/memory/ti-emif-sram-pm.S                   | 10 +--------
+ drivers/mfd/lp873x.c                               | 10 +--------
+ drivers/mfd/tps65086.c                             | 10 +--------
+ drivers/mfd/tps65217.c                             | 10 +--------
+ drivers/mfd/tps65218.c                             | 10 +--------
+ drivers/mfd/tps65912-core.c                        | 10 +--------
+ drivers/mfd/tps65912-i2c.c                         | 10 +--------
+ drivers/mfd/tps65912-spi.c                         | 10 +--------
+ drivers/misc/sram-exec.c                           | 10 +--------
+ drivers/mmc/host/sdhci-bcm-kona.c                  | 14 ++-----------
+ drivers/mmc/host/sdhci-iproc.c                     | 14 ++-----------
+ drivers/net/can/ti_hecc.c                          | 11 +---------
+ drivers/net/ethernet/chelsio/cxgb/common.h         | 11 +---------
+ drivers/net/ethernet/chelsio/cxgb/cphy.h           | 11 +---------
+ drivers/net/ethernet/chelsio/cxgb/cpl5_cmd.h       | 12 +----------
+ drivers/net/ethernet/chelsio/cxgb/elmer0.h         | 12 +----------
+ drivers/net/ethernet/chelsio/cxgb/espi.c           | 11 +---------
+ drivers/net/ethernet/chelsio/cxgb/espi.h           | 11 +---------
+ drivers/net/ethernet/chelsio/cxgb/gmac.h           | 11 +---------
+ drivers/net/ethernet/chelsio/cxgb/mv88x201x.c      | 11 +---------
+ drivers/net/ethernet/chelsio/cxgb/pm3393.c         | 11 +---------
+ drivers/net/ethernet/chelsio/cxgb/regs.h           | 11 +---------
+ drivers/net/ethernet/chelsio/cxgb/sge.c            | 11 +---------
+ drivers/net/ethernet/chelsio/cxgb/sge.h            | 11 +---------
+ drivers/net/ethernet/chelsio/cxgb/subr.c           | 11 +---------
+ .../net/ethernet/chelsio/cxgb/suni1x10gexp_regs.h  | 12 +----------
+ drivers/net/ethernet/cisco/enic/cq_desc.h          | 15 +-------------
+ drivers/net/ethernet/cisco/enic/cq_enet_desc.h     | 15 +-------------
+ drivers/net/ethernet/cisco/enic/enic.h             | 15 +-------------
+ drivers/net/ethernet/cisco/enic/enic_api.c         | 19 ++---------------
+ drivers/net/ethernet/cisco/enic/enic_api.h         | 19 ++---------------
+ drivers/net/ethernet/cisco/enic/enic_dev.c         | 19 ++---------------
+ drivers/net/ethernet/cisco/enic/enic_dev.h         | 19 ++---------------
+ drivers/net/ethernet/cisco/enic/enic_ethtool.c     | 19 ++---------------
+ drivers/net/ethernet/cisco/enic/enic_pp.c          | 19 ++---------------
+ drivers/net/ethernet/cisco/enic/enic_pp.h          | 19 ++---------------
+ drivers/net/ethernet/cisco/enic/enic_res.c         | 15 +-------------
+ drivers/net/ethernet/cisco/enic/enic_res.h         | 15 +-------------
+ drivers/net/ethernet/cisco/enic/rq_enet_desc.h     | 15 +-------------
+ drivers/net/ethernet/cisco/enic/vnic_cq.c          | 15 +-------------
+ drivers/net/ethernet/cisco/enic/vnic_cq.h          | 15 +-------------
+ drivers/net/ethernet/cisco/enic/vnic_dev.c         | 15 +-------------
+ drivers/net/ethernet/cisco/enic/vnic_dev.h         | 15 +-------------
+ drivers/net/ethernet/cisco/enic/vnic_devcmd.h      | 15 +-------------
+ drivers/net/ethernet/cisco/enic/vnic_enet.h        | 15 +-------------
+ drivers/net/ethernet/cisco/enic/vnic_intr.c        | 15 +-------------
+ drivers/net/ethernet/cisco/enic/vnic_intr.h        | 15 +-------------
+ drivers/net/ethernet/cisco/enic/vnic_nic.h         | 15 +-------------
+ drivers/net/ethernet/cisco/enic/vnic_resource.h    | 15 +-------------
+ drivers/net/ethernet/cisco/enic/vnic_rq.c          | 16 +--------------
+ drivers/net/ethernet/cisco/enic/vnic_rq.h          | 15 +-------------
+ drivers/net/ethernet/cisco/enic/vnic_rss.h         | 14 +------------
+ drivers/net/ethernet/cisco/enic/vnic_stats.h       | 15 +-------------
+ drivers/net/ethernet/cisco/enic/vnic_vic.c         | 19 ++---------------
+ drivers/net/ethernet/cisco/enic/vnic_vic.h         | 19 ++---------------
+ drivers/net/ethernet/cisco/enic/vnic_wq.c          | 15 +-------------
+ drivers/net/ethernet/cisco/enic/vnic_wq.h          | 15 +-------------
+ drivers/net/ethernet/cisco/enic/wq_enet_desc.h     | 15 +-------------
+ drivers/net/wireless/marvell/mwifiex/11ac.c        | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/11ac.h        | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/11h.c         | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/11n.c         | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/11n.h         | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/11n_aggr.c    | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/11n_aggr.h    | 14 +------------
+ .../net/wireless/marvell/mwifiex/11n_rxreorder.c   | 14 +------------
+ .../net/wireless/marvell/mwifiex/11n_rxreorder.h   | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/Makefile      | 13 +-----------
+ drivers/net/wireless/marvell/mwifiex/cfg80211.c    | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/cfg80211.h    | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/cfp.c         | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/cmdevt.c      | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/debugfs.c     | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/decl.h        | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/ethtool.c     | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/fw.h          | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/ie.c          | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/init.c        | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/ioctl.h       | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/join.c        | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/main.c        | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/main.h        | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/pcie.c        | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/pcie.h        | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/pcie_quirks.c | 18 ++--------------
+ drivers/net/wireless/marvell/mwifiex/pcie_quirks.h | 18 ++--------------
+ drivers/net/wireless/marvell/mwifiex/scan.c        | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/sdio.c        | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/sdio.h        | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/sta_cmd.c     | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/sta_event.c   | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/sta_ioctl.c   | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/sta_rx.c      | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/sta_tx.c      | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/txrx.c        | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/uap_cmd.c     | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/uap_event.c   | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/uap_txrx.c    | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/usb.c         | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/usb.h         | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/util.c        | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/util.h        | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/wmm.c         | 14 +------------
+ drivers/net/wireless/marvell/mwifiex/wmm.h         | 14 +------------
+ drivers/nvmem/bcm-ocotp.c                          | 14 ++-----------
+ drivers/phy/broadcom/phy-bcm-cygnus-pcie.c         | 14 ++-----------
+ drivers/phy/broadcom/phy-bcm-ns2-pcie.c            | 14 ++-----------
+ drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c          | 14 ++-----------
+ drivers/phy/motorola/phy-cpcap-usb.c               | 10 +--------
+ drivers/phy/ti/phy-dm816x-usb.c                    | 11 +---------
+ drivers/pinctrl/bcm/pinctrl-bcm281xx.c             | 14 ++-----------
+ drivers/pinctrl/bcm/pinctrl-cygnus-mux.c           | 14 ++-----------
+ drivers/pinctrl/bcm/pinctrl-ns2-mux.c              | 10 +--------
+ drivers/pinctrl/bcm/pinctrl-nsp-gpio.c             | 14 ++-----------
+ drivers/pinctrl/bcm/pinctrl-nsp-mux.c              | 10 +--------
+ drivers/pinctrl/pinctrl-as3722.c                   | 15 +-------------
+ drivers/pinctrl/pinctrl-palmas.c                   | 15 +-------------
+ drivers/pinctrl/pinctrl-utils.c                    | 15 +-------------
+ drivers/pinctrl/pinctrl-utils.h                    | 15 +-------------
+ drivers/power/reset/brcm-kona-reset.c              | 14 ++-----------
+ drivers/power/reset/brcmstb-reboot.c               | 14 ++-----------
+ drivers/power/supply/cpcap-battery.c               | 10 +--------
+ drivers/ptp/ptp_dte.c                              | 14 ++-----------
+ drivers/pwm/pwm-bcm-iproc.c                        | 14 ++-----------
+ drivers/pwm/pwm-bcm-kona.c                         | 14 ++-----------
+ drivers/regulator/cpcap-regulator.c                | 10 +--------
+ drivers/regulator/isl6271a-regulator.c             | 10 +--------
+ drivers/regulator/lp873x-regulator.c               | 10 +--------
+ drivers/regulator/max8973-regulator.c              | 15 +-------------
+ drivers/regulator/ti-abb-regulator.c               | 10 +--------
+ drivers/regulator/tps51632-regulator.c             | 15 +-------------
+ drivers/regulator/tps62360-regulator.c             | 15 +-------------
+ drivers/regulator/tps65023-regulator.c             | 10 +--------
+ drivers/regulator/tps6507x-regulator.c             | 10 +--------
+ drivers/regulator/tps65086-regulator.c             | 10 +--------
+ drivers/regulator/tps65217-regulator.c             | 10 +--------
+ drivers/regulator/tps65218-regulator.c             | 10 +--------
+ drivers/regulator/tps65912-regulator.c             | 10 +--------
+ drivers/reset/reset-ti-sci.c                       | 10 +--------
+ drivers/reset/reset-ti-syscon.c                    | 10 +--------
+ drivers/scsi/fnic/cq_desc.h                        | 14 +------------
+ drivers/scsi/fnic/cq_enet_desc.h                   | 14 +------------
+ drivers/scsi/fnic/cq_exch_desc.h                   | 14 +------------
+ drivers/scsi/fnic/fcpio.h                          | 14 +------------
+ drivers/scsi/fnic/fnic.h                           | 14 +------------
+ drivers/scsi/fnic/fnic_attrs.c                     | 14 +------------
+ drivers/scsi/fnic/fnic_debugfs.c                   | 18 ++--------------
+ drivers/scsi/fnic/fnic_fcs.c                       | 14 +------------
+ drivers/scsi/fnic/fnic_fip.h                       | 14 +------------
+ drivers/scsi/fnic/fnic_io.h                        | 14 +------------
+ drivers/scsi/fnic/fnic_isr.c                       | 15 +-------------
+ drivers/scsi/fnic/fnic_main.c                      | 15 +-------------
+ drivers/scsi/fnic/fnic_res.c                       | 14 +------------
+ drivers/scsi/fnic/fnic_res.h                       | 14 +------------
+ drivers/scsi/fnic/fnic_scsi.c                      | 14 +------------
+ drivers/scsi/fnic/fnic_stats.h                     | 18 ++--------------
+ drivers/scsi/fnic/fnic_trace.c                     | 18 ++--------------
+ drivers/scsi/fnic/fnic_trace.h                     | 18 ++--------------
+ drivers/scsi/fnic/rq_enet_desc.h                   | 14 +------------
+ drivers/scsi/fnic/vnic_cq.c                        | 14 +------------
+ drivers/scsi/fnic/vnic_cq.h                        | 14 +------------
+ drivers/scsi/fnic/vnic_cq_copy.h                   | 14 +------------
+ drivers/scsi/fnic/vnic_dev.c                       | 14 +------------
+ drivers/scsi/fnic/vnic_dev.h                       | 14 +------------
+ drivers/scsi/fnic/vnic_devcmd.h                    | 14 +------------
+ drivers/scsi/fnic/vnic_intr.c                      | 14 +------------
+ drivers/scsi/fnic/vnic_intr.h                      | 14 +------------
+ drivers/scsi/fnic/vnic_nic.h                       | 14 +------------
+ drivers/scsi/fnic/vnic_resource.h                  | 14 +------------
+ drivers/scsi/fnic/vnic_rq.c                        | 15 +-------------
+ drivers/scsi/fnic/vnic_rq.h                        | 14 +------------
+ drivers/scsi/fnic/vnic_scsi.h                      | 14 +------------
+ drivers/scsi/fnic/vnic_stats.h                     | 14 +------------
+ drivers/scsi/fnic/vnic_wq.c                        | 14 +------------
+ drivers/scsi/fnic/vnic_wq.h                        | 14 +------------
+ drivers/scsi/fnic/vnic_wq_copy.c                   | 15 +-------------
+ drivers/scsi/fnic/vnic_wq_copy.h                   | 14 +------------
+ drivers/scsi/fnic/wq_enet_desc.h                   | 14 +------------
+ drivers/scsi/snic/cq_desc.h                        | 18 ++--------------
+ drivers/scsi/snic/cq_enet_desc.h                   | 18 ++--------------
+ drivers/scsi/snic/snic.h                           | 18 ++--------------
+ drivers/scsi/snic/snic_attrs.c                     | 18 ++--------------
+ drivers/scsi/snic/snic_ctl.c                       | 18 ++--------------
+ drivers/scsi/snic/snic_debugfs.c                   | 18 ++--------------
+ drivers/scsi/snic/snic_disc.c                      | 18 ++--------------
+ drivers/scsi/snic/snic_disc.h                      | 18 ++--------------
+ drivers/scsi/snic/snic_fwint.h                     | 18 ++--------------
+ drivers/scsi/snic/snic_io.c                        | 18 ++--------------
+ drivers/scsi/snic/snic_io.h                        | 18 ++--------------
+ drivers/scsi/snic/snic_isr.c                       | 18 ++--------------
+ drivers/scsi/snic/snic_main.c                      | 18 ++--------------
+ drivers/scsi/snic/snic_res.c                       | 18 ++--------------
+ drivers/scsi/snic/snic_res.h                       | 18 ++--------------
+ drivers/scsi/snic/snic_scsi.c                      | 18 ++--------------
+ drivers/scsi/snic/snic_stats.h                     | 18 ++--------------
+ drivers/scsi/snic/snic_trc.c                       | 18 ++--------------
+ drivers/scsi/snic/snic_trc.h                       | 18 ++--------------
+ drivers/scsi/snic/vnic_cq.c                        | 18 ++--------------
+ drivers/scsi/snic/vnic_cq.h                        | 18 ++--------------
+ drivers/scsi/snic/vnic_cq_fw.h                     | 18 ++--------------
+ drivers/scsi/snic/vnic_dev.c                       | 18 ++--------------
+ drivers/scsi/snic/vnic_dev.h                       | 18 ++--------------
+ drivers/scsi/snic/vnic_devcmd.h                    | 18 ++--------------
+ drivers/scsi/snic/vnic_intr.c                      | 18 ++--------------
+ drivers/scsi/snic/vnic_intr.h                      | 18 ++--------------
+ drivers/scsi/snic/vnic_resource.h                  | 18 ++--------------
+ drivers/scsi/snic/vnic_snic.h                      | 18 ++--------------
+ drivers/scsi/snic/vnic_stats.h                     | 18 ++--------------
+ drivers/scsi/snic/vnic_wq.c                        | 18 ++--------------
+ drivers/scsi/snic/vnic_wq.h                        | 18 ++--------------
+ drivers/scsi/snic/wq_enet_desc.h                   | 18 ++--------------
+ drivers/soc/ti/knav_dma.c                          | 10 +--------
+ drivers/thermal/hisi_thermal.c                     | 10 +--------
+ drivers/uio/uio_pruss.c                            | 10 +--------
+ drivers/video/backlight/tps65217_bl.c              | 10 +--------
+ include/dt-bindings/clock/bcm21664.h               | 10 +--------
+ include/dt-bindings/clock/bcm281xx.h               | 10 +--------
+ include/dt-bindings/clock/ti-dra7-atl.h            | 10 +--------
+ include/dt-bindings/pinctrl/hisi.h                 | 10 +--------
+ include/dt-bindings/pinctrl/keystone.h             | 10 +--------
+ include/dt-bindings/power/mt6797-power.h           |  9 +-------
+ include/linux/clk/ti.h                             | 10 +--------
+ include/linux/input/elan-i2c-ids.h                 |  5 +----
+ include/linux/mfd/lp873x.h                         | 10 +--------
+ include/linux/mfd/tps65086.h                       | 10 +--------
+ include/linux/mfd/tps65217.h                       | 10 +--------
+ include/linux/mfd/tps65218.h                       | 10 +--------
+ include/linux/mfd/tps65912.h                       | 10 +--------
+ include/linux/platform_data/davinci_asp.h          | 10 +--------
+ include/linux/platform_data/gpio-davinci.h         | 10 +--------
+ include/linux/platform_data/uio_dmem_genirq.h      | 10 +--------
+ include/linux/platform_data/uio_pruss.h            | 10 +--------
+ include/linux/platform_data/usb-omap.h             | 16 +--------------
+ include/linux/pm_wakeirq.h                         | 14 ++-----------
+ include/linux/reset/bcm63xx_pmb.h                  | 10 +--------
+ include/linux/soc/ti/knav_dma.h                    | 10 +--------
+ include/linux/soc/ti/knav_qmss.h                   | 10 +--------
+ include/linux/soc/ti/ti-msgmgr.h                   | 10 +--------
+ include/linux/sram.h                               | 14 ++-----------
+ include/linux/sunrpc/bc_xprt.h                     | 17 +--------------
+ include/linux/ti-emif-sram.h                       | 10 +--------
+ include/linux/usb/audio-v2.h                       |  3 ---
+ include/linux/usb/audio.h                          |  3 ---
+ include/linux/usb/c67x00.h                         | 15 --------------
+ include/linux/usb/cdc-wdm.h                        |  4 ----
+ include/linux/usb/cdc.h                            |  4 ----
+ include/linux/usb/composite.h                      | 14 -------------
+ include/linux/usb/ehci_def.h                       | 14 -------------
+ include/linux/usb/ehci_pdriver.h                   | 14 -------------
+ include/linux/usb/g_hid.h                          | 14 -------------
+ include/linux/usb/gadget.h                         |  2 --
+ include/linux/usb/hcd.h                            | 14 -------------
+ include/linux/usb/input.h                          |  4 ----
+ include/linux/usb/isp1301.h                        | 10 ---------
+ include/linux/usb/m66592.h                         | 14 -------------
+ include/linux/usb/musb-ux500.h                     | 10 ---------
+ include/linux/usb/net2280.h                        | 14 -------------
+ include/linux/usb/of.h                             |  2 --
+ include/linux/usb/ohci_pdriver.h                   | 14 -------------
+ include/linux/usb/otg-fsm.h                        | 17 ++-------------
+ include/linux/usb/phy_companion.h                  | 10 ---------
+ include/linux/usb/r8a66597.h                       | 14 -------------
+ include/linux/usb/rndis_host.h                     | 14 -------------
+ include/linux/usb/serial.h                         |  5 -----
+ include/linux/usb/storage.h                        |  2 --
+ include/linux/usb/tegra_usb_phy.h                  | 10 ---------
+ include/linux/usb/ulpi.h                           |  4 ----
+ include/linux/usb/usb338x.h                        | 11 ----------
+ include/linux/usb/usbnet.h                         | 14 -------------
+ include/linux/usb/xhci-dbgp.h                      |  4 ----
+ include/linux/wkup_m3_ipc.h                        | 10 +--------
+ include/media/i2c/adv7343.h                        | 10 +--------
+ include/media/i2c/adv7393.h                        | 10 +--------
+ include/media/i2c/ov2659.h                         | 14 +------------
+ include/uapi/linux/netfilter/xt_IDLETIMER.h        | 17 +--------------
+ net/hsr/hsr_debugfs.c                              | 10 +--------
+ net/sunrpc/backchannel_rqst.c                      | 16 +--------------
+ net/sunrpc/sunrpc.h                                | 16 +--------------
+ samples/v4l/v4l2-pci-skeleton.c                    | 14 +------------
+ scripts/gcc-plugins/latent_entropy_plugin.c        |  2 +-
+ scripts/gcc-plugins/stackleak_plugin.c             |  2 +-
+ scripts/gcc-plugins/structleak_plugin.c            |  2 +-
+ sound/soc/bcm/cygnus-pcm.c                         | 14 ++-----------
+ sound/soc/bcm/cygnus-ssp.c                         | 14 ++-----------
+ sound/soc/bcm/cygnus-ssp.h                         | 14 ++-----------
+ tools/power/cpupower/debug/i386/dump_psb.c         |  6 ++----
+ 617 files changed, 732 insertions(+), 5619 deletions(-)
+Merging gpio-brgl-fixes/gpio/for-current (7329b0717296 gpio: sim: fix the chip_name configfs item)
+$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current
+Merge made by the 'ort' strategy.
+ drivers/gpio/gpio-sim.c | 16 +++++-----------
+ 1 file changed, 5 insertions(+), 11 deletions(-)
+Merging gpio-intel-fixes/fixes (b93a8b2c5161 gpio: dln2: make irq_chip immutable)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes
+Already up to date.
+Merging pinctrl-intel-fixes/fixes (ba79c5e45eec MAINTAINERS: Update Intel pin control to Supported)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes
+Already up to date.
+Merging erofs-fixes/fixes (8b1ac84dcf2c Documentation/ABI: sysfs-fs-erofs: Fix Sphinx errors)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes
+Already up to date.
+Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc())
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity-fixes/fixes
+Already up to date.
+Merging kunit-fixes/kunit-fixes (f2906aa86338 Linux 5.19-rc1)
+$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes
+Already up to date.
+Merging ubifs-fixes/fixes (c3c07fc25f37 ubi: fastmap: Return error code if memory allocation fails in add_aeb())
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes
+Already up to date.
+Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes
+Already up to date.
+Merging cel-fixes/for-rc (1197eb5906a5 lockd: fix nlm_close_files)
+$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel-fixes/for-rc
+Already up to date.
+Merging irqchip-fixes/irq/irqchip-fixes (1357d2a65601 irqchip/apple-aic: Make symbol 'use_fast_ipi' static)
+$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes
+Already up to date.
+Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes
+Already up to date.
+Merging broadcom-fixes/fixes (a26f045984e7 Merge branch 'devicetree/fixes' into fixes)
+$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes
+Merge made by the 'ort' strategy.
+Merging perf-current/perf/urgent (ff898552fb32 perf synthetic-events: Ignore dead threads during event synthesis)
+$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent
+Already up to date.
+Merging efi-fixes/urgent (aa6d1ed107eb efi/x86: libstub: Fix typo in __efi64_argmap* name)
+$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent
+Already up to date.
+Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.)
+$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus
+Merge made by the 'ort' strategy.
+ include/linux/zstd_lib.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging battery-fixes/fixes (093d27bb6f2d power: supply: core: Fix boundary conditions in interpolation)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes
+Merge made by the 'ort' strategy.
+ drivers/power/reset/arm-versatile-reboot.c |  1 +
+ drivers/power/supply/ab8500_fg.c           |  9 ++++++++-
+ drivers/power/supply/power_supply_core.c   | 24 ++++++++++++------------
+ 3 files changed, 21 insertions(+), 13 deletions(-)
+Merging drm-misc-fixes/for-linux-next-fixes (925b6e59138c Revert "drm/amdgpu: add drm buddy support to amdgpu")
+$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/Kconfig                        |   1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h |  97 ++-----
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h        |  10 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c   | 359 ++++++++++---------------
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h   |  89 ------
+ 5 files changed, 176 insertions(+), 380 deletions(-)
+ delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h
+$ git am -3 ../patches/0001-Revert-Revert-drm-amdgpu-add-drm-buddy-support-to-am.patch
+Applying: Revert "Revert "drm/amdgpu: add drm buddy support to amdgpu""
+$ git reset HEAD^
+Unstaged changes after reset:
+M	drivers/gpu/drm/Kconfig
+M	drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h
+M	drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
+M	drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 27ca1dbc37a0] Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc
+ Date: Fri Jul 15 09:13:19 2022 +1000
+Merging kbuild/for-next (be66c181264a kbuild: dummy-tools: avoid tmpdir leak in dummy gcc)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS                                        |  1 -
+ Makefile                                           |  2 --
+ arch/arc/configs/axs101_defconfig                  |  1 -
+ arch/arc/configs/axs103_defconfig                  |  1 -
+ arch/arc/configs/axs103_smp_defconfig              |  1 -
+ arch/arc/configs/haps_hs_defconfig                 |  1 -
+ arch/arc/configs/haps_hs_smp_defconfig             |  1 -
+ arch/arc/configs/hsdk_defconfig                    |  1 -
+ arch/arc/configs/nsim_700_defconfig                |  1 -
+ arch/arc/configs/nsimosci_defconfig                |  1 -
+ arch/arc/configs/nsimosci_hs_defconfig             |  1 -
+ arch/arc/configs/nsimosci_hs_smp_defconfig         |  1 -
+ arch/arc/configs/tb10x_defconfig                   |  1 -
+ arch/arc/configs/vdk_hs38_defconfig                |  1 -
+ arch/arc/configs/vdk_hs38_smp_defconfig            |  1 -
+ certs/Makefile                                     | 14 ++++++-------
+ certs/blacklist_hashes.c                           |  1 -
+ certs/blacklist_nohashes.c                         |  6 ------
+ {scripts => certs}/check-blacklist-hashes.awk      |  0
+ init/Kconfig                                       | 16 +++++----------
+ scripts/Makefile.build                             |  5 ++---
+ .../dummy-plugin-dir/include/plugin-version.h      |  0
+ scripts/dummy-tools/gcc                            |  8 ++------
+ scripts/mod/modpost.c                              | 24 +++++++++++++++-------
+ 24 files changed, 32 insertions(+), 58 deletions(-)
+ delete mode 100644 certs/blacklist_nohashes.c
+ rename {scripts => certs}/check-blacklist-hashes.awk (100%)
+ create mode 100644 scripts/dummy-tools/dummy-plugin-dir/include/plugin-version.h
+Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros)
+$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format
+Already up to date.
+Merging perf/perf/core (0d2997f750d1 perf lock: Look up callchain for the contended locks)
+$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core
+Auto-merging tools/perf/builtin-inject.c
+Auto-merging tools/perf/util/evsel.c
+CONFLICT (content): Merge conflict in tools/perf/util/evsel.c
+Auto-merging tools/perf/util/header.c
+Auto-merging tools/perf/util/header.h
+Auto-merging tools/perf/util/synthetic-events.c
+Resolved 'tools/perf/util/evsel.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 4ae408632eea] Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git
+$ git diff -M --stat --summary HEAD^..
+ tools/arch/x86/include/asm/amd-ibs.h               |   16 +-
+ tools/lib/perf/include/perf/event.h                |    1 +
+ tools/perf/Documentation/perf-lock.txt             |    7 +
+ tools/perf/Documentation/perf-record.txt           |   10 +
+ tools/perf/Documentation/perf.data-file-format.txt |   20 +-
+ tools/perf/Makefile.config                         |   27 +-
+ tools/perf/Makefile.perf                           |   16 +-
+ tools/perf/arch/x86/util/evsel.c                   |   52 +
+ tools/perf/builtin-inject.c                        |    3 +-
+ tools/perf/builtin-lock.c                          |  426 ++++++-
+ tools/perf/builtin-record.c                        |   44 +-
+ tools/perf/builtin-script.c                        |    6 +
+ tools/perf/pmu-events/Build                        |   17 +-
+ tools/perf/pmu-events/empty-pmu-events.c           |  158 +++
+ tools/perf/pmu-events/jevents.c                    | 1342 --------------------
+ tools/perf/pmu-events/jevents.py                   |  409 ++++++
+ tools/perf/pmu-events/jsmn.c                       |  352 -----
+ tools/perf/pmu-events/jsmn.h                       |   68 -
+ tools/perf/pmu-events/json.c                       |  162 ---
+ tools/perf/pmu-events/json.h                       |   39 -
+ tools/perf/tests/pmu-events.c                      |    1 +
+ tools/perf/tests/shell/stat_all_metrics.sh         |   47 +-
+ tools/perf/tests/shell/test_brstack.sh             |  114 ++
+ tools/perf/util/amd-sample-raw.c                   |   68 +-
+ tools/perf/util/callchain.c                        |   18 +-
+ tools/perf/util/data-convert-json.c                |    5 +-
+ tools/perf/util/env.c                              |   62 +-
+ tools/perf/util/env.h                              |   14 +-
+ tools/perf/util/event.c                            |    1 +
+ tools/perf/util/evsel.c                            |    7 +
+ tools/perf/util/evsel.h                            |    1 +
+ tools/perf/util/header.c                           |  192 +--
+ tools/perf/util/header.h                           |    2 +-
+ tools/perf/util/pmu.c                              |   15 +-
+ tools/perf/util/pmu.h                              |    2 +
+ tools/perf/util/record.c                           |    2 +-
+ tools/perf/util/record.h                           |    1 +
+ tools/perf/util/session.c                          |    4 +
+ tools/perf/util/synthetic-events.c                 |    7 +-
+ tools/perf/util/tool.h                             |    3 +-
+ 40 files changed, 1584 insertions(+), 2157 deletions(-)
+ create mode 100644 tools/perf/pmu-events/empty-pmu-events.c
+ delete mode 100644 tools/perf/pmu-events/jevents.c
+ create mode 100755 tools/perf/pmu-events/jevents.py
+ delete mode 100644 tools/perf/pmu-events/jsmn.c
+ delete mode 100644 tools/perf/pmu-events/jsmn.h
+ delete mode 100644 tools/perf/pmu-events/json.c
+ delete mode 100644 tools/perf/pmu-events/json.h
+ create mode 100755 tools/perf/tests/shell/test_brstack.sh
+Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn)
+$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes
+Already up to date.
+Merging dma-mapping/for-next (20347fca71a3 swiotlb: split up the global swiotlb lock)
+$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging arch/arm/mach-mvebu/coherency.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/kernel-parameters.txt    |   4 +-
+ Documentation/x86/x86_64/boot-options.rst          |   8 +-
+ arch/arm/Kconfig                                   |   5 +-
+ arch/arm/common/Kconfig                            |   6 +-
+ arch/arm/common/Makefile                           |   1 -
+ arch/arm/common/dmabounce.c                        | 582 ------------------
+ arch/arm/common/sa1111.c                           |  64 --
+ arch/arm/include/asm/device.h                      |   3 -
+ arch/arm/include/asm/dma-direct.h                  |  49 +-
+ arch/arm/include/asm/dma-mapping.h                 | 128 ----
+ arch/arm/include/asm/memory.h                      |   2 -
+ arch/arm/mach-footbridge/Kconfig                   |   1 +
+ arch/arm/mach-footbridge/common.c                  |  19 +-
+ arch/arm/mach-footbridge/include/mach/dma-direct.h |   8 +
+ arch/arm/mach-footbridge/include/mach/memory.h     |   4 -
+ arch/arm/mach-highbank/highbank.c                  |   2 +-
+ arch/arm/mach-mvebu/coherency.c                    |   2 +-
+ arch/arm/mm/dma-mapping.c                          | 649 +++------------------
+ drivers/usb/core/hcd.c                             |  17 +-
+ drivers/usb/host/ohci-sa1111.c                     |  25 +
+ include/linux/swiotlb.h                            |   6 +-
+ kernel/dma/swiotlb.c                               | 239 ++++++--
+ 22 files changed, 346 insertions(+), 1478 deletions(-)
+ delete mode 100644 arch/arm/common/dmabounce.c
+ delete mode 100644 arch/arm/include/asm/dma-mapping.h
+ create mode 100644 arch/arm/mach-footbridge/include/mach/dma-direct.h
+Merging asm-generic/master (4313a24985f0 arch/*/: remove CONFIG_VIRT_TO_BUS)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master
+Auto-merging arch/parisc/Kconfig
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging drivers/tty/serial/qcom_geni_serial.c
+Auto-merging lib/Kconfig
+Auto-merging lib/Makefile
+Merge made by the 'ort' strategy.
+ Documentation/core-api/bus-virt-phys-mapping.rst   | 220 ---------------------
+ Documentation/core-api/dma-api-howto.rst           |  14 --
+ Documentation/core-api/index.rst                   |   1 -
+ .../translations/zh_CN/core-api/index.rst          |   1 -
+ arch/Kconfig                                       |   3 +
+ arch/alpha/Kconfig                                 |   1 -
+ arch/alpha/include/asm/floppy.h                    |   2 +-
+ arch/alpha/include/asm/io.h                        |   8 +-
+ arch/arm/kernel/irq.c                              |   3 +-
+ arch/arm64/Kconfig                                 |   1 +
+ arch/arm64/include/asm/io.h                        |  41 +---
+ arch/arm64/kvm/hyp/nvhe/Makefile                   |   7 +-
+ arch/ia64/Kconfig                                  |   1 -
+ arch/ia64/include/asm/io.h                         |   8 -
+ arch/m68k/Kconfig                                  |   1 -
+ arch/m68k/include/asm/virtconvert.h                |   4 +-
+ arch/microblaze/Kconfig                            |   1 -
+ arch/microblaze/include/asm/io.h                   |   2 -
+ arch/mips/Kconfig                                  |   1 -
+ arch/mips/include/asm/io.h                         |   9 -
+ arch/parisc/Kconfig                                |   1 -
+ arch/parisc/include/asm/floppy.h                   |   4 +-
+ arch/parisc/include/asm/io.h                       |   2 -
+ arch/parisc/kernel/irq.c                           |   2 +
+ arch/powerpc/Kconfig                               |   1 -
+ arch/powerpc/include/asm/io.h                      |   2 -
+ arch/powerpc/kernel/irq.c                          |   4 +
+ arch/riscv/include/asm/page.h                      |   1 -
+ arch/s390/include/asm/softirq_stack.h              |   3 +-
+ arch/sh/kernel/irq.c                               |   2 +
+ arch/sparc/kernel/irq_64.c                         |   2 +
+ arch/x86/Kconfig                                   |   1 -
+ arch/x86/include/asm/io.h                          |   9 -
+ arch/xtensa/Kconfig                                |   1 -
+ arch/xtensa/include/asm/io.h                       |   3 -
+ drivers/gpu/drm/meson/meson_viu.c                  |  22 +--
+ drivers/hwtracing/coresight/coresight-etm4x-core.c |   8 +-
+ drivers/hwtracing/coresight/coresight-etm4x.h      |   8 +-
+ drivers/irqchip/irq-tegra.c                        |  10 +-
+ drivers/soc/qcom/qcom-geni-se.c                    |   3 +
+ drivers/tty/serial/qcom_geni_serial.c              |   3 +
+ include/asm-generic/io.h                           | 105 ++++++++--
+ include/asm-generic/softirq_stack.h                |   2 +-
+ include/trace/events/rwmmio.h                      |  97 +++++++++
+ lib/Kconfig                                        |   7 +
+ lib/Makefile                                       |   2 +
+ lib/trace_readwrite.c                              |  47 +++++
+ mm/Kconfig                                         |   8 -
+ 48 files changed, 313 insertions(+), 376 deletions(-)
+ delete mode 100644 Documentation/core-api/bus-virt-phys-mapping.rst
+ create mode 100644 include/trace/events/rwmmio.h
+ create mode 100644 lib/trace_readwrite.c
+Merging arc/for-next (f2906aa86338 Linux 5.19-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next
+Already up to date.
+Merging arm/for-next (e035a96f2536 Merge branches 'misc' and 'fixes' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next
+Auto-merging arch/arm/Kconfig
+Merge made by the 'ort' strategy.
+ arch/arm/Kconfig         | 2 ++
+ arch/arm/mm/kasan_init.c | 6 +++++-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+Merging arm64/for-next/core (eff044f1b04e Merge branch 'for-next/boot' into for-next/core)
+$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging MAINTAINERS
+Auto-merging arch/Kconfig
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm64/include/asm/io.h
+Auto-merging arch/arm64/mm/hugetlbpage.c
+Auto-merging arch/x86/Kconfig
+Auto-merging include/asm-generic/io.h
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-devices-system-cpu |    3 +-
+ Documentation/admin-guide/kernel-parameters.txt    |    8 +-
+ Documentation/admin-guide/perf/hns3-pmu.rst        |  136 ++
+ Documentation/admin-guide/perf/index.rst           |    1 +
+ Documentation/arm64/memory.rst                     |   10 +-
+ Documentation/arm64/silicon-errata.rst             |    2 +
+ .../features/vm/ioremap_prot/arch-support.txt      |    2 +-
+ Documentation/memory-barriers.txt                  |   11 +-
+ Documentation/virt/kvm/arm/hyp-abi.rst             |   11 +-
+ MAINTAINERS                                        |    6 +
+ arch/Kconfig                                       |    3 +
+ arch/arm/include/asm/io.h                          |    4 +-
+ arch/arm/mm/ioremap.c                              |    9 +-
+ arch/arm/mm/nommu.c                                |    9 +-
+ arch/arm64/Kconfig                                 |   20 +
+ arch/arm64/boot/Makefile                           |    5 +-
+ arch/arm64/include/asm/asm-extable.h               |   79 +-
+ arch/arm64/include/asm/asm-uaccess.h               |   12 +-
+ arch/arm64/include/asm/asm_pointer_auth.h          |    4 +-
+ arch/arm64/include/asm/assembler.h                 |   35 +-
+ arch/arm64/include/asm/barrier.h                   |   12 +-
+ arch/arm64/include/asm/cache.h                     |   41 +-
+ arch/arm64/include/asm/cacheflush.h                |    7 -
+ arch/arm64/include/asm/cpu.h                       |    1 +
+ arch/arm64/include/asm/cpu_ops.h                   |    9 -
+ arch/arm64/include/asm/cpufeature.h                |    5 +-
+ arch/arm64/include/asm/cpuidle.h                   |   15 -
+ arch/arm64/include/asm/el2_setup.h                 |   60 -
+ arch/arm64/include/asm/fixmap.h                    |    4 +-
+ arch/arm64/include/asm/io.h                        |   24 +-
+ arch/arm64/include/asm/kernel-pgtable.h            |   18 +-
+ arch/arm64/include/asm/memory.h                    |    9 +
+ arch/arm64/include/asm/mmu_context.h               |   16 +-
+ arch/arm64/include/asm/pgtable.h                   |   10 +
+ arch/arm64/include/asm/processor.h                 |    3 +-
+ arch/arm64/include/asm/setup.h                     |    3 -
+ arch/arm64/include/asm/sysreg.h                    |  128 +-
+ arch/arm64/include/asm/uaccess.h                   |   94 +-
+ arch/arm64/include/asm/virt.h                      |   11 +-
+ arch/arm64/kernel/Makefile                         |    7 +-
+ arch/arm64/kernel/acpi.c                           |    2 +-
+ arch/arm64/kernel/alternative.c                    |    2 +-
+ arch/arm64/kernel/armv8_deprecated.c               |    9 +-
+ arch/arm64/kernel/cpu_errata.c                     |   10 +-
+ arch/arm64/kernel/cpufeature.c                     |  308 ++--
+ arch/arm64/kernel/cpuidle.c                        |   29 -
+ arch/arm64/kernel/cpuinfo.c                        |   52 +-
+ arch/arm64/kernel/entry.S                          |   53 +-
+ arch/arm64/kernel/fpsimd.c                         |    1 -
+ arch/arm64/kernel/head.S                           |  528 +++----
+ arch/arm64/kernel/hibernate.c                      |    5 -
+ arch/arm64/kernel/hyp-stub.S                       |  117 +-
+ arch/arm64/kernel/idreg-override.c                 |  106 +-
+ arch/arm64/kernel/image-vars.h                     |   59 +-
+ arch/arm64/kernel/kaslr.c                          |  149 +-
+ arch/arm64/kernel/kuser32.S                        |    1 +
+ arch/arm64/kernel/mte.c                            |    9 -
+ arch/arm64/kernel/pi/Makefile                      |   33 +
+ arch/arm64/kernel/pi/kaslr_early.c                 |  112 ++
+ arch/arm64/kernel/setup.c                          |   15 -
+ arch/arm64/kernel/signal.c                         |   20 +-
+ arch/arm64/kernel/sigreturn32.S                    |    1 +
+ arch/arm64/kernel/sleep.S                          |    3 +-
+ arch/arm64/kernel/stacktrace.c                     |   99 +-
+ arch/arm64/kernel/suspend.c                        |    2 +-
+ arch/arm64/kernel/traps.c                          |    6 +-
+ arch/arm64/kernel/vdso/Makefile                    |    8 +-
+ arch/arm64/kernel/vdso/vdso.lds.S                  |   16 +-
+ arch/arm64/kernel/vdso32/Makefile                  |    1 +
+ arch/arm64/kernel/vdso32/vdso.lds.S                |   27 +-
+ arch/arm64/kernel/vmlinux.lds.S                    |   22 +-
+ arch/arm64/kvm/hyp/include/nvhe/fixed_config.h     |   32 +-
+ arch/arm64/kvm/hyp/nvhe/sys_regs.c                 |   12 +-
+ arch/arm64/kvm/sys_regs.c                          |   14 +-
+ arch/arm64/lib/mte.S                               |    2 +-
+ arch/arm64/mm/cache.S                              |   41 -
+ arch/arm64/mm/copypage.c                           |    9 -
+ arch/arm64/mm/dma-mapping.c                        |   19 +-
+ arch/arm64/mm/extable.c                            |   10 +-
+ arch/arm64/mm/fault.c                              |    1 -
+ arch/arm64/mm/hugetlbpage.c                        |   10 -
+ arch/arm64/mm/init.c                               |    4 +-
+ arch/arm64/mm/ioremap.c                            |   90 +-
+ arch/arm64/mm/kasan_init.c                         |    4 +-
+ arch/arm64/mm/mmu.c                                |   78 +-
+ arch/arm64/mm/mteswap.c                            |    9 -
+ arch/arm64/mm/proc.S                               |  188 +--
+ arch/arm64/tools/cpucaps                           |    1 +
+ arch/arm64/tools/gen-sysreg.awk                    |    2 +-
+ arch/arm64/tools/sysreg                            |  264 ++++
+ arch/x86/Kconfig                                   |    1 +
+ arch/x86/Kconfig.debug                             |    3 -
+ drivers/cpuidle/Kconfig.arm                        |    3 +-
+ drivers/perf/arm-cci.c                             |   11 +-
+ drivers/perf/arm-ccn.c                             |    6 +-
+ drivers/perf/fsl_imx8_ddr_perf.c                   |    6 +-
+ drivers/perf/hisilicon/Kconfig                     |   10 +
+ drivers/perf/hisilicon/Makefile                    |    1 +
+ drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c      |   16 +-
+ drivers/perf/hisilicon/hisi_uncore_hha_pmu.c       |   16 +-
+ drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c       |   16 +-
+ drivers/perf/hisilicon/hisi_uncore_pa_pmu.c        |   16 +-
+ drivers/perf/hisilicon/hisi_uncore_pmu.c           |   18 +
+ drivers/perf/hisilicon/hisi_uncore_pmu.h           |    2 +
+ drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c      |   15 +-
+ drivers/perf/hisilicon/hns3_pmu.c                  | 1671 ++++++++++++++++++++
+ drivers/perf/marvell_cn10k_tad_pmu.c               |   12 +-
+ drivers/perf/riscv_pmu.c                           |    4 +-
+ drivers/perf/riscv_pmu_sbi.c                       |  101 +-
+ include/asm-generic/barrier.h                      |    8 +
+ include/asm-generic/io.h                           |   29 +-
+ include/linux/cpuhotplug.h                         |    1 +
+ include/linux/gfp.h                                |    2 +-
+ include/linux/perf/riscv_pmu.h                     |    4 +
+ mm/ioremap.c                                       |   26 +-
+ mm/kasan/common.c                                  |    3 +-
+ mm/page_alloc.c                                    |   19 +-
+ 117 files changed, 3842 insertions(+), 1620 deletions(-)
+ create mode 100644 Documentation/admin-guide/perf/hns3-pmu.rst
+ create mode 100644 arch/arm64/kernel/pi/Makefile
+ create mode 100644 arch/arm64/kernel/pi/kaslr_early.c
+ create mode 100644 drivers/perf/hisilicon/hns3_pmu.c
+Merging arm-perf/for-next/perf (aaaee7b55c9e docs: perf: Include hns3-pmu.rst in toctree to fix 'htmldocs' WARNING)
+$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf
+Already up to date.
+Merging arm-soc/for-next (f3eade9adec6 soc: document merges)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/boot/dts/bcm28155-ap.dts
+Auto-merging arch/arm/mach-bcm/Makefile
+CONFLICT (modify/delete): arch/arm/mach-bcm/bcm63xx.c deleted in arm-soc/for-next and modified in HEAD.  Version HEAD of arch/arm/mach-bcm/bcm63xx.c left in tree.
+Auto-merging arch/arm/mach-bcm/bcm_kona_smc.c
+Auto-merging arch/arm/mach-omap2/display.c
+Auto-merging arch/arm64/boot/dts/mediatek/mt6795.dtsi
+Auto-merging arch/arm64/boot/dts/mediatek/mt8173.dtsi
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/arm/mach-bcm/bcm63xx.c
+rm 'arch/arm/mach-bcm/bcm63xx.c'
+$ git commit --no-edit -v -a
+[master 5ff6bb6566ce] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/arm/google/chromebook-boot-flow.rst  |   69 +
+ Documentation/arm/index.rst                        |    2 +
+ Documentation/devicetree/bindings/arm/altera.yaml  |   10 +-
+ .../devicetree/bindings/arm/bcm/brcm,bcm4708.yaml  |    7 +
+ .../devicetree/bindings/arm/bcm/brcm,bcmbca.yaml   |   92 +
+ .../devicetree/bindings/arm/freescale/fsl,scu.txt  |  271 ---
+ Documentation/devicetree/bindings/arm/fsl.yaml     |   61 +-
+ .../devicetree/bindings/arm/mediatek.yaml          |   30 +
+ .../bindings/arm/mediatek/mediatek,pericfg.yaml    |    1 +
+ Documentation/devicetree/bindings/arm/qcom.yaml    |  332 ++-
+ .../devicetree/bindings/arm/rockchip.yaml          |    5 +
+ .../bindings/arm/samsung/samsung-soc.yaml          |   40 +
+ .../devicetree/bindings/arm/stm32/stm32.yaml       |    8 +-
+ Documentation/devicetree/bindings/arm/sunxi.yaml   |   10 +
+ .../arm/sunxi/allwinner,sun4i-a10-mbus.yaml        |   24 +-
+ .../arm/tegra/nvidia,tegra-ccplex-cluster.yaml     |    1 -
+ .../arm/tegra/nvidia,tegra194-axi2apb.yaml         |   40 +
+ .../bindings/arm/tegra/nvidia,tegra194-cbb.yaml    |   97 +
+ .../bindings/arm/tegra/nvidia,tegra234-cbb.yaml    |   74 +
+ .../clock/allwinner,sun8i-a83t-de2-clk.yaml        |    3 +
+ .../devicetree/bindings/clock/fsl,scu-clk.yaml     |   43 +
+ .../bindings/clock/qcom,dispcc-sm8x50.yaml         |    6 +-
+ .../bindings/clock/qcom,gpucc-sm8350.yaml          |   72 +
+ .../bindings/clock/qcom,sm8450-camcc.yaml          |   80 +
+ .../bindings/clock/samsung,exynos7885-clock.yaml   |   27 +
+ .../devicetree/bindings/clock/st,stm32mp1-rcc.yaml |    1 +
+ .../devicetree/bindings/firmware/arm,scmi.yaml     |   10 +
+ .../devicetree/bindings/firmware/fsl,scu.yaml      |  210 ++
+ .../devicetree/bindings/firmware/qcom,scm.txt      |    4 +
+ .../devicetree/bindings/gpio/gpio-zynq.yaml        |   59 +-
+ .../bindings/{arm => hwinfo}/renesas,prr.yaml      |    4 +-
+ .../bindings/i2c/marvell,mv64xxx-i2c.yaml          |   10 +-
+ .../devicetree/bindings/input/fsl,scu-key.yaml     |   40 +
+ .../bindings/interconnect/qcom,msm8998-bwmon.yaml  |   86 +
+ .../memory-controllers/mediatek,smi-common.yaml    |    1 +
+ .../memory-controllers/mediatek,smi-larb.yaml      |    1 +
+ .../bindings/net/allwinner,sun8i-a83t-emac.yaml    |    1 +
+ .../bindings/net/pcs/renesas,rzn1-miic.yaml        |  171 ++
+ .../devicetree/bindings/nvmem/fsl,scu-ocotp.yaml   |   56 +
+ .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml       |   18 +-
+ .../bindings/pinctrl/fsl,scu-pinctrl.yaml          |   74 +
+ .../devicetree/bindings/power/fsl,scu-pd.yaml      |   41 +
+ .../bindings/power/mediatek,power-controller.yaml  |    2 +
+ .../devicetree/bindings/rtc/fsl,scu-rtc.yaml       |   31 +
+ .../bindings/soc/bcm/brcm,bcm2835-pm.txt           |   46 -
+ .../bindings/soc/bcm/brcm,bcm2835-pm.yaml          |   86 +
+ .../devicetree/bindings/soc/mediatek/devapc.yaml   |    1 +
+ .../{display => soc}/mediatek/mediatek,mutex.yaml  |   14 +-
+ .../devicetree/bindings/soc/mediatek/mtk-svs.yaml  |   91 +
+ .../devicetree/bindings/soc/qcom/qcom,wcnss.yaml   |    1 -
+ .../bindings/soc/samsung/exynos-pmu.yaml           |   13 +-
+ .../bindings/soc/samsung/exynos-usi.yaml           |    8 +-
+ .../devicetree/bindings/soc/ti/ti,pruss.yaml       |    5 +-
+ .../bindings/thermal/fsl,scu-thermal.yaml          |   38 +
+ .../bindings/timer/nvidia,tegra186-timer.yaml      |  109 +
+ .../bindings/usb/allwinner,sun4i-a10-musb.yaml     |    1 +
+ .../devicetree/bindings/usb/atmel-usb.txt          |    3 +
+ .../devicetree/bindings/usb/generic-ehci.yaml      |    1 +
+ .../devicetree/bindings/usb/generic-ohci.yaml      |    1 +
+ .../devicetree/bindings/vendor-prefixes.yaml       |    2 +
+ .../devicetree/bindings/watchdog/fsl,scu-wdt.yaml  |   34 +
+ MAINTAINERS                                        |   35 +-
+ arch/arm/Kconfig.debug                             |    2 +-
+ arch/arm/arm-soc-for-next-contents.txt             |  188 ++
+ arch/arm/boot/dts/Makefile                         |   23 +-
+ arch/arm/boot/dts/alpine.dtsi                      |    2 +-
+ arch/arm/boot/dts/am335x-boneblack-wireless.dts    |    2 +-
+ arch/arm/boot/dts/am335x-boneblack.dts             |    4 +
+ arch/arm/boot/dts/am335x-boneblue.dts              |    2 +-
+ arch/arm/boot/dts/am335x-bonegreen-wireless.dts    |    2 +-
+ arch/arm/boot/dts/am335x-cm-t335.dts               |    4 +-
+ arch/arm/boot/dts/am335x-evm.dts                   |    8 +-
+ arch/arm/boot/dts/am335x-guardian.dts              |    2 -
+ arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi  |    4 +-
+ arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi  |    4 +-
+ arch/arm/boot/dts/am335x-pcm-953.dtsi              |    4 +-
+ arch/arm/boot/dts/am335x-pepper.dts                |    8 +-
+ .../boot/dts/am335x-sancloud-bbe-extended-wifi.dts |    2 +-
+ arch/arm/boot/dts/am335x-shc.dts                   |    6 +-
+ arch/arm/boot/dts/am3517-evm-ui.dtsi               |   26 +-
+ arch/arm/boot/dts/am3517-evm.dts                   |   18 +-
+ arch/arm/boot/dts/am3874-iceboard.dts              |    4 +-
+ arch/arm/boot/dts/am437x-idk-evm.dts               |    6 +-
+ arch/arm/boot/dts/am437x-l4.dtsi                   |    2 +-
+ arch/arm/boot/dts/animeo_ip.dts                    |   10 +-
+ arch/arm/boot/dts/armada-370-c200-v2.dts           |    8 +-
+ arch/arm/boot/dts/armada-370-rd.dts                |    2 -
+ arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi |    8 +-
+ .../dts/armada-370-seagate-personal-cloud.dtsi     |    8 +-
+ arch/arm/boot/dts/armada-381-netgear-gs110emx.dts  |    2 +-
+ arch/arm/boot/dts/armada-385-clearfog-gtr.dtsi     |    4 +-
+ arch/arm/boot/dts/armada-385-linksys.dtsi          |    4 +-
+ arch/arm/boot/dts/armada-388-clearfog-base.dts     |    2 +-
+ arch/arm/boot/dts/armada-388-clearfog.dts          |    2 +-
+ arch/arm/boot/dts/armada-xp-axpwifiap.dts          |    6 +-
+ arch/arm/boot/dts/armada-xp-linksys-mamba.dts      |    8 +-
+ arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts   |    6 +-
+ arch/arm/boot/dts/aspeed-ast2500-evb.dts           |    2 +-
+ arch/arm/boot/dts/aspeed-ast2600-evb-a1.dts        |    1 +
+ arch/arm/boot/dts/aspeed-ast2600-evb.dts           |    2 +-
+ arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts     |   30 +-
+ arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts   |   48 +-
+ arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts       |   10 +-
+ arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts       |   14 +-
+ arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts   |   22 +-
+ arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts        |   23 +-
+ arch/arm/boot/dts/aspeed-bmc-opp-mowgli.dts        |   20 +-
+ arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts        |    2 +-
+ arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts      |    2 +-
+ arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts       |    2 +-
+ arch/arm/boot/dts/aspeed-bmc-opp-swift.dts         |   30 +-
+ arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts        |   14 +-
+ arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts        |    4 +-
+ arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts   |   16 +-
+ arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts         |    4 +-
+ arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts  |    6 +-
+ arch/arm/boot/dts/aspeed-bmc-quanta-s6q.dts        |    6 +-
+ arch/arm/boot/dts/at91-foxg20.dts                  |    4 +-
+ arch/arm/boot/dts/at91-gatwick.dts                 |    2 +-
+ arch/arm/boot/dts/at91-kizbox.dts                  |    8 +-
+ arch/arm/boot/dts/at91-kizbox2-common.dtsi         |   10 +-
+ arch/arm/boot/dts/at91-kizbox3-hs.dts              |   14 +-
+ arch/arm/boot/dts/at91-kizboxmini-common.dtsi      |    6 +-
+ arch/arm/boot/dts/at91-nattis-2-natte-2.dts        |    2 +-
+ arch/arm/boot/dts/at91-qil_a9260.dts               |    4 +-
+ arch/arm/boot/dts/at91-sam9x60ek.dts               |    7 +-
+ arch/arm/boot/dts/at91-sama5d27_som1.dtsi          |    4 +-
+ arch/arm/boot/dts/at91-sama5d27_som1_ek.dts        |    8 +-
+ arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi        |    2 +
+ arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts      |    7 +-
+ arch/arm/boot/dts/at91-sama5d2_icp.dts             |    9 +-
+ arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts          |   12 +-
+ arch/arm/boot/dts/at91-sama5d2_xplained.dts        |   12 +-
+ arch/arm/boot/dts/at91-sama5d3_xplained.dts        |    4 +-
+ arch/arm/boot/dts/at91-sama5d4_xplained.dts        |    4 +-
+ arch/arm/boot/dts/at91-sama5d4ek.dts               |    4 +-
+ arch/arm/boot/dts/at91-sama7g5ek.dts               |    4 +-
+ arch/arm/boot/dts/at91-wb45n.dts                   |    7 +-
+ arch/arm/boot/dts/at91-wb50n.dts                   |   10 +-
+ arch/arm/boot/dts/at91sam9260.dtsi                 |    2 +-
+ arch/arm/boot/dts/at91sam9260ek.dts                |    6 +-
+ arch/arm/boot/dts/at91sam9261.dtsi                 |    2 +-
+ arch/arm/boot/dts/at91sam9261ek.dts                |   10 +-
+ arch/arm/boot/dts/at91sam9263.dtsi                 |    2 +-
+ arch/arm/boot/dts/at91sam9263ek.dts                |    6 +-
+ arch/arm/boot/dts/at91sam9g20ek_common.dtsi        |    6 +-
+ .../boot/dts/at91sam9g25-gardena-smart-gateway.dts |    2 +-
+ arch/arm/boot/dts/at91sam9g45.dtsi                 |    2 +-
+ arch/arm/boot/dts/at91sam9m10g45ek.dts             |   16 +-
+ arch/arm/boot/dts/at91sam9n12.dtsi                 |    2 +-
+ arch/arm/boot/dts/at91sam9n12ek.dts                |    4 +-
+ arch/arm/boot/dts/at91sam9rl.dtsi                  |    2 +-
+ arch/arm/boot/dts/at91sam9rlek.dts                 |    6 +-
+ arch/arm/boot/dts/at91sam9x5.dtsi                  |    2 +-
+ arch/arm/boot/dts/axm5516-cpus.dtsi                |   32 +-
+ arch/arm/boot/dts/bcm2711-rpi.dtsi                 |    4 +
+ arch/arm/boot/dts/bcm2711.dtsi                     |   14 +-
+ arch/arm/boot/dts/bcm28155-ap.dts                  |    8 +-
+ arch/arm/boot/dts/bcm2835-common.dtsi              |    1 +
+ arch/arm/boot/dts/bcm283x.dtsi                     |    8 +-
+ arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts        |    6 +-
+ arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts        |    8 +-
+ .../dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi    |   10 +-
+ arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts  |   10 +-
+ arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts    |    4 +-
+ arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts    |    4 +-
+ arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts       |    2 +-
+ arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts       |    2 +-
+ arch/arm/boot/dts/bcm4708-netgear-r6250.dts        |    6 +-
+ arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts     |    6 +-
+ arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts      |    6 +-
+ arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts        |    4 +-
+ arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts |    8 +-
+ arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts  |    2 +-
+ arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts      |    2 +-
+ arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts      |    2 +-
+ arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts |    4 +-
+ arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts        |    6 +-
+ arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts  |   14 +-
+ arch/arm/boot/dts/bcm4709-linksys-ea9200.dts       |    6 +-
+ arch/arm/boot/dts/bcm4709-netgear-r7000.dts        |    8 +-
+ arch/arm/boot/dts/bcm4709-netgear-r8000.dts        |   10 +-
+ arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts  |    6 +-
+ arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts       |    8 +-
+ arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts      |    6 +-
+ arch/arm/boot/dts/bcm47094-linksys-panamera.dts    |    6 +-
+ arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts      |    2 +-
+ arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts      |    2 +-
+ arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts      |    2 +-
+ arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts      |    4 +-
+ arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts      |    2 +-
+ arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts   |    2 +-
+ arch/arm/boot/dts/bcm47094-netgear-r8500.dts       |    8 +-
+ arch/arm/boot/dts/bcm47094-phicomm-k3.dts          |    2 +-
+ arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts      |    2 +-
+ arch/arm/boot/dts/bcm47189-luxul-xap-810.dts       |    2 +-
+ arch/arm/boot/dts/bcm47189-tenda-ac9.dts           |    6 +-
+ arch/arm/boot/dts/bcm47622.dtsi                    |   14 +-
+ arch/arm/boot/dts/bcm53015-meraki-mr26.dts         |  166 ++
+ arch/arm/boot/dts/bcm53016-meraki-mr32.dts         |    4 +-
+ arch/arm/boot/dts/bcm5301x.dtsi                    |    6 +-
+ arch/arm/boot/dts/bcm63138.dtsi                    |    4 +-
+ arch/arm/boot/dts/bcm63148.dtsi                    |  103 +
+ arch/arm/boot/dts/bcm63178.dtsi                    |  118 +
+ arch/arm/boot/dts/bcm6756.dtsi                     |  130 ++
+ arch/arm/boot/dts/bcm6846.dtsi                     |  103 +
+ arch/arm/boot/dts/bcm6855.dtsi                     |  120 +
+ arch/arm/boot/dts/bcm6878.dtsi                     |  110 +
+ arch/arm/boot/dts/bcm911360_entphn.dts             |    4 +-
+ arch/arm/boot/dts/bcm947189acdbmr.dts              |    4 +-
+ arch/arm/boot/dts/bcm953012er.dts                  |    4 +-
+ arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi      |    2 +-
+ arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi    |    2 +-
+ arch/arm/boot/dts/bcm963138.dts                    |   27 +
+ arch/arm/boot/dts/bcm963138dvt.dts                 |    2 +-
+ arch/arm/boot/dts/bcm963148.dts                    |   30 +
+ arch/arm/boot/dts/bcm963178.dts                    |   30 +
+ arch/arm/boot/dts/bcm96756.dts                     |   30 +
+ arch/arm/boot/dts/bcm96846.dts                     |   30 +
+ arch/arm/boot/dts/bcm96855.dts                     |   30 +
+ arch/arm/boot/dts/bcm96878.dts                     |   30 +
+ arch/arm/boot/dts/da850-evm.dts                    |   18 +-
+ arch/arm/boot/dts/da850.dtsi                       |   12 +-
+ arch/arm/boot/dts/dm8148-evm.dts                   |    2 +-
+ arch/arm/boot/dts/dm8168-evm.dts                   |    2 +-
+ arch/arm/boot/dts/dra62x-j5eco-evm.dts             |    2 +-
+ arch/arm/boot/dts/dra76x.dtsi                      |    6 +-
+ arch/arm/boot/dts/e60k02.dtsi                      |    4 +-
+ arch/arm/boot/dts/e70k02.dtsi                      |    8 +-
+ arch/arm/boot/dts/ecx-common.dtsi                  |   10 +-
+ arch/arm/boot/dts/en7523-evb.dts                   |    8 +
+ arch/arm/boot/dts/en7523.dtsi                      |   66 +
+ arch/arm/boot/dts/exynos-pinctrl.h                 |   55 +
+ arch/arm/boot/dts/exynos3250-artik5.dtsi           |    2 +-
+ arch/arm/boot/dts/exynos3250-pinctrl.dtsi          |    2 +-
+ arch/arm/boot/dts/exynos3250.dtsi                  |    6 +-
+ arch/arm/boot/dts/exynos4.dtsi                     |    8 +-
+ arch/arm/boot/dts/exynos4210-i9100.dts             |    8 +-
+ arch/arm/boot/dts/exynos4210-origen.dts            |   12 +-
+ arch/arm/boot/dts/exynos4210-pinctrl.dtsi          |    2 +-
+ arch/arm/boot/dts/exynos4210-trats.dts             |    2 +-
+ arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi        |    8 +-
+ arch/arm/boot/dts/exynos4412-itop-elite.dts        |   15 +-
+ arch/arm/boot/dts/exynos4412-midas.dtsi            |    3 +-
+ arch/arm/boot/dts/exynos4412-odroidu3.dts          |    4 +-
+ arch/arm/boot/dts/exynos4412-odroidx.dts           |    5 +-
+ arch/arm/boot/dts/exynos4412-p4note.dtsi           |   86 +-
+ arch/arm/boot/dts/exynos4412-pinctrl.dtsi          |    2 +-
+ arch/arm/boot/dts/exynos4412-tiny4412.dts          |    3 +
+ arch/arm/boot/dts/exynos5.dtsi                     |    2 +-
+ arch/arm/boot/dts/exynos5250-arndale.dts           |   12 +-
+ arch/arm/boot/dts/exynos5250-pinctrl.dtsi          |    2 +-
+ arch/arm/boot/dts/exynos5250-snow-common.dtsi      |    2 +-
+ arch/arm/boot/dts/exynos5250-spring.dts            |    2 +-
+ arch/arm/boot/dts/exynos5260-pinctrl.dtsi          |    2 +-
+ arch/arm/boot/dts/exynos5410-pinctrl.dtsi          |    2 +-
+ arch/arm/boot/dts/exynos5420-arndale-octa.dts      |    2 +-
+ arch/arm/boot/dts/exynos5420-peach-pit.dts         |    2 +-
+ arch/arm/boot/dts/exynos5420-pinctrl.dtsi          |    2 +-
+ arch/arm/boot/dts/exynos5422-odroidhc1.dts         |    4 +-
+ arch/arm/boot/dts/exynos5422-odroidxu4.dts         |    4 +-
+ arch/arm/boot/dts/exynos54xx-odroidxu-leds.dtsi    |    8 +-
+ arch/arm/boot/dts/exynos5800-peach-pi.dts          |    2 +-
+ arch/arm/boot/dts/imx25.dtsi                       |    2 +-
+ arch/arm/boot/dts/imx27.dtsi                       |    6 +-
+ arch/arm/boot/dts/imx31.dtsi                       |    4 +-
+ arch/arm/boot/dts/imx50.dtsi                       |    6 +-
+ arch/arm/boot/dts/imx51-ts4800.dts                 |    2 +-
+ arch/arm/boot/dts/imx51.dtsi                       |    6 +-
+ arch/arm/boot/dts/imx53.dtsi                       |    6 +-
+ arch/arm/boot/dts/imx6dl-plym2m.dts                |    2 +-
+ arch/arm/boot/dts/imx6dl-prtvt7.dts                |    2 +-
+ arch/arm/boot/dts/imx6dl-victgo.dts                |    2 +-
+ arch/arm/boot/dts/imx6dl.dtsi                      |    2 +-
+ arch/arm/boot/dts/imx6q-apalis-eval.dts            |  127 +-
+ arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts      |  263 +--
+ arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts      |  276 +++
+ arch/arm/boot/dts/imx6q-apalis-ixora.dts           |  113 +-
+ arch/arm/boot/dts/imx6q-bosch-acc.dts              |    4 +-
+ .../boot/dts/imx6q-skov-reve-mi1010ait-1cp1.dts    |    6 +
+ arch/arm/boot/dts/imx6q.dtsi                       |    4 +-
+ arch/arm/boot/dts/imx6qdl-apalis.dtsi              |  638 +++++-
+ arch/arm/boot/dts/imx6qdl-colibri.dtsi             |   19 +-
+ arch/arm/boot/dts/imx6qdl-prti6q.dtsi              |    3 +
+ arch/arm/boot/dts/imx6qdl-skov-cpu-revc.dtsi       |    4 +-
+ arch/arm/boot/dts/imx6qdl-skov-cpu.dtsi            |   10 +
+ arch/arm/boot/dts/imx6qdl.dtsi                     |    6 +-
+ arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts       |   10 +-
+ arch/arm/boot/dts/imx6sx.dtsi                      |    2 +-
+ arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi      |    1 -
+ arch/arm/boot/dts/imx6ul-phytec-segin.dtsi         |    5 -
+ arch/arm/boot/dts/imx6ul-tqma6ul2l.dtsi            |    2 +-
+ arch/arm/boot/dts/imx6ul.dtsi                      |   36 +-
+ arch/arm/boot/dts/imx6ull-colibri.dtsi             |    1 -
+ arch/arm/boot/dts/imx6ull-tqma6ull2.dtsi           |    2 +-
+ arch/arm/boot/dts/imx6ull-tqma6ull2l.dtsi          |    2 +-
+ arch/arm/boot/dts/imx6ull.dtsi                     |    2 +-
+ arch/arm/boot/dts/imx6ulz-bsh-smm-m2.dts           |    4 +
+ arch/arm/boot/dts/imx7-colibri-aster.dtsi          |  142 +-
+ arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi        |  156 +-
+ arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi        |  112 +
+ arch/arm/boot/dts/imx7-colibri-iris.dtsi           |  108 +
+ arch/arm/boot/dts/imx7-colibri.dtsi                |  830 ++++---
+ arch/arm/boot/dts/imx7d-colibri-aster.dts          |   30 +-
+ arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts     |   10 +-
+ arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts   |   10 +-
+ arch/arm/boot/dts/imx7d-colibri-emmc-iris-v2.dts   |   21 +
+ arch/arm/boot/dts/imx7d-colibri-emmc-iris.dts      |   21 +
+ arch/arm/boot/dts/imx7d-colibri-emmc.dtsi          |   17 +-
+ arch/arm/boot/dts/imx7d-colibri-eval-v3.dts        |   45 +-
+ arch/arm/boot/dts/imx7d-colibri-iris-v2.dts        |   83 +
+ arch/arm/boot/dts/imx7d-colibri-iris.dts           |   56 +
+ arch/arm/boot/dts/imx7d-colibri.dtsi               |   13 +-
+ arch/arm/boot/dts/imx7d-sdb.dts                    |    2 +-
+ arch/arm/boot/dts/imx7d-smegw01.dts                |    4 +-
+ arch/arm/boot/dts/imx7d.dtsi                       |    2 +-
+ arch/arm/boot/dts/imx7s-colibri-aster.dts          |   27 +-
+ arch/arm/boot/dts/imx7s-colibri-eval-v3.dts        |   43 +-
+ arch/arm/boot/dts/imx7s-colibri-iris-v2.dts        |   78 +
+ arch/arm/boot/dts/imx7s-colibri-iris.dts           |   51 +
+ arch/arm/boot/dts/imx7s-colibri.dtsi               |    5 +-
+ arch/arm/boot/dts/imx7s.dtsi                       |    2 +-
+ arch/arm/boot/dts/imxrt1050.dtsi                   |    4 +-
+ arch/arm/boot/dts/keystone-k2e-netcp.dtsi          |   26 +-
+ arch/arm/boot/dts/keystone-k2e.dtsi                |    6 +-
+ arch/arm/boot/dts/keystone-k2g-netcp.dtsi          |    2 +-
+ arch/arm/boot/dts/keystone-k2g.dtsi                |   18 +-
+ arch/arm/boot/dts/keystone-k2hk-netcp.dtsi         |   12 +-
+ arch/arm/boot/dts/keystone-k2hk.dtsi               |    4 +-
+ arch/arm/boot/dts/keystone-k2l-netcp.dtsi          |   18 +-
+ arch/arm/boot/dts/keystone-k2l.dtsi                |    8 +-
+ arch/arm/boot/dts/keystone.dtsi                    |   18 +-
+ .../boot/dts/lan966x-kontron-kswitch-d10-mmt.dtsi  |   13 +
+ arch/arm/boot/dts/lan966x-pcb8291.dts              |   18 +-
+ arch/arm/boot/dts/lan966x.dtsi                     |   26 +
+ arch/arm/boot/dts/lpc18xx.dtsi                     |    6 +-
+ arch/arm/boot/dts/ls1021a-iot.dts                  |    2 +-
+ arch/arm/boot/dts/ls1021a.dtsi                     |    7 +
+ arch/arm/boot/dts/meson.dtsi                       |    4 +-
+ arch/arm/boot/dts/meson8.dtsi                      |    2 +-
+ arch/arm/boot/dts/meson8b.dtsi                     |    2 +-
+ arch/arm/boot/dts/mt2701.dtsi                      |    8 +-
+ arch/arm/boot/dts/mt7623.dtsi                      |    6 +-
+ arch/arm/boot/dts/mt7623a-rfb-emmc.dts             |    4 +-
+ arch/arm/boot/dts/mt7623a-rfb-nand.dts             |    4 +-
+ arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts      |    4 +-
+ arch/arm/boot/dts/mt7623n-rfb-emmc.dts             |    4 +-
+ arch/arm/boot/dts/mt7629-rfb.dts                   |    4 +-
+ arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi      |    2 +-
+ arch/arm/boot/dts/nuvoton-npcm750.dtsi             |    2 +-
+ arch/arm/boot/dts/omap2420-h4.dts                  |    2 +-
+ arch/arm/boot/dts/omap3-evm-37xx.dts               |    2 +-
+ arch/arm/boot/dts/omap3-evm.dts                    |    2 +-
+ arch/arm/boot/dts/omap3-gta04.dtsi                 |    2 +-
+ arch/arm/boot/dts/omap3-igep.dtsi                  |    2 +-
+ arch/arm/boot/dts/omap3-ldp.dts                    |    6 +-
+ arch/arm/boot/dts/omap3-lilly-a83x.dtsi            |    2 +-
+ arch/arm/boot/dts/omap3-n900.dts                   |    4 +-
+ arch/arm/boot/dts/omap3-n950-n9.dtsi               |    4 +-
+ arch/arm/boot/dts/omap3-overo-base.dtsi            |    2 +-
+ arch/arm/boot/dts/omap3-pandora-common.dtsi        |    2 +-
+ arch/arm/boot/dts/omap3430-sdp.dts                 |    6 +-
+ arch/arm/boot/dts/omap5-l4.dtsi                    |    2 +-
+ arch/arm/boot/dts/pxa300-raumfeld-common.dtsi      |   10 +-
+ arch/arm/boot/dts/qcom-apq8060-dragonboard.dts     |   25 +-
+ arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts |   24 +-
+ arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts        |   14 +-
+ arch/arm/boot/dts/qcom-apq8064-ifc6410.dts         |   25 +-
+ .../dts/qcom-apq8064-sony-xperia-lagan-yuga.dts    |   10 +-
+ arch/arm/boot/dts/qcom-apq8064.dtsi                |  162 +-
+ arch/arm/boot/dts/qcom-apq8084.dtsi                |   10 +-
+ arch/arm/boot/dts/qcom-ipq4018-ap120c-ac-bit.dts   |    6 +
+ arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dts       |    7 +
+ arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dtsi      |    2 +-
+ arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi      |    2 +-
+ arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1-c1.dts    |    2 +-
+ arch/arm/boot/dts/qcom-ipq4019.dtsi                |    4 +-
+ arch/arm/boot/dts/qcom-ipq8064-rb3011.dts          |    6 +-
+ arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi           |    9 +-
+ arch/arm/boot/dts/qcom-ipq8064.dtsi                |   36 +-
+ arch/arm/boot/dts/qcom-mdm9615-wp8548.dtsi         |    2 +-
+ arch/arm/boot/dts/qcom-mdm9615.dtsi                |    7 +-
+ arch/arm/boot/dts/qcom-msm8226.dtsi                |    6 +-
+ arch/arm/boot/dts/qcom-msm8660.dtsi                |  112 +-
+ arch/arm/boot/dts/qcom-msm8960.dtsi                |   54 +-
+ .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts     |   12 +-
+ .../boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi   |   10 +-
+ arch/arm/boot/dts/qcom-msm8974.dtsi                |   49 +-
+ .../arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts |   14 +-
+ arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts |   20 +-
+ .../qcom-msm8974pro-sony-xperia-shinano-castor.dts |   18 +-
+ arch/arm/boot/dts/qcom-pm8841.dtsi                 |    1 +
+ arch/arm/boot/dts/qcom-pm8941.dtsi                 |    2 +-
+ arch/arm/boot/dts/qcom-pmx55.dtsi                  |    1 +
+ arch/arm/boot/dts/qcom-pmx65.dtsi                  |    3 +-
+ arch/arm/boot/dts/qcom-sdx55.dtsi                  |    8 +-
+ arch/arm/boot/dts/qcom-sdx65-mtp.dts               |   61 +-
+ arch/arm/boot/dts/qcom-sdx65.dtsi                  |  271 ++-
+ arch/arm/boot/dts/r7s9210-rza2mevb.dts             |    4 +-
+ arch/arm/boot/dts/r8a7790-lager.dts                |    2 +-
+ arch/arm/boot/dts/r8a7790-stout.dts                |    2 +-
+ arch/arm/boot/dts/r8a7791-koelsch.dts              |    2 +-
+ arch/arm/boot/dts/r8a7791-porter.dts               |    2 +-
+ arch/arm/boot/dts/r8a7792-blanche.dts              |    2 +-
+ arch/arm/boot/dts/r8a7793-gose.dts                 |    2 +-
+ arch/arm/boot/dts/r8a7794-alt.dts                  |    2 +-
+ arch/arm/boot/dts/r8a7794-silk.dts                 |    2 +-
+ arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi     |   39 -
+ arch/arm/boot/dts/r9a06g032-rzn1d400-db.dts        |  119 +
+ arch/arm/boot/dts/r9a06g032.dtsi                   |  108 +
+ arch/arm/boot/dts/rk3066a-bqcurie2.dts             |    4 +-
+ arch/arm/boot/dts/rk3066a-mk808.dts                |   18 +
+ arch/arm/boot/dts/rk3066a-rayeager.dts             |    2 +-
+ arch/arm/boot/dts/rk3188-bqedison2qc.dts           |    4 +-
+ arch/arm/boot/dts/rk3188-px3-evb.dts               |    2 +-
+ arch/arm/boot/dts/rk3188-radxarock.dts             |    2 +-
+ arch/arm/boot/dts/rk3229-evb.dts                   |    2 +-
+ arch/arm/boot/dts/rk3288-evb.dtsi                  |    2 +-
+ arch/arm/boot/dts/rk3288-firefly-reload.dts        |    2 +-
+ arch/arm/boot/dts/rk3288-firefly.dtsi              |    2 +-
+ arch/arm/boot/dts/rk3288-phycore-rdk.dts           |    4 +-
+ arch/arm/boot/dts/rk3288-popmetal.dts              |    2 +-
+ arch/arm/boot/dts/rk3288-r89.dts                   |    2 +-
+ arch/arm/boot/dts/rk3288-rock2-square.dts          |    2 +-
+ arch/arm/boot/dts/rk3288-tinker.dtsi               |    4 +-
+ .../boot/dts/rk3288-veyron-broadcom-bluetooth.dtsi |   10 +-
+ arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi    |    2 +-
+ arch/arm/boot/dts/rk3288-veyron-minnie.dts         |    4 +-
+ arch/arm/boot/dts/rk3288-veyron-pinky.dts          |    2 +-
+ arch/arm/boot/dts/rk3288-veyron.dtsi               |    2 +-
+ arch/arm/boot/dts/rv1108-elgin-r1.dts              |   14 +-
+ arch/arm/boot/dts/rv1108-evb.dts                   |   14 +-
+ arch/arm/boot/dts/rv1108.dtsi                      |    2 +-
+ arch/arm/boot/dts/s3c2410-pinctrl.h                |   19 +
+ arch/arm/boot/dts/s3c2416-pinctrl.dtsi             |   38 +-
+ arch/arm/boot/dts/s3c2416.dtsi                     |    4 +-
+ arch/arm/boot/dts/s3c64xx-pinctrl.dtsi             |  178 +-
+ arch/arm/boot/dts/s3c64xx-pinctrl.h                |   27 +
+ arch/arm/boot/dts/s3c64xx.dtsi                     |    6 +-
+ arch/arm/boot/dts/s5pv210-aquila.dts               |    4 +-
+ arch/arm/boot/dts/s5pv210-aries.dtsi               |  134 +-
+ arch/arm/boot/dts/s5pv210-fascinate4g.dts          |   28 +-
+ arch/arm/boot/dts/s5pv210-galaxys.dts              |   42 +-
+ arch/arm/boot/dts/s5pv210-pinctrl.dtsi             |  480 ++--
+ arch/arm/boot/dts/s5pv210-pinctrl.h                |   39 +
+ arch/arm/boot/dts/s5pv210.dtsi                     |    8 +-
+ arch/arm/boot/dts/sam9x60.dtsi                     |    4 +-
+ arch/arm/boot/dts/sama5d2.dtsi                     |   24 +-
+ arch/arm/boot/dts/sama5d3.dtsi                     |    2 +-
+ arch/arm/boot/dts/sama5d4.dtsi                     |    2 +-
+ arch/arm/boot/dts/sama7g5.dtsi                     |    7 +
+ arch/arm/boot/dts/sd5203.dts                       |    2 +-
+ arch/arm/boot/dts/socfpga_arria10.dtsi             |   10 +
+ arch/arm/boot/dts/socfpga_arria10_chameleonv3.dts  |   90 +
+ ...ry_aa1.dts => socfpga_arria10_mercury_aa1.dtsi} |   48 +-
+ arch/arm/boot/dts/spear1310-evb.dts                |    2 +-
+ arch/arm/boot/dts/spear1340-evb.dts                |    2 +-
+ arch/arm/boot/dts/spear1340.dtsi                   |    2 +-
+ arch/arm/boot/dts/spear300-evb.dts                 |    2 +-
+ arch/arm/boot/dts/spear310-evb.dts                 |    2 +-
+ arch/arm/boot/dts/spear320-evb.dts                 |    2 +-
+ arch/arm/boot/dts/spear320-hmi.dts                 |    2 +-
+ arch/arm/boot/dts/spear320.dtsi                    |    2 +-
+ arch/arm/boot/dts/ste-ab8500.dtsi                  |    6 +-
+ arch/arm/boot/dts/ste-dbx5x0.dtsi                  |    5 -
+ arch/arm/boot/dts/ste-hrefv60plus.dtsi             |    4 +-
+ arch/arm/boot/dts/ste-ux500-samsung-codina.dts     |    4 +-
+ arch/arm/boot/dts/ste-ux500-samsung-gavini.dts     |    4 +-
+ arch/arm/boot/dts/ste-ux500-samsung-janice.dts     |    4 +-
+ arch/arm/boot/dts/stih407-family.dtsi              |  176 +-
+ arch/arm/boot/dts/stih407.dtsi                     |    4 +-
+ arch/arm/boot/dts/stih410.dtsi                     |    4 +-
+ arch/arm/boot/dts/stihxxx-b2120.dtsi               |    8 +-
+ arch/arm/boot/dts/stm32429i-eval.dts               |    8 +-
+ arch/arm/boot/dts/stm32h743.dtsi                   |    4 +-
+ arch/arm/boot/dts/stm32h743i-disco.dts             |    8 +-
+ arch/arm/boot/dts/stm32h743i-eval.dts              |    8 +-
+ arch/arm/boot/dts/stm32h750i-art-pi.dts            |    8 +-
+ arch/arm/boot/dts/stm32mp131.dtsi                  |  140 +-
+ arch/arm/boot/dts/stm32mp133.dtsi                  |    4 +-
+ arch/arm/boot/dts/stm32mp135f-dk.dts               |   11 +
+ arch/arm/boot/dts/stm32mp13xc.dtsi                 |    3 +-
+ arch/arm/boot/dts/stm32mp13xf.dtsi                 |    3 +-
+ arch/arm/boot/dts/stm32mp15-pinctrl.dtsi           |  177 +-
+ arch/arm/boot/dts/stm32mp151.dtsi                  |    7 +-
+ .../arm/boot/dts/stm32mp153c-dhcor-drc-compact.dts |   30 +
+ arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi |   55 +
+ .../boot/dts/stm32mp15xx-dhcor-drc-compact.dtsi    |  322 +++
+ arch/arm/boot/dts/stm32mp15xx-dhcor-io1v8.dtsi     |    5 +
+ arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi       |    4 +-
+ arch/arm/boot/dts/stm32mp15xx-osd32.dtsi           |    9 +-
+ arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts       |   40 +-
+ arch/arm/boot/dts/sun4i-a10-pcduino.dts            |    6 +-
+ arch/arm/boot/dts/sun5i-a13-licheepi-one.dts       |    6 +-
+ arch/arm/boot/dts/sun6i-a31.dtsi                   |   12 +-
+ arch/arm/boot/dts/sun7i-a20-pcduino3.dts           |    6 +-
+ arch/arm/boot/dts/sun8i-a23-a33.dtsi               |    8 +-
+ .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts    |    8 +-
+ arch/arm/boot/dts/sun8i-h3-beelink-x2.dts          |    6 +-
+ arch/arm/boot/dts/sun8i-h3-mapleboard-mp130.dts    |    6 +-
+ arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts         |    8 +-
+ arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts      |    2 +-
+ arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts           |    4 +-
+ arch/arm/boot/dts/sun8i-h3-nanopi.dtsi             |    4 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-2.dts          |    6 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts       |    4 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-one.dts        |    4 +-
+ arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts         |    4 +-
+ arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts       |    4 +-
+ arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts  |    5 +
+ arch/arm/boot/dts/sun8i-r40-cpu-opp.dtsi           |   52 +
+ arch/arm/boot/dts/sun8i-r40-feta40i.dtsi           |    5 +
+ arch/arm/boot/dts/sun8i-r40.dtsi                   |   44 +-
+ arch/arm/boot/dts/sun8i-t3-cqa3t-bv3.dts           |    5 +
+ arch/arm/boot/dts/sun8i-v3s.dtsi                   |    6 +-
+ arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts  |    5 +
+ arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi      |    8 +-
+ arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi    |    4 +-
+ arch/arm/boot/dts/sunxi-h3-h5.dtsi                 |   13 +-
+ arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi   |    4 +-
+ arch/arm/boot/dts/tegra114-asus-tf701t.dts         |    8 +-
+ arch/arm/boot/dts/tegra114-dalmore.dts             |    8 +-
+ arch/arm/boot/dts/tegra114-roth.dts                |    6 +-
+ arch/arm/boot/dts/tegra114-tn7.dts                 |    6 +-
+ arch/arm/boot/dts/tegra124-apalis-eval.dts         |    2 +-
+ arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts    |    2 +-
+ arch/arm/boot/dts/tegra124-jetson-tk1.dts          |    2 +-
+ arch/arm/boot/dts/tegra124-nyan.dtsi               |    4 +-
+ arch/arm/boot/dts/tegra124-venice2.dts             |    2 +-
+ arch/arm/boot/dts/tegra20-acer-a500-picasso.dts    |   10 +-
+ arch/arm/boot/dts/tegra20-asus-tf101.dts           |   10 +-
+ arch/arm/boot/dts/tegra20-colibri-eval-v3.dts      |    2 +-
+ arch/arm/boot/dts/tegra20-colibri-iris.dts         |    2 +-
+ arch/arm/boot/dts/tegra20-harmony.dts              |    2 +-
+ arch/arm/boot/dts/tegra20-paz00.dts                |    2 +-
+ arch/arm/boot/dts/tegra20-seaboard.dts             |    4 +-
+ arch/arm/boot/dts/tegra20-trimslice.dts            |    2 +-
+ arch/arm/boot/dts/tegra20-ventana.dts              |    2 +-
+ arch/arm/boot/dts/tegra30-apalis-eval.dts          |    2 +-
+ arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts     |    2 +-
+ .../dts/tegra30-asus-nexus7-grouper-common.dtsi    |   14 +-
+ arch/arm/boot/dts/tegra30-asus-nexus7-tilapia.dtsi |    2 +-
+ .../boot/dts/tegra30-asus-transformer-common.dtsi  |   10 +-
+ arch/arm/boot/dts/tegra30-cardhu.dtsi              |    6 +-
+ arch/arm/boot/dts/tegra30-colibri-eval-v3.dts      |    2 +-
+ arch/arm/boot/dts/tegra30-colibri.dtsi             |    6 +-
+ arch/arm/boot/dts/tegra30-ouya.dts                 |    2 +-
+ arch/arm/boot/dts/tegra30-pegatron-chagall.dts     |   10 +-
+ arch/arm/boot/dts/zynq-zc702.dts                   |    4 +-
+ arch/arm/boot/dts/zynq-zturn-common.dtsi           |    2 +-
+ arch/arm/configs/bcm2835_defconfig                 |    1 +
+ arch/arm/configs/multi_v7_defconfig                |    5 +-
+ arch/arm/configs/shmobile_defconfig                |    4 +-
+ arch/arm/mach-bcm/Kconfig                          |   61 +-
+ arch/arm/mach-bcm/Makefile                         |   11 +-
+ arch/arm/mach-bcm/bcm63xx.c                        |   17 -
+ arch/arm/mach-bcm/bcm_kona_smc.c                   |    1 +
+ arch/arm/mach-imx/Kconfig                          |    6 +-
+ arch/arm/mach-imx/cpu-imx25.c                      |    2 +
+ arch/arm/mach-omap2/Kconfig                        |    6 +-
+ arch/arm/mach-omap2/display.c                      |    3 +
+ arch/arm/mach-omap2/pdata-quirks.c                 |    2 +
+ arch/arm/mach-omap2/prm3xxx.c                      |    1 +
+ arch/arm/mach-s3c/Kconfig                          |   14 +-
+ arch/arm/mach-s3c/Kconfig.s3c24xx                  |   26 +-
+ arch/arm/mach-s3c/Kconfig.s3c64xx                  |   16 +-
+ arch/arm/mach-s3c/mach-mini2440.c                  |    2 +-
+ arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c |    5 +-
+ arch/arm/mach-zynq/common.c                        |    1 +
+ arch/arm64/Kconfig.platforms                       |   12 +-
+ arch/arm64/boot/dts/allwinner/Makefile             |    2 +
+ arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi     |    6 +
+ .../dts/allwinner/sun50i-a64-amarula-relic.dts     |    2 +-
+ .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts |    4 +-
+ .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts   |    2 +-
+ .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts |    6 +-
+ .../boot/dts/allwinner/sun50i-a64-pinebook.dts     |    4 +-
+ .../dts/allwinner/sun50i-a64-pinephone-1.0.dts     |    4 +
+ .../dts/allwinner/sun50i-a64-pinephone-1.1.dts     |    4 +
+ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi      |   10 +-
+ .../boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts |    4 +-
+ .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts  |    4 +-
+ .../dts/allwinner/sun50i-h5-orangepi-prime.dts     |    4 +-
+ .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts    |    4 +-
+ .../dts/allwinner/sun50i-h6-orangepi-lite2.dts     |    4 +-
+ arch/arm64/boot/dts/allwinner/sun50i-h6-tanix.dtsi |    2 +-
+ arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi       |   12 +-
+ .../dts/allwinner/sun50i-h616-orangepi-zero2.dts   |  213 ++
+ .../boot/dts/allwinner/sun50i-h616-x96-mate.dts    |  177 ++
+ arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi     |  591 +++++
+ arch/arm64/boot/dts/altera/Makefile                |    3 +-
+ arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi  |   58 +-
+ .../boot/dts/altera/socfpga_stratix10_socdk.dts    |   10 +-
+ .../dts/altera/socfpga_stratix10_socdk_nand.dts    |   10 +-
+ .../boot/dts/altera/socfpga_stratix10_swvp.dts     |  117 +
+ arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts   |    4 +-
+ arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts   |    4 +-
+ arch/arm64/boot/dts/amlogic/meson-axg.dtsi         |    2 +-
+ .../arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts |   27 +-
+ .../boot/dts/amlogic/meson-g12b-gtking-pro.dts     |    2 -
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi          |    2 +-
+ arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts |    2 -
+ .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts    |    4 +-
+ .../boot/dts/amlogic/meson-gxbb-wetek-play2.dts    |    4 +-
+ .../dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dts |    4 +-
+ .../boot/dts/amlogic/meson-gxl-s905d-p230.dts      |    4 +-
+ .../dts/amlogic/meson-gxl-s905d-vero4k-plus.dts    |    4 +-
+ .../amlogic/meson-gxl-s905w-jethome-jethub-j80.dts |    2 +-
+ .../boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dts |    4 +-
+ .../boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts   |    4 +-
+ arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts     |    4 +-
+ .../boot/dts/amlogic/meson-gxm-wetek-core2.dts     |    2 -
+ arch/arm64/boot/dts/amlogic/meson-s4.dtsi          |    6 +
+ arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts   |   10 +-
+ arch/arm64/boot/dts/apm/apm-merlin.dts             |    2 +-
+ arch/arm64/boot/dts/apm/apm-mustang.dts            |    2 +-
+ arch/arm64/boot/dts/apm/apm-shadowcat.dtsi         |    6 +-
+ arch/arm64/boot/dts/apm/apm-storm.dtsi             |   10 +-
+ arch/arm64/boot/dts/arm/fvp-base-revc.dts          |    2 +-
+ arch/arm64/boot/dts/arm/juno-base.dtsi             |   44 +-
+ arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi          |   16 +-
+ arch/arm64/boot/dts/arm/juno-r1.dts                |    2 +
+ arch/arm64/boot/dts/arm/juno-r2.dts                |    2 +
+ arch/arm64/boot/dts/arm/juno-scmi.dtsi             |    1 -
+ arch/arm64/boot/dts/arm/juno.dts                   |    2 +
+ arch/arm64/boot/dts/broadcom/Makefile              |    1 +
+ .../bcm4908/bcm4906-tplink-archer-c2300-v1.dts     |    8 +-
+ .../broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts    |    8 +-
+ arch/arm64/boot/dts/broadcom/bcmbca/Makefile       |    7 +
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm4912.dtsi   |  128 ++
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm63146.dtsi  |  110 +
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm63158.dtsi  |  128 ++
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm6813.dtsi   |  128 ++
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm6856.dtsi   |  103 +
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi   |  121 +
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm94912.dts   |   30 +
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm963146.dts  |   30 +
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm963158.dts  |   30 +
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm96813.dts   |   30 +
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm96856.dts   |   30 +
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm96858.dts   |   30 +
+ .../arm64/boot/dts/broadcom/stingray/stingray.dtsi |    2 +-
+ arch/arm64/boot/dts/exynos/exynos-pinctrl.h        |   79 +
+ arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi |    2 +-
+ arch/arm64/boot/dts/exynos/exynos5433.dtsi         |    6 +-
+ arch/arm64/boot/dts/exynos/exynos7-espresso.dts    |    6 +-
+ arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi    |   72 +-
+ .../boot/dts/exynos/exynos7885-jackpotlte.dts      |   20 +
+ arch/arm64/boot/dts/exynos/exynos7885-pinctrl.dtsi |    2 +-
+ arch/arm64/boot/dts/exynos/exynos7885.dtsi         |   32 +
+ arch/arm64/boot/dts/exynos/exynos850-pinctrl.dtsi  |    2 +-
+ .../boot/dts/exynos/exynosautov9-pinctrl.dtsi      |    8 +-
+ arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts   |   20 +
+ arch/arm64/boot/dts/exynos/exynosautov9.dtsi       | 1170 +++++++++-
+ arch/arm64/boot/dts/freescale/Makefile             |    4 +
+ arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts  |    2 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi     |   18 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts  |    2 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi     |   16 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi     |   20 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi     |   20 +-
+ .../arm64/boot/dts/freescale/fsl-ls1088a-ten64.dts |   10 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi     |   16 +-
+ arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi     |   18 +-
+ arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts  |    4 +-
+ arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi     |   16 +-
+ arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts  |    4 +-
+ arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi    |   10 +-
+ .../dts/freescale/imx8mm-beacon-baseboard.dtsi     |    4 +-
+ arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi      |   43 +
+ .../boot/dts/freescale/imx8mm-icore-mx8mm.dtsi     |   12 +-
+ arch/arm64/boot/dts/freescale/imx8mm-mx8menlo.dts  |    4 +-
+ .../dts/freescale/imx8mm-phyboard-polis-rdk.dts    |  450 ++++
+ .../boot/dts/freescale/imx8mm-phycore-som.dtsi     |  440 ++++
+ .../boot/dts/freescale/imx8mm-var-som-symphony.dts |    6 +-
+ .../boot/dts/freescale/imx8mm-venice-gw700x.dtsi   |   24 +-
+ .../boot/dts/freescale/imx8mm-venice-gw7901.dts    |    8 +-
+ .../boot/dts/freescale/imx8mm-venice-gw7902.dts    |   10 +-
+ .../boot/dts/freescale/imx8mm-venice-gw7903.dts    |    6 +-
+ arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi   |   10 +-
+ arch/arm64/boot/dts/freescale/imx8mm.dtsi          |   16 +-
+ .../dts/freescale/imx8mn-beacon-baseboard.dtsi     |    4 +-
+ arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi      |   45 +-
+ .../boot/dts/freescale/imx8mn-var-som-symphony.dts |    6 +-
+ .../boot/dts/freescale/imx8mn-venice-gw7902.dts    |    8 +-
+ arch/arm64/boot/dts/freescale/imx8mn.dtsi          |   13 +-
+ .../arm64/boot/dts/freescale/imx8mp-dhcom-pdk2.dts |  163 ++
+ .../arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi | 1030 +++++++++
+ arch/arm64/boot/dts/freescale/imx8mp-evk.dts       |   38 +-
+ .../dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts    |  702 ++++++
+ .../arm64/boot/dts/freescale/imx8mp-tqma8mpql.dtsi |  284 +++
+ arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi   |   10 +-
+ arch/arm64/boot/dts/freescale/imx8mp.dtsi          |   31 +-
+ arch/arm64/boot/dts/freescale/imx8mq-evk.dts       |   43 +
+ .../boot/dts/freescale/imx8mq-librem5-devkit.dts   |    6 +-
+ arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi  |    4 +-
+ arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dts  |    6 +-
+ .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi |    2 +-
+ arch/arm64/boot/dts/freescale/imx8mq.dtsi          |   15 +-
+ arch/arm64/boot/dts/freescale/imx8qm.dtsi          |    4 +-
+ .../dts/freescale/imx8qxp-colibri-eval-v3.dtsi     |    8 +-
+ arch/arm64/boot/dts/freescale/imx8qxp.dtsi         |   14 +-
+ arch/arm64/boot/dts/freescale/imx8ulp.dtsi         |   14 +-
+ arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts  |  114 +
+ arch/arm64/boot/dts/freescale/imx93-pinfunc.h      |  623 +++++
+ arch/arm64/boot/dts/freescale/imx93.dtsi           |  334 +++
+ arch/arm64/boot/dts/freescale/mba8mx.dtsi          |    8 +-
+ arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts  |   14 +-
+ arch/arm64/boot/dts/hisilicon/hi3660.dtsi          |    8 +-
+ arch/arm64/boot/dts/hisilicon/hi3670.dtsi          |    2 +-
+ arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts     |   12 +-
+ arch/arm64/boot/dts/hisilicon/hip05-d02.dts        |    6 +-
+ arch/arm64/boot/dts/hisilicon/hip06.dtsi           |    6 +-
+ arch/arm64/boot/dts/hisilicon/hip07.dtsi           |    6 +-
+ arch/arm64/boot/dts/intel/socfpga_agilex.dtsi      |   14 +-
+ arch/arm64/boot/dts/lg/lg1312.dtsi                 |   38 +-
+ arch/arm64/boot/dts/lg/lg1313.dtsi                 |   38 +-
+ .../boot/dts/marvell/armada-3720-turris-mox.dts    |    4 +-
+ .../boot/dts/marvell/armada-7040-mochabin.dts      |    4 +-
+ .../dts/marvell/armada-8040-clearfog-gt-8k.dts     |    4 +-
+ arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi |    2 +-
+ .../boot/dts/marvell/armada-8040-puzzle-m801.dts   |    4 +-
+ arch/arm64/boot/dts/marvell/cn9130-db.dtsi         |    2 +-
+ arch/arm64/boot/dts/mediatek/Makefile              |    5 +
+ arch/arm64/boot/dts/mediatek/mt2712-evb.dts        |    2 +-
+ arch/arm64/boot/dts/mediatek/mt2712e.dtsi          |    2 +
+ arch/arm64/boot/dts/mediatek/mt6795.dtsi           |  260 ++-
+ .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts  |   21 +-
+ arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts       |   13 +-
+ arch/arm64/boot/dts/mediatek/mt7622.dtsi           |   10 +-
+ arch/arm64/boot/dts/mediatek/mt7986a.dtsi          |    4 +-
+ .../boot/dts/mediatek/mt8173-elm-hana-rev7.dts     |    6 +-
+ arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi       |   24 +-
+ arch/arm64/boot/dts/mediatek/mt8173-evb.dts        |   12 +-
+ arch/arm64/boot/dts/mediatek/mt8173.dtsi           |   16 +-
+ arch/arm64/boot/dts/mediatek/mt8183-evb.dts        |   38 +-
+ .../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi    |    4 +-
+ .../boot/dts/mediatek/mt8183-kukui-kakadu.dtsi     |    2 +-
+ arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi     |   13 +-
+ arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts    |    2 +-
+ arch/arm64/boot/dts/mediatek/mt8183.dtsi           |  315 ++-
+ .../boot/dts/mediatek/mt8192-asurada-hayato-r1.dts |   47 +
+ .../dts/mediatek/mt8192-asurada-spherion-r0.dts    |   62 +
+ arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi   |  959 ++++++++
+ arch/arm64/boot/dts/mediatek/mt8192.dtsi           |   29 +-
+ .../boot/dts/mediatek/mt8195-cherry-tomato-r1.dts  |   15 +
+ .../boot/dts/mediatek/mt8195-cherry-tomato-r2.dts  |   35 +
+ .../boot/dts/mediatek/mt8195-cherry-tomato-r3.dts  |   36 +
+ arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi    |  702 ++++++
+ arch/arm64/boot/dts/mediatek/mt8195-evb.dts        |    8 +-
+ arch/arm64/boot/dts/mediatek/mt8195.dtsi           |   76 +-
+ arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi   |    4 +-
+ .../boot/dts/microchip/sparx5_pcb134_board.dtsi    |  200 +-
+ .../boot/dts/microchip/sparx5_pcb135_board.dtsi    |   48 +-
+ arch/arm64/boot/dts/nvidia/tegra132-norrin.dts     |    4 +-
+ arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts |   49 +-
+ .../dts/nvidia/tegra186-p3509-0000+p3636-0001.dts  |    6 +-
+ arch/arm64/boot/dts/nvidia/tegra186.dtsi           |   37 +-
+ arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi     |    2 +-
+ arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts |   47 +-
+ .../arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi |   47 +-
+ arch/arm64/boot/dts/nvidia/tegra194.dtsi           |  113 +-
+ arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts |   84 +
+ arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi     |    6 +-
+ arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi     |    2 +-
+ arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts |   88 +-
+ arch/arm64/boot/dts/nvidia/tegra210-smaug.dts      |   10 +-
+ arch/arm64/boot/dts/nvidia/tegra210.dtsi           |   42 +-
+ .../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts  |   49 +-
+ arch/arm64/boot/dts/nvidia/tegra234.dtsi           |  177 ++
+ arch/arm64/boot/dts/qcom/Makefile                  |   28 +-
+ arch/arm64/boot/dts/qcom/apq8016-sbc.dts           |   36 +-
+ arch/arm64/boot/dts/qcom/apq8096-db820c.dts        |   91 +-
+ arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts       |    6 +-
+ arch/arm64/boot/dts/qcom/ipq6018.dtsi              |   41 +-
+ arch/arm64/boot/dts/qcom/ipq8074.dtsi              |   42 +-
+ .../boot/dts/qcom/msm8916-alcatel-idol347.dts      |    2 +-
+ arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts     |    4 +-
+ arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts     |    2 +-
+ .../boot/dts/qcom/msm8916-longcheer-l8150.dts      |    2 +-
+ .../boot/dts/qcom/msm8916-longcheer-l8910.dts      |    2 +-
+ .../dts/qcom/msm8916-samsung-a2015-common.dtsi     |   16 +-
+ .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts      |    8 -
+ .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts      |    8 -
+ arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts    |    4 +-
+ .../boot/dts/qcom/msm8916-samsung-serranove.dts    |    6 +-
+ .../boot/dts/qcom/msm8916-wingtech-wt88047.dts     |    2 +-
+ arch/arm64/boot/dts/qcom/msm8916.dtsi              |   28 +-
+ arch/arm64/boot/dts/qcom/msm8953.dtsi              |    6 +-
+ arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts  |    6 +-
+ .../boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi  |   29 +-
+ .../dts/qcom/msm8994-sony-xperia-kitakami.dtsi     |   12 +-
+ arch/arm64/boot/dts/qcom/msm8994.dtsi              |   21 +-
+ .../qcom/msm8996-pmi8996-sony-xperia-tone-dora.dts |   11 -
+ .../msm8996-pmi8996-sony-xperia-tone-kagura.dts    |   11 -
+ .../msm8996-pmi8996-sony-xperia-tone-keyaki.dts    |   11 -
+ .../boot/dts/qcom/msm8996-sony-xperia-tone.dtsi    |   77 +-
+ .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi |   14 +-
+ arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts |    4 +-
+ .../arm64/boot/dts/qcom/msm8996-xiaomi-natrium.dts |  414 ++++
+ .../arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts |    2 +-
+ arch/arm64/boot/dts/qcom/msm8996.dtsi              |  297 ++-
+ .../boot/dts/qcom/msm8998-asus-novago-tp370ql.dts  |   23 +-
+ arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi    |  138 +-
+ arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts    |  460 +++-
+ arch/arm64/boot/dts/qcom/msm8998-hp-envy-x2.dts    |    9 +-
+ .../boot/dts/qcom/msm8998-lenovo-miix-630.dts      |    9 +-
+ arch/arm64/boot/dts/qcom/msm8998-mtp.dts           |  443 +++-
+ arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi          |  421 ----
+ .../boot/dts/qcom/msm8998-oneplus-cheeseburger.dts |    2 +-
+ .../boot/dts/qcom/msm8998-oneplus-common.dtsi      |   88 +-
+ .../dts/qcom/msm8998-sony-xperia-yoshino-lilac.dts |    4 +
+ .../dts/qcom/msm8998-sony-xperia-yoshino-maple.dts |    2 +-
+ .../boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi |  120 +-
+ arch/arm64/boot/dts/qcom/msm8998.dtsi              |   87 +-
+ arch/arm64/boot/dts/qcom/pm6350.dtsi               |    3 +-
+ arch/arm64/boot/dts/qcom/pm660.dtsi                |    2 +-
+ arch/arm64/boot/dts/qcom/pm660l.dtsi               |    8 +-
+ arch/arm64/boot/dts/qcom/pm8005.dtsi               |    4 +
+ arch/arm64/boot/dts/qcom/pm8009.dtsi               |    3 +-
+ arch/arm64/boot/dts/qcom/pm8150.dtsi               |    3 +-
+ arch/arm64/boot/dts/qcom/pm8150b.dtsi              |   13 +-
+ arch/arm64/boot/dts/qcom/pm8150l.dtsi              |   14 +-
+ arch/arm64/boot/dts/qcom/pm8350.dtsi               |    3 +-
+ arch/arm64/boot/dts/qcom/pm8350b.dtsi              |    3 +-
+ arch/arm64/boot/dts/qcom/pm8916.dtsi               |   17 +-
+ arch/arm64/boot/dts/qcom/pm8994.dtsi               |   10 +
+ arch/arm64/boot/dts/qcom/pmi8994.dtsi              |   22 +-
+ arch/arm64/boot/dts/qcom/pmi8998.dtsi              |   13 +-
+ arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi          |    2 +-
+ arch/arm64/boot/dts/qcom/pmm8155au_2.dtsi          |    2 +-
+ arch/arm64/boot/dts/qcom/pmr735b.dtsi              |    3 +-
+ arch/arm64/boot/dts/qcom/pms405.dtsi               |   17 +-
+ arch/arm64/boot/dts/qcom/qcs404-evb.dtsi           |    4 +-
+ arch/arm64/boot/dts/qcom/qcs404.dtsi               |   35 +-
+ arch/arm64/boot/dts/qcom/qrb5165-rb5.dts           |   44 +-
+ arch/arm64/boot/dts/qcom/sa8295p-adp.dts           |  389 ++++
+ arch/arm64/boot/dts/qcom/sa8540p.dtsi              |  133 ++
+ arch/arm64/boot/dts/qcom/sc7180-idp.dts            |    5 +-
+ .../arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi |    4 +
+ .../boot/dts/qcom/sc7180-trogdor-homestar.dtsi     |    6 +
+ .../boot/dts/qcom/sc7180-trogdor-kingoftown-r0.dts |   44 +
+ .../boot/dts/qcom/sc7180-trogdor-kingoftown-r1.dts |   17 +
+ .../boot/dts/qcom/sc7180-trogdor-kingoftown.dtsi   |  225 ++
+ arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi |    1 +
+ .../dts/qcom/sc7180-trogdor-mrbland-rev0-auo.dts   |   22 +
+ .../dts/qcom/sc7180-trogdor-mrbland-rev0-boe.dts   |   22 +
+ .../boot/dts/qcom/sc7180-trogdor-mrbland-rev0.dtsi |   53 +
+ .../dts/qcom/sc7180-trogdor-mrbland-rev1-auo.dts   |   22 +
+ .../dts/qcom/sc7180-trogdor-mrbland-rev1-boe.dts   |   24 +
+ .../boot/dts/qcom/sc7180-trogdor-mrbland.dtsi      |  350 +++
+ .../dts/qcom/sc7180-trogdor-pazquel-lte-parade.dts |   22 +
+ .../dts/qcom/sc7180-trogdor-pazquel-lte-ti.dts     |   22 +
+ .../dts/qcom/sc7180-trogdor-pazquel-parade.dts     |   17 +
+ .../boot/dts/qcom/sc7180-trogdor-pazquel-ti.dts    |   17 +
+ .../boot/dts/qcom/sc7180-trogdor-pazquel.dtsi      |  222 ++
+ .../arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi |    2 +
+ .../qcom/sc7180-trogdor-quackingstick-r0-lte.dts   |   38 +
+ .../dts/qcom/sc7180-trogdor-quackingstick-r0.dts   |   26 +
+ .../dts/qcom/sc7180-trogdor-quackingstick.dtsi     |  324 +++
+ arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts     |    2 +
+ .../qcom/sc7180-trogdor-wormdingler-rev0-boe.dts   |   22 +
+ .../qcom/sc7180-trogdor-wormdingler-rev0-inx.dts   |   22 +
+ .../dts/qcom/sc7180-trogdor-wormdingler-rev0.dtsi  |   53 +
+ ...sc7180-trogdor-wormdingler-rev1-boe-rt5682s.dts |   29 +
+ .../qcom/sc7180-trogdor-wormdingler-rev1-boe.dts   |   28 +
+ ...sc7180-trogdor-wormdingler-rev1-inx-rt5682s.dts |   29 +
+ .../qcom/sc7180-trogdor-wormdingler-rev1-inx.dts   |   22 +
+ .../boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi  |  412 ++++
+ arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi       |    8 +-
+ arch/arm64/boot/dts/qcom/sc7180.dtsi               |   75 +-
+ arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi |   16 +
+ .../dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi   |   20 +
+ arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts  |   73 +
+ .../dts/qcom/sc7280-herobrine-herobrine-r1.dts     |   11 +
+ .../boot/dts/qcom/sc7280-herobrine-villager-r0.dts |   29 +
+ arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi     |   22 +-
+ arch/arm64/boot/dts/qcom/sc7280-idp.dtsi           |   91 +-
+ arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi         |   11 +-
+ arch/arm64/boot/dts/qcom/sc7280.dtsi               |  241 +-
+ arch/arm64/boot/dts/qcom/sc8280xp-crd.dts          |  427 ++++
+ .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts     |  386 ++++
+ arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi       |  109 +
+ arch/arm64/boot/dts/qcom/sc8280xp.dtsi             | 2139 +++++++++++++++++
+ .../arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts |  461 ++++
+ .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi     |   61 +-
+ arch/arm64/boot/dts/qcom/sdm630.dtsi               |  332 +--
+ arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts  |    2 +-
+ .../dts/qcom/sdm636-sony-xperia-ganges-mermaid.dts |    2 +-
+ .../arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts |   28 +-
+ arch/arm64/boot/dts/qcom/sdm660.dtsi               |    5 +-
+ arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi         |  136 +-
+ arch/arm64/boot/dts/qcom/sdm845-db845c.dts         |   62 +-
+ arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi     |  614 +++++
+ arch/arm64/boot/dts/qcom/sdm845-lg-judyln.dts      |   68 +
+ arch/arm64/boot/dts/qcom/sdm845-lg-judyp.dts       |   44 +
+ .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi |    8 +-
+ arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts  |   35 +-
+ .../dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts  |    5 +-
+ .../boot/dts/qcom/sdm845-sony-xperia-tama.dtsi     |    2 +-
+ .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts      |    8 +-
+ arch/arm64/boot/dts/qcom/sdm845.dtsi               |  241 +-
+ .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts      |   10 +-
+ arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts   |    4 +-
+ .../dts/qcom/sm6125-sony-xperia-seine-pdx201.dts   |   40 +-
+ arch/arm64/boot/dts/qcom/sm6125.dtsi               |   40 +-
+ arch/arm64/boot/dts/qcom/sm6350.dtsi               |   30 +-
+ arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts  |    4 +-
+ arch/arm64/boot/dts/qcom/sm8150-hdk.dts            |    4 +-
+ .../boot/dts/qcom/sm8150-microsoft-surface-duo.dts |    4 +-
+ arch/arm64/boot/dts/qcom/sm8150.dtsi               |   36 +-
+ arch/arm64/boot/dts/qcom/sm8250-hdk.dts            |    4 +-
+ .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi      |    2 +-
+ arch/arm64/boot/dts/qcom/sm8250.dtsi               |  110 +-
+ .../dts/qcom/sm8350-microsoft-surface-duo2.dts     |    2 -
+ .../boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi   |    2 +-
+ arch/arm64/boot/dts/qcom/sm8350.dtsi               |  148 +-
+ arch/arm64/boot/dts/qcom/sm8450-hdk.dts            |    2 -
+ arch/arm64/boot/dts/qcom/sm8450-qrd.dts            |    2 -
+ arch/arm64/boot/dts/qcom/sm8450.dtsi               |   76 +-
+ arch/arm64/boot/dts/renesas/Makefile               |    3 +
+ .../boot/dts/renesas/beacon-renesom-baseboard.dtsi |    6 +-
+ .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi |    4 +-
+ .../dts/renesas/draak-ebisu-panel-aa104xd12.dts    |   36 +
+ arch/arm64/boot/dts/renesas/draak.dtsi             |    2 +-
+ arch/arm64/boot/dts/renesas/ebisu.dtsi             |    8 +-
+ arch/arm64/boot/dts/renesas/hihope-common.dtsi     |    4 +-
+ arch/arm64/boot/dts/renesas/panel-aa104xd12.dtsi   |   30 +
+ arch/arm64/boot/dts/renesas/r8a774c0.dtsi          |    6 +-
+ arch/arm64/boot/dts/renesas/r8a77990.dtsi          |    6 +-
+ arch/arm64/boot/dts/renesas/r8a779a0.dtsi          |   31 +-
+ .../boot/dts/renesas/r8a779f0-spider-cpu.dtsi      |   13 +
+ arch/arm64/boot/dts/renesas/r8a779f0-spider.dts    |    1 +
+ arch/arm64/boot/dts/renesas/r8a779f0.dtsi          |  434 +++-
+ arch/arm64/boot/dts/renesas/r8a779m8.dtsi          |    5 +
+ arch/arm64/boot/dts/renesas/r9a07g043.dtsi         |   21 +-
+ arch/arm64/boot/dts/renesas/r9a07g043u11-smarc.dts |    6 -
+ arch/arm64/boot/dts/renesas/r9a07g054l2-smarc.dts  |    2 +-
+ arch/arm64/boot/dts/renesas/r9a09g011-v2mevk2.dts  |   14 +
+ arch/arm64/boot/dts/renesas/r9a09g011.dtsi         |   51 +
+ arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi   |    4 +-
+ arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi  |    4 +-
+ arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi      |    2 +-
+ arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi  |   23 +-
+ arch/arm64/boot/dts/renesas/rzg2ul-smarc.dtsi      |    6 +
+ arch/arm64/boot/dts/renesas/salvator-common.dtsi   |    8 +-
+ .../boot/dts/renesas/salvator-panel-aa104xd12.dts  |   36 +
+ arch/arm64/boot/dts/renesas/ulcb-kf.dtsi           |   14 +-
+ arch/arm64/boot/dts/renesas/ulcb.dtsi              |    6 +-
+ arch/arm64/boot/dts/rockchip/Makefile              |    1 +
+ arch/arm64/boot/dts/rockchip/px30.dtsi             |    2 +-
+ arch/arm64/boot/dts/rockchip/rk3308-evb.dts        |    2 +-
+ arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts  |  253 +++
+ arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts |   32 +-
+ arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts |    2 +-
+ arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi       |    2 +-
+ arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts    |    2 +-
+ .../boot/dts/rockchip/rk3368-orion-r68-meta.dts    |    4 +-
+ arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts    |    2 +-
+ arch/arm64/boot/dts/rockchip/rk3368-r88.dts        |    2 +-
+ arch/arm64/boot/dts/rockchip/rk3368.dtsi           |    6 +-
+ arch/arm64/boot/dts/rockchip/rk3399-evb.dts        |    2 +-
+ arch/arm64/boot/dts/rockchip/rk3399-firefly.dts    |    2 +-
+ .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi   |    2 +-
+ arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts  |    2 +-
+ .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi      |    2 +-
+ .../boot/dts/rockchip/rk3399-khadas-edge.dtsi      |    2 +-
+ arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts |    4 +-
+ arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi   |    2 +-
+ arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts   |    2 +-
+ .../boot/dts/rockchip/rk3399-pinebook-pro.dts      |    4 +-
+ .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts |    2 +-
+ arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi    |    2 +-
+ arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi |   72 +-
+ .../dts/rockchip/rk3399-sapphire-excavator.dts     |    2 +-
+ arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi  |    2 +-
+ .../boot/dts/rockchip/rk3399pro-vmarc-som.dtsi     |    2 +-
+ arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi  |    2 +-
+ arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts |  114 +
+ arch/arm64/boot/dts/rockchip/rk3566.dtsi           |    4 +
+ arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts |   89 +
+ arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts   |   55 +
+ arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts    |   55 +
+ arch/arm64/boot/dts/rockchip/rk3568.dtsi           |    4 +
+ arch/arm64/boot/dts/rockchip/rk356x.dtsi           |  166 ++
+ arch/arm64/boot/dts/sprd/sc9836.dtsi               |   10 +-
+ arch/arm64/boot/dts/sprd/sc9863a.dtsi              |    4 +-
+ arch/arm64/boot/dts/sprd/whale2.dtsi               |    2 +-
+ arch/arm64/boot/dts/tesla/fsd-evb.dts              |    4 +
+ arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi         |  106 +-
+ arch/arm64/boot/dts/tesla/fsd-pinctrl.h            |   33 +
+ arch/arm64/boot/dts/tesla/fsd.dtsi                 |  120 +
+ arch/arm64/boot/dts/ti/k3-am62-main.dtsi           |   17 +-
+ arch/arm64/boot/dts/ti/k3-am625-sk.dts             |   11 +-
+ arch/arm64/boot/dts/ti/k3-am64-main.dtsi           |    4 +-
+ arch/arm64/boot/dts/ti/k3-am642-evm.dts            |    2 +-
+ arch/arm64/boot/dts/ti/k3-am642-sk.dts             |   16 +-
+ arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi |    4 +-
+ arch/arm64/boot/dts/ti/k3-am65-main.dtsi           |   14 +-
+ arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi         |    4 +-
+ arch/arm64/boot/dts/ti/k3-am654-base-board.dts     |    8 +-
+ arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi    |    4 +-
+ .../boot/dts/ti/k3-j721e-common-proc-board.dts     |    4 +-
+ arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi    |    4 +-
+ arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi         |    4 +-
+ arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi   |    4 +-
+ arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi     |    4 +
+ arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts  |    4 +-
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts  |    2 +-
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts  |    2 +-
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts  |    2 +-
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts  |    2 +-
+ arch/arm64/boot/dts/xilinx/zynqmp.dtsi             |   26 +
+ arch/arm64/configs/defconfig                       |   18 +
+ drivers/ata/Kconfig                                |    2 +-
+ drivers/char/hw_random/Kconfig                     |    2 +-
+ drivers/clk/bcm/Kconfig                            |    4 +-
+ drivers/firmware/arm_scmi/Kconfig                  |   12 +
+ drivers/firmware/arm_scmi/Makefile                 |    3 +-
+ drivers/firmware/arm_scmi/driver.c                 |  281 ++-
+ drivers/firmware/arm_scmi/perf.c                   |  225 +-
+ drivers/firmware/arm_scmi/powercap.c               |  866 +++++++
+ drivers/firmware/arm_scmi/protocols.h              |   23 +
+ drivers/firmware/arm_scmi/scmi_power_control.c     |  362 +++
+ drivers/firmware/arm_scmi/system.c                 |   17 +-
+ drivers/firmware/arm_scpi.c                        |   61 +-
+ drivers/firmware/qcom_scm-legacy.c                 |    4 +
+ drivers/firmware/qcom_scm.c                        |   71 +-
+ drivers/firmware/tegra/bpmp-debugfs.c              |   10 +-
+ drivers/firmware/tegra/bpmp.c                      |    6 +-
+ drivers/firmware/xilinx/zynqmp.c                   |   16 +-
+ drivers/i2c/busses/Kconfig                         |    2 +-
+ drivers/memory/mtk-smi.c                           |   17 +
+ drivers/memory/tegra/tegra234.c                    |   80 +
+ drivers/mfd/bcm2835-pm.c                           |   74 +-
+ drivers/phy/broadcom/Kconfig                       |    2 +-
+ drivers/soc/amlogic/meson-mx-socinfo.c             |    1 +
+ drivers/soc/amlogic/meson-secure-pwrc.c            |    4 +-
+ drivers/soc/bcm/bcm2835-power.c                    |   72 +-
+ drivers/soc/bcm/brcmstb/biuctrl.c                  |    9 +-
+ drivers/soc/bcm/brcmstb/pm/pm-arm.c                |    2 +-
+ drivers/soc/fsl/guts.c                             |  221 +-
+ drivers/soc/imx/gpcv2.c                            |    8 +-
+ drivers/soc/imx/imx8m-blk-ctrl.c                   |    9 +-
+ drivers/soc/mediatek/Kconfig                       |   10 +
+ drivers/soc/mediatek/Makefile                      |    1 +
+ drivers/soc/mediatek/mt6795-pm-domains.h           |  112 +
+ drivers/soc/mediatek/mt8183-pm-domains.h           |    1 +
+ drivers/soc/mediatek/mt8186-pm-domains.h           |    2 +-
+ drivers/soc/mediatek/mt8192-pm-domains.h           |    2 +
+ drivers/soc/mediatek/mt8195-pm-domains.h           |    4 +-
+ drivers/soc/mediatek/mt8365-mmsys.h                |   22 +
+ drivers/soc/mediatek/mtk-devapc.c                  |   45 +-
+ drivers/soc/mediatek/mtk-mutex.c                   |  155 +-
+ drivers/soc/mediatek/mtk-pm-domains.c              |    8 +
+ drivers/soc/mediatek/mtk-pm-domains.h              |    2 +
+ drivers/soc/mediatek/mtk-pmic-wrap.c               |  225 +-
+ drivers/soc/mediatek/mtk-svs.c                     | 2403 ++++++++++++++++++++
+ drivers/soc/qcom/Kconfig                           |   17 +
+ drivers/soc/qcom/Makefile                          |    1 +
+ drivers/soc/qcom/apr.c                             |   15 +-
+ drivers/soc/qcom/cmd-db.c                          |    8 +-
+ drivers/soc/qcom/icc-bwmon.c                       |  421 ++++
+ drivers/soc/qcom/llcc-qcom.c                       |    2 +-
+ drivers/soc/qcom/mdt_loader.c                      |    4 +-
+ drivers/soc/qcom/ocmem.c                           |    3 +
+ drivers/soc/qcom/qcom_aoss.c                       |    4 +-
+ drivers/soc/qcom/rpmhpd.c                          |    4 +-
+ drivers/soc/qcom/smp2p.c                           |    3 +
+ drivers/soc/qcom/socinfo.c                         |    1 +
+ drivers/soc/renesas/r8a779a0-sysc.c                |   10 +-
+ drivers/soc/renesas/rcar-gen4-sysc.h               |    4 +-
+ drivers/soc/renesas/rcar-sysc.h                    |    4 +-
+ drivers/soc/sunxi/Kconfig                          |    1 +
+ drivers/soc/ti/pruss.c                             |    1 +
+ drivers/soc/ti/wkup_m3_ipc.c                       |    2 +-
+ drivers/soc/xilinx/xlnx_event_manager.c            |    5 +-
+ drivers/spi/Kconfig                                |    2 +-
+ drivers/tty/serial/Kconfig                         |    4 +-
+ include/dt-bindings/clock/exynos7885.h             |   54 +-
+ include/dt-bindings/clock/qcom,dispcc-sm8350.h     |    1 +
+ include/dt-bindings/clock/qcom,gcc-ipq8074.h       |    3 +
+ include/dt-bindings/clock/qcom,gpucc-sm8350.h      |   52 +
+ include/dt-bindings/clock/qcom,sm8450-camcc.h      |  159 ++
+ include/dt-bindings/clock/tegra234-clock.h         |  105 +
+ include/dt-bindings/mailbox/qcom-ipcc.h            |    1 +
+ include/dt-bindings/memory/tegra234-mc.h           |   26 +
+ include/dt-bindings/net/pcs-rzn1-miic.h            |   33 +
+ include/dt-bindings/power/mt6795-power.h           |   16 +
+ include/dt-bindings/power/tegra234-powergate.h     |    2 +
+ include/dt-bindings/reset/tegra234-reset.h         |   10 +
+ include/dt-bindings/soc/samsung,boot-mode.h        |   18 +
+ include/linux/firmware/xlnx-zynqmp.h               |    7 +
+ include/linux/mfd/bcm2835-pm.h                     |    1 +
+ include/linux/scmi_protocol.h                      |  134 ++
+ include/linux/soc/mediatek/mtk-mutex.h             |   27 +
+ include/trace/events/scmi.h                        |   56 +
+ 1097 files changed, 39830 insertions(+), 6897 deletions(-)
+ create mode 100644 Documentation/arm/google/chromebook-boot-flow.rst
+ delete mode 100644 Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/samsung/samsung-soc.yaml
+ create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra194-axi2apb.yaml
+ create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra194-cbb.yaml
+ create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra234-cbb.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/fsl,scu-clk.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/qcom,gpucc-sm8350.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm8450-camcc.yaml
+ create mode 100644 Documentation/devicetree/bindings/firmware/fsl,scu.yaml
+ rename Documentation/devicetree/bindings/{arm => hwinfo}/renesas,prr.yaml (85%)
+ create mode 100644 Documentation/devicetree/bindings/input/fsl,scu-key.yaml
+ create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/pcs/renesas,rzn1-miic.yaml
+ create mode 100644 Documentation/devicetree/bindings/nvmem/fsl,scu-ocotp.yaml
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,scu-pinctrl.yaml
+ create mode 100644 Documentation/devicetree/bindings/power/fsl,scu-pd.yaml
+ create mode 100644 Documentation/devicetree/bindings/rtc/fsl,scu-rtc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.txt
+ create mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml
+ rename Documentation/devicetree/bindings/{display => soc}/mediatek/mediatek,mutex.yaml (81%)
+ create mode 100644 Documentation/devicetree/bindings/soc/mediatek/mtk-svs.yaml
+ create mode 100644 Documentation/devicetree/bindings/thermal/fsl,scu-thermal.yaml
+ create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra186-timer.yaml
+ create mode 100644 Documentation/devicetree/bindings/watchdog/fsl,scu-wdt.yaml
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 arch/arm/boot/dts/bcm53015-meraki-mr26.dts
+ create mode 100644 arch/arm/boot/dts/bcm63148.dtsi
+ create mode 100644 arch/arm/boot/dts/bcm63178.dtsi
+ create mode 100644 arch/arm/boot/dts/bcm6756.dtsi
+ create mode 100644 arch/arm/boot/dts/bcm6846.dtsi
+ create mode 100644 arch/arm/boot/dts/bcm6855.dtsi
+ create mode 100644 arch/arm/boot/dts/bcm6878.dtsi
+ create mode 100644 arch/arm/boot/dts/bcm963138.dts
+ create mode 100644 arch/arm/boot/dts/bcm963148.dts
+ create mode 100644 arch/arm/boot/dts/bcm963178.dts
+ create mode 100644 arch/arm/boot/dts/bcm96756.dts
+ create mode 100644 arch/arm/boot/dts/bcm96846.dts
+ create mode 100644 arch/arm/boot/dts/bcm96855.dts
+ create mode 100644 arch/arm/boot/dts/bcm96878.dts
+ create mode 100644 arch/arm/boot/dts/exynos-pinctrl.h
+ create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts
+ create mode 100644 arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi
+ create mode 100644 arch/arm/boot/dts/imx7-colibri-iris.dtsi
+ create mode 100644 arch/arm/boot/dts/imx7d-colibri-emmc-iris-v2.dts
+ create mode 100644 arch/arm/boot/dts/imx7d-colibri-emmc-iris.dts
+ create mode 100644 arch/arm/boot/dts/imx7d-colibri-iris-v2.dts
+ create mode 100644 arch/arm/boot/dts/imx7d-colibri-iris.dts
+ create mode 100644 arch/arm/boot/dts/imx7s-colibri-iris-v2.dts
+ create mode 100644 arch/arm/boot/dts/imx7s-colibri-iris.dts
+ delete mode 100644 arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi
+ create mode 100644 arch/arm/boot/dts/s3c2410-pinctrl.h
+ create mode 100644 arch/arm/boot/dts/s3c64xx-pinctrl.h
+ create mode 100644 arch/arm/boot/dts/s5pv210-pinctrl.h
+ create mode 100644 arch/arm/boot/dts/socfpga_arria10_chameleonv3.dts
+ rename arch/arm/boot/dts/{socfpga_arria10_mercury_aa1.dts => socfpga_arria10_mercury_aa1.dtsi} (70%)
+ create mode 100644 arch/arm/boot/dts/stm32mp153c-dhcor-drc-compact.dts
+ create mode 100644 arch/arm/boot/dts/stm32mp15xx-dhcor-drc-compact.dtsi
+ create mode 100644 arch/arm/boot/dts/sun8i-r40-cpu-opp.dtsi
+ delete mode 100644 arch/arm/mach-bcm/bcm63xx.c
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h616-x96-mate.dts
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+ create mode 100644 arch/arm64/boot/dts/altera/socfpga_stratix10_swvp.dts
+ create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/Makefile
+ create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm4912.dtsi
+ create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm63146.dtsi
+ create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm63158.dtsi
+ create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm6813.dtsi
+ create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm6856.dtsi
+ create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi
+ create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm94912.dts
+ create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm963146.dts
+ create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm963158.dts
+ create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm96813.dts
+ create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm96856.dts
+ create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm96858.dts
+ create mode 100644 arch/arm64/boot/dts/exynos/exynos-pinctrl.h
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-phyboard-polis-rdk.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-phycore-som.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-dhcom-pdk2.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts
+ create mode 100755 arch/arm64/boot/dts/freescale/imx93-pinfunc.h
+ create mode 100644 arch/arm64/boot/dts/freescale/imx93.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-hayato-r1.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r0.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi
+ delete mode 100644 arch/arm64/boot/dts/qcom/msm8996-pmi8996-sony-xperia-tone-dora.dts
+ delete mode 100644 arch/arm64/boot/dts/qcom/msm8996-pmi8996-sony-xperia-tone-kagura.dts
+ delete mode 100644 arch/arm64/boot/dts/qcom/msm8996-pmi8996-sony-xperia-tone-keyaki.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/msm8996-xiaomi-natrium.dts
+ delete mode 100644 arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sa8295p-adp.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sa8540p.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r0.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r1.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland-rev0-auo.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland-rev0-boe.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland-rev0.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland-rev1-auo.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland-rev1-boe.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel-lte-parade.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel-lte-ti.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel-parade.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel-ti.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick-r0-lte.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick-r0.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev0-boe.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev0-inx.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev0.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-boe-rt5682s.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-boe.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-inx-rt5682s.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-inx.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sc8280xp.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sdm845-lg-judyln.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sdm845-lg-judyp.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/draak-ebisu-panel-aa104xd12.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/panel-aa104xd12.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/salvator-panel-aa104xd12.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
+ create mode 100644 arch/arm64/boot/dts/tesla/fsd-pinctrl.h
+ create mode 100644 drivers/firmware/arm_scmi/powercap.c
+ create mode 100644 drivers/firmware/arm_scmi/scmi_power_control.c
+ create mode 100644 drivers/soc/mediatek/mt6795-pm-domains.h
+ create mode 100644 drivers/soc/mediatek/mtk-svs.c
+ create mode 100644 drivers/soc/qcom/icc-bwmon.c
+ create mode 120000 include/dt-bindings/clock/qcom,dispcc-sm8350.h
+ create mode 100644 include/dt-bindings/clock/qcom,gpucc-sm8350.h
+ create mode 100644 include/dt-bindings/clock/qcom,sm8450-camcc.h
+ create mode 100644 include/dt-bindings/net/pcs-rzn1-miic.h
+ create mode 100644 include/dt-bindings/power/mt6795-power.h
+ create mode 100644 include/dt-bindings/soc/samsung,boot-mode.h
+Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git actions/for-next
+Auto-merging arch/arm/boot/dts/owl-s500-roseapplepi.dts
+Merge made by the 'ort' strategy.
+Merging amlogic/for-next (147c83586707 Merge branch 'v5.20/drivers' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next
+Merge made by the 'ort' strategy.
+Merging aspeed/for-next (bfcbea2c93e5 ARM: dts: aspeed: nuvia: rename vendor nuvia to qcom)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'ort' strategy.
+Merging at91/at91-next (4dd1a613e464 ARM: dts: lan966x: Add UDPHS support)
+$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next
+Already up to date.
+Merging broadcom/next (8cd8892b7757 Merge branch 'drivers/next' into next)
+$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next
+Merge made by the 'ort' strategy.
+Merging drivers-memory/for-next (0d97f2176dec memory: mtk-smi: Add support for MT6795 Helio X10)
+$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next
+Already up to date.
+Merging imx-mxs/for-next (37960df982d0 Merge branch 'imx/defconfig' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next
+Auto-merging arch/arm/boot/dts/imx6qdl-colibri.dtsi
+Auto-merging arch/arm/boot/dts/imx6qdl.dtsi
+Auto-merging arch/arm/boot/dts/imx6ull-colibri.dtsi
+Auto-merging arch/arm/boot/dts/imx7d-smegw01.dts
+Auto-merging arch/arm/boot/dts/imx7s.dtsi
+Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+Auto-merging arch/arm64/boot/dts/freescale/imx8mp-evk.dts
+Auto-merging arch/arm64/boot/dts/freescale/imx8mp.dtsi
+Auto-merging drivers/soc/imx/imx8m-blk-ctrl.c
+Merge made by the 'ort' strategy.
+Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git keystone/next
+Merge made by the 'ort' strategy.
+Merging mediatek/for-next (5281655db0e1 Merge branch 'v5.19-next/soc' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next
+Merge made by the 'ort' strategy.
+Merging mvebu/for-next (58ec0844bd13 Merge branch 'mvebu/dt64' into mvebu/for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next
+Merge made by the 'ort' strategy.
+Merging omap/for-next (ad2fe4582c48 Merge branches 'omap-for-v5.20/omap1', 'omap-for-v5.20/ti-sysc' and 'omap-for-v5.20/soc' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next
+Auto-merging arch/arm/mach-omap1/timer.c
+Merge made by the 'ort' strategy.
+ arch/arm/mach-omap1/Kconfig        | 22 +++++++++++-----------
+ arch/arm/mach-omap1/timer.c        |  2 +-
+ arch/arm/mach-omap2/omap4-common.c |  1 +
+ drivers/bus/ti-sysc.c              |  3 +++
+ 4 files changed, 16 insertions(+), 12 deletions(-)
+Merging qcom/for-next (ca48adcc40b0 Merge branches 'arm64-for-5.20', 'arm64-defconfig-for-5.20', 'clk-for-5.20', 'dts-for-5.20', 'dts-fixes-for-5.19' and 'drivers-for-5.20' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next
+Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/boot/dts/qcom-msm8974.dtsi
+Merge made by the 'ort' strategy.
+ .../bindings/clock/qcom,gcc-apq8064.yaml           |   40 +-
+ .../bindings/clock/qcom,gcc-ipq8074.yaml           |    5 +
+ .../bindings/clock/qcom,gcc-msm8996.yaml           |   16 +
+ .../devicetree/bindings/clock/qcom,gcc-other.yaml  |    5 +-
+ .../devicetree/bindings/clock/qcom,gcc-sdm845.yaml |    3 +
+ drivers/clk/qcom/Kconfig                           |   22 +-
+ drivers/clk/qcom/Makefile                          |    3 +
+ drivers/clk/qcom/camcc-sdm845.c                    |    4 +
+ drivers/clk/qcom/camcc-sm8250.c                    |   16 +-
+ drivers/clk/qcom/camcc-sm8450.c                    | 2856 ++++++++++++++++++++
+ drivers/clk/qcom/clk-alpha-pll.c                   |  144 +-
+ drivers/clk/qcom/clk-alpha-pll.h                   |   11 +-
+ drivers/clk/qcom/clk-hfpll.c                       |   15 +-
+ drivers/clk/qcom/clk-krait.c                       |   23 +-
+ drivers/clk/qcom/clk-krait.h                       |    1 +
+ drivers/clk/qcom/clk-rcg2.c                        |   16 +-
+ drivers/clk/qcom/clk-regmap-phy-mux.c              |   62 +
+ drivers/clk/qcom/clk-regmap-phy-mux.h              |   33 +
+ drivers/clk/qcom/clk-rpmh.c                        |    5 +
+ drivers/clk/qcom/dispcc-sm8250.c                   |   63 +-
+ drivers/clk/qcom/gcc-ipq8074.c                     |  104 +-
+ drivers/clk/qcom/gcc-msm8916.c                     |   35 +
+ drivers/clk/qcom/gcc-msm8939.c                     |   31 +-
+ drivers/clk/qcom/gcc-msm8960.c                     |    6 +-
+ drivers/clk/qcom/gcc-sc7280.c                      |   49 +-
+ drivers/clk/qcom/gcc-sc8280xp.c                    |  142 +-
+ drivers/clk/qcom/gcc-sm6350.c                      |    2 +-
+ drivers/clk/qcom/gcc-sm8450.c                      |   49 +-
+ drivers/clk/qcom/gdsc.c                            |   28 +-
+ drivers/clk/qcom/gdsc.h                            |    4 +
+ drivers/clk/qcom/gpucc-sm8350.c                    |  637 +++++
+ drivers/clk/qcom/krait-cc.c                        |    8 +
+ drivers/clk/qcom/mmcc-msm8996.c                    | 1052 ++++---
+ drivers/soc/qcom/Kconfig                           |    1 +
+ include/dt-bindings/clock/qcom,gcc-ipq8074.h       |    1 +
+ include/dt-bindings/clock/qcom,gcc-msm8939.h       |    1 +
+ 36 files changed, 4873 insertions(+), 620 deletions(-)
+ create mode 100644 drivers/clk/qcom/camcc-sm8450.c
+ create mode 100644 drivers/clk/qcom/clk-regmap-phy-mux.c
+ create mode 100644 drivers/clk/qcom/clk-regmap-phy-mux.h
+ create mode 100644 drivers/clk/qcom/gpucc-sm8350.c
+Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git raspberrypi/for-next
+Auto-merging arch/arm/boot/dts/bcm2711-rpi-400.dts
+Merge made by the 'ort' strategy.
+Merging renesas/next (b5468cb7909f Merge branches 'renesas-arm-dt-for-v5.20' and 'renesas-dt-bindings-for-v5.20' into renesas-next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next
+Merge made by the 'ort' strategy.
+Merging reset/reset/next (096e772b1cdc Revert "reset: microchip-sparx5: allow building as a module")
+$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next
+Merge made by the 'ort' strategy.
+ drivers/reset/Kconfig | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging rockchip/for-next (2e1170c71ec0 Merge branch 'v5.20-armsoc/dts64' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next
+Auto-merging arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi
+Auto-merging arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
+Merge made by the 'ort' strategy.
+Merging samsung-krzk/for-next (5642cb8ce0f1 Merge branch 'next/dt' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next
+Auto-merging arch/arm64/boot/dts/exynos/exynos7885.dtsi
+Merge made by the 'ort' strategy.
+Merging scmi/for-linux-next (1a5c74382bce Merge branch 'for-next/arch_topology' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
+$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next
+Merge made by the 'ort' strategy.
+ arch/arm64/kernel/topology.c  |  14 -----
+ drivers/acpi/pptt.c           |  40 +-----------
+ drivers/base/arch_topology.c  | 100 +++++++++++++++++++++--------
+ drivers/base/cacheinfo.c      | 143 +++++++++++++++++++++++++++---------------
+ include/linux/acpi.h          |   5 --
+ include/linux/arch_topology.h |   1 -
+ include/linux/cacheinfo.h     |   3 +
+ 7 files changed, 172 insertions(+), 134 deletions(-)
+Merging stm32/stm32-next (4b43ff02d2a4 ARM: dts: stm32: Add ST MIPID02 bindings to AV96)
+$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'ort' strategy.
+ arch/arm/boot/dts/stm32mp131.dtsi | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging sunxi/sunxi/for-next (3a83b092dd59 Merge branch 'sunxi/dt-for-5.20' into sunxi/for-next)
+$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next
+Merge made by the 'ort' strategy.
+ drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c |  16 +----
+ drivers/clk/sunxi-ng/ccu-sun50i-h6.c   |  16 ++++-
+ drivers/clk/sunxi-ng/ccu-sun8i-de2.c   |  77 ++++++----------------
+ drivers/clk/sunxi-ng/ccu-sun8i-h3.c    | 113 +--------------------------------
+ drivers/clk/sunxi-ng/ccu-sun8i-r.c     |  40 +++---------
+ drivers/clk/sunxi-ng/ccu-sun8i-v3s.c   |  80 ++---------------------
+ drivers/clk/sunxi/Kconfig              |   4 +-
+ 7 files changed, 51 insertions(+), 295 deletions(-)
+Merging tee/next (db30e53bf897 Merge branch 'tee_cleanup_for_v5.19' into next)
+$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next
+Auto-merging drivers/tee/tee_shm.c
+Merge made by the 'ort' strategy.
+Merging tegra/for-next (393c6c3a6152 Merge branch for-5.20/arm64/defconfig into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next
+Merge made by the 'ort' strategy.
+ drivers/soc/tegra/Kconfig              |   11 +-
+ drivers/soc/tegra/Makefile             |    1 +
+ drivers/soc/tegra/cbb/Makefile         |    9 +
+ drivers/soc/tegra/cbb/tegra-cbb.c      |  190 +++
+ drivers/soc/tegra/cbb/tegra194-cbb.c   | 2365 ++++++++++++++++++++++++++++++++
+ drivers/soc/tegra/cbb/tegra234-cbb.c   | 1114 +++++++++++++++
+ drivers/soc/tegra/fuse/fuse-tegra.c    |   16 +
+ drivers/soc/tegra/fuse/tegra-apbmisc.c |   36 +-
+ include/soc/tegra/fuse.h               |    7 +
+ include/soc/tegra/tegra-cbb.h          |   47 +
+ 10 files changed, 3791 insertions(+), 5 deletions(-)
+ create mode 100644 drivers/soc/tegra/cbb/Makefile
+ create mode 100644 drivers/soc/tegra/cbb/tegra-cbb.c
+ create mode 100644 drivers/soc/tegra/cbb/tegra194-cbb.c
+ create mode 100644 drivers/soc/tegra/cbb/tegra234-cbb.c
+ create mode 100644 include/soc/tegra/tegra-cbb.h
+Merging ti/ti-next (62b9e4033c13 Merge branches 'ti-drivers-soc-next' and 'ti-k3-dts-next' into ti-next)
+$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next
+Merge made by the 'ort' strategy.
+Merging xilinx/for-next (516de80d448f Merge branch 'zynqmp/soc' into for-next)
+$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next
+Merge made by the 'ort' strategy.
+Merging clk/clk-next (16615b92d4dc Merge branch 'clk-renesas' into clk-next)
+$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next
+Auto-merging drivers/clk/ti/clkctrl.c
+Merge made by the 'ort' strategy.
+ .../arm/mediatek/mediatek,mt8186-sys-clock.yaml    |   3 +
+ .../arm/mediatek/mediatek,mt8192-clock.yaml        |   8 -
+ .../arm/mediatek/mediatek,mt8192-sys-clock.yaml    |   3 +
+ .../arm/mediatek/mediatek,mt8195-sys-clock.yaml    |   3 +
+ .../bindings/clock/fixed-factor-clock.yaml         |   1 -
+ .../bindings/clock/renesas,rzg2l-cpg.yaml          |   7 +-
+ drivers/clk/clk-devres.c                           |  91 +++++++--
+ drivers/clk/clk-fixed-factor.c                     |  11 +-
+ drivers/clk/clk.c                                  |  48 -----
+ drivers/clk/mediatek/clk-mt2701-eth.c              |  10 +-
+ drivers/clk/mediatek/clk-mt2701-g3d.c              |  10 +-
+ drivers/clk/mediatek/clk-mt2701-hif.c              |  10 +-
+ drivers/clk/mediatek/clk-mt2701.c                  |  22 ++-
+ drivers/clk/mediatek/clk-mt2712.c                  |  22 ++-
+ drivers/clk/mediatek/clk-mt7622-eth.c              |  10 +-
+ drivers/clk/mediatek/clk-mt7622-hif.c              |  12 +-
+ drivers/clk/mediatek/clk-mt7622.c                  |  22 ++-
+ drivers/clk/mediatek/clk-mt7629-eth.c              |  10 +-
+ drivers/clk/mediatek/clk-mt7629-hif.c              |  12 +-
+ drivers/clk/mediatek/clk-mt8135.c                  |  22 ++-
+ drivers/clk/mediatek/clk-mt8173.c                  |  22 ++-
+ drivers/clk/mediatek/clk-mt8183.c                  |  18 +-
+ drivers/clk/mediatek/clk-mt8186-infra_ao.c         |  23 +++
+ drivers/clk/mediatek/clk-mt8192-msdc.c             |  21 ---
+ drivers/clk/mediatek/clk-mt8192.c                  |  29 +++
+ drivers/clk/mediatek/clk-mt8195-infra_ao.c         |  24 +++
+ drivers/clk/mediatek/clk-mtk.c                     |   7 +
+ drivers/clk/mediatek/clk-mtk.h                     |   9 +-
+ drivers/clk/mediatek/reset.c                       | 198 +++++++++++++------
+ drivers/clk/mediatek/reset.h                       |  82 ++++++++
+ drivers/clk/meson/axg-audio.c                      |  36 +---
+ drivers/clk/renesas/clk-r8a73a4.c                  |  22 +--
+ drivers/clk/renesas/clk-r8a7740.c                  |  20 +-
+ drivers/clk/renesas/clk-r8a7778.c                  |  31 +--
+ drivers/clk/renesas/clk-r8a7779.c                  |  27 +--
+ drivers/clk/renesas/clk-rz.c                       |  33 ++--
+ drivers/clk/renesas/clk-sh73a0.c                   |  26 +--
+ drivers/clk/renesas/r8a779f0-cpg-mssr.c            |  10 +
+ drivers/clk/renesas/r9a06g032-clocks.c             |  32 ++--
+ drivers/clk/renesas/r9a07g044-cpg.c                |  17 +-
+ drivers/clk/renesas/r9a09g011-cpg.c                |   5 +
+ drivers/clk/renesas/rzg2l-cpg.c                    |   2 +-
+ drivers/clk/ti/clk-44xx.c                          | 210 ++++++++++-----------
+ drivers/clk/ti/clk-54xx.c                          | 160 ++++++++--------
+ drivers/clk/ti/clkctrl.c                           |   4 -
+ include/dt-bindings/reset/mt8186-resets.h          |   5 +
+ include/dt-bindings/reset/mt8192-resets.h          |   8 +
+ include/dt-bindings/reset/mt8195-resets.h          |   6 +
+ include/linux/clk-provider.h                       |   2 -
+ include/linux/clk.h                                | 134 ++++++++++++-
+ 50 files changed, 1030 insertions(+), 530 deletions(-)
+ create mode 100644 drivers/clk/mediatek/reset.h
+Merging clk-imx/for-next (c196175acdd3 clk: imx: clk-fracn-gppll: Add more freq config for video pll)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next
+Merge made by the 'ort' strategy.
+ drivers/clk/imx/clk-fracn-gppll.c | 36 +++++++++++++++++++++---------------
+ drivers/clk/imx/clk-imx93.c       |  6 +++---
+ 2 files changed, 24 insertions(+), 18 deletions(-)
+Merging clk-renesas/renesas-clk (0e704f6c42dc clk: renesas: rcar-gen4: Fix initconst confusion for cpg_pll_config)
+$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk
+Merge made by the 'ort' strategy.
+ drivers/clk/renesas/r9a07g043-cpg.c       | 32 +++++++++++++++++++++++++++++++
+ drivers/clk/renesas/rcar-gen4-cpg.c       |  2 +-
+ include/dt-bindings/clock/r9a07g043-cpg.h | 20 +++++++++++++++++++
+ 3 files changed, 53 insertions(+), 1 deletion(-)
+Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next
+Already up to date.
+Merging csky/linux-next (f5ac0fb05b23 csky: Move HEAD_TEXT_SECTION out of __init_begin-end)
+$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next
+Merge made by the 'ort' strategy.
+ arch/csky/include/asm/sections.h  | 10 ++++++++++
+ arch/csky/kernel/probes/kprobes.c |  4 ++++
+ arch/csky/kernel/setup.c          |  4 ++--
+ arch/csky/kernel/vmlinux.lds.S    | 15 ++++++++-------
+ arch/csky/mm/asid.c               |  5 ++---
+ 5 files changed, 26 insertions(+), 12 deletions(-)
+ create mode 100644 arch/csky/include/asm/sections.h
+Merging loongarch/loongarch-next (a111daf0c53a Linux 5.19-rc3)
+$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next
+Already up to date.
+Merging m68k/for-next (b508128bb0d1 m68k: defconfig: Update defconfigs for v5.19-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next
+Merge made by the 'ort' strategy.
+ arch/m68k/Kconfig.cpu                      |  7 ++--
+ arch/m68k/Kconfig.debug                    |  6 ++--
+ arch/m68k/Kconfig.machine                  |  5 +--
+ arch/m68k/configs/amiga_defconfig          | 14 +++-----
+ arch/m68k/configs/apollo_defconfig         | 14 +++-----
+ arch/m68k/configs/atari_defconfig          | 14 +++-----
+ arch/m68k/configs/bvme6000_defconfig       | 14 +++-----
+ arch/m68k/configs/hp300_defconfig          | 14 +++-----
+ arch/m68k/configs/mac_defconfig            | 14 +++-----
+ arch/m68k/configs/multi_defconfig          | 14 +++-----
+ arch/m68k/configs/mvme147_defconfig        | 14 +++-----
+ arch/m68k/configs/mvme16x_defconfig        | 14 +++-----
+ arch/m68k/configs/q40_defconfig            | 14 +++-----
+ arch/m68k/configs/sun3_defconfig           | 14 +++-----
+ arch/m68k/configs/sun3x_defconfig          | 14 +++-----
+ arch/m68k/include/asm/bitops.h             |  2 +-
+ arch/m68k/include/asm/processor.h          |  1 +
+ arch/m68k/include/uapi/asm/bootinfo-virt.h |  8 +++++
+ arch/m68k/kernel/traps.c                   |  1 +
+ arch/m68k/mac/iop.c                        |  4 +--
+ arch/m68k/mac/macints.c                    | 35 +++++++++---------
+ arch/m68k/q40/q40ints.c                    |  2 +-
+ arch/m68k/sun3/mmu_emu.c                   | 11 +++---
+ arch/m68k/virt/config.c                    | 11 ++++++
+ arch/m68k/virt/ints.c                      |  3 +-
+ arch/m68k/virt/platform.c                  | 58 +++++++++++++++++-------------
+ 26 files changed, 149 insertions(+), 173 deletions(-)
+Merging m68knommu/for-next (7ede4785ea97 m68k: Fix syntax errors in comments)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next
+Merge made by the 'ort' strategy.
+ arch/m68k/coldfire/device.c | 6 +++---
+ arch/m68k/coldfire/intc-2.c | 2 +-
+ arch/m68k/coldfire/m523x.c  | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+Merging microblaze/next (78b5f52ab6f6 microblaze: fix typos in comments)
+$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next
+Already up to date.
+Merging mips/mips-next (d3164e2f3b0a MIPS: Remove VR41xx support)
+$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next
+Auto-merging MAINTAINERS
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/mips/include/asm/io.h
+Merge made by the 'ort' strategy.
+ MAINTAINERS                                        |   1 +
+ arch/mips/Kbuild.platforms                         |   1 -
+ arch/mips/Kconfig                                  |  23 -
+ arch/mips/Makefile                                 |   1 -
+ arch/mips/alchemy/devboards/pm.c                   |   2 +-
+ arch/mips/boot/dts/img/pistachio_marduk.dts        |   4 +-
+ arch/mips/boot/dts/ingenic/ci20.dts                |   2 +-
+ arch/mips/boot/dts/ingenic/gcw0.dts                |  31 +-
+ arch/mips/boot/dts/ingenic/rs90.dts                |  18 +-
+ arch/mips/boot/dts/mscc/ocelot.dtsi                |   9 +-
+ arch/mips/boot/dts/pic32/pic32mzda_sk.dts          |   9 +-
+ arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts   |   6 +-
+ arch/mips/boot/dts/qca/ar9331_dpt_module.dts       |   4 +-
+ arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts     |   6 +-
+ arch/mips/boot/dts/qca/ar9331_omega.dts            |   4 +-
+ .../dts/qca/ar9331_openembed_som9331_board.dts     |   4 +-
+ arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts        |   8 +-
+ .../dts/ralink/gardena_smart_gateway_mt7688.dts    |   2 +-
+ arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts |   2 +-
+ arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts |   2 +-
+ .../cavium-octeon/executive/cvmx-helper-board.c    |   4 +-
+ arch/mips/cavium-octeon/octeon-platform.c          |   3 +-
+ arch/mips/configs/capcella_defconfig               |  91 ---
+ arch/mips/configs/e55_defconfig                    |  37 --
+ arch/mips/configs/mpc30x_defconfig                 |  53 --
+ arch/mips/configs/tb0219_defconfig                 |  76 ---
+ arch/mips/configs/tb0226_defconfig                 |  71 --
+ arch/mips/configs/tb0287_defconfig                 |  84 ---
+ arch/mips/configs/workpad_defconfig                |  67 --
+ arch/mips/include/asm/cpu-type.h                   |  11 -
+ arch/mips/include/asm/cpu.h                        |   3 +-
+ arch/mips/include/asm/io.h                         |   2 +-
+ arch/mips/include/asm/mach-vr41xx/irq.h            |   9 -
+ arch/mips/include/asm/mipsregs.h                   |  14 -
+ arch/mips/include/asm/octeon/cvmx-helper-board.h   |  12 +-
+ arch/mips/include/asm/pgtable-32.h                 |   5 -
+ arch/mips/include/asm/pgtable-64.h                 |   5 -
+ arch/mips/include/asm/vermagic.h                   |   2 -
+ arch/mips/include/asm/vr41xx/capcella.h            |  30 -
+ arch/mips/include/asm/vr41xx/giu.h                 |  41 --
+ arch/mips/include/asm/vr41xx/irq.h                 |  97 ---
+ arch/mips/include/asm/vr41xx/mpc30x.h              |  24 -
+ arch/mips/include/asm/vr41xx/pci.h                 |  77 ---
+ arch/mips/include/asm/vr41xx/siu.h                 |  45 --
+ arch/mips/include/asm/vr41xx/tb0219.h              |  29 -
+ arch/mips/include/asm/vr41xx/tb0226.h              |  30 -
+ arch/mips/include/asm/vr41xx/tb0287.h              |  30 -
+ arch/mips/include/asm/vr41xx/vr41xx.h              | 148 -----
+ arch/mips/kernel/cpu-probe.c                       |  40 --
+ arch/mips/kernel/proc.c                            |   2 +-
+ arch/mips/kernel/vdso.c                            |   2 +-
+ arch/mips/lib/dump_tlb.c                           |   8 -
+ arch/mips/loongson64/numa.c                        |   1 -
+ arch/mips/math-emu/dsemul.c                        |   9 +-
+ arch/mips/mm/c-r4k.c                               |  44 --
+ arch/mips/mm/context.c                             |   5 +-
+ arch/mips/mm/tlbex.c                               |  35 -
+ arch/mips/pci/Makefile                             |   6 -
+ arch/mips/pci/fixup-capcella.c                     |  37 --
+ arch/mips/pci/fixup-lemote2f.c                     |   2 +-
+ arch/mips/pci/fixup-mpc30x.c                       |  36 --
+ arch/mips/pci/fixup-tb0219.c                       |  38 --
+ arch/mips/pci/fixup-tb0226.c                       |  73 ---
+ arch/mips/pci/fixup-tb0287.c                       |  52 --
+ arch/mips/pci/ops-vr41xx.c                         | 113 ----
+ arch/mips/pci/pci-vr41xx.c                         | 309 ---------
+ arch/mips/pci/pci-vr41xx.h                         | 141 ----
+ arch/mips/sgi-ip22/ip22-gio.c                      |   2 +-
+ arch/mips/vr41xx/Kconfig                           | 104 ---
+ arch/mips/vr41xx/Makefile                          |   5 -
+ arch/mips/vr41xx/Platform                          |  29 -
+ arch/mips/vr41xx/casio-e55/Makefile                |   6 -
+ arch/mips/vr41xx/casio-e55/setup.c                 |  27 -
+ arch/mips/vr41xx/common/Makefile                   |   6 -
+ arch/mips/vr41xx/common/bcu.c                      | 210 ------
+ arch/mips/vr41xx/common/cmu.c                      | 242 -------
+ arch/mips/vr41xx/common/giu.c                      | 110 ----
+ arch/mips/vr41xx/common/icu.c                      | 714 ---------------------
+ arch/mips/vr41xx/common/init.c                     |  60 --
+ arch/mips/vr41xx/common/irq.c                      | 106 ---
+ arch/mips/vr41xx/common/pmu.c                      | 123 ----
+ arch/mips/vr41xx/common/rtc.c                      | 105 ---
+ arch/mips/vr41xx/common/siu.c                      | 142 ----
+ arch/mips/vr41xx/common/type.c                     |  11 -
+ arch/mips/vr41xx/ibm-workpad/Makefile              |   6 -
+ arch/mips/vr41xx/ibm-workpad/setup.c               |  27 -
+ 86 files changed, 69 insertions(+), 4158 deletions(-)
+ delete mode 100644 arch/mips/configs/capcella_defconfig
+ delete mode 100644 arch/mips/configs/e55_defconfig
+ delete mode 100644 arch/mips/configs/mpc30x_defconfig
+ delete mode 100644 arch/mips/configs/tb0219_defconfig
+ delete mode 100644 arch/mips/configs/tb0226_defconfig
+ delete mode 100644 arch/mips/configs/tb0287_defconfig
+ delete mode 100644 arch/mips/configs/workpad_defconfig
+ delete mode 100644 arch/mips/include/asm/mach-vr41xx/irq.h
+ delete mode 100644 arch/mips/include/asm/vr41xx/capcella.h
+ delete mode 100644 arch/mips/include/asm/vr41xx/giu.h
+ delete mode 100644 arch/mips/include/asm/vr41xx/irq.h
+ delete mode 100644 arch/mips/include/asm/vr41xx/mpc30x.h
+ delete mode 100644 arch/mips/include/asm/vr41xx/pci.h
+ delete mode 100644 arch/mips/include/asm/vr41xx/siu.h
+ delete mode 100644 arch/mips/include/asm/vr41xx/tb0219.h
+ delete mode 100644 arch/mips/include/asm/vr41xx/tb0226.h
+ delete mode 100644 arch/mips/include/asm/vr41xx/tb0287.h
+ delete mode 100644 arch/mips/include/asm/vr41xx/vr41xx.h
+ delete mode 100644 arch/mips/pci/fixup-capcella.c
+ delete mode 100644 arch/mips/pci/fixup-mpc30x.c
+ delete mode 100644 arch/mips/pci/fixup-tb0219.c
+ delete mode 100644 arch/mips/pci/fixup-tb0226.c
+ delete mode 100644 arch/mips/pci/fixup-tb0287.c
+ delete mode 100644 arch/mips/pci/ops-vr41xx.c
+ delete mode 100644 arch/mips/pci/pci-vr41xx.c
+ delete mode 100644 arch/mips/pci/pci-vr41xx.h
+ delete mode 100644 arch/mips/vr41xx/Kconfig
+ delete mode 100644 arch/mips/vr41xx/Makefile
+ delete mode 100644 arch/mips/vr41xx/Platform
+ delete mode 100644 arch/mips/vr41xx/casio-e55/Makefile
+ delete mode 100644 arch/mips/vr41xx/casio-e55/setup.c
+ delete mode 100644 arch/mips/vr41xx/common/Makefile
+ delete mode 100644 arch/mips/vr41xx/common/bcu.c
+ delete mode 100644 arch/mips/vr41xx/common/cmu.c
+ delete mode 100644 arch/mips/vr41xx/common/giu.c
+ delete mode 100644 arch/mips/vr41xx/common/icu.c
+ delete mode 100644 arch/mips/vr41xx/common/init.c
+ delete mode 100644 arch/mips/vr41xx/common/irq.c
+ delete mode 100644 arch/mips/vr41xx/common/pmu.c
+ delete mode 100644 arch/mips/vr41xx/common/rtc.c
+ delete mode 100644 arch/mips/vr41xx/common/siu.c
+ delete mode 100644 arch/mips/vr41xx/common/type.c
+ delete mode 100644 arch/mips/vr41xx/ibm-workpad/Makefile
+ delete mode 100644 arch/mips/vr41xx/ibm-workpad/setup.c
+Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git nios2/for-next
+Already up to date.
+Merging openrisc/for-next (48bddb89d59e openrisc: unwinder: Fix grammar issue in comment)
+$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next
+Already up to date.
+Merging parisc-hd/for-next (03c765b0e3b4 Linux 5.19-rc4)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next
+Already up to date.
+Merging powerpc/next (ac2a2303016b Merge branch 'topic/ppc-kvm' into next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/powerpc/include/asm/io.h
+Auto-merging arch/powerpc/kernel/irq.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/kernel-parameters.txt    |   6 -
+ arch/powerpc/Kconfig                               |   8 +-
+ arch/powerpc/Kconfig.debug                         |   4 +-
+ arch/powerpc/boot/dts/turris1x.dts                 | 475 ++++++++++++++++++++
+ arch/powerpc/configs/44x/akebono_defconfig         |   2 +-
+ arch/powerpc/configs/44x/currituck_defconfig       |   2 +-
+ arch/powerpc/configs/44x/fsp2_defconfig            |   2 +-
+ arch/powerpc/configs/44x/iss476-smp_defconfig      |   2 +-
+ arch/powerpc/configs/44x/warp_defconfig            |   2 +-
+ arch/powerpc/configs/52xx/lite5200b_defconfig      |   2 +-
+ arch/powerpc/configs/52xx/motionpro_defconfig      |   2 +-
+ arch/powerpc/configs/52xx/tqm5200_defconfig        |   2 +-
+ arch/powerpc/configs/adder875_defconfig            |   2 +-
+ arch/powerpc/configs/ep8248e_defconfig             |   2 +-
+ arch/powerpc/configs/ep88xc_defconfig              |   2 +-
+ arch/powerpc/configs/fsl-emb-nonhw.config          |   2 +-
+ arch/powerpc/configs/mgcoge_defconfig              |   2 +-
+ arch/powerpc/configs/mpc5200_defconfig             |   2 +-
+ arch/powerpc/configs/mpc8272_ads_defconfig         |   2 +-
+ arch/powerpc/configs/mpc885_ads_defconfig          |   2 +-
+ arch/powerpc/configs/ppc6xx_defconfig              |   2 +-
+ arch/powerpc/configs/pq2fads_defconfig             |   2 +-
+ arch/powerpc/configs/ps3_defconfig                 |   2 +-
+ arch/powerpc/configs/tqm8xx_defconfig              |   2 +-
+ arch/powerpc/include/asm/asm-prototypes.h          |  11 +-
+ arch/powerpc/include/asm/book3s/64/hugetlb.h       |   3 +
+ arch/powerpc/include/asm/cputime.h                 |   1 +
+ arch/powerpc/include/asm/hvcall.h                  |   8 +
+ arch/powerpc/include/asm/hw_irq.h                  |  77 +---
+ arch/powerpc/include/asm/inst.h                    |  19 -
+ arch/powerpc/include/asm/interrupt.h               |   1 +
+ arch/powerpc/include/asm/io.h                      |   1 -
+ arch/powerpc/include/asm/irq.h                     |   1 -
+ arch/powerpc/include/asm/kasan.h                   |  13 +-
+ arch/powerpc/include/asm/kvm_host.h                |  16 +-
+ arch/powerpc/include/asm/machdep.h                 |   2 -
+ arch/powerpc/include/asm/mman.h                    |   1 +
+ arch/powerpc/include/asm/mmu.h                     |  12 -
+ arch/powerpc/include/asm/mpc52xx.h                 |   1 -
+ arch/powerpc/include/asm/mpc5xxx.h                 |   9 +-
+ arch/powerpc/include/asm/nohash/64/pgalloc.h       |   5 +-
+ arch/powerpc/include/asm/nohash/64/pgtable.h       |  23 +-
+ arch/powerpc/include/asm/plpar_wrappers.h          |   5 +-
+ arch/powerpc/include/asm/prom.h                    |   1 +
+ arch/powerpc/include/asm/setup.h                   |   6 +-
+ arch/powerpc/include/asm/uaccess.h                 |   1 -
+ arch/powerpc/include/asm/word-at-a-time.h          |   2 +-
+ arch/powerpc/kernel/Makefile                       |   2 +-
+ arch/powerpc/kernel/asm-offsets.c                  |   2 +-
+ arch/powerpc/kernel/dawr.c                         |   1 +
+ arch/powerpc/kernel/head_64.S                      |   3 +
+ arch/powerpc/kernel/irq.c                          | 496 ++-------------------
+ arch/powerpc/kernel/irq_64.c                       | 466 +++++++++++++++++++
+ arch/powerpc/kernel/kprobes.c                      |   2 +-
+ arch/powerpc/kernel/pci-common.c                   |   1 +
+ arch/powerpc/kernel/prom.c                         |   2 +-
+ arch/powerpc/kernel/prom_init.c                    |   2 +-
+ arch/powerpc/kernel/setup_64.c                     |   1 -
+ arch/powerpc/kernel/trace/ftrace.c                 |  24 +-
+ arch/powerpc/kexec/core.c                          |   2 +
+ arch/powerpc/kvm/Kconfig                           |  21 +-
+ arch/powerpc/kvm/book3s_64_mmu_radix.c             |   1 +
+ arch/powerpc/kvm/book3s_64_vio.c                   |   2 +-
+ arch/powerpc/kvm/book3s_hv.c                       |  26 +-
+ arch/powerpc/kvm/book3s_hv.h                       |  10 +
+ arch/powerpc/kvm/book3s_hv_nested.c                |   1 +
+ arch/powerpc/kvm/book3s_hv_p9_entry.c              |  36 +-
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S            |  24 +-
+ arch/powerpc/kvm/book3s_xics.h                     |   1 +
+ arch/powerpc/kvm/powerpc.c                         |   1 +
+ arch/powerpc/kvm/trace_hv.h                        |  21 +-
+ arch/powerpc/lib/test_emulate_step.c               |   6 +-
+ arch/powerpc/mm/book3s32/mmu.c                     |   2 +-
+ arch/powerpc/mm/book3s64/hash_pgtable.c            |   1 +
+ arch/powerpc/mm/book3s64/pkeys.c                   |   1 +
+ arch/powerpc/mm/hugetlbpage.c                      |   1 +
+ arch/powerpc/mm/init_32.c                          |  37 --
+ arch/powerpc/mm/kasan/Makefile                     |   1 +
+ arch/powerpc/mm/kasan/init_book3e_64.c             | 133 ++++++
+ arch/powerpc/mm/kasan/init_book3s_64.c             |   2 +
+ arch/powerpc/mm/mem.c                              |   1 +
+ arch/powerpc/mm/mmu_decl.h                         |   1 -
+ arch/powerpc/mm/nohash/40x.c                       |   9 +-
+ arch/powerpc/mm/nohash/8xx.c                       |   9 -
+ arch/powerpc/mm/nohash/book3e_hugetlbpage.c        |  30 +-
+ arch/powerpc/mm/nohash/tlb_low_64e.S               | 147 ++----
+ arch/powerpc/mm/ptdump/shared.c                    |   6 +-
+ arch/powerpc/net/bpf_jit_comp32.c                  |  72 ++-
+ arch/powerpc/net/bpf_jit_comp64.c                  |  96 ++--
+ arch/powerpc/perf/core-book3s.c                    |  35 +-
+ arch/powerpc/perf/isa207-common.c                  |   3 +
+ arch/powerpc/perf/isa207-common.h                  |   1 +
+ arch/powerpc/platforms/52xx/mpc52xx_common.c       |  37 --
+ arch/powerpc/platforms/52xx/mpc52xx_gpt.c          |  20 +-
+ arch/powerpc/platforms/83xx/misc.c                 |  14 +-
+ arch/powerpc/platforms/Kconfig.cputype             |   1 -
+ arch/powerpc/platforms/powermac/setup.c            |   7 -
+ arch/powerpc/platforms/powernv/Kconfig             |   2 +-
+ arch/powerpc/platforms/pseries/iommu.c             |   8 +-
+ arch/powerpc/platforms/pseries/kexec.c             |   2 +-
+ arch/powerpc/platforms/pseries/lpar.c              |   2 +-
+ .../platforms/pseries/papr_platform_attributes.c   |   1 +
+ arch/powerpc/platforms/pseries/papr_scm.c          |   2 +-
+ arch/powerpc/platforms/pseries/setup.c             |   6 +-
+ arch/powerpc/platforms/pseries/vas.c               |   1 +
+ arch/powerpc/sysdev/fsl_pci.c                      |   1 +
+ arch/powerpc/sysdev/mpc5xxx_clocks.c               |  41 +-
+ arch/powerpc/xmon/xmon.c                           |   2 +-
+ drivers/ata/pata_mpc52xx.c                         |   2 +-
+ drivers/i2c/busses/i2c-mpc.c                       |   7 +-
+ drivers/misc/cxl/cxl.h                             |   2 +-
+ drivers/net/can/mscan/mpc5xxx_can.c                |   2 +-
+ drivers/net/ethernet/freescale/fec_mpc52xx.c       |   2 +-
+ drivers/net/ethernet/freescale/fec_mpc52xx_phy.c   |   3 +-
+ drivers/net/ethernet/freescale/fs_enet/mii-fec.c   |   4 +-
+ drivers/scsi/mesh.c                                |   7 +-
+ drivers/spi/spi-mpc52xx.c                          |   2 +-
+ drivers/tty/serial/mpc52xx_uart.c                  |   4 +-
+ tools/testing/selftests/powerpc/include/reg.h      |   4 +
+ tools/testing/selftests/powerpc/include/utils.h    |  10 +
+ tools/testing/selftests/powerpc/math/.gitignore    |   1 +
+ tools/testing/selftests/powerpc/mce/.gitignore     |   1 +
+ .../selftests/powerpc/papr_attributes/attr_test.c  |  30 +-
+ tools/testing/selftests/powerpc/pmu/Makefile       |  11 +-
+ tools/testing/selftests/powerpc/pmu/branch_loops.S |  28 ++
+ tools/testing/selftests/powerpc/pmu/ebb/.gitignore |   1 +
+ .../powerpc/pmu/event_code_tests/Makefile          |  15 +
+ .../pmu/event_code_tests/blacklisted_events_test.c | 132 ++++++
+ .../event_alternatives_tests_p10.c                 | 109 +++++
+ .../event_code_tests/event_alternatives_tests_p9.c | 116 +++++
+ .../event_code_tests/generic_events_valid_test.c   | 130 ++++++
+ .../event_code_tests/group_constraint_cache_test.c |  60 +++
+ .../group_constraint_l2l3_sel_test.c               |  64 +++
+ .../group_constraint_mmcra_sample_test.c           |  54 +++
+ .../event_code_tests/group_constraint_pmc56_test.c |  63 +++
+ .../group_constraint_pmc_count_test.c              |  70 +++
+ .../group_constraint_radix_scope_qual_test.c       |  56 +++
+ .../group_constraint_repeat_test.c                 |  56 +++
+ .../group_constraint_thresh_cmp_test.c             |  96 ++++
+ .../group_constraint_thresh_ctl_test.c             |  64 +++
+ .../group_constraint_thresh_sel_test.c             |  63 +++
+ .../event_code_tests/group_constraint_unit_test.c  |  74 +++
+ .../group_pmc56_exclude_constraints_test.c         |  64 +++
+ .../event_code_tests/hw_cache_event_type_test.c    |  88 ++++
+ .../pmu/event_code_tests/invalid_event_code_test.c |  67 +++
+ .../reserved_bits_mmcra_sample_elig_mode_test.c    |  77 ++++
+ .../reserved_bits_mmcra_thresh_ctl_test.c          |  44 ++
+ .../selftests/powerpc/pmu/sampling_tests/Makefile  |   7 +-
+ .../pmu/sampling_tests/bhrb_filter_map_test.c      | 105 +++++
+ .../pmu/sampling_tests/bhrb_no_crash_wo_pmu_test.c |  59 +++
+ .../intr_regs_no_crash_wo_pmu_test.c               |  57 +++
+ .../selftests/powerpc/pmu/sampling_tests/misc.c    | 135 +++++-
+ .../selftests/powerpc/pmu/sampling_tests/misc.h    |   9 +-
+ .../pmu/sampling_tests/mmcr1_sel_unit_cache_test.c |  77 ++++
+ .../pmu/sampling_tests/mmcra_bhrb_any_test.c       |  65 +++
+ .../pmu/sampling_tests/mmcra_bhrb_cond_test.c      |  69 +++
+ .../mmcra_bhrb_disable_no_branch_test.c            |  64 +++
+ .../pmu/sampling_tests/mmcra_bhrb_disable_test.c   |  66 +++
+ .../pmu/sampling_tests/mmcra_bhrb_ind_call_test.c  |  69 +++
+ .../pmu/sampling_tests/mmcra_thresh_cmp_test.c     |  74 +++
+ .../testing/selftests/powerpc/security/.gitignore  |   1 +
+ 161 files changed, 4124 insertions(+), 1057 deletions(-)
+ create mode 100644 arch/powerpc/boot/dts/turris1x.dts
+ create mode 100644 arch/powerpc/kernel/irq_64.c
+ create mode 100644 arch/powerpc/mm/kasan/init_book3e_64.c
+ create mode 100644 tools/testing/selftests/powerpc/mce/.gitignore
+ create mode 100644 tools/testing/selftests/powerpc/pmu/branch_loops.S
+ create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/Makefile
+ create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/blacklisted_events_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/event_alternatives_tests_p10.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/event_alternatives_tests_p9.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/generic_events_valid_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_cache_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_l2l3_sel_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_mmcra_sample_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_pmc56_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_pmc_count_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_radix_scope_qual_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_repeat_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_thresh_cmp_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_thresh_ctl_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_thresh_sel_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_unit_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/group_pmc56_exclude_constraints_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/hw_cache_event_type_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/invalid_event_code_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/reserved_bits_mmcra_sample_elig_mode_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/event_code_tests/reserved_bits_mmcra_thresh_ctl_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/bhrb_filter_map_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/bhrb_no_crash_wo_pmu_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/intr_regs_no_crash_wo_pmu_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcr1_sel_unit_cache_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_any_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_cond_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_disable_no_branch_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_disable_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_ind_call_test.c
+ create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_thresh_cmp_test.c
+Merging soc-fsl/next (4b0986a3613c Linux 5.18)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next
+Already up to date.
+Merging risc-v/for-next (b49816611eac riscv: dts: sifive: "fix" pmic watchdog node name)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next
+Auto-merging arch/riscv/Kconfig
+Auto-merging arch/riscv/boot/dts/microchip/mpfs.dtsi
+Merge made by the 'ort' strategy.
+ arch/riscv/Kconfig                                 | 47 ++++++++++++++++------
+ arch/riscv/Kconfig.erratas                         |  2 +-
+ arch/riscv/Kconfig.socs                            |  4 +-
+ arch/riscv/boot/dts/canaan/k210.dtsi               | 12 ++++++
+ arch/riscv/boot/dts/microchip/mpfs.dtsi            | 27 +++++++++++--
+ arch/riscv/boot/dts/sifive/fu540-c000.dtsi         | 24 +++++++++++
+ arch/riscv/boot/dts/sifive/fu740-c000.dtsi         | 24 +++++++++++
+ .../riscv/boot/dts/sifive/hifive-unmatched-a00.dts |  2 +-
+ arch/riscv/boot/dts/starfive/jh7100.dtsi           | 16 +++++++-
+ arch/riscv/configs/32-bit.config                   |  2 +
+ arch/riscv/configs/defconfig                       |  1 +
+ arch/riscv/configs/nommu_k210_defconfig            |  1 +
+ arch/riscv/configs/nommu_k210_sdcard_defconfig     |  1 +
+ arch/riscv/configs/nommu_virt_defconfig            |  1 +
+ arch/riscv/configs/rv32_defconfig                  |  1 +
+ arch/riscv/errata/thead/errata.c                   | 38 ++++++-----------
+ arch/riscv/include/asm/hwcap.h                     | 25 ++++++++++++
+ arch/riscv/include/asm/pci.h                       |  4 +-
+ arch/riscv/include/asm/switch_to.h                 |  4 +-
+ arch/riscv/kernel/alternative.c                    | 18 ++++-----
+ arch/riscv/kernel/cpufeature.c                     | 46 ++++++++-------------
+ 21 files changed, 211 insertions(+), 89 deletions(-)
+Merging risc-v-mc/dt-for-next (88d319c6abae riscv: dts: microchip: Add mpfs' topology information)
+$ git merge -m Merge branch 'dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git risc-v-mc/dt-for-next
+Already up to date.
+Merging s390/for-next (d1a22ff346f3 Merge branch 'features' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next
+Merge made by the 'ort' strategy.
+ tools/testing/crypto/chacha20-s390/test-cipher.c | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size)
+$ git merge -m Merge branch 'for-next' of git://git.libc.org/linux-sh sh/for-next
+Already up to date.
+Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git sparc-next/master
+Already up to date.
+Merging uml/linux-next (2a4a62a14be1 um: Fix out-of-bounds read in LDT setup)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git uml/linux-next
+Already up to date.
+Merging xtensa/xtensa-for-next (0847d167d0f9 xtensa: enable ARCH_HAS_GCOV_PROFILE_ALL)
+$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next
+Auto-merging arch/xtensa/Kconfig
+Merge made by the 'ort' strategy.
+ .../debug/gcov-profile-all/arch-support.txt        |  2 +-
+ Documentation/features/debug/kcov/arch-support.txt |  2 +-
+ arch/xtensa/Kconfig                                |  2 +
+ arch/xtensa/boot/lib/Makefile                      |  2 +
+ arch/xtensa/platforms/iss/network.c                | 63 ++++++++++------------
+ 5 files changed, 34 insertions(+), 37 deletions(-)
+Merging pidfd/for-next (f70417005a89 Revert "ovl: turn of SB_POSIXACL with idmapped layers temporarily")
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next
+Merge made by the 'ort' strategy.
+ Documentation/filesystems/overlayfs.rst |   4 -
+ fs/attr.c                               |  74 ++++----
+ fs/ext2/inode.c                         |   8 +-
+ fs/ext4/inode.c                         |  14 +-
+ fs/f2fs/file.c                          |  22 +--
+ fs/f2fs/recovery.c                      |  10 +-
+ fs/fat/file.c                           |   9 +-
+ fs/jfs/file.c                           |   4 +-
+ fs/ksmbd/vfs.c                          |   2 +-
+ fs/ksmbd/vfs.h                          |   2 +-
+ fs/ocfs2/file.c                         |   2 +-
+ fs/open.c                               |  60 +++++--
+ fs/overlayfs/copy_up.c                  |   4 +-
+ fs/overlayfs/inode.c                    |  87 ++++++++-
+ fs/overlayfs/overlayfs.h                |  15 +-
+ fs/overlayfs/super.c                    |  25 +--
+ fs/posix_acl.c                          | 168 ++++++++++++------
+ fs/quota/dquot.c                        |  17 +-
+ fs/reiserfs/inode.c                     |   4 +-
+ fs/xattr.c                              |  25 ++-
+ fs/xfs/xfs_iops.c                       |  14 +-
+ fs/zonefs/super.c                       |   2 +-
+ include/linux/evm.h                     |   6 +-
+ include/linux/fs.h                      | 140 ++++++++++++++-
+ include/linux/mnt_idmapping.h           | 305 ++++++++++++++++++++++++++++----
+ include/linux/posix_acl.h               |   1 +
+ include/linux/posix_acl_xattr.h         |  34 ++--
+ include/linux/quotaops.h                |  15 +-
+ include/linux/security.h                |   8 +-
+ include/linux/xattr.h                   |   2 +-
+ security/integrity/evm/evm_main.c       |  12 +-
+ security/security.c                     |   5 +-
+ 32 files changed, 815 insertions(+), 285 deletions(-)
+Merging fscrypt/master (218d921b581e fscrypt: add new helper functions for test_dummy_encryption)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt/master
+Already up to date.
+Merging fscache/fscache-next (0885eacdc81f Merge tag 'nfsd-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux)
+$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next
+Already up to date.
+Merging afs/afs-next (26291c54e111 Linux 5.17-rc2)
+$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next
+Already up to date.
+Merging btrfs/for-next (3f0dabb4090c Merge branch 'for-next-next-v5.19-20220712' into for-next-20220712)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/btrfs/zoned.c
+Merge made by the 'ort' strategy.
+ arch/parisc/include/asm/cacheflush.h |   6 +-
+ arch/parisc/kernel/cache.c           |   2 +-
+ fs/btrfs/async-thread.h              |   1 -
+ fs/btrfs/backref.c                   |  88 ++--
+ fs/btrfs/backref.h                   |   3 +-
+ fs/btrfs/block-group.c               |  34 +-
+ fs/btrfs/block-rsv.c                 |  21 +-
+ fs/btrfs/block-rsv.h                 |  15 +-
+ fs/btrfs/btrfs_inode.h               |  25 +-
+ fs/btrfs/compression.c               | 360 ++++----------
+ fs/btrfs/compression.h               |  18 +-
+ fs/btrfs/ctree.h                     | 105 ++++-
+ fs/btrfs/delalloc-space.c            |   6 +-
+ fs/btrfs/delayed-inode.c             | 364 ++++++++++-----
+ fs/btrfs/delayed-inode.h             |  11 +
+ fs/btrfs/delayed-ref.c               |   4 +-
+ fs/btrfs/dev-replace.c               |   3 +-
+ fs/btrfs/disk-io.c                   | 268 ++++-------
+ fs/btrfs/disk-io.h                   |  17 +-
+ fs/btrfs/extent-tree.c               | 149 +++---
+ fs/btrfs/extent_io.c                 | 876 ++++++++++++++++-------------------
+ fs/btrfs/extent_io.h                 |  16 +-
+ fs/btrfs/file.c                      |  85 +++-
+ fs/btrfs/free-space-cache.c          |   3 +-
+ fs/btrfs/inode.c                     | 754 ++++++++++++++++--------------
+ fs/btrfs/ioctl.c                     | 150 +++---
+ fs/btrfs/lzo.c                       |  28 +-
+ fs/btrfs/ordered-data.c              |  40 +-
+ fs/btrfs/ordered-data.h              |   5 +-
+ fs/btrfs/raid56.c                    | 792 +++++++++++++++----------------
+ fs/btrfs/raid56.h                    | 168 ++++++-
+ fs/btrfs/reflink.c                   |  19 +-
+ fs/btrfs/scrub.c                     |  71 ++-
+ fs/btrfs/send.c                      | 781 +++++++++++++++++++++----------
+ fs/btrfs/send.h                      | 169 ++++---
+ fs/btrfs/space-info.c                | 110 ++++-
+ fs/btrfs/space-info.h                |   8 +-
+ fs/btrfs/struct-funcs.c              |  11 +-
+ fs/btrfs/subpage.c                   |   4 +-
+ fs/btrfs/super.c                     |  36 +-
+ fs/btrfs/sysfs.c                     | 186 +++++++-
+ fs/btrfs/tests/btrfs-tests.c         |   1 +
+ fs/btrfs/tests/extent-buffer-tests.c |   3 +-
+ fs/btrfs/transaction.c               |  26 +-
+ fs/btrfs/tree-log.c                  |  20 +-
+ fs/btrfs/tree-log.h                  |   3 +
+ fs/btrfs/volumes.c                   | 357 +++++++-------
+ fs/btrfs/volumes.h                   |  46 +-
+ fs/btrfs/zlib.c                      |  42 +-
+ fs/btrfs/zoned.c                     | 130 +++++-
+ fs/btrfs/zoned.h                     |  18 +
+ fs/btrfs/zstd.c                      |  33 +-
+ include/linux/blkdev.h               |   5 +
+ include/linux/highmem-internal.h     |  10 +-
+ include/trace/events/btrfs.h         | 158 +++++++
+ include/uapi/linux/btrfs.h           |  10 +-
+ mm/highmem.c                         |   2 +-
+ 57 files changed, 3842 insertions(+), 2834 deletions(-)
+Merging ceph/master (91c08da8e7fc fscrypt: add fscrypt_context_for_new_inode)
+$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master
+Merge made by the 'ort' strategy.
+ Documentation/filesystems/netfs_library.rst |  8 ++++---
+ fs/afs/file.c                               |  2 +-
+ fs/ceph/addr.c                              | 11 +++++----
+ fs/crypto/fname.c                           | 36 ++++++++++++++++++++++++-----
+ fs/crypto/fscrypt_private.h                 |  9 +++-----
+ fs/crypto/hooks.c                           |  6 ++---
+ fs/crypto/policy.c                          | 35 +++++++++++++++++++++++-----
+ fs/inode.c                                  | 10 +++++---
+ fs/netfs/buffered_read.c                    | 17 ++++++++------
+ include/linux/fscrypt.h                     |  5 ++++
+ include/linux/netfs.h                       |  2 +-
+ 11 files changed, 100 insertions(+), 41 deletions(-)
+Merging cifs/for-next (2987372a321e cifs: remove redundant initialization to variable mnt_sign_enabled)
+$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next
+Merge made by the 'ort' strategy.
+ fs/cifs/cifssmb.c | 2 +-
+ fs/cifs/smb2ops.c | 5 +++--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+Merging configfs/for-next (84ec758fb2da configfs: fix a race in configfs_{,un}register_subsystem())
+$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next
+Already up to date.
+Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next
+Already up to date.
+Merging erofs/dev (2c13554cafe7 erofs: introduce multi-reference pclusters (fully-referenced))
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS                  |   2 +
+ fs/erofs/compress.h          |   2 +-
+ fs/erofs/decompressor.c      |  18 +-
+ fs/erofs/decompressor_lzma.c |   1 +
+ fs/erofs/zdata.c             | 777 ++++++++++++++++++++++++-------------------
+ fs/erofs/zdata.h             | 119 +++----
+ fs/erofs/zpvec.h             | 159 ---------
+ 7 files changed, 503 insertions(+), 575 deletions(-)
+ delete mode 100644 fs/erofs/zpvec.h
+Merging exfat/dev (204e6ceaa103 exfat: use updated exfat_chain directly during renaming)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev
+Already up to date.
+Merging ext3/for_next (7fd0dbb80f46 Merge ext2 min_t() cleanup from Jiangshan Yi.)
+$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next
+Merge made by the 'ort' strategy.
+ fs/ext2/super.c                    |   6 +-
+ fs/notify/fanotify/fanotify.c      |  19 ++++---
+ fs/notify/fanotify/fanotify.h      |   2 +
+ fs/notify/fanotify/fanotify_user.c | 110 ++++++++++++++++++++++++++++---------
+ fs/notify/fdinfo.c                 |   6 +-
+ fs/notify/fsnotify.c               |  21 ++++---
+ fs/notify/inotify/inotify_user.c   |   2 +-
+ include/linux/fanotify.h           |  14 +++--
+ include/linux/fsnotify_backend.h   |  89 ++++++++++++++++++++++++++++--
+ include/uapi/linux/fanotify.h      |   8 +++
+ 10 files changed, 215 insertions(+), 62 deletions(-)
+Merging ext4/dev (f8dc286e4d94 jbd2: fix outstanding credits assert in jbd2_journal_commit_transaction())
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev
+Auto-merging fs/ext4/inode.c
+Merge made by the 'ort' strategy.
+ fs/ext4/balloc.c      |  2 +-
+ fs/ext4/ext4.h        |  5 +++--
+ fs/ext4/ext4_jbd2.c   |  3 +--
+ fs/ext4/fast_commit.c | 44 ++++++++++++++++++++++----------------------
+ fs/ext4/indirect.c    |  4 ++--
+ fs/ext4/inline.c      | 30 ++++++++++++++++++++++++++++++
+ fs/ext4/inode.c       |  2 +-
+ fs/ext4/ioctl.c       | 22 +++++++++++++++-------
+ fs/ext4/mballoc.c     | 10 ++++++++--
+ fs/ext4/orphan.c      | 24 ++++++++++++------------
+ fs/ext4/resize.c      |  6 +++++-
+ fs/ext4/super.c       |  4 ++--
+ fs/ext4/symlink.c     | 15 +++++++++++++++
+ fs/jbd2/checkpoint.c  |  6 +++---
+ fs/jbd2/commit.c      | 32 ++++++++++++++++----------------
+ fs/jbd2/journal.c     | 41 +++++++++++++++++++----------------------
+ fs/jbd2/recovery.c    | 30 +++++++++++++++---------------
+ fs/jbd2/revoke.c      |  8 ++++----
+ fs/jbd2/transaction.c | 26 +++++++++++++-------------
+ include/linux/jbd2.h  |  6 ++----
+ 20 files changed, 189 insertions(+), 131 deletions(-)
+Merging f2fs/dev (785c1904b28d f2fs: add a sysfs entry to show zone capacity)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev
+Auto-merging fs/f2fs/file.c
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-fs-f2fs |   6 +
+ Documentation/filesystems/f2fs.rst      |   5 +
+ fs/f2fs/compress.c                      | 211 ++++++++++++++++++++------------
+ fs/f2fs/data.c                          |  52 +++++---
+ fs/f2fs/debug.c                         |   2 +-
+ fs/f2fs/f2fs.h                          |  32 +++--
+ fs/f2fs/file.c                          |  14 +--
+ fs/f2fs/gc.c                            |   4 +-
+ fs/f2fs/gc.h                            |  21 ++--
+ fs/f2fs/node.c                          |   8 +-
+ fs/f2fs/segment.c                       |  26 ++--
+ fs/f2fs/segment.h                       |  11 +-
+ fs/f2fs/super.c                         |  86 ++++++++-----
+ fs/f2fs/sysfs.c                         |  10 ++
+ 14 files changed, 305 insertions(+), 183 deletions(-)
+Merging fsverity/fsverity (e6af1bb07704 fs-verity: Use struct_size() helper in enable_verity())
+$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity
+Already up to date.
+Merging fuse/for-next (6b49bc9d8a5f fuse: avoid unnecessary spinlock bump)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next
+Auto-merging fs/fuse/dax.c
+Auto-merging fs/fuse/dir.c
+Auto-merging fs/fuse/file.c
+Merge made by the 'ort' strategy.
+ fs/fuse/dax.c  |  2 +-
+ fs/fuse/dir.c  |  7 ++++++-
+ fs/fuse/file.c | 39 ++++++++++++++++++++++++++-------------
+ 3 files changed, 33 insertions(+), 15 deletions(-)
+Merging gfs2/for-next (44dab005fd42 gfs2: Minor gfs2_glock_nq_m cleanup)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next
+Merge made by the 'ort' strategy.
+ fs/gfs2/dir.c      |  2 +-
+ fs/gfs2/file.c     |  3 +--
+ fs/gfs2/glock.c    | 13 +++++--------
+ fs/gfs2/lock_dlm.c |  2 +-
+ fs/gfs2/rgrp.c     |  9 ++++++---
+ fs/gfs2/rgrp.h     |  3 ++-
+ fs/gfs2/xattr.c    |  2 +-
+ 7 files changed, 17 insertions(+), 17 deletions(-)
+Merging jfs/jfs-next (e471e5942c00 fs/jfs: Remove dead code)
+$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next
+Already up to date.
+Merging ksmbd/ksmbd-for-next (732f30694325 Merge tag '5.19-rc4-ksmbd-server-fixes' of git://git.samba.org/ksmbd)
+$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next
+Already up to date.
+Merging nfs/linux-next (32346491ddf2 Linux 5.19-rc6)
+$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next
+Already up to date.
+Merging nfs-anna/linux-next (4f40a5b55446 NFSv4: Add an fattr allocation to _nfs4_discover_trunking())
+$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next
+Already up to date.
+Merging nfsd/for-next (05eaba9bd8c0 NFSD: limit the number of v4 clients to 1024 per 1GB of system memory)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next
+Auto-merging fs/nfsd/nfsd.h
+Merge made by the 'ort' strategy.
+ Documentation/fault-injection/fault-injection.rst |   7 +
+ fs/lockd/svc4proc.c                               |   4 +-
+ fs/lockd/svclock.c                                |  10 +-
+ fs/lockd/svcproc.c                                |   5 +-
+ fs/nfsd/filecache.c                               | 727 ++++++++++++++--------
+ fs/nfsd/filecache.h                               |   7 +-
+ fs/nfsd/netns.h                                   |   3 +
+ fs/nfsd/nfs4proc.c                                |  10 +-
+ fs/nfsd/nfs4state.c                               |  35 +-
+ fs/nfsd/nfsctl.c                                  |  19 +-
+ fs/nfsd/nfsd.h                                    |   2 +
+ fs/nfsd/nfsfh.c                                   |   5 +-
+ fs/nfsd/trace.h                                   | 325 +++++++++-
+ include/linux/lockd/lockd.h                       |   1 +
+ include/trace/events/sunrpc.h                     |  14 +-
+ net/sunrpc/svc_xprt.c                             |   2 +-
+ 16 files changed, 833 insertions(+), 343 deletions(-)
+Merging ntfs3/master (604a9d272dc3 fs/ntfs3: Remove unnecessary 'NULL' values from pointers)
+$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master
+Auto-merging fs/ntfs3/file.c
+Auto-merging fs/ntfs3/inode.c
+Auto-merging fs/ntfs3/ntfs_fs.h
+Auto-merging fs/ntfs3/super.c
+Merge made by the 'ort' strategy.
+ fs/ntfs3/attrib.c  | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ fs/ntfs3/bitmap.c  |   4 +-
+ fs/ntfs3/file.c    |  98 ++++++++++++++++-------------
+ fs/ntfs3/frecord.c |  49 +++++++++++----
+ fs/ntfs3/fslog.c   |   4 +-
+ fs/ntfs3/fsntfs.c  |  25 ++++----
+ fs/ntfs3/index.c   |  31 ++++-----
+ fs/ntfs3/inode.c   |   1 +
+ fs/ntfs3/ntfs_fs.h |   6 +-
+ fs/ntfs3/record.c  |   5 +-
+ fs/ntfs3/run.c     |  42 +++++++++++++
+ fs/ntfs3/super.c   |   8 +--
+ fs/ntfs3/xattr.c   |   6 +-
+ 13 files changed, 355 insertions(+), 104 deletions(-)
+Merging orangefs/for-next (40a74870b2d1 orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next
+Already up to date.
+Merging overlayfs/overlayfs-next (4a47c6385bb4 ovl: turn of SB_POSIXACL with idmapped layers temporarily)
+$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next
+Already up to date.
+Merging ubifs/next (8c03a1c21d72 ubi: ubi_create_volume: Fix use-after-free when volume creation failed)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next
+Already up to date.
+Merging v9fs/9p-next (89a9ef3e8d02 net: 9p: fix refcount leak in p9_read_work() error handling)
+$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next
+Merge made by the 'ort' strategy.
+ fs/9p/fid.c               |  61 +++++++++-------
+ fs/9p/fid.h               |   6 +-
+ fs/9p/vfs_addr.c          |   4 +-
+ fs/9p/vfs_dentry.c        |   4 +-
+ fs/9p/vfs_dir.c           |   2 +-
+ fs/9p/vfs_file.c          |   9 +--
+ fs/9p/vfs_inode.c         |  89 ++++++++++-------------
+ fs/9p/vfs_inode_dotl.c    |  82 ++++++++-------------
+ fs/9p/vfs_super.c         |   8 +--
+ fs/9p/xattr.c             |   8 +--
+ include/net/9p/client.h   |  49 +++++++++++--
+ include/trace/events/9p.h |  48 +++++++++++++
+ net/9p/client.c           | 180 +++++++++++++++++++++++-----------------------
+ net/9p/trans_fd.c         |  13 ++--
+ net/9p/trans_rdma.c       |   2 +-
+ net/9p/trans_virtio.c     |   4 +-
+ net/9p/trans_xen.c        |   2 +-
+ 17 files changed, 316 insertions(+), 255 deletions(-)
+Merging xfs/for-next (95ff0363f3f6 xfs: fix use-after-free in xattr node block inactivation)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next
+Auto-merging fs/xfs/xfs_iops.c
+Merge made by the 'ort' strategy.
+ .../filesystems/xfs-delayed-logging-design.rst     | 361 ++++++++++--
+ fs/xfs/Makefile                                    |   1 +
+ fs/xfs/libxfs/xfs_ag.c                             | 171 ++++--
+ fs/xfs/libxfs/xfs_ag.h                             |  75 ++-
+ fs/xfs/libxfs/xfs_ag_resv.c                        |   2 +-
+ fs/xfs/libxfs/xfs_alloc.c                          | 143 +++--
+ fs/xfs/libxfs/xfs_alloc.h                          |  58 +-
+ fs/xfs/libxfs/xfs_alloc_btree.c                    |   9 +-
+ fs/xfs/libxfs/xfs_attr.c                           |  22 +-
+ fs/xfs/libxfs/xfs_attr.h                           |  10 +-
+ fs/xfs/libxfs/xfs_attr_leaf.c                      |  29 +-
+ fs/xfs/libxfs/xfs_attr_remote.c                    |  15 +-
+ fs/xfs/libxfs/xfs_bmap.c                           |  84 +--
+ fs/xfs/libxfs/xfs_bmap_btree.c                     |  10 +-
+ fs/xfs/libxfs/xfs_btree.c                          |  29 +-
+ fs/xfs/libxfs/xfs_dir2.c                           |   2 +-
+ fs/xfs/libxfs/xfs_dir2_block.c                     |   6 +-
+ fs/xfs/libxfs/xfs_dir2_sf.c                        |   8 +-
+ fs/xfs/libxfs/xfs_ialloc.c                         |  86 ++-
+ fs/xfs/libxfs/xfs_ialloc.h                         |  25 +-
+ fs/xfs/libxfs/xfs_ialloc_btree.c                   |  20 +-
+ fs/xfs/libxfs/xfs_inode_buf.c                      |  15 +-
+ fs/xfs/libxfs/xfs_inode_fork.c                     |  65 ++-
+ fs/xfs/libxfs/xfs_inode_fork.h                     |  27 +-
+ fs/xfs/libxfs/xfs_refcount.c                       |  19 +-
+ fs/xfs/libxfs/xfs_refcount_btree.c                 |   5 +-
+ fs/xfs/libxfs/xfs_rmap.c                           |   8 +-
+ fs/xfs/libxfs/xfs_rmap_btree.c                     |   9 +-
+ fs/xfs/libxfs/xfs_symlink_remote.c                 |   2 +-
+ fs/xfs/libxfs/xfs_types.c                          |  73 +--
+ fs/xfs/libxfs/xfs_types.h                          |   9 -
+ fs/xfs/scrub/agheader.c                            |  25 +-
+ fs/xfs/scrub/agheader_repair.c                     |  21 +-
+ fs/xfs/scrub/alloc.c                               |   7 +-
+ fs/xfs/scrub/bmap.c                                |  16 +-
+ fs/xfs/scrub/btree.c                               |   2 +-
+ fs/xfs/scrub/common.c                              |   6 +-
+ fs/xfs/scrub/dabtree.c                             |   2 +-
+ fs/xfs/scrub/dir.c                                 |   2 +-
+ fs/xfs/scrub/fscounters.c                          |   4 +-
+ fs/xfs/scrub/health.c                              |   2 +
+ fs/xfs/scrub/ialloc.c                              |  12 +-
+ fs/xfs/scrub/quota.c                               |   2 +-
+ fs/xfs/scrub/refcount.c                            |   9 +-
+ fs/xfs/scrub/repair.c                              |  47 +-
+ fs/xfs/scrub/rmap.c                                |   6 +-
+ fs/xfs/scrub/symlink.c                             |   6 +-
+ fs/xfs/xfs_attr_inactive.c                         |  24 +-
+ fs/xfs/xfs_attr_list.c                             |   9 +-
+ fs/xfs/xfs_bmap_util.c                             |  22 +-
+ fs/xfs/xfs_buf.c                                   | 263 +++++----
+ fs/xfs/xfs_buf.h                                   |  21 +-
+ fs/xfs/xfs_dir2_readdir.c                          |   2 +-
+ fs/xfs/xfs_discard.c                               |   2 +-
+ fs/xfs/xfs_extfree_item.c                          |   6 +-
+ fs/xfs/xfs_filestream.c                            |   4 +-
+ fs/xfs/xfs_fsmap.c                                 |   3 +-
+ fs/xfs/xfs_fsops.c                                 |  13 +-
+ fs/xfs/xfs_icache.c                                |  15 +-
+ fs/xfs/xfs_inode.c                                 | 624 ++++++---------------
+ fs/xfs/xfs_inode.h                                 |  69 ++-
+ fs/xfs/xfs_inode_item.c                            |  58 +-
+ fs/xfs/xfs_ioctl.c                                 |  10 +-
+ fs/xfs/xfs_iomap.c                                 |   8 +-
+ fs/xfs/xfs_iops.c                                  |  13 +-
+ fs/xfs/xfs_iops.h                                  |   3 +
+ fs/xfs/xfs_itable.c                                |   4 +-
+ fs/xfs/xfs_iunlink_item.c                          | 180 ++++++
+ fs/xfs/xfs_iunlink_item.h                          |  27 +
+ fs/xfs/xfs_log.c                                   |  55 +-
+ fs/xfs/xfs_log.h                                   |   3 +-
+ fs/xfs/xfs_log_cil.c                               | 472 ++++++++++++----
+ fs/xfs/xfs_log_priv.h                              |  58 +-
+ fs/xfs/xfs_log_recover.c                           | 196 ++++---
+ fs/xfs/xfs_mount.c                                 |   3 +-
+ fs/xfs/xfs_qm.c                                    |  11 +-
+ fs/xfs/xfs_reflink.c                               |  46 +-
+ fs/xfs/xfs_reflink.h                               |   3 -
+ fs/xfs/xfs_super.c                                 |  11 +
+ fs/xfs/xfs_symlink.c                               |   2 +-
+ fs/xfs/xfs_trace.h                                 |   3 +-
+ fs/xfs/xfs_trans.c                                 |  95 +++-
+ fs/xfs/xfs_trans.h                                 |   7 +-
+ fs/xfs/xfs_trans_priv.h                            |   3 +-
+ 84 files changed, 2277 insertions(+), 1638 deletions(-)
+ create mode 100644 fs/xfs/xfs_iunlink_item.c
+ create mode 100644 fs/xfs/xfs_iunlink_item.h
+Merging zonefs/for-next (6bac30bb8ff8 zonefs: Call page_address() on page acquired with GFP_KERNEL flag)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next
+Auto-merging fs/zonefs/super.c
+Merge made by the 'ort' strategy.
+ fs/zonefs/super.c | 16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+Merging iomap/iomap-for-next (f8189d5d5fbf dax: set did_zero to true when zeroing successfully)
+$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next
+Merge made by the 'ort' strategy.
+ fs/dax.c               |  4 ++--
+ fs/iomap/buffered-io.c | 15 ++++++++-------
+ 2 files changed, 10 insertions(+), 9 deletions(-)
+Merging djw-vfs/vfs-for-next (49df34221804 fs: fix an infinite loop in iomap_fiemap)
+$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next
+Already up to date.
+Merging file-locks/locks-next (80d8e4d3f313 fs/locks: fix fcntl_getlk64/fcntl_setlk64 stub prototypes)
+$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next
+Auto-merging include/linux/fs.h
+Merge made by the 'ort' strategy.
+Merging vfs/for-next (51d1c3ac528b Merge branches 'work.misc', 'work.lseek', 'work.iov_iter' and 'work.namei' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next
+Auto-merging arch/powerpc/include/asm/uaccess.h
+Auto-merging arch/powerpc/platforms/52xx/mpc52xx_gpt.c
+Auto-merging drivers/gpio/gpiolib-cdev.c
+Auto-merging drivers/net/tun.c
+Auto-merging drivers/vfio/vfio.c
+Auto-merging fs/btrfs/file.c
+CONFLICT (content): Merge conflict in fs/btrfs/file.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/ceph/addr.c
+Auto-merging fs/fuse/file.c
+Auto-merging fs/gfs2/file.c
+Auto-merging fs/io_uring.c
+Auto-merging fs/open.c
+Auto-merging fs/overlayfs/copy_up.c
+Auto-merging fs/read_write.c
+Auto-merging fs/zonefs/super.c
+Auto-merging include/linux/blkdev.h
+Auto-merging include/linux/fs.h
+Auto-merging kernel/trace/trace.c
+Auto-merging mm/shmem.c
+Auto-merging net/9p/client.c
+CONFLICT (content): Merge conflict in net/9p/client.c
+Auto-merging net/9p/trans_virtio.c
+Auto-merging net/socket.c
+Auto-merging net/tls/tls_sw.c
+Auto-merging virt/kvm/kvm_main.c
+Resolved 'fs/btrfs/file.c' using previous resolution.
+Resolved 'net/9p/client.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 5ba72187e763] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/stable/sysfs-block               |    9 +
+ .../watchdog/convert_drivers_to_kernel_api.rst     |    1 -
+ arch/parisc/kernel/perf.c                          |    1 -
+ arch/powerpc/include/asm/uaccess.h                 |    2 +-
+ arch/powerpc/kernel/eeh.c                          |    4 -
+ arch/powerpc/platforms/52xx/mpc52xx_gpt.c          |    1 -
+ arch/powerpc/platforms/cell/spufs/file.c           |   17 -
+ arch/powerpc/platforms/powernv/eeh-powernv.c       |    1 -
+ arch/powerpc/platforms/pseries/dtl.c               |    1 -
+ arch/s390/hypfs/hypfs_dbfs.c                       |    1 -
+ arch/s390/hypfs/inode.c                            |    1 -
+ arch/s390/include/asm/uaccess.h                    |    4 +-
+ arch/s390/kernel/crash_dump.c                      |   22 +-
+ arch/s390/kernel/debug.c                           |    1 -
+ arch/s390/kernel/perf_cpum_cf.c                    |    1 -
+ arch/s390/kernel/sysinfo.c                         |    1 -
+ arch/s390/pci/pci_clp.c                            |    1 -
+ arch/um/drivers/harddog_kern.c                     |    1 -
+ arch/um/drivers/hostaudio_kern.c                   |    2 -
+ arch/x86/kernel/cpu/mce/dev-mcelog.c               |    1 -
+ arch/x86/kernel/cpu/resctrl/pseudo_lock.c          |    1 -
+ block/bio.c                                        |  126 +--
+ block/blk-map.c                                    |    7 +-
+ block/blk-merge.c                                  |   41 +-
+ block/blk-sysfs.c                                  |    7 +
+ block/bounce.c                                     |   13 +-
+ block/fops.c                                       |   24 +-
+ crypto/af_alg.c                                    |    3 +-
+ crypto/algif_hash.c                                |    5 +-
+ drivers/acpi/apei/erst-dbg.c                       |    1 -
+ drivers/auxdisplay/charlcd.c                       |    1 -
+ drivers/block/mtip32xx/mtip32xx.c                  |    3 -
+ drivers/block/pktcdvd.c                            |    1 -
+ drivers/bluetooth/hci_vhci.c                       |    1 -
+ drivers/bus/moxtet.c                               |    2 -
+ drivers/char/agp/frontend.c                        |    1 -
+ drivers/char/applicom.c                            |    1 -
+ drivers/char/ds1620.c                              |    1 -
+ drivers/char/dtlk.c                                |    1 -
+ drivers/char/hpet.c                                |    1 -
+ drivers/char/ipmi/ipmi_watchdog.c                  |    1 -
+ drivers/char/pc8736x_gpio.c                        |    1 -
+ drivers/char/pcmcia/cm4000_cs.c                    |    1 -
+ drivers/char/pcmcia/cm4040_cs.c                    |    1 -
+ drivers/char/pcmcia/scr24x_cs.c                    |    1 -
+ drivers/char/ppdev.c                               |    1 -
+ drivers/char/scx200_gpio.c                         |    1 -
+ drivers/char/sonypi.c                              |    1 -
+ drivers/char/tb0219.c                              |    1 -
+ drivers/char/tpm/tpm-dev.c                         |    1 -
+ drivers/char/tpm/tpm_vtpm_proxy.c                  |    1 -
+ drivers/char/tpm/tpmrm-dev.c                       |    1 -
+ drivers/char/virtio_console.c                      |    1 -
+ drivers/counter/counter-chrdev.c                   |    1 -
+ drivers/dma-buf/dma-buf.c                          |    1 -
+ drivers/firewire/core-cdev.c                       |    1 -
+ drivers/firmware/efi/capsule-loader.c              |    1 -
+ drivers/firmware/efi/test/efi_test.c               |    1 -
+ drivers/firmware/turris-mox-rwtm.c                 |    1 -
+ drivers/gnss/core.c                                |    1 -
+ drivers/gpio/gpio-mockup.c                         |    1 -
+ drivers/gpio/gpiolib-cdev.c                        |    1 -
+ drivers/gpu/drm/drm_file.c                         |    4 +-
+ drivers/gpu/drm/i915/i915_perf.c                   |    1 -
+ drivers/gpu/drm/msm/msm_perf.c                     |    1 -
+ drivers/gpu/drm/msm/msm_rd.c                       |    1 -
+ drivers/hid/uhid.c                                 |    1 -
+ drivers/hwmon/asus_atk0110.c                       |    1 -
+ drivers/hwmon/fschmd.c                             |    1 -
+ drivers/hwmon/w83793.c                             |    1 -
+ drivers/hwtracing/coresight/coresight-etb10.c      |    1 -
+ drivers/hwtracing/coresight/coresight-tmc-core.c   |    1 -
+ drivers/hwtracing/intel_th/msu.c                   |    1 -
+ drivers/hwtracing/stm/core.c                       |    1 -
+ drivers/i2c/i2c-dev.c                              |    1 -
+ drivers/infiniband/core/ucma.c                     |    1 -
+ drivers/infiniband/core/user_mad.c                 |    2 -
+ drivers/infiniband/core/uverbs_main.c              |    4 -
+ drivers/infiniband/hw/hfi1/fault.c                 |    1 -
+ drivers/infiniband/hw/mlx5/devx.c                  |    2 -
+ drivers/input/evdev.c                              |    1 -
+ drivers/input/joydev.c                             |    1 -
+ drivers/input/keyboard/applespi.c                  |    1 -
+ drivers/input/misc/uinput.c                        |    1 -
+ drivers/input/serio/userio.c                       |    1 -
+ drivers/isdn/capi/capi.c                           |    1 -
+ drivers/isdn/mISDN/timerdev.c                      |    1 -
+ drivers/leds/uleds.c                               |    1 -
+ drivers/macintosh/adb.c                            |    1 -
+ drivers/macintosh/smu.c                            |    1 -
+ drivers/media/cec/core/cec-api.c                   |    1 -
+ drivers/media/mc/mc-devnode.c                      |    1 -
+ drivers/media/rc/lirc_dev.c                        |    1 -
+ drivers/media/usb/uvc/uvc_debugfs.c                |    1 -
+ drivers/media/v4l2-core/v4l2-dev.c                 |    1 -
+ drivers/message/fusion/mptctl.c                    |    1 -
+ drivers/misc/lis3lv02d/lis3lv02d.c                 |    1 -
+ drivers/misc/mei/main.c                            |    1 -
+ drivers/misc/phantom.c                             |    1 -
+ drivers/mmc/core/block.c                           |    1 -
+ drivers/mtd/ubi/cdev.c                             |    2 -
+ drivers/mtd/ubi/debug.c                            |    1 -
+ drivers/net/netdevsim/fib.c                        |    1 -
+ drivers/net/tap.c                                  |    1 -
+ drivers/net/tun.c                                  |    1 -
+ .../wireless/broadcom/brcm80211/brcmfmac/core.c    |    1 -
+ drivers/net/wireless/intel/iwlwifi/mvm/d3.c        |    1 -
+ drivers/nvme/target/io-cmd-file.c                  |    2 +-
+ drivers/pinctrl/pinmux.c                           |    1 -
+ drivers/platform/chrome/cros_ec_debugfs.c          |    1 -
+ drivers/platform/chrome/wilco_ec/debugfs.c         |    1 -
+ drivers/platform/chrome/wilco_ec/event.c           |    1 -
+ drivers/platform/chrome/wilco_ec/telemetry.c       |    1 -
+ drivers/platform/surface/surface_aggregator_cdev.c |    1 -
+ drivers/platform/surface/surface_dtx.c             |    1 -
+ drivers/pps/pps.c                                  |    1 -
+ drivers/rtc/dev.c                                  |    1 -
+ drivers/rtc/rtc-m41t80.c                           |    1 -
+ drivers/s390/char/fs3270.c                         |    1 -
+ drivers/s390/char/sclp_ctl.c                       |    1 -
+ drivers/s390/char/tape_char.c                      |    1 -
+ drivers/s390/char/uvdevice.c                       |    1 -
+ drivers/s390/char/vmcp.c                           |    1 -
+ drivers/s390/char/vmlogrdr.c                       |    1 -
+ drivers/s390/char/zcore.c                          |    2 -
+ drivers/s390/cio/chsc_sch.c                        |    1 -
+ drivers/s390/cio/css.c                             |    1 -
+ drivers/s390/crypto/pkey_api.c                     |    1 -
+ drivers/s390/crypto/zcrypt_api.c                   |    1 -
+ drivers/sbus/char/openprom.c                       |    1 -
+ drivers/sbus/char/uctrl.c                          |    1 -
+ drivers/scsi/sg.c                                  |    1 -
+ drivers/spi/spidev.c                               |    1 -
+ drivers/staging/pi433/pi433_if.c                   |    1 -
+ .../intel/int340x_thermal/acpi_thermal_rel.c       |    1 -
+ drivers/tty/tty_io.c                               |    3 -
+ drivers/usb/gadget/function/f_fs.c                 |    2 -
+ drivers/usb/gadget/legacy/inode.c                  |    2 -
+ drivers/usb/gadget/legacy/raw_gadget.c             |    1 -
+ drivers/usb/gadget/udc/atmel_usba_udc.c            |    1 -
+ drivers/usb/misc/ftdi-elan.c                       |    1 -
+ drivers/usb/misc/ldusb.c                           |    1 -
+ drivers/usb/mon/mon_bin.c                          |    1 -
+ drivers/usb/mon/mon_stat.c                         |    1 -
+ drivers/usb/mon/mon_text.c                         |    2 -
+ drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c     |    2 -
+ drivers/vfio/pci/mlx5/main.c                       |    2 -
+ drivers/vfio/vfio.c                                |    2 +-
+ drivers/vhost/scsi.c                               |    4 +-
+ drivers/watchdog/acquirewdt.c                      |    1 -
+ drivers/watchdog/advantechwdt.c                    |    1 -
+ drivers/watchdog/alim1535_wdt.c                    |    1 -
+ drivers/watchdog/alim7101_wdt.c                    |    1 -
+ drivers/watchdog/ar7_wdt.c                         |    1 -
+ drivers/watchdog/at91rm9200_wdt.c                  |    1 -
+ drivers/watchdog/ath79_wdt.c                       |    1 -
+ drivers/watchdog/cpu5wdt.c                         |    1 -
+ drivers/watchdog/cpwd.c                            |    1 -
+ drivers/watchdog/eurotechwdt.c                     |    1 -
+ drivers/watchdog/gef_wdt.c                         |    1 -
+ drivers/watchdog/geodewdt.c                        |    1 -
+ drivers/watchdog/ib700wdt.c                        |    1 -
+ drivers/watchdog/ibmasr.c                          |    1 -
+ drivers/watchdog/indydog.c                         |    1 -
+ drivers/watchdog/it8712f_wdt.c                     |    1 -
+ drivers/watchdog/m54xx_wdt.c                       |    1 -
+ drivers/watchdog/machzwd.c                         |    1 -
+ drivers/watchdog/mixcomwd.c                        |    1 -
+ drivers/watchdog/mtx-1_wdt.c                       |    1 -
+ drivers/watchdog/nv_tco.c                          |    1 -
+ drivers/watchdog/pc87413_wdt.c                     |    1 -
+ drivers/watchdog/pcwd.c                            |    2 -
+ drivers/watchdog/pcwd_pci.c                        |    2 -
+ drivers/watchdog/pcwd_usb.c                        |    2 -
+ drivers/watchdog/pika_wdt.c                        |    1 -
+ drivers/watchdog/rc32434_wdt.c                     |    1 -
+ drivers/watchdog/rdc321x_wdt.c                     |    1 -
+ drivers/watchdog/riowd.c                           |    1 -
+ drivers/watchdog/sa1100_wdt.c                      |    1 -
+ drivers/watchdog/sb_wdog.c                         |    1 -
+ drivers/watchdog/sbc60xxwdt.c                      |    1 -
+ drivers/watchdog/sbc7240_wdt.c                     |    1 -
+ drivers/watchdog/sbc8360.c                         |    1 -
+ drivers/watchdog/sbc_epx_c3.c                      |    1 -
+ drivers/watchdog/sbc_fitpc2_wdt.c                  |    1 -
+ drivers/watchdog/sc1200wdt.c                       |    1 -
+ drivers/watchdog/sc520_wdt.c                       |    1 -
+ drivers/watchdog/sch311x_wdt.c                     |    1 -
+ drivers/watchdog/scx200_wdt.c                      |    1 -
+ drivers/watchdog/smsc37b787_wdt.c                  |    1 -
+ drivers/watchdog/w83877f_wdt.c                     |    1 -
+ drivers/watchdog/w83977f_wdt.c                     |    1 -
+ drivers/watchdog/wafer5823wdt.c                    |    1 -
+ drivers/watchdog/wdrtas.c                          |    2 -
+ drivers/watchdog/wdt.c                             |    2 -
+ drivers/watchdog/wdt285.c                          |    1 -
+ drivers/watchdog/wdt977.c                          |    1 -
+ drivers/watchdog/wdt_pci.c                         |    2 -
+ drivers/xen/evtchn.c                               |    1 -
+ drivers/xen/mcelog.c                               |    1 -
+ drivers/xen/xenbus/xenbus_dev_frontend.c           |    1 -
+ fs/aio.c                                           |    2 +-
+ fs/btrfs/file.c                                    |   19 +-
+ fs/btrfs/inode.c                                   |    3 +-
+ fs/ceph/addr.c                                     |    2 +-
+ fs/ceph/file.c                                     |    5 +-
+ fs/cifs/file.c                                     |    8 +-
+ fs/cifs/misc.c                                     |    3 +-
+ fs/coredump.c                                      |    4 +-
+ fs/debugfs/file.c                                  |    1 -
+ fs/direct-io.c                                     |    7 +-
+ fs/dlm/debug_fs.c                                  |    1 -
+ fs/efivarfs/file.c                                 |    1 -
+ fs/fcntl.c                                         |    1 +
+ fs/file_table.c                                    |   19 +-
+ fs/fsopen.c                                        |    1 -
+ fs/fuse/control.c                                  |    4 -
+ fs/fuse/dev.c                                      |    8 +-
+ fs/fuse/file.c                                     |    7 +-
+ fs/gfs2/file.c                                     |    2 +-
+ fs/io_uring.c                                      |    2 +-
+ fs/iomap/direct-io.c                               |   25 +-
+ fs/mount.h                                         |    1 -
+ fs/namei.c                                         |  191 ++--
+ fs/namespace.c                                     |    2 +-
+ fs/nfs/direct.c                                    |    8 +-
+ fs/nsfs.c                                          |    1 -
+ fs/open.c                                          |    3 +
+ fs/overlayfs/copy_up.c                             |    3 +-
+ fs/pipe.c                                          |    1 -
+ fs/proc_namespace.c                                |    2 +-
+ fs/read_write.c                                    |   23 +-
+ fs/splice.c                                        |   64 +-
+ fs/ubifs/debug.c                                   |    2 -
+ fs/zonefs/super.c                                  |    2 +-
+ include/linux/blkdev.h                             |   17 +
+ include/linux/debugfs.h                            |    1 -
+ include/linux/fs.h                                 |   22 +-
+ include/linux/iomap.h                              |    6 +
+ include/linux/pipe_fs_i.h                          |   20 -
+ include/linux/uaccess.h                            |    4 +-
+ include/linux/uio.h                                |   52 +-
+ kernel/bpf/bpf_iter.c                              |    1 -
+ kernel/events/core.c                               |    1 -
+ kernel/power/user.c                                |    1 -
+ kernel/relay.c                                     |    1 -
+ kernel/time/posix-clock.c                          |    1 -
+ kernel/trace/trace.c                               |    3 -
+ lib/iov_iter.c                                     | 1104 +++++++++-----------
+ mm/huge_memory.c                                   |    1 -
+ mm/shmem.c                                         |    2 +-
+ net/9p/client.c                                    |  125 +--
+ net/9p/protocol.c                                  |    3 +-
+ net/9p/trans_virtio.c                              |   37 +-
+ net/core/datagram.c                                |    3 +-
+ net/core/skmsg.c                                   |    3 +-
+ net/mac80211/rc80211_minstrel_ht_debugfs.c         |    2 -
+ net/rds/message.c                                  |    3 +-
+ net/rfkill/core.c                                  |    1 -
+ net/socket.c                                       |    1 -
+ net/sunrpc/cache.c                                 |    4 -
+ net/sunrpc/rpc_pipe.c                              |    1 -
+ net/tls/tls_sw.c                                   |    4 +-
+ scripts/coccinelle/api/stream_open.cocci           |    1 -
+ sound/core/control.c                               |    1 -
+ sound/core/oss/mixer_oss.c                         |    1 -
+ sound/core/oss/pcm_oss.c                           |    1 -
+ sound/core/pcm_native.c                            |    2 -
+ sound/core/rawmidi.c                               |    1 -
+ sound/core/seq/seq_clientmgr.c                     |    1 -
+ sound/core/timer.c                                 |    1 -
+ sound/oss/dmasound/dmasound_core.c                 |    3 -
+ virt/kvm/kvm_main.c                                |    1 -
+ 273 files changed, 940 insertions(+), 1428 deletions(-)
+Merging printk/for-next (7f6fa2d4a510 Merge branch 'for-5.20' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next
+Merge made by the 'ort' strategy.
+ lib/test_printf.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+Merging pci/next (946aac7af90b Merge branch 'pci/misc')
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next
+Merge made by the 'ort' strategy.
+ Documentation/PCI/pci-iov-howto.rst                |   7 +-
+ .../devicetree/bindings/pci/mediatek-pcie.txt      |   1 +
+ .../devicetree/bindings/pci/pci-rcar-gen2.txt      |  84 -----
+ .../devicetree/bindings/pci/qcom,pcie.yaml         |   4 +-
+ .../bindings/pci/renesas,pci-rcar-gen2.yaml        | 186 ++++++++++
+ drivers/dma/dw-edma/dw-edma-core.c                 | 141 +++++---
+ drivers/dma/dw-edma/dw-edma-core.h                 |  31 +-
+ drivers/dma/dw-edma/dw-edma-pcie.c                 |  83 ++---
+ drivers/dma/dw-edma/dw-edma-v0-core.c              |  41 ++-
+ drivers/dma/dw-edma/dw-edma-v0-core.h              |   4 +-
+ drivers/dma/dw-edma/dw-edma-v0-debugfs.c           |  18 +-
+ drivers/dma/dw-edma/dw-edma-v0-debugfs.h           |   8 +-
+ drivers/pci/controller/Kconfig                     |   2 +-
+ drivers/pci/controller/dwc/pci-dra7xx.c            |  12 +-
+ drivers/pci/controller/dwc/pci-exynos.c            |   6 +-
+ drivers/pci/controller/dwc/pci-imx6.c              |   6 +-
+ drivers/pci/controller/dwc/pci-keystone.c          |  22 +-
+ drivers/pci/controller/dwc/pci-layerscape-ep.c     |  12 -
+ drivers/pci/controller/dwc/pci-layerscape.c        |   2 +-
+ drivers/pci/controller/dwc/pci-meson.c             |   2 +-
+ drivers/pci/controller/dwc/pcie-al.c               |   6 +-
+ drivers/pci/controller/dwc/pcie-armada8k.c         |   6 +-
+ drivers/pci/controller/dwc/pcie-artpec6.c          |   4 +-
+ drivers/pci/controller/dwc/pcie-designware-ep.c    |  42 ++-
+ drivers/pci/controller/dwc/pcie-designware-host.c  | 114 +++---
+ drivers/pci/controller/dwc/pcie-designware-plat.c  |  25 +-
+ drivers/pci/controller/dwc/pcie-designware.c       |  72 ++--
+ drivers/pci/controller/dwc/pcie-designware.h       |  55 ++-
+ drivers/pci/controller/dwc/pcie-dw-rockchip.c      |   4 +-
+ drivers/pci/controller/dwc/pcie-fu740.c            |   2 +-
+ drivers/pci/controller/dwc/pcie-histb.c            |  10 +-
+ drivers/pci/controller/dwc/pcie-intel-gw.c         |   6 +-
+ drivers/pci/controller/dwc/pcie-keembay.c          |   4 +-
+ drivers/pci/controller/dwc/pcie-kirin.c            |   2 +-
+ drivers/pci/controller/dwc/pcie-qcom.c             | 396 ++++++++++++++-------
+ drivers/pci/controller/dwc/pcie-spear13xx.c        |   8 +-
+ drivers/pci/controller/dwc/pcie-tegra194.c         |  29 +-
+ drivers/pci/controller/dwc/pcie-uniphier.c         |  10 +-
+ drivers/pci/controller/dwc/pcie-visconti.c         |   6 +-
+ drivers/pci/controller/pci-aardvark.c              | 112 +++++-
+ drivers/pci/controller/pci-rcar-gen2.c             |   1 +
+ drivers/pci/controller/pci-xgene.c                 |   2 +-
+ drivers/pci/controller/pcie-iproc-msi.c            |   4 +-
+ drivers/pci/controller/pcie-mediatek-gen3.c        |  48 ++-
+ drivers/pci/controller/pcie-microchip-host.c       |   2 +
+ drivers/pci/controller/vmd.c                       |  13 +-
+ drivers/pci/endpoint/functions/pci-epf-test.c      | 117 +++++-
+ drivers/pci/pci.c                                  |   6 -
+ drivers/pci/pci.h                                  |   2 -
+ drivers/pci/pcie/aer.c                             |  15 +-
+ drivers/pci/pcie/aspm.c                            |  20 --
+ drivers/pci/pcie/err.c                             |  12 +-
+ drivers/pci/pcie/portdrv_core.c                    |   9 +-
+ drivers/pci/probe.c                                |   3 +
+ drivers/pci/quirks.c                               |   3 +
+ drivers/pci/switch/switchtec.c                     |   7 +-
+ include/linux/dma/edma.h                           |  61 +++-
+ 57 files changed, 1221 insertions(+), 689 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt
+ create mode 100644 Documentation/devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml
+Merging pstore/for-next/pstore (2c09d1443b9b pstore/zone: cleanup "rcnt" type)
+$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore
+Merge made by the 'ort' strategy.
+ fs/pstore/platform.c | 63 ++++++++++++++++++++++++++++++++++++++++++----------
+ fs/pstore/zone.c     | 12 +++++-----
+ 2 files changed, 57 insertions(+), 18 deletions(-)
+Merging hid/for-next (6c55e6cce170 Merge branch 'for-5.20/nintendo' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/input/elan,ekth6915.yaml   |  65 ++++++
+ drivers/hid/.kunitconfig                           |   5 +
+ drivers/hid/Kconfig                                |  16 ++
+ drivers/hid/Makefile                               |   3 +
+ drivers/hid/amd-sfh-hid/amd_sfh_pcie.c             |   3 +-
+ drivers/hid/hid-apple.c                            |  34 +++-
+ drivers/hid/hid-cp2112.c                           |   5 +
+ drivers/hid/hid-ids.h                              |   2 +
+ drivers/hid/hid-input.c                            |   2 +
+ drivers/hid/hid-logitech-hidpp.c                   |   2 +-
+ drivers/hid/hid-multitouch.c                       |  13 +-
+ drivers/hid/hid-nintendo.c                         |   5 +-
+ drivers/hid/hid-uclogic-core.c                     |   2 +
+ drivers/hid/hid-uclogic-params.c                   | 225 +++++++++++++++++++--
+ drivers/hid/hid-uclogic-rdesc-test.c               | 219 ++++++++++++++++++++
+ drivers/hid/hid-uclogic-rdesc.c                    | 124 +++++++++++-
+ drivers/hid/hid-uclogic-rdesc.h                    |  24 ++-
+ drivers/hid/i2c-hid/Kconfig                        |  15 ++
+ drivers/hid/i2c-hid/Makefile                       |   1 +
+ drivers/hid/i2c-hid/i2c-hid-of-elan.c              | 130 ++++++++++++
+ drivers/hid/intel-ish-hid/ipc/ipc.c                |   2 +-
+ drivers/hid/wacom_sys.c                            |   2 +-
+ drivers/hid/wacom_wac.c                            |  72 ++++---
+ 23 files changed, 909 insertions(+), 62 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/elan,ekth6915.yaml
+ create mode 100644 drivers/hid/.kunitconfig
+ create mode 100644 drivers/hid/hid-uclogic-rdesc-test.c
+ create mode 100644 drivers/hid/i2c-hid/i2c-hid-of-elan.c
+Merging i2c/i2c/for-next (b91756cecc54 Merge branch 'i2c/for-mergewindow' into i2c/for-next)
+$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/i2c/busses/Kconfig
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/i2c/arm,i2c-versatile.yaml |  29 ++
+ .../devicetree/bindings/i2c/i2c-nomadik.txt        |  23 -
+ .../devicetree/bindings/i2c/i2c-ocores.txt         |  78 ----
+ .../devicetree/bindings/i2c/i2c-qcom-cci.txt       |   7 +-
+ .../devicetree/bindings/i2c/i2c-rk3x.yaml          |   1 +
+ .../devicetree/bindings/i2c/i2c-versatile.txt      |  10 -
+ .../bindings/i2c/nuvoton,npcm7xx-i2c.yaml          |  25 +-
+ .../bindings/i2c/opencores,i2c-ocores.yaml         | 113 +++++
+ .../devicetree/bindings/i2c/st,nomadik-i2c.yaml    | 115 +++++
+ Documentation/i2c/busses/i2c-i801.rst              |   1 +
+ MAINTAINERS                                        |   6 +-
+ drivers/i2c/busses/Kconfig                         |  20 +-
+ drivers/i2c/busses/Makefile                        |   3 +-
+ drivers/i2c/busses/i2c-hisi.c                      |   3 +-
+ drivers/i2c/busses/i2c-i801.c                      |   3 +
+ drivers/i2c/busses/i2c-microchip-corei2c.c         | 480 +++++++++++++++++++++
+ drivers/i2c/busses/i2c-mv64xxx.c                   |  61 ++-
+ drivers/i2c/busses/i2c-mxs.c                       |   2 +-
+ drivers/i2c/busses/i2c-npcm7xx.c                   | 176 ++++----
+ drivers/i2c/busses/i2c-qcom-cci.c                  |  62 ++-
+ drivers/i2c/busses/i2c-xiic.c                      |   4 +-
+ drivers/i2c/i2c-core-base.c                        |   9 +-
+ 22 files changed, 987 insertions(+), 244 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/i2c/arm,i2c-versatile.yaml
+ delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-nomadik.txt
+ delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-ocores.txt
+ delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-versatile.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/opencores,i2c-ocores.yaml
+ create mode 100644 Documentation/devicetree/bindings/i2c/st,nomadik-i2c.yaml
+ create mode 100644 drivers/i2c/busses/i2c-microchip-corei2c.c
+Merging i3c/i3c/next (f2906aa86338 Linux 5.19-rc1)
+$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next
+Already up to date.
+Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias)
+$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next
+Already up to date.
+Merging hwmon-staging/hwmon-next (9992b19d756a hwmon: (asus-ec-sensors) add definitions for ROG ZENITH II EXTREME)
+$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-class-hwmon        |    9 +
+ .../devicetree/bindings/hwmon/national,lm90.yaml   |  131 +
+ .../devicetree/bindings/trivial-devices.yaml       |    2 +
+ Documentation/hwmon/asus_ec_sensors.rst            |    4 +
+ Documentation/hwmon/index.rst                      |    1 +
+ Documentation/hwmon/lm90.rst                       |  233 +-
+ Documentation/hwmon/lt7182s.rst                    |   92 +
+ Documentation/hwmon/pmbus-core.rst                 |    9 +
+ drivers/hwmon/Kconfig                              |   21 +-
+ drivers/hwmon/aquacomputer_d5next.c                |  244 +-
+ drivers/hwmon/asus-ec-sensors.c                    |  108 +-
+ drivers/hwmon/asus_wmi_sensors.c                   |   12 +-
+ drivers/hwmon/dell-smm-hwmon.c                     |   93 +-
+ drivers/hwmon/drivetemp.c                          |    1 +
+ drivers/hwmon/f71882fg.c                           |    2 +
+ drivers/hwmon/gsc-hwmon.c                          |    3 +
+ drivers/hwmon/lm75.h                               |    3 +-
+ drivers/hwmon/lm90.c                               | 2556 +++++++++++++-------
+ drivers/hwmon/nct6775-platform.c                   |   12 +-
+ drivers/hwmon/occ/p9_sbe.c                         |    6 +-
+ drivers/hwmon/pmbus/Kconfig                        |    9 +
+ drivers/hwmon/pmbus/Makefile                       |    1 +
+ drivers/hwmon/pmbus/lt7182s.c                      |  195 ++
+ drivers/hwmon/pmbus/ltc2978.c                      |   44 +-
+ drivers/hwmon/pmbus/pmbus.h                        |   10 +-
+ drivers/hwmon/pmbus/pmbus_core.c                   |  446 +++-
+ drivers/hwmon/sch56xx-common.c                     |   44 +-
+ 27 files changed, 3154 insertions(+), 1137 deletions(-)
+ create mode 100644 Documentation/hwmon/lt7182s.rst
+ create mode 100644 drivers/hwmon/pmbus/lt7182s.c
+Merging jc_docs/docs-next (bb6279d8ed25 Merge branch 'submitting-drivers-removal' into docs-next)
+$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging Documentation/driver-api/gpio/consumer.rst
+Auto-merging Documentation/filesystems/f2fs.rst
+Auto-merging Documentation/translations/zh_CN/core-api/index.rst
+Auto-merging Documentation/translations/zh_CN/core-api/kernel-api.rst
+Auto-merging Documentation/virt/kvm/api.rst
+Auto-merging MAINTAINERS
+Auto-merging include/linux/fscache.h
+Auto-merging include/linux/objtool.h
+Auto-merging init/Kconfig
+Auto-merging tools/include/linux/objtool.h
+Auto-merging tools/objtool/check.c
+Merge made by the 'ort' strategy.
+ Documentation/Kconfig                              |  23 +-
+ Documentation/admin-guide/devices.rst              |   7 +-
+ Documentation/admin-guide/kernel-parameters.txt    |   2 +-
+ Documentation/admin-guide/sysctl/kernel.rst        |   4 +-
+ Documentation/arm64/elf_hwcaps.rst                 |  23 --
+ Documentation/dev-tools/coccinelle.rst             |   2 +-
+ Documentation/dev-tools/kselftest.rst              |  27 +-
+ .../devicetree/bindings/input/da9062-onkey.txt     |   2 +-
+ Documentation/doc-guide/kernel-doc.rst             |   2 +
+ Documentation/doc-guide/sphinx.rst                 |  14 +-
+ Documentation/driver-api/gpio/consumer.rst         |   2 +-
+ Documentation/driver-api/gpio/driver.rst           |   6 +-
+ Documentation/driver-api/gpio/using-gpio.rst       |   2 +-
+ Documentation/driver-api/hte/tegra194-hte.rst      |   5 +-
+ Documentation/filesystems/f2fs.rst                 |  13 +-
+ Documentation/filesystems/overlayfs.rst            |   2 +-
+ Documentation/hwmon/submitting-patches.rst         |   1 -
+ Documentation/kernel-hacking/hacking.rst           |   3 +-
+ Documentation/process/5.Posting.rst                |   3 +-
+ Documentation/process/8.Conclusion.rst             |  16 +-
+ Documentation/process/howto.rst                    |   4 +-
+ Documentation/process/index.rst                    |   1 -
+ Documentation/process/kernel-docs.rst              |  62 +--
+ Documentation/process/submitting-drivers.rst       | 194 ---------
+ Documentation/process/submitting-patches.rst       |   5 +-
+ Documentation/security/keys/core.rst               |   2 +-
+ Documentation/security/secrets/coco.rst            |   2 +-
+ Documentation/security/siphash.rst                 |   2 +-
+ Documentation/sphinx/automarkup.py                 |  56 +--
+ .../translations/it_IT/kernel-hacking/hacking.rst  |   3 +-
+ .../translations/it_IT/networking/netdev-FAQ.rst   |   2 +-
+ .../translations/it_IT/process/5.Posting.rst       |   5 +-
+ .../translations/it_IT/process/8.Conclusion.rst    |   5 +-
+ Documentation/translations/it_IT/process/howto.rst |   3 +-
+ Documentation/translations/it_IT/process/index.rst |   1 -
+ .../it_IT/process/submitting-drivers.rst           |  16 -
+ .../it_IT/process/submitting-patches.rst           |   6 +-
+ Documentation/translations/ja_JP/howto.rst         |   4 +-
+ Documentation/translations/ko_KR/howto.rst         |   2 +-
+ .../translations/zh_CN/admin-guide/index.rst       |   2 +-
+ .../zh_CN/admin-guide/reporting-issues.rst         | 125 +++---
+ .../zh_CN/admin-guide/reporting-regressions.rst    | 370 ++++++++++++++++++
+ .../translations/zh_CN/core-api/cachetlb.rst       |   6 +
+ .../translations/zh_CN/core-api/cpu_hotplug.rst    | 435 ++++++++++++++++++---
+ .../translations/zh_CN/core-api/index.rst          |   1 +
+ .../translations/zh_CN/core-api/irq/irq-domain.rst |  22 +-
+ .../translations/zh_CN/core-api/kernel-api.rst     |   3 +
+ .../translations/zh_CN/core-api/mm-api.rst         |  23 +-
+ .../translations/zh_CN/core-api/printk-basics.rst  |   3 +-
+ .../translations/zh_CN/core-api/printk-formats.rst |   3 +-
+ .../translations/zh_CN/core-api/watch_queue.rst    | 313 +++++++++++++++
+ .../translations/zh_CN/core-api/workqueue.rst      |  21 +-
+ .../translations/zh_CN/core-api/xarray.rst         |   4 +-
+ .../translations/zh_CN/devicetree/index.rst        |   2 +-
+ .../translations/zh_CN/devicetree/of_unittest.rst  |   2 +-
+ .../translations/zh_CN/devicetree/usage-model.rst  |   2 +-
+ .../translations/zh_CN/doc-guide/kernel-doc.rst    |   2 +-
+ .../translations/zh_CN/kernel-hacking/hacking.rst  |  25 +-
+ Documentation/translations/zh_CN/locking/index.rst |   5 +-
+ .../translations/zh_CN/locking/mutex-design.rst    | 145 +++++++
+ .../translations/zh_CN/process/5.Posting.rst       |   3 +-
+ .../translations/zh_CN/process/8.Conclusion.rst    |   1 -
+ Documentation/translations/zh_CN/process/howto.rst |   1 -
+ Documentation/translations/zh_CN/process/index.rst |   1 -
+ .../zh_CN/process/submitting-drivers.rst           | 160 --------
+ .../zh_CN/process/submitting-patches.rst           |   4 +-
+ Documentation/translations/zh_CN/riscv/index.rst   |   1 -
+ Documentation/translations/zh_CN/riscv/pmu.rst     | 235 -----------
+ .../translations/zh_CN/riscv/vm-layout.rst         |  37 ++
+ .../translations/zh_CN/vm/free_page_reporting.rst  |   2 +-
+ Documentation/translations/zh_CN/vm/frontswap.rst  |   2 +-
+ Documentation/translations/zh_CN/vm/highmem.rst    |  77 ++--
+ Documentation/translations/zh_CN/vm/index.rst      |  31 +-
+ Documentation/translations/zh_CN/vm/page_frags.rst |   2 +-
+ .../translations/zh_CN/vm/page_migration.rst       | 228 +++++++++++
+ Documentation/translations/zh_CN/vm/page_owner.rst |  79 +++-
+ .../zh_CN/vm/vmalloced-kernel-stacks.rst           | 133 +++++++
+ Documentation/translations/zh_CN/vm/zsmalloc.rst   |   2 +-
+ .../translations/zh_TW/process/5.Posting.rst       |   3 +-
+ .../translations/zh_TW/process/8.Conclusion.rst    |   1 -
+ Documentation/translations/zh_TW/process/howto.rst |   1 -
+ Documentation/translations/zh_TW/process/index.rst |   1 -
+ .../zh_TW/process/submitting-drivers.rst           | 164 --------
+ .../zh_TW/process/submitting-patches.rst           |   4 +-
+ Documentation/virt/hyperv/clocks.rst               |  73 ++++
+ Documentation/virt/hyperv/index.rst                |  12 +
+ Documentation/virt/hyperv/overview.rst             | 207 ++++++++++
+ Documentation/virt/hyperv/vmbus.rst                | 303 ++++++++++++++
+ Documentation/virt/index.rst                       |   1 +
+ Documentation/virt/kvm/api.rst                     |   4 +-
+ Documentation/virt/kvm/s390/s390-pv-boot.rst       |   2 +-
+ Documentation/virt/kvm/x86/hypercalls.rst          |   2 +-
+ .../virt/uml/user_mode_linux_howto_v2.rst          |   2 +-
+ Documentation/x86/orc-unwinder.rst                 |   2 +-
+ MAINTAINERS                                        |   7 +-
+ arch/m68k/q40/README                               |   5 +-
+ include/linux/fscache.h                            |   2 +-
+ include/linux/objtool.h                            |   2 +-
+ include/linux/watch_queue.h                        |   2 +-
+ init/Kconfig                                       |   2 +-
+ kernel/watch_queue.c                               |   2 +-
+ lib/Kconfig.debug                                  |   2 +-
+ scripts/get_feat.pl                                |   2 +-
+ scripts/kernel-doc                                 |  82 ++--
+ scripts/sphinx-pre-install                         |  90 ++++-
+ tools/include/linux/objtool.h                      |   2 +-
+ tools/objtool/check.c                              |   2 +-
+ 107 files changed, 2811 insertions(+), 1220 deletions(-)
+ delete mode 100644 Documentation/process/submitting-drivers.rst
+ delete mode 100644 Documentation/translations/it_IT/process/submitting-drivers.rst
+ create mode 100644 Documentation/translations/zh_CN/admin-guide/reporting-regressions.rst
+ create mode 100644 Documentation/translations/zh_CN/core-api/watch_queue.rst
+ create mode 100644 Documentation/translations/zh_CN/locking/mutex-design.rst
+ delete mode 100644 Documentation/translations/zh_CN/process/submitting-drivers.rst
+ delete mode 100644 Documentation/translations/zh_CN/riscv/pmu.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/page_migration.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/vmalloced-kernel-stacks.rst
+ delete mode 100644 Documentation/translations/zh_TW/process/submitting-drivers.rst
+ create mode 100644 Documentation/virt/hyperv/clocks.rst
+ create mode 100644 Documentation/virt/hyperv/index.rst
+ create mode 100644 Documentation/virt/hyperv/overview.rst
+ create mode 100644 Documentation/virt/hyperv/vmbus.rst
+Merging v4l-dvb/master (d8e8aa866ed8 media: mediatek: vcodec: Report supported bitrate modes)
+$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master
+Auto-merging MAINTAINERS
+Auto-merging drivers/media/rc/lirc_dev.c
+Auto-merging drivers/media/v4l2-core/v4l2-ioctl.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/media/vivid.rst          |  14 +
+ .../media/mediatek,vcodec-subdev-decoder.yaml      |  52 +-
+ .../bindings/media/mediatek-jpeg-encoder.yaml      |   6 +
+ .../bindings/media/qcom,sdm660-camss.yaml          |   7 +
+ .../userspace-api/media/v4l/pixfmt-yuv-planar.rst  |  54 ++
+ MAINTAINERS                                        |   2 +
+ drivers/media/cec/core/cec-adap.c                  |   5 +-
+ drivers/media/cec/platform/cros-ec/cros-ec-cec.c   |   4 +
+ drivers/media/common/v4l2-tpg/v4l2-tpg-core.c      |  38 ++
+ drivers/media/i2c/adv7180.c                        |   5 +-
+ drivers/media/i2c/adv7604.c                        |   5 +-
+ drivers/media/i2c/tda1997x.c                       |   1 +
+ drivers/media/pci/cx88/cx88-core.c                 |  22 +-
+ drivers/media/pci/ddbridge/ddbridge-ci.c           |   9 -
+ drivers/media/pci/ddbridge/ddbridge-ci.h           |   9 -
+ drivers/media/pci/ddbridge/ddbridge-core.c         |   9 -
+ drivers/media/pci/ddbridge/ddbridge-hw.c           |   9 -
+ drivers/media/pci/ddbridge/ddbridge-hw.h           |  11 +-
+ drivers/media/pci/ddbridge/ddbridge-i2c.c          |   9 -
+ drivers/media/pci/ddbridge/ddbridge-i2c.h          |   9 -
+ drivers/media/pci/ddbridge/ddbridge-io.h           |   9 -
+ drivers/media/pci/ddbridge/ddbridge-main.c         |   9 -
+ drivers/media/pci/ddbridge/ddbridge-max.c          |   9 -
+ drivers/media/pci/ddbridge/ddbridge-max.h          |  11 +-
+ drivers/media/pci/ddbridge/ddbridge-mci.c          |   9 -
+ drivers/media/pci/ddbridge/ddbridge-mci.h          |   9 -
+ drivers/media/pci/ddbridge/ddbridge-regs.h         |   9 -
+ drivers/media/pci/ddbridge/ddbridge-sx8.c          |   9 -
+ drivers/media/pci/ddbridge/ddbridge.h              |  11 +-
+ drivers/media/pci/saa7164/saa7164-api.c            |   2 +-
+ drivers/media/pci/sta2x11/Kconfig                  |   2 +-
+ drivers/media/pci/tw5864/tw5864-core.c             |  30 +-
+ drivers/media/pci/tw686x/tw686x-core.c             |  21 +-
+ drivers/media/pci/tw686x/tw686x-video.c            |   4 +-
+ drivers/media/platform/amphion/vdec.c              |   3 +-
+ drivers/media/platform/amphion/venc.c              |   3 +-
+ drivers/media/platform/amphion/vpu_cmds.c          |   3 +-
+ drivers/media/platform/amphion/vpu_core.c          |  11 +-
+ drivers/media/platform/amphion/vpu_dbg.c           |   2 +-
+ drivers/media/platform/amphion/vpu_malone.c        |  18 +
+ drivers/media/platform/amphion/vpu_malone.h        |   1 +
+ drivers/media/platform/amphion/vpu_msgs.c          |   7 +-
+ drivers/media/platform/amphion/vpu_rpc.c           |   2 +-
+ drivers/media/platform/amphion/vpu_v4l2.c          |   6 +-
+ drivers/media/platform/atmel/atmel-isc-base.c      |  20 +-
+ drivers/media/platform/atmel/atmel-sama7g5-isc.c   |   2 +
+ .../media/platform/mediatek/jpeg/mtk_jpeg_core.c   |   3 +
+ .../platform/mediatek/vcodec/mtk_vcodec_dec.c      |  78 ++-
+ .../platform/mediatek/vcodec/mtk_vcodec_dec_drv.c  |  12 +
+ .../platform/mediatek/vcodec/mtk_vcodec_dec_hw.c   |  12 +-
+ .../platform/mediatek/vcodec/mtk_vcodec_dec_hw.h   |   2 +
+ .../platform/mediatek/vcodec/mtk_vcodec_dec_pm.c   |  50 ++
+ .../platform/mediatek/vcodec/mtk_vcodec_drv.h      |  15 +-
+ .../platform/mediatek/vcodec/mtk_vcodec_enc.c      |  36 +-
+ .../mediatek/vcodec/vdec/vdec_h264_req_multi_if.c  |  25 +-
+ .../mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c     | 202 +++++-
+ .../media/platform/mediatek/vcodec/vdec_drv_if.c   |   2 +-
+ .../media/platform/mediatek/vcodec/vdec_vpu_if.c   |   5 +
+ drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.c  |  16 +-
+ drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h  |  10 +-
+ drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c     | 328 +++++-----
+ drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h     |   4 +-
+ drivers/media/platform/qcom/camss/camss-csid.c     |   2 +-
+ drivers/media/platform/qcom/camss/camss-ispif.c    |  39 +-
+ drivers/media/platform/qcom/camss/camss-vfe.c      |  34 -
+ drivers/media/platform/qcom/camss/camss-vfe.h      |   3 -
+ drivers/media/platform/qcom/camss/camss.c          |  71 +-
+ drivers/media/platform/qcom/camss/camss.h          |   7 +-
+ .../media/platform/renesas/rcar-vin/rcar-core.c    |   2 +-
+ drivers/media/platform/renesas/rcar_drif.c         |   5 -
+ drivers/media/platform/rockchip/rkisp1/Makefile    |  17 +-
+ .../platform/rockchip/rkisp1/rkisp1-capture.c      | 159 +++--
+ .../media/platform/rockchip/rkisp1/rkisp1-common.h |  48 +-
+ .../media/platform/rockchip/rkisp1/rkisp1-debug.c  | 222 +++++++
+ .../media/platform/rockchip/rkisp1/rkisp1-dev.c    |  79 +--
+ .../media/platform/rockchip/rkisp1/rkisp1-isp.c    | 156 ++---
+ .../media/platform/rockchip/rkisp1/rkisp1-params.c | 711 +++++++++++----------
+ .../media/platform/rockchip/rkisp1/rkisp1-regs.h   | 190 +++---
+ .../platform/rockchip/rkisp1/rkisp1-resizer.c      | 204 ++----
+ .../media/platform/rockchip/rkisp1/rkisp1-stats.c  |  13 +-
+ .../media/platform/samsung/exynos-gsc/gsc-core.c   |   3 +-
+ .../media/platform/samsung/exynos-gsc/gsc-core.h   |   2 +-
+ .../platform/samsung/exynos4-is/fimc-is-errno.h    |   2 +-
+ .../media/platform/samsung/exynos4-is/mipi-csis.c  |   2 +-
+ .../media/platform/samsung/s5p-jpeg/jpeg-core.c    |   2 +-
+ .../media/platform/samsung/s5p-mfc/s5p_mfc_pm.c    |   3 +-
+ drivers/media/platform/st/sti/delta/delta-v4l2.c   |  24 +-
+ drivers/media/platform/st/stm32/stm32-dcmi.c       |  53 +-
+ drivers/media/platform/ti/davinci/vpif.c           |   1 +
+ drivers/media/platform/ti/omap/omap_voutlib.c      |   4 +-
+ drivers/media/rc/igorplugusb.c                     |  19 +-
+ drivers/media/rc/iguanair.c                        |   5 +-
+ drivers/media/rc/imon_raw.c                        |  16 +-
+ drivers/media/rc/lirc_dev.c                        |   6 +-
+ drivers/media/rc/rc-main.c                         |   6 +-
+ drivers/media/rc/redrat3.c                         |   4 +-
+ drivers/media/rc/streamzap.c                       |   2 +-
+ drivers/media/rc/ttusbir.c                         |   4 +-
+ drivers/media/rc/xbox_remote.c                     |  10 +-
+ drivers/media/test-drivers/vivid/vivid-ctrls.c     |  14 +
+ drivers/media/usb/Kconfig                          |   1 -
+ drivers/media/usb/Makefile                         |   1 -
+ drivers/media/usb/airspy/airspy.c                  |  17 +-
+ drivers/media/usb/em28xx/em28xx-audio.c            |  10 -
+ drivers/media/usb/em28xx/em28xx-camera.c           |  10 -
+ drivers/media/usb/em28xx/em28xx-cards.c            |  10 -
+ drivers/media/usb/em28xx/em28xx-core.c             |  10 -
+ drivers/media/usb/em28xx/em28xx-dvb.c              |   4 -
+ drivers/media/usb/em28xx/em28xx-i2c.c              |  10 -
+ drivers/media/usb/em28xx/em28xx-input.c            |  10 -
+ drivers/media/usb/em28xx/em28xx-v4l.h              |   9 -
+ drivers/media/usb/em28xx/em28xx-vbi.c              |  10 -
+ drivers/media/usb/em28xx/em28xx-video.c            |  10 -
+ drivers/media/usb/em28xx/em28xx.h                  |  10 -
+ drivers/media/usb/gspca/xirlink_cit.c              |   2 +-
+ drivers/media/usb/hdpvr/hdpvr-video.c              |   2 +-
+ drivers/media/usb/pvrusb2/pvrusb2-hdw.c            |   1 +
+ drivers/media/usb/usbtv/usbtv-video.c              |   5 +-
+ drivers/media/usb/usbtv/usbtv.h                    |   3 +-
+ drivers/media/v4l2-core/v4l2-common.c              |   1 +
+ drivers/media/v4l2-core/v4l2-ioctl.c               |   1 +
+ drivers/media/v4l2-core/v4l2-mem2mem.c             |   2 +-
+ drivers/staging/media/Kconfig                      |  12 +-
+ drivers/staging/media/Makefile                     |   1 +
+ drivers/staging/media/atomisp/i2c/ov5693/ov5693.h  |   2 +-
+ drivers/staging/media/av7110/av7110.c              |   2 +-
+ drivers/staging/media/hantro/hantro_drv.c          |  12 +-
+ drivers/staging/media/hantro/hantro_g2_regs.h      |   2 +-
+ drivers/staging/media/hantro/hantro_hevc.c         |  30 +
+ drivers/staging/media/hantro/hantro_hw.h           |  14 +
+ drivers/staging/media/hantro/hantro_v4l2.c         |   2 +-
+ drivers/staging/media/hantro/imx8m_vpu_hw.c        |  80 ++-
+ drivers/staging/media/hantro/rockchip_vpu_hw.c     | 104 +--
+ drivers/staging/media/hantro/sama5d4_vdec_hw.c     |  40 +-
+ drivers/staging/media/hantro/sunxi_vpu_hw.c        |  24 +-
+ drivers/staging/media/rkvdec/rkvdec-vp9.c          |   2 -
+ .../{media/usb => staging/media}/stkwebcam/Kconfig |   8 +-
+ .../usb => staging/media}/stkwebcam/Makefile       |   2 +-
+ drivers/staging/media/stkwebcam/TODO               |  12 +
+ .../usb => staging/media}/stkwebcam/stk-sensor.c   |   0
+ .../usb => staging/media}/stkwebcam/stk-webcam.c   |   0
+ .../usb => staging/media}/stkwebcam/stk-webcam.h   |   0
+ drivers/staging/media/zoran/videocodec.c           |  93 +--
+ drivers/staging/media/zoran/videocodec.h           |  15 +
+ drivers/staging/media/zoran/zoran.h                |  14 +
+ drivers/staging/media/zoran/zr36016.c              |  91 +--
+ drivers/staging/media/zoran/zr36050.c              | 144 ++---
+ drivers/staging/media/zoran/zr36060.c              |  97 +--
+ include/media/tpg/v4l2-tpg.h                       |  16 +
+ include/uapi/linux/videodev2.h                     |   1 +
+ 150 files changed, 2580 insertions(+), 1825 deletions(-)
+ create mode 100644 drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c
+ rename drivers/{media/usb => staging/media}/stkwebcam/Kconfig (68%)
+ rename drivers/{media/usb => staging/media}/stkwebcam/Makefile (63%)
+ create mode 100644 drivers/staging/media/stkwebcam/TODO
+ rename drivers/{media/usb => staging/media}/stkwebcam/stk-sensor.c (100%)
+ rename drivers/{media/usb => staging/media}/stkwebcam/stk-webcam.c (100%)
+ rename drivers/{media/usb => staging/media}/stkwebcam/stk-webcam.h (100%)
+Merging v4l-dvb-next/master (e670f5d672ef media: amphion: only insert the first sequence startcode for vc1l format)
+$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master
+Auto-merging MAINTAINERS
+Auto-merging drivers/media/i2c/Kconfig
+Auto-merging drivers/media/v4l2-core/v4l2-ioctl.c
+Merge made by the 'ort' strategy.
+ .../bindings/media/allwinner,sun6i-a31-csi.yaml    |   58 +-
+ .../media/allwinner,sun6i-a31-mipi-csi2.yaml       |  137 ++
+ .../media/allwinner,sun8i-a83t-mipi-csi2.yaml      |  125 ++
+ .../bindings/media/exynos-jpeg-codec.txt           |   16 -
+ .../bindings/media/i2c/aptina,mt9p031.yaml         |    1 +
+ .../devicetree/bindings/media/i2c/onnn,ar0521.yaml |  112 ++
+ .../bindings/media/rockchip,rk3568-vepu.yaml       |   69 +
+ .../bindings/media/samsung,s5pv210-jpeg.yaml       |  123 ++
+ Documentation/userspace-api/media/v4l/control.rst  |    4 +-
+ Documentation/userspace-api/media/v4l/mmap.rst     |    2 +-
+ .../userspace-api/media/v4l/pixfmt-yuv-planar.rst  |    3 -
+ MAINTAINERS                                        |   17 +
+ drivers/media/i2c/Kconfig                          |   13 +
+ drivers/media/i2c/Makefile                         |    1 +
+ drivers/media/i2c/ar0521.c                         | 1061 +++++++++++++
+ drivers/media/i2c/mt9p031.c                        |   73 +-
+ drivers/media/i2c/ov5640.c                         | 1650 ++++++++++++++------
+ drivers/media/i2c/ov7251.c                         |    5 +-
+ drivers/media/i2c/st-mipid02.c                     |   30 +-
+ drivers/media/pci/cx18/cx18-av-core.c              |    2 +-
+ drivers/media/platform/amphion/vdec.c              |   47 +-
+ drivers/media/platform/amphion/vpu.h               |    1 +
+ drivers/media/platform/amphion/vpu_core.c          |    7 +-
+ drivers/media/platform/amphion/vpu_malone.c        |    2 +
+ drivers/media/platform/amphion/vpu_rpc.h           |    7 +-
+ drivers/media/platform/amphion/vpu_v4l2.c          |    2 +-
+ drivers/media/platform/mediatek/mdp/mtk_mdp_ipi.h  |    2 +
+ .../platform/mediatek/vcodec/mtk_vcodec_dec.c      |   54 +-
+ .../platform/mediatek/vcodec/mtk_vcodec_dec_drv.c  |    3 +-
+ .../mediatek/vcodec/mtk_vcodec_dec_stateful.c      |   29 +-
+ .../mediatek/vcodec/mtk_vcodec_dec_stateless.c     |   30 +-
+ .../platform/mediatek/vcodec/mtk_vcodec_drv.h      |   20 +-
+ drivers/media/platform/qcom/venus/core.c           |   15 +-
+ drivers/media/platform/qcom/venus/dbgfs.c          |    9 +
+ drivers/media/platform/qcom/venus/dbgfs.h          |   13 +
+ drivers/media/platform/qcom/venus/hfi_parser.c     |    6 +-
+ drivers/media/platform/qcom/venus/hfi_platform.c   |   22 +
+ drivers/media/platform/qcom/venus/hfi_platform.h   |    2 +
+ drivers/media/platform/renesas/rcar_drif.c         |    2 +-
+ .../platform/st/sti/c8sectpfe/c8sectpfe-core.c     |   33 +-
+ drivers/media/platform/st/stm32/stm32-dcmi.c       |   18 +-
+ drivers/media/platform/sunxi/Kconfig               |    2 +
+ drivers/media/platform/sunxi/Makefile              |    2 +
+ .../media/platform/sunxi/sun6i-mipi-csi2/Kconfig   |   14 +
+ .../media/platform/sunxi/sun6i-mipi-csi2/Makefile  |    4 +
+ .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c        |  749 +++++++++
+ .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.h        |   52 +
+ .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2_reg.h    |   76 +
+ .../platform/sunxi/sun8i-a83t-mipi-csi2/Kconfig    |   12 +
+ .../platform/sunxi/sun8i-a83t-mipi-csi2/Makefile   |    4 +
+ .../sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_dphy.c   |   72 +
+ .../sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_dphy.h   |   39 +
+ .../sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c    |  815 ++++++++++
+ .../sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.h    |   55 +
+ .../sun8i_a83t_mipi_csi2_reg.h                     |  151 ++
+ drivers/media/platform/ti/cal/cal-camerarx.c       |    2 +-
+ drivers/media/platform/xilinx/xilinx-vip.h         |    4 +-
+ drivers/media/usb/gspca/spca501.c                  |    2 +-
+ drivers/media/usb/pvrusb2/pvrusb2-hdw.c            |    2 +-
+ drivers/media/v4l2-core/v4l2-ioctl.c               |    2 +-
+ drivers/staging/media/atomisp/Makefile             |    3 -
+ .../staging/media/atomisp/i2c/atomisp-mt9m114.c    |    4 +-
+ drivers/staging/media/atomisp/i2c/atomisp-ov2722.c |   20 +-
+ drivers/staging/media/atomisp/include/hmm/hmm.h    |   32 +-
+ drivers/staging/media/atomisp/include/hmm/hmm_bo.h |   37 +-
+ .../staging/media/atomisp/include/hmm/hmm_common.h |   26 -
+ .../staging/media/atomisp/include/hmm/hmm_pool.h   |  116 --
+ .../staging/media/atomisp/include/linux/atomisp.h  |  146 --
+ drivers/staging/media/atomisp/notes.txt            |   30 +
+ drivers/staging/media/atomisp/pci/atomisp_acc.c    |  625 --------
+ drivers/staging/media/atomisp/pci/atomisp_acc.h    |  120 --
+ drivers/staging/media/atomisp/pci/atomisp_cmd.c    |   92 +-
+ drivers/staging/media/atomisp/pci/atomisp_compat.h |   29 +-
+ .../media/atomisp/pci/atomisp_compat_css20.c       |  365 +----
+ .../media/atomisp/pci/atomisp_compat_ioctl32.h     |   58 -
+ drivers/staging/media/atomisp/pci/atomisp_drvfs.c  |    7 +-
+ drivers/staging/media/atomisp/pci/atomisp_fops.c   |   13 -
+ .../media/atomisp/pci/atomisp_gmin_platform.c      |   27 +-
+ drivers/staging/media/atomisp/pci/atomisp_ioctl.c  |   73 +-
+ drivers/staging/media/atomisp/pci/atomisp_ioctl.h  |    1 -
+ drivers/staging/media/atomisp/pci/atomisp_subdev.c |    3 -
+ drivers/staging/media/atomisp/pci/atomisp_subdev.h |   10 -
+ drivers/staging/media/atomisp/pci/atomisp_v4l2.c   |   32 -
+ .../pci/hive_isp_css_include/host/debug_public.h   |    2 +-
+ drivers/staging/media/atomisp/pci/hmm/hmm.c        |  202 +--
+ drivers/staging/media/atomisp/pci/hmm/hmm_bo.c     |  261 +---
+ .../media/atomisp/pci/hmm/hmm_dynamic_pool.c       |  234 ---
+ .../media/atomisp/pci/hmm/hmm_reserved_pool.c      |  253 ---
+ .../media/atomisp/pci/ia_css_frame_public.h        |   40 -
+ .../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c   |    2 +-
+ .../isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c    |    2 +-
+ .../atomisp/pci/isp/modes/interface/isp_const.h    |    6 -
+ .../atomisp/pci/runtime/debug/src/ia_css_debug.c   |    2 -
+ .../pci/runtime/frame/interface/ia_css_frame.h     |    7 +-
+ .../media/atomisp/pci/runtime/frame/src/frame.c    |  110 +-
+ .../atomisp/pci/runtime/isp_param/src/isp_param.c  |    2 +-
+ .../media/atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c |   23 +-
+ .../media/atomisp/pci/runtime/spctrl/src/spctrl.c  |    2 +-
+ drivers/staging/media/atomisp/pci/sh_css.c         |    8 +-
+ .../staging/media/atomisp/pci/sh_css_firmware.c    |    2 +-
+ drivers/staging/media/atomisp/pci/sh_css_mipi.c    |    3 +-
+ drivers/staging/media/atomisp/pci/sh_css_params.c  |   47 +-
+ drivers/staging/media/hantro/hantro_drv.c          |    1 +
+ drivers/staging/media/hantro/hantro_hw.h           |    1 +
+ drivers/staging/media/hantro/rockchip_vpu_hw.c     |   85 +-
+ drivers/staging/media/imx/imx7-media-csi.c         | 1607 +++++++++++++++----
+ 106 files changed, 6852 insertions(+), 3804 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yaml
+ create mode 100644 Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-mipi-csi2.yaml
+ delete mode 100644 Documentation/devicetree/bindings/media/exynos-jpeg-codec.txt
+ create mode 100644 Documentation/devicetree/bindings/media/i2c/onnn,ar0521.yaml
+ create mode 100644 Documentation/devicetree/bindings/media/rockchip,rk3568-vepu.yaml
+ create mode 100644 Documentation/devicetree/bindings/media/samsung,s5pv210-jpeg.yaml
+ create mode 100644 drivers/media/i2c/ar0521.c
+ create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig
+ create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/Makefile
+ create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c
+ create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.h
+ create mode 100644 drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2_reg.h
+ create mode 100644 drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/Kconfig
+ create mode 100644 drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/Makefile
+ create mode 100644 drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_dphy.c
+ create mode 100644 drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_dphy.h
+ create mode 100644 drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c
+ create mode 100644 drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.h
+ create mode 100644 drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2_reg.h
+ delete mode 100644 drivers/staging/media/atomisp/include/hmm/hmm_pool.h
+ create mode 100644 drivers/staging/media/atomisp/notes.txt
+ delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_acc.c
+ delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_acc.h
+ delete mode 100644 drivers/staging/media/atomisp/pci/hmm/hmm_dynamic_pool.c
+ delete mode 100644 drivers/staging/media/atomisp/pci/hmm/hmm_reserved_pool.c
+Merging pm/linux-next (524b6b1a1288 Merge branch 'acpi-cppc' into linux-next)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next
+Auto-merging drivers/acpi/acpi_video.c
+Merge made by the 'ort' strategy.
+ .../firmware-guide/acpi/DSD-properties-rules.rst   |  11 +-
+ Documentation/power/pci.rst                        |   2 +-
+ arch/x86/kernel/acpi/cppc.c                        |   6 +
+ drivers/acpi/Kconfig                               |   4 +-
+ drivers/acpi/Makefile                              |   5 +-
+ drivers/acpi/acpi_lpss.c                           |   3 +
+ drivers/acpi/acpi_video.c                          |  41 ++---
+ drivers/acpi/apei/apei-base.c                      |   2 +-
+ drivers/acpi/apei/bert.c                           |  31 +++-
+ drivers/acpi/apei/einj.c                           |   2 +
+ drivers/acpi/bus.c                                 |  47 +++--
+ drivers/acpi/container.c                           |  17 +-
+ drivers/acpi/device_pm.c                           |  22 +++
+ drivers/acpi/device_sysfs.c                        |   2 +-
+ drivers/acpi/ec.c                                  | 140 +++++---------
+ drivers/acpi/glue.c                                | 133 ++++++++++----
+ drivers/acpi/processor_driver.c                    |  72 +-------
+ drivers/acpi/processor_idle.c                      |   6 +-
+ drivers/acpi/processor_thermal.c                   |  54 ++++++
+ drivers/acpi/property.c                            |  45 ++---
+ drivers/acpi/scan.c                                |  70 +++----
+ drivers/acpi/sleep.c                               |   8 +
+ drivers/acpi/viot.c                                |  26 ++-
+ drivers/acpi/x86/s2idle.c                          |   4 +-
+ drivers/base/power/runtime.c                       |   6 +
+ drivers/base/power/wakeup.c                        |  30 ---
+ drivers/bus/hisi_lpc.c                             | 204 ++++++++++-----------
+ drivers/cpufreq/acpi-cpufreq.c                     |   4 +
+ drivers/cpufreq/cpufreq.c                          |  27 +--
+ drivers/cpuidle/governors/haltpoll.c               |   3 +
+ drivers/mfd/mfd-core.c                             |  31 +++-
+ drivers/mmc/host/sdhci-acpi.c                      |   7 +-
+ drivers/mmc/host/sdhci-pci-core.c                  |  11 +-
+ drivers/platform/x86/thinkpad_acpi.c               |  53 +++---
+ drivers/powercap/intel_rapl_common.c               |   1 +
+ drivers/soundwire/slave.c                          | 117 +++++++-----
+ drivers/thermal/intel/x86_pkg_temp_thermal.c       |   2 +-
+ drivers/thermal/thermal_core.c                     |  18 +-
+ drivers/thunderbolt/acpi.c                         |  29 +--
+ drivers/usb/core/usb-acpi.c                        |  18 +-
+ include/acpi/acpi_bus.h                            |   9 +-
+ include/acpi/processor.h                           |   9 +-
+ include/linux/acpi_viot.h                          |   2 +
+ include/linux/pm_wakeup.h                          |  31 +++-
+ include/trace/events/power.h                       |  29 +++
+ 45 files changed, 747 insertions(+), 647 deletions(-)
+Merging cpufreq-arm/cpufreq/arm/linux-next (0d0771e1d749 dt-bindings: opp: Add msm8939 to the compatible list)
+$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next
+Auto-merging drivers/cpufreq/cpufreq.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml   |  7 +++++++
+ .../devicetree/bindings/opp/opp-v2-kryo-cpu.yaml          | 15 +++++++++++++++
+ drivers/cpufreq/cpufreq.c                                 |  6 +++---
+ drivers/cpufreq/mediatek-cpufreq.c                        |  9 +++++++--
+ drivers/cpufreq/qcom-cpufreq-hw.c                         | 14 +++++++++-----
+ 5 files changed, 41 insertions(+), 10 deletions(-)
+Merging cpupower/cpupower (f2906aa86338 Linux 5.19-rc1)
+$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower
+Already up to date.
+Merging devfreq/devfreq-next (98ebac384ad2 PM / devfreq: tegra30: Add error message for devm_devfreq_add_device())
+$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/devfreq/exynos-bus.txt     | 488 ---------------------
+ .../bindings/interconnect/mediatek,cci.yaml        | 141 ++++++
+ .../bindings/interconnect/samsung,exynos-bus.yaml  | 290 ++++++++++++
+ MAINTAINERS                                        |   3 +-
+ drivers/devfreq/Kconfig                            |  10 +
+ drivers/devfreq/Makefile                           |   1 +
+ drivers/devfreq/devfreq.c                          |   4 +
+ drivers/devfreq/imx-bus.c                          |   2 +-
+ drivers/devfreq/mtk-cci-devfreq.c                  | 440 +++++++++++++++++++
+ drivers/devfreq/tegra30-devfreq.c                  |   4 +-
+ 10 files changed, 892 insertions(+), 491 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/devfreq/exynos-bus.txt
+ create mode 100644 Documentation/devicetree/bindings/interconnect/mediatek,cci.yaml
+ create mode 100644 Documentation/devicetree/bindings/interconnect/samsung,exynos-bus.yaml
+ create mode 100644 drivers/devfreq/mtk-cci-devfreq.c
+Merging opp/opp/linux-next (1e5fb38442eb OPP: Remove dev{m}_pm_opp_of_add_table_noclk())
+$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next
+Auto-merging drivers/devfreq/exynos-bus.c
+Auto-merging drivers/devfreq/tegra30-devfreq.c
+Auto-merging drivers/gpu/drm/panfrost/panfrost_drv.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/opp/opp-v2-base.yaml       |   10 +
+ drivers/cpufreq/cpufreq-dt.c                       |   19 +-
+ drivers/cpufreq/imx-cpufreq-dt.c                   |   12 +-
+ drivers/cpufreq/qcom-cpufreq-nvmem.c               |  109 +-
+ drivers/cpufreq/sti-cpufreq.c                      |   27 +-
+ drivers/cpufreq/sun50i-cpufreq-nvmem.c             |   31 +-
+ drivers/cpufreq/tegra20-cpufreq.c                  |   12 +-
+ drivers/cpufreq/ti-cpufreq.c                       |   42 +-
+ drivers/devfreq/exynos-bus.c                       |   21 +-
+ drivers/devfreq/tegra30-devfreq.c                  |   22 +-
+ drivers/gpu/drm/lima/lima_devfreq.c                |   12 +-
+ drivers/gpu/drm/panfrost/panfrost_devfreq.c        |    3 +-
+ drivers/gpu/drm/panfrost/panfrost_drv.c            |   15 +-
+ drivers/memory/tegra/tegra124-emc.c                |   11 +-
+ drivers/opp/core.c                                 | 1575 ++++++++++----------
+ drivers/opp/cpu.c                                  |   12 +-
+ drivers/opp/debugfs.c                              |   27 +-
+ drivers/opp/of.c                                   |  136 +-
+ drivers/opp/opp.h                                  |   50 +-
+ drivers/opp/ti-opp-supply.c                        |   77 +-
+ drivers/soc/tegra/common.c                         |   49 +-
+ drivers/soc/tegra/pmc.c                            |    4 +-
+ include/linux/pm_opp.h                             |  322 ++--
+ 23 files changed, 1338 insertions(+), 1260 deletions(-)
+Merging thermal/thermal/linux-next (4768f717d85c dt-bindings: thermal: rcar-gen3-thermal: Add r8a779f0 support)
+$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../bindings/thermal/qcom,spmi-temp-alarm.yaml     | 85 ++++++++++++++++++++++
+ .../bindings/thermal/qcom-spmi-temp-alarm.txt      | 51 -------------
+ .../bindings/thermal/rcar-gen3-thermal.yaml        | 36 +++++----
+ MAINTAINERS                                        |  1 +
+ drivers/thermal/cpufreq_cooling.c                  | 77 +++++++-------------
+ drivers/thermal/devfreq_cooling.c                  | 27 +++----
+ drivers/thermal/rcar_gen3_thermal.c                |  4 +-
+ include/trace/events/thermal.h                     | 28 ++-----
+ 8 files changed, 152 insertions(+), 157 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/thermal/qcom,spmi-temp-alarm.yaml
+ delete mode 100644 Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt
+Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next
+Already up to date.
+Merging dlm/next (0f24debbb847 fs: dlm: move kref_put assert for lkb structs)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next
+Merge made by the 'ort' strategy.
+ fs/dlm/Kconfig             |   9 +++
+ fs/dlm/Makefile            |   2 +-
+ fs/dlm/ast.c               |   4 +-
+ fs/dlm/config.c            |  21 ++++---
+ fs/dlm/config.h            |   3 +-
+ fs/dlm/dlm_internal.h      |  32 ++++++++--
+ fs/dlm/lock.c              | 143 ++++++++++++++++++---------------------------
+ fs/dlm/lock.h              |  17 +++++-
+ fs/dlm/lockspace.c         |  31 +++++++---
+ fs/dlm/lowcomms.c          |   4 +-
+ fs/dlm/member.c            |  30 +++++-----
+ fs/dlm/plock.c             |  51 +++++++++++-----
+ fs/dlm/recoverd.c          |  35 +++++++++--
+ fs/dlm/user.c              |  21 ++++++-
+ include/trace/events/dlm.h | 118 ++++++++++++++++++++++++++++++-------
+ 15 files changed, 351 insertions(+), 170 deletions(-)
+Merging rdma/for-next (2635d2a8d466 IB: Fix spelling of 'writable')
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+Merge made by the 'ort' strategy.
+ drivers/infiniband/core/cma.c                     | 230 ++++++++++++++++++++--
+ drivers/infiniband/core/cma_priv.h                |   1 +
+ drivers/infiniband/core/rdma_core.c               |   2 +-
+ drivers/infiniband/hw/bnxt_re/bnxt_re.h           |   2 +-
+ drivers/infiniband/hw/hfi1/pio_copy.c             |   2 +-
+ drivers/infiniband/hw/mlx5/cq.c                   |   4 +
+ drivers/infiniband/hw/mlx5/dm.c                   |  53 +++--
+ drivers/infiniband/hw/mlx5/mlx5_ib.h              |  12 +-
+ drivers/infiniband/hw/mlx5/mr.c                   |   1 +
+ drivers/infiniband/hw/mlx5/umr.c                  |  78 +++++++-
+ drivers/infiniband/hw/qib/qib_file_ops.c          |   4 +-
+ drivers/infiniband/hw/qib/qib_sd7220.c            |   2 +-
+ drivers/infiniband/hw/usnic/usnic_uiom.c          |   2 +-
+ drivers/infiniband/sw/rxe/rxe_cq.c                |   8 +-
+ drivers/infiniband/sw/rxe/rxe_mr.c                |   2 +-
+ drivers/infiniband/sw/rxe/rxe_mw.c                |   6 +-
+ drivers/infiniband/sw/rxe/rxe_pool.c              | 106 ++++++++--
+ drivers/infiniband/sw/rxe/rxe_pool.h              |  18 +-
+ drivers/infiniband/sw/rxe/rxe_qp.c                |   2 -
+ drivers/infiniband/sw/rxe/rxe_queue.h             |   5 +-
+ drivers/infiniband/sw/rxe/rxe_req.c               |   8 +-
+ drivers/infiniband/sw/rxe/rxe_resp.c              | 168 +++++++++-------
+ drivers/infiniband/sw/rxe/rxe_verbs.c             |  39 ++--
+ drivers/infiniband/sw/rxe/rxe_verbs.h             |   4 +-
+ drivers/infiniband/ulp/iser/iser_verbs.c          |   6 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c  |  33 ++++
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.c |  18 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c  |  42 ++++
+ drivers/net/ethernet/mellanox/mlx5/core/main.c    |   7 -
+ include/linux/mlx5/device.h                       |  36 ++--
+ include/linux/mlx5/driver.h                       |   1 +
+ include/linux/mlx5/fs.h                           |  14 ++
+ include/linux/mlx5/mlx5_ifc.h                     | 151 ++++++++++++--
+ include/rdma/rdma_cm.h                            |   1 +
+ include/uapi/rdma/mlx5_user_ioctl_verbs.h         |   1 +
+ 35 files changed, 851 insertions(+), 218 deletions(-)
+Merging net-next/master (b126047f43f1 Merge branch 'xen-netfront-xsa-403-follow-on')
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master
+Auto-merging Documentation/networking/ip-sysctl.rst
+Auto-merging MAINTAINERS
+Auto-merging arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
+Auto-merging arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
+CONFLICT (content): Merge conflict in arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
+Auto-merging arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
+Auto-merging arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
+CONFLICT (content): Merge conflict in arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
+Auto-merging arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts
+CONFLICT (content): Merge conflict in arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts
+Auto-merging arch/arm64/boot/dts/marvell/cn9130-db.dtsi
+Auto-merging arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
+CONFLICT (content): Merge conflict in arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
+Auto-merging arch/riscv/boot/dts/microchip/mpfs.dtsi
+Auto-merging arch/x86/net/bpf_jit_comp.c
+Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c
+Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c
+Auto-merging drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
+Auto-merging drivers/net/ethernet/netronome/nfp/nfdk/dp.c
+Auto-merging drivers/net/ethernet/sfc/ef10.c
+Auto-merging drivers/net/wireless/ath/ath11k/wmi.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/d3.c
+Auto-merging drivers/net/wireless/mac80211_hwsim.c
+Auto-merging drivers/net/wireless/marvell/mwifiex/11h.c
+Auto-merging drivers/net/wireless/marvell/mwifiex/cfg80211.c
+Auto-merging drivers/net/wireless/realtek/rtw88/rtw8821c.c
+Auto-merging drivers/net/xen-netback/rx.c
+Auto-merging include/net/cfg80211.h
+Auto-merging include/net/mac80211.h
+Auto-merging include/net/raw.h
+Auto-merging include/net/sock.h
+CONFLICT (content): Merge conflict in include/net/sock.h
+Auto-merging include/net/tls.h
+CONFLICT (content): Merge conflict in include/net/tls.h
+Auto-merging include/uapi/linux/bpf.h
+Auto-merging kernel/bpf/bpf_iter.c
+Auto-merging kernel/bpf/core.c
+Auto-merging kernel/bpf/helpers.c
+Auto-merging kernel/events/core.c
+Auto-merging kernel/sysctl.c
+Auto-merging net/core/datagram.c
+Auto-merging net/core/dev.c
+Auto-merging net/core/filter.c
+Auto-merging net/core/skmsg.c
+Auto-merging net/ipv4/af_inet.c
+Auto-merging net/ipv4/esp4.c
+Auto-merging net/ipv4/fib_semantics.c
+CONFLICT (content): Merge conflict in net/ipv4/fib_semantics.c
+Auto-merging net/ipv4/tcp.c
+Auto-merging net/ipv4/tcp_input.c
+Auto-merging net/ipv4/tcp_output.c
+Auto-merging net/ipv6/route.c
+Auto-merging net/mac80211/cfg.c
+Auto-merging net/mac80211/iface.c
+Auto-merging net/mac80211/rx.c
+Auto-merging net/mac80211/tx.c
+Auto-merging net/mac80211/util.c
+Auto-merging net/mac80211/wme.c
+Auto-merging net/mptcp/protocol.c
+Auto-merging net/socket.c
+Auto-merging net/tls/tls_device.c
+Auto-merging net/tls/tls_main.c
+Auto-merging net/tls/tls_sw.c
+Auto-merging net/wireless/sme.c
+Auto-merging tools/include/uapi/linux/bpf.h
+Auto-merging tools/testing/selftests/net/.gitignore
+Auto-merging tools/testing/selftests/net/forwarding/Makefile
+Resolved 'arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts' using previous resolution.
+Resolved 'arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi' using previous resolution.
+Resolved 'arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts' using previous resolution.
+Resolved 'arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts' using previous resolution.
+Resolved 'include/net/sock.h' using previous resolution.
+Recorded preimage for 'include/net/tls.h'
+Recorded preimage for 'net/ipv4/fib_semantics.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'include/net/tls.h'.
+Recorded resolution for 'net/ipv4/fib_semantics.c'.
+[master 474c95bc9d4b] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/sysctl/net.rst           |   12 +
+ Documentation/bpf/btf.rst                          |   43 +-
+ Documentation/bpf/instruction-set.rst              |    4 +-
+ .../bpf/libbpf/libbpf_naming_convention.rst        |   13 +-
+ .../bindings/net/can/microchip,mpfs-can.yaml       |   45 +
+ .../devicetree/bindings/net/cdns,macb.yaml         |    1 +
+ .../bindings/net/dsa/mediatek,mt7530.yaml          |  407 ++
+ .../bindings/net/dsa/microchip,lan937x.yaml        |  192 +
+ .../devicetree/bindings/net/dsa/mt7530.txt         |  327 --
+ .../bindings/net/dsa/renesas,rzn1-a5psw.yaml       |  157 +
+ .../bindings/net/ethernet-controller.yaml          |   35 +-
+ .../bindings/net/mediatek,star-emac.yaml           |   17 +
+ Documentation/devicetree/bindings/net/micrel.txt   |    1 +
+ Documentation/devicetree/bindings/net/sff,sfp.txt  |   85 -
+ Documentation/devicetree/bindings/net/sff,sfp.yaml |  142 +
+ .../devicetree/bindings/net/snps,dwmac.yaml        |    5 +
+ .../devicetree/bindings/net/ti,dp83867.yaml        |   18 +-
+ .../devicetree/bindings/net/xlnx,emaclite.yaml     |   63 +
+ Documentation/networking/bonding.rst               |   11 +
+ Documentation/networking/can.rst                   |    2 +-
+ .../networking/device_drivers/can/can327.rst       |  331 ++
+ .../networking/device_drivers/can/index.rst        |    1 +
+ .../networking/device_drivers/ethernet/index.rst   |    2 +-
+ .../device_drivers/ethernet/neterion/vxge.rst      |  115 -
+ .../device_drivers/ethernet/wangxun/txgbe.rst      |   20 +
+ Documentation/networking/ip-sysctl.rst             |    6 +
+ Documentation/networking/tls.rst                   |   47 +
+ MAINTAINERS                                        |   43 +-
+ arch/arm/net/bpf_jit_32.c                          |   16 -
+ .../dts/freescale/fsl-lx2160a-clearfog-itx.dtsi    |    8 +-
+ .../boot/dts/marvell/armada-3720-turris-mox.dts    |   10 +-
+ arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts   |   16 +-
+ .../boot/dts/marvell/armada-7040-mochabin.dts      |   16 +-
+ .../dts/marvell/armada-8040-clearfog-gt-8k.dts     |    4 +-
+ arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi |   24 +-
+ .../boot/dts/marvell/armada-8040-puzzle-m801.dts   |   16 +-
+ arch/arm64/boot/dts/marvell/cn9130-crb.dtsi        |    6 +-
+ arch/arm64/boot/dts/marvell/cn9130-db.dtsi         |    8 +-
+ arch/arm64/boot/dts/marvell/cn9131-db.dtsi         |    8 +-
+ arch/arm64/boot/dts/marvell/cn9132-db.dtsi         |    8 +-
+ arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts |   48 +
+ arch/arm64/net/bpf_jit_comp.c                      |    9 +-
+ arch/riscv/boot/dts/microchip/mpfs.dtsi            |   18 +
+ arch/riscv/net/bpf_jit.h                           |    1 +
+ arch/riscv/net/bpf_jit_core.c                      |    8 +-
+ arch/x86/net/bpf_jit_comp.c                        |   30 +-
+ drivers/atm/he.c                                   |    9 +-
+ drivers/atm/iphase.c                               |    2 +-
+ drivers/infiniband/ulp/ipoib/ipoib_ib.c            |    2 +-
+ drivers/isdn/hardware/mISDN/hfcsusb.c              |    2 +-
+ drivers/net/Kconfig                                |    2 +
+ drivers/net/amt.c                                  |    8 +-
+ drivers/net/bonding/bond_main.c                    |   51 +-
+ drivers/net/bonding/bond_netlink.c                 |  116 +-
+ drivers/net/bonding/bond_options.c                 |   65 +-
+ drivers/net/can/Kconfig                            |  111 +-
+ drivers/net/can/Makefile                           |    3 +-
+ drivers/net/can/can327.c                           | 1137 +++++
+ drivers/net/can/ctucanfd/ctucanfd_base.c           |    2 +-
+ drivers/net/can/dev/Makefile                       |   17 +-
+ drivers/net/can/dev/bittiming.c                    |  197 -
+ drivers/net/can/dev/calc_bittiming.c               |  202 +
+ drivers/net/can/dev/dev.c                          |    9 +-
+ drivers/net/can/dev/netlink.c                      |    9 +-
+ drivers/net/can/dev/skb.c                          |   72 +
+ drivers/net/can/m_can/Kconfig                      |    1 +
+ drivers/net/can/m_can/m_can.c                      |    4 +-
+ drivers/net/can/slcan/Makefile                     |    7 +
+ drivers/net/can/{slcan.c => slcan/slcan-core.c}    |  504 +-
+ drivers/net/can/slcan/slcan-ethtool.c              |   65 +
+ drivers/net/can/slcan/slcan.h                      |   18 +
+ drivers/net/can/spi/mcp251xfd/Kconfig              |    1 +
+ drivers/net/can/usb/Kconfig                        |   15 +-
+ drivers/net/can/usb/Makefile                       |    2 +-
+ drivers/net/can/usb/{esd_usb2.c => esd_usb.c}      |  250 +-
+ drivers/net/can/usb/etas_es58x/es58x_core.c        |    5 +-
+ drivers/net/can/usb/etas_es58x/es58x_core.h        |    6 +-
+ drivers/net/can/xilinx_can.c                       |   72 +-
+ drivers/net/dsa/Kconfig                            |    9 +
+ drivers/net/dsa/Makefile                           |    1 +
+ drivers/net/dsa/b53/b53_spi.c                      |    2 -
+ drivers/net/dsa/hirschmann/hellcreek.c             |    7 +-
+ drivers/net/dsa/microchip/Kconfig                  |   42 +-
+ drivers/net/dsa/microchip/Makefile                 |   11 +-
+ drivers/net/dsa/microchip/ksz8.h                   |  105 +-
+ drivers/net/dsa/microchip/ksz8795.c                |  583 +--
+ drivers/net/dsa/microchip/ksz8795_reg.h            |   29 -
+ drivers/net/dsa/microchip/ksz8863_smi.c            |   19 +-
+ drivers/net/dsa/microchip/ksz9477.c                |  335 +-
+ drivers/net/dsa/microchip/ksz9477.h                |   60 +
+ drivers/net/dsa/microchip/ksz9477_i2c.c            |    6 +-
+ drivers/net/dsa/microchip/ksz9477_reg.h            |   22 -
+ drivers/net/dsa/microchip/ksz9477_spi.c            |  150 -
+ drivers/net/dsa/microchip/ksz_common.c             |  818 +++-
+ drivers/net/dsa/microchip/ksz_common.h             |  197 +-
+ .../net/dsa/microchip/{ksz8795_spi.c => ksz_spi.c} |  125 +-
+ drivers/net/dsa/microchip/lan937x.h                |   27 +
+ drivers/net/dsa/microchip/lan937x_main.c           |  484 ++
+ drivers/net/dsa/microchip/lan937x_reg.h            |  180 +
+ drivers/net/dsa/mt7530.c                           |   82 +-
+ drivers/net/dsa/mt7530.h                           |    1 -
+ drivers/net/dsa/mv88e6xxx/chip.c                   |   39 +-
+ drivers/net/dsa/mv88e6xxx/chip.h                   |    3 +-
+ drivers/net/dsa/mv88e6xxx/port.c                   |   36 -
+ drivers/net/dsa/mv88e6xxx/port.h                   |    2 -
+ drivers/net/dsa/ocelot/Kconfig                     |    1 +
+ drivers/net/dsa/ocelot/felix.c                     |    9 +
+ drivers/net/dsa/ocelot/felix.h                     |    1 +
+ drivers/net/dsa/ocelot/felix_vsc9959.c             |  289 +-
+ drivers/net/dsa/qca/ar9331.c                       |   34 +-
+ drivers/net/dsa/realtek/rtl8365mb.c                |  299 +-
+ drivers/net/dsa/rzn1_a5psw.c                       | 1064 ++++
+ drivers/net/dsa/rzn1_a5psw.h                       |  259 +
+ drivers/net/dsa/sja1105/sja1105_main.c             |    2 +-
+ drivers/net/eql.c                                  |    4 +-
+ drivers/net/ethernet/Kconfig                       |    1 +
+ drivers/net/ethernet/Makefile                      |    1 +
+ drivers/net/ethernet/agere/et131x.c                |    2 +-
+ drivers/net/ethernet/altera/altera_utils.h         |    5 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-dcb.c           |    2 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-drv.c           |    6 +-
+ drivers/net/ethernet/amd/xgbe/xgbe.h               |    2 +-
+ .../aquantia/atlantic/macsec/macsec_struct.h       |    4 +-
+ drivers/net/ethernet/atheros/ag71xx.c              |   12 +-
+ drivers/net/ethernet/atheros/atl1c/atl1c_main.c    |   11 +-
+ drivers/net/ethernet/atheros/atl1e/atl1e_main.c    |   10 +-
+ drivers/net/ethernet/atheros/atlx/atl1.c           |    7 +-
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c       |   16 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c    |   17 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c          |   15 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c    |    2 +-
+ drivers/net/ethernet/broadcom/cnic.c               |    4 +-
+ drivers/net/ethernet/broadcom/tg3.c                |    2 +-
+ drivers/net/ethernet/brocade/bna/bnad.c            |    6 +-
+ drivers/net/ethernet/cadence/macb_main.c           |  112 +-
+ drivers/net/ethernet/cadence/macb_ptp.c            |    7 +-
+ drivers/net/ethernet/cavium/thunder/nicvf_queues.c |    4 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c     |    2 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c |    6 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c |    8 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |   27 +-
+ drivers/net/ethernet/chelsio/cxgb4/sge.c           |    2 +-
+ .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c    |    2 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c     |    2 +-
+ .../chelsio/inline_crypto/ch_ktls/chcr_ktls.c      |    6 +-
+ drivers/net/ethernet/cisco/enic/enic_main.c        |    5 +-
+ drivers/net/ethernet/emulex/benet/be_main.c        |    8 +-
+ drivers/net/ethernet/freescale/fec_main.c          |    2 +-
+ drivers/net/ethernet/freescale/fs_enet/fs_enet.h   |    2 +-
+ drivers/net/ethernet/freescale/gianfar.c           |    1 +
+ drivers/net/ethernet/freescale/gianfar_ethtool.c   |    6 +-
+ drivers/net/ethernet/fungible/funcore/fun_hci.h    |   40 +
+ .../net/ethernet/fungible/funeth/funeth_ethtool.c  |   36 +
+ drivers/net/ethernet/fungible/funeth/funeth_main.c |    3 +-
+ drivers/net/ethernet/fungible/funeth/funeth_tx.c   |   25 +-
+ drivers/net/ethernet/fungible/funeth/funeth_txrx.h |    1 +
+ drivers/net/ethernet/google/gve/gve_tx_dqo.c       |    6 +-
+ drivers/net/ethernet/hisilicon/hns/hns_enet.c      |    6 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_enet.c    |    4 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_trace.h   |    3 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c  |    2 +-
+ drivers/net/ethernet/hisilicon/hns_mdio.c          |    4 +-
+ drivers/net/ethernet/huawei/hinic/hinic_dev.h      |    3 -
+ drivers/net/ethernet/huawei/hinic/hinic_main.c     |   68 +-
+ drivers/net/ethernet/huawei/hinic/hinic_rx.c       |    2 -
+ drivers/net/ethernet/huawei/hinic/hinic_sriov.c    |    6 -
+ drivers/net/ethernet/huawei/hinic/hinic_tx.c       |    2 -
+ drivers/net/ethernet/ibm/ehea/ehea_main.c          |    2 +-
+ drivers/net/ethernet/intel/e100.c                  |    1 -
+ drivers/net/ethernet/intel/e1000/e1000_hw.c        |    6 +-
+ drivers/net/ethernet/intel/e1000/e1000_main.c      |    4 +-
+ drivers/net/ethernet/intel/e1000/e1000_param.c     |    2 -
+ drivers/net/ethernet/intel/e1000e/mac.c            |    2 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c         |    4 +-
+ drivers/net/ethernet/intel/e1000e/param.c          |    2 -
+ drivers/net/ethernet/intel/fm10k/fm10k_mbx.c       |    4 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_tlv.c       |    4 +-
+ drivers/net/ethernet/intel/i40e/i40e.h             |    1 +
+ drivers/net/ethernet/intel/i40e/i40e_ethtool.c     |  101 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c        |  139 +-
+ drivers/net/ethernet/intel/i40e/i40e_ptp.c         |    1 -
+ drivers/net/ethernet/intel/i40e/i40e_txrx.c        |  105 +-
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c |    8 +-
+ drivers/net/ethernet/intel/i40e/i40e_xsk.c         |   17 +-
+ drivers/net/ethernet/intel/iavf/iavf.h             |    7 +-
+ drivers/net/ethernet/intel/iavf/iavf_main.c        |  129 +-
+ drivers/net/ethernet/intel/iavf/iavf_virtchnl.c    |   65 +-
+ drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c  |    4 +-
+ drivers/net/ethernet/intel/ice/ice_flex_pipe.c     |    2 +-
+ drivers/net/ethernet/intel/ice/ice_gnss.c          |   11 +-
+ drivers/net/ethernet/intel/ice/ice_lag.c           |    6 +-
+ drivers/net/ethernet/intel/ice/ice_lib.c           |    5 +-
+ drivers/net/ethernet/intel/ice/ice_protocol_type.h |    9 +-
+ drivers/net/ethernet/intel/ice/ice_sriov.c         |   10 -
+ drivers/net/ethernet/intel/ice/ice_switch.c        |  386 +-
+ drivers/net/ethernet/intel/ice/ice_switch.h        |    1 +
+ drivers/net/ethernet/intel/ice/ice_tc_lib.c        |   66 +-
+ drivers/net/ethernet/intel/ice/ice_tc_lib.h        |    3 +
+ drivers/net/ethernet/intel/ice/ice_virtchnl.c      |  121 +-
+ drivers/net/ethernet/intel/ice/ice_vlan_mode.c     |    1 -
+ drivers/net/ethernet/intel/igb/e1000_82575.c       |    2 +-
+ drivers/net/ethernet/intel/igb/e1000_defines.h     |    3 -
+ drivers/net/ethernet/intel/igb/e1000_mac.c         |    2 +-
+ drivers/net/ethernet/intel/igb/e1000_regs.h        |    1 -
+ drivers/net/ethernet/intel/igb/igb_main.c          |  123 +-
+ drivers/net/ethernet/intel/igbvf/igbvf.h           |    2 +-
+ drivers/net/ethernet/intel/igbvf/netdev.c          |    2 +-
+ drivers/net/ethernet/intel/igc/igc_mac.c           |    2 +-
+ drivers/net/ethernet/intel/igc/igc_ptp.c           |    1 -
+ drivers/net/ethernet/intel/ixgb/ixgb_hw.c          |    4 +-
+ drivers/net/ethernet/intel/ixgb/ixgb_main.c        |    3 +-
+ drivers/net/ethernet/intel/ixgb/ixgb_param.c       |    2 -
+ drivers/net/ethernet/intel/ixgbe/ixgbe.h           |   34 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c     |    2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.c    |    2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c    |    2 -
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c   |    2 -
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |   88 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c       |    1 -
+ drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c     |    2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_type.h      |    7 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c      |    4 +-
+ drivers/net/ethernet/intel/ixgbevf/ethtool.c       |    4 -
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c  |    2 +-
+ drivers/net/ethernet/intel/ixgbevf/vf.c            |    2 +-
+ drivers/net/ethernet/marvell/mv643xx_eth.c         |    2 +-
+ drivers/net/ethernet/marvell/mvneta.c              |    4 +-
+ drivers/net/ethernet/marvell/octeontx2/af/Makefile |    2 +-
+ drivers/net/ethernet/marvell/octeontx2/af/cgx.c    |   42 +-
+ drivers/net/ethernet/marvell/octeontx2/af/cgx.h    |    2 +-
+ .../net/ethernet/marvell/octeontx2/af/cgx_fw_if.h  |    2 +
+ drivers/net/ethernet/marvell/octeontx2/af/mbox.h   |   45 +-
+ drivers/net/ethernet/marvell/octeontx2/af/npc.h    |   25 +
+ .../ethernet/marvell/octeontx2/af/npc_profile.h    |    5 +-
+ drivers/net/ethernet/marvell/octeontx2/af/rpm.c    |   21 +-
+ drivers/net/ethernet/marvell/octeontx2/af/rpm.h    |    4 +-
+ drivers/net/ethernet/marvell/octeontx2/af/rvu.c    |   16 +
+ drivers/net/ethernet/marvell/octeontx2/af/rvu.h    |   24 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c    |   41 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_cpt.c    |    4 +-
+ .../ethernet/marvell/octeontx2/af/rvu_debugfs.c    |  179 +
+ .../ethernet/marvell/octeontx2/af/rvu_devlink.c    |   71 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_nix.c    |    7 +
+ .../net/ethernet/marvell/octeontx2/af/rvu_npc.c    |   53 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c |  161 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.h |   17 +
+ .../ethernet/marvell/octeontx2/af/rvu_npc_hash.c   | 1982 ++++++++
+ .../ethernet/marvell/octeontx2/af/rvu_npc_hash.h   |  233 +
+ .../net/ethernet/marvell/octeontx2/af/rvu_reg.h    |   15 +
+ .../ethernet/marvell/octeontx2/nic/otx2_common.h   |   10 +-
+ .../ethernet/marvell/octeontx2/nic/otx2_dmac_flt.c |   46 +-
+ .../ethernet/marvell/octeontx2/nic/otx2_flows.c    |   40 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c   |    2 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c |    4 +-
+ drivers/net/ethernet/marvell/prestera/prestera.h   |   50 +-
+ .../net/ethernet/marvell/prestera/prestera_acl.c   |   47 +-
+ .../net/ethernet/marvell/prestera/prestera_acl.h   |    4 +-
+ .../net/ethernet/marvell/prestera/prestera_flow.c  |   52 +-
+ .../net/ethernet/marvell/prestera/prestera_flow.h  |    1 +
+ .../ethernet/marvell/prestera/prestera_flower.c    |   26 +-
+ .../net/ethernet/marvell/prestera/prestera_hw.c    |  256 +-
+ .../net/ethernet/marvell/prestera/prestera_hw.h    |   22 +-
+ .../net/ethernet/marvell/prestera/prestera_main.c  |  191 +
+ .../ethernet/marvell/prestera/prestera_switchdev.c |  706 ++-
+ drivers/net/ethernet/marvell/sky2.c                |    4 +-
+ drivers/net/ethernet/mediatek/mtk_eth_soc.c        |   11 +-
+ drivers/net/ethernet/mediatek/mtk_star_emac.c      |  529 +-
+ drivers/net/ethernet/mellanox/mlx4/en_tx.c         |    4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/Makefile   |    7 +-
+ drivers/net/ethernet/mellanox/mlx5/core/dev.c      |   29 +-
+ .../net/ethernet/mellanox/mlx5/core/en/devlink.c   |   16 +-
+ .../ethernet/mellanox/mlx5/core/en/tc/act/act.c    |    4 +-
+ .../ethernet/mellanox/mlx5/core/en/tc/act/act.h    |    3 +-
+ .../ethernet/mellanox/mlx5/core/en/tc/act/police.c |   61 +
+ .../ethernet/mellanox/mlx5/core/en/tc/act/trap.c   |    2 +-
+ .../net/ethernet/mellanox/mlx5/core/en/tc/meter.c  |  474 ++
+ .../net/ethernet/mellanox/mlx5/core/en/tc/meter.h  |   60 +
+ .../ethernet/mellanox/mlx5/core/en/tc/post_act.c   |    6 +-
+ .../ethernet/mellanox/mlx5/core/en/tc/post_meter.c |  198 +
+ .../ethernet/mellanox/mlx5/core/en/tc/post_meter.h |   27 +
+ drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c |    4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h |   11 +-
+ .../net/ethernet/mellanox/mlx5/core/en/tc_priv.h   |    6 +
+ .../mellanox/mlx5/core/en_accel/ipsec_fs.h         |   21 -
+ .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c |    2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.h   |    3 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c    |   71 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.h    |    8 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_tx.c    |    4 +-
+ .../ethernet/mellanox/mlx5/core/esw/devlink_port.c |   20 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.c  |  125 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.h  |   21 +-
+ .../ethernet/mellanox/mlx5/core/eswitch_offloads.c |  126 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c  |   10 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lib/aso.c  |  433 ++
+ drivers/net/ethernet/mellanox/mlx5/core/lib/aso.h  |   87 +
+ drivers/net/ethernet/mellanox/mlx5/core/main.c     |    1 +
+ .../net/ethernet/mellanox/mlx5/core/sf/devlink.c   |    2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/sriov.c    |    3 +-
+ .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c |    4 +-
+ drivers/net/ethernet/mellanox/mlxsw/Makefile       |    4 +-
+ drivers/net/ethernet/mellanox/mlxsw/cmd.h          |   62 +-
+ drivers/net/ethernet/mellanox/mlxsw/core.c         |   12 -
+ drivers/net/ethernet/mellanox/mlxsw/core.h         |   14 +-
+ .../mellanox/mlxsw/core_acl_flex_actions.c         |    2 +-
+ drivers/net/ethernet/mellanox/mlxsw/core_env.c     |    2 +-
+ drivers/net/ethernet/mellanox/mlxsw/minimal.c      |    3 +-
+ drivers/net/ethernet/mellanox/mlxsw/pci.c          |   47 +-
+ drivers/net/ethernet/mellanox/mlxsw/port.h         |    2 -
+ drivers/net/ethernet/mellanox/mlxsw/reg.h          | 1026 ++--
+ drivers/net/ethernet/mellanox/mlxsw/resources.h    |    2 +
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c     |   79 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.h     |   59 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum2_kvdl.c   |    2 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c | 1072 +++-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_pgt.c |  346 ++
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c  | 1036 ++--
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.h  |   77 +-
+ .../ethernet/mellanox/mlxsw/spectrum_router_xm.c   |  812 ----
+ .../ethernet/mellanox/mlxsw/spectrum_switchdev.c   |  842 ++--
+ .../net/ethernet/mellanox/mlxsw/spectrum_trap.c    |    8 +-
+ drivers/net/ethernet/mellanox/mlxsw/trap.h         |    4 +-
+ drivers/net/ethernet/microchip/lan743x_ethtool.c   |   63 +-
+ drivers/net/ethernet/microchip/lan743x_ethtool.h   |   26 +
+ drivers/net/ethernet/microchip/lan743x_main.c      |  378 +-
+ drivers/net/ethernet/microchip/lan743x_main.h      |  106 +
+ .../ethernet/microchip/sparx5/sparx5_switchdev.c   |   55 +-
+ drivers/net/ethernet/microsoft/mana/gdma.h         |   10 +
+ drivers/net/ethernet/microsoft/mana/gdma_main.c    |   39 +-
+ drivers/net/ethernet/microsoft/mana/hw_channel.c   |   18 +-
+ drivers/net/ethernet/microsoft/mana/hw_channel.h   |    5 +
+ drivers/net/ethernet/microsoft/mana/mana.h         |   70 +
+ drivers/net/ethernet/microsoft/mana/mana_bpf.c     |   64 +
+ drivers/net/ethernet/microsoft/mana/mana_en.c      |  148 +-
+ drivers/net/ethernet/microsoft/mana/mana_ethtool.c |   12 +-
+ drivers/net/ethernet/mscc/ocelot.c                 |    1 +
+ drivers/net/ethernet/mscc/ocelot_ptp.c             |    8 +
+ drivers/net/ethernet/myricom/myri10ge/myri10ge.c   |    2 +-
+ drivers/net/ethernet/natsemi/natsemi.c             |    2 +-
+ drivers/net/ethernet/neterion/Kconfig              |   24 -
+ drivers/net/ethernet/neterion/Makefile             |    1 -
+ drivers/net/ethernet/neterion/s2io.c               |   10 +-
+ drivers/net/ethernet/neterion/vxge/Makefile        |    8 -
+ drivers/net/ethernet/neterion/vxge/vxge-config.c   | 5099 --------------------
+ drivers/net/ethernet/neterion/vxge/vxge-config.h   | 2086 --------
+ drivers/net/ethernet/neterion/vxge/vxge-ethtool.c  | 1154 -----
+ drivers/net/ethernet/neterion/vxge/vxge-ethtool.h  |   48 -
+ drivers/net/ethernet/neterion/vxge/vxge-main.c     | 4808 ------------------
+ drivers/net/ethernet/neterion/vxge/vxge-main.h     |  516 --
+ drivers/net/ethernet/neterion/vxge/vxge-reg.h      | 4636 ------------------
+ drivers/net/ethernet/neterion/vxge/vxge-traffic.c  | 2428 ----------
+ drivers/net/ethernet/neterion/vxge/vxge-traffic.h  | 2290 ---------
+ drivers/net/ethernet/neterion/vxge/vxge-version.h  |   49 -
+ drivers/net/ethernet/netronome/nfp/flower/action.c |    8 +-
+ drivers/net/ethernet/netronome/nfp/flower/cmsg.h   |    2 -
+ .../net/ethernet/netronome/nfp/flower/conntrack.c  |   14 +-
+ .../net/ethernet/netronome/nfp/flower/lag_conf.c   |    4 +-
+ .../net/ethernet/netronome/nfp/flower/metadata.c   |    2 +-
+ .../net/ethernet/netronome/nfp/flower/offload.c    |    4 +-
+ .../net/ethernet/netronome/nfp/flower/qos_conf.c   |    6 +-
+ .../ethernet/netronome/nfp/flower/tunnel_conf.c    |    2 +-
+ drivers/net/ethernet/netronome/nfp/nfd3/dp.c       |   84 +-
+ drivers/net/ethernet/netronome/nfp/nfd3/rings.c    |    4 +
+ drivers/net/ethernet/netronome/nfp/nfd3/xsk.c      |   17 +-
+ drivers/net/ethernet/netronome/nfp/nfdk/dp.c       |  122 +-
+ drivers/net/ethernet/netronome/nfp/nfdk/rings.c    |    5 +-
+ drivers/net/ethernet/netronome/nfp/nfp_app.c       |    2 +-
+ drivers/net/ethernet/netronome/nfp/nfp_main.c      |    6 +-
+ drivers/net/ethernet/netronome/nfp/nfp_net.h       |   27 +-
+ .../net/ethernet/netronome/nfp/nfp_net_common.c    |  153 +-
+ drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h  |   18 +
+ drivers/net/ethernet/netronome/nfp/nfp_net_dp.c    |   24 +
+ drivers/net/ethernet/netronome/nfp/nfp_net_dp.h    |    4 +
+ .../net/ethernet/netronome/nfp/nfp_net_ethtool.c   |  220 +
+ drivers/net/ethernet/netronome/nfp/nfp_net_repr.c  |   12 +-
+ drivers/net/ethernet/netronome/nfp/nfp_net_xsk.c   |    8 +-
+ drivers/net/ethernet/netronome/nfp/nfpcore/crc32.h |    1 -
+ .../net/ethernet/netronome/nfp/nfpcore/nfp_cpp.h   |   26 +-
+ .../net/ethernet/netronome/nfp/nfpcore/nfp_dev.c   |    4 +-
+ .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h   |    2 +
+ .../ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c   |   30 +
+ drivers/net/ethernet/pensando/ionic/ionic_txrx.c   |    5 +-
+ .../net/ethernet/qlogic/netxen/netxen_nic_main.c   |    2 +-
+ drivers/net/ethernet/qlogic/qed/qed_dev.c          |    4 +-
+ drivers/net/ethernet/qlogic/qed/qed_int.c          |    2 +-
+ drivers/net/ethernet/qlogic/qed/qed_rdma.c         |    7 +-
+ drivers/net/ethernet/qlogic/qede/qede_fp.c         |    8 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c     |    2 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c   |    6 +-
+ drivers/net/ethernet/qualcomm/emac/emac-mac.c      |    6 +-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c    |    2 +-
+ drivers/net/ethernet/sfc/ef10.c                    |    4 +-
+ drivers/net/ethernet/sfc/ef100.c                   |   69 +-
+ drivers/net/ethernet/sfc/ef100_ethtool.c           |    2 +-
+ drivers/net/ethernet/sfc/ef100_netdev.c            |  130 +-
+ drivers/net/ethernet/sfc/ef100_netdev.h            |    4 +-
+ drivers/net/ethernet/sfc/ef100_nic.c               |  422 +-
+ drivers/net/ethernet/sfc/ef100_nic.h               |   10 +-
+ drivers/net/ethernet/sfc/efx.c                     |   73 +-
+ drivers/net/ethernet/sfc/efx_common.c              |   77 +-
+ drivers/net/ethernet/sfc/efx_common.h              |   16 +-
+ drivers/net/ethernet/sfc/ethtool.c                 |   22 +-
+ drivers/net/ethernet/sfc/ethtool_common.c          |   50 +-
+ drivers/net/ethernet/sfc/falcon/bitfield.h         |    2 +-
+ drivers/net/ethernet/sfc/falcon/farch.c            |    6 +-
+ drivers/net/ethernet/sfc/mcdi.c                    |   17 +-
+ drivers/net/ethernet/sfc/mcdi_pcol.h               |   10 +-
+ drivers/net/ethernet/sfc/mcdi_port.c               |    4 +-
+ drivers/net/ethernet/sfc/net_driver.h              |   69 +-
+ drivers/net/ethernet/sfc/rx_common.c               |    4 +-
+ drivers/net/ethernet/sfc/siena/farch.c             |    6 +-
+ drivers/net/ethernet/sfc/siena/mcdi.c              |    2 +-
+ drivers/net/ethernet/sfc/siena/mcdi_pcol.h         |   10 +-
+ drivers/net/ethernet/sfc/sriov.c                   |   10 +-
+ drivers/net/ethernet/sfc/tx.c                      |    4 +-
+ drivers/net/ethernet/stmicro/stmmac/Kconfig        |    3 +
+ drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c  |   34 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c    |  157 +-
+ drivers/net/ethernet/stmicro/stmmac/mmc_core.c     |    2 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |   14 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c  |   14 +
+ drivers/net/ethernet/sun/cassini.c                 |    2 +-
+ drivers/net/ethernet/sun/cassini.h                 |    2 +-
+ drivers/net/ethernet/sun/ldmvsw.c                  |    2 +-
+ drivers/net/ethernet/sun/sungem.c                  |    2 +-
+ drivers/net/ethernet/sunplus/spl2sw_driver.c       |    2 +-
+ drivers/net/ethernet/synopsys/dwc-xlgmac-net.c     |    2 +-
+ drivers/net/ethernet/via/via-velocity.h            |    2 +-
+ drivers/net/ethernet/wangxun/Kconfig               |   32 +
+ drivers/net/ethernet/wangxun/Makefile              |    6 +
+ drivers/net/ethernet/wangxun/txgbe/Makefile        |    9 +
+ drivers/net/ethernet/wangxun/txgbe/txgbe.h         |   24 +
+ drivers/net/ethernet/wangxun/txgbe/txgbe_main.c    |  165 +
+ drivers/net/ethernet/wangxun/txgbe/txgbe_type.h    |   57 +
+ drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c  |    2 +-
+ drivers/net/ethernet/xscale/ixp4xx_eth.c           |   15 +-
+ drivers/net/fddi/skfp/fplustm.c                    |    2 +-
+ drivers/net/ipa/gsi.c                              |  229 +-
+ drivers/net/ipa/gsi.h                              |   13 +-
+ drivers/net/ipa/gsi_private.h                      |   24 +-
+ drivers/net/ipa/gsi_trans.c                        |  108 +-
+ drivers/net/ipa/gsi_trans.h                        |   15 +-
+ drivers/net/ipa/ipa_cmd.c                          |    8 +-
+ drivers/net/ipa/ipa_endpoint.c                     |   27 +-
+ drivers/net/ipa/ipa_endpoint.h                     |    4 +-
+ drivers/net/ipvlan/ipvlan.h                        |   10 +-
+ drivers/net/ipvlan/ipvlan_core.c                   |    6 +-
+ drivers/net/ipvlan/ipvlan_main.c                   |   18 +-
+ drivers/net/macsec.c                               |   12 +-
+ drivers/net/macvlan.c                              |   22 +-
+ drivers/net/netconsole.c                           |    2 +-
+ drivers/net/pcs/Kconfig                            |   12 +-
+ drivers/net/pcs/Makefile                           |    1 +
+ drivers/net/pcs/pcs-lynx.c                         |   80 +-
+ drivers/net/pcs/pcs-rzn1-miic.c                    |  531 ++
+ drivers/net/pcs/pcs-xpcs.c                         |  168 +-
+ drivers/net/pcs/pcs-xpcs.h                         |    1 -
+ drivers/net/phy/Kconfig                            |    7 +
+ drivers/net/phy/Makefile                           |    1 +
+ drivers/net/phy/aquantia_main.c                    |   20 +
+ drivers/net/phy/bcm-phy-lib.h                      |   19 +
+ drivers/net/phy/bcm-phy-ptp.c                      |  944 ++++
+ drivers/net/phy/broadcom.c                         |   48 +-
+ drivers/net/phy/dp83867.c                          |   55 +-
+ drivers/net/phy/dp83td510.c                        |   49 +
+ drivers/net/phy/fixed_phy.c                        |    1 +
+ drivers/net/phy/marvell-88x2222.c                  |    2 +
+ drivers/net/phy/marvell.c                          |   10 +-
+ drivers/net/phy/micrel.c                           |   73 +-
+ drivers/net/phy/mxl-gpy.c                          |  162 +-
+ drivers/net/phy/nxp-tja11xx.c                      |   11 +-
+ drivers/net/phy/phy_device.c                       |   18 +-
+ drivers/net/phy/phylink.c                          |   74 +-
+ drivers/net/phy/sfp.c                              |   10 +-
+ drivers/net/phy/smsc.c                             |   13 +-
+ drivers/net/ppp/ppp_generic.c                      |    2 +-
+ drivers/net/team/team.c                            |   26 +-
+ drivers/net/usb/asix.h                             |    3 -
+ drivers/net/usb/asix_common.c                      |   40 +-
+ drivers/net/usb/catc.c                             |    2 +-
+ drivers/net/usb/cdc_eem.c                          |    2 +-
+ drivers/net/usb/smsc95xx.c                         |  207 +-
+ drivers/net/usb/usbnet.c                           |   19 +-
+ drivers/net/vmxnet3/Makefile                       |    2 +-
+ drivers/net/vmxnet3/upt1_defs.h                    |    2 +-
+ drivers/net/vmxnet3/vmxnet3_defs.h                 |   80 +-
+ drivers/net/vmxnet3/vmxnet3_drv.c                  |  298 +-
+ drivers/net/vmxnet3/vmxnet3_ethtool.c              |  122 +-
+ drivers/net/vmxnet3/vmxnet3_int.h                  |   24 +-
+ drivers/net/vrf.c                                  |    8 +-
+ drivers/net/vxlan/vxlan_core.c                     |    8 +-
+ drivers/net/wan/farsync.h                          |    2 +-
+ drivers/net/wireguard/receive.c                    |    9 +-
+ drivers/net/wireless/admtek/adm8211.c              |    2 +-
+ drivers/net/wireless/ath/ar5523/ar5523.c           |   12 +-
+ drivers/net/wireless/ath/ath10k/core.c             |   11 +-
+ drivers/net/wireless/ath/ath10k/core.h             |    1 +
+ drivers/net/wireless/ath/ath10k/htt_rx.c           |    8 +-
+ drivers/net/wireless/ath/ath10k/htt_tx.c           |   61 +-
+ drivers/net/wireless/ath/ath10k/mac.c              |  113 +-
+ drivers/net/wireless/ath/ath10k/qmi.c              |    4 +-
+ drivers/net/wireless/ath/ath10k/snoc.c             |    5 +-
+ drivers/net/wireless/ath/ath10k/txrx.c             |   15 +-
+ drivers/net/wireless/ath/ath10k/wmi-tlv.c          |    2 +-
+ drivers/net/wireless/ath/ath10k/wmi.c              |    4 +-
+ drivers/net/wireless/ath/ath11k/ahb.c              |    4 +-
+ drivers/net/wireless/ath/ath11k/core.c             |   16 +-
+ drivers/net/wireless/ath/ath11k/core.h             |    6 +-
+ drivers/net/wireless/ath/ath11k/debug.h            |    4 +-
+ .../net/wireless/ath/ath11k/debugfs_htt_stats.c    |   88 +-
+ .../net/wireless/ath/ath11k/debugfs_htt_stats.h    |   39 +
+ drivers/net/wireless/ath/ath11k/dp_rx.c            |    8 +-
+ drivers/net/wireless/ath/ath11k/hal.c              |    2 +-
+ drivers/net/wireless/ath/ath11k/hal_rx.c           |    2 +-
+ drivers/net/wireless/ath/ath11k/htc.c              |    4 +-
+ drivers/net/wireless/ath/ath11k/mac.c              |   64 +-
+ drivers/net/wireless/ath/ath11k/pci.c              |    2 +
+ drivers/net/wireless/ath/ath11k/qmi.c              |    6 +-
+ drivers/net/wireless/ath/ath11k/wmi.c              |    6 +-
+ drivers/net/wireless/ath/ath5k/base.c              |    2 +-
+ drivers/net/wireless/ath/ath5k/mac80211-ops.c      |   14 +-
+ drivers/net/wireless/ath/ath5k/phy.c               |    2 +-
+ drivers/net/wireless/ath/ath6kl/cfg80211.c         |    8 +-
+ drivers/net/wireless/ath/ath6kl/usb.c              |   16 +-
+ drivers/net/wireless/ath/ath6kl/wmi.h              |    2 +-
+ drivers/net/wireless/ath/ath9k/ar9002_phy.c        |    2 +-
+ drivers/net/wireless/ath/ath9k/beacon.c            |   15 +-
+ drivers/net/wireless/ath/ath9k/dfs.c               |    2 +-
+ drivers/net/wireless/ath/ath9k/hif_usb.c           |   26 +-
+ drivers/net/wireless/ath/ath9k/htc.h               |   32 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_beacon.c    |    4 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_init.c      |    3 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_main.c      |   18 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_txrx.c      |   10 +-
+ drivers/net/wireless/ath/ath9k/main.c              |   12 +-
+ drivers/net/wireless/ath/carl9170/main.c           |    4 +-
+ drivers/net/wireless/ath/carl9170/tx.c             |    2 +-
+ drivers/net/wireless/ath/wcn36xx/hal.h             |    4 +-
+ drivers/net/wireless/ath/wcn36xx/main.c            |   22 +-
+ drivers/net/wireless/ath/wcn36xx/smd.c             |    2 +-
+ drivers/net/wireless/ath/wil6210/cfg80211.c        |    9 +-
+ drivers/net/wireless/ath/wil6210/txrx.c            |    4 +-
+ drivers/net/wireless/ath/wil6210/wmi.c             |    4 +-
+ drivers/net/wireless/atmel/at76c50x-usb.c          |    2 +-
+ drivers/net/wireless/broadcom/b43/main.c           |    6 +-
+ drivers/net/wireless/broadcom/b43legacy/main.c     |    4 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c         |   10 +-
+ .../broadcom/brcm80211/brcmsmac/mac80211_if.c      |   18 +-
+ drivers/net/wireless/intel/iwlegacy/3945-mac.c     |    6 +-
+ drivers/net/wireless/intel/iwlegacy/4965-rs.c      |    5 +-
+ drivers/net/wireless/intel/iwlegacy/4965.c         |    6 +-
+ drivers/net/wireless/intel/iwlegacy/common.c       |   18 +-
+ drivers/net/wireless/intel/iwlegacy/common.h       |    2 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/agn.h       |    2 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/lib.c       |    4 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/main.c      |    4 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/rxon.c      |   26 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/coex.c      |   10 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/d3.c        |    4 +-
+ .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c   |    4 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c   |    2 +-
+ .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c |   12 +-
+ .../net/wireless/intel/iwlwifi/mvm/ftm-responder.c |    4 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c  |   24 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c  |   88 +-
+ .../net/wireless/intel/iwlwifi/mvm/offloading.c    |    6 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/ops.c       |    2 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/power.c     |    4 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/quota.c     |    4 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rs.c        |    2 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/scan.c      |    4 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sf.c        |    6 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.c       |    2 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tdls.c      |    4 +-
+ .../net/wireless/intel/iwlwifi/mvm/time-event.c    |   12 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tx.c        |    2 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/utils.c     |    6 +-
+ drivers/net/wireless/intersil/p54/main.c           |    8 +-
+ drivers/net/wireless/mac80211_hwsim.c              |  262 +-
+ drivers/net/wireless/mac80211_hwsim.h              |    5 +-
+ drivers/net/wireless/marvell/libertas/mesh.c       |   10 +-
+ drivers/net/wireless/marvell/libertas_tf/main.c    |    6 +-
+ drivers/net/wireless/marvell/mwifiex/11h.c         |    2 +-
+ drivers/net/wireless/marvell/mwifiex/cfg80211.c    |   18 +-
+ drivers/net/wireless/marvell/mwl8k.c               |   14 +-
+ drivers/net/wireless/mediatek/mt76/mac80211.c      |    4 +-
+ drivers/net/wireless/mediatek/mt76/mt7603/beacon.c |    2 +-
+ drivers/net/wireless/mediatek/mt76/mt7603/main.c   |    4 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/main.c   |    4 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/mcu.c    |    8 +-
+ .../net/wireless/mediatek/mt76/mt76_connac_mcu.c   |   10 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02.h       |    2 +-
+ .../net/wireless/mediatek/mt76/mt76x02_beacon.c    |    2 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_util.c  |    2 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/main.c   |    4 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/mcu.c    |   12 +-
+ drivers/net/wireless/mediatek/mt76/mt7921/main.c   |    4 +-
+ drivers/net/wireless/mediatek/mt76/mt7921/mcu.c    |    4 +-
+ drivers/net/wireless/mediatek/mt7601u/main.c       |    2 +-
+ drivers/net/wireless/mediatek/mt7601u/phy.c        |    9 +-
+ drivers/net/wireless/microchip/wilc1000/cfg80211.c |  249 +-
+ drivers/net/wireless/microchip/wilc1000/fw.h       |   21 +-
+ drivers/net/wireless/microchip/wilc1000/hif.c      |  202 +-
+ drivers/net/wireless/microchip/wilc1000/hif.h      |   14 +-
+ drivers/net/wireless/microchip/wilc1000/netdev.c   |   11 +-
+ drivers/net/wireless/microchip/wilc1000/netdev.h   |   14 +-
+ drivers/net/wireless/microchip/wilc1000/spi.c      |    6 +-
+ drivers/net/wireless/microchip/wilc1000/wlan.c     |    3 +-
+ drivers/net/wireless/microchip/wilc1000/wlan.h     |    2 +
+ drivers/net/wireless/microchip/wilc1000/wlan_if.h  |   20 +-
+ drivers/net/wireless/purelifi/plfxlc/mac.c         |    8 +-
+ drivers/net/wireless/quantenna/qtnfmac/cfg80211.c  |   14 +-
+ drivers/net/wireless/quantenna/qtnfmac/commands.c  |   14 +-
+ drivers/net/wireless/quantenna/qtnfmac/event.c     |   15 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00.h        |    2 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00config.c  |    4 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00mac.c     |    4 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00queue.c   |    2 +-
+ drivers/net/wireless/ray_cs.c                      |   20 +-
+ drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c |    4 +-
+ drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c |    4 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c  |   12 +-
+ drivers/net/wireless/realtek/rtlwifi/core.c        |    8 +-
+ drivers/net/wireless/realtek/rtlwifi/debug.c       |    8 +-
+ drivers/net/wireless/realtek/rtlwifi/pci.c         |    2 +-
+ drivers/net/wireless/realtek/rtw88/bf.c            |    2 +-
+ drivers/net/wireless/realtek/rtw88/debug.c         |    6 +-
+ drivers/net/wireless/realtek/rtw88/fw.c            |    2 +-
+ drivers/net/wireless/realtek/rtw88/mac80211.c      |    9 +-
+ drivers/net/wireless/realtek/rtw88/main.c          |   22 +-
+ drivers/net/wireless/realtek/rtw88/rtw8723d.c      |    2 +-
+ drivers/net/wireless/realtek/rtw88/rtw8723d.h      |    2 +
+ drivers/net/wireless/realtek/rtw88/rtw8723de.c     |    2 +-
+ drivers/net/wireless/realtek/rtw88/rtw8723de.h     |   10 -
+ drivers/net/wireless/realtek/rtw88/rtw8821c.c      |    2 +-
+ drivers/net/wireless/realtek/rtw88/rtw8821c.h      |    2 +
+ drivers/net/wireless/realtek/rtw88/rtw8821ce.c     |    2 +-
+ drivers/net/wireless/realtek/rtw88/rtw8821ce.h     |   10 -
+ drivers/net/wireless/realtek/rtw88/rtw8822b.c      |    2 +-
+ drivers/net/wireless/realtek/rtw88/rtw8822b.h      |    2 +
+ drivers/net/wireless/realtek/rtw88/rtw8822be.c     |    2 +-
+ drivers/net/wireless/realtek/rtw88/rtw8822be.h     |   10 -
+ drivers/net/wireless/realtek/rtw88/rtw8822c.c      |    2 +-
+ drivers/net/wireless/realtek/rtw88/rtw8822c.h      |    2 +
+ drivers/net/wireless/realtek/rtw88/rtw8822ce.c     |    2 +-
+ drivers/net/wireless/realtek/rtw88/rtw8822ce.h     |   10 -
+ drivers/net/wireless/realtek/rtw89/cam.c           |   38 +-
+ drivers/net/wireless/realtek/rtw89/cam.h           |   17 +-
+ drivers/net/wireless/realtek/rtw89/core.c          |  204 +-
+ drivers/net/wireless/realtek/rtw89/core.h          |   80 +-
+ drivers/net/wireless/realtek/rtw89/debug.c         |    6 +-
+ drivers/net/wireless/realtek/rtw89/debug.h         |    3 +
+ drivers/net/wireless/realtek/rtw89/fw.c            |   29 +-
+ drivers/net/wireless/realtek/rtw89/fw.h            |    5 +-
+ drivers/net/wireless/realtek/rtw89/mac.c           |   15 +-
+ drivers/net/wireless/realtek/rtw89/mac.h           |    1 +
+ drivers/net/wireless/realtek/rtw89/mac80211.c      |   14 +-
+ drivers/net/wireless/realtek/rtw89/pci.c           |   25 +-
+ drivers/net/wireless/realtek/rtw89/pci.h           |    1 +
+ drivers/net/wireless/realtek/rtw89/phy.c           |   46 +-
+ drivers/net/wireless/realtek/rtw89/phy.h           |    1 +
+ drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c  |    4 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852c.c      |    1 +
+ drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c  |   27 +
+ drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.h  |    1 +
+ drivers/net/wireless/realtek/rtw89/sar.c           |  140 +-
+ drivers/net/wireless/realtek/rtw89/ser.c           |   15 +-
+ drivers/net/wireless/rndis_wlan.c                  |    5 +-
+ drivers/net/wireless/rsi/rsi_91x_core.c            |    3 +-
+ drivers/net/wireless/rsi/rsi_91x_hal.c             |    9 +-
+ drivers/net/wireless/rsi/rsi_91x_mac80211.c        |   33 +-
+ drivers/net/wireless/rsi/rsi_91x_mgmt.c            |    3 +-
+ drivers/net/wireless/silabs/wfx/fwio.c             |    3 +-
+ drivers/net/wireless/silabs/wfx/hif_tx.c           |   12 +-
+ drivers/net/wireless/silabs/wfx/sta.c              |   40 +-
+ drivers/net/wireless/silabs/wfx/sta.h              |   10 +-
+ drivers/net/wireless/st/cw1200/bh.c                |   10 +-
+ drivers/net/wireless/st/cw1200/sta.c               |   44 +-
+ drivers/net/wireless/st/cw1200/sta.h               |    2 +-
+ drivers/net/wireless/st/cw1200/txrx.c              |    4 +-
+ drivers/net/wireless/ti/wl1251/main.c              |   12 +-
+ drivers/net/wireless/ti/wlcore/cmd.c               |    4 +-
+ drivers/net/wireless/ti/wlcore/main.c              |   47 +-
+ drivers/net/wireless/virt_wifi.c                   |    2 +-
+ drivers/net/wireless/zydas/zd1211rw/zd_mac.c       |   13 +-
+ drivers/net/xen-netback/common.h                   |   12 -
+ drivers/net/xen-netback/interface.c                |   16 +-
+ drivers/net/xen-netback/netback.c                  |    8 +-
+ drivers/net/xen-netback/rx.c                       |    2 +-
+ drivers/net/xen-netfront.c                         |   24 +-
+ drivers/nfc/nxp-nci/core.c                         |   34 +
+ drivers/ptp/ptp_ocp.c                              |   23 +-
+ drivers/staging/qlge/qlge_main.c                   |    2 +-
+ drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c  |    8 +-
+ drivers/staging/vt6655/device_main.c               |    8 +-
+ drivers/staging/vt6655/rxtx.c                      |    2 +-
+ drivers/staging/vt6656/main_usb.c                  |    6 +-
+ drivers/staging/vt6656/rxtx.c                      |    2 +-
+ drivers/staging/wlan-ng/cfg80211.c                 |    2 +-
+ include/linux/bpf-cgroup-defs.h                    |   13 +-
+ include/linux/bpf-cgroup.h                         |    9 +-
+ include/linux/bpf.h                                |  152 +-
+ include/linux/bpf_lsm.h                            |    7 +
+ include/linux/bpf_verifier.h                       |   14 +-
+ include/linux/brcmphy.h                            |    1 +
+ include/linux/btf.h                                |   28 +
+ include/linux/btf_ids.h                            |    3 +-
+ include/linux/can/bittiming.h                      |    2 +
+ include/linux/can/skb.h                            |   59 +-
+ include/linux/filter.h                             |   35 +-
+ include/linux/ieee80211.h                          |  257 +
+ include/linux/if_macvlan.h                         |    6 +-
+ include/linux/if_team.h                            |   10 +-
+ include/linux/if_vlan.h                            |   10 +-
+ include/linux/mii.h                                |   35 +
+ include/linux/mlx5/driver.h                        |    4 +
+ include/linux/mlx5/eswitch.h                       |    8 +-
+ include/linux/mroute_base.h                        |   15 +-
+ include/linux/net.h                                |    4 +
+ include/linux/netdevice.h                          |   40 +-
+ include/linux/pcs-rzn1-miic.h                      |   18 +
+ include/linux/pcs/pcs-xpcs.h                       |    3 +-
+ include/linux/phy.h                                |    3 +
+ include/linux/skbuff.h                             |  203 +-
+ include/linux/skmsg.h                              |    1 +
+ include/linux/socket.h                             |    4 -
+ include/linux/sockptr.h                            |    8 +
+ include/linux/sysctl.h                             |    2 +
+ include/linux/tcp.h                                |   30 +
+ include/linux/time64.h                             |    3 +
+ include/net/af_unix.h                              |    5 +-
+ include/net/bond_options.h                         |   14 +-
+ include/net/bonding.h                              |    1 +
+ include/net/cfg80211.h                             |  265 +-
+ include/net/devlink.h                              |   19 +-
+ include/net/dropreason.h                           |  256 +
+ include/net/dsa.h                                  |    9 +
+ include/net/flow_dissector.h                       |   16 +
+ include/net/flow_offload.h                         |    6 +
+ include/net/fq_impl.h                              |    5 +-
+ include/net/ip_tunnels.h                           |    4 +-
+ include/net/mac80211.h                             |  264 +-
+ include/net/mptcp.h                                |    3 +-
+ include/net/neighbour.h                            |    1 +
+ include/net/net_namespace.h                        |    2 +
+ include/net/netns/unix.h                           |    6 +
+ include/net/pkt_cls.h                              |    2 +-
+ include/net/pkt_sched.h                            |   17 +
+ include/net/raw.h                                  |   18 +-
+ include/net/rawv6.h                                |    7 +-
+ include/net/route.h                                |    4 -
+ include/net/sock.h                                 |  114 +-
+ include/net/strparser.h                            |   12 +-
+ include/net/switchdev.h                            |    3 +
+ include/net/tcp.h                                  |    4 +
+ include/net/tls.h                                  |  279 +-
+ include/net/udp.h                                  |    4 +-
+ include/net/xfrm.h                                 |    4 +-
+ include/soc/mscc/ocelot.h                          |    6 +
+ include/trace/events/net.h                         |    2 +-
+ include/trace/events/qdisc.h                       |    4 +-
+ include/trace/events/skb.h                         |   89 +-
+ include/uapi/linux/bpf.h                           |   93 +-
+ include/uapi/linux/btf.h                           |   17 +-
+ include/uapi/linux/if_ether.h                      |    1 +
+ include/uapi/linux/if_link.h                       |    1 +
+ include/uapi/linux/neighbour.h                     |    1 +
+ include/uapi/linux/nl80211.h                       |   55 +-
+ include/uapi/linux/snmp.h                          |    2 +
+ include/uapi/linux/sysctl.h                        |   37 +-
+ include/uapi/linux/tls.h                           |    2 +
+ kernel/bpf/bpf_iter.c                              |    9 +-
+ kernel/bpf/bpf_lsm.c                               |   81 +
+ kernel/bpf/bpf_struct_ops.c                        |    7 +-
+ kernel/bpf/btf.c                                   |  234 +-
+ kernel/bpf/cgroup.c                                |  416 +-
+ kernel/bpf/core.c                                  |   32 +-
+ kernel/bpf/helpers.c                               |   12 +-
+ kernel/bpf/percpu_freelist.c                       |   20 +-
+ kernel/bpf/syscall.c                               |   25 +-
+ kernel/bpf/trampoline.c                            |  262 +-
+ kernel/bpf/verifier.c                              |  287 +-
+ kernel/events/core.c                               |   16 +-
+ kernel/sysctl.c                                    |   41 +
+ kernel/trace/bpf_trace.c                           |    4 +-
+ kernel/trace/trace_uprobe.c                        |    7 +-
+ lib/test_bpf.c                                     |    4 +-
+ net/6lowpan/nhc.c                                  |  103 +-
+ net/6lowpan/nhc.h                                  |   38 +-
+ net/6lowpan/nhc_dest.c                             |    9 +-
+ net/6lowpan/nhc_fragment.c                         |    9 +-
+ net/6lowpan/nhc_ghc_ext_dest.c                     |    9 +-
+ net/6lowpan/nhc_ghc_ext_frag.c                     |   11 +-
+ net/6lowpan/nhc_ghc_ext_hop.c                      |    9 +-
+ net/6lowpan/nhc_ghc_ext_route.c                    |    9 +-
+ net/6lowpan/nhc_ghc_icmpv6.c                       |    9 +-
+ net/6lowpan/nhc_ghc_udp.c                          |    9 +-
+ net/6lowpan/nhc_hop.c                              |    9 +-
+ net/6lowpan/nhc_ipv6.c                             |   11 +-
+ net/6lowpan/nhc_mobility.c                         |    9 +-
+ net/6lowpan/nhc_routing.c                          |    9 +-
+ net/6lowpan/nhc_udp.c                              |    9 +-
+ net/8021q/vlan_core.c                              |    6 +-
+ net/8021q/vlan_dev.c                               |   22 +-
+ net/ax25/af_ax25.c                                 |    7 +-
+ net/ax25/ax25_dev.c                                |    9 +-
+ net/bpf/test_run.c                                 |    6 -
+ net/bridge/br_if.c                                 |   10 +-
+ net/bridge/br_mdb.c                                |   15 +-
+ net/bridge/br_netlink.c                            |    8 +-
+ net/bridge/br_vlan.c                               |   36 +-
+ net/can/Kconfig                                    |    5 +-
+ net/core/.gitignore                                |    1 +
+ net/core/Makefile                                  |   23 +-
+ net/core/datagram.c                                |    3 -
+ net/core/dev.c                                     |   48 +-
+ net/core/dev_ioctl.c                               |    4 +-
+ net/core/devlink.c                                 |  346 +-
+ net/core/drop_monitor.c                            |   36 +-
+ net/core/dst.c                                     |    8 +-
+ net/core/failover.c                                |    4 +-
+ net/core/filter.c                                  |  195 +-
+ net/core/flow_offload.c                            |    7 +
+ net/core/link_watch.c                              |    2 +-
+ net/core/neighbour.c                               |   50 +-
+ net/core/net-sysfs.c                               |    8 +-
+ net/core/netpoll.c                                 |    2 +-
+ net/core/page_pool.c                               |    3 +-
+ net/core/pktgen.c                                  |    6 +-
+ net/core/skbuff.c                                  |   31 +-
+ net/core/skmsg.c                                   |   49 +-
+ net/core/sock.c                                    |   34 +-
+ net/core/sock_map.c                                |   23 +
+ net/core/stream.c                                  |    6 +-
+ net/decnet/af_decnet.c                             |    4 +
+ net/decnet/dn_neigh.c                              |    1 +
+ net/dsa/Kconfig                                    |   11 +-
+ net/dsa/Makefile                                   |    1 +
+ net/dsa/slave.c                                    |   37 +-
+ net/dsa/tag_ksz.c                                  |   59 +
+ net/dsa/tag_rzn1_a5psw.c                           |  113 +
+ net/ethtool/ioctl.c                                |   21 +-
+ net/ethtool/netlink.c                              |    6 +-
+ net/ethtool/netlink.h                              |    2 +-
+ net/ipv4/af_inet.c                                 |   13 +-
+ net/ipv4/arp.c                                     |    1 +
+ net/ipv4/bpf_tcp_ca.c                              |   39 +-
+ net/ipv4/devinet.c                                 |    4 +-
+ net/ipv4/esp4.c                                    |    4 +-
+ net/ipv4/fib_semantics.c                           |   11 +-
+ net/ipv4/ip_output.c                               |   10 +-
+ net/ipv4/ip_tunnel.c                               |   21 +-
+ net/ipv4/ipconfig.c                                |    8 +-
+ net/ipv4/ipmr.c                                    |  217 +-
+ net/ipv4/ipmr_base.c                               |   53 +-
+ net/ipv4/ping.c                                    |   36 +-
+ net/ipv4/raw.c                                     |  172 +-
+ net/ipv4/raw_diag.c                                |   57 +-
+ net/ipv4/route.c                                   |   41 +-
+ net/ipv4/tcp.c                                     |  117 +-
+ net/ipv4/tcp_bpf.c                                 |    1 +
+ net/ipv4/tcp_input.c                               |    9 +-
+ net/ipv4/tcp_ipv4.c                                |    5 +
+ net/ipv4/tcp_output.c                              |   32 +-
+ net/ipv4/tcp_timer.c                               |   19 +-
+ net/ipv4/udp.c                                     |   25 +-
+ net/ipv4/udplite.c                                 |    3 +
+ net/ipv4/xfrm4_policy.c                            |    2 +-
+ net/ipv6/addrconf.c                                |   66 +-
+ net/ipv6/addrconf_core.c                           |    2 +-
+ net/ipv6/af_inet6.c                                |    6 +-
+ net/ipv6/ip6_gre.c                                 |   51 +-
+ net/ipv6/ip6_tunnel.c                              |   22 +-
+ net/ipv6/ip6_vti.c                                 |    4 +-
+ net/ipv6/ip6mr.c                                   |  297 +-
+ net/ipv6/ndisc.c                                   |    1 +
+ net/ipv6/raw.c                                     |  120 +-
+ net/ipv6/route.c                                   |   12 +-
+ net/ipv6/sit.c                                     |   12 +-
+ net/ipv6/tcp_ipv6.c                                |    8 +-
+ net/ipv6/udp.c                                     |    3 +
+ net/ipv6/udplite.c                                 |    3 +
+ net/ipv6/xfrm6_policy.c                            |    4 +-
+ net/iucv/af_iucv.c                                 |    2 -
+ net/l2tp/l2tp_debugfs.c                            |    6 +-
+ net/l2tp/l2tp_ppp.c                                |    2 +-
+ net/llc/af_llc.c                                   |    2 +-
+ net/mac80211/agg-rx.c                              |    4 +-
+ net/mac80211/agg-tx.c                              |    2 +-
+ net/mac80211/airtime.c                             |    4 +-
+ net/mac80211/cfg.c                                 |  621 +--
+ net/mac80211/chan.c                                |  660 ++-
+ net/mac80211/debug.h                               |   14 +
+ net/mac80211/debugfs.c                             |  101 +-
+ net/mac80211/debugfs_key.c                         |   10 +-
+ net/mac80211/debugfs_netdev.c                      |   52 +-
+ net/mac80211/debugfs_sta.c                         |   24 +-
+ net/mac80211/driver-ops.h                          |  102 +-
+ net/mac80211/eht.c                                 |    9 +-
+ net/mac80211/ethtool.c                             |   26 +-
+ net/mac80211/he.c                                  |   17 +-
+ net/mac80211/ht.c                                  |   41 +-
+ net/mac80211/ibss.c                                |   65 +-
+ net/mac80211/ieee80211_i.h                         |  489 +-
+ net/mac80211/iface.c                               |  254 +-
+ net/mac80211/key.c                                 |   78 +-
+ net/mac80211/key.h                                 |    9 +-
+ net/mac80211/main.c                                |  227 +-
+ net/mac80211/mesh.c                                |   20 +-
+ net/mac80211/mesh_hwmp.c                           |    6 +-
+ net/mac80211/mesh_plink.c                          |   19 +-
+ net/mac80211/mlme.c                                |  440 +-
+ net/mac80211/ocb.c                                 |   15 +-
+ net/mac80211/offchannel.c                          |   22 +-
+ net/mac80211/rate.c                                |   19 +-
+ net/mac80211/rate.h                                |    8 +-
+ net/mac80211/rx.c                                  |   98 +-
+ net/mac80211/scan.c                                |    2 +-
+ net/mac80211/sta_info.c                            |  391 +-
+ net/mac80211/sta_info.h                            |   46 +-
+ net/mac80211/status.c                              |   43 +-
+ net/mac80211/tdls.c                                |   31 +-
+ net/mac80211/trace.h                               | 1160 +++--
+ net/mac80211/tx.c                                  |  743 ++-
+ net/mac80211/util.c                                |  152 +-
+ net/mac80211/vht.c                                 |  177 +-
+ net/mac80211/wme.c                                 |    3 +-
+ net/mac80211/wpa.c                                 |  133 +-
+ net/mac80211/wpa.h                                 |    5 +-
+ net/mptcp/pm_netlink.c                             |  131 +-
+ net/mptcp/protocol.c                               |   60 +-
+ net/mptcp/protocol.h                               |    3 +-
+ net/mptcp/subflow.c                                |    2 +-
+ net/openvswitch/vport-netdev.c                     |    6 +-
+ net/packet/af_packet.c                             |   12 +-
+ net/rxrpc/rxkad.c                                  |    2 +-
+ net/sched/act_mirred.c                             |    6 +-
+ net/sched/cls_api.c                                |    5 +-
+ net/sched/cls_flower.c                             |    8 +-
+ net/sched/sch_api.c                                |    2 +-
+ net/sched/sch_generic.c                            |   11 +-
+ net/sched/sch_taprio.c                             |    5 +-
+ net/sctp/protocol.c                                |    4 +-
+ net/sctp/sm_statefuns.c                            |    2 -
+ net/sctp/socket.c                                  |   12 +-
+ net/sctp/stream_interleave.c                       |    2 -
+ net/sctp/ulpqueue.c                                |    4 -
+ net/smc/smc_pnet.c                                 |    7 +-
+ net/socket.c                                       |   15 +-
+ net/strparser/strparser.c                          |    3 +
+ net/switchdev/switchdev.c                          |    4 +-
+ net/tipc/bearer.c                                  |    4 +-
+ net/tipc/name_table.c                              |   11 -
+ net/tipc/name_table.h                              |    1 -
+ net/tls/tls.h                                      |  290 ++
+ net/tls/tls_device.c                               |    3 +-
+ net/tls/tls_device_fallback.c                      |    8 +-
+ net/tls/tls_main.c                                 |   97 +-
+ net/tls/tls_proc.c                                 |    4 +
+ net/tls/tls_sw.c                                   |  236 +-
+ net/tls/tls_toe.c                                  |    2 +
+ net/unix/af_unix.c                                 |  294 +-
+ net/unix/diag.c                                    |   49 +-
+ net/unix/sysctl_net_unix.c                         |   19 +-
+ net/wireless/ap.c                                  |   46 +-
+ net/wireless/chan.c                                |  206 +-
+ net/wireless/core.c                                |   34 +-
+ net/wireless/core.h                                |   24 +-
+ net/wireless/ibss.c                                |   57 +-
+ net/wireless/mesh.c                                |   31 +-
+ net/wireless/mlme.c                                |  163 +-
+ net/wireless/nl80211.c                             | 1022 +++-
+ net/wireless/ocb.c                                 |    5 +-
+ net/wireless/rdev-ops.h                            |   58 +-
+ net/wireless/reg.c                                 |  139 +-
+ net/wireless/scan.c                                |    8 +-
+ net/wireless/sme.c                                 |  512 +-
+ net/wireless/trace.h                               |  378 +-
+ net/wireless/util.c                                |   44 +-
+ net/wireless/wext-compat.c                         |   48 +-
+ net/wireless/wext-sme.c                            |   29 +-
+ net/xdp/xdp_umem.c                                 |    6 +-
+ net/xfrm/xfrm_device.c                             |    2 +-
+ samples/bpf/Makefile                               |    9 -
+ samples/bpf/xdp1_kern.c                            |   11 +-
+ samples/bpf/xdp2_kern.c                            |   11 +-
+ samples/bpf/xdp_fwd_user.c                         |   55 +-
+ samples/bpf/xdp_router_ipv4.bpf.c                  |    9 +
+ samples/bpf/xdp_tx_iptunnel_kern.c                 |    2 +-
+ samples/bpf/xdpsock.h                              |   19 -
+ samples/bpf/xdpsock_ctrl_proc.c                    |  190 -
+ samples/bpf/xdpsock_kern.c                         |   24 -
+ samples/bpf/xdpsock_user.c                         | 2019 --------
+ samples/bpf/xsk_fwd.c                              | 1085 -----
+ scripts/bpf_doc.py                                 |    4 +
+ tools/bpf/bpftool/Documentation/bpftool-cgroup.rst |   16 +-
+ .../bpf/bpftool/Documentation/bpftool-feature.rst  |   12 +
+ tools/bpf/bpftool/Documentation/bpftool-prog.rst   |    5 +-
+ tools/bpf/bpftool/Makefile                         |   13 +-
+ tools/bpf/bpftool/bash-completion/bpftool          |   30 +-
+ tools/bpf/bpftool/btf.c                            |   57 +-
+ tools/bpf/bpftool/btf_dumper.c                     |   29 +
+ tools/bpf/bpftool/cgroup.c                         |  162 +-
+ tools/bpf/bpftool/common.c                         |  160 +-
+ tools/bpf/bpftool/feature.c                        |  148 +-
+ tools/bpf/bpftool/gen.c                            |  113 +
+ tools/bpf/bpftool/link.c                           |   61 +-
+ tools/bpf/bpftool/main.c                           |    2 -
+ tools/bpf/bpftool/main.h                           |   24 +-
+ tools/bpf/bpftool/map.c                            |   84 +-
+ tools/bpf/bpftool/pids.c                           |    1 +
+ tools/bpf/bpftool/prog.c                           |   79 +-
+ tools/bpf/bpftool/struct_ops.c                     |    2 +
+ tools/include/linux/btf_ids.h                      |   35 +-
+ tools/include/uapi/linux/bpf.h                     |   93 +-
+ tools/include/uapi/linux/btf.h                     |   17 +-
+ tools/include/uapi/linux/if_link.h                 |    1 +
+ tools/lib/bpf/Build                                |    2 +-
+ tools/lib/bpf/Makefile                             |    2 +-
+ tools/lib/bpf/bpf.c                                |  200 +-
+ tools/lib/bpf/bpf.h                                |   98 +-
+ tools/lib/bpf/bpf_core_read.h                      |   11 +
+ tools/lib/bpf/bpf_helpers.h                        |   13 +
+ tools/lib/bpf/bpf_tracing.h                        |    2 +-
+ tools/lib/bpf/btf.c                                |  412 +-
+ tools/lib/bpf/btf.h                                |  118 +-
+ tools/lib/bpf/btf_dump.c                           |  160 +-
+ tools/lib/bpf/libbpf.c                             | 1829 ++-----
+ tools/lib/bpf/libbpf.h                             |  507 +-
+ tools/lib/bpf/libbpf.map                           |  120 +-
+ tools/lib/bpf/libbpf_common.h                      |   16 +-
+ tools/lib/bpf/libbpf_internal.h                    |   31 +-
+ tools/lib/bpf/libbpf_legacy.h                      |   28 +-
+ tools/lib/bpf/libbpf_probes.c                      |  125 +-
+ tools/lib/bpf/linker.c                             |    7 +-
+ tools/lib/bpf/netlink.c                            |   62 +-
+ tools/lib/bpf/relo_core.c                          |  479 +-
+ tools/lib/bpf/relo_core.h                          |   10 +-
+ tools/lib/bpf/usdt.c                               |  129 +-
+ tools/perf/util/bpf-loader.c                       |  204 +-
+ tools/testing/selftests/bpf/.gitignore             |    3 +-
+ tools/testing/selftests/bpf/Makefile               |   34 +-
+ tools/testing/selftests/bpf/bench.c                |   99 +
+ tools/testing/selftests/bpf/bench.h                |   16 +
+ .../bpf/benchs/bench_bpf_hashmap_full_update.c     |   96 +
+ .../selftests/bpf/benchs/bench_local_storage.c     |  287 ++
+ .../benchs/bench_local_storage_rcu_tasks_trace.c   |  281 ++
+ .../benchs/run_bench_bpf_hashmap_full_update.sh    |   11 +
+ .../bpf/benchs/run_bench_local_storage.sh          |   24 +
+ .../run_bench_local_storage_rcu_tasks_trace.sh     |   11 +
+ tools/testing/selftests/bpf/benchs/run_common.sh   |   17 +
+ tools/testing/selftests/bpf/bpf_legacy.h           |    9 -
+ tools/testing/selftests/bpf/btf_helpers.c          |   25 +-
+ tools/testing/selftests/bpf/config                 |    6 +
+ tools/testing/selftests/bpf/network_helpers.c      |    2 +-
+ .../selftests/bpf/prog_tests/attach_probe.c        |   49 +-
+ tools/testing/selftests/bpf/prog_tests/bpf_loop.c  |   62 +
+ .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c  |   61 +
+ tools/testing/selftests/bpf/prog_tests/btf.c       |  155 +-
+ tools/testing/selftests/bpf/prog_tests/btf_write.c |  126 +-
+ .../testing/selftests/bpf/prog_tests/core_reloc.c  |  140 +-
+ .../selftests/bpf/prog_tests/fexit_stress.c        |   32 +-
+ .../selftests/bpf/prog_tests/kprobe_multi_test.c   |    4 +-
+ .../testing/selftests/bpf/prog_tests/libbpf_str.c  |  207 +
+ .../testing/selftests/bpf/prog_tests/lsm_cgroup.c  |  313 ++
+ .../selftests/bpf/prog_tests/resolve_btfids.c      |    2 +-
+ .../testing/selftests/bpf/prog_tests/sock_fields.c |    1 -
+ .../testing/selftests/bpf/prog_tests/tc_redirect.c |    8 +-
+ tools/testing/selftests/bpf/prog_tests/usdt.c      |    2 +-
+ .../selftests/bpf/prog_tests/xdp_synproxy.c        |  183 +
+ .../bpf/progs/bpf_hashmap_full_update_bench.c      |   40 +
+ tools/testing/selftests/bpf/progs/bpf_loop.c       |  114 +
+ .../testing/selftests/bpf/progs/bpf_tracing_net.h  |    1 +
+ .../bpf/progs/btf__core_reloc_enum64val.c          |    3 +
+ .../bpf/progs/btf__core_reloc_enum64val___diff.c   |    3 +
+ .../btf__core_reloc_enum64val___err_missing.c      |    3 +
+ .../btf__core_reloc_enum64val___val3_missing.c     |    3 +
+ .../bpf/progs/btf__core_reloc_type_based___diff.c  |    3 +
+ .../testing/selftests/bpf/progs/core_reloc_types.h |  190 +-
+ .../selftests/bpf/progs/local_storage_bench.c      |  104 +
+ .../progs/local_storage_rcu_tasks_trace_bench.c    |   67 +
+ tools/testing/selftests/bpf/progs/lsm_cgroup.c     |  180 +
+ .../selftests/bpf/progs/lsm_cgroup_nonvoid.c       |   14 +
+ .../selftests/bpf/progs/tcp_ca_incompl_cong_ops.c  |   35 +
+ .../selftests/bpf/progs/tcp_ca_unsupp_cong_op.c    |   21 +
+ .../selftests/bpf/progs/tcp_ca_write_sk_pacing.c   |   60 +
+ .../selftests/bpf/progs/test_attach_probe.c        |   60 +
+ tools/testing/selftests/bpf/progs/test_btf_haskv.c |   51 -
+ tools/testing/selftests/bpf/progs/test_btf_newkv.c |   18 -
+ .../bpf/progs/test_core_reloc_enum64val.c          |   70 +
+ .../selftests/bpf/progs/test_core_reloc_kernel.c   |   19 +
+ .../bpf/progs/test_core_reloc_type_based.c         |   49 +-
+ tools/testing/selftests/bpf/progs/test_tc_dtime.c  |   53 +-
+ tools/testing/selftests/bpf/progs/test_varlen.c    |    8 +-
+ .../selftests/bpf/progs/xdp_synproxy_kern.c        |  843 ++++
+ .../selftests/bpf/test_bpftool_synctypes.py        |  182 +-
+ tools/testing/selftests/bpf/test_btf.h             |    3 +
+ tools/testing/selftests/bpf/test_verifier.c        |  367 +-
+ tools/testing/selftests/bpf/test_xdping.sh         |    4 +
+ tools/testing/selftests/bpf/test_xsk.sh            |    6 +-
+ .../selftests/bpf/verifier/bpf_loop_inline.c       |  263 +
+ tools/testing/selftests/bpf/xdp_synproxy.c         |  466 ++
+ tools/{lib => testing/selftests}/bpf/xsk.c         |   92 +-
+ tools/{lib => testing/selftests}/bpf/xsk.h         |   30 +-
+ tools/testing/selftests/bpf/xsk_prereqs.sh         |    4 +-
+ .../selftests/bpf/{xdpxceiver.c => xskxceiver.c}   |   25 +-
+ .../selftests/bpf/{xdpxceiver.h => xskxceiver.h}   |    6 +-
+ .../drivers/net/mlxsw/rif_counter_scale.sh         |  107 +
+ .../drivers/net/mlxsw/spectrum-2/resource_scale.sh |   31 +-
+ .../net/mlxsw/spectrum-2/rif_counter_scale.sh      |    1 +
+ .../net/mlxsw/spectrum-2/tc_flower_scale.sh        |   15 +-
+ .../drivers/net/mlxsw/spectrum/resource_scale.sh   |   29 +-
+ .../net/mlxsw/spectrum/rif_counter_scale.sh        |   34 +
+ .../selftests/drivers/net/mlxsw/tc_flower_scale.sh |   17 +
+ tools/testing/selftests/net/.gitignore             |    1 +
+ tools/testing/selftests/net/af_unix/Makefile       |    3 +-
+ tools/testing/selftests/net/af_unix/unix_connect.c |  149 +
+ tools/testing/selftests/net/cmsg_sender.c          |    2 +-
+ tools/testing/selftests/net/fib_rule_tests.sh      |   23 +
+ tools/testing/selftests/net/forwarding/Makefile    |    1 +
+ .../net/forwarding/bridge_mdb_port_down.sh         |  118 +
+ .../net/forwarding/ethtool_extended_state.sh       |   43 +-
+ .../net/forwarding/mirror_gre_bridge_1q_lag.sh     |    7 +-
+ tools/testing/selftests/net/mptcp/mptcp_join.sh    |  116 +-
+ tools/testing/selftests/net/mptcp/pm_nl_ctl.c      |    2 +-
+ tools/testing/selftests/net/mptcp/simult_flows.sh  |   14 +-
+ tools/testing/selftests/net/mptcp/userspace_pm.sh  |   40 +-
+ tools/testing/selftests/net/tls.c                  |   66 +
+ tools/testing/selftests/tc-testing/.gitignore      |    1 -
+ 1129 files changed, 45522 insertions(+), 46415 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/can/microchip,mpfs-can.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml
+ delete mode 100644 Documentation/devicetree/bindings/net/dsa/mt7530.txt
+ create mode 100644 Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml
+ delete mode 100644 Documentation/devicetree/bindings/net/sff,sfp.txt
+ create mode 100644 Documentation/devicetree/bindings/net/sff,sfp.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/xlnx,emaclite.yaml
+ create mode 100644 Documentation/networking/device_drivers/can/can327.rst
+ delete mode 100644 Documentation/networking/device_drivers/ethernet/neterion/vxge.rst
+ create mode 100644 Documentation/networking/device_drivers/ethernet/wangxun/txgbe.rst
+ create mode 100644 drivers/net/can/can327.c
+ create mode 100644 drivers/net/can/dev/calc_bittiming.c
+ create mode 100644 drivers/net/can/slcan/Makefile
+ rename drivers/net/can/{slcan.c => slcan/slcan-core.c} (65%)
+ create mode 100644 drivers/net/can/slcan/slcan-ethtool.c
+ create mode 100644 drivers/net/can/slcan/slcan.h
+ rename drivers/net/can/usb/{esd_usb2.c => esd_usb.c} (81%)
+ create mode 100644 drivers/net/dsa/microchip/ksz9477.h
+ delete mode 100644 drivers/net/dsa/microchip/ksz9477_spi.c
+ rename drivers/net/dsa/microchip/{ksz8795_spi.c => ksz_spi.c} (52%)
+ create mode 100644 drivers/net/dsa/microchip/lan937x.h
+ create mode 100644 drivers/net/dsa/microchip/lan937x_main.c
+ create mode 100644 drivers/net/dsa/microchip/lan937x_reg.h
+ create mode 100644 drivers/net/dsa/rzn1_a5psw.c
+ create mode 100644 drivers/net/dsa/rzn1_a5psw.h
+ create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.h
+ create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c
+ create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/police.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_meter.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_meter.h
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/aso.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/aso.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_pgt.c
+ delete mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_router_xm.c
+ delete mode 100644 drivers/net/ethernet/neterion/vxge/Makefile
+ delete mode 100644 drivers/net/ethernet/neterion/vxge/vxge-config.c
+ delete mode 100644 drivers/net/ethernet/neterion/vxge/vxge-config.h
+ delete mode 100644 drivers/net/ethernet/neterion/vxge/vxge-ethtool.c
+ delete mode 100644 drivers/net/ethernet/neterion/vxge/vxge-ethtool.h
+ delete mode 100644 drivers/net/ethernet/neterion/vxge/vxge-main.c
+ delete mode 100644 drivers/net/ethernet/neterion/vxge/vxge-main.h
+ delete mode 100644 drivers/net/ethernet/neterion/vxge/vxge-reg.h
+ delete mode 100644 drivers/net/ethernet/neterion/vxge/vxge-traffic.c
+ delete mode 100644 drivers/net/ethernet/neterion/vxge/vxge-traffic.h
+ delete mode 100644 drivers/net/ethernet/neterion/vxge/vxge-version.h
+ create mode 100644 drivers/net/ethernet/wangxun/Kconfig
+ create mode 100644 drivers/net/ethernet/wangxun/Makefile
+ create mode 100644 drivers/net/ethernet/wangxun/txgbe/Makefile
+ create mode 100644 drivers/net/ethernet/wangxun/txgbe/txgbe.h
+ create mode 100644 drivers/net/ethernet/wangxun/txgbe/txgbe_main.c
+ create mode 100644 drivers/net/ethernet/wangxun/txgbe/txgbe_type.h
+ create mode 100644 drivers/net/pcs/pcs-rzn1-miic.c
+ create mode 100644 drivers/net/phy/bcm-phy-ptp.c
+ delete mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723de.h
+ delete mode 100644 drivers/net/wireless/realtek/rtw88/rtw8821ce.h
+ delete mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822be.h
+ delete mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822ce.h
+ create mode 100644 include/linux/pcs-rzn1-miic.h
+ create mode 100644 include/net/dropreason.h
+ create mode 100644 net/core/.gitignore
+ create mode 100644 net/dsa/tag_rzn1_a5psw.c
+ create mode 100644 net/tls/tls.h
+ delete mode 100644 samples/bpf/xdpsock.h
+ delete mode 100644 samples/bpf/xdpsock_ctrl_proc.c
+ delete mode 100644 samples/bpf/xdpsock_kern.c
+ delete mode 100644 samples/bpf/xdpsock_user.c
+ delete mode 100644 samples/bpf/xsk_fwd.c
+ create mode 100644 tools/testing/selftests/bpf/benchs/bench_bpf_hashmap_full_update.c
+ create mode 100644 tools/testing/selftests/bpf/benchs/bench_local_storage.c
+ create mode 100644 tools/testing/selftests/bpf/benchs/bench_local_storage_rcu_tasks_trace.c
+ create mode 100755 tools/testing/selftests/bpf/benchs/run_bench_bpf_hashmap_full_update.sh
+ create mode 100755 tools/testing/selftests/bpf/benchs/run_bench_local_storage.sh
+ create mode 100755 tools/testing/selftests/bpf/benchs/run_bench_local_storage_rcu_tasks_trace.sh
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/libbpf_str.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/lsm_cgroup.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_synproxy.c
+ create mode 100644 tools/testing/selftests/bpf/progs/bpf_hashmap_full_update_bench.c
+ create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_enum64val.c
+ create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_enum64val___diff.c
+ create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_enum64val___err_missing.c
+ create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_enum64val___val3_missing.c
+ create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_type_based___diff.c
+ create mode 100644 tools/testing/selftests/bpf/progs/local_storage_bench.c
+ create mode 100644 tools/testing/selftests/bpf/progs/local_storage_rcu_tasks_trace_bench.c
+ create mode 100644 tools/testing/selftests/bpf/progs/lsm_cgroup.c
+ create mode 100644 tools/testing/selftests/bpf/progs/lsm_cgroup_nonvoid.c
+ create mode 100644 tools/testing/selftests/bpf/progs/tcp_ca_incompl_cong_ops.c
+ create mode 100644 tools/testing/selftests/bpf/progs/tcp_ca_unsupp_cong_op.c
+ create mode 100644 tools/testing/selftests/bpf/progs/tcp_ca_write_sk_pacing.c
+ delete mode 100644 tools/testing/selftests/bpf/progs/test_btf_haskv.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_core_reloc_enum64val.c
+ create mode 100644 tools/testing/selftests/bpf/progs/xdp_synproxy_kern.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/bpf_loop_inline.c
+ create mode 100644 tools/testing/selftests/bpf/xdp_synproxy.c
+ rename tools/{lib => testing/selftests}/bpf/xsk.c (94%)
+ rename tools/{lib => testing/selftests}/bpf/xsk.h (84%)
+ rename tools/testing/selftests/bpf/{xdpxceiver.c => xskxceiver.c} (98%)
+ rename tools/testing/selftests/bpf/{xdpxceiver.h => xskxceiver.h} (98%)
+ create mode 100644 tools/testing/selftests/drivers/net/mlxsw/rif_counter_scale.sh
+ create mode 120000 tools/testing/selftests/drivers/net/mlxsw/spectrum-2/rif_counter_scale.sh
+ create mode 100644 tools/testing/selftests/drivers/net/mlxsw/spectrum/rif_counter_scale.sh
+ create mode 100644 tools/testing/selftests/net/af_unix/unix_connect.c
+ create mode 100755 tools/testing/selftests/net/forwarding/bridge_mdb_port_down.sh
+$ git am -3 ../patches/0001-fix-up-for-net-tls-Check-for-errors-in-tls_device_in.patch
+Applying: fix up for "net/tls: Check for errors in tls_device_init"
+$ git reset HEAD^
+Unstaged changes after reset:
+M	net/tls/tls.h
+$ git add -A .
+$ git commit -v -a --amend
+[master 40d0864256fa] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
+ Date: Fri Jul 15 11:55:42 2022 +1000
+Merging bpf-next/for-next (96a233e600df bpf: Add endian modifiers to fix endian warnings)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next
+Auto-merging arch/x86/net/bpf_jit_comp.c
+Auto-merging kernel/bpf/core.c
+Auto-merging net/core/filter.c
+Auto-merging net/core/skmsg.c
+Merge made by the 'ort' strategy.
+ arch/arm64/include/asm/insn.h                      |   3 +
+ arch/arm64/lib/insn.c                              |  30 +-
+ arch/arm64/net/bpf_jit.h                           |   7 +
+ arch/arm64/net/bpf_jit_comp.c                      | 715 ++++++++++++++++++++-
+ arch/x86/net/bpf_jit_comp.c                        |  45 +-
+ include/linux/bpf.h                                |   3 +-
+ include/linux/bpf_verifier.h                       |   8 +-
+ include/linux/filter.h                             |   8 +
+ include/net/xdp_sock_drv.h                         |  14 +
+ kernel/bpf/bpf_struct_ops.c                        |   3 +
+ kernel/bpf/core.c                                  |  29 +-
+ kernel/bpf/devmap.c                                |   2 +-
+ kernel/bpf/hashtab.c                               |   6 +-
+ kernel/bpf/local_storage.c                         |   2 +-
+ kernel/bpf/lpm_trie.c                              |   2 +-
+ kernel/bpf/syscall.c                               |  36 +-
+ kernel/bpf/trampoline.c                            |   3 +
+ kernel/bpf/verifier.c                              |  67 +-
+ kernel/kallsyms.c                                  |  91 +++
+ net/core/filter.c                                  |   4 +-
+ net/core/skmsg.c                                   |   4 +-
+ net/xdp/xsk.c                                      |   5 +-
+ samples/bpf/fds_example.c                          |   3 +-
+ samples/bpf/sock_example.c                         |   3 +-
+ samples/bpf/test_cgrp2_attach.c                    |   3 +-
+ samples/bpf/test_lru_dist.c                        |   2 +-
+ samples/bpf/test_map_in_map_user.c                 |   4 +-
+ samples/bpf/tracex5_user.c                         |   3 +-
+ samples/bpf/xdp_redirect_map.bpf.c                 |   6 +-
+ samples/bpf/xdp_redirect_map_user.c                |   9 +
+ tools/lib/bpf/libbpf.c                             |  22 +-
+ tools/testing/selftests/bpf/prog_tests/bpf_iter.c  |  16 +
+ tools/testing/selftests/bpf/progs/bpf_iter.h       |   7 +
+ tools/testing/selftests/bpf/progs/bpf_iter_ksym.c  |  74 +++
+ .../selftests/bpf/progs/test_xdp_noinline.c        |  30 +-
+ 35 files changed, 1127 insertions(+), 142 deletions(-)
+ create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_ksym.c
+Merging ipsec-next/master (5e25c25aa2c0 xfrm: improve wording of comment above XFRM_OFFLOAD flags)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master
+Auto-merging include/net/route.h
+Auto-merging include/net/xfrm.h
+Auto-merging net/ipv4/route.c
+Merge made by the 'ort' strategy.
+ drivers/net/vrf.c         |  2 +-
+ include/net/route.h       |  3 +--
+ include/net/xfrm.h        |  4 ++--
+ include/uapi/linux/xfrm.h | 12 ++++++------
+ net/ipv4/route.c          | 24 ++++++++----------------
+ net/ipv6/esp6.c           |  4 ++--
+ net/key/af_key.c          |  6 +-----
+ net/xfrm/xfrm_state.c     |  6 ++----
+ net/xfrm/xfrm_user.c      |  6 ++----
+ 9 files changed, 25 insertions(+), 42 deletions(-)
+Merging mlx5-next/mlx5-next (cdcdce948d64 net/mlx5: Add bits and fields to support enhanced CQE compression)
+$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next
+Already up to date.
+Merging netfilter-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master
+Already up to date.
+Merging ipvs-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/master
+Already up to date.
+Merging bluetooth/master (b28a31ebc74f Bluetooth: Collect kcov coverage from hci_rx_work)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master
+Auto-merging include/net/bluetooth/hci_core.h
+Auto-merging net/bluetooth/hci_core.c
+Auto-merging net/bluetooth/hci_sync.c
+Auto-merging net/bluetooth/mgmt.c
+Merge made by the 'ort' strategy.
+ .../bindings/net/broadcom-bluetooth.yaml           |  8 ++
+ drivers/bluetooth/btbcm.c                          | 33 ++++++--
+ drivers/bluetooth/btbcm.h                          |  8 +-
+ drivers/bluetooth/btmtksdio.c                      | 15 ++++
+ drivers/bluetooth/btusb.c                          |  3 +
+ drivers/bluetooth/hci_bcm.c                        | 17 +++-
+ drivers/bluetooth/hci_intel.c                      |  6 +-
+ drivers/bluetooth/hci_qca.c                        |  2 +-
+ include/net/bluetooth/hci.h                        |  1 +
+ include/net/bluetooth/hci_core.h                   | 13 +++
+ net/bluetooth/eir.c                                | 41 +++++----
+ net/bluetooth/hci_conn.c                           |  3 +
+ net/bluetooth/hci_core.c                           | 96 ++++++++++++++--------
+ net/bluetooth/hci_event.c                          |  9 +-
+ net/bluetooth/hci_sock.c                           | 11 ++-
+ net/bluetooth/hci_sync.c                           | 71 ++++++++++------
+ net/bluetooth/l2cap_core.c                         |  1 +
+ net/bluetooth/mgmt.c                               | 14 ++--
+ 18 files changed, 252 insertions(+), 100 deletions(-)
+Merging wireless-next/for-next (6a605eb1d71e octeontx2-af: returning uninitialized variable)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next
+Already up to date.
+Merging mtd/mtd/next (ad9b10d1eaad mtd: core: introduce of support for dynamic partitions)
+$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next
+Merge made by the 'ort' strategy.
+ .../bindings/mtd/partitions/partition.yaml         |  20 +-
+ .../bindings/mtd/partitions/qcom,smem-part.yaml    |  27 +++
+ drivers/mtd/devices/mtd_dataflash.c                |   8 +
+ drivers/mtd/devices/powernv_flash.c                |   4 +-
+ drivers/mtd/devices/spear_smi.c                    |  10 +-
+ drivers/mtd/devices/st_spi_fsm.c                   |  23 +-
+ drivers/mtd/hyperbus/hbmc-am654.c                  |   6 +-
+ drivers/mtd/hyperbus/hyperbus-core.c               |   8 +-
+ drivers/mtd/hyperbus/rpc-if.c                      |  13 +-
+ drivers/mtd/lpddr/lpddr2_nvm.c                     |   4 +-
+ drivers/mtd/maps/physmap-core.c                    |  13 +-
+ drivers/mtd/maps/physmap-versatile.c               |   2 +
+ drivers/mtd/mtdchar.c                              |  13 +-
+ drivers/mtd/mtdcore.c                              |  61 +++++
+ drivers/mtd/nand/raw/atmel/nand-controller.c       |   4 +-
+ drivers/mtd/nand/raw/meson_nand.c                  |  16 +-
+ drivers/mtd/nand/raw/omap2.c                       |   6 +-
+ drivers/mtd/nand/raw/tegra_nand.c                  |   5 +-
+ drivers/mtd/parsers/Kconfig                        |   9 +
+ drivers/mtd/parsers/Makefile                       |   1 +
+ drivers/mtd/parsers/ofpart_bcm4908.c               |   3 +
+ drivers/mtd/parsers/redboot.c                      |   1 +
+ drivers/mtd/parsers/scpart.c                       | 249 +++++++++++++++++++++
+ drivers/mtd/sm_ftl.c                               |   2 +-
+ include/linux/mtd/hyperbus.h                       |   4 +-
+ include/uapi/mtd/mtd-abi.h                         |   4 +-
+ 26 files changed, 437 insertions(+), 79 deletions(-)
+ create mode 100644 drivers/mtd/parsers/scpart.c
+Merging nand/nand/next (e16eceea863b mtd: rawnand: arasan: Fix clock rate in NV-DDR)
+$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next
+Auto-merging drivers/mtd/nand/raw/meson_nand.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/mtd/mxc-nand.yaml          |   2 -
+ .../devicetree/bindings/mtd/qcom,nandc.yaml        |  27 ++
+ drivers/mtd/nand/raw/arasan-nand-controller.c      |  16 +-
+ drivers/mtd/nand/raw/cafe_nand.c                   |   9 +-
+ drivers/mtd/nand/raw/meson_nand.c                  |   1 -
+ drivers/mtd/nand/raw/qcom_nandc.c                  | 306 +++++++++++++++++----
+ drivers/mtd/nand/raw/sm_common.c                   |   2 +-
+ drivers/mtd/nand/spi/Makefile                      |   2 +-
+ drivers/mtd/nand/spi/ato.c                         |  86 ++++++
+ drivers/mtd/nand/spi/core.c                        |   1 +
+ include/linux/mtd/spinand.h                        |   1 +
+ 11 files changed, 391 insertions(+), 62 deletions(-)
+ create mode 100644 drivers/mtd/nand/spi/ato.c
+Merging spi-nor/spi-nor/next (77d4ac6d3848 mtd: spi-nor: move SECT_4K_PMC special handling)
+$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next
+Merge made by the 'ort' strategy.
+ drivers/mtd/spi-nor/core.c |  7 +------
+ drivers/mtd/spi-nor/core.h |  2 --
+ drivers/mtd/spi-nor/issi.c | 23 +++++++++++++++++++++--
+ 3 files changed, 22 insertions(+), 10 deletions(-)
+Merging crypto/master (79e6e2f3f3ff crypto: testmgr - populate RSA CRT parameters in RSA test vectors)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Auto-merging crypto/Kconfig
+Auto-merging crypto/Makefile
+Auto-merging fs/crypto/fscrypt_private.h
+Auto-merging fs/crypto/policy.c
+Auto-merging lib/Kconfig
+Auto-merging lib/Makefile
+Resolved 'MAINTAINERS' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 94b8e8c4971c] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-driver-qat         |   60 +
+ Documentation/filesystems/fscrypt.rst              |   22 +-
+ MAINTAINERS                                        |   15 +-
+ arch/arm/crypto/Kconfig                            |    2 +-
+ arch/arm/crypto/Makefile                           |    4 +-
+ arch/arm/crypto/blake2s-shash.c                    |   75 -
+ arch/arm64/crypto/Kconfig                          |   10 +-
+ arch/arm64/crypto/Makefile                         |    3 +
+ arch/arm64/crypto/aes-glue.c                       |   80 +-
+ arch/arm64/crypto/aes-modes.S                      |  349 ++--
+ arch/arm64/crypto/aes-neon.S                       |    2 +-
+ arch/arm64/crypto/polyval-ce-core.S                |  361 ++++
+ arch/arm64/crypto/polyval-ce-glue.c                |  191 ++
+ arch/x86/crypto/Makefile                           |    7 +-
+ arch/x86/crypto/aes_ctrby8_avx-x86_64.S            |  232 ++-
+ arch/x86/crypto/aesni-intel_glue.c                 |  114 +-
+ arch/x86/crypto/blake2s-glue.c                     |    3 +-
+ arch/x86/crypto/blake2s-shash.c                    |   77 -
+ arch/x86/crypto/polyval-clmulni_asm.S              |  321 ++++
+ arch/x86/crypto/polyval-clmulni_glue.c             |  203 +++
+ crypto/Kconfig                                     |   59 +-
+ crypto/Makefile                                    |    4 +-
+ crypto/blake2s_generic.c                           |   75 -
+ crypto/hctr2.c                                     |  581 ++++++
+ crypto/polyval-generic.c                           |  245 +++
+ crypto/rsa.c                                       |   78 +-
+ crypto/tcrypt.c                                    |   22 +-
+ crypto/testmgr.c                                   |   44 +-
+ crypto/testmgr.h                                   | 1872 +++++++++++++++++---
+ crypto/xctr.c                                      |  191 ++
+ .../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c    |    1 +
+ drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c  |   16 +-
+ drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c  |   10 +-
+ drivers/crypto/amcc/crypto4xx_core.c               |   40 +-
+ drivers/crypto/atmel-ecc.c                         |   12 +-
+ drivers/crypto/caam/caamalg_qi2.c                  |    2 +-
+ drivers/crypto/caam/caamhash_desc.c                |    2 +-
+ drivers/crypto/caam/qi.c                           |    2 +-
+ drivers/crypto/cavium/cpt/cpt_hw_types.h           |    2 +-
+ drivers/crypto/ccp/ccp-dev.h                       |    2 +-
+ drivers/crypto/ccp/sev-dev.c                       |   12 +-
+ drivers/crypto/hisilicon/qm.c                      |  203 ++-
+ drivers/crypto/hisilicon/sec/sec_algs.c            |   14 +-
+ drivers/crypto/hisilicon/sec/sec_drv.c             |    2 +-
+ drivers/crypto/hisilicon/sec/sec_drv.h             |    2 +-
+ drivers/crypto/hisilicon/sec2/sec.h                |    6 +-
+ drivers/crypto/hisilicon/sec2/sec_crypto.c         |   20 +-
+ drivers/crypto/hisilicon/sec2/sec_main.c           |   39 +-
+ drivers/crypto/hisilicon/trng/trng.c               |    2 +-
+ drivers/crypto/hisilicon/zip/zip_main.c            |   17 +-
+ drivers/crypto/inside-secure/safexcel.h            |   18 +-
+ .../crypto/marvell/octeontx2/otx2_cpt_devlink.c    |   40 +-
+ .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c    |   17 +-
+ .../crypto/marvell/octeontx2/otx2_cptpf_ucode.h    |    3 +
+ drivers/crypto/nx/nx-common-powernv.c              |    2 +-
+ drivers/crypto/nx/nx-common-pseries.c              |    5 +-
+ drivers/crypto/qat/Kconfig                         |   14 +-
+ drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c     |    1 +
+ drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h     |    1 +
+ drivers/crypto/qat/qat_4xxx/adf_drv.c              |    6 +-
+ drivers/crypto/qat/qat_common/Makefile             |    1 +
+ drivers/crypto/qat/qat_common/adf_accel_devices.h  |    1 +
+ drivers/crypto/qat/qat_common/adf_cfg.c            |   41 +-
+ drivers/crypto/qat/qat_common/adf_common_drv.h     |    8 +-
+ drivers/crypto/qat/qat_common/adf_init.c           |   26 +
+ drivers/crypto/qat/qat_common/adf_sriov.c          |   28 +-
+ drivers/crypto/qat/qat_common/adf_sysfs.c          |  191 ++
+ drivers/crypto/qat/qat_common/qat_algs.c           |    4 +-
+ drivers/crypto/qat/qat_common/qat_asym_algs.c      |    4 +-
+ drivers/crypto/ux500/hash/hash_core.c              |    2 +-
+ drivers/crypto/vmx/ghash.c                         |    1 +
+ drivers/crypto/vmx/ghashp8-ppc.pl                  |    2 +-
+ fs/crypto/fscrypt_private.h                        |    2 +-
+ fs/crypto/keysetup.c                               |    7 +
+ fs/crypto/policy.c                                 |   14 +-
+ include/crypto/internal/blake2s.h                  |  108 --
+ include/crypto/polyval.h                           |   22 +
+ include/linux/hisi_acc_qm.h                        |    8 +-
+ include/uapi/linux/fscrypt.h                       |    3 +-
+ lib/crypto/blake2s-selftest.c                      |   41 +
+ lib/crypto/blake2s.c                               |   37 +-
+ lib/mpi/mpi-add.c                                  |    2 +-
+ lib/mpi/mpi-mul.c                                  |    1 +
+ 83 files changed, 5275 insertions(+), 1094 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-qat
+ delete mode 100644 arch/arm/crypto/blake2s-shash.c
+ create mode 100644 arch/arm64/crypto/polyval-ce-core.S
+ create mode 100644 arch/arm64/crypto/polyval-ce-glue.c
+ delete mode 100644 arch/x86/crypto/blake2s-shash.c
+ create mode 100644 arch/x86/crypto/polyval-clmulni_asm.S
+ create mode 100644 arch/x86/crypto/polyval-clmulni_glue.c
+ delete mode 100644 crypto/blake2s_generic.c
+ create mode 100644 crypto/hctr2.c
+ create mode 100644 crypto/polyval-generic.c
+ create mode 100644 crypto/xctr.c
+ create mode 100644 drivers/crypto/qat/qat_common/adf_sysfs.c
+ create mode 100644 include/crypto/polyval.h
+Merging drm/drm-next (0180290abb5c Merge tag 'topic/nouveau-misc-2022-07-13-1' of git://anongit.freedesktop.org/drm/drm into drm-next)
+$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next
+Auto-merging CREDITS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging MAINTAINERS
+Auto-merging drivers/dma-buf/dma-buf.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+Auto-merging drivers/gpu/drm/bridge/fsl-ldb.c
+Auto-merging drivers/gpu/drm/drm_panel_orientation_quirks.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_gt.c
+Auto-merging drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+Auto-merging drivers/gpu/drm/i915/gvt/cmd_parser.c
+Auto-merging drivers/gpu/drm/i915/i915_vma.c
+Auto-merging drivers/gpu/drm/panfrost/panfrost_drv.c
+Auto-merging drivers/gpu/drm/solomon/ssd130x.c
+Merge made by the 'ort' strategy.
+ CREDITS                                            |      4 +
+ .../bindings/display/bridge/analogix,anx7625.yaml  |     19 +-
+ .../bindings/display/bridge/fsl,imx8qxp-ldb.yaml   |    173 +
+ .../display/bridge/fsl,imx8qxp-pixel-combiner.yaml |    144 +
+ .../display/bridge/fsl,imx8qxp-pixel-link.yaml     |    144 +
+ .../display/bridge/fsl,imx8qxp-pxl2dpi.yaml        |    108 +
+ .../bindings/display/bridge/fsl,ldb.yaml           |     16 +-
+ .../display/bridge/ingenic,jz4780-hdmi.yaml        |      1 -
+ .../bindings/display/bridge/ti,dlpc3433.yaml       |    117 +
+ .../devicetree/bindings/display/fsl,lcdif.yaml     |      1 +
+ .../bindings/display/mediatek/mediatek,dpi.yaml    |     11 +-
+ .../bindings/display/mediatek/mediatek,dsi.txt     |     62 -
+ .../bindings/display/mediatek/mediatek,dsi.yaml    |    116 +
+ .../display/mediatek/mediatek,mdp-rdma.yaml        |     88 +
+ .../bindings/display/msm/dp-controller.yaml        |      8 +-
+ .../devicetree/bindings/display/msm/hdmi.txt       |     99 -
+ .../devicetree/bindings/display/msm/hdmi.yaml      |    232 +
+ .../bindings/display/panel/ebbg,ft8719.yaml        |     74 +
+ .../display/panel/feiyang,fy07024di26a30d.yaml     |      1 -
+ .../bindings/display/panel/novatek,nt36672a.yaml   |      2 +
+ .../bindings/display/panel/panel-simple.yaml       |      8 +
+ .../bindings/display/panel/sharp,lq101r1sx01.yaml  |      7 +-
+ .../display/samsung/samsung,exynos-hdmi-ddc.yaml   |      1 -
+ .../display/samsung/samsung,exynos-hdmi.yaml       |      1 -
+ .../display/samsung/samsung,exynos-mixer.yaml      |      1 -
+ .../display/samsung/samsung,exynos5433-decon.yaml  |      1 -
+ .../display/samsung/samsung,exynos5433-mic.yaml    |      1 -
+ .../display/samsung/samsung,exynos7-decon.yaml     |      1 -
+ .../bindings/display/samsung/samsung,fimd.yaml     |      1 -
+ .../display/tegra/nvidia,tegra114-mipi.txt         |     41 -
+ .../display/tegra/nvidia,tegra114-mipi.yaml        |     74 +
+ .../display/tegra/nvidia,tegra124-dpaux.yaml       |    152 +
+ .../display/tegra/nvidia,tegra124-sor.yaml         |    197 +
+ .../display/tegra/nvidia,tegra124-vic.yaml         |     72 +
+ .../bindings/display/tegra/nvidia,tegra186-dc.yaml |     85 +
+ .../display/tegra/nvidia,tegra186-display.yaml     |    310 +
+ .../display/tegra/nvidia,tegra186-dsi-padctl.yaml  |     45 +
+ .../bindings/display/tegra/nvidia,tegra20-dc.yaml  |    183 +
+ .../bindings/display/tegra/nvidia,tegra20-dsi.yaml |    159 +
+ .../bindings/display/tegra/nvidia,tegra20-epp.yaml |     70 +
+ .../display/tegra/nvidia,tegra20-gr2d.yaml         |     74 +
+ .../display/tegra/nvidia,tegra20-gr3d.yaml         |    215 +
+ .../display/tegra/nvidia,tegra20-hdmi.yaml         |    126 +
+ .../display/tegra/nvidia,tegra20-host1x.txt        |    675 -
+ .../display/tegra/nvidia,tegra20-host1x.yaml       |    431 +
+ .../bindings/display/tegra/nvidia,tegra20-isp.yaml |     67 +
+ .../bindings/display/tegra/nvidia,tegra20-mpe.yaml |     73 +
+ .../bindings/display/tegra/nvidia,tegra20-tvo.yaml |     58 +
+ .../bindings/display/tegra/nvidia,tegra20-vi.yaml  |    163 +
+ .../display/tegra/nvidia,tegra210-csi.yaml         |     52 +
+ .../devicetree/bindings/gpu/arm,mali-bifrost.yaml  |     25 +-
+ .../devicetree/bindings/gpu/brcm,bcm-v3d.yaml      |      1 +
+ .../devicetree/bindings/mfd/fsl,imx8qxp-csr.yaml   |    192 +
+ .../bindings/phy/qcom,hdmi-phy-other.yaml          |    104 +
+ .../devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml |     85 +
+ .../bindings/phy/samsung,exynos-hdmi-phy.yaml      |      1 -
+ .../pinctrl/nvidia,tegra124-dpaux-padctl.txt       |     59 -
+ .../devicetree/bindings/vendor-prefixes.yaml       |      2 +
+ Documentation/driver-api/aperture.rst              |     13 +
+ Documentation/driver-api/index.rst                 |      1 +
+ Documentation/gpu/drm-internals.rst                |     32 +
+ Documentation/gpu/drm-usage-stats.rst              |     21 +
+ Documentation/gpu/i915.rst                         |     12 +
+ Documentation/gpu/todo.rst                         |     11 +
+ Documentation/gpu/vkms.rst                         |      6 -
+ .../userspace-api/media/v4l/subdev-formats.rst     |    156 +
+ MAINTAINERS                                        |     38 +-
+ drivers/char/agp/intel-gtt.c                       |     58 +-
+ drivers/dma-buf/Kconfig                            |      6 +-
+ drivers/dma-buf/Makefile                           |      2 +-
+ drivers/dma-buf/dma-buf.c                          |    110 +-
+ drivers/dma-buf/dma-fence-chain.c                  |      4 +-
+ drivers/dma-buf/dma-fence-unwrap.c                 |    162 +
+ drivers/dma-buf/st-dma-fence-unwrap.c              |    157 +-
+ drivers/dma-buf/sync_file.c                        |    119 +-
+ drivers/dma-buf/udmabuf.c                          |     18 +-
+ drivers/gpu/drm/Kconfig                            |     18 +
+ drivers/gpu/drm/Makefile                           |      4 +-
+ drivers/gpu/drm/amd/amdgpu/Makefile                |      3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h                |     16 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c           |      6 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c         |     17 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h         |     14 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c   |    426 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c            |      7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c        |      7 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |    263 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c      |     13 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c        |     51 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.h        |      2 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            |     10 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c          |     48 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c            |     63 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h            |      2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c             |      2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_imu.h            |      7 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.c            |      6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c            |    143 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h            |     59 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mes_ctx.h        |      1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h           |      5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c            |      4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h            |      6 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c          |      1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h          |      1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c           |     12 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h           |      1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c          |     20 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c            |    102 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h            |      1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c           |      6 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             |      2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c       |     51 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h       |     27 -
+ drivers/gpu/drm/amd/amdgpu/atombios_encoders.c     |     14 -
+ drivers/gpu/drm/amd/amdgpu/clearstate_gfx11.h      |    307 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c             |     41 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c             |     28 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c             |      3 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c             |      7 +-
+ drivers/gpu/drm/amd/amdgpu/imu_v11_0.c             |     46 +-
+ drivers/gpu/drm/amd/amdgpu/mes_v11_0.c             |     76 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c          |    555 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.h          |     28 +
+ drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c              |      2 +-
+ drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c              |      2 +-
+ drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c              |      2 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c             |      2 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c             |    126 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c             |      8 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v13_0.c             |      6 +
+ drivers/gpu/drm/amd/amdgpu/soc21.c                 |     19 +-
+ drivers/gpu/drm/amd/amdgpu/umc_v6_7.c              |     50 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c              |    563 +-
+ drivers/gpu/drm/amd/amdkfd/Kconfig                 |     14 +
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c           |     83 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_crat.c              |      2 -
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c            |      6 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  |     12 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_events.c            |      5 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_migrate.c           |     53 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_migrate.h           |      5 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c       |     12 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c   |      2 +
+ drivers/gpu/drm/amd/amdkfd/kfd_priv.h              |      5 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c           |     21 +-
+ .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c |     32 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c        |    134 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h        |     21 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.c               |     66 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.h               |      2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.c          |    323 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.h          |      4 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |    357 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h  |     12 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c  |     46 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h  |      2 -
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c |      3 +
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c  |     18 +-
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c    |    151 +-
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h    |      6 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c  |     21 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h    |      1 +
+ drivers/gpu/drm/amd/display/dc/Makefile            |      2 +
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c |    950 +-
+ .../display/dc/bios/bios_parser_types_internal2.h  |      1 +
+ .../gpu/drm/amd/display/dc/bios/command_table.c    |      4 +-
+ .../amd/display/dc/bios/command_table_helper2.c    |      2 +
+ drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile    |     34 +
+ drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c   |     17 +-
+ .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c   |     23 +-
+ .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c        |     12 +
+ .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c   |     15 +-
+ .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.h   |     60 +
+ .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c       |     11 +-
+ .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c |     12 +
+ .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c   |      8 +
+ .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c |      8 +
+ .../drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.c |      8 +
+ .../gpu/drm/amd/display/dc/clk_mgr/dcn32/dalsmc.h  |     65 +
+ .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c   |    869 +
+ .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.h   |     39 +
+ .../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.c       |    140 +
+ .../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.h       |     47 +
+ .../dc/clk_mgr/dcn32/dcn32_smu13_driver_if.h       |     63 +
+ .../amd/display/dc/clk_mgr/dcn32/smu13_driver_if.h |    108 +
+ drivers/gpu/drm/amd/display/dc/core/dc.c           |    164 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_debug.c     |      2 +
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c      |    137 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c   |    374 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c |     38 +-
+ .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c  |     45 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c  |     52 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_stream.c    |      5 +-
+ drivers/gpu/drm/amd/display/dc/dc.h                |     45 +-
+ drivers/gpu/drm/amd/display/dc/dc_bios_types.h     |      5 +
+ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c       |     33 +
+ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h       |      5 +
+ drivers/gpu/drm/amd/display/dc/dc_hw_types.h       |      1 +
+ drivers/gpu/drm/amd/display/dc/dc_link.h           |      5 +
+ drivers/gpu/drm/amd/display/dc/dc_stream.h         |     36 +-
+ drivers/gpu/drm/amd/display/dc/dc_types.h          |     23 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_abm.h       |     45 +
+ .../gpu/drm/amd/display/dc/dce/dce_clock_source.c  |     27 +
+ .../gpu/drm/amd/display/dc/dce/dce_clock_source.h  |     15 +
+ .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c  |      2 +
+ drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c      |     64 +
+ drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h      |      2 +
+ .../amd/display/dc/dce110/dce110_hw_sequencer.c    |     23 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h    |     33 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c  |      2 +
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c  |    146 +-
+ .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h  |      6 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c  |      1 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h  |      5 +
+ .../amd/display/dc/dcn10/dcn10_stream_encoder.c    |      8 +-
+ .../amd/display/dc/dcn10/dcn10_stream_encoder.h    |     29 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h  |     34 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c  |      2 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h  |     25 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c |     49 +-
+ .../amd/display/dc/dcn20/dcn20_stream_encoder.c    |      1 +
+ drivers/gpu/drm/amd/display/dc/dcn201/Makefile     |      1 -
+ drivers/gpu/drm/amd/display/dc/dcn30/Makefile      |      6 +-
+ .../display/dc/dcn30/dcn30_dio_stream_encoder.c    |     32 +-
+ .../display/dc/dcn30/dcn30_dio_stream_encoder.h    |     35 +
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c   |      8 +-
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h   |     16 +
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c |     61 +-
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h |     11 +-
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c  |      2 +-
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c   |     14 +-
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h   |    147 +
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c  |      1 +
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h  |      9 +
+ .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c  |      1 +
+ drivers/gpu/drm/amd/display/dc/dcn302/Makefile     |      8 +-
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c  |     40 +-
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h  |     16 +-
+ .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c  |      6 +
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c  |      2 +-
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c |     24 +-
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c  |      1 +
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.h  |      6 +-
+ .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c  |      2 -
+ .../drm/amd/display/dc/dcn315/dcn315_resource.c    |      6 +-
+ .../drm/amd/display/dc/dcn316/dcn316_resource.c    |      6 +-
+ drivers/gpu/drm/amd/display/dc/dcn32/Makefile      |     45 +
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c  |    303 +
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.h  |    159 +
+ .../amd/display/dc/dcn32/dcn32_dio_link_encoder.c  |    294 +
+ .../amd/display/dc/dcn32/dcn32_dio_link_encoder.h  |     60 +
+ .../display/dc/dcn32/dcn32_dio_stream_encoder.c    |    461 +
+ .../display/dc/dcn32/dcn32_dio_stream_encoder.h    |    266 +
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dpp.c   |    164 +
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dpp.h   |     38 +
+ .../display/dc/dcn32/dcn32_hpo_dp_link_encoder.c   |     90 +
+ .../display/dc/dcn32/dcn32_hpo_dp_link_encoder.h   |     63 +
+ .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c    |    964 +
+ .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h    |    174 +
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.c  |    148 +
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.h  |     69 +
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c |    960 +
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h |     66 +
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c  |    156 +
+ .../hw_translate_diag.c => dcn32/dcn32_init.h}     |     20 +-
+ .../gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.c  |    239 +
+ .../gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.h  |    225 +
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.c   |    810 +
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.h   |    213 +
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c  |    268 +
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.h  |    254 +
+ .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c  |   4002 +
+ .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h  |     88 +
+ drivers/gpu/drm/amd/display/dc/dcn321/Makefile     |     42 +
+ .../display/dc/dcn321/dcn321_dio_link_encoder.c    |    199 +
+ .../display/dc/dcn321/dcn321_dio_link_encoder.h    |     42 +
+ .../drm/amd/display/dc/dcn321/dcn321_resource.c    |   2335 +
+ .../hw_factory_diag.c => dcn321/dcn321_resource.h} |     46 +-
+ drivers/gpu/drm/amd/display/dc/dml/Makefile        |      7 +
+ drivers/gpu/drm/amd/display/dc/dml/dc_features.h   |      2 +-
+ .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c   |    110 +-
+ .../amd/display/dc/dml/dcn30/display_mode_vba_30.c |      8 +-
+ .../gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c |     40 +-
+ .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c   |     73 +-
+ .../amd/display/dc/dml/dcn31/display_mode_vba_31.c |      2 +-
+ .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c  |     16 +-
+ .../amd/display/dc/dml/dcn32/display_mode_vba_32.c |   3824 +
+ .../amd/display/dc/dml/dcn32/display_mode_vba_32.h |     57 +
+ .../dc/dml/dcn32/display_mode_vba_util_32.c        |   6253 +
+ .../dc/dml/dcn32/display_mode_vba_util_32.h        |   1175 +
+ .../display/dc/dml/dcn32/display_rq_dlg_calc_32.c  |    616 +
+ .../display/dc/dml/dcn32/display_rq_dlg_calc_32.h  |     70 +
+ .../drm/amd/display/dc/dml/display_mode_enums.h    |     88 +-
+ .../gpu/drm/amd/display/dc/dml/display_mode_lib.c  |     12 +
+ .../gpu/drm/amd/display/dc/dml/display_mode_lib.h  |     15 +
+ .../drm/amd/display/dc/dml/display_mode_structs.h  |    138 +
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.c  |    171 +
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.h  |    247 +-
+ drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c   |     71 +-
+ drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c        |      4 +-
+ drivers/gpu/drm/amd/display/dc/gpio/Makefile       |      8 +-
+ .../amd/display/dc/gpio/dcn20/hw_translate_dcn20.c |     17 +-
+ .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.c |     17 +-
+ .../amd/display/dc/gpio/dcn30/hw_translate_dcn30.c |     19 +-
+ .../amd/display/dc/gpio/dcn32/hw_factory_dcn32.c   |    255 +
+ .../hw_factory_diag.h => dcn32/hw_factory_dcn32.h} |     13 +-
+ .../amd/display/dc/gpio/dcn32/hw_translate_dcn32.c |    349 +
+ .../hw_translate_dcn32.h}                          |     11 +-
+ drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c   |     16 +-
+ drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c |     13 +-
+ drivers/gpu/drm/amd/display/dc/inc/core_status.h   |      2 +-
+ drivers/gpu/drm/amd/display/dc/inc/core_types.h    |     10 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h    |      7 +-
+ .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h   |     45 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h       |     31 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h   |      3 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h        |      6 -
+ drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h       |      8 +
+ .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h   |     23 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h  |      2 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h        |      5 +
+ .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h |      8 +
+ .../drm/amd/display/dc/inc/hw/timing_generator.h   |      8 +
+ drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h  |      2 +
+ .../drm/amd/display/dc/inc/hw_sequencer_private.h  |     11 +
+ drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h  |      7 +
+ drivers/gpu/drm/amd/display/dc/inc/link_hwss.h     |      6 +-
+ drivers/gpu/drm/amd/display/dc/inc/resource.h      |      7 +
+ drivers/gpu/drm/amd/display/dc/irq/Makefile        |     10 +-
+ .../amd/display/dc/irq/dcn32/irq_service_dcn32.c   |    432 +
+ .../amd/display/dc/irq/dcn32/irq_service_dcn32.h   |     35 +
+ drivers/gpu/drm/amd/display/dmub/dmub_srv.h        |      8 +
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h    |    277 +-
+ drivers/gpu/drm/amd/display/dmub/src/Makefile      |      1 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c  |    493 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.h  |    256 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c    |     51 +-
+ .../drm/amd/display/include/bios_parser_types.h    |     11 +
+ drivers/gpu/drm/amd/display/include/dal_asic_id.h  |     14 +-
+ drivers/gpu/drm/amd/display/include/dal_types.h    |      2 +
+ .../drm/amd/display/include/ddc_service_types.h    |      4 +
+ drivers/gpu/drm/amd/display/include/fixed31_32.h   |      2 +-
+ .../drm/amd/display/include/link_service_types.h   |      3 +-
+ .../drm/amd/display/modules/freesync/freesync.c    |      5 +
+ .../amd/display/modules/hdcp/hdcp2_transition.c    |      2 +-
+ .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c    |      4 +
+ .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.h    |     11 +
+ .../gpu/drm/amd/display/modules/inc/mod_freesync.h |      3 +
+ .../amd/display/modules/info_packet/info_packet.c  |     29 +-
+ .../drm/amd/display/modules/power/power_helpers.c  |     84 +
+ .../drm/amd/display/modules/power/power_helpers.h  |      6 +
+ drivers/gpu/drm/amd/display/modules/vmid/vmid.c    |      2 +-
+ drivers/gpu/drm/amd/include/amd_shared.h           |      1 +
+ .../gpu/drm/amd/include/asic_reg/dce/dce_11_0_d.h  |      1 +
+ .../amd/include/asic_reg/dce/dce_11_0_sh_mask.h    |      2 +
+ .../amd/include/asic_reg/dcn/dcn_3_2_0_offset.h    |  14677 ++
+ .../amd/include/asic_reg/dcn/dcn_3_2_0_sh_mask.h   | 222893 ++++++++++++++++++
+ .../amd/include/asic_reg/dcn/dcn_3_2_1_offset.h    |  14561 ++
+ .../amd/include/asic_reg/dcn/dcn_3_2_1_sh_mask.h   |  56582 +++++
+ .../include/asic_reg/mmhub/mmhub_3_0_1_offset.h    |   1769 +
+ .../include/asic_reg/mmhub/mmhub_3_0_1_sh_mask.h   |   7483 +
+ .../amd/include/asic_reg/nbio/nbio_4_3_0_offset.h  |      2 +
+ .../amd/include/asic_reg/nbio/nbio_4_3_0_sh_mask.h |      1 +
+ .../amd/include/asic_reg/nbio/nbio_7_7_0_offset.h  |      4 +
+ .../amd/include/asic_reg/nbio/nbio_7_7_0_sh_mask.h |     10 +
+ drivers/gpu/drm/amd/include/atomfirmware.h         |    209 +-
+ drivers/gpu/drm/amd/include/mes_api_def.h          |      2 +-
+ drivers/gpu/drm/amd/include/mes_v11_api_def.h      |     43 +-
+ drivers/gpu/drm/amd/pm/amdgpu_dpm.c                |     14 +
+ drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h            |      2 +
+ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c          |     31 +-
+ drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h      |     12 +
+ .../drm/amd/pm/swsmu/inc/pmfw_if/arcturus_ppsmc.h  |      2 +-
+ .../swsmu/inc/pmfw_if/smu13_driver_if_aldebaran.h  |     17 +-
+ .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h |      6 +
+ .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_7.h |     62 +-
+ drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h       |      2 +
+ drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h       |     23 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c  |     10 +-
+ .../drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c    |      1 +
+ drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c    |      1 +
+ .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c    |     13 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c     |      9 +
+ drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c   |      1 +
+ drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c    |     14 +
+ drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c |     98 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c     |     61 +-
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c   |     36 +-
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c   |     28 +-
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c   |     14 +
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c   |     19 +
+ .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c   |      1 +
+ drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c             |     83 +-
+ drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c   |      1 +
+ drivers/gpu/drm/arm/display/komeda/komeda_kms.h    |      1 +
+ .../gpu/drm/arm/display/komeda/komeda_pipeline.c   |      2 +
+ drivers/gpu/drm/arm/display/komeda/komeda_plane.c  |      1 +
+ .../drm/arm/display/komeda/komeda_wb_connector.c   |      1 +
+ drivers/gpu/drm/arm/hdlcd_crtc.c                   |      1 +
+ drivers/gpu/drm/arm/malidp_crtc.c                  |      1 +
+ drivers/gpu/drm/arm/malidp_mw.c                    |      2 +
+ drivers/gpu/drm/arm/malidp_planes.c                |      2 +
+ drivers/gpu/drm/armada/armada_510.c                |      1 +
+ drivers/gpu/drm/armada/armada_fb.h                 |      2 +
+ drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c           |      1 +
+ drivers/gpu/drm/aspeed/aspeed_gfx_out.c            |      1 +
+ drivers/gpu/drm/ast/ast_dp.c                       |     10 +-
+ drivers/gpu/drm/ast/ast_drv.h                      |      2 +-
+ drivers/gpu/drm/ast/ast_mode.c                     |     27 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c     |      1 +
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c   |      1 +
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c    |      2 +
+ drivers/gpu/drm/bridge/Kconfig                     |     21 +
+ drivers/gpu/drm/bridge/Makefile                    |      2 +
+ drivers/gpu/drm/bridge/adv7511/adv7511.h           |     12 -
+ drivers/gpu/drm/bridge/adv7511/adv7511_cec.c       |     12 +
+ drivers/gpu/drm/bridge/adv7511/adv7511_drv.c       |     24 +-
+ drivers/gpu/drm/bridge/analogix/analogix_dp_core.c |      1 +
+ drivers/gpu/drm/bridge/analogix/anx7625.c          |    200 +-
+ .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c    |      2 +
+ drivers/gpu/drm/bridge/cdns-dsi.c                  |     26 +
+ drivers/gpu/drm/bridge/chipone-icn6211.c           |     54 +-
+ drivers/gpu/drm/bridge/chrontel-ch7033.c           |      1 +
+ drivers/gpu/drm/bridge/display-connector.c         |      1 +
+ drivers/gpu/drm/bridge/fsl-ldb.c                   |      1 +
+ drivers/gpu/drm/bridge/imx/Kconfig                 |     47 +
+ drivers/gpu/drm/bridge/imx/Makefile                |      9 +
+ drivers/gpu/drm/bridge/imx/imx-ldb-helper.c        |    221 +
+ drivers/gpu/drm/bridge/imx/imx-ldb-helper.h        |     96 +
+ drivers/gpu/drm/bridge/imx/imx8qm-ldb-drv.c        |    588 +
+ drivers/gpu/drm/bridge/imx/imx8qxp-ldb-drv.c       |    723 +
+ .../gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c    |    450 +
+ drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c    |    430 +
+ drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c       |    488 +
+ drivers/gpu/drm/bridge/ite-it66121.c               |      1 +
+ drivers/gpu/drm/bridge/lontium-lt8912b.c           |     11 +-
+ drivers/gpu/drm/bridge/lontium-lt9211.c            |      7 +-
+ drivers/gpu/drm/bridge/lontium-lt9611.c            |     26 +-
+ drivers/gpu/drm/bridge/lontium-lt9611uxc.c         |      3 +-
+ drivers/gpu/drm/bridge/nwl-dsi.c                   |      7 +
+ drivers/gpu/drm/bridge/panel.c                     |     34 +
+ drivers/gpu/drm/bridge/parade-ps8622.c             |      6 +-
+ drivers/gpu/drm/bridge/parade-ps8640.c             |    113 +-
+ drivers/gpu/drm/bridge/sii902x.c                   |      1 +
+ drivers/gpu/drm/bridge/sil-sii8620.c               |      4 +-
+ drivers/gpu/drm/bridge/simple-bridge.c             |      1 +
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c          |      1 +
+ drivers/gpu/drm/bridge/tc358764.c                  |      1 +
+ drivers/gpu/drm/bridge/tc358767.c                  |    180 +-
+ drivers/gpu/drm/bridge/tc358775.c                  |     25 +-
+ drivers/gpu/drm/bridge/ti-dlpc3433.c               |    418 +
+ drivers/gpu/drm/bridge/ti-sn65dsi83.c              |     71 +-
+ drivers/gpu/drm/bridge/ti-sn65dsi86.c              |     27 +-
+ drivers/gpu/drm/bridge/ti-tfp410.c                 |      2 +
+ drivers/gpu/drm/display/Kconfig                    |      2 +-
+ drivers/gpu/drm/display/drm_dp_aux_bus.c           |    211 +-
+ drivers/gpu/drm/display/drm_dp_helper.c            |      4 +-
+ drivers/gpu/drm/display/drm_dp_mst_topology.c      |     33 +-
+ drivers/gpu/drm/drm_aperture.c                     |    178 +-
+ drivers/gpu/drm/drm_atomic.c                       |      2 +
+ drivers/gpu/drm/drm_atomic_helper.c                |     57 +
+ drivers/gpu/drm/drm_atomic_state_helper.c          |      2 +
+ drivers/gpu/drm/drm_atomic_uapi.c                  |      1 +
+ drivers/gpu/drm/drm_blend.c                        |      2 +-
+ drivers/gpu/drm/drm_bridge.c                       |     24 +
+ drivers/gpu/drm/drm_bridge_connector.c             |      8 +-
+ drivers/gpu/drm/drm_client_modeset.c               |     29 +-
+ drivers/gpu/drm/drm_connector.c                    |    119 +-
+ drivers/gpu/drm/drm_crtc.c                         |      2 +
+ drivers/gpu/drm/drm_crtc_helper.c                  |      1 +
+ drivers/gpu/drm/drm_crtc_internal.h                |      5 +-
+ drivers/gpu/drm/drm_damage_helper.c                |      1 +
+ drivers/gpu/drm/drm_debugfs.c                      |     42 +-
+ drivers/gpu/drm/drm_displayid.c                    |     16 +-
+ drivers/gpu/drm/drm_edid.c                         |   2010 +-
+ drivers/gpu/drm/drm_encoder.c                      |      2 +-
+ drivers/gpu/drm/drm_fb_helper.c                    |     28 +-
+ drivers/gpu/drm/drm_gem_atomic_helper.c            |      7 +-
+ drivers/gpu/drm/drm_gem_cma_helper.c               |     39 +-
+ drivers/gpu/drm/drm_gem_framebuffer_helper.c       |    104 +-
+ drivers/gpu/drm/drm_gem_vram_helper.c              |     54 +-
+ drivers/gpu/drm/drm_ioctl.c                        |      2 +-
+ drivers/gpu/drm/drm_kms_helper_common.c            |      1 +
+ drivers/gpu/drm/drm_mipi_dbi.c                     |      9 +
+ drivers/gpu/drm/drm_mode_config.c                  |      1 +
+ drivers/gpu/drm/drm_modes.c                        |      6 +
+ drivers/gpu/drm/drm_modeset_helper.c               |      1 +
+ drivers/gpu/drm/drm_of.c                           |     63 +
+ drivers/gpu/drm/drm_panel_orientation_quirks.c     |      2 +-
+ drivers/gpu/drm/drm_prime.c                        |      2 +-
+ drivers/gpu/drm/drm_probe_helper.c                 |    241 +-
+ drivers/gpu/drm/drm_simple_kms_helper.c            |     14 +-
+ drivers/gpu/drm/drm_syncobj.c                      |     59 +-
+ drivers/gpu/drm/drm_writeback.c                    |      1 +
+ drivers/gpu/drm/exynos/exynos5433_drm_decon.c      |      2 +
+ drivers/gpu/drm/exynos/exynos7_drm_decon.c         |     18 +-
+ drivers/gpu/drm/exynos/exynos_dp.c                 |      1 +
+ drivers/gpu/drm/exynos/exynos_drm_dpi.c            |      1 +
+ drivers/gpu/drm/exynos/exynos_drm_fb.c             |      1 +
+ drivers/gpu/drm/exynos/exynos_drm_fbdev.c          |      1 +
+ drivers/gpu/drm/exynos/exynos_drm_fimd.c           |      2 +
+ drivers/gpu/drm/exynos/exynos_drm_ipp.c            |      1 +
+ drivers/gpu/drm/exynos/exynos_drm_plane.c          |      2 +
+ drivers/gpu/drm/exynos/exynos_drm_scaler.c         |      1 +
+ drivers/gpu/drm/exynos/exynos_drm_vidi.c           |      1 +
+ drivers/gpu/drm/exynos/exynos_mixer.c              |      3 +
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c        |      1 +
+ drivers/gpu/drm/gma500/cdv_intel_crt.c             |     47 +-
+ drivers/gpu/drm/gma500/cdv_intel_dp.c              |      1 +
+ drivers/gpu/drm/gma500/cdv_intel_hdmi.c            |     98 +-
+ drivers/gpu/drm/gma500/cdv_intel_lvds.c            |     80 +-
+ drivers/gpu/drm/gma500/framebuffer.c               |      1 +
+ drivers/gpu/drm/gma500/gma_display.c               |      1 +
+ drivers/gpu/drm/gma500/intel_i2c.c                 |     36 +-
+ drivers/gpu/drm/gma500/oaktrail_crtc.c             |      1 +
+ drivers/gpu/drm/gma500/oaktrail_hdmi.c             |      1 +
+ drivers/gpu/drm/gma500/oaktrail_lvds.c             |     51 +-
+ drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c         |     36 +-
+ drivers/gpu/drm/gma500/psb_drv.h                   |      2 +-
+ drivers/gpu/drm/gma500/psb_intel_drv.h             |     24 +-
+ drivers/gpu/drm/gma500/psb_intel_lvds.c            |     86 +-
+ drivers/gpu/drm/gma500/psb_intel_modes.c           |      2 +
+ drivers/gpu/drm/gud/gud_connector.c                |      1 +
+ drivers/gpu/drm/gud/gud_drv.c                      |      1 +
+ drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c       |      1 +
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c    |      1 +
+ drivers/gpu/drm/hyperv/hyperv_drm_drv.c            |     74 +-
+ drivers/gpu/drm/hyperv/hyperv_drm_modeset.c        |      2 +
+ drivers/gpu/drm/i2c/tda998x_drv.c                  |      1 +
+ drivers/gpu/drm/i915/Makefile                      |      6 +-
+ drivers/gpu/drm/i915/TODO.txt                      |      2 +-
+ drivers/gpu/drm/i915/display/g4x_dp.c              |     22 +-
+ drivers/gpu/drm/i915/display/hsw_ips.c             |      4 +-
+ drivers/gpu/drm/i915/display/i9xx_plane.c          |      1 +
+ drivers/gpu/drm/i915/display/icl_dsi.c             |     11 +-
+ drivers/gpu/drm/i915/display/intel_audio.c         |      1 +
+ drivers/gpu/drm/i915/display/intel_audio_regs.h    |    160 +
+ drivers/gpu/drm/i915/display/intel_backlight.c     |     24 +-
+ drivers/gpu/drm/i915/display/intel_bios.c          |    657 +-
+ drivers/gpu/drm/i915/display/intel_bios.h          |      7 +
+ drivers/gpu/drm/i915/display/intel_bw.c            |      6 +-
+ drivers/gpu/drm/i915/display/intel_cdclk.c         |     16 +-
+ drivers/gpu/drm/i915/display/intel_color.c         |     51 +-
+ .../gpu/drm/i915/display/intel_crtc_state_dump.c   |    314 +
+ .../gpu/drm/i915/display/intel_crtc_state_dump.h   |     16 +
+ drivers/gpu/drm/i915/display/intel_cursor.c        |      1 +
+ drivers/gpu/drm/i915/display/intel_ddi.c           |     54 +-
+ drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c |     37 +-
+ drivers/gpu/drm/i915/display/intel_display.c       |   1846 +-
+ drivers/gpu/drm/i915/display/intel_display.h       |     23 +-
+ .../gpu/drm/i915/display/intel_display_debugfs.c   |     28 +
+ drivers/gpu/drm/i915/display/intel_display_power.c |     10 +-
+ .../drm/i915/display/intel_display_power_well.c    |      4 +-
+ drivers/gpu/drm/i915/display/intel_display_types.h |     90 +-
+ drivers/gpu/drm/i915/display/intel_dmc.c           |    103 +-
+ drivers/gpu/drm/i915/display/intel_dmc_regs.h      |     65 +-
+ drivers/gpu/drm/i915/display/intel_dp.c            |     95 +-
+ drivers/gpu/drm/i915/display/intel_dp.h            |      2 +
+ .../gpu/drm/i915/display/intel_dp_aux_backlight.c  |      6 +-
+ drivers/gpu/drm/i915/display/intel_dpll.c          |     89 +-
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.c      |    407 +-
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.h      |      8 +
+ drivers/gpu/drm/i915/display/intel_dpt.c           |     16 +-
+ drivers/gpu/drm/i915/display/intel_drrs.c          |      3 -
+ drivers/gpu/drm/i915/display/intel_dsi.c           |      2 +-
+ .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c |      9 +-
+ drivers/gpu/drm/i915/display/intel_dsi_vbt.c       |     56 +-
+ drivers/gpu/drm/i915/display/intel_fb.c            |      1 +
+ drivers/gpu/drm/i915/display/intel_fbc.c           |      5 +-
+ drivers/gpu/drm/i915/display/intel_hdcp.c          |      2 +-
+ drivers/gpu/drm/i915/display/intel_hdmi.c          |      2 +-
+ drivers/gpu/drm/i915/display/intel_hotplug.c       |      3 +-
+ drivers/gpu/drm/i915/display/intel_lspcon.c        |      1 +
+ drivers/gpu/drm/i915/display/intel_lvds.c          |      8 +-
+ drivers/gpu/drm/i915/display/intel_modeset_setup.c |    734 +
+ drivers/gpu/drm/i915/display/intel_modeset_setup.h |     15 +
+ .../gpu/drm/i915/display/intel_modeset_verify.c    |    246 +
+ .../gpu/drm/i915/display/intel_modeset_verify.h    |     21 +
+ drivers/gpu/drm/i915/display/intel_opregion.c      |     16 +
+ drivers/gpu/drm/i915/display/intel_opregion.h      |      7 +
+ drivers/gpu/drm/i915/display/intel_overlay.c       |      2 -
+ drivers/gpu/drm/i915/display/intel_panel.c         |     66 +-
+ drivers/gpu/drm/i915/display/intel_panel.h         |      3 +-
+ drivers/gpu/drm/i915/display/intel_pch_refclk.c    |     91 +-
+ drivers/gpu/drm/i915/display/intel_pps.c           |    129 +-
+ drivers/gpu/drm/i915/display/intel_pps.h           |      1 +
+ drivers/gpu/drm/i915/display/intel_psr.c           |     80 +-
+ drivers/gpu/drm/i915/display/intel_sdvo.c          |      5 +-
+ drivers/gpu/drm/i915/display/intel_snps_phy.c      |     77 +-
+ drivers/gpu/drm/i915/display/intel_snps_phy.h      |      5 +-
+ drivers/gpu/drm/i915/display/intel_sprite.c        |      1 +
+ drivers/gpu/drm/i915/display/intel_tc.c            |      3 +-
+ drivers/gpu/drm/i915/display/intel_vbt_defs.h      |     67 +-
+ drivers/gpu/drm/i915/display/intel_vrr.c           |     30 +-
+ drivers/gpu/drm/i915/display/intel_vrr.h           |      4 +-
+ drivers/gpu/drm/i915/display/skl_universal_plane.c |      1 +
+ drivers/gpu/drm/i915/display/vlv_dsi.c             |     14 +-
+ drivers/gpu/drm/i915/gem/i915_gem_context.c        |     28 +-
+ drivers/gpu/drm/i915/gem/i915_gem_shmem.c          |     11 +-
+ drivers/gpu/drm/i915/gem/i915_gem_shrinker.c       |      2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_stolen.c         |      6 +-
+ drivers/gpu/drm/i915/gem/i915_gem_tiling.c         |      2 +-
+ drivers/gpu/drm/i915/gem/i915_gemfs.c              |     50 +-
+ drivers/gpu/drm/i915/gem/i915_gemfs.h              |      3 +-
+ .../drm/i915/gem/selftests/i915_gem_client_blt.c   |    250 +-
+ .../gpu/drm/i915/gem/selftests/i915_gem_context.c  |      2 +-
+ drivers/gpu/drm/i915/gt/gen8_engine_cs.c           |     21 +-
+ drivers/gpu/drm/i915/gt/intel_context.c            |     24 +
+ drivers/gpu/drm/i915/gt/intel_context.h            |     25 +-
+ drivers/gpu/drm/i915/gt/intel_context_types.h      |      4 +-
+ drivers/gpu/drm/i915/gt/intel_engine.h             |      2 +
+ drivers/gpu/drm/i915/gt/intel_engine_cs.c          |    215 +-
+ drivers/gpu/drm/i915/gt/intel_engine_regs.h        |     10 +-
+ drivers/gpu/drm/i915/gt/intel_engine_types.h       |     12 +-
+ .../gpu/drm/i915/gt/intel_execlists_submission.c   |     27 +-
+ drivers/gpu/drm/i915/gt/intel_ggtt.c               |    627 +-
+ drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c          |    132 +
+ drivers/gpu/drm/i915/gt/intel_ggtt_gmch.h          |     27 +
+ drivers/gpu/drm/i915/gt/intel_gpu_commands.h       |     37 +-
+ drivers/gpu/drm/i915/gt/intel_gt.c                 |    267 +-
+ drivers/gpu/drm/i915/gt/intel_gt.h                 |     24 -
+ drivers/gpu/drm/i915/gt/intel_gt_debugfs.c         |      3 +-
+ drivers/gpu/drm/i915/gt/intel_gt_gmch.c            |    654 -
+ drivers/gpu/drm/i915/gt/intel_gt_gmch.h            |     46 -
+ drivers/gpu/drm/i915/gt/intel_gt_irq.c             |     16 +
+ drivers/gpu/drm/i915/gt/intel_gt_mcr.c             |    497 +
+ drivers/gpu/drm/i915/gt/intel_gt_mcr.h             |     34 +
+ drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c      |     12 +-
+ drivers/gpu/drm/i915/gt/intel_gt_regs.h            |     76 +-
+ drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c        |    177 +
+ drivers/gpu/drm/i915/gt/intel_gt_types.h           |      8 +
+ drivers/gpu/drm/i915/gt/intel_gtt.h                |     45 +-
+ drivers/gpu/drm/i915/gt/intel_llc.c                |      3 +-
+ drivers/gpu/drm/i915/gt/intel_lrc.h                |     10 -
+ drivers/gpu/drm/i915/gt/intel_mocs.c               |     24 +-
+ drivers/gpu/drm/i915/gt/intel_rc6.c                |      4 +-
+ drivers/gpu/drm/i915/gt/intel_region_lmem.c        |     21 +-
+ drivers/gpu/drm/i915/gt/intel_ring.c               |      3 +-
+ drivers/gpu/drm/i915/gt/intel_ring_submission.c    |     11 +-
+ drivers/gpu/drm/i915/gt/intel_rps.c                |      9 +-
+ drivers/gpu/drm/i915/gt/intel_sseu.c               |    450 +-
+ drivers/gpu/drm/i915/gt/intel_sseu.h               |     92 +-
+ drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c       |     30 +-
+ drivers/gpu/drm/i915/gt/intel_workarounds.c        |    186 +-
+ drivers/gpu/drm/i915/gt/selftest_hangcheck.c       |      9 +-
+ drivers/gpu/drm/i915/gt/selftest_llc.c             |      2 +-
+ drivers/gpu/drm/i915/gt/selftest_rps.c             |      2 +-
+ .../gpu/drm/i915/gt/uc/abi/guc_actions_slpc_abi.h  |      6 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc.c             |      8 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc.h             |      8 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c         |      5 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c     |     77 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h        |      1 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c    |      4 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_log.c         |      2 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c          |      5 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h         |      1 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c        |     62 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h        |      1 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h  |      3 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c  |    131 +-
+ drivers/gpu/drm/i915/gt/uc/intel_huc.c             |     97 +-
+ drivers/gpu/drm/i915/gt/uc/intel_huc.h             |      5 +-
+ drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c          |      5 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc.c              |     26 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c           |    104 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h           |      2 +
+ drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h       |      9 +
+ drivers/gpu/drm/i915/gvt/cmd_parser.c              |      2 +-
+ drivers/gpu/drm/i915/i915_driver.c                 |     54 +-
+ drivers/gpu/drm/i915/i915_drm_client.h             |      2 +-
+ drivers/gpu/drm/i915/i915_drv.h                    |     94 +-
+ drivers/gpu/drm/i915/i915_gem.h                    |     39 -
+ drivers/gpu/drm/i915/i915_getparam.c               |     11 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c              |     27 +-
+ drivers/gpu/drm/i915/i915_gpu_error.h              |      7 +
+ drivers/gpu/drm/i915/i915_pci.c                    |    132 +-
+ drivers/gpu/drm/i915/i915_query.c                  |     26 +-
+ drivers/gpu/drm/i915/i915_reg.h                    |    235 +-
+ drivers/gpu/drm/i915/i915_request.c                |     57 +-
+ drivers/gpu/drm/i915/i915_request.h                |      2 +
+ drivers/gpu/drm/i915/i915_scheduler.h              |      1 +
+ drivers/gpu/drm/i915/i915_tasklet.h                |     43 +
+ drivers/gpu/drm/i915/i915_utils.h                  |     40 -
+ drivers/gpu/drm/i915/i915_vma.c                    |     39 +-
+ drivers/gpu/drm/i915/intel_device_info.h           |     45 +-
+ drivers/gpu/drm/i915/intel_dram.c                  |      2 +-
+ drivers/gpu/drm/i915/intel_gvt_mmio_table.c        |      2 +
+ drivers/gpu/drm/i915/intel_pch.c                   |     16 +-
+ drivers/gpu/drm/i915/intel_pch.h                   |      8 +-
+ drivers/gpu/drm/i915/intel_pcode.c                 |     93 +-
+ drivers/gpu/drm/i915/intel_pcode.h                 |     20 +-
+ drivers/gpu/drm/i915/intel_pm.c                    |    180 +-
+ drivers/gpu/drm/i915/intel_pm.h                    |     14 +-
+ drivers/gpu/drm/i915/intel_step.c                  |     70 +-
+ drivers/gpu/drm/i915/intel_step.h                  |      4 +-
+ drivers/gpu/drm/i915/intel_uncore.c                |    378 +-
+ drivers/gpu/drm/i915/intel_uncore.h                |      8 -
+ drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c       |      5 +-
+ drivers/gpu/drm/i915/selftests/intel_uncore.c      |      2 +
+ drivers/gpu/drm/imx/dcss/dcss-drv.c                |      1 +
+ drivers/gpu/drm/imx/dcss/dcss-plane.c              |      2 +
+ drivers/gpu/drm/imx/imx-ldb.c                      |      2 +
+ drivers/gpu/drm/imx/imx-tve.c                      |      1 +
+ drivers/gpu/drm/imx/ipuv3-plane.c                  |      2 +
+ drivers/gpu/drm/imx/parallel-display.c             |      2 +
+ drivers/gpu/drm/ingenic/ingenic-drm-drv.c          |     12 +-
+ drivers/gpu/drm/ingenic/ingenic-drm.h              |      3 +
+ drivers/gpu/drm/ingenic/ingenic-ipu.c              |      1 +
+ drivers/gpu/drm/kmb/kmb_dsi.c                      |      1 +
+ drivers/gpu/drm/kmb/kmb_plane.c                    |      2 +
+ drivers/gpu/drm/logicvc/Kconfig                    |      9 +
+ drivers/gpu/drm/logicvc/Makefile                   |      9 +
+ drivers/gpu/drm/logicvc/logicvc_crtc.c             |    280 +
+ drivers/gpu/drm/logicvc/logicvc_crtc.h             |     21 +
+ drivers/gpu/drm/logicvc/logicvc_drm.c              |    496 +
+ drivers/gpu/drm/logicvc/logicvc_drm.h              |     67 +
+ drivers/gpu/drm/logicvc/logicvc_interface.c        |    214 +
+ drivers/gpu/drm/logicvc/logicvc_interface.h        |     28 +
+ drivers/gpu/drm/logicvc/logicvc_layer.c            |    631 +
+ drivers/gpu/drm/logicvc/logicvc_layer.h            |     64 +
+ drivers/gpu/drm/logicvc/logicvc_mode.c             |     80 +
+ drivers/gpu/drm/logicvc/logicvc_mode.h             |     15 +
+ drivers/gpu/drm/logicvc/logicvc_of.c               |    185 +
+ drivers/gpu/drm/logicvc/logicvc_of.h               |     46 +
+ drivers/gpu/drm/logicvc/logicvc_regs.h             |     80 +
+ drivers/gpu/drm/mcde/mcde_clk_div.c                |      1 +
+ drivers/gpu/drm/mcde/mcde_display.c                |      1 +
+ drivers/gpu/drm/mcde/mcde_dsi.c                    |      1 +
+ drivers/gpu/drm/mediatek/Makefile                  |      4 +-
+ drivers/gpu/drm/mediatek/mtk_disp_drv.h            |     20 +
+ drivers/gpu/drm/mediatek/mtk_disp_merge.c          |    320 +
+ drivers/gpu/drm/mediatek/mtk_disp_ovl.c            |      2 +
+ drivers/gpu/drm/mediatek/mtk_disp_rdma.c           |     10 +-
+ drivers/gpu/drm/mediatek/mtk_dpi.c                 |    261 +-
+ drivers/gpu/drm/mediatek/mtk_dpi_regs.h            |     18 +
+ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c        |     69 +-
+ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h        |      3 +
+ drivers/gpu/drm/mediatek/mtk_drm_drv.c             |    184 +-
+ drivers/gpu/drm/mediatek/mtk_drm_drv.h             |      8 +
+ drivers/gpu/drm/mediatek/mtk_drm_plane.c           |      3 +
+ drivers/gpu/drm/mediatek/mtk_drm_plane.h           |      1 +
+ drivers/gpu/drm/mediatek/mtk_dsi.c                 |    101 +-
+ drivers/gpu/drm/mediatek/mtk_mdp_rdma.c            |    315 +
+ drivers/gpu/drm/mediatek/mtk_mdp_rdma.h            |     20 +
+ drivers/gpu/drm/meson/meson_encoder_cvbs.c         |      1 +
+ drivers/gpu/drm/meson/meson_encoder_hdmi.c         |     27 +-
+ drivers/gpu/drm/meson/meson_overlay.c              |      2 +
+ drivers/gpu/drm/meson/meson_plane.c                |      2 +
+ drivers/gpu/drm/mgag200/Makefile                   |     14 +-
+ drivers/gpu/drm/mgag200/mgag200_drv.c              |    387 +-
+ drivers/gpu/drm/mgag200/mgag200_drv.h              |    148 +-
+ drivers/gpu/drm/mgag200/mgag200_g200.c             |    201 +
+ drivers/gpu/drm/mgag200/mgag200_g200eh.c           |     50 +
+ drivers/gpu/drm/mgag200/mgag200_g200eh3.c          |     51 +
+ drivers/gpu/drm/mgag200/mgag200_g200er.c           |     46 +
+ drivers/gpu/drm/mgag200/mgag200_g200ev.c           |     50 +
+ drivers/gpu/drm/mgag200/mgag200_g200ew3.c          |     60 +
+ drivers/gpu/drm/mgag200/mgag200_g200se.c           |    130 +
+ drivers/gpu/drm/mgag200/mgag200_g200wb.c           |     50 +
+ drivers/gpu/drm/mgag200/mgag200_i2c.c              |     59 +-
+ drivers/gpu/drm/mgag200/mgag200_mm.c               |    116 -
+ drivers/gpu/drm/mgag200/mgag200_mode.c             |    454 +-
+ drivers/gpu/drm/mgag200/mgag200_pll.c              |     12 +-
+ drivers/gpu/drm/mgag200/mgag200_reg.h              |      2 +
+ drivers/gpu/drm/msm/Makefile                       |      1 -
+ drivers/gpu/drm/msm/adreno/a5xx_gpu.c              |      8 -
+ drivers/gpu/drm/msm/adreno/a6xx_gmu.c              |     30 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gmu.h              |      4 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gpu.c              |    106 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gpu.h              |      3 +-
+ drivers/gpu/drm/msm/adreno/a6xx_hfi.c              |     65 +-
+ drivers/gpu/drm/msm/adreno/adreno_device.c         |     23 +
+ drivers/gpu/drm/msm/adreno/adreno_gpu.c            |     29 +-
+ drivers/gpu/drm/msm/adreno/adreno_gpu.h            |     32 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c      |     24 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h      |      4 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c           |    119 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h           |      6 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c        |    163 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h        |     26 +-
+ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c    |     21 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c        |      1 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h         |     25 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c     |    514 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h     |     20 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c         |      5 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h         |      1 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c         |      9 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h         |      2 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c        |      5 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.h        |      2 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c  |      8 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h  |      2 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c        |     24 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h        |      9 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c          |     53 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h          |      1 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c     |      5 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.h     |      1 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c    |      7 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h    |      1 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c        |      9 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h        |      5 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c         |      5 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.h         |      1 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c        |     55 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h        |     36 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c        |      9 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c          |      5 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c            |     40 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h            |      2 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c          |     22 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c             |      2 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h             |      2 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c      |      2 +
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c           |     29 +-
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h           |      6 -
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c         |      1 +
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c           |     21 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.h           |      6 -
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c          |      1 +
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c           |     31 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_pipe.c          |      3 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c         |      2 +
+ drivers/gpu/drm/msm/disp/mdp_format.c              |      2 +
+ drivers/gpu/drm/msm/dp/dp_clk_util.c               |    120 -
+ drivers/gpu/drm/msm/dp/dp_clk_util.h               |     38 -
+ drivers/gpu/drm/msm/dp/dp_ctrl.c                   |     13 +-
+ drivers/gpu/drm/msm/dp/dp_display.c                |    100 +-
+ drivers/gpu/drm/msm/dp/dp_display.h                |      1 -
+ drivers/gpu/drm/msm/dp/dp_drm.c                    |      8 +-
+ drivers/gpu/drm/msm/dp/dp_drm.h                    |      2 +-
+ drivers/gpu/drm/msm/dp/dp_parser.c                 |     53 +-
+ drivers/gpu/drm/msm/dp/dp_parser.h                 |      6 +-
+ drivers/gpu/drm/msm/dp/dp_power.c                  |    104 +-
+ drivers/gpu/drm/msm/dsi/dsi_host.c                 |     57 +-
+ drivers/gpu/drm/msm/hdmi/hdmi.c                    |    126 +-
+ drivers/gpu/drm/msm/hdmi/hdmi.h                    |     15 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_bridge.c             |     11 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_hpd.c                |     62 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c           |     12 +
+ drivers/gpu/drm/msm/msm_debugfs.c                  |      1 +
+ drivers/gpu/drm/msm/msm_drv.c                      |     81 +-
+ drivers/gpu/drm/msm/msm_drv.h                      |     11 +-
+ drivers/gpu/drm/msm/msm_fb.c                       |      1 +
+ drivers/gpu/drm/msm/msm_fbdev.c                    |      1 +
+ drivers/gpu/drm/msm/msm_fence.c                    |     11 +-
+ drivers/gpu/drm/msm/msm_gem.c                      |     22 +-
+ drivers/gpu/drm/msm/msm_gem.h                      |     15 +-
+ drivers/gpu/drm/msm/msm_gem_shrinker.c             |      2 +-
+ drivers/gpu/drm/msm/msm_gpu.c                      |     63 +-
+ drivers/gpu/drm/msm/msm_gpu.h                      |     31 +-
+ drivers/gpu/drm/msm/msm_gpu_devfreq.c              |     41 +-
+ drivers/gpu/drm/mxsfb/Kconfig                      |     16 +
+ drivers/gpu/drm/mxsfb/Makefile                     |      2 +
+ drivers/gpu/drm/mxsfb/lcdif_drv.c                  |    340 +
+ drivers/gpu/drm/mxsfb/lcdif_drv.h                  |     44 +
+ drivers/gpu/drm/mxsfb/lcdif_kms.c                  |    485 +
+ drivers/gpu/drm/mxsfb/lcdif_regs.h                 |    257 +
+ drivers/gpu/drm/mxsfb/mxsfb_kms.c                  |      2 +
+ drivers/gpu/drm/nouveau/Kconfig                    |      1 -
+ drivers/gpu/drm/nouveau/dispnv50/disp.c            |     16 -
+ drivers/gpu/drm/nouveau/dispnv50/wndw.c            |     13 +-
+ drivers/gpu/drm/nouveau/dispnv50/wndw.h            |      2 -
+ drivers/gpu/drm/nouveau/include/nvhw/drf.h         |      4 +-
+ drivers/gpu/drm/nouveau/include/nvif/object.h      |      6 +
+ drivers/gpu/drm/nouveau/include/nvkm/core/device.h |      3 -
+ .../gpu/drm/nouveau/include/nvkm/engine/falcon.h   |     10 -
+ drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h |      2 -
+ drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h  |      3 +-
+ .../gpu/drm/nouveau/include/nvkm/subdev/fault.h    |      1 +
+ .../gpu/drm/nouveau/include/nvkm/subdev/secboot.h  |     66 -
+ drivers/gpu/drm/nouveau/nouveau_abi16.c            |     32 +-
+ drivers/gpu/drm/nouveau/nouveau_abi16.h            |      1 +
+ drivers/gpu/drm/nouveau/nouveau_chan.c             |      4 +-
+ drivers/gpu/drm/nouveau/nouveau_drv.h              |      1 -
+ drivers/gpu/drm/nouveau/nouveau_fbcon.c            |      2 +
+ drivers/gpu/drm/nouveau/nouveau_nvif.c             |     31 +-
+ drivers/gpu/drm/nouveau/nouveau_usif.c             |    231 +-
+ drivers/gpu/drm/nouveau/nvif/object.c              |      2 +-
+ drivers/gpu/drm/nouveau/nvkm/core/ioctl.c          |      3 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/ce/gv100.c     |     24 +
+ drivers/gpu/drm/nouveau/nvkm/engine/ce/priv.h      |      2 +
+ drivers/gpu/drm/nouveau/nvkm/engine/ce/tu102.c     |      1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/device/acpi.c  |      6 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/device/base.c  |     25 -
+ drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c |     14 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/device/user.c  |      1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c    |     29 -
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c    |     37 -
+ .../gpu/drm/nouveau/nvkm/engine/fifo/changk104.h   |      2 -
+ .../gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c |     11 +-
+ .../gpu/drm/nouveau/nvkm/engine/fifo/gpfifogv100.c |     47 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/gv100.c   |      2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h    |      1 -
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c     |      4 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c     |      1 -
+ drivers/gpu/drm/nouveau/nvkm/falcon/base.c         |     10 -
+ drivers/gpu/drm/nouveau/nvkm/falcon/v1.c           |     25 -
+ drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c    |      2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/bios/priv.h    |      2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c  |      2 +-
+ .../gpu/drm/nouveau/nvkm/subdev/bios/shadowrom.c   |     14 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c     |     20 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c      |      4 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi4.c                |      1 +
+ drivers/gpu/drm/omapdrm/dss/hdmi5.c                |      1 +
+ drivers/gpu/drm/omapdrm/omap_debugfs.c             |      1 +
+ drivers/gpu/drm/omapdrm/omap_dmm_tiler.c           |      1 +
+ drivers/gpu/drm/omapdrm/omap_fb.c                  |      2 +
+ drivers/gpu/drm/omapdrm/omap_fbdev.c               |      1 +
+ drivers/gpu/drm/omapdrm/omap_plane.c               |      2 +
+ drivers/gpu/drm/panel/Kconfig                      |     13 +
+ drivers/gpu/drm/panel/Makefile                     |      1 +
+ .../gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c   |      7 +-
+ drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c     |     12 +
+ drivers/gpu/drm/panel/panel-dsi-cm.c               |     29 +-
+ drivers/gpu/drm/panel/panel-ebbg-ft8719.c          |    285 +
+ drivers/gpu/drm/panel/panel-edp.c                  |     48 +-
+ drivers/gpu/drm/panel/panel-elida-kd35t133.c       |     12 +
+ .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c  |      2 +-
+ drivers/gpu/drm/panel/panel-ilitek-ili9881c.c      |     12 +
+ drivers/gpu/drm/panel/panel-lvds.c                 |     13 +
+ drivers/gpu/drm/panel/panel-novatek-nt35510.c      |      6 +-
+ drivers/gpu/drm/panel/panel-novatek-nt36672a.c     |      4 +
+ .../gpu/drm/panel/panel-raspberrypi-touchscreen.c  |      1 +
+ drivers/gpu/drm/panel/panel-raydium-rm67191.c      |      1 +
+ drivers/gpu/drm/panel/panel-samsung-atna33xc20.c   |     51 +-
+ drivers/gpu/drm/panel/panel-seiko-43wvf1g.c        |      1 +
+ drivers/gpu/drm/panel/panel-simple.c               |    137 +-
+ drivers/gpu/drm/panel/panel-sony-acx565akm.c       |     12 +-
+ drivers/gpu/drm/panfrost/panfrost_device.c         |      9 +-
+ drivers/gpu/drm/panfrost/panfrost_drv.c            |      1 +
+ drivers/gpu/drm/panfrost/panfrost_features.h       |     13 +
+ drivers/gpu/drm/panfrost/panfrost_gpu.c            |     18 +-
+ drivers/gpu/drm/panfrost/panfrost_issues.h         |     19 +-
+ drivers/gpu/drm/panfrost/panfrost_regs.h           |      1 +
+ drivers/gpu/drm/pl111/pl111_display.c              |      4 +-
+ drivers/gpu/drm/pl111/pl111_drv.c                  |      1 +
+ drivers/gpu/drm/pl111/pl111_versatile.c            |      2 +
+ drivers/gpu/drm/qxl/qxl_display.c                  |      2 +
+ drivers/gpu/drm/qxl/qxl_draw.c                     |      1 +
+ drivers/gpu/drm/qxl/qxl_kms.c                      |      2 -
+ drivers/gpu/drm/r128/r128_drv.h                    |      4 +-
+ drivers/gpu/drm/radeon/.gitignore                  |      2 +-
+ drivers/gpu/drm/radeon/Kconfig                     |      2 +-
+ drivers/gpu/drm/radeon/Makefile                    |      2 +-
+ drivers/gpu/drm/radeon/atombios_crtc.c             |      1 +
+ drivers/gpu/drm/radeon/atombios_encoders.c         |     14 -
+ drivers/gpu/drm/radeon/evergreen.c                 |      1 +
+ drivers/gpu/drm/radeon/ni_dpm.c                    |      6 +-
+ drivers/gpu/drm/radeon/r100.c                      |      1 +
+ drivers/gpu/drm/radeon/r300_reg.h                  |      2 +-
+ drivers/gpu/drm/radeon/radeon_acpi.c               |      2 -
+ drivers/gpu/drm/radeon/radeon_device.c             |      1 +
+ drivers/gpu/drm/radeon/radeon_display.c            |      1 +
+ drivers/gpu/drm/radeon/radeon_fb.c                 |      1 +
+ drivers/gpu/drm/radeon/radeon_gem.c                |      2 +-
+ drivers/gpu/drm/radeon/radeon_legacy_crtc.c        |      1 +
+ drivers/gpu/drm/radeon/radeon_legacy_encoders.c    |     15 -
+ drivers/gpu/drm/radeon/radeon_mode.h               |      4 -
+ drivers/gpu/drm/radeon/radeon_sa.c                 |      6 +-
+ drivers/gpu/drm/radeon/rs600.c                     |      1 +
+ drivers/gpu/drm/radeon/rv770.c                     |      1 +
+ drivers/gpu/drm/rcar-du/rcar_du_encoder.c          |      1 +
+ drivers/gpu/drm/rcar-du/rcar_du_kms.c              |      1 +
+ drivers/gpu/drm/rcar-du/rcar_du_plane.c            |      2 +
+ drivers/gpu/drm/rcar-du/rcar_du_vsp.c              |      2 +
+ drivers/gpu/drm/rcar-du/rcar_du_writeback.c        |      2 +
+ drivers/gpu/drm/rcar-du/rcar_lvds.c                |      1 +
+ drivers/gpu/drm/rcar-du/rcar_mipi_dsi.c            |     15 +-
+ drivers/gpu/drm/rockchip/Kconfig                   |      4 +-
+ drivers/gpu/drm/rockchip/analogix_dp-rockchip.c    |     10 +-
+ drivers/gpu/drm/rockchip/rk3066_hdmi.c             |      1 +
+ drivers/gpu/drm/rockchip/rockchip_drm_fb.c         |      1 +
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c        |      5 +
+ drivers/gpu/drm/rockchip/rockchip_drm_vop2.c       |      8 +-
+ drivers/gpu/drm/rockchip/rockchip_rgb.c            |      1 +
+ drivers/gpu/drm/scheduler/sched_entity.c           |      6 +-
+ drivers/gpu/drm/scheduler/sched_main.c             |     13 +-
+ drivers/gpu/drm/selftests/test-drm_damage_helper.c |      1 +
+ drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c |      2 +-
+ drivers/gpu/drm/selftests/test-drm_plane_helper.c  |      1 +
+ drivers/gpu/drm/shmobile/shmob_drm_backlight.c     |      6 +-
+ drivers/gpu/drm/shmobile/shmob_drm_crtc.c          |      1 +
+ drivers/gpu/drm/shmobile/shmob_drm_kms.c           |      1 +
+ drivers/gpu/drm/shmobile/shmob_drm_plane.c         |      1 +
+ drivers/gpu/drm/solomon/ssd130x-spi.c              |      2 +
+ drivers/gpu/drm/solomon/ssd130x.c                  |      2 +
+ drivers/gpu/drm/sprd/sprd_dpu.c                    |      2 +
+ drivers/gpu/drm/sti/sti_compositor.c               |      1 +
+ drivers/gpu/drm/sti/sti_cursor.c                   |      1 +
+ drivers/gpu/drm/sti/sti_gdp.c                      |      2 +
+ drivers/gpu/drm/sti/sti_hda.c                      |      1 +
+ drivers/gpu/drm/sti/sti_hdmi.c                     |      1 +
+ drivers/gpu/drm/sti/sti_hqvdp.c                    |      2 +
+ drivers/gpu/drm/sti/sti_plane.c                    |      2 +
+ drivers/gpu/drm/stm/drv.c                          |      1 +
+ drivers/gpu/drm/stm/ltdc.c                         |    294 +-
+ drivers/gpu/drm/stm/ltdc.h                         |      8 +-
+ drivers/gpu/drm/sun4i/sun4i_backend.c              |      2 +
+ drivers/gpu/drm/sun4i/sun4i_framebuffer.c          |      1 +
+ drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c             |      1 +
+ drivers/gpu/drm/sun4i/sun4i_layer.c                |      1 +
+ drivers/gpu/drm/sun4i/sun4i_tcon.c                 |      1 +
+ drivers/gpu/drm/sun4i/sun4i_tcon.h                 |      1 +
+ drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h              |      9 +-
+ drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c             |    242 +-
+ drivers/gpu/drm/sun4i/sun8i_mixer.c                |      1 +
+ drivers/gpu/drm/sun4i/sun8i_ui_layer.c             |      2 +
+ drivers/gpu/drm/sun4i/sun8i_vi_layer.c             |      2 +
+ drivers/gpu/drm/tegra/dc.c                         |      3 +
+ drivers/gpu/drm/tegra/drm.c                        |      2 +
+ drivers/gpu/drm/tegra/drm.h                        |     11 +
+ drivers/gpu/drm/tegra/falcon.c                     |      8 +
+ drivers/gpu/drm/tegra/falcon.h                     |      1 +
+ drivers/gpu/drm/tegra/fb.c                         |      1 +
+ drivers/gpu/drm/tegra/gem.c                        |     11 +-
+ drivers/gpu/drm/tegra/hub.c                        |      3 +
+ drivers/gpu/drm/tegra/nvdec.c                      |     14 +-
+ drivers/gpu/drm/tegra/plane.c                      |      2 +
+ drivers/gpu/drm/tegra/submit.c                     |     48 +-
+ drivers/gpu/drm/tegra/uapi.c                       |     43 +-
+ drivers/gpu/drm/tegra/vic.c                        |     92 +-
+ drivers/gpu/drm/tests/.kunitconfig                 |      3 +
+ drivers/gpu/drm/tests/Makefile                     |      3 +
+ drivers/gpu/drm/tests/drm_format_helper_test.c     |    161 +
+ drivers/gpu/drm/tidss/tidss_dispc.c                |      3 +
+ drivers/gpu/drm/tidss/tidss_plane.c                |      2 +
+ drivers/gpu/drm/tilcdc/tilcdc_crtc.c               |      1 +
+ drivers/gpu/drm/tilcdc/tilcdc_panel.c              |      1 +
+ drivers/gpu/drm/tilcdc/tilcdc_plane.c              |      1 +
+ drivers/gpu/drm/tiny/Kconfig                       |      1 +
+ drivers/gpu/drm/tiny/arcpgu.c                      |      2 +
+ drivers/gpu/drm/tiny/bochs.c                       |      3 +
+ drivers/gpu/drm/tiny/cirrus.c                      |      2 +
+ drivers/gpu/drm/tiny/gm12u320.c                    |      2 +
+ drivers/gpu/drm/tiny/ili9225.c                     |      1 +
+ drivers/gpu/drm/tiny/repaper.c                     |      1 +
+ drivers/gpu/drm/tiny/st7586.c                      |      1 +
+ drivers/gpu/drm/tiny/st7735r.c                     |      1 +
+ drivers/gpu/drm/ttm/ttm_bo.c                       |      9 +-
+ drivers/gpu/drm/tve200/tve200_display.c            |      1 +
+ drivers/gpu/drm/udl/udl_connector.c                |      3 +-
+ drivers/gpu/drm/v3d/Kconfig                        |      5 +-
+ drivers/gpu/drm/v3d/v3d_debugfs.c                  |     18 +-
+ drivers/gpu/drm/v3d/v3d_drv.c                      |     12 +-
+ drivers/gpu/drm/v3d/v3d_gem.c                      |     12 +-
+ drivers/gpu/drm/vboxvideo/vbox_mode.c              |      2 +
+ drivers/gpu/drm/vc4/vc4_bo.c                       |      2 +
+ drivers/gpu/drm/vc4/vc4_crtc.c                     |     15 +-
+ drivers/gpu/drm/vc4/vc4_dpi.c                      |    100 +-
+ drivers/gpu/drm/vc4/vc4_drv.c                      |     19 +
+ drivers/gpu/drm/vc4/vc4_drv.h                      |      1 +
+ drivers/gpu/drm/vc4/vc4_dsi.c                      |    152 +-
+ drivers/gpu/drm/vc4/vc4_hdmi.c                     |    210 +-
+ drivers/gpu/drm/vc4/vc4_hdmi.h                     |     14 +-
+ drivers/gpu/drm/vc4/vc4_hdmi_regs.h                |     38 +-
+ drivers/gpu/drm/vc4/vc4_hvs.c                      |     42 +
+ drivers/gpu/drm/vc4/vc4_kms.c                      |      9 +-
+ drivers/gpu/drm/vc4/vc4_plane.c                    |     94 +-
+ drivers/gpu/drm/vc4/vc4_regs.h                     |      2 +-
+ drivers/gpu/drm/vc4/vc4_txp.c                      |      1 +
+ drivers/gpu/drm/virtio/virtgpu_display.c           |      1 +
+ drivers/gpu/drm/virtio/virtgpu_drv.h               |      1 +
+ drivers/gpu/drm/virtio/virtgpu_ioctl.c             |      6 +-
+ drivers/gpu/drm/virtio/virtgpu_object.c            |      4 +-
+ drivers/gpu/drm/virtio/virtgpu_prime.c             |      6 +-
+ drivers/gpu/drm/virtio/virtgpu_vq.c                |      2 +
+ drivers/gpu/drm/vkms/vkms_composer.c               |     10 +-
+ drivers/gpu/drm/vkms/vkms_drv.h                    |      1 +
+ drivers/gpu/drm/vkms/vkms_output.c                 |      1 +
+ drivers/gpu/drm/vkms/vkms_writeback.c              |      1 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_bo.c                 |     10 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fb.c                 |      1 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c                |      2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.h                |      1 +
+ drivers/gpu/drm/xen/xen_drm_front_conn.c           |      1 +
+ drivers/gpu/drm/xen/xen_drm_front_kms.c            |      1 +
+ drivers/gpu/drm/xlnx/zynqmp_disp.c                 |      1 +
+ drivers/gpu/drm/xlnx/zynqmp_dp.c                   |      1 +
+ drivers/gpu/host1x/Makefile                        |      6 +-
+ drivers/gpu/host1x/cdma.c                          |     43 +-
+ drivers/gpu/host1x/channel.c                       |      8 +-
+ drivers/gpu/host1x/context.c                       |    160 +
+ drivers/gpu/host1x/context.h                       |     38 +
+ drivers/gpu/host1x/context_bus.c                   |      5 -
+ drivers/gpu/host1x/dev.c                           |    124 +-
+ drivers/gpu/host1x/dev.h                           |     13 +
+ drivers/gpu/host1x/hw/cdma_hw.c                    |     34 +
+ drivers/gpu/host1x/hw/channel_hw.c                 |    137 +-
+ drivers/gpu/host1x/hw/host1x01_hardware.h          |    114 +-
+ drivers/gpu/host1x/hw/host1x02_hardware.h          |    113 +-
+ drivers/gpu/host1x/hw/host1x04_hardware.h          |    113 +-
+ drivers/gpu/host1x/hw/host1x05_hardware.h          |    113 +-
+ drivers/gpu/host1x/hw/host1x06_hardware.h          |    118 +-
+ drivers/gpu/host1x/hw/host1x07_hardware.h          |    118 +-
+ drivers/gpu/host1x/hw/host1x08.c                   |     33 +
+ drivers/gpu/host1x/hw/host1x08.h                   |     15 +
+ drivers/gpu/host1x/hw/host1x08_hardware.h          |     21 +
+ drivers/gpu/host1x/hw/hw_host1x08_channel.h        |     11 +
+ drivers/gpu/host1x/hw/hw_host1x08_common.h         |     11 +
+ drivers/gpu/host1x/hw/hw_host1x08_hypervisor.h     |      9 +
+ drivers/gpu/host1x/hw/hw_host1x08_uclass.h         |    181 +
+ drivers/gpu/host1x/hw/hw_host1x08_vm.h             |     36 +
+ drivers/gpu/host1x/hw/intr_hw.c                    |     11 +
+ drivers/gpu/host1x/hw/opcodes.h                    |    150 +
+ drivers/vfio/pci/vfio_pci_core.c                   |      5 +
+ drivers/video/Kconfig                              |      6 +
+ drivers/video/Makefile                             |      2 +
+ drivers/video/aperture.c                           |    351 +
+ drivers/video/console/Kconfig                      |      1 +
+ drivers/video/fbdev/Kconfig                        |      7 +-
+ drivers/video/fbdev/core/fbcon.c                   |     13 +-
+ drivers/video/fbdev/core/fbmem.c                   |     22 +-
+ drivers/video/fbdev/efifb.c                        |     11 -
+ drivers/video/fbdev/simplefb.c                     |     11 -
+ include/drm/display/drm_dp_aux_bus.h               |     34 +-
+ include/drm/display/drm_dp_helper.h                |     48 +-
+ include/drm/drm_atomic_helper.h                    |      2 +
+ include/drm/drm_bridge.h                           |     15 +
+ include/drm/drm_connector.h                        |     10 +-
+ include/drm/drm_crtc.h                             |     17 +-
+ include/drm/drm_displayid.h                        |      6 +-
+ include/drm/drm_edid.h                             |     39 +-
+ include/drm/drm_encoder_slave.h                    |      2 +
+ include/drm/drm_fb_helper.h                        |      1 +
+ include/drm/drm_gem.h                              |     26 +-
+ include/drm/drm_gem_framebuffer_helper.h           |     10 +-
+ include/drm/drm_mipi_dsi.h                         |     17 +
+ include/drm/drm_of.h                               |     22 +
+ include/drm/drm_panel.h                            |      9 +
+ include/drm/drm_probe_helper.h                     |      3 +
+ include/drm/drm_rect.h                             |     16 +
+ include/drm/gpu_scheduler.h                        |      4 +-
+ include/drm/intel-gtt.h                            |     24 +-
+ include/linux/aperture.h                           |     56 +
+ include/linux/dma-fence-unwrap.h                   |     82 +-
+ include/linux/fb.h                                 |      1 -
+ include/linux/host1x.h                             |     42 +
+ include/linux/iosys-map.h                          |     82 +-
+ include/linux/workqueue.h                          |      1 +
+ include/uapi/drm/drm_fourcc.h                      |     10 +-
+ include/uapi/drm/i915_drm.h                        |     16 +
+ include/uapi/linux/dma-buf.h                       |     84 +
+ include/uapi/linux/kfd_ioctl.h                     |     52 +-
+ include/uapi/linux/media-bus-format.h              |      6 +-
+ kernel/workqueue.c                                 |      9 +
+ 1150 files changed, 384700 insertions(+), 14679 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/fsl,imx8qxp-ldb.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/fsl,imx8qxp-pixel-combiner.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/fsl,imx8qxp-pixel-link.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/fsl,imx8qxp-pxl2dpi.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,dlpc3433.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt
+ create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,mdp-rdma.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/msm/hdmi.txt
+ create mode 100644 Documentation/devicetree/bindings/display/msm/hdmi.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/panel/ebbg,ft8719.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra114-mipi.txt
+ create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra114-mipi.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra124-dpaux.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra124-sor.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra124-vic.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra186-dc.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra186-display.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra186-dsi-padctl.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-dc.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-dsi.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-epp.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-gr2d.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-gr3d.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-hdmi.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt
+ create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-isp.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-mpe.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-tvo.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-vi.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/tegra/nvidia,tegra210-csi.yaml
+ create mode 100644 Documentation/devicetree/bindings/mfd/fsl,imx8qxp-csr.yaml
+ create mode 100644 Documentation/devicetree/bindings/phy/qcom,hdmi-phy-other.yaml
+ create mode 100644 Documentation/devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml
+ delete mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-dpaux-padctl.txt
+ create mode 100644 Documentation/driver-api/aperture.rst
+ create mode 100644 drivers/dma-buf/dma-fence-unwrap.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dalsmc.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_smu13_driver_if.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/smu13_driver_if.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_link_encoder.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_link_encoder.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_stream_encoder.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_stream_encoder.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dpp.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dpp.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hpo_dp_link_encoder.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hpo_dp_link_encoder.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c
+ rename drivers/gpu/drm/amd/display/dc/{gpio/diagnostics/hw_translate_diag.c => dcn32/dcn32_init.h} (74%)
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn321/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn321/dcn321_dio_link_encoder.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn321/dcn321_dio_link_encoder.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c
+ rename drivers/gpu/drm/amd/display/dc/{gpio/diagnostics/hw_factory_diag.c => dcn321/dcn321_resource.h} (53%)
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn32/display_rq_dlg_calc_32.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn32/display_rq_dlg_calc_32.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn32/hw_factory_dcn32.c
+ rename drivers/gpu/drm/amd/display/dc/gpio/{diagnostics/hw_factory_diag.h => dcn32/hw_factory_dcn32.h} (81%)
+ create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn32/hw_translate_dcn32.c
+ rename drivers/gpu/drm/amd/display/dc/gpio/{diagnostics/hw_translate_diag.h => dcn32/hw_translate_dcn32.h} (82%)
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn32/irq_service_dcn32.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn32/irq_service_dcn32.h
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_2_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_2_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_2_1_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_2_1_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_0_1_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_0_1_sh_mask.h
+ create mode 100644 drivers/gpu/drm/bridge/imx/Kconfig
+ create mode 100644 drivers/gpu/drm/bridge/imx/Makefile
+ create mode 100644 drivers/gpu/drm/bridge/imx/imx-ldb-helper.c
+ create mode 100644 drivers/gpu/drm/bridge/imx/imx-ldb-helper.h
+ create mode 100644 drivers/gpu/drm/bridge/imx/imx8qm-ldb-drv.c
+ create mode 100644 drivers/gpu/drm/bridge/imx/imx8qxp-ldb-drv.c
+ create mode 100644 drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c
+ create mode 100644 drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c
+ create mode 100644 drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c
+ create mode 100644 drivers/gpu/drm/bridge/ti-dlpc3433.c
+ create mode 100644 drivers/gpu/drm/i915/display/intel_audio_regs.h
+ create mode 100644 drivers/gpu/drm/i915/display/intel_crtc_state_dump.c
+ create mode 100644 drivers/gpu/drm/i915/display/intel_crtc_state_dump.h
+ create mode 100644 drivers/gpu/drm/i915/display/intel_modeset_setup.c
+ create mode 100644 drivers/gpu/drm/i915/display/intel_modeset_setup.h
+ create mode 100644 drivers/gpu/drm/i915/display/intel_modeset_verify.c
+ create mode 100644 drivers/gpu/drm/i915/display/intel_modeset_verify.h
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_ggtt_gmch.h
+ delete mode 100644 drivers/gpu/drm/i915/gt/intel_gt_gmch.c
+ delete mode 100644 drivers/gpu/drm/i915/gt/intel_gt_gmch.h
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_mcr.c
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_mcr.h
+ create mode 100644 drivers/gpu/drm/i915/i915_tasklet.h
+ create mode 100644 drivers/gpu/drm/logicvc/Kconfig
+ create mode 100644 drivers/gpu/drm/logicvc/Makefile
+ create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.c
+ create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.h
+ create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.c
+ create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.h
+ create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.c
+ create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.h
+ create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.c
+ create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.h
+ create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.c
+ create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.h
+ create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.c
+ create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.h
+ create mode 100644 drivers/gpu/drm/logicvc/logicvc_regs.h
+ create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_merge.c
+ create mode 100644 drivers/gpu/drm/mediatek/mtk_mdp_rdma.c
+ create mode 100644 drivers/gpu/drm/mediatek/mtk_mdp_rdma.h
+ create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200.c
+ create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200eh.c
+ create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200eh3.c
+ create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200er.c
+ create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200ev.c
+ create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200ew3.c
+ create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200se.c
+ create mode 100644 drivers/gpu/drm/mgag200/mgag200_g200wb.c
+ delete mode 100644 drivers/gpu/drm/mgag200/mgag200_mm.c
+ delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h
+ delete mode 100644 drivers/gpu/drm/msm/dp/dp_clk_util.c
+ delete mode 100644 drivers/gpu/drm/msm/dp/dp_clk_util.h
+ create mode 100644 drivers/gpu/drm/mxsfb/lcdif_drv.c
+ create mode 100644 drivers/gpu/drm/mxsfb/lcdif_drv.h
+ create mode 100644 drivers/gpu/drm/mxsfb/lcdif_kms.c
+ create mode 100644 drivers/gpu/drm/mxsfb/lcdif_regs.h
+ delete mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/secboot.h
+ create mode 100644 drivers/gpu/drm/panel/panel-ebbg-ft8719.c
+ create mode 100644 drivers/gpu/drm/tests/.kunitconfig
+ create mode 100644 drivers/gpu/drm/tests/Makefile
+ create mode 100644 drivers/gpu/drm/tests/drm_format_helper_test.c
+ create mode 100644 drivers/gpu/host1x/context.c
+ create mode 100644 drivers/gpu/host1x/context.h
+ create mode 100644 drivers/gpu/host1x/hw/host1x08.c
+ create mode 100644 drivers/gpu/host1x/hw/host1x08.h
+ create mode 100644 drivers/gpu/host1x/hw/host1x08_hardware.h
+ create mode 100644 drivers/gpu/host1x/hw/hw_host1x08_channel.h
+ create mode 100644 drivers/gpu/host1x/hw/hw_host1x08_common.h
+ create mode 100644 drivers/gpu/host1x/hw/hw_host1x08_hypervisor.h
+ create mode 100644 drivers/gpu/host1x/hw/hw_host1x08_uclass.h
+ create mode 100644 drivers/gpu/host1x/hw/hw_host1x08_vm.h
+ create mode 100644 drivers/gpu/host1x/hw/opcodes.h
+ create mode 100644 drivers/video/aperture.c
+ create mode 100644 include/linux/aperture.h
+Merging drm-misc/for-linux-next (c96cfaf8fc02 drm/nouveau: Don't pm_runtime_put_sync(), only pm_runtime_put_autosuspend())
+$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next
+Merge made by the 'ort' strategy.
+ drivers/dma-buf/dma-fence-unwrap.c          | 3 ++-
+ drivers/gpu/drm/mgag200/mgag200_drv.c       | 6 ------
+ drivers/gpu/drm/nouveau/nouveau_connector.c | 8 +++-----
+ drivers/gpu/drm/nouveau/nouveau_display.c   | 4 ++--
+ drivers/gpu/drm/nouveau/nouveau_fbcon.c     | 2 +-
+ include/linux/dma-fence-unwrap.h            | 6 +-----
+ 6 files changed, 9 insertions(+), 20 deletions(-)
+Merging amdgpu/drm-next (b7be3ae75916 drm/amd/display: remove duplicate dcn314 includes)
+$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
+Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+Auto-merging drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h
+Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
+Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
+Auto-merging drivers/gpu/drm/radeon/radeon_device.c
+Merge made by the 'ort' strategy.
+ Documentation/gpu/amdgpu/amdgpu-glossary.rst       |     2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h                |     5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c         |     9 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c   |    20 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c        |   107 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |    20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c          |     9 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.c            |    10 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c            |   104 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h            |     8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c         |     4 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c            |    50 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             |     8 +
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c             |    82 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c             |   263 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c             |    17 +-
+ drivers/gpu/drm/amd/amdgpu/mes_v10_1.c             |   116 +-
+ drivers/gpu/drm/amd/amdgpu/mes_v11_0.c             |   133 +-
+ drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c              |    12 +-
+ drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c              |    12 +-
+ drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c              |    12 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c             |    79 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c             |   131 +-
+ drivers/gpu/drm/amd/amdgpu/soc21.c                 |     8 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c            |     2 +
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  |    11 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.c               |    14 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |   222 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h  |     8 +
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c  |    11 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c |     1 +
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c    |    19 +
+ drivers/gpu/drm/amd/display/dc/Makefile            |     2 +-
+ drivers/gpu/drm/amd/display/dc/basics/vector.c     |     2 -
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c |    48 +-
+ .../amd/display/dc/bios/command_table_helper2.c    |     1 +
+ drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile    |     9 +
+ drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c   |    28 +-
+ .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c        |     8 +-
+ .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c |     7 +-
+ .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c   |     8 +-
+ .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c |   751 +
+ .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.h |    57 +
+ .../drm/amd/display/dc/clk_mgr/dcn314/dcn314_smu.c |   391 +
+ .../drm/amd/display/dc/clk_mgr/dcn314/dcn314_smu.h |    79 +
+ .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c |     7 +-
+ .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c |     8 +-
+ .../drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.c |     8 +-
+ .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c   |     2 +
+ .../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.c       |     5 +-
+ drivers/gpu/drm/amd/display/dc/core/dc.c           |   541 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_debug.c     |     2 +
+ .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c  |     2 -
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c      |    55 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c  |     9 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c   |    54 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c |    58 +-
+ .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c  |    32 +
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c  |   208 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_sink.c      |     2 -
+ drivers/gpu/drm/amd/display/dc/core/dc_stream.c    |     3 -
+ drivers/gpu/drm/amd/display/dc/core/dc_surface.c   |     2 -
+ drivers/gpu/drm/amd/display/dc/dc.h                |    41 +-
+ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c       |   419 +
+ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h       |     4 +
+ drivers/gpu/drm/amd/display/dc/dc_hw_types.h       |     2 +
+ drivers/gpu/drm/amd/display/dc/dc_link.h           |     2 +
+ drivers/gpu/drm/amd/display/dc/dc_stream.h         |    24 +-
+ drivers/gpu/drm/amd/display/dc/dc_types.h          |     8 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_audio.c     |    13 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_aux.c       |     8 +-
+ .../gpu/drm/amd/display/dc/dce/dce_clock_source.c  |     2 -
+ .../gpu/drm/amd/display/dc/dce/dce_clock_source.h  |     5 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c      |     3 -
+ drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c    |     2 -
+ drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c       |     2 -
+ .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c  |     3 -
+ drivers/gpu/drm/amd/display/dc/dce/dce_opp.c       |     2 -
+ .../drm/amd/display/dc/dce/dce_stream_encoder.c    |     5 +-
+ .../drm/amd/display/dc/dce/dce_stream_encoder.h    |    14 +-
+ .../drm/amd/display/dc/dce100/dce100_resource.c    |     2 -
+ .../drm/amd/display/dc/dce110/dce110_compressor.c  |     3 -
+ .../amd/display/dc/dce110/dce110_hw_sequencer.c    |    10 +-
+ .../amd/display/dc/dce110/dce110_opp_regamma_v.c   |     2 -
+ .../drm/amd/display/dc/dce110/dce110_resource.c    |     2 -
+ .../drm/amd/display/dc/dce110/dce110_transform_v.c |     2 -
+ .../drm/amd/display/dc/dce112/dce112_compressor.c  |     3 -
+ .../drm/amd/display/dc/dce112/dce112_resource.c    |     2 -
+ .../drm/amd/display/dc/dce120/dce120_resource.c    |     2 -
+ .../gpu/drm/amd/display/dc/dce80/dce80_resource.c  |     2 -
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c   |     2 +
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c    |     2 -
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c  |     3 +
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c  |     6 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c   |     2 -
+ .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c  |     3 -
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c   |     2 -
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c  |     2 -
+ .../amd/display/dc/dcn10/dcn10_stream_encoder.c    |     5 +-
+ .../amd/display/dc/dcn10/dcn10_stream_encoder.h    |    17 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c   |     2 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c   |    17 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h   |   219 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c  |     3 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c |   116 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c  |    12 +-
+ .../amd/display/dc/dcn20/dcn20_stream_encoder.c    |     1 -
+ .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c  |     2 +-
+ .../display/dc/dcn30/dcn30_dio_stream_encoder.c    |     4 +-
+ .../display/dc/dcn30/dcn30_dio_stream_encoder.h    |     6 +-
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c   |     2 +
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c |    22 +-
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h   |   106 +-
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c  |     5 +
+ .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c  |   172 +-
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c  |    16 +-
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h  |    35 +
+ .../amd/display/dc/dcn31/dcn31_dio_link_encoder.h  |    28 +
+ .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c  |     5 +-
+ drivers/gpu/drm/amd/display/dc/dcn314/Makefile     |    43 +
+ .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c    |   265 +
+ .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.h    |   158 +
+ .../display/dc/dcn314/dcn314_dio_stream_encoder.c  |   448 +
+ .../display/dc/dcn314/dcn314_dio_stream_encoder.h  |   311 +
+ .../gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c   |   340 +
+ .../gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.h   |    40 +
+ .../gpu/drm/amd/display/dc/dcn314/dcn314_init.c    |   158 +
+ .../gpu/drm/amd/display/dc/dcn314/dcn314_init.h    |    34 +
+ .../gpu/drm/amd/display/dc/dcn314/dcn314_optc.c    |   239 +
+ .../gpu/drm/amd/display/dc/dcn314/dcn314_optc.h    |   255 +
+ .../drm/amd/display/dc/dcn314/dcn314_resource.c    |  2356 +
+ .../drm/amd/display/dc/dcn314/dcn314_resource.h    |    43 +
+ .../drm/amd/display/dc/dcn315/dcn315_resource.c    |     1 +
+ .../drm/amd/display/dc/dcn316/dcn316_resource.c    |     1 +
+ drivers/gpu/drm/amd/display/dc/dcn32/Makefile      |    13 +-
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c  |     4 +
+ .../display/dc/dcn32/dcn32_dio_stream_encoder.c    |    20 +-
+ .../display/dc/dcn32/dcn32_dio_stream_encoder.h    |     1 +
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c |   247 +-
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h |    21 +
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c  |    12 +-
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.c   |   236 +-
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.h   |   117 +-
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c  |     2 +-
+ .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c  |   684 +-
+ .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h  |    20 +-
+ .../amd/display/dc/dcn32/dcn32_resource_helpers.c  |   260 +
+ .../drm/amd/display/dc/dcn321/dcn321_resource.c    |   526 +-
+ .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c   |     6 +
+ .../gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c   |     2 +
+ .../amd/display/dc/dml/dcn30/display_mode_vba_30.c |    21 +-
+ .../amd/display/dc/dml/dcn30/display_mode_vba_30.h |    11 +
+ .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c  |    93 +-
+ .../amd/display/dc/dml/dcn31/display_mode_vba_31.c |   107 +-
+ .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c  |    91 +-
+ .../display/dc/dml/dcn314/display_mode_vba_314.c   |  7420 +++
+ .../display/dc/dml/dcn314/display_mode_vba_314.h   |    44 +
+ .../dc/dml/dcn314/display_rq_dlg_calc_314.c        |  1733 +
+ .../dc/dml/dcn314/display_rq_dlg_calc_314.h        |    70 +
+ .../amd/display/dc/dml/dcn32/display_mode_vba_32.c |    31 +-
+ .../dc/dml/dcn32/display_mode_vba_util_32.c        |     2 +-
+ .../drm/amd/display/dc/dml/display_mode_structs.h  |     3 +
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.c  |    18 +-
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.h  |    44 +-
+ drivers/gpu/drm/amd/display/dc/gpio/gpio_base.c    |     2 -
+ drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c |     2 -
+ drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c       |     3 -
+ drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c   |     3 +-
+ drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c       |     2 -
+ drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c |     1 +
+ drivers/gpu/drm/amd/display/dc/inc/core_status.h   |     1 +
+ drivers/gpu/drm/amd/display/dc/inc/core_types.h    |    42 +-
+ drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h    |     8 +-
+ .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h |     1 +
+ drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h  |     7 +
+ .../drm/amd/display/dc/inc/hw_sequencer_private.h  |     2 +
+ drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h  |     5 +
+ drivers/gpu/drm/amd/display/dc/irq/Makefile        |    10 +
+ .../amd/display/dc/irq/dce110/irq_service_dce110.c |     2 -
+ .../amd/display/dc/irq/dce120/irq_service_dce120.c |     2 -
+ .../amd/display/dc/irq/dce80/irq_service_dce80.c   |     2 -
+ .../amd/display/dc/irq/dcn10/irq_service_dcn10.c   |     2 -
+ .../amd/display/dc/irq/dcn314/irq_service_dcn314.c |   434 +
+ .../amd/display/dc/irq/dcn314/irq_service_dcn314.h |    35 +
+ drivers/gpu/drm/amd/display/dc/irq/irq_service.c   |     2 -
+ drivers/gpu/drm/amd/display/dc/os_types.h          |     3 +-
+ .../amd/display/dc/virtual/virtual_link_encoder.c  |     2 -
+ .../display/dc/virtual/virtual_stream_encoder.c    |     2 -
+ drivers/gpu/drm/amd/display/dmub/dmub_srv.h        |     1 +
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h    |   114 +-
+ .../drm/amd/display/dmub/inc/dmub_subvp_state.h    |   183 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c    |     1 +
+ drivers/gpu/drm/amd/display/include/dal_asic_id.h  |     1 +
+ drivers/gpu/drm/amd/display/include/dal_types.h    |     1 +
+ .../gpu/drm/amd/display/include/set_mode_types.h   |     8 +-
+ .../drm/amd/display/modules/color/color_gamma.c    |     3 -
+ .../drm/amd/display/modules/freesync/freesync.c    |     2 -
+ .../drm/amd/display/modules/power/power_helpers.c  |    33 +-
+ drivers/gpu/drm/amd/include/amd_shared.h           |     1 +
+ .../amd/include/asic_reg/clk/clk_11_0_1_offset.h   |     0
+ .../amd/include/asic_reg/clk/clk_11_0_1_sh_mask.h  |     0
+ .../drm/amd/include/asic_reg/dce/dce_6_0_sh_mask.h |     2 +
+ .../amd/include/asic_reg/dcn/dcn_2_0_3_offset.h    |     0
+ .../amd/include/asic_reg/dcn/dcn_2_0_3_sh_mask.h   |     0
+ .../amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h   |     2 +
+ .../amd/include/asic_reg/dcn/dcn_3_0_1_sh_mask.h   |     2 +
+ .../amd/include/asic_reg/dcn/dcn_3_0_2_sh_mask.h   |     2 +
+ .../amd/include/asic_reg/dcn/dcn_3_0_3_sh_mask.h   |     2 +
+ .../amd/include/asic_reg/dcn/dcn_3_1_2_sh_mask.h   |     2 +
+ .../amd/include/asic_reg/dcn/dcn_3_1_4_offset.h    | 15245 +++++
+ .../amd/include/asic_reg/dcn/dcn_3_1_4_sh_mask.h   | 61832 +++++++++++++++++++
+ .../amd/include/asic_reg/dpcs/dpcs_2_0_3_offset.h  |     0
+ .../amd/include/asic_reg/dpcs/dpcs_2_0_3_sh_mask.h |     0
+ .../amd/include/asic_reg/dpcs/dpcs_3_1_4_offset.h  |  7215 +++
+ .../amd/include/asic_reg/dpcs/dpcs_3_1_4_sh_mask.h | 55194 +++++++++++++++++
+ drivers/gpu/drm/amd/include/mes_v11_api_def.h      |     6 +-
+ .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h |     3 +-
+ .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_7_ppsmc.h   |     9 +-
+ drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h       |     1 +
+ drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h       |     2 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c     |     2 +
+ drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c   |    38 +
+ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c     |    26 +-
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c   |     2 +
+ drivers/gpu/drm/radeon/radeon_device.c             |     2 +-
+ include/uapi/linux/kfd_ioctl.h                     |     5 +-
+ 226 files changed, 160838 insertions(+), 1534 deletions(-)
+ create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_smu.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_smu.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn314/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dccg.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dio_stream_encoder.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dio_stream_encoder.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn314/dcn314_init.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn314/dcn314_init.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn314/dcn314_optc.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn314/dcn314_optc.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn314/display_mode_vba_314.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn314/display_mode_vba_314.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn314/display_rq_dlg_calc_314.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn314/display_rq_dlg_calc_314.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn314/irq_service_dcn314.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn314/irq_service_dcn314.h
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_subvp_state.h
+ mode change 100755 => 100644 drivers/gpu/drm/amd/include/asic_reg/clk/clk_11_0_1_offset.h
+ mode change 100755 => 100644 drivers/gpu/drm/amd/include/asic_reg/clk/clk_11_0_1_sh_mask.h
+ mode change 100755 => 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_2_0_3_offset.h
+ mode change 100755 => 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_2_0_3_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_1_4_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_1_4_sh_mask.h
+ mode change 100755 => 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_2_0_3_offset.h
+ mode change 100755 => 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_2_0_3_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_3_1_4_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_3_1_4_sh_mask.h
+Merging drm-intel/for-linux-next (81cb44274c65 drm/i915: Add Wa_14016291713)
+$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next
+Auto-merging drivers/gpu/drm/i915/display/intel_fbc.c
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/i915/display/intel_cdclk.c |  4 +--
+ drivers/gpu/drm/i915/display/intel_fbc.c   |  6 ++++
+ drivers/gpu/drm/i915/display/intel_psr.c   | 53 +++++++++++++++++-------------
+ 3 files changed, 39 insertions(+), 24 deletions(-)
+Merging drm-tegra/for-next (135f4c551d51 drm/tegra: vic: Use devm_platform_ioremap_resource())
+$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next
+Already up to date.
+Merging drm-msm/msm-next (cb77085b1f0a drm/msm/dpu: Fix for non-visible planes)
+$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next
+Already up to date.
+Merging drm-msm-lumag/msm-next-lumag (1ff1da40d6fc Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu', 'msm-next-lumag-dp', 'msm-next-lumag-dsi', 'msm-next-lumag-hdmi', 'msm-next-lumag-mdp5' and 'msm-next-lumag-mdp4' into msm-next-lumag)
+$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag
+Already up to date.
+Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation)
+$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next
+Already up to date.
+Merging etnaviv/etnaviv/next (2829a9fcb738 drm/etnaviv: reap idle softpin mappings when necessary)
+$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next
+Already up to date.
+Merging fbdev/for-next (7ae7b9c5e47d video: fbdev: atari: Remove unused definitions and variables)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next
+Merge made by the 'ort' strategy.
+ Documentation/m68k/kernel-options.rst |  4 +-
+ drivers/video/fbdev/68328fb.c         |  7 +--
+ drivers/video/fbdev/amifb.c           | 15 +-----
+ drivers/video/fbdev/atafb.c           | 99 ++++++++++-------------------------
+ drivers/video/fbdev/cirrusfb.c        |  2 +-
+ drivers/video/fbdev/dnfb.c            |  2 +-
+ drivers/video/fbdev/fm2fb.c           |  4 +-
+ drivers/video/fbdev/hpfb.c            |  4 +-
+ drivers/video/fbdev/q40fb.c           |  2 +-
+ drivers/video/fbdev/sa1100fb.c        | 41 ---------------
+ drivers/video/fbdev/skeletonfb.c      |  6 +--
+ drivers/video/fbdev/valkyriefb.c      | 10 ++--
+ 12 files changed, 46 insertions(+), 150 deletions(-)
+Merging regmap/for-next (cf39ed2e8ecd regmap: add WARN_ONCE when invalid mask is provided to regmap_field_init())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next
+Merge made by the 'ort' strategy.
+ drivers/base/regmap/regcache.c   |  11 +-
+ drivers/base/regmap/regmap-irq.c | 432 ++++++++++++++++++++++++++-------------
+ drivers/base/regmap/regmap.c     |  25 +++
+ include/linux/regmap.h           | 141 ++++++++++---
+ 4 files changed, 438 insertions(+), 171 deletions(-)
+Merging sound/for-next (63f4b99f0089 ALSA: hda: cs35l41: Support Speaker ID for laptops)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next
+Auto-merging MAINTAINERS
+Auto-merging MAINTAINERS
+Auto-merging sound/core/control.c
+Auto-merging sound/core/pcm_native.c
+Auto-merging sound/core/rawmidi.c
+Auto-merging sound/pci/hda/patch_realtek.c
+Merge made by the 'ort' strategy.
+ MAINTAINERS                           |   1 +
+ include/sound/control.h               |   2 +-
+ include/sound/core.h                  |   6 +
+ include/sound/cs35l41.h               |   4 +
+ include/sound/dmaengine_pcm.h         |   2 +
+ include/sound/pcm.h                   |  50 +++-
+ include/sound/rawmidi.h               |   6 +-
+ include/uapi/sound/compress_offload.h |   2 +-
+ include/uapi/sound/compress_params.h  |   6 +-
+ sound/core/Kconfig                    |  37 ++-
+ sound/core/compress_offload.c         |   9 +-
+ sound/core/control.c                  | 283 ++++++++++++++-----
+ sound/core/device.c                   |   2 +
+ sound/core/info.c                     |   2 +
+ sound/core/init.c                     |  14 +
+ sound/core/isadma.c                   |   3 +-
+ sound/core/memalloc.c                 |  10 +-
+ sound/core/pcm.c                      |   4 +
+ sound/core/pcm_dmaengine.c            |  30 +-
+ sound/core/pcm_memory.c               |   4 +
+ sound/core/pcm_native.c               |   6 +
+ sound/core/rawmidi.c                  | 274 ++++++++++++-------
+ sound/core/vmaster.c                  |   3 +-
+ sound/hda/ext/hdac_ext_controller.c   |   7 -
+ sound/hda/hdac_controller.c           |   7 +-
+ sound/hda/trace.h                     |  41 ++-
+ sound/isa/wavefront/wavefront_synth.c |   2 -
+ sound/pci/hda/Kconfig                 |  16 +-
+ sound/pci/hda/Makefile                |   2 +
+ sound/pci/hda/cs35l41_hda.c           | 501 +++++++++++++++++++++++++++++++++-
+ sound/pci/hda/cs35l41_hda.h           |  16 ++
+ sound/pci/hda/cs35l41_hda_i2c.c       |  15 +-
+ sound/pci/hda/cs35l41_hda_spi.c       |  15 +-
+ sound/pci/hda/hda_bind.c              |   7 +
+ sound/pci/hda/hda_codec.c             |  72 ++---
+ sound/pci/hda/hda_component.h         |   1 +
+ sound/pci/hda/hda_cs_dsp_ctl.c        | 232 ++++++++++++++++
+ sound/pci/hda/hda_cs_dsp_ctl.h        |  37 +++
+ sound/pci/hda/patch_cs8409-tables.c   |   6 +-
+ sound/pci/hda/patch_cs8409.h          |   2 -
+ sound/pci/hda/patch_realtek.c         |   1 +
+ sound/soc/soc-topology.c              |   2 +-
+ sound/usb/endpoint.c                  |   2 +-
+ sound/usb/mixer_quirks.c              | 187 ++++++++++++-
+ 44 files changed, 1620 insertions(+), 311 deletions(-)
+ create mode 100644 sound/pci/hda/hda_cs_dsp_ctl.c
+ create mode 100644 sound/pci/hda/hda_cs_dsp_ctl.h
+Merging sound-asoc/for-next (c9a866cf4a53 Merge remote-tracking branch 'asoc/for-5.20' into asoc-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next
+Auto-merging Documentation/process/kernel-docs.rst
+Auto-merging MAINTAINERS
+Auto-merging drivers/base/regmap/regmap.c
+Auto-merging drivers/gpu/drm/bridge/sii902x.c
+Auto-merging drivers/gpu/drm/i2c/tda998x_drv.c
+Auto-merging drivers/gpu/drm/sti/sti_hdmi.c
+Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c
+Auto-merging drivers/media/i2c/tda1997x.c
+Auto-merging include/sound/cs35l41.h
+Auto-merging include/sound/pcm.h
+Auto-merging sound/soc/bcm/cygnus-ssp.c
+Merge made by the 'ort' strategy.
+ .../bindings/dsp/mediatek,mt8186-dsp.yaml          |   91 +
+ .../bindings/dsp/mediatek,mt8195-dsp.yaml          |   10 +-
+ .../devicetree/bindings/sound/adi,max98396.yaml    |   30 +-
+ .../sound/allwinner,sun50i-a64-codec-analog.yaml   |    5 +
+ .../bindings/sound/atmel-sam9x5-wm8731-audio.txt   |    2 +-
+ .../devicetree/bindings/sound/designware-i2s.txt   |   35 -
+ .../devicetree/bindings/sound/fsl,micfil.txt       |   33 -
+ .../devicetree/bindings/sound/fsl,micfil.yaml      |   85 +
+ .../devicetree/bindings/sound/fsl,mqs.txt          |    2 +-
+ .../devicetree/bindings/sound/fsl,spdif.yaml       |    4 +
+ .../devicetree/bindings/sound/fsl-sai.txt          |   11 +
+ .../devicetree/bindings/sound/nau8821.txt          |    2 +-
+ .../bindings/sound/nvidia,tegra210-ahub.yaml       |    4 +
+ .../bindings/sound/nvidia,tegra210-mbdrc.yaml      |   47 +
+ .../bindings/sound/nvidia,tegra210-ope.yaml        |   87 +
+ .../bindings/sound/nvidia,tegra210-peq.yaml        |   48 +
+ .../devicetree/bindings/sound/nxp,tfa989x.yaml     |    1 +
+ .../devicetree/bindings/sound/qcom,sdm845.txt      |   91 -
+ .../devicetree/bindings/sound/qcom,sm8250.yaml     |    3 +
+ .../devicetree/bindings/sound/qcom,wsa883x.yaml    |   74 +
+ .../devicetree/bindings/sound/rockchip-i2s.yaml    |    7 +
+ .../bindings/sound/snps,designware-i2s.yaml        |   94 +
+ .../devicetree/bindings/sound/tas2780.yaml         |   72 +
+ Documentation/process/kernel-docs.rst              |    2 +-
+ Documentation/sound/soc/codec.rst                  |    2 +-
+ Documentation/sound/soc/platform.rst               |    2 +-
+ MAINTAINERS                                        |    5 +
+ drivers/firmware/mtk-adsp-ipc.c                    |   36 +-
+ drivers/gpu/drm/bridge/sii902x.c                   |    5 +-
+ .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c    |    2 +-
+ drivers/gpu/drm/exynos/exynos_hdmi.c               |    8 +-
+ drivers/gpu/drm/i2c/tda998x_drv.c                  |    6 +-
+ drivers/gpu/drm/sti/sti_hdmi.c                     |    8 +-
+ drivers/gpu/drm/vc4/vc4_hdmi.c                     |    1 +
+ drivers/media/i2c/tda1997x.c                       |    1 -
+ drivers/soundwire/intel.c                          |   14 +-
+ drivers/soundwire/qcom.c                           |   10 +
+ include/dt-bindings/sound/qcom,wcd9335.h           |   15 +
+ include/linux/soundwire/sdw_intel.h                |    3 +
+ include/sound/cs35l41.h                            |    3 +
+ include/sound/hdmi-codec.h                         |    4 +-
+ include/sound/madera-pdata.h                       |    2 +-
+ include/sound/pcm.h                                |   19 +-
+ include/sound/simple_card_utils.h                  |    5 +-
+ include/sound/soc-acpi-intel-match.h               |    2 +
+ include/sound/soc-card.h                           |    1 +
+ include/sound/soc-component.h                      |    7 +-
+ include/sound/soc-dai.h                            |    6 +
+ include/sound/soc.h                                |   15 +-
+ include/sound/sof.h                                |    1 +
+ include/sound/sof/dai-amd.h                        |    7 +
+ include/sound/sof/dai.h                            |    2 +-
+ include/sound/sof/ipc4/header.h                    |    8 +
+ include/sound/sof/stream.h                         |    6 +-
+ include/uapi/sound/sof/abi.h                       |    4 +-
+ include/uapi/sound/sof/header.h                    |   30 +
+ include/uapi/sound/sof/tokens.h                    |   44 +
+ sound/pci/ens1370.c                                |    2 +-
+ sound/soc/adi/axi-i2s.c                            |    1 +
+ sound/soc/adi/axi-spdif.c                          |    1 +
+ sound/soc/amd/Kconfig                              |   12 +
+ sound/soc/amd/Makefile                             |    2 +
+ sound/soc/amd/acp-config.c                         |   30 +
+ sound/soc/amd/acp-es8336.c                         |  318 +++
+ sound/soc/amd/acp-pcm-dma.c                        |   50 +-
+ sound/soc/amd/acp.h                                |   13 +
+ sound/soc/amd/acp/Kconfig                          |   12 +
+ sound/soc/amd/acp/Makefile                         |    2 +
+ sound/soc/amd/acp/acp-i2s.c                        |  169 +-
+ sound/soc/amd/acp/acp-legacy-mach.c                |   32 +
+ sound/soc/amd/acp/acp-mach-common.c                |  301 +-
+ sound/soc/amd/acp/acp-mach.h                       |    9 +
+ sound/soc/amd/acp/acp-pci.c                        |    6 +
+ sound/soc/amd/acp/acp-pdm.c                        |   10 +-
+ sound/soc/amd/acp/acp-platform.c                   |   47 +-
+ sound/soc/amd/acp/acp-rembrandt.c                  |  401 +++
+ sound/soc/amd/acp/acp-renoir.c                     |   48 +-
+ sound/soc/amd/acp/acp-sof-mach.c                   |   30 +
+ sound/soc/amd/acp/amd.h                            |   86 +-
+ sound/soc/amd/acp/chip_offset_byte.h               |   40 +-
+ sound/soc/amd/mach-config.h                        |    1 +
+ sound/soc/amd/raven/acp3x-i2s.c                    |    3 +-
+ sound/soc/amd/renoir/acp3x-pdm-dma.c               |   13 +-
+ sound/soc/amd/vangogh/acp5x-i2s.c                  |    5 +-
+ sound/soc/amd/yc/acp6x-pdm-dma.c                   |   13 +-
+ sound/soc/atmel/atmel-classd.c                     |    1 +
+ sound/soc/atmel/atmel-i2s.c                        |    7 +-
+ sound/soc/atmel/atmel-pdmic.c                      |    1 +
+ sound/soc/atmel/atmel_ssc_dai.c                    |   25 +-
+ sound/soc/atmel/mchp-i2s-mcc.c                     |   11 +-
+ sound/soc/atmel/mchp-pdmc.c                        |    7 +-
+ sound/soc/atmel/mchp-spdifrx.c                     |    3 +-
+ sound/soc/atmel/mchp-spdiftx.c                     |    3 +-
+ sound/soc/atmel/mikroe-proto.c                     |    4 +-
+ sound/soc/au1x/ac97c.c                             |    3 +-
+ sound/soc/au1x/i2sc.c                              |    5 +-
+ sound/soc/au1x/psc-ac97.c                          |    3 +-
+ sound/soc/au1x/psc-i2s.c                           |    7 +-
+ sound/soc/bcm/bcm2835-i2s.c                        |   23 +-
+ sound/soc/bcm/bcm63xx-i2s-whistler.c               |    1 +
+ sound/soc/bcm/cygnus-ssp.c                         |   11 +-
+ sound/soc/cirrus/ep93xx-ac97.c                     |    3 +-
+ sound/soc/cirrus/ep93xx-i2s.c                      |   11 +-
+ sound/soc/codecs/88pm860x-codec.c                  |    1 -
+ sound/soc/codecs/Kconfig                           |   28 +
+ sound/soc/codecs/Makefile                          |    6 +
+ sound/soc/codecs/ab8500-codec.c                    |    3 -
+ sound/soc/codecs/ab8500-codec.h                    |    2 -
+ sound/soc/codecs/ac97.c                            |    1 -
+ sound/soc/codecs/ad1836.c                          |    1 -
+ sound/soc/codecs/ad193x.c                          |    1 -
+ sound/soc/codecs/ad1980.c                          |    1 -
+ sound/soc/codecs/ad73311.c                         |    1 -
+ sound/soc/codecs/adau1373.c                        |    1 -
+ sound/soc/codecs/adau1701.c                        |    1 -
+ sound/soc/codecs/adau1761.c                        |    1 -
+ sound/soc/codecs/adau1781.c                        |    1 -
+ sound/soc/codecs/adau1977.c                        |    1 -
+ sound/soc/codecs/adau7002.c                        |    1 -
+ sound/soc/codecs/adau7118.c                        |    1 -
+ sound/soc/codecs/adav80x.c                         |    1 -
+ sound/soc/codecs/ads117x.c                         |    1 -
+ sound/soc/codecs/ak4104.c                          |    1 -
+ sound/soc/codecs/ak4118.c                          |    1 -
+ sound/soc/codecs/ak4375.c                          |    1 -
+ sound/soc/codecs/ak4458.c                          |    2 -
+ sound/soc/codecs/ak4535.c                          |    1 -
+ sound/soc/codecs/ak4554.c                          |    1 -
+ sound/soc/codecs/ak4613.c                          |    7 -
+ sound/soc/codecs/ak4641.c                          |    1 -
+ sound/soc/codecs/ak4642.c                          |    1 -
+ sound/soc/codecs/ak4671.c                          |    1 -
+ sound/soc/codecs/ak5386.c                          |    1 -
+ sound/soc/codecs/ak5558.c                          |    2 -
+ sound/soc/codecs/alc5623.c                         |    1 -
+ sound/soc/codecs/alc5632.c                         |    1 -
+ sound/soc/codecs/bd28623.c                         |    1 -
+ sound/soc/codecs/bt-sco.c                          |    1 -
+ sound/soc/codecs/cpcap.c                           |    1 -
+ sound/soc/codecs/cq93vc.c                          |    1 -
+ sound/soc/codecs/cros_ec_codec.c                   |    1 +
+ sound/soc/codecs/cs35l32.c                         |    1 -
+ sound/soc/codecs/cs35l33.c                         |    1 -
+ sound/soc/codecs/cs35l34.c                         |    1 -
+ sound/soc/codecs/cs35l35.c                         |    1 -
+ sound/soc/codecs/cs35l36.c                         |    1 -
+ sound/soc/codecs/cs35l41-lib.c                     |   82 +-
+ sound/soc/codecs/cs35l41-spi.c                     |    1 +
+ sound/soc/codecs/cs35l41.c                         |   71 +-
+ sound/soc/codecs/cs35l45-i2c.c                     |    4 +-
+ sound/soc/codecs/cs35l45.c                         |    6 +-
+ sound/soc/codecs/cs35l45.h                         |    4 +-
+ sound/soc/codecs/cs4234.c                          |    1 -
+ sound/soc/codecs/cs4265.c                          |    1 -
+ sound/soc/codecs/cs4270.c                          |    2 -
+ sound/soc/codecs/cs4271.c                          |    1 -
+ sound/soc/codecs/cs42l42.c                         |    4 +-
+ sound/soc/codecs/cs42l51.c                         |    1 -
+ sound/soc/codecs/cs42l52.c                         |    1 -
+ sound/soc/codecs/cs42l56.c                         |    1 -
+ sound/soc/codecs/cs42l73.c                         |    1 -
+ sound/soc/codecs/cs42xx8.c                         |    1 -
+ sound/soc/codecs/cs43130.c                         |    1 -
+ sound/soc/codecs/cs4341.c                          |    1 -
+ sound/soc/codecs/cs4349.c                          |    1 -
+ sound/soc/codecs/cs47l15.c                         |    1 -
+ sound/soc/codecs/cs47l24.c                         |    1 -
+ sound/soc/codecs/cs47l35.c                         |    1 -
+ sound/soc/codecs/cs47l85.c                         |    1 -
+ sound/soc/codecs/cs47l90.c                         |    1 -
+ sound/soc/codecs/cs47l92.c                         |    1 -
+ sound/soc/codecs/cs53l30.c                         |    1 -
+ sound/soc/codecs/cx20442.c                         |    1 -
+ sound/soc/codecs/cx2072x.c                         |   17 +-
+ sound/soc/codecs/da7210.c                          |    3 +-
+ sound/soc/codecs/da7213.c                          |    1 -
+ sound/soc/codecs/da7218.c                          |    1 -
+ sound/soc/codecs/da7219.c                          |    7 -
+ sound/soc/codecs/da732x.c                          |    7 -
+ sound/soc/codecs/da9055.c                          |    1 -
+ sound/soc/codecs/dmic.c                            |    1 -
+ sound/soc/codecs/es7134.c                          |    1 -
+ sound/soc/codecs/es7241.c                          |    1 -
+ sound/soc/codecs/es8316.c                          |   21 +-
+ sound/soc/codecs/es8328.c                          |    1 -
+ sound/soc/codecs/gtm601.c                          |    1 -
+ sound/soc/codecs/hda-dai.c                         |  102 +
+ sound/soc/codecs/hda.c                             |  395 +++
+ sound/soc/codecs/hda.h                             |   19 +
+ sound/soc/codecs/hdac_hdmi.c                       |    1 -
+ sound/soc/codecs/hdmi-codec.c                      |   19 +-
+ sound/soc/codecs/ics43432.c                        |    1 -
+ sound/soc/codecs/inno_rk3036.c                     |    1 -
+ sound/soc/codecs/isabelle.c                        |    1 -
+ sound/soc/codecs/jz4740.c                          |    2 -
+ sound/soc/codecs/lm49453.c                         |    7 -
+ sound/soc/codecs/lochnagar-sc.c                    |    1 -
+ sound/soc/codecs/max98088.c                        |   33 +-
+ sound/soc/codecs/max98090.c                        |   13 +-
+ sound/soc/codecs/max98095.c                        |    1 -
+ sound/soc/codecs/max98357a.c                       |    1 -
+ sound/soc/codecs/max98371.c                        |    1 -
+ sound/soc/codecs/max98373.c                        |   16 +-
+ sound/soc/codecs/max98390.c                        |    3 +-
+ sound/soc/codecs/max98396.c                        |  271 +-
+ sound/soc/codecs/max98396.h                        |   10 +-
+ sound/soc/codecs/max9850.c                         |    1 -
+ sound/soc/codecs/max98520.c                        |    1 -
+ sound/soc/codecs/max9860.c                         |    7 +-
+ sound/soc/codecs/max9867.c                         |    1 -
+ sound/soc/codecs/max98925.c                        |    1 -
+ sound/soc/codecs/max98926.c                        |    1 -
+ sound/soc/codecs/max98927.c                        |    1 -
+ sound/soc/codecs/mc13783.c                         |    1 -
+ sound/soc/codecs/ml26124.c                         |    1 -
+ sound/soc/codecs/msm8916-wcd-analog.c              |    1 -
+ sound/soc/codecs/msm8916-wcd-digital.c             |   47 +-
+ sound/soc/codecs/mt6358.c                          |    1 +
+ sound/soc/codecs/mt6359-accdet.c                   |    1 +
+ sound/soc/codecs/mt6359.c                          |    1 +
+ sound/soc/codecs/nau8315.c                         |    1 -
+ sound/soc/codecs/nau8540.c                         |    1 -
+ sound/soc/codecs/nau8810.c                         |    1 -
+ sound/soc/codecs/nau8821.c                         |   36 +-
+ sound/soc/codecs/nau8821.h                         |    1 +
+ sound/soc/codecs/nau8822.c                         |   15 +-
+ sound/soc/codecs/nau8822.h                         |    2 +
+ sound/soc/codecs/nau8824.c                         |    1 -
+ sound/soc/codecs/nau8825.c                         |    3 +-
+ sound/soc/codecs/pcm1681.c                         |    1 -
+ sound/soc/codecs/pcm1789.c                         |    1 -
+ sound/soc/codecs/pcm179x.c                         |    1 -
+ sound/soc/codecs/pcm186x.c                         |    2 -
+ sound/soc/codecs/pcm3008.c                         |    1 -
+ sound/soc/codecs/pcm3168a.c                        |    1 -
+ sound/soc/codecs/pcm5102a.c                        |    1 -
+ sound/soc/codecs/pcm512x.c                         |    1 -
+ sound/soc/codecs/rk3328_codec.c                    |    6 +-
+ sound/soc/codecs/rk817_codec.c                     |    1 -
+ sound/soc/codecs/rt1011.c                          |    1 -
+ sound/soc/codecs/rt1015.c                          |    1 -
+ sound/soc/codecs/rt1015p.c                         |    1 -
+ sound/soc/codecs/rt1016.c                          |    1 -
+ sound/soc/codecs/rt1019.c                          |    1 -
+ sound/soc/codecs/rt1305.c                          |    1 -
+ sound/soc/codecs/rt1308-sdw.c                      |   12 +
+ sound/soc/codecs/rt1308.c                          |    1 -
+ sound/soc/codecs/rt1316-sdw.c                      |   12 +
+ sound/soc/codecs/rt274.c                           |   11 +-
+ sound/soc/codecs/rt286.c                           |   19 +-
+ sound/soc/codecs/rt286.h                           |    2 -
+ sound/soc/codecs/rt298.c                           |   61 +-
+ sound/soc/codecs/rt298.h                           |    2 -
+ sound/soc/codecs/rt5514.c                          |    1 -
+ sound/soc/codecs/rt5616.c                          |    1 -
+ sound/soc/codecs/rt5631.c                          |    1 -
+ sound/soc/codecs/rt5640.c                          |   13 +-
+ sound/soc/codecs/rt5645.c                          |    1 -
+ sound/soc/codecs/rt5651.c                          |    1 -
+ sound/soc/codecs/rt5659.c                          |    1 -
+ sound/soc/codecs/rt5660.c                          |    1 -
+ sound/soc/codecs/rt5663.c                          |    1 -
+ sound/soc/codecs/rt5665.c                          |    1 -
+ sound/soc/codecs/rt5668.c                          |    1 -
+ sound/soc/codecs/rt5670.c                          |    1 -
+ sound/soc/codecs/rt5677.c                          |    1 -
+ sound/soc/codecs/rt5682.c                          |    1 -
+ sound/soc/codecs/rt5682s.c                         |    1 -
+ sound/soc/codecs/rt700.c                           |    5 +
+ sound/soc/codecs/rt711-sdca.c                      |    5 +
+ sound/soc/codecs/rt711.c                           |    5 +
+ sound/soc/codecs/rt715-sdca.c                      |   12 +
+ sound/soc/codecs/rt715.c                           |   12 +
+ sound/soc/codecs/sgtl5000.c                        |    1 -
+ sound/soc/codecs/si476x.c                          |    1 -
+ sound/soc/codecs/spdif_receiver.c                  |    1 -
+ sound/soc/codecs/spdif_transmitter.c               |    1 -
+ sound/soc/codecs/ssm2518.c                         |    5 +-
+ sound/soc/codecs/ssm2602.c                         |    7 +-
+ sound/soc/codecs/ssm4567.c                         |    5 +-
+ sound/soc/codecs/sta32x.c                          |    5 +-
+ sound/soc/codecs/sta350.c                          |    5 +-
+ sound/soc/codecs/sta529.c                          |    1 -
+ sound/soc/codecs/stac9766.c                        |    2 -
+ sound/soc/codecs/sti-sas.c                         |    7 +-
+ sound/soc/codecs/tas2552.c                         |   13 +-
+ sound/soc/codecs/tas2562.c                         |    2 -
+ sound/soc/codecs/tas2764.c                         |    1 -
+ sound/soc/codecs/tas2770.c                         |    7 +-
+ sound/soc/codecs/tas2780.c                         |  663 +++++
+ sound/soc/codecs/tas2780.h                         |  101 +
+ sound/soc/codecs/tas5086.c                         |    3 +-
+ sound/soc/codecs/tas571x.c                         |    1 -
+ sound/soc/codecs/tas5720.c                         |    6 +-
+ sound/soc/codecs/tas5805m.c                        |    1 -
+ sound/soc/codecs/tas6424.c                         |    7 +-
+ sound/soc/codecs/tfa9879.c                         |    5 +-
+ sound/soc/codecs/tfa989x.c                         |   31 +-
+ sound/soc/codecs/tlv320adc3xxx.c                   |    3 +-
+ sound/soc/codecs/tlv320adcx140.c                   |   11 +-
+ sound/soc/codecs/tlv320aic23.c                     |    8 +-
+ sound/soc/codecs/tlv320aic26.c                     |   16 +-
+ sound/soc/codecs/tlv320aic31xx.c                   |   20 +-
+ sound/soc/codecs/tlv320aic32x4.c                   |   11 +-
+ sound/soc/codecs/tlv320aic3x.c                     |   12 +-
+ sound/soc/codecs/tlv320dac33.c                     |   13 +-
+ sound/soc/codecs/tscs42xx.c                        |    1 -
+ sound/soc/codecs/twl4030.c                         |  102 +-
+ sound/soc/codecs/twl6040.c                         |    1 -
+ sound/soc/codecs/uda1334.c                         |    3 +-
+ sound/soc/codecs/uda134x.c                         |    1 -
+ sound/soc/codecs/uda1380.c                         |    1 -
+ sound/soc/codecs/wcd-mbhc-v2.c                     |   12 +-
+ sound/soc/codecs/wcd9335.c                         |   98 +-
+ sound/soc/codecs/wl1273.c                          |    1 -
+ sound/soc/codecs/wm0010.c                          |    1 -
+ sound/soc/codecs/wm1250-ev1.c                      |    1 -
+ sound/soc/codecs/wm2000.c                          |    1 -
+ sound/soc/codecs/wm2200.c                          |    1 -
+ sound/soc/codecs/wm5100.c                          |    1 -
+ sound/soc/codecs/wm5102.c                          |    1 -
+ sound/soc/codecs/wm5110.c                          |    1 -
+ sound/soc/codecs/wm8350.c                          |    1 -
+ sound/soc/codecs/wm8400.c                          |    1 -
+ sound/soc/codecs/wm8510.c                          |    1 -
+ sound/soc/codecs/wm8523.c                          |    1 -
+ sound/soc/codecs/wm8524.c                          |    1 -
+ sound/soc/codecs/wm8580.c                          |    1 -
+ sound/soc/codecs/wm8711.c                          |    1 -
+ sound/soc/codecs/wm8727.c                          |    1 -
+ sound/soc/codecs/wm8728.c                          |    1 -
+ sound/soc/codecs/wm8731.c                          |    1 -
+ sound/soc/codecs/wm8737.c                          |    1 -
+ sound/soc/codecs/wm8741.c                          |    1 -
+ sound/soc/codecs/wm8750.c                          |    1 -
+ sound/soc/codecs/wm8753.c                          |    1 -
+ sound/soc/codecs/wm8770.c                          |    1 -
+ sound/soc/codecs/wm8776.c                          |    1 -
+ sound/soc/codecs/wm8782.c                          |    1 -
+ sound/soc/codecs/wm8804.c                          |    1 -
+ sound/soc/codecs/wm8900.c                          |    1 -
+ sound/soc/codecs/wm8903.c                          |    1 -
+ sound/soc/codecs/wm8904.c                          |    1 -
+ sound/soc/codecs/wm8940.c                          |    1 -
+ sound/soc/codecs/wm8955.c                          |    1 -
+ sound/soc/codecs/wm8960.c                          |    1 -
+ sound/soc/codecs/wm8961.c                          |    1 -
+ sound/soc/codecs/wm8962.c                          |    1 -
+ sound/soc/codecs/wm8971.c                          |    1 -
+ sound/soc/codecs/wm8974.c                          |    1 -
+ sound/soc/codecs/wm8978.c                          |    1 -
+ sound/soc/codecs/wm8983.c                          |    1 -
+ sound/soc/codecs/wm8985.c                          |    1 -
+ sound/soc/codecs/wm8988.c                          |    1 -
+ sound/soc/codecs/wm8990.c                          |    1 -
+ sound/soc/codecs/wm8991.c                          |    1 -
+ sound/soc/codecs/wm8993.c                          |    1 -
+ sound/soc/codecs/wm8994.c                          |    1 -
+ sound/soc/codecs/wm8995.c                          |    1 -
+ sound/soc/codecs/wm8996.c                          |    2 -
+ sound/soc/codecs/wm8997.c                          |    1 -
+ sound/soc/codecs/wm8998.c                          |    1 -
+ sound/soc/codecs/wm9081.c                          |    1 -
+ sound/soc/codecs/wm9090.c                          |    1 -
+ sound/soc/codecs/wm9705.c                          |    1 -
+ sound/soc/codecs/wm9712.c                          |    1 -
+ sound/soc/codecs/wm9713.c                          |    1 -
+ sound/soc/codecs/wm_adsp.c                         |   25 +-
+ sound/soc/codecs/wsa881x.c                         |   16 +-
+ sound/soc/codecs/wsa883x.c                         | 1511 ++++++++++
+ sound/soc/codecs/zl38060.c                         |    1 -
+ sound/soc/dwc/dwc-i2s.c                            |   15 +-
+ sound/soc/fsl/Kconfig                              |    3 +
+ sound/soc/fsl/fsl_asrc_dma.c                       |   19 +-
+ sound/soc/fsl/fsl_aud2htx.c                        |    3 +-
+ sound/soc/fsl/fsl_audmix.c                         |    6 +-
+ sound/soc/fsl/fsl_easrc.c                          |    7 +-
+ sound/soc/fsl/fsl_esai.c                           |   11 +-
+ sound/soc/fsl/fsl_micfil.c                         |   55 +-
+ sound/soc/fsl/fsl_micfil.h                         |    9 +
+ sound/soc/fsl/fsl_mqs.c                            |  136 +-
+ sound/soc/fsl/fsl_rpmsg.c                          |    3 +-
+ sound/soc/fsl/fsl_sai.c                            |  375 ++-
+ sound/soc/fsl/fsl_sai.h                            |   28 +-
+ sound/soc/fsl/fsl_spdif.c                          |   51 +-
+ sound/soc/fsl/fsl_ssi.c                            |   23 +-
+ sound/soc/fsl/fsl_utils.c                          |   69 +
+ sound/soc/fsl/fsl_utils.h                          |    7 +
+ sound/soc/fsl/fsl_xcvr.c                           |   12 +-
+ sound/soc/fsl/imx-audmix.c                         |    4 +-
+ sound/soc/fsl/imx-audmux.c                         |   24 +-
+ sound/soc/fsl/imx-card.c                           |   16 +-
+ sound/soc/fsl/mpc5200_psc_i2s.c                    |    3 +-
+ sound/soc/fsl/pcm030-audio-fabric.c                |    8 +-
+ .../generic/audio-graph-card2-custom-sample.dtsi   |  101 +-
+ sound/soc/generic/audio-graph-card2.c              |   74 +-
+ sound/soc/generic/simple-card-utils.c              |   44 +-
+ sound/soc/generic/test-component.c                 |   20 +-
+ sound/soc/hisilicon/hi6210-i2s.c                   |   19 +-
+ sound/soc/img/img-i2s-in.c                         |    7 +-
+ sound/soc/img/img-i2s-out.c                        |   21 +-
+ sound/soc/img/img-parallel-out.c                   |    3 +-
+ sound/soc/img/img-spdif-in.c                       |    3 +-
+ sound/soc/img/img-spdif-out.c                      |    3 +-
+ sound/soc/img/pistachio-internal-dac.c             |    1 -
+ sound/soc/intel/Kconfig                            |    5 +-
+ sound/soc/intel/atom/sst-atom-controls.c           |    8 +-
+ sound/soc/intel/atom/sst/sst.c                     |    2 +-
+ sound/soc/intel/atom/sst/sst_ipc.c                 |    8 +-
+ sound/soc/intel/avs/Makefile                       |    3 +
+ sound/soc/intel/avs/boards/Kconfig                 |  121 +
+ sound/soc/intel/avs/boards/Makefile                |   27 +
+ sound/soc/intel/avs/boards/da7219.c                |  282 ++
+ sound/soc/intel/avs/boards/dmic.c                  |   93 +
+ sound/soc/intel/avs/boards/hdaudio.c               |  294 ++
+ sound/soc/intel/avs/boards/i2s_test.c              |  180 ++
+ sound/soc/intel/avs/boards/max98357a.c             |  154 ++
+ sound/soc/intel/avs/boards/max98373.c              |  239 ++
+ sound/soc/intel/avs/boards/nau8825.c               |  353 +++
+ sound/soc/intel/avs/boards/rt274.c                 |  310 +++
+ sound/soc/intel/avs/boards/rt286.c                 |  281 ++
+ sound/soc/intel/avs/boards/rt298.c                 |  281 ++
+ sound/soc/intel/avs/boards/rt5682.c                |  340 +++
+ sound/soc/intel/avs/boards/ssm4567.c               |  271 ++
+ sound/soc/intel/avs/cldma.c                        |   12 +-
+ sound/soc/intel/avs/core.c                         |   13 +-
+ sound/soc/intel/avs/dsp.c                          |   11 +-
+ sound/soc/intel/avs/ipc.c                          |    1 +
+ sound/soc/intel/avs/loader.c                       |    2 +-
+ sound/soc/intel/avs/messages.c                     |   18 +-
+ sound/soc/intel/avs/pcm.c                          |    2 -
+ sound/soc/intel/avs/topology.c                     |   27 +
+ sound/soc/intel/boards/Kconfig                     |    5 +-
+ sound/soc/intel/boards/Makefile                    |    4 +-
+ sound/soc/intel/boards/bdw_rt286.c                 |  279 ++
+ sound/soc/intel/boards/broadwell.c                 |  336 ---
+ sound/soc/intel/boards/bxt_da7219_max98357a.c      |   21 +-
+ sound/soc/intel/boards/bxt_rt298.c                 |    2 +-
+ sound/soc/intel/boards/bytcht_cx2072x.c            |    2 +-
+ sound/soc/intel/boards/bytcht_da7213.c             |    2 +-
+ sound/soc/intel/boards/bytcht_es8316.c             |    2 +-
+ sound/soc/intel/boards/bytcht_nocodec.c            |    2 +-
+ sound/soc/intel/boards/bytcr_rt5640.c              |    4 +-
+ sound/soc/intel/boards/bytcr_rt5651.c              |    4 +-
+ sound/soc/intel/boards/bytcr_wm5102.c              |    2 +-
+ sound/soc/intel/boards/cht_bsw_max98090_ti.c       |    3 +-
+ sound/soc/intel/boards/cht_bsw_rt5645.c            |    8 +-
+ sound/soc/intel/boards/cht_bsw_rt5672.c            |    2 +-
+ sound/soc/intel/boards/cml_rt1011_rt5682.c         |   23 +-
+ sound/soc/intel/boards/glk_rt5682_max98357a.c      |   21 +-
+ sound/soc/intel/boards/haswell.c                   |  202 --
+ sound/soc/intel/boards/hda_dsp_common.c            |    4 +-
+ sound/soc/intel/boards/hsw_rt5640.c                |  176 ++
+ sound/soc/intel/boards/kbl_da7219_max98357a.c      |   21 +-
+ sound/soc/intel/boards/kbl_da7219_max98927.c       |   21 +-
+ sound/soc/intel/boards/kbl_rt5663_max98927.c       |   21 +-
+ .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c  |   21 +-
+ sound/soc/intel/boards/skl_hda_dsp_generic.c       |    4 +-
+ sound/soc/intel/boards/skl_nau88l25_max98357a.c    |   19 +-
+ sound/soc/intel/boards/skl_nau88l25_ssm4567.c      |   19 +-
+ sound/soc/intel/boards/skl_rt286.c                 |    2 +-
+ sound/soc/intel/boards/sof_cs42l42.c               |  109 +-
+ sound/soc/intel/boards/sof_da7219_max98373.c       |   23 +-
+ sound/soc/intel/boards/sof_nau8825.c               |   23 +-
+ sound/soc/intel/boards/sof_pcm512x.c               |    2 +-
+ sound/soc/intel/boards/sof_realtek_common.c        |   24 +-
+ sound/soc/intel/boards/sof_realtek_common.h        |    6 +-
+ sound/soc/intel/boards/sof_rt5682.c                |   25 +-
+ sound/soc/intel/boards/sof_sdw.c                   |   34 +-
+ sound/soc/intel/catpt/device.c                     |    5 +-
+ sound/soc/intel/catpt/pcm.c                        |   26 +-
+ sound/soc/intel/catpt/sysfs.c                      |    4 +-
+ sound/soc/intel/common/Makefile                    |    1 +
+ sound/soc/intel/common/soc-acpi-intel-adl-match.c  |    7 +
+ .../intel/common/soc-acpi-intel-hsw-bdw-match.c    |    6 +-
+ sound/soc/intel/common/soc-acpi-intel-mtl-match.c  |   72 +
+ sound/soc/intel/keembay/kmb_platform.c             |   18 +-
+ sound/soc/intel/skylake/skl-pcm.c                  |    5 +-
+ sound/soc/intel/skylake/skl-topology.c             |    6 -
+ sound/soc/jz4740/Kconfig                           |    2 +-
+ sound/soc/jz4740/jz4740-i2s.c                      |   43 +-
+ sound/soc/mediatek/mt6797/mt6797-mt6351.c          |    6 +-
+ sound/soc/mediatek/mt8173/mt8173-afe-pcm.c         |    6 +-
+ sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c   |   10 +-
+ sound/soc/mediatek/mt8173/mt8173-rt5650.c          |    9 +-
+ sound/soc/mediatek/mt8186/mt8186-afe-clk.c         |  651 +++++
+ sound/soc/mediatek/mt8186/mt8186-afe-clk.h         |  106 +
+ sound/soc/mediatek/mt8186/mt8186-afe-gpio.c        |  243 ++
+ sound/soc/mediatek/mt8186/mt8186-afe-gpio.h        |   19 +
+ sound/soc/mediatek/mt8186/mt8186-audsys-clk.c      |  150 +
+ sound/soc/mediatek/mt8186/mt8186-audsys-clk.h      |   15 +
+ sound/soc/mediatek/mt8186/mt8186-audsys-clkid.h    |   45 +
+ sound/soc/mediatek/mt8186/mt8186-dai-adda.c        |  871 ++++++
+ sound/soc/mediatek/mt8186/mt8186-dai-hostless.c    |  298 ++
+ sound/soc/mediatek/mt8186/mt8186-dai-hw-gain.c     |  236 ++
+ sound/soc/mediatek/mt8186/mt8186-dai-i2s.c         | 1286 +++++++++
+ sound/soc/mediatek/mt8186/mt8186-dai-pcm.c         |  423 +++
+ sound/soc/mediatek/mt8186/mt8186-dai-src.c         |  695 +++++
+ sound/soc/mediatek/mt8186/mt8186-dai-tdm.c         |  698 +++++
+ sound/soc/mediatek/mt8186/mt8186-interconnection.h |   69 +
+ sound/soc/mediatek/mt8186/mt8186-misc-control.c    |  252 ++
+ sound/soc/mediatek/mt8186/mt8186-reg.h             | 2913 ++++++++++++++++++++
+ sound/soc/mediatek/mt8195/mt8195-afe-clk.c         |    8 +-
+ sound/soc/mediatek/mt8195/mt8195-dai-etdm.c        |    6 +-
+ sound/soc/mediatek/mt8195/mt8195-dai-pcm.c         |    6 +-
+ sound/soc/meson/aiu-acodec-ctrl.c                  |    1 -
+ sound/soc/meson/aiu-codec-ctrl.c                   |    1 -
+ sound/soc/meson/aiu-encoder-i2s.c                  |    2 +-
+ sound/soc/meson/axg-frddr.c                        |    3 +
+ sound/soc/meson/axg-pdm.c                          |    4 +-
+ sound/soc/meson/axg-spdifin.c                      |    1 +
+ sound/soc/meson/axg-spdifout.c                     |    1 +
+ sound/soc/meson/axg-tdm-interface.c                |   14 +-
+ sound/soc/meson/axg-toddr.c                        |    3 +
+ sound/soc/meson/g12a-toacodec.c                    |    2 -
+ sound/soc/meson/g12a-tohdmitx.c                    |    1 -
+ sound/soc/meson/meson-codec-glue.c                 |    2 +-
+ sound/soc/meson/t9015.c                            |    1 -
+ sound/soc/mxs/mxs-saif.c                           |    7 +-
+ sound/soc/pxa/magician.c                           |    8 +-
+ sound/soc/pxa/mmp-sspa.c                           |   15 +-
+ sound/soc/pxa/pxa-ssp.c                            |   43 +-
+ sound/soc/pxa/pxa2xx-i2s.c                         |   27 +-
+ sound/soc/qcom/apq8016_sbc.c                       |    2 +-
+ sound/soc/qcom/lpass-apq8016.c                     |    1 +
+ sound/soc/qcom/lpass-cpu.c                         |    7 +
+ sound/soc/qcom/qdsp6/audioreach.c                  |    4 +-
+ sound/soc/qcom/qdsp6/q6adm.c                       |    6 +-
+ sound/soc/qcom/qdsp6/q6afe.c                       |    6 +-
+ sound/soc/qcom/qdsp6/q6asm-dai.c                   |   23 +-
+ sound/soc/qcom/sc7180.c                            |    2 +-
+ sound/soc/qcom/sc7280.c                            |   33 +
+ sound/soc/qcom/sdm845.c                            |    6 +-
+ sound/soc/qcom/sm8250.c                            |    4 +-
+ sound/soc/rockchip/rk3288_hdmi_analog.c            |    4 +-
+ sound/soc/rockchip/rockchip_i2s.c                  |  182 +-
+ sound/soc/rockchip/rockchip_i2s_tdm.c              |   13 +-
+ sound/soc/rockchip/rockchip_pdm.c                  |    7 +-
+ sound/soc/rockchip/rockchip_spdif.c                |    1 +
+ sound/soc/samsung/Kconfig                          |   20 +-
+ sound/soc/samsung/aries_wm8994.c                   |    7 +-
+ sound/soc/samsung/h1940_uda1380.c                  |    2 +-
+ sound/soc/samsung/i2s.c                            |    8 +-
+ sound/soc/samsung/neo1973_wm8753.c                 |    2 +-
+ sound/soc/samsung/pcm.c                            |    7 +-
+ sound/soc/samsung/rx1950_uda1380.c                 |    4 +-
+ sound/soc/samsung/s3c-i2s-v2.c                     |   17 +-
+ sound/soc/samsung/s3c2412-i2s.c                    |    7 +-
+ sound/soc/samsung/s3c24xx-i2s.c                    |   14 +-
+ sound/soc/samsung/snow.c                           |    2 +-
+ sound/soc/samsung/spdif.c                          |    7 +-
+ sound/soc/sh/fsi.c                                 |    6 +-
+ sound/soc/sh/hac.c                                 |    3 +-
+ sound/soc/sh/rcar/core.c                           |   30 +-
+ sound/soc/sh/rcar/ssiu.c                           |    2 +
+ sound/soc/sh/rz-ssi.c                              |   11 +-
+ sound/soc/sh/siu_pcm.c                             |   17 +-
+ sound/soc/sh/ssi.c                                 |   13 +-
+ sound/soc/soc-card.c                               |    6 +
+ sound/soc/soc-core.c                               |  167 +-
+ sound/soc/soc-dai.c                                |    3 +-
+ sound/soc/soc-dapm.c                               |   10 +-
+ sound/soc/soc-ops.c                                |   51 +-
+ sound/soc/soc-pcm.c                                |    3 +-
+ sound/soc/soc-topology-test.c                      |   37 +-
+ sound/soc/soc-utils.c                              |    1 -
+ sound/soc/sof/Kconfig                              |    7 +
+ sound/soc/sof/Makefile                             |   16 +-
+ sound/soc/sof/amd/Kconfig                          |    1 +
+ sound/soc/sof/amd/acp-dsp-offset.h                 |    2 +
+ sound/soc/sof/amd/acp.c                            |   36 +
+ sound/soc/sof/amd/acp.h                            |    4 +
+ sound/soc/sof/amd/pci-rn.c                         |    4 +
+ sound/soc/sof/amd/renoir.c                         |    4 +
+ sound/soc/sof/compress.c                           |   73 +-
+ sound/soc/sof/core.c                               |    7 +-
+ sound/soc/sof/debug.c                              |    5 +-
+ sound/soc/sof/imx/Kconfig                          |    1 +
+ sound/soc/sof/intel/Kconfig                        |   27 +
+ sound/soc/sof/intel/Makefile                       |    4 +-
+ sound/soc/sof/intel/apl.c                          |    1 +
+ sound/soc/sof/intel/bdw.c                          |    7 +-
+ sound/soc/sof/intel/byt.c                          |    5 +-
+ sound/soc/sof/intel/cnl.c                          |   39 +-
+ sound/soc/sof/intel/hda-dai.c                      |  226 +-
+ sound/soc/sof/intel/hda-dsp.c                      |   26 +-
+ sound/soc/sof/intel/hda-ipc.c                      |   39 +-
+ sound/soc/sof/intel/hda-loader.c                   |   28 +-
+ sound/soc/sof/intel/hda-stream.c                   |    6 +-
+ sound/soc/sof/intel/hda.c                          |  149 +-
+ sound/soc/sof/intel/hda.h                          |   70 +
+ sound/soc/sof/intel/icl.c                          |    1 +
+ sound/soc/sof/intel/mtl.c                          |  805 ++++++
+ sound/soc/sof/intel/mtl.h                          |   76 +
+ sound/soc/sof/intel/pci-apl.c                      |    1 +
+ sound/soc/sof/intel/pci-cnl.c                      |    1 +
+ sound/soc/sof/intel/pci-icl.c                      |    1 +
+ sound/soc/sof/intel/pci-mtl.c                      |   71 +
+ sound/soc/sof/intel/pci-tgl.c                      |    1 +
+ sound/soc/sof/intel/shim.h                         |    2 +
+ sound/soc/sof/intel/tgl.c                          |   34 +-
+ sound/soc/sof/ipc.c                                |   24 +-
+ sound/soc/sof/ipc3-dtrace.c                        |   55 +-
+ sound/soc/sof/ipc3-loader.c                        |   11 +-
+ sound/soc/sof/ipc3-pcm.c                           |    8 +-
+ sound/soc/sof/ipc3-topology.c                      |   73 +-
+ sound/soc/sof/ipc3.c                               |   36 +-
+ sound/soc/sof/ipc4-control.c                       |  216 ++
+ sound/soc/sof/ipc4-pcm.c                           |  230 ++
+ sound/soc/sof/ipc4-priv.h                          |    7 +
+ sound/soc/sof/ipc4-topology.c                      | 1811 ++++++++++++
+ sound/soc/sof/ipc4-topology.h                      |  245 ++
+ sound/soc/sof/ipc4.c                               |   45 +-
+ sound/soc/sof/mediatek/Kconfig                     |    1 +
+ sound/soc/sof/mediatek/adsp_helper.h               |    1 +
+ sound/soc/sof/mediatek/mt8186/mt8186-clk.c         |    4 +-
+ sound/soc/sof/mediatek/mt8195/mt8195-clk.c         |    7 +
+ sound/soc/sof/mediatek/mt8195/mt8195.c             |   50 +-
+ sound/soc/sof/mediatek/mt8195/mt8195.h             |    5 +
+ sound/soc/sof/ops.h                                |    6 +
+ sound/soc/sof/pcm.c                                |   13 +
+ sound/soc/sof/sof-audio.h                          |   12 +
+ sound/soc/sof/sof-client-ipc-msg-injector.c        |   29 +-
+ sound/soc/sof/sof-client-probes.c                  |    5 +
+ sound/soc/sof/sof-client.c                         |    4 +-
+ sound/soc/sof/sof-priv.h                           |   14 +-
+ sound/soc/sof/topology.c                           |  121 +-
+ sound/soc/spear/spdif_in.c                         |    3 +-
+ sound/soc/spear/spdif_out.c                        |    3 +-
+ sound/soc/sti/sti_uniperif.c                       |    3 +-
+ sound/soc/stm/stm32_adfsdm.c                       |    3 +-
+ sound/soc/stm/stm32_i2s.c                          |    9 +-
+ sound/soc/stm/stm32_sai_sub.c                      |   11 +-
+ sound/soc/stm/stm32_spdifrx.c                      |    1 +
+ sound/soc/sunxi/sun4i-codec.c                      |   85 +-
+ sound/soc/sunxi/sun4i-i2s.c                        |   23 +-
+ sound/soc/sunxi/sun4i-spdif.c                      |    3 +-
+ sound/soc/sunxi/sun50i-codec-analog.c              |    8 +
+ sound/soc/sunxi/sun8i-codec.c                      |    7 +-
+ sound/soc/tegra/Kconfig                            |    9 +
+ sound/soc/tegra/Makefile                           |    2 +
+ sound/soc/tegra/tegra20_ac97.c                     |    5 +-
+ sound/soc/tegra/tegra20_das.c                      |  198 +-
+ sound/soc/tegra/tegra20_das.h                      |  120 -
+ sound/soc/tegra/tegra20_i2s.c                      |    9 +-
+ sound/soc/tegra/tegra20_spdif.c                    |    1 +
+ sound/soc/tegra/tegra210_adx.c                     |    2 +-
+ sound/soc/tegra/tegra210_ahub.c                    |   39 +-
+ sound/soc/tegra/tegra210_i2s.c                     |    7 +-
+ sound/soc/tegra/tegra210_mbdrc.c                   | 1014 +++++++
+ sound/soc/tegra/tegra210_mbdrc.h                   |  215 ++
+ sound/soc/tegra/tegra210_ope.c                     |  419 +++
+ sound/soc/tegra/tegra210_ope.h                     |   90 +
+ sound/soc/tegra/tegra210_peq.c                     |  434 +++
+ sound/soc/tegra/tegra210_peq.h                     |   56 +
+ sound/soc/tegra/tegra30_i2s.c                      |    9 +-
+ sound/soc/ti/davinci-i2s.c                         |   35 +-
+ sound/soc/ti/davinci-mcasp.c                       |   16 +-
+ sound/soc/ti/davinci-vcif.c                        |    3 +-
+ sound/soc/ti/omap-dmic.c                           |    3 +-
+ sound/soc/ti/omap-hdmi.c                           |    1 +
+ sound/soc/ti/omap-mcbsp.c                          |   15 +-
+ sound/soc/ti/omap-mcpdm.c                          |    7 +-
+ sound/soc/uniphier/evea.c                          |    1 -
+ sound/soc/ux500/mop500.c                           |    2 -
+ sound/soc/ux500/mop500_ab8500.c                    |    2 -
+ sound/soc/ux500/mop500_ab8500.h                    |    2 -
+ sound/soc/ux500/ux500_msp_dai.c                    |   41 +-
+ sound/soc/ux500/ux500_msp_dai.h                    |    2 -
+ sound/soc/ux500/ux500_msp_i2s.c                    |    2 -
+ sound/soc/ux500/ux500_msp_i2s.h                    |    2 -
+ sound/soc/ux500/ux500_pcm.c                        |    2 -
+ sound/soc/ux500/ux500_pcm.h                        |    2 -
+ sound/soc/xilinx/xlnx_formatter_pcm.c              |   18 +-
+ sound/soc/xilinx/xlnx_i2s.c                        |    1 +
+ sound/soc/xilinx/xlnx_spdif.c                      |    1 +
+ sound/soc/xtensa/xtfpga-i2s.c                      |   19 +-
+ 677 files changed, 27918 insertions(+), 3256 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dsp/mediatek,mt8186-dsp.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/designware-i2s.txt
+ delete mode 100644 Documentation/devicetree/bindings/sound/fsl,micfil.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/fsl,micfil.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-mbdrc.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-ope.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-peq.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/qcom,sdm845.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/qcom,wsa883x.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/snps,designware-i2s.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/tas2780.yaml
+ create mode 100644 include/dt-bindings/sound/qcom,wcd9335.h
+ create mode 100644 sound/soc/amd/acp-es8336.c
+ create mode 100644 sound/soc/amd/acp/acp-rembrandt.c
+ create mode 100644 sound/soc/codecs/hda-dai.c
+ create mode 100644 sound/soc/codecs/hda.c
+ create mode 100644 sound/soc/codecs/hda.h
+ create mode 100644 sound/soc/codecs/tas2780.c
+ create mode 100644 sound/soc/codecs/tas2780.h
+ create mode 100644 sound/soc/codecs/wsa883x.c
+ create mode 100644 sound/soc/intel/avs/boards/Kconfig
+ create mode 100644 sound/soc/intel/avs/boards/Makefile
+ create mode 100644 sound/soc/intel/avs/boards/da7219.c
+ create mode 100644 sound/soc/intel/avs/boards/dmic.c
+ create mode 100644 sound/soc/intel/avs/boards/hdaudio.c
+ create mode 100644 sound/soc/intel/avs/boards/i2s_test.c
+ create mode 100644 sound/soc/intel/avs/boards/max98357a.c
+ create mode 100644 sound/soc/intel/avs/boards/max98373.c
+ create mode 100644 sound/soc/intel/avs/boards/nau8825.c
+ create mode 100644 sound/soc/intel/avs/boards/rt274.c
+ create mode 100644 sound/soc/intel/avs/boards/rt286.c
+ create mode 100644 sound/soc/intel/avs/boards/rt298.c
+ create mode 100644 sound/soc/intel/avs/boards/rt5682.c
+ create mode 100644 sound/soc/intel/avs/boards/ssm4567.c
+ create mode 100644 sound/soc/intel/boards/bdw_rt286.c
+ delete mode 100644 sound/soc/intel/boards/broadwell.c
+ delete mode 100644 sound/soc/intel/boards/haswell.c
+ create mode 100644 sound/soc/intel/boards/hsw_rt5640.c
+ create mode 100644 sound/soc/intel/common/soc-acpi-intel-mtl-match.c
+ create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-clk.c
+ create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-clk.h
+ create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-gpio.c
+ create mode 100644 sound/soc/mediatek/mt8186/mt8186-afe-gpio.h
+ create mode 100644 sound/soc/mediatek/mt8186/mt8186-audsys-clk.c
+ create mode 100644 sound/soc/mediatek/mt8186/mt8186-audsys-clk.h
+ create mode 100644 sound/soc/mediatek/mt8186/mt8186-audsys-clkid.h
+ create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-adda.c
+ create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-hostless.c
+ create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-hw-gain.c
+ create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-i2s.c
+ create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-pcm.c
+ create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-src.c
+ create mode 100644 sound/soc/mediatek/mt8186/mt8186-dai-tdm.c
+ create mode 100644 sound/soc/mediatek/mt8186/mt8186-interconnection.h
+ create mode 100644 sound/soc/mediatek/mt8186/mt8186-misc-control.c
+ create mode 100644 sound/soc/mediatek/mt8186/mt8186-reg.h
+ create mode 100644 sound/soc/sof/intel/mtl.c
+ create mode 100644 sound/soc/sof/intel/mtl.h
+ create mode 100644 sound/soc/sof/intel/pci-mtl.c
+ create mode 100644 sound/soc/sof/ipc4-control.c
+ create mode 100644 sound/soc/sof/ipc4-pcm.c
+ create mode 100644 sound/soc/sof/ipc4-topology.c
+ create mode 100644 sound/soc/sof/ipc4-topology.h
+ delete mode 100644 sound/soc/tegra/tegra20_das.h
+ create mode 100644 sound/soc/tegra/tegra210_mbdrc.c
+ create mode 100644 sound/soc/tegra/tegra210_mbdrc.h
+ create mode 100644 sound/soc/tegra/tegra210_ope.c
+ create mode 100644 sound/soc/tegra/tegra210_ope.h
+ create mode 100644 sound/soc/tegra/tegra210_peq.c
+ create mode 100644 sound/soc/tegra/tegra210_peq.h
+Merging modules/modules-next (6f1dae1d84b6 module: Show the last unloaded module's taint flag(s))
+$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging MAINTAINERS
+Auto-merging init/Kconfig
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/kernel-parameters.txt |  17 +-
+ MAINTAINERS                                     |   1 +
+ init/Kconfig                                    | 293 +-----------------------
+ kernel/module/Kconfig                           | 293 ++++++++++++++++++++++++
+ kernel/module/internal.h                        |   2 +-
+ kernel/module/kallsyms.c                        |  41 ++--
+ kernel/module/main.c                            |  43 ++--
+ kernel/module/procfs.c                          |   2 +-
+ scripts/module.lds.S                            |   2 +
+ 9 files changed, 371 insertions(+), 323 deletions(-)
+ create mode 100644 kernel/module/Kconfig
+Merging input/next (39636805cab2 dt-bindings: input: iqs7222: Use central 'linux,code' definition)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next
+Auto-merging drivers/input/touchscreen/goodix.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/input/adc-joystick.yaml    |    2 +-
+ .../devicetree/bindings/input/adc-keys.txt         |   67 -
+ .../devicetree/bindings/input/adc-keys.yaml        |  103 ++
+ .../input/allwinner,sun4i-a10-lradc-keys.yaml      |    5 +-
+ .../devicetree/bindings/input/azoteq,iqs7222.yaml  |   41 +-
+ .../bindings/input/fsl,mpr121-touchkey.yaml        |    4 +-
+ .../devicetree/bindings/input/gpio-keys.yaml       |  167 ++-
+ Documentation/devicetree/bindings/input/input.yaml |   24 +-
+ .../devicetree/bindings/input/iqs269a.yaml         |   17 +-
+ .../devicetree/bindings/input/iqs626a.yaml         |   13 +-
+ .../devicetree/bindings/input/iqs62x-keys.yaml     |    9 +-
+ .../devicetree/bindings/input/max77650-onkey.yaml  |    8 +-
+ .../bindings/input/microchip,cap11xx.yaml          |    2 +-
+ .../bindings/input/touchscreen/edt-ft5x06.yaml     |    8 +
+ drivers/input/joystick/sensehat-joystick.c         |    4 +-
+ drivers/input/keyboard/Kconfig                     |    2 +-
+ drivers/input/keyboard/adp5588-keys.c              |  206 ++--
+ drivers/input/keyboard/cros_ec_keyb.c              |   89 +-
+ drivers/input/keyboard/mt6779-keypad.c             |   18 +-
+ drivers/input/keyboard/mtk-pmic-keys.c             |   98 +-
+ drivers/input/keyboard/omap4-keypad.c              |   26 +-
+ drivers/input/misc/iqs7222.c                       |  178 ++-
+ drivers/input/mouse/cyapa_gen6.c                   |    2 +-
+ drivers/input/mouse/gpio_mouse.c                   |    2 +-
+ drivers/input/serio/i8042-x86ia64io.h              | 1282 ++++++++++++--------
+ drivers/input/touchscreen/edt-ft5x06.c             |   96 +-
+ drivers/input/touchscreen/exc3000.c                |    7 +-
+ drivers/input/touchscreen/goodix.c                 |   22 +-
+ drivers/input/touchscreen/zinitix.c                |  112 +-
+ 29 files changed, 1560 insertions(+), 1054 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/input/adc-keys.txt
+ create mode 100644 Documentation/devicetree/bindings/input/adc-keys.yaml
+Merging block/for-next (f46c4db86bee Merge branch 'for-5.20/block' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next
+Auto-merging MAINTAINERS
+Auto-merging Makefile
+Auto-merging block/bio.c
+CONFLICT (content): Merge conflict in block/bio.c
+Auto-merging block/fops.c
+CONFLICT (content): Merge conflict in block/fops.c
+Auto-merging drivers/block/mtip32xx/mtip32xx.c
+CONFLICT (content): Merge conflict in drivers/block/mtip32xx/mtip32xx.c
+Auto-merging drivers/block/pktcdvd.c
+Auto-merging drivers/mmc/core/block.c
+Auto-merging drivers/nvdimm/pmem.c
+Auto-merging drivers/scsi/fnic/fnic_scsi.c
+Auto-merging drivers/target/target_core_iblock.c
+Auto-merging drivers/ufs/core/ufshcd.c
+Auto-merging fs/btrfs/compression.c
+CONFLICT (content): Merge conflict in fs/btrfs/compression.c
+Auto-merging fs/btrfs/compression.h
+Auto-merging fs/btrfs/extent_io.c
+CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/btrfs/raid56.c
+CONFLICT (content): Merge conflict in fs/btrfs/raid56.c
+Auto-merging fs/direct-io.c
+Auto-merging fs/ext4/ext4.h
+Auto-merging fs/ext4/fast_commit.c
+Auto-merging fs/ext4/super.c
+Auto-merging fs/f2fs/data.c
+Auto-merging fs/f2fs/f2fs.h
+Auto-merging fs/f2fs/node.c
+Auto-merging fs/f2fs/segment.c
+Auto-merging fs/gfs2/dir.c
+Auto-merging fs/inode.c
+CONFLICT (modify/delete): fs/io_uring.c deleted in block/for-next and modified in HEAD.  Version HEAD of fs/io_uring.c left in tree.
+Auto-merging fs/iomap/buffered-io.c
+Auto-merging fs/iomap/direct-io.c
+Auto-merging fs/jbd2/commit.c
+Auto-merging fs/jbd2/journal.c
+Auto-merging fs/jbd2/recovery.c
+Auto-merging fs/ntfs3/file.c
+Auto-merging fs/ntfs3/fsntfs.c
+Auto-merging fs/ntfs3/inode.c
+Auto-merging fs/ntfs3/ntfs_fs.h
+Auto-merging fs/ocfs2/super.c
+Auto-merging fs/read_write.c
+Auto-merging fs/reiserfs/inode.c
+Auto-merging fs/xfs/xfs_buf.c
+Auto-merging fs/xfs/xfs_iomap.c
+Auto-merging fs/xfs/xfs_log_recover.c
+Auto-merging fs/zonefs/super.c
+Auto-merging include/linux/blkdev.h
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/jbd2.h
+Auto-merging include/linux/socket.h
+Auto-merging lib/Makefile
+Auto-merging net/socket.c
+Resolved 'block/bio.c' using previous resolution.
+Recorded preimage for 'block/fops.c'
+Resolved 'drivers/block/mtip32xx/mtip32xx.c' using previous resolution.
+Recorded preimage for 'fs/btrfs/compression.c'
+Recorded preimage for 'fs/btrfs/extent_io.c'
+Recorded preimage for 'fs/btrfs/raid56.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f fs/io_uring.c
+rm 'fs/io_uring.c'
+$ git commit --no-edit -v -a
+Recorded resolution for 'block/fops.c'.
+Recorded resolution for 'fs/btrfs/compression.c'.
+Recorded resolution for 'fs/btrfs/extent_io.c'.
+Recorded resolution for 'fs/btrfs/raid56.c'.
+[master 0cdbc5f27fa0] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/block/null_blk.rst            |    22 +
+ Documentation/scsi/scsi_eh.rst              |     3 +-
+ Documentation/scsi/scsi_mid_low_api.rst     |     2 +-
+ MAINTAINERS                                 |     8 +-
+ Makefile                                    |     1 +
+ arch/m68k/emu/nfblock.c                     |     4 +-
+ arch/um/drivers/ubd_kern.c                  |     8 +-
+ arch/xtensa/platforms/iss/simdisk.c         |     4 +-
+ block/Kconfig                               |     1 -
+ block/bdev.c                                |    10 +-
+ block/bfq-cgroup.c                          |    34 +-
+ block/bfq-iosched.c                         |    16 +-
+ block/bfq-iosched.h                         |     8 +-
+ block/bfq-wf2q.c                            |     5 +-
+ block/bio.c                                 |    14 +-
+ block/blk-cgroup-rwstat.h                   |     8 +-
+ block/blk-cgroup.c                          |    76 +-
+ block/blk-cgroup.h                          |    12 +-
+ block/blk-core.c                            |    70 +-
+ block/blk-flush.c                           |     6 +-
+ block/blk-ia-ranges.c                       |    65 +-
+ block/blk-ioc.c                             |     2 +
+ block/blk-iocost.c                          |     2 +-
+ block/blk-iolatency.c                       |    12 +-
+ block/blk-ioprio.c                          |    57 +-
+ block/blk-ioprio.h                          |     9 +
+ block/blk-lib.c                             |     6 +-
+ block/blk-merge.c                           |    38 +-
+ block/blk-mq-debugfs-zoned.c                |     6 +-
+ block/blk-mq-debugfs.c                      |    19 +-
+ block/blk-mq-sysfs.c                        |    45 +-
+ block/blk-mq-tag.c                          |    31 +-
+ block/blk-mq-tag.h                          |    10 +-
+ block/blk-mq.c                              |   105 +-
+ block/blk-mq.h                              |    39 +-
+ block/blk-rq-qos.c                          |    10 +-
+ block/blk-settings.c                        |    11 +-
+ block/blk-sysfs.c                           |    53 +-
+ block/blk-throttle.c                        |     7 +-
+ block/blk-wbt.c                             |    18 +-
+ block/blk-zoned.c                           |    92 +-
+ block/blk.h                                 |    29 +-
+ block/bsg-lib.c                             |     6 +-
+ block/elevator.h                            |     2 +-
+ block/fops.c                                |    12 +-
+ block/genhd.c                               |    65 +-
+ block/ioctl.c                               |     2 +-
+ block/ioprio.c                              |    58 +-
+ block/kyber-iosched.c                       |     8 +-
+ block/mq-deadline.c                         |     4 +-
+ block/partitions/core.c                     |     3 +-
+ crypto/kpp.c                                |     6 +
+ crypto/shash.c                              |     6 +
+ drivers/block/Kconfig                       |     9 +
+ drivers/block/Makefile                      |     2 +
+ drivers/block/amiflop.c                     |     2 +-
+ drivers/block/aoe/aoeblk.c                  |     2 +-
+ drivers/block/aoe/aoedev.c                  |     2 +-
+ drivers/block/ataflop.c                     |     5 +-
+ drivers/block/brd.c                         |     8 +-
+ drivers/block/drbd/drbd_actlog.c            |     9 +-
+ drivers/block/drbd/drbd_bitmap.c            |    51 +-
+ drivers/block/drbd/drbd_int.h               |     5 +-
+ drivers/block/drbd/drbd_main.c              |     4 +-
+ drivers/block/drbd/drbd_receiver.c          |    24 +-
+ drivers/block/drbd/drbd_req.c               |     6 +-
+ drivers/block/drbd/drbd_worker.c            |     2 +-
+ drivers/block/floppy.c                      |     8 +-
+ drivers/block/loop.c                        |     3 +-
+ drivers/block/mtip32xx/mtip32xx.c           |   306 +-
+ drivers/block/mtip32xx/mtip32xx.h           |     5 -
+ drivers/block/n64cart.c                     |     2 +-
+ drivers/block/nbd.c                         |     9 +-
+ drivers/block/null_blk/main.c               |    60 +-
+ drivers/block/null_blk/null_blk.h           |    14 +-
+ drivers/block/null_blk/trace.h              |     2 +-
+ drivers/block/null_blk/zoned.c              |    12 +-
+ drivers/block/paride/pcd.c                  |     4 +-
+ drivers/block/paride/pd.c                   |     6 +-
+ drivers/block/paride/pf.c                   |     4 +-
+ drivers/block/pktcdvd.c                     |    14 +-
+ drivers/block/ps3disk.c                     |     4 +-
+ drivers/block/ps3vram.c                     |     4 +-
+ drivers/block/rbd.c                         |     2 +-
+ drivers/block/rnbd/rnbd-clt-sysfs.c         |     2 +-
+ drivers/block/rnbd/rnbd-clt.c               |   207 +-
+ drivers/block/rnbd/rnbd-clt.h               |    18 +-
+ drivers/block/rnbd/rnbd-proto.h             |     7 +-
+ drivers/block/rnbd/rnbd-srv-dev.c           |     1 -
+ drivers/block/rnbd/rnbd-srv-dev.h           |     1 -
+ drivers/block/rnbd/rnbd-srv-sysfs.c         |     5 +-
+ drivers/block/rnbd/rnbd-srv.c               |    29 +-
+ drivers/block/rnbd/rnbd-srv.h               |     7 +-
+ drivers/block/sunvdc.c                      |     4 +-
+ drivers/block/swim.c                        |     2 +-
+ drivers/block/swim3.c                       |     2 +-
+ drivers/block/sx8.c                         |     6 +-
+ drivers/block/ublk_drv.c                    |  1598 ++++
+ drivers/block/virtio_blk.c                  |     3 +-
+ drivers/block/xen-blkback/blkback.c         |     6 +-
+ drivers/block/xen-blkfront.c                |     4 +-
+ drivers/block/z2ram.c                       |     3 +-
+ drivers/block/zram/zram_drv.c               |     8 +-
+ drivers/cdrom/gdrom.c                       |     3 +-
+ drivers/infiniband/ulp/srp/ib_srp.c         |     3 +-
+ drivers/md/bcache/super.c                   |    27 +-
+ drivers/md/dm-bufio.c                       |    26 +-
+ drivers/md/dm-ebs-target.c                  |    15 +-
+ drivers/md/dm-flakey.c                      |     8 +-
+ drivers/md/dm-integrity.c                   |    76 +-
+ drivers/md/dm-io.c                          |    38 +-
+ drivers/md/dm-kcopyd.c                      |    26 +-
+ drivers/md/dm-log.c                         |     8 +-
+ drivers/md/dm-raid.c                        |     3 +-
+ drivers/md/dm-raid1.c                       |    12 +-
+ drivers/md/dm-snap-persistent.c             |    25 +-
+ drivers/md/dm-table.c                       |     6 +-
+ drivers/md/dm-writecache.c                  |    12 +-
+ drivers/md/dm-zone.c                        |    88 +-
+ drivers/md/dm-zoned-metadata.c              |     5 +-
+ drivers/md/dm-zoned-target.c                |    25 +-
+ drivers/md/dm-zoned.h                       |     2 +-
+ drivers/md/dm.c                             |    33 +-
+ drivers/md/md-autodetect.c                  |     1 +
+ drivers/md/md-bitmap.c                      |     6 +-
+ drivers/md/md-cluster.c                     |     4 +-
+ drivers/md/md.c                             |    92 +-
+ drivers/md/md.h                             |    19 +-
+ drivers/md/raid1.c                          |    14 +-
+ drivers/md/raid10.c                         |    22 +-
+ drivers/md/raid5-cache.c                    |    52 +-
+ drivers/md/raid5-log.h                      |    77 +-
+ drivers/md/raid5-ppl.c                      |    14 +-
+ drivers/md/raid5.c                          |   649 +-
+ drivers/memstick/core/ms_block.c            |     3 +-
+ drivers/memstick/core/mspro_block.c         |     3 +-
+ drivers/mmc/core/block.c                    |     1 -
+ drivers/mmc/core/queue.c                    |     4 +-
+ drivers/mtd/mtd_blkdevs.c                   |     4 +-
+ drivers/mtd/ubi/block.c                     |     4 +-
+ drivers/nvdimm/btt.c                        |     8 +-
+ drivers/nvdimm/pmem.c                       |     6 +-
+ drivers/nvme/Kconfig                        |     1 +
+ drivers/nvme/Makefile                       |     1 +
+ drivers/nvme/common/Kconfig                 |     4 +
+ drivers/nvme/common/Makefile                |     7 +
+ drivers/nvme/common/auth.c                  |   482 +
+ drivers/nvme/host/Kconfig                   |    15 +
+ drivers/nvme/host/Makefile                  |     1 +
+ drivers/nvme/host/apple.c                   |    12 +-
+ drivers/nvme/host/auth.c                    |  1017 ++
+ drivers/nvme/host/core.c                    |   195 +-
+ drivers/nvme/host/fabrics.c                 |    94 +-
+ drivers/nvme/host/fabrics.h                 |     7 +
+ drivers/nvme/host/fc.c                      |    18 +-
+ drivers/nvme/host/ioctl.c                   |     4 +-
+ drivers/nvme/host/multipath.c               |    10 +-
+ drivers/nvme/host/nvme.h                    |    43 +-
+ drivers/nvme/host/pci.c                     |    10 +-
+ drivers/nvme/host/rdma.c                    |    29 +-
+ drivers/nvme/host/tcp.c                     |    28 +-
+ drivers/nvme/host/trace.c                   |    32 +
+ drivers/nvme/host/zns.c                     |     6 +-
+ drivers/nvme/target/Kconfig                 |    15 +
+ drivers/nvme/target/Makefile                |     1 +
+ drivers/nvme/target/admin-cmd.c             |     4 +-
+ drivers/nvme/target/auth.c                  |   525 +
+ drivers/nvme/target/configfs.c              |   138 +-
+ drivers/nvme/target/core.c                  |    15 +
+ drivers/nvme/target/fabrics-cmd-auth.c      |   545 ++
+ drivers/nvme/target/fabrics-cmd.c           |    55 +-
+ drivers/nvme/target/io-cmd-bdev.c           |    17 +-
+ drivers/nvme/target/loop.c                  |    20 +-
+ drivers/nvme/target/nvmet.h                 |    75 +-
+ drivers/nvme/target/zns.c                   |    24 +-
+ drivers/s390/block/dasd.c                   |     4 +-
+ drivers/s390/block/dasd_genhd.c             |     4 +-
+ drivers/s390/block/dasd_int.h               |     2 +-
+ drivers/s390/block/dcssblk.c                |     8 +-
+ drivers/s390/block/scm_blk.c                |     4 +-
+ drivers/scsi/aacraid/comminit.c             |     2 +-
+ drivers/scsi/aacraid/linit.c                |     2 +-
+ drivers/scsi/device_handler/scsi_dh_alua.c  |     4 +-
+ drivers/scsi/device_handler/scsi_dh_emc.c   |     2 +-
+ drivers/scsi/device_handler/scsi_dh_hp_sw.c |     4 +-
+ drivers/scsi/device_handler/scsi_dh_rdac.c  |     2 +-
+ drivers/scsi/fnic/fnic_scsi.c               |    14 +-
+ drivers/scsi/hosts.c                        |    14 +-
+ drivers/scsi/mpi3mr/mpi3mr_os.c             |    16 +-
+ drivers/scsi/scsi_error.c                   |    22 +-
+ drivers/scsi/scsi_lib.c                     |    26 +-
+ drivers/scsi/scsi_priv.h                    |     4 +-
+ drivers/scsi/scsi_sysfs.c                   |     2 +-
+ drivers/scsi/sd.c                           |    10 +-
+ drivers/scsi/sd_zbc.c                       |    12 +-
+ drivers/scsi/sr.c                           |     4 +-
+ drivers/target/target_core_iblock.c         |     4 +-
+ drivers/ufs/core/ufshcd.c                   |     4 +-
+ drivers/ufs/core/ufshpb.c                   |     7 +-
+ fs/Makefile                                 |     2 -
+ fs/btrfs/check-integrity.c                  |     4 +-
+ fs/btrfs/compression.c                      |     6 +-
+ fs/btrfs/compression.h                      |     2 +-
+ fs/btrfs/extent_io.c                        |    18 +-
+ fs/btrfs/inode.c                            |     4 +-
+ fs/btrfs/raid56.c                           |     4 +-
+ fs/buffer.c                                 |    56 +-
+ fs/direct-io.c                              |    40 +-
+ fs/ext4/ext4.h                              |     8 +-
+ fs/ext4/fast_commit.c                       |     4 +-
+ fs/ext4/mmp.c                               |    11 +-
+ fs/ext4/super.c                             |    20 +-
+ fs/f2fs/data.c                              |    11 +-
+ fs/f2fs/f2fs.h                              |     6 +-
+ fs/f2fs/node.c                              |     2 +-
+ fs/f2fs/segment.c                           |     2 +-
+ fs/gfs2/bmap.c                              |     5 +-
+ fs/gfs2/dir.c                               |     5 +-
+ fs/gfs2/log.c                               |     4 +-
+ fs/gfs2/log.h                               |     2 +-
+ fs/gfs2/lops.c                              |     4 +-
+ fs/gfs2/lops.h                              |     2 +-
+ fs/gfs2/meta_io.c                           |    18 +-
+ fs/gfs2/quota.c                             |     2 +-
+ fs/hfsplus/hfsplus_fs.h                     |     2 +-
+ fs/hfsplus/part_tbl.c                       |     5 +-
+ fs/hfsplus/super.c                          |     4 +-
+ fs/hfsplus/wrapper.c                        |    12 +-
+ fs/inode.c                                  |   168 +-
+ fs/io_uring.c                               | 13265 --------------------------
+ fs/iomap/buffered-io.c                      |    67 +-
+ fs/iomap/direct-io.c                        |     8 +-
+ fs/isofs/compress.c                         |     2 +-
+ fs/jbd2/commit.c                            |     8 +-
+ fs/jbd2/journal.c                           |    25 +-
+ fs/jbd2/recovery.c                          |     4 +-
+ fs/mpage.c                                  |     6 +-
+ fs/nfs/blocklayout/blocklayout.c            |    13 +-
+ fs/nilfs2/btnode.c                          |     8 +-
+ fs/nilfs2/btnode.h                          |     4 +-
+ fs/nilfs2/btree.c                           |     6 +-
+ fs/nilfs2/gcinode.c                         |     7 +-
+ fs/nilfs2/mdt.c                             |    19 +-
+ fs/ntfs/aops.c                              |     6 +-
+ fs/ntfs/compress.c                          |     2 +-
+ fs/ntfs/file.c                              |     2 +-
+ fs/ntfs/logfile.c                           |     2 +-
+ fs/ntfs/mft.c                               |     4 +-
+ fs/ntfs3/file.c                             |     2 +-
+ fs/ntfs3/fsntfs.c                           |     2 +-
+ fs/ntfs3/inode.c                            |     2 +-
+ fs/ntfs3/ntfs_fs.h                          |     2 +-
+ fs/ocfs2/aops.c                             |     2 +-
+ fs/ocfs2/buffer_head_io.c                   |     8 +-
+ fs/ocfs2/cluster/heartbeat.c                |    75 +-
+ fs/ocfs2/super.c                            |     2 +-
+ fs/read_write.c                             |     4 +-
+ fs/reiserfs/inode.c                         |     4 +-
+ fs/reiserfs/journal.c                       |    12 +-
+ fs/reiserfs/stree.c                         |     4 +-
+ fs/reiserfs/super.c                         |     2 +-
+ fs/udf/dir.c                                |     2 +-
+ fs/udf/directory.c                          |     2 +-
+ fs/udf/inode.c                              |     2 +-
+ fs/ufs/balloc.c                             |     2 +-
+ fs/xfs/xfs_bio_io.c                         |     2 +-
+ fs/xfs/xfs_buf.c                            |     4 +-
+ fs/xfs/xfs_file.c                           |    11 +-
+ fs/xfs/xfs_iomap.c                          |    11 +-
+ fs/xfs/xfs_linux.h                          |     2 +-
+ fs/xfs/xfs_log_recover.c                    |     2 +-
+ fs/zonefs/super.c                           |    22 +-
+ fs/zonefs/trace.h                           |     4 +-
+ include/crypto/hash.h                       |     2 +
+ include/crypto/kpp.h                        |     2 +
+ include/linux/base64.h                      |    16 +
+ include/linux/bio.h                         |    10 +-
+ include/linux/blk-mq.h                      |    34 +-
+ include/linux/blk_types.h                   |   119 +-
+ include/linux/blkdev.h                      |   215 +-
+ include/linux/blktrace_api.h                |    13 +-
+ include/linux/buffer_head.h                 |     9 +-
+ include/linux/dm-io.h                       |     4 +-
+ include/linux/fs.h                          |     4 +
+ include/linux/io_uring_types.h              |   544 ++
+ include/linux/ioprio.h                      |    24 +-
+ include/linux/jbd2.h                        |     2 +-
+ include/linux/nvme-auth.h                   |    41 +
+ include/linux/nvme.h                        |   213 +-
+ include/linux/socket.h                      |     7 +-
+ include/linux/writeback.h                   |    11 +-
+ include/net/compat.h                        |     5 +-
+ include/scsi/scsi_cmnd.h                    |     4 +-
+ include/scsi/scsi_device.h                  |     2 +-
+ include/scsi/scsi_host.h                    |     2 +-
+ include/trace/events/f2fs.h                 |    22 +-
+ include/trace/events/io_uring.h             |   199 +-
+ include/trace/events/jbd2.h                 |    12 +-
+ include/trace/events/nilfs2.h               |     4 +-
+ include/uapi/linux/io_uring.h               |    69 +-
+ include/uapi/linux/ublk_cmd.h               |   162 +
+ io_uring/Makefile                           |    11 +
+ io_uring/advise.c                           |    99 +
+ io_uring/advise.h                           |     7 +
+ io_uring/alloc_cache.h                      |    53 +
+ io_uring/cancel.c                           |   315 +
+ io_uring/cancel.h                           |    23 +
+ io_uring/epoll.c                            |    65 +
+ io_uring/epoll.h                            |     6 +
+ io_uring/fdinfo.c                           |   194 +
+ io_uring/fdinfo.h                           |     3 +
+ io_uring/filetable.c                        |   193 +
+ io_uring/filetable.h                        |    88 +
+ io_uring/fs.c                               |   293 +
+ io_uring/fs.h                               |    20 +
+ {fs => io_uring}/io-wq.c                    |    18 +-
+ io_uring/io-wq.h                            |    83 +
+ io_uring/io_uring.c                         |  3977 ++++++++
+ io_uring/io_uring.h                         |   256 +
+ io_uring/kbuf.c                             |   551 ++
+ io_uring/kbuf.h                             |   133 +
+ io_uring/msg_ring.c                         |   171 +
+ io_uring/msg_ring.h                         |     4 +
+ io_uring/net.c                              |  1047 ++
+ io_uring/net.h                              |    60 +
+ io_uring/nop.c                              |    25 +
+ io_uring/nop.h                              |     4 +
+ io_uring/opdef.c                            |   494 +
+ io_uring/opdef.h                            |    42 +
+ io_uring/openclose.c                        |   256 +
+ io_uring/openclose.h                        |    14 +
+ io_uring/poll.c                             |   965 ++
+ io_uring/poll.h                             |    39 +
+ io_uring/refs.h                             |    48 +
+ io_uring/rsrc.c                             |  1373 +++
+ io_uring/rsrc.h                             |   166 +
+ io_uring/rw.c                               |  1054 ++
+ io_uring/rw.h                               |    23 +
+ fs/io-wq.h => io_uring/slist.h              |   100 +-
+ io_uring/splice.c                           |   122 +
+ io_uring/splice.h                           |     7 +
+ io_uring/sqpoll.c                           |   425 +
+ io_uring/sqpoll.h                           |    29 +
+ io_uring/statx.c                            |    73 +
+ io_uring/statx.h                            |     5 +
+ io_uring/sync.c                             |   110 +
+ io_uring/sync.h                             |    10 +
+ io_uring/tctx.c                             |   340 +
+ io_uring/tctx.h                             |    57 +
+ io_uring/timeout.c                          |   644 ++
+ io_uring/timeout.h                          |    36 +
+ io_uring/uring_cmd.c                        |   114 +
+ io_uring/uring_cmd.h                        |    13 +
+ io_uring/xattr.c                            |   258 +
+ io_uring/xattr.h                            |    15 +
+ kernel/power/swap.c                         |    29 +-
+ kernel/sched/core.c                         |     2 +-
+ kernel/trace/blktrace.c                     |    66 +-
+ lib/Makefile                                |     2 +-
+ lib/base64.c                                |   103 +
+ mm/filemap.c                                |     4 +
+ mm/page-writeback.c                         |    89 +-
+ net/compat.c                                |    39 +-
+ net/socket.c                                |    37 +-
+ 364 files changed, 23266 insertions(+), 16169 deletions(-)
+ create mode 100644 drivers/block/ublk_drv.c
+ create mode 100644 drivers/nvme/common/Kconfig
+ create mode 100644 drivers/nvme/common/Makefile
+ create mode 100644 drivers/nvme/common/auth.c
+ create mode 100644 drivers/nvme/host/auth.c
+ create mode 100644 drivers/nvme/target/auth.c
+ create mode 100644 drivers/nvme/target/fabrics-cmd-auth.c
+ delete mode 100644 fs/io_uring.c
+ create mode 100644 include/linux/base64.h
+ create mode 100644 include/linux/io_uring_types.h
+ create mode 100644 include/linux/nvme-auth.h
+ create mode 100644 include/uapi/linux/ublk_cmd.h
+ create mode 100644 io_uring/Makefile
+ create mode 100644 io_uring/advise.c
+ create mode 100644 io_uring/advise.h
+ create mode 100644 io_uring/alloc_cache.h
+ create mode 100644 io_uring/cancel.c
+ create mode 100644 io_uring/cancel.h
+ create mode 100644 io_uring/epoll.c
+ create mode 100644 io_uring/epoll.h
+ create mode 100644 io_uring/fdinfo.c
+ create mode 100644 io_uring/fdinfo.h
+ create mode 100644 io_uring/filetable.c
+ create mode 100644 io_uring/filetable.h
+ create mode 100644 io_uring/fs.c
+ create mode 100644 io_uring/fs.h
+ rename {fs => io_uring}/io-wq.c (99%)
+ create mode 100644 io_uring/io-wq.h
+ create mode 100644 io_uring/io_uring.c
+ create mode 100644 io_uring/io_uring.h
+ create mode 100644 io_uring/kbuf.c
+ create mode 100644 io_uring/kbuf.h
+ create mode 100644 io_uring/msg_ring.c
+ create mode 100644 io_uring/msg_ring.h
+ create mode 100644 io_uring/net.c
+ create mode 100644 io_uring/net.h
+ create mode 100644 io_uring/nop.c
+ create mode 100644 io_uring/nop.h
+ create mode 100644 io_uring/opdef.c
+ create mode 100644 io_uring/opdef.h
+ create mode 100644 io_uring/openclose.c
+ create mode 100644 io_uring/openclose.h
+ create mode 100644 io_uring/poll.c
+ create mode 100644 io_uring/poll.h
+ create mode 100644 io_uring/refs.h
+ create mode 100644 io_uring/rsrc.c
+ create mode 100644 io_uring/rsrc.h
+ create mode 100644 io_uring/rw.c
+ create mode 100644 io_uring/rw.h
+ rename fs/io-wq.h => io_uring/slist.h (56%)
+ create mode 100644 io_uring/splice.c
+ create mode 100644 io_uring/splice.h
+ create mode 100644 io_uring/sqpoll.c
+ create mode 100644 io_uring/sqpoll.h
+ create mode 100644 io_uring/statx.c
+ create mode 100644 io_uring/statx.h
+ create mode 100644 io_uring/sync.c
+ create mode 100644 io_uring/sync.h
+ create mode 100644 io_uring/tctx.c
+ create mode 100644 io_uring/tctx.h
+ create mode 100644 io_uring/timeout.c
+ create mode 100644 io_uring/timeout.h
+ create mode 100644 io_uring/uring_cmd.c
+ create mode 100644 io_uring/uring_cmd.h
+ create mode 100644 io_uring/xattr.c
+ create mode 100644 io_uring/xattr.h
+ create mode 100644 lib/base64.c
+$ git am -3 ../patches/0001-fixup-for-keep-iocb_flags-result-cached-in-struct-fi.patch
+Applying: fixup for "keep iocb_flags() result cached in struct file"
+$ git reset HEAD^
+Unstaged changes after reset:
+M	io_uring/rw.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 0929976524c7] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git
+ Date: Fri Jul 15 13:24:36 2022 +1000
+$ git am -3 ../patches/0001-fix-up-for-fs-remove-no_llseek.patch
+Applying: fix up for "fs: remove no_llseek"
+$ git reset HEAD^
+Unstaged changes after reset:
+M	drivers/block/ublk_drv.c
+$ git add -A .
+$ git commit -v -a --amend
+[master bc4aeb81453f] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git
+ Date: Fri Jul 15 13:24:36 2022 +1000
+Merging device-mapper/for-next (2ee73ef60db4 dm writecache: count number of blocks discarded, not number of discard bios)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next
+Auto-merging drivers/md/dm-kcopyd.c
+Auto-merging drivers/md/dm-raid.c
+Auto-merging drivers/md/dm-table.c
+Auto-merging drivers/md/dm-writecache.c
+Auto-merging drivers/md/dm-zone.c
+Auto-merging drivers/md/dm.c
+Merge made by the 'ort' strategy.
+ .../admin-guide/device-mapper/writecache.rst       |  18 +-
+ drivers/md/Makefile                                |   2 +-
+ drivers/md/dm-cache-metadata.h                     |   2 +-
+ drivers/md/dm-cache-target.c                       |   2 +-
+ drivers/md/dm-core.h                               |  23 +-
+ drivers/md/dm-ima.c                                |   5 +-
+ drivers/md/dm-io-rewind.c                          | 166 +++++++++++
+ drivers/md/dm-ioctl.c                              |   6 +-
+ drivers/md/dm-kcopyd.c                             |   2 +-
+ drivers/md/dm-raid.c                               |   2 +-
+ drivers/md/dm-rq.c                                 |   1 -
+ drivers/md/dm-snap.c                               |   2 +-
+ drivers/md/dm-table.c                              | 318 ++++++++++-----------
+ drivers/md/dm-verity-target.c                      |   7 +-
+ drivers/md/dm-writecache.c                         |  43 +--
+ drivers/md/dm-zone.c                               |   7 +-
+ drivers/md/dm.c                                    | 255 ++++++++++-------
+ drivers/md/dm.h                                    |   4 -
+ include/linux/device-mapper.h                      |   1 -
+ 19 files changed, 529 insertions(+), 337 deletions(-)
+ create mode 100644 drivers/md/dm-io-rewind.c
+Merging libata/for-next (0184898dd14d ata: libata-scsi: fix result type of ata_ioc32())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next
+Merge made by the 'ort' strategy.
+ drivers/ata/libata-acpi.c      |   8 +--
+ drivers/ata/libata-core.c      |  68 +++++++++++------------
+ drivers/ata/libata-eh.c        |  30 +++++------
+ drivers/ata/libata-scsi.c      |   8 +--
+ drivers/ata/libata-transport.c |   2 +-
+ drivers/ata/libata.h           |   8 +--
+ drivers/ata/pata_acpi.c        |   2 +-
+ drivers/ata/pata_ali.c         |   2 +-
+ drivers/ata/pata_amd.c         |  14 ++---
+ drivers/ata/pata_hpt366.c      |   2 +-
+ drivers/ata/pata_hpt37x.c      | 119 +++++++++++++++++++++--------------------
+ drivers/ata/pata_hpt3x2n.c     |  21 ++++----
+ drivers/ata/pata_macio.c       |   2 +-
+ drivers/ata/pata_pdc2027x.c    |   4 +-
+ drivers/ata/pata_serverworks.c |   4 +-
+ drivers/ata/pata_sis.c         |   2 +-
+ drivers/ata/pata_via.c         |   2 +-
+ include/linux/libata.h         |  51 +++++++++---------
+ 18 files changed, 176 insertions(+), 173 deletions(-)
+Merging pcmcia/pcmcia-next (2ef4bb24ff39 pcmcia: Use platform_get_irq() to get the interrupt)
+$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next
+Already up to date.
+Merging mmc/next (b3fa3e6dccc4 mmc: block: Add single read for 4k sector cards)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next
+Auto-merging drivers/memstick/core/ms_block.c
+Auto-merging drivers/mmc/core/block.c
+Merge made by the 'ort' strategy.
+ .../bindings/mmc/brcm,sdhci-brcmstb.yaml           |  32 +++-
+ .../devicetree/bindings/mmc/exynos-dw-mshc.txt     |  94 ----------
+ .../devicetree/bindings/mmc/mmc-spi-slot.txt       |  29 ----
+ .../devicetree/bindings/mmc/mmc-spi-slot.yaml      |  77 ++++++++
+ Documentation/devicetree/bindings/mmc/mtk-sd.yaml  |  12 +-
+ .../devicetree/bindings/mmc/renesas,sdhi.yaml      |   7 +-
+ .../bindings/mmc/samsung,exynos-dw-mshc.yaml       | 160 +++++++++++++++++
+ .../bindings/mmc/samsung,s3c6410-sdhci.yaml        |  81 +++++++++
+ .../devicetree/bindings/mmc/samsung-sdhci.txt      |  32 ----
+ .../devicetree/bindings/mmc/sdhci-msm.yaml         |  80 +++++++--
+ drivers/memstick/core/ms_block.c                   |  15 +-
+ drivers/mmc/core/block.c                           |  32 ++--
+ drivers/mmc/core/bus.c                             |   4 +-
+ drivers/mmc/core/core.c                            |  10 +-
+ drivers/mmc/core/debugfs.c                         |  80 +++++++++
+ drivers/mmc/core/host.c                            |   2 +-
+ drivers/mmc/core/sd.c                              |   4 +-
+ drivers/mmc/core/sdio.c                            |  16 +-
+ drivers/mmc/host/cqhci-core.c                      |   9 +-
+ drivers/mmc/host/dw_mmc-exynos.c                   |   4 +-
+ drivers/mmc/host/dw_mmc-hi3798cv200.c              |   4 +-
+ drivers/mmc/host/dw_mmc-rockchip.c                 |   4 +-
+ drivers/mmc/host/mmci.c                            |   2 +-
+ drivers/mmc/host/mtk-sd.c                          |   2 +-
+ drivers/mmc/host/mxcmmc.c                          |   4 +-
+ drivers/mmc/host/renesas_sdhi_core.c               |  37 ++--
+ drivers/mmc/host/renesas_sdhi_internal_dmac.c      |   5 +-
+ drivers/mmc/host/sdhci-brcmstb.c                   |  69 +++++++-
+ drivers/mmc/host/sdhci-of-arasan.c                 |   5 +-
+ drivers/mmc/host/sdhci-of-at91.c                   |   9 +-
+ drivers/mmc/host/sdhci-of-dwcmshc.c                | 193 ++++++++++++++++-----
+ drivers/mmc/host/sdhci-of-esdhc.c                  |   7 +-
+ drivers/mmc/host/sdhci-pci-gli.c                   |  34 ++++
+ drivers/mmc/host/sdhci-st.c                        |   5 +-
+ drivers/mmc/host/sdhci.c                           |  59 +++++--
+ drivers/mmc/host/sdhci.h                           |   3 +
+ drivers/mmc/host/tmio_mmc.c                        |   2 +-
+ drivers/mmc/host/tmio_mmc.h                        |   6 +-
+ drivers/mmc/host/tmio_mmc_core.c                   |  28 ++-
+ include/linux/mmc/card.h                           |   1 +
+ include/linux/mmc/host.h                           |  26 +++
+ include/linux/mmc/mmc.h                            |   6 +
+ 42 files changed, 967 insertions(+), 324 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
+ delete mode 100644 Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml
+ create mode 100644 Documentation/devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml
+ create mode 100644 Documentation/devicetree/bindings/mmc/samsung,s3c6410-sdhci.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mmc/samsung-sdhci.txt
+Merging mfd/for-mfd-next (30f8f57ce7ae mfd: intel_soc_pmic_bxtwc: Fix spelling in the comment)
+$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next
+Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/mach-pxa/eseries.c
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/mfd/da9063.txt   |  114 --
+ .../devicetree/bindings/mfd/dlg,da9063.yaml        |  132 ++
+ .../devicetree/bindings/mfd/mps,mp2629.yaml        |    4 +-
+ Documentation/devicetree/bindings/mfd/mt6397.txt   |    8 +-
+ .../devicetree/bindings/mfd/qcom,tcsr.txt          |   24 -
+ .../devicetree/bindings/mfd/qcom,tcsr.yaml         |   50 +
+ .../devicetree/bindings/mfd/qcom-pm8xxx.yaml       |    2 +-
+ .../devicetree/bindings/mfd/st,stm32-timers.yaml   |   15 +
+ .../bindings/mfd/ti,j721e-system-controller.yaml   |   12 +
+ .../devicetree/bindings/trivial-devices.yaml       |    2 -
+ MAINTAINERS                                        |    4 +-
+ arch/arm/mach-pxa/eseries.c                        |    4 +-
+ arch/arm/mach-pxa/tosa.c                           |    4 +-
+ drivers/mfd/asic3.c                                |    9 +-
+ drivers/mfd/axp20x.c                               |    9 +
+ drivers/mfd/cros_ec_dev.c                          |    5 +
+ drivers/mfd/db8500-prcmu.c                         |    2 +-
+ drivers/mfd/dln2.c                                 |   17 +-
+ drivers/mfd/intel-lpss-pci.c                       |   13 +
+ drivers/mfd/intel_soc_pmic_bxtwc.c                 |  194 +--
+ drivers/mfd/intel_soc_pmic_chtwc.c                 |   27 +-
+ drivers/mfd/max77620.c                             |    2 +
+ drivers/mfd/max77714.c                             |    4 +-
+ drivers/mfd/mt6358-irq.c                           |   24 +
+ drivers/mfd/mt6397-core.c                          |   91 ++
+ drivers/mfd/mt6397-irq.c                           |    9 +-
+ drivers/mfd/qcom-pm8008.c                          |   53 +-
+ drivers/mfd/syscon.c                               |    3 +-
+ drivers/mfd/t7l66xb.c                              |    6 +-
+ drivers/mfd/tc6393xb.c                             |    5 +-
+ drivers/mfd/twl-core.c                             |  323 +---
+ include/linux/mfd/ipaq-micro.h                     |    4 +-
+ include/linux/mfd/max77714.h                       |    2 +-
+ include/linux/mfd/mt6331/core.h                    |   40 +
+ include/linux/mfd/mt6331/registers.h               |  584 ++++++++
+ include/linux/mfd/mt6332/core.h                    |   65 +
+ include/linux/mfd/mt6332/registers.h               |  642 ++++++++
+ include/linux/mfd/mt6357/core.h                    |  119 ++
+ include/linux/mfd/mt6357/registers.h               | 1574 ++++++++++++++++++++
+ include/linux/mfd/mt6397/core.h                    |    3 +
+ include/linux/mfd/t7l66xb.h                        |    1 -
+ include/linux/mfd/tc6387xb.h                       |    1 -
+ include/linux/mfd/tc6393xb.h                       |    2 +-
+ include/linux/mfd/twl.h                            |   55 -
+ include/linux/platform_data/cros_ec_commands.h     |    2 +
+ include/linux/platform_data/cros_ec_proto.h        |    1 +
+ 46 files changed, 3534 insertions(+), 732 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/mfd/da9063.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/dlg,da9063.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mfd/qcom,tcsr.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
+ create mode 100644 include/linux/mfd/mt6331/core.h
+ create mode 100644 include/linux/mfd/mt6331/registers.h
+ create mode 100644 include/linux/mfd/mt6332/core.h
+ create mode 100644 include/linux/mfd/mt6332/registers.h
+ create mode 100644 include/linux/mfd/mt6357/core.h
+ create mode 100644 include/linux/mfd/mt6357/registers.h
+Merging backlight/for-backlight-next (023a8830a628 backlight: backlight: Slighly simplify devm_of_find_backlight())
+$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next
+Already up to date.
+Merging battery/for-next (a578cc3af5ce power: reset: pwr-mlxbf: change rst_pwr_hid and low_pwr_hid from global to local variables)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/atmel-sysregs.txt      |  15 --
+ .../devicetree/bindings/power/supply/bq24190.yaml  |   2 +-
+ .../bindings/power/supply/qcom,pm8941-charger.yaml |   9 +-
+ .../power/supply/summit,smb347-charger.yaml        |   2 +-
+ .../bindings/reset/atmel,at91sam9260-reset.yaml    |  68 ++++++++
+ drivers/power/reset/Kconfig                        |   6 +
+ drivers/power/reset/Makefile                       |   1 +
+ drivers/power/reset/at91-reset.c                   | 184 +++++++++++++++++++--
+ drivers/power/reset/pwr-mlxbf.c                    |  97 +++++++++++
+ drivers/power/supply/ab8500_chargalg.c             |  46 +++++-
+ drivers/power/supply/bq24257_charger.c             |   2 +-
+ drivers/power/supply/cros_peripheral_charger.c     |   2 +-
+ drivers/power/supply/goldfish_battery.c            |   4 +-
+ drivers/power/supply/lp8788-charger.c              |   2 +-
+ drivers/power/supply/max77976_charger.c            |   4 +-
+ include/dt-bindings/reset/sama7g5-reset.h          |  10 ++
+ 16 files changed, 412 insertions(+), 42 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/reset/atmel,at91sam9260-reset.yaml
+ create mode 100644 drivers/power/reset/pwr-mlxbf.c
+ create mode 100644 include/dt-bindings/reset/sama7g5-reset.h
+Merging regulator/for-next (91de5eb17c10 regulator: pwm: Update Lee Jones' email address)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next
+Auto-merging drivers/regulator/ti-abb-regulator.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/regulator/mps,mp5416.yaml  |   1 +
+ .../bindings/regulator/pwm-regulator.txt           |  92 ----
+ .../bindings/regulator/pwm-regulator.yaml          | 126 ++++++
+ .../bindings/regulator/qcom,smd-rpm-regulator.yaml |   4 +
+ .../bindings/regulator/qcom,spmi-regulator.txt     | 347 --------------
+ .../bindings/regulator/qcom,spmi-regulator.yaml    | 323 +++++++++++++
+ drivers/regulator/Kconfig                          |  28 ++
+ drivers/regulator/Makefile                         |   3 +
+ drivers/regulator/max597x-regulator.c              | 502 +++++++++++++++++++++
+ drivers/regulator/mp5416.c                         |  30 +-
+ drivers/regulator/mt6370-regulator.c               | 390 ++++++++++++++++
+ drivers/regulator/qcom_smd-regulator.c             |  29 +-
+ drivers/regulator/qcom_spmi-regulator.c            |  37 ++
+ drivers/regulator/rpi-panel-attiny-regulator.c     |   6 +-
+ drivers/regulator/rt5120-regulator.c               | 420 +++++++++++++++++
+ drivers/regulator/rt5190a-regulator.c              |   3 +
+ drivers/regulator/scmi-regulator.c                 |   1 +
+ drivers/regulator/ti-abb-regulator.c               |   4 +-
+ include/linux/regulator/driver.h                   |   1 +
+ 19 files changed, 1893 insertions(+), 454 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/regulator/pwm-regulator.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/pwm-regulator.yaml
+ delete mode 100644 Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml
+ create mode 100644 drivers/regulator/max597x-regulator.c
+ create mode 100644 drivers/regulator/mt6370-regulator.c
+ create mode 100644 drivers/regulator/rt5120-regulator.c
+Merging security/next (ed56f4b5173e MAINTAINERS: update the LSM maintainer info)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+Merging apparmor/apparmor-next (524d8e14258a apparmor: disable showing the mode as part of a secid to secctx)
+$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS                            |   7 ++-
+ security/apparmor/Kconfig              |  86 ++++++++++++++++++++--------
+ security/apparmor/apparmorfs.c         | 101 ++++++++++++++++++---------------
+ security/apparmor/audit.c              |   2 +-
+ security/apparmor/domain.c             |   3 +-
+ security/apparmor/include/apparmor.h   |   1 +
+ security/apparmor/include/apparmorfs.h |  14 +++++
+ security/apparmor/include/lib.h        |   5 ++
+ security/apparmor/include/policy_ns.h  |   1 +
+ security/apparmor/include/secid.h      |   5 +-
+ security/apparmor/label.c              |  17 +++---
+ security/apparmor/lib.c                |   2 +-
+ security/apparmor/lsm.c                |  38 +++++++------
+ security/apparmor/mount.c              |  12 ++--
+ security/apparmor/net.c                |   3 +-
+ security/apparmor/policy.c             |  35 +++++++-----
+ security/apparmor/policy_ns.c          |  41 ++++++++++---
+ security/apparmor/policy_unpack.c      |  37 ++++++++----
+ security/apparmor/policy_unpack_test.c |  28 ++++-----
+ security/apparmor/procattr.c           |   2 +-
+ security/apparmor/secid.c              |  56 +++++++-----------
+ 21 files changed, 304 insertions(+), 192 deletions(-)
+Merging integrity/next-integrity (077c63ca4e72 Merge remote-tracking branch 'linux-integrity/kexec-keyrings' into next-integrity)
+$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity
+Auto-merging security/integrity/evm/evm_main.c
+Merge made by the 'ort' strategy.
+ arch/arm64/include/asm/kexec.h        | 18 +++++++-
+ arch/arm64/kernel/kexec_image.c       | 11 +----
+ arch/powerpc/include/asm/kexec.h      | 14 ++++++
+ arch/s390/include/asm/kexec.h         | 14 ++++++
+ arch/s390/kernel/machine_kexec_file.c | 18 +++++---
+ arch/x86/include/asm/kexec.h          | 12 +++++
+ arch/x86/kernel/kexec-bzimage64.c     | 20 +--------
+ include/linux/kexec.h                 | 82 +++++++++++++++++++++++++++++-----
+ kernel/kexec_core.c                   | 27 ------------
+ kernel/kexec_file.c                   | 83 +++++++++++++----------------------
+ security/integrity/evm/evm_main.c     | 52 ++++++++++------------
+ 11 files changed, 195 insertions(+), 156 deletions(-)
+Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
+$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next
+Already up to date.
+Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata)
+$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next
+Already up to date.
+Merging selinux/next (ef54ccb61616 selinux: selinux_add_opt() callers free memory)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging mm/secretmem.c
+Auto-merging security/selinux/hooks.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/kernel-parameters.txt |  4 ++--
+ mm/secretmem.c                                  |  9 +++++++++
+ security/selinux/hooks.c                        | 17 +++++++----------
+ security/selinux/include/audit.h                |  2 +-
+ security/selinux/include/avc.h                  |  2 +-
+ security/selinux/ss/policydb.h                  |  2 ++
+ security/selinux/ss/services.c                  |  9 ++++++++-
+ 7 files changed, 30 insertions(+), 15 deletions(-)
+Merging smack/next (b50503990d88 smack: Remove the redundant lsm_inode_alloc)
+$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next
+Merge made by the 'ort' strategy.
+ security/smack/smack_access.c | 7 ++-----
+ security/smack/smack_lsm.c    | 7 -------
+ 2 files changed, 2 insertions(+), 12 deletions(-)
+Merging tomoyo/master (b047602d579b Merge tag 'trace-v5.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
+$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master
+Already up to date.
+Merging tpmdd/next (1679eb4a6194 tpm: eventlog: Fix section mismatch for DEBUG_SECTION_MISMATCH)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next
+Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/trivial-devices.yaml       |   2 +
+ crypto/asymmetric_keys/pkcs7_parser.c              |  18 +
+ crypto/asymmetric_keys/public_key.c                |   7 +-
+ crypto/asymmetric_keys/x509_cert_parser.c          |   3 +
+ drivers/char/tpm/Kconfig                           |  12 +
+ drivers/char/tpm/Makefile                          |   1 +
+ drivers/char/tpm/tpm.h                             |   1 +
+ drivers/char/tpm/tpm1-cmd.c                        |   7 +-
+ drivers/char/tpm/tpm_tis_core.c                    |  14 +
+ drivers/char/tpm/tpm_tis_core.h                    |  10 +
+ drivers/char/tpm/tpm_tis_i2c.c                     | 390 +++++++++++++++++++++
+ include/linux/tpm_eventlog.h                       |   2 +-
+ scripts/sign-file.c                                |   2 +-
+ 13 files changed, 464 insertions(+), 5 deletions(-)
+ create mode 100644 drivers/char/tpm/tpm_tis_i2c.c
+Merging watchdog/master (a111daf0c53a Linux 5.19-rc3)
+$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master
+Already up to date.
+Merging iommu/next (70f57b51402c Merge branches 'iommu/fixes', 'arm/exynos', 'arm/mediatek', 'x86/amd' and 'core' into next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/kernel-parameters.txt    |  34 +-
+ .../devicetree/bindings/iommu/mediatek,iommu.yaml  |  17 +
+ drivers/acpi/arm64/iort.c                          | 360 ++++++++++-
+ drivers/iommu/Kconfig                              |  26 +
+ drivers/iommu/amd/amd_iommu.h                      |  13 +-
+ drivers/iommu/amd/amd_iommu_types.h                | 133 ++--
+ drivers/iommu/amd/init.c                           | 692 +++++++++++++--------
+ drivers/iommu/amd/io_pgtable.c                     |   6 +-
+ drivers/iommu/amd/iommu.c                          | 563 ++++++++++-------
+ drivers/iommu/amd/iommu_v2.c                       |  67 +-
+ drivers/iommu/amd/quirks.c                         |   4 +-
+ drivers/iommu/apple-dart.c                         |   3 -
+ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c        |  86 ++-
+ drivers/iommu/arm/arm-smmu/arm-smmu.c              |  66 +-
+ drivers/iommu/arm/arm-smmu/qcom_iommu.c            |  11 -
+ drivers/iommu/dma-iommu.c                          |  21 +-
+ drivers/iommu/exynos-iommu.c                       |   8 +-
+ drivers/iommu/fsl_pamu_domain.c                    |   5 -
+ drivers/iommu/io-pgtable-arm-v7s.c                 |  75 ++-
+ drivers/iommu/iommu.c                              |  31 +-
+ drivers/iommu/iova.c                               |   7 +-
+ drivers/iommu/msm_iommu.c                          |   5 -
+ drivers/iommu/mtk_iommu.c                          |  68 +-
+ drivers/iommu/mtk_iommu_v1.c                       |   5 -
+ drivers/iommu/sprd-iommu.c                         |  11 -
+ drivers/iommu/sun50i-iommu.c                       |   3 -
+ drivers/iommu/tegra-gart.c                         |   5 -
+ drivers/iommu/tegra-smmu.c                         |   3 -
+ drivers/iommu/virtio-iommu.c                       |   8 +-
+ include/linux/acpi_iort.h                          |  14 +-
+ include/linux/io-pgtable.h                         |  15 +-
+ include/linux/iommu.h                              |  10 +
+ 32 files changed, 1577 insertions(+), 798 deletions(-)
+Merging audit/next (546093206ba1 audit: make is_audit_feature_set() static)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next
+Merge made by the 'ort' strategy.
+ include/linux/audit.h | 2 --
+ kernel/audit.c        | 4 ++--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+Merging devicetree/for-next (d17e37c41b7e of: device: Fix missing of_node_put() in of_dma_set_restricted_buffer)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/cpus.yaml    |   1 +
+ .../bindings/arm/tegra/nvidia,tegra20-pmc.yaml     |   2 +-
+ .../devicetree/bindings/arm/vexpress-sysreg.yaml   |  10 +-
+ .../devicetree/bindings/ata/ahci-ceva.txt          |  63 -------
+ .../devicetree/bindings/ata/ceva,ahci-1v84.yaml    | 189 +++++++++++++++++++++
+ Documentation/devicetree/bindings/chosen.txt       | 137 ---------------
+ .../devicetree/bindings/clock/efm32-clock.txt      |  11 --
+ .../bindings/connector/usb-connector.yaml          | 152 ++++++++---------
+ .../devicetree/bindings/display/arm,pl11x.yaml     |  15 +-
+ .../devicetree/bindings/display/bridge/sii902x.txt |  78 ---------
+ .../bindings/display/bridge/sil,sii9022.yaml       | 131 ++++++++++++++
+ .../bindings/display/panel/arm,rtsm-display.yaml   |  27 +++
+ .../samsung,exynos-chipid.yaml}                    |   2 +-
+ .../bindings/hwinfo/samsung,s5pv210-chipid.yaml    |  30 ++++
+ .../k3-socinfo.yaml => hwinfo/ti,k3-socinfo.yaml}  |   2 +-
+ .../bindings/{i2c => hwmon}/ibm,p8-occ-hwmon.txt   |   0
+ .../devicetree/bindings/i2c/i2c-efm32.txt          |  33 ----
+ .../interrupt-controller/rda,8810pl-intc.txt       |  61 -------
+ .../interrupt-controller/rda,8810pl-intc.yaml      |  43 +++++
+ .../devicetree/bindings/media/gpio-ir-receiver.txt |  20 ---
+ .../bindings/media/gpio-ir-receiver.yaml           |  40 +++++
+ Documentation/devicetree/bindings/media/rc.yaml    |   2 +-
+ .../mtd/partitions/arm,arm-firmware-suite.txt      |  17 --
+ .../mtd/partitions/arm,arm-firmware-suite.yaml     |  28 +++
+ .../devicetree/bindings/net/nfc/nxp,nci.yaml       |   1 -
+ .../devicetree/bindings/perf/arm,ccn.yaml          |  40 +++++
+ Documentation/devicetree/bindings/perf/arm-ccn.txt |  23 ---
+ .../devicetree/bindings/serial/efm32-uart.txt      |  20 ---
+ .../devicetree/bindings/serio/ps2-gpio.txt         |  23 ---
+ .../devicetree/bindings/serio/ps2-gpio.yaml        |  64 +++++++
+ .../devicetree/bindings/spi/efm32-spi.txt          |  39 -----
+ .../devicetree/bindings/sram/qcom,imem.yaml        |  75 ++++++++
+ .../devicetree/bindings/sram/qcom,ocmem.yaml       |  10 +-
+ .../devicetree/bindings/vendor-prefixes.yaml       |  16 +-
+ .../bindings/watchdog/faraday,ftwdt010.yaml        |   2 +-
+ .../devicetree/bindings/writing-bindings.rst       |   2 +-
+ MAINTAINERS                                        |   4 +-
+ drivers/of/base.c                                  |   2 +-
+ drivers/of/device.c                                |   5 +-
+ drivers/of/fdt.c                                   |   4 +-
+ drivers/of/kexec.c                                 |  17 ++
+ drivers/of/of_reserved_mem.c                       |   3 +-
+ drivers/of/unittest.c                              |  17 +-
+ include/dt-bindings/clock/efm32-cmu.h              |  43 -----
+ include/linux/of.h                                 |   5 +-
+ 45 files changed, 818 insertions(+), 691 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/ata/ahci-ceva.txt
+ create mode 100644 Documentation/devicetree/bindings/ata/ceva,ahci-1v84.yaml
+ delete mode 100644 Documentation/devicetree/bindings/chosen.txt
+ delete mode 100644 Documentation/devicetree/bindings/clock/efm32-clock.txt
+ delete mode 100644 Documentation/devicetree/bindings/display/bridge/sii902x.txt
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/sil,sii9022.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/panel/arm,rtsm-display.yaml
+ rename Documentation/devicetree/bindings/{soc/samsung/exynos-chipid.yaml => hwinfo/samsung,exynos-chipid.yaml} (92%)
+ create mode 100644 Documentation/devicetree/bindings/hwinfo/samsung,s5pv210-chipid.yaml
+ rename Documentation/devicetree/bindings/{soc/ti/k3-socinfo.yaml => hwinfo/ti,k3-socinfo.yaml} (92%)
+ rename Documentation/devicetree/bindings/{i2c => hwmon}/ibm,p8-occ-hwmon.txt (100%)
+ delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-efm32.txt
+ delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/rda,8810pl-intc.txt
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/rda,8810pl-intc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/media/gpio-ir-receiver.txt
+ create mode 100644 Documentation/devicetree/bindings/media/gpio-ir-receiver.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mtd/partitions/arm,arm-firmware-suite.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/partitions/arm,arm-firmware-suite.yaml
+ create mode 100644 Documentation/devicetree/bindings/perf/arm,ccn.yaml
+ delete mode 100644 Documentation/devicetree/bindings/perf/arm-ccn.txt
+ delete mode 100644 Documentation/devicetree/bindings/serial/efm32-uart.txt
+ delete mode 100644 Documentation/devicetree/bindings/serio/ps2-gpio.txt
+ create mode 100644 Documentation/devicetree/bindings/serio/ps2-gpio.yaml
+ delete mode 100644 Documentation/devicetree/bindings/spi/efm32-spi.txt
+ create mode 100644 Documentation/devicetree/bindings/sram/qcom,imem.yaml
+ delete mode 100644 include/dt-bindings/clock/efm32-cmu.h
+Merging dt-krzk/for-next (ad0d6ea39195 Merge branch 'for-v5.20/dt-bindings-qcom' into next/dt-bindings)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next
+Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml
+CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/qcom.yaml
+Auto-merging Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml
+Auto-merging Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.yaml
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging MAINTAINERS
+Resolved 'Documentation/devicetree/bindings/arm/qcom.yaml' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 79092a46295b] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/arm/aspeed/aspeed.yaml     |  87 +++++++++++++++++
+ Documentation/devicetree/bindings/arm/qcom.yaml    | 108 +++++++++++++++++++--
+ .../bindings/cpufreq/qcom-cpufreq-nvmem.yaml       |   4 +-
+ .../bindings/leds/backlight/qcom-wled.yaml         |   9 +-
+ .../devicetree/bindings/nvmem/qcom,qfprom.yaml     |   2 +
+ .../bindings/soc/qcom/qcom,aoss-qmp.yaml           |   1 +
+ .../bindings/soc/qcom/qcom,rpmh-rsc.yaml           |  33 +++----
+ .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml |   3 +
+ .../bindings/spi/qcom,spi-geni-qcom.yaml           |   5 +-
+ .../devicetree/bindings/vendor-prefixes.yaml       |   2 +
+ MAINTAINERS                                        |   1 +
+ 11 files changed, 223 insertions(+), 32 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/aspeed/aspeed.yaml
+Merging mailbox/mailbox-for-next (79f9fbe30352 mailbox: qcom-ipcc: Fix -Wunused-function with CONFIG_PM_SLEEP=n)
+$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next
+Already up to date.
+Merging spi/for-next (6e9966d92061 Merge remote-tracking branch 'spi/for-5.20' into spi-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/spi/Kconfig
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/sound/renesas,rz-ssi.yaml  |   3 +-
+ .../bindings/spi/atmel,at91rm9200-spi.yaml         |  75 +++
+ .../bindings/spi/mediatek,spi-mt65xx.yaml          |   1 +
+ .../spi/nvidia,tegra210-quad-peripheral-props.yaml |  33 ++
+ .../bindings/spi/nvidia,tegra210-quad.yaml         |  22 +-
+ .../devicetree/bindings/spi/samsung,spi.yaml       |   6 +-
+ .../devicetree/bindings/spi/snps,dw-apb-ssi.yaml   |  26 +-
+ .../devicetree/bindings/spi/spi-cadence.yaml       |   7 +
+ .../bindings/spi/spi-peripheral-props.yaml         |   6 +
+ .../devicetree/bindings/spi/spi-zynqmp-qspi.yaml   |   7 +
+ .../devicetree/bindings/spi/spi_atmel.txt          |  36 --
+ MAINTAINERS                                        |   1 +
+ drivers/spi/Kconfig                                |   9 +
+ drivers/spi/Makefile                               |   1 +
+ drivers/spi/atmel-quadspi.c                        | 104 +++-
+ drivers/spi/spi-altera-dfl.c                       |  14 +-
+ drivers/spi/spi-amd.c                              |  45 +-
+ drivers/spi/spi-dw-core.c                          |  10 +-
+ drivers/spi/spi-dw-dma.c                           |  25 +-
+ drivers/spi/spi-dw-mmio.c                          |   8 +-
+ drivers/spi/spi-dw.h                               |  13 +-
+ drivers/spi/spi-fsi.c                              |  19 +-
+ drivers/spi/spi-intel-pci.c                        |   1 +
+ drivers/spi/spi-intel.c                            |   4 +-
+ drivers/spi/spi-microchip-core.c                   | 617 +++++++++++++++++++++
+ drivers/spi/spi-mpc52xx-psc.c                      | 116 ++--
+ drivers/spi/spi-pxa2xx.c                           |   4 +
+ drivers/spi/spi-s3c64xx.c                          | 123 ++--
+ drivers/spi/spi-sh.c                               |  94 +---
+ drivers/spi/spi-sifive.c                           |  39 ++
+ drivers/spi/spi-stm32-qspi.c                       |  18 +-
+ drivers/spi/spi-synquacer.c                        |   1 +
+ drivers/spi/spi-tegra20-slink.c                    |   3 +-
+ drivers/spi/spi-tegra210-quad.c                    |  33 +-
+ drivers/spi/spi-ti-qspi.c                          |  75 +--
+ drivers/spi/spi-topcliff-pch.c                     |  30 +-
+ drivers/spi/spi-zynqmp-gqspi.c                     |  25 +-
+ drivers/spi/spi.c                                  | 566 +++++++++++--------
+ include/linux/spi/spi.h                            | 169 +++---
+ tools/spi/spidev_test.c                            |  11 +
+ 40 files changed, 1694 insertions(+), 706 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/spi/atmel,at91rm9200-spi.yaml
+ create mode 100644 Documentation/devicetree/bindings/spi/nvidia,tegra210-quad-peripheral-props.yaml
+ delete mode 100644 Documentation/devicetree/bindings/spi/spi_atmel.txt
+ create mode 100644 drivers/spi/spi-microchip-core.c
+Merging tip/master (3c1ec304a1bc Merge branch into tip/master: 'x86/vmware')
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/x86/include/asm/cpufeatures.h
+Auto-merging arch/x86/include/uapi/asm/bootparam.h
+Auto-merging arch/x86/kernel/kexec-bzimage64.c
+Auto-merging arch/x86/kernel/module.c
+Auto-merging arch/x86/kernel/process.c
+Auto-merging drivers/idle/intel_idle.c
+CONFLICT (content): Merge conflict in drivers/idle/intel_idle.c
+Auto-merging drivers/of/kexec.c
+Auto-merging drivers/thermal/cpufreq_cooling.c
+Auto-merging include/linux/of.h
+Auto-merging kernel/events/core.c
+Auto-merging kernel/sched/core.c
+Resolved 'drivers/idle/intel_idle.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 3ccaebdf2875] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/pm/cpuidle.rst   |  15 +-
+ Documentation/core-api/protection-keys.rst |  44 +-
+ Documentation/staging/static-keys.rst      |   3 -
+ arch/arc/kernel/jump_label.c               |  13 -
+ arch/arm/kernel/jump_label.c               |   6 -
+ arch/arm64/kernel/jump_label.c             |  11 -
+ arch/mips/include/asm/jump_label.h         |   2 +
+ arch/mips/kernel/jump_label.c              |  19 +
+ arch/mips/kernel/module.c                  |   5 +-
+ arch/parisc/kernel/jump_label.c            |  11 -
+ arch/riscv/kernel/jump_label.c             |  12 -
+ arch/s390/include/asm/jump_label.h         |   5 +-
+ arch/s390/kernel/jump_label.c              |  28 +-
+ arch/s390/kernel/module.c                  |   1 -
+ arch/sparc/kernel/module.c                 |   3 -
+ arch/x86/Kconfig                           |   1 +
+ arch/x86/events/amd/uncore.c               | 146 +++++-
+ arch/x86/events/perf_event.h               |   3 +-
+ arch/x86/include/asm/cpufeatures.h         |   2 +-
+ arch/x86/include/asm/fpu/api.h             |   2 +
+ arch/x86/include/asm/mwait.h               |   1 +
+ arch/x86/include/asm/perf_event.h          |  16 +
+ arch/x86/include/asm/special_insns.h       |   9 +
+ arch/x86/include/uapi/asm/bootparam.h      |   9 +
+ arch/x86/kernel/cpu/mce/inject.c           |  47 ++
+ arch/x86/kernel/cpu/mce/internal.h         |   2 +-
+ arch/x86/kernel/cpu/vmware.c               |   4 +-
+ arch/x86/kernel/e820.c                     |   6 +-
+ arch/x86/kernel/fpu/core.c                 |  14 +
+ arch/x86/kernel/jump_label.c               |  13 -
+ arch/x86/kernel/kexec-bzimage64.c          |  42 +-
+ arch/x86/kernel/module.c                   |   3 -
+ arch/x86/kernel/pmem.c                     |   7 +-
+ arch/x86/kernel/process.c                  |  44 +-
+ arch/x86/kernel/setup.c                    |  63 +++
+ arch/x86/mm/pkeys.c                        |  15 +-
+ arch/x86/mm/tlb.c                          |  18 +-
+ drivers/idle/intel_idle.c                  |  25 +-
+ drivers/of/kexec.c                         |  13 +-
+ drivers/powercap/dtpm_cpu.c                |  33 +-
+ drivers/thermal/cpufreq_cooling.c          |   6 +-
+ include/linux/ima.h                        |   5 +
+ include/linux/jump_label.h                 |   9 +-
+ include/linux/lockdep.h                    |  30 +-
+ include/linux/of.h                         |   2 -
+ include/linux/perf_event.h                 |   2 +
+ include/linux/sched.h                      |   2 +-
+ include/linux/sched/topology.h             |   1 +
+ include/uapi/linux/perf_event.h            |   5 +-
+ kernel/events/core.c                       |  21 +-
+ kernel/events/ring_buffer.c                |   5 +-
+ kernel/irq/pm.c                            |   2 -
+ kernel/jump_label.c                        |  41 +-
+ kernel/locking/lockdep.c                   |   7 +-
+ kernel/sched/core.c                        | 183 ++++---
+ kernel/sched/cpufreq_schedutil.c           |   5 +-
+ kernel/sched/deadline.c                    |   6 +-
+ kernel/sched/fair.c                        | 764 ++++++++++++++++++-----------
+ kernel/sched/features.h                    |   3 +-
+ kernel/sched/pelt.h                        |  40 +-
+ kernel/sched/sched.h                       |  63 ++-
+ kernel/sched/topology.c                    |  23 +-
+ security/integrity/ima/ima_kexec.c         |   2 +-
+ tools/testing/selftests/rseq/rseq-riscv.h  |  50 +-
+ tools/testing/selftests/rseq/rseq.c        |   3 +-
+ 65 files changed, 1285 insertions(+), 711 deletions(-)
+Merging clockevents/timers/drivers/next (ff714ee7191b clocksource/drivers/timer-ti-dm: Add compatible for am6 SoCs)
+$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next
+Auto-merging arch/arm/mach-omap2/Kconfig
+Auto-merging drivers/clocksource/Kconfig
+Auto-merging drivers/clocksource/Makefile
+Auto-merging drivers/clocksource/timer-ti-dm.c
+Merge made by the 'ort' strategy.
+ arch/arm/mach-omap2/Kconfig       |   2 +
+ drivers/clocksource/Kconfig       |   8 ++-
+ drivers/clocksource/Makefile      |   2 +-
+ drivers/clocksource/timer-ti-dm.c | 123 ++++++++++++++++++++++++++++++++
+ include/clocksource/timer-ti-dm.h | 144 --------------------------------------
+ 5 files changed, 133 insertions(+), 146 deletions(-)
+Merging edac/edac-for-next (92705c9f9956 Merge edac-misc into for-next)
+$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next
+Auto-merging drivers/edac/synopsys_edac.c
+Merge made by the 'ort' strategy.
+ drivers/edac/synopsys_edac.c | 44 +++++++++++++++++++++++++-------------------
+ 1 file changed, 25 insertions(+), 19 deletions(-)
+Merging irqchip/irq/irqchip-next (5d796a6dbe0a Merge branch irq/misc-5.20 into irq/irqchip-next)
+$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next
+Auto-merging arch/parisc/kernel/irq.c
+Auto-merging arch/sh/kernel/irq.c
+Auto-merging drivers/irqchip/Kconfig
+Auto-merging include/linux/gpio/driver.h
+Merge made by the 'ort' strategy.
+ .../interrupt-controller/renesas,rzg2l-irqc.yaml   | 133 +++++++
+ .../interrupt-controller/sifive,plic-1.0.0.yaml    |  65 +++-
+ .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml    |  15 +
+ arch/alpha/kernel/irq.c                            |   2 +-
+ arch/arm/mach-hisi/Kconfig                         |   2 +-
+ arch/ia64/kernel/iosapic.c                         |   2 +-
+ arch/ia64/kernel/irq.c                             |   4 +-
+ arch/ia64/kernel/msi_ia64.c                        |   4 +-
+ arch/mips/cavium-octeon/octeon-irq.c               |   4 +-
+ arch/parisc/kernel/irq.c                           |   2 +-
+ arch/sh/kernel/irq.c                               |   7 +-
+ arch/x86/hyperv/irqdomain.c                        |   2 +-
+ arch/xtensa/kernel/irq.c                           |   7 +-
+ drivers/gpio/gpio-msc313.c                         |  15 +-
+ drivers/gpio/gpio-tegra.c                          |  15 +-
+ drivers/gpio/gpio-tegra186.c                       |  15 +-
+ drivers/gpio/gpio-thunderx.c                       |  17 +-
+ drivers/gpio/gpio-visconti.c                       |  15 +-
+ drivers/gpio/gpiolib.c                             |  51 ++-
+ drivers/iommu/hyperv-iommu.c                       |   2 +-
+ drivers/irqchip/Kconfig                            |  28 +-
+ drivers/irqchip/Makefile                           |   1 +
+ drivers/irqchip/irq-bcm6345-l1.c                   |   4 +-
+ drivers/irqchip/irq-mips-gic.c                     |  80 +++--
+ drivers/irqchip/irq-renesas-rzg2l.c                | 393 +++++++++++++++++++++
+ drivers/irqchip/irq-sifive-plic.c                  | 142 ++++++--
+ drivers/irqchip/irq-stm32-exti.c                   | 250 +++++++------
+ drivers/parisc/iosapic.c                           |   2 +-
+ drivers/pci/controller/pci-hyperv.c                |  12 +-
+ drivers/pinctrl/qcom/pinctrl-spmi-gpio.c           |  15 +-
+ drivers/pinctrl/renesas/pinctrl-rzg2l.c            | 233 ++++++++++++
+ drivers/sh/intc/chip.c                             |   2 +-
+ drivers/xen/events/events_base.c                   |   7 +-
+ include/linux/gpio/driver.h                        |  42 +--
+ include/linux/irq.h                                |  34 +-
+ include/linux/irqdesc.h                            |   5 +-
+ kernel/irq/Kconfig                                 |   2 +
+ kernel/irq/chip.c                                  |  11 +-
+ kernel/irq/debugfs.c                               |   2 +-
+ kernel/irq/ipi.c                                   |  16 +-
+ kernel/irq/manage.c                                |  10 +-
+ 41 files changed, 1301 insertions(+), 369 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,rzg2l-irqc.yaml
+ create mode 100644 drivers/irqchip/irq-renesas-rzg2l.c
+Merging ftrace/for-next (01dca6d03bb3 Merge branch 'trace/for-next-rtla' into trace/for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/for-next
+Merge made by the 'ort' strategy.
+Merging rcu/rcu/next (88cea4e18ed4 rcu: Make tiny RCU support leak callbacks for debug-object errors)
+$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging Documentation/memory-barriers.txt
+Auto-merging MAINTAINERS
+Auto-merging arch/Kconfig
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/arm/kernel/entry-common.S
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/loongarch/Kconfig
+CONFLICT (content): Merge conflict in arch/loongarch/Kconfig
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/riscv/Kconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/xtensa/Kconfig
+Auto-merging arch/xtensa/kernel/entry.S
+Auto-merging drivers/acpi/processor_idle.c
+Auto-merging include/linux/sched.h
+Auto-merging init/Kconfig
+Auto-merging kernel/locking/lockdep.c
+Auto-merging kernel/rcu/tree_stall.h
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/sched/sched.h
+Auto-merging kernel/time/tick-sched.c
+Auto-merging kernel/trace/trace.c
+Resolved 'arch/loongarch/Kconfig' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master d8abdd88679f] Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
+$ git diff -M --stat --summary HEAD^..
+ .../RCU/Design/Requirements/Requirements.rst       |  10 +-
+ Documentation/RCU/checklist.rst                    |   9 +-
+ Documentation/RCU/stallwarn.rst                    |   6 +-
+ Documentation/admin-guide/kernel-parameters.txt    |  58 ++
+ .../time/context-tracking/arch-support.txt         |   6 +-
+ .../litmus-tests/locking/DCL-broken.litmus         |  55 ++
+ .../litmus-tests/locking/DCL-fixed.litmus          |  56 ++
+ .../litmus-tests/locking/RM-broken.litmus          |  42 ++
+ Documentation/litmus-tests/locking/RM-fixed.litmus |  42 ++
+ Documentation/memory-barriers.txt                  | 177 +++---
+ MAINTAINERS                                        |   1 +
+ arch/Kconfig                                       |   8 +-
+ arch/arm/Kconfig                                   |   2 +-
+ arch/arm/kernel/entry-common.S                     |   4 +-
+ arch/arm/kernel/entry-header.S                     |  12 +-
+ arch/arm/mach-imx/cpuidle-imx6q.c                  |   5 +-
+ arch/arm64/Kconfig                                 |   2 +-
+ arch/arm64/kernel/entry-common.c                   |  14 +-
+ arch/csky/Kconfig                                  |   2 +-
+ arch/csky/kernel/entry.S                           |   8 +-
+ arch/loongarch/Kconfig                             |   2 +-
+ arch/mips/Kconfig                                  |   2 +-
+ arch/powerpc/Kconfig                               |   2 +-
+ arch/powerpc/include/asm/context_tracking.h        |   2 +-
+ arch/riscv/Kconfig                                 |   2 +-
+ arch/riscv/kernel/entry.S                          |  12 +-
+ arch/sparc/Kconfig                                 |   2 +-
+ arch/sparc/kernel/rtrap_64.S                       |   2 +-
+ arch/x86/Kconfig                                   |   4 +-
+ arch/x86/mm/fault.c                                |   2 +-
+ arch/xtensa/Kconfig                                |   2 +-
+ arch/xtensa/kernel/entry.S                         |   8 +-
+ drivers/acpi/processor_idle.c                      |   5 +-
+ drivers/cpuidle/cpuidle-psci.c                     |   8 +-
+ drivers/cpuidle/cpuidle-riscv-sbi.c                |   8 +-
+ drivers/cpuidle/cpuidle.c                          |   9 +-
+ include/linux/context_tracking.h                   |  95 +--
+ include/linux/context_tracking_irq.h               |  21 +
+ include/linux/context_tracking_state.h             | 113 +++-
+ include/linux/entry-common.h                       |  10 +-
+ include/linux/hardirq.h                            |  12 +-
+ include/linux/rcupdate.h                           |  45 +-
+ include/linux/rcupdate_trace.h                     |   2 +-
+ include/linux/rcutiny.h                            |  27 +-
+ include/linux/rcutree.h                            |  11 +-
+ include/linux/sched.h                              |   4 +-
+ include/linux/tracepoint.h                         |   4 +-
+ init/Kconfig                                       |   4 +-
+ init/init_task.c                                   |   1 +
+ kernel/cfi.c                                       |   4 +-
+ kernel/context_tracking.c                          | 617 ++++++++++++++++--
+ kernel/cpu_pm.c                                    |   8 +-
+ kernel/entry/common.c                              |  16 +-
+ kernel/extable.c                                   |   4 +-
+ kernel/fork.c                                      |   1 +
+ kernel/locking/lockdep.c                           |   2 +-
+ kernel/rcu/Kconfig                                 |  31 +
+ kernel/rcu/Kconfig.debug                           |   2 +-
+ kernel/rcu/rcu.h                                   |  19 +-
+ kernel/rcu/rcuscale.c                              |   1 +
+ kernel/rcu/rcutorture.c                            | 247 +++++---
+ kernel/rcu/refscale.c                              |  18 +-
+ kernel/rcu/srcutree.c                              |  98 ++-
+ kernel/rcu/tasks.h                                 | 541 ++++++++++------
+ kernel/rcu/tiny.c                                  |  42 +-
+ kernel/rcu/tree.c                                  | 692 ++++++---------------
+ kernel/rcu/tree.h                                  |  21 +-
+ kernel/rcu/tree_exp.h                              | 119 +++-
+ kernel/rcu/tree_nocb.h                             | 272 +++++---
+ kernel/rcu/tree_plugin.h                           |  94 ++-
+ kernel/rcu/tree_stall.h                            |  55 +-
+ kernel/rcu/update.c                                |  15 +-
+ kernel/sched/core.c                                |  34 +-
+ kernel/sched/idle.c                                |  10 +-
+ kernel/sched/sched.h                               |   1 +
+ kernel/smp.c                                       |   4 +-
+ kernel/softirq.c                                   |   4 +-
+ kernel/time/Kconfig                                |  37 +-
+ kernel/time/tick-sched.c                           |   2 +-
+ kernel/torture.c                                   |   7 +
+ kernel/trace/trace.c                               |   8 +-
+ tools/Makefile                                     |   3 +
+ tools/include/nolibc/Makefile                      |  37 +-
+ tools/include/nolibc/stdio.h                       |   4 +-
+ tools/include/nolibc/stdlib.h                      |   7 +-
+ tools/memory-model/Documentation/litmus-tests.txt  |  37 +-
+ tools/memory-model/Documentation/locking.txt       | 320 ++++++++++
+ tools/memory-model/linux-kernel.bell               |  16 +-
+ tools/memory-model/litmus-tests/.gitignore         |   2 +-
+ tools/memory-model/scripts/README                  |  16 +-
+ tools/memory-model/scripts/checkalllitmus.sh       |  29 +-
+ tools/memory-model/scripts/checkghlitmus.sh        |  11 +-
+ tools/memory-model/scripts/checklitmus.sh          |  25 +-
+ tools/memory-model/scripts/checklitmushist.sh      |   2 +-
+ tools/memory-model/scripts/checktheselitmus.sh     |  43 ++
+ tools/memory-model/scripts/cmplitmushist.sh        |  49 +-
+ tools/memory-model/scripts/hwfnseg.sh              |  20 +
+ tools/memory-model/scripts/initlitmushist.sh       |   2 +-
+ tools/memory-model/scripts/judgelitmus.sh          | 120 +++-
+ tools/memory-model/scripts/newlitmushist.sh        |   4 +-
+ tools/memory-model/scripts/parseargs.sh            |  21 +-
+ tools/memory-model/scripts/runlitmus.sh            |  80 +++
+ tools/memory-model/scripts/runlitmushist.sh        |  29 +-
+ tools/memory-model/scripts/simpletest.sh           |  35 ++
+ .../selftests/rcutorture/bin/kvm-check-branches.sh |  11 +-
+ .../testing/selftests/rcutorture/bin/kvm-remote.sh |   1 +
+ tools/testing/selftests/rcutorture/bin/kvm.sh      |   6 +-
+ 107 files changed, 3372 insertions(+), 1524 deletions(-)
+ create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus
+ create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus
+ create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus
+ create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus
+ create mode 100644 include/linux/context_tracking_irq.h
+ create mode 100644 tools/memory-model/Documentation/locking.txt
+ create mode 100755 tools/memory-model/scripts/checktheselitmus.sh
+ create mode 100755 tools/memory-model/scripts/hwfnseg.sh
+ create mode 100755 tools/memory-model/scripts/runlitmus.sh
+ create mode 100755 tools/memory-model/scripts/simpletest.sh
+Merging kvm/next (4b88b1a518b3 KVM: selftests: Enhance handling WRMSR ICR register in x2APIC mode)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging Documentation/virt/kvm/api.rst
+Auto-merging arch/riscv/kvm/mmu.c
+Auto-merging arch/x86/events/perf_event.h
+Auto-merging arch/x86/include/asm/msr-index.h
+Auto-merging arch/x86/include/asm/perf_event.h
+Auto-merging arch/x86/kvm/emulate.c
+Auto-merging arch/x86/kvm/svm/sev.c
+Auto-merging arch/x86/kvm/svm/svm.c
+Auto-merging arch/x86/kvm/svm/svm.h
+Auto-merging arch/x86/kvm/vmx/capabilities.h
+CONFLICT (content): Merge conflict in arch/x86/kvm/vmx/capabilities.h
+Auto-merging arch/x86/kvm/vmx/nested.c
+Auto-merging arch/x86/kvm/vmx/vmx.c
+Auto-merging arch/x86/kvm/vmx/vmx.c
+Auto-merging arch/x86/kvm/vmx/vmx.h
+Auto-merging arch/x86/kvm/x86.c
+Auto-merging arch/x86/kvm/x86.c
+CONFLICT (content): Merge conflict in arch/x86/kvm/x86.c
+Auto-merging include/linux/kvm_host.h
+Auto-merging include/uapi/linux/kvm.h
+Auto-merging tools/testing/selftests/kvm/lib/aarch64/ucall.c
+CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/lib/aarch64/ucall.c
+Auto-merging tools/testing/selftests/kvm/s390x/memop.c
+CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/s390x/memop.c
+Auto-merging tools/testing/selftests/kvm/s390x/resets.c
+CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/s390x/resets.c
+Auto-merging tools/testing/selftests/kvm/s390x/sync_regs_test.c
+CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/s390x/sync_regs_test.c
+Auto-merging tools/testing/selftests/kvm/s390x/tprot.c
+CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/s390x/tprot.c
+Auto-merging virt/kvm/kvm_main.c
+Auto-merging virt/kvm/kvm_main.c
+Resolved 'arch/x86/kvm/vmx/capabilities.h' using previous resolution.
+Recorded preimage for 'arch/x86/kvm/x86.c'
+Resolved 'tools/testing/selftests/kvm/lib/aarch64/ucall.c' using previous resolution.
+Resolved 'tools/testing/selftests/kvm/s390x/memop.c' using previous resolution.
+Resolved 'tools/testing/selftests/kvm/s390x/resets.c' using previous resolution.
+Resolved 'tools/testing/selftests/kvm/s390x/sync_regs_test.c' using previous resolution.
+Resolved 'tools/testing/selftests/kvm/s390x/tprot.c' 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/x86.c'.
+[master 520c3d3e813f] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/kernel-parameters.txt    |    3 +-
+ Documentation/virt/kvm/api.rst                     |  273 ++++-
+ Documentation/virt/kvm/s390/index.rst              |    1 +
+ Documentation/virt/kvm/s390/s390-pv-dump.rst       |   64 ++
+ arch/arm64/kvm/mmu.c                               |    2 +-
+ arch/riscv/kvm/mmu.c                               |    5 +-
+ arch/s390/boot/uv.c                                |    4 +
+ arch/s390/include/asm/kvm_host.h                   |    1 +
+ arch/s390/include/asm/uv.h                         |   45 +-
+ arch/s390/kernel/uv.c                              |   53 +
+ arch/s390/kvm/kvm-s390.c                           |  271 ++++-
+ arch/s390/kvm/kvm-s390.h                           |    5 +
+ arch/s390/kvm/pv.c                                 |  198 ++++
+ arch/x86/events/core.c                             |   28 +-
+ arch/x86/events/intel/core.c                       |  160 ++-
+ arch/x86/events/perf_event.h                       |    6 +-
+ arch/x86/include/asm/kvm-x86-ops.h                 |    1 +
+ arch/x86/include/asm/kvm-x86-pmu-ops.h             |    2 +-
+ arch/x86/include/asm/kvm_host.h                    |   82 +-
+ arch/x86/include/asm/msr-index.h                   |    7 +
+ arch/x86/include/asm/perf_event.h                  |   11 +-
+ arch/x86/include/asm/vmx.h                         |   18 +
+ arch/x86/include/asm/vmxfeatures.h                 |    6 +-
+ arch/x86/include/uapi/asm/kvm.h                    |   10 +-
+ arch/x86/include/uapi/asm/vmx.h                    |    4 +-
+ arch/x86/kernel/cpu/feat_ctl.c                     |    9 +-
+ arch/x86/kernel/kvm.c                              |    3 +-
+ arch/x86/kvm/cpuid.c                               |   35 +-
+ arch/x86/kvm/cpuid.h                               |    5 +
+ arch/x86/kvm/debugfs.c                             |    4 +-
+ arch/x86/kvm/emulate.c                             |   26 +-
+ arch/x86/kvm/i8254.c                               |   10 +-
+ arch/x86/kvm/i8254.h                               |    1 -
+ arch/x86/kvm/kvm_emulate.h                         |   28 +-
+ arch/x86/kvm/lapic.c                               |  131 ++-
+ arch/x86/kvm/lapic.h                               |   19 +-
+ arch/x86/kvm/mmu.h                                 |   10 -
+ arch/x86/kvm/mmu/mmu.c                             |  792 +++++++++----
+ arch/x86/kvm/mmu/mmu_internal.h                    |   38 +-
+ arch/x86/kvm/mmu/paging.h                          |   14 -
+ arch/x86/kvm/mmu/paging_tmpl.h                     |  116 +-
+ arch/x86/kvm/mmu/spte.c                            |   22 +-
+ arch/x86/kvm/mmu/spte.h                            |   31 +-
+ arch/x86/kvm/mmu/tdp_iter.c                        |    6 +-
+ arch/x86/kvm/mmu/tdp_mmu.c                         |   24 +-
+ arch/x86/kvm/pmu.c                                 |  212 ++--
+ arch/x86/kvm/pmu.h                                 |   45 +-
+ arch/x86/kvm/svm/nested.c                          |   63 +-
+ arch/x86/kvm/svm/pmu.c                             |   62 +-
+ arch/x86/kvm/svm/sev.c                             |   17 +-
+ arch/x86/kvm/svm/svm.c                             |  180 ++-
+ arch/x86/kvm/svm/svm.h                             |   12 +-
+ arch/x86/kvm/trace.h                               |   31 +-
+ arch/x86/kvm/vmx/capabilities.h                    |   57 +-
+ arch/x86/kvm/vmx/evmcs.c                           |    2 +
+ arch/x86/kvm/vmx/evmcs.h                           |    1 +
+ arch/x86/kvm/vmx/nested.c                          |   67 +-
+ arch/x86/kvm/vmx/pmu_intel.c                       |  187 ++-
+ arch/x86/kvm/vmx/posted_intr.c                     |   17 +-
+ arch/x86/kvm/vmx/posted_intr.h                     |    2 +
+ arch/x86/kvm/vmx/vmcs.h                            |    1 +
+ arch/x86/kvm/vmx/vmx.c                             |  322 +++++-
+ arch/x86/kvm/vmx/vmx.h                             |   83 +-
+ arch/x86/kvm/x86.c                                 |  489 +++++---
+ arch/x86/kvm/x86.h                                 |   33 +-
+ include/linux/kvm_host.h                           |   13 +-
+ include/linux/kvm_types.h                          |    6 +-
+ include/uapi/linux/kvm.h                           |   68 ++
+ tools/testing/selftests/kvm/.gitignore             |    8 +-
+ tools/testing/selftests/kvm/Makefile               |   15 +
+ tools/testing/selftests/kvm/aarch64/arch_timer.c   |   79 +-
+ .../selftests/kvm/aarch64/debug-exceptions.c       |   22 +-
+ tools/testing/selftests/kvm/aarch64/get-reg-list.c |   30 +-
+ tools/testing/selftests/kvm/aarch64/hypercalls.c   |   90 +-
+ tools/testing/selftests/kvm/aarch64/psci_test.c    |   69 +-
+ .../selftests/kvm/aarch64/vcpu_width_config.c      |   71 +-
+ tools/testing/selftests/kvm/aarch64/vgic_init.c    |  443 ++++---
+ tools/testing/selftests/kvm/aarch64/vgic_irq.c     |   40 +-
+ .../selftests/kvm/access_tracking_perf_test.c      |   92 +-
+ tools/testing/selftests/kvm/demand_paging_test.c   |   49 +-
+ tools/testing/selftests/kvm/dirty_log_perf_test.c  |   51 +-
+ tools/testing/selftests/kvm/dirty_log_test.c       |   95 +-
+ .../testing/selftests/kvm/hardware_disable_test.c  |   29 +-
+ .../selftests/kvm/include/aarch64/processor.h      |   28 +-
+ tools/testing/selftests/kvm/include/aarch64/vgic.h |    6 +-
+ .../testing/selftests/kvm/include/kvm_util_base.h  |  809 +++++++++----
+ .../testing/selftests/kvm/include/perf_test_util.h |    7 +-
+ .../selftests/kvm/include/riscv/processor.h        |   20 -
+ tools/testing/selftests/kvm/include/test_util.h    |    7 +
+ tools/testing/selftests/kvm/include/ucall_common.h |    2 +-
+ tools/testing/selftests/kvm/include/x86_64/apic.h  |    1 +
+ tools/testing/selftests/kvm/include/x86_64/evmcs.h |    2 +-
+ tools/testing/selftests/kvm/include/x86_64/mce.h   |   25 +
+ .../selftests/kvm/include/x86_64/processor.h       |  200 +++-
+ .../selftests/kvm/include/x86_64/svm_util.h        |   12 +
+ .../testing/selftests/kvm/kvm_binary_stats_test.c  |  169 ++-
+ tools/testing/selftests/kvm/kvm_create_max_vcpus.c |   10 +-
+ tools/testing/selftests/kvm/kvm_page_table_test.c  |   66 +-
+ .../testing/selftests/kvm/lib/aarch64/processor.c  |   81 +-
+ tools/testing/selftests/kvm/lib/aarch64/ucall.c    |   13 +-
+ tools/testing/selftests/kvm/lib/aarch64/vgic.c     |   54 +-
+ tools/testing/selftests/kvm/lib/elf.c              |    1 -
+ tools/testing/selftests/kvm/lib/guest_modes.c      |    6 +-
+ tools/testing/selftests/kvm/lib/kvm_util.c         | 1212 +++++---------------
+ .../testing/selftests/kvm/lib/kvm_util_internal.h  |  128 ---
+ tools/testing/selftests/kvm/lib/perf_test_util.c   |   92 +-
+ tools/testing/selftests/kvm/lib/riscv/processor.c  |  111 +-
+ tools/testing/selftests/kvm/lib/riscv/ucall.c      |   16 +-
+ .../selftests/kvm/lib/s390x/diag318_test_handler.c |   11 +-
+ tools/testing/selftests/kvm/lib/s390x/processor.c  |   44 +-
+ tools/testing/selftests/kvm/lib/s390x/ucall.c      |   10 +-
+ .../selftests/kvm/lib/x86_64/perf_test_util.c      |    9 +-
+ tools/testing/selftests/kvm/lib/x86_64/processor.c |  550 ++++-----
+ tools/testing/selftests/kvm/lib/x86_64/svm.c       |    6 +-
+ tools/testing/selftests/kvm/lib/x86_64/ucall.c     |   12 +-
+ tools/testing/selftests/kvm/lib/x86_64/vmx.c       |   16 +-
+ .../testing/selftests/kvm/max_guest_memory_test.c  |   53 +-
+ .../kvm/memslot_modification_stress_test.c         |   13 +-
+ tools/testing/selftests/kvm/memslot_perf_test.c    |   28 +-
+ tools/testing/selftests/kvm/rseq_test.c            |   22 +-
+ tools/testing/selftests/kvm/s390x/memop.c          |   95 +-
+ tools/testing/selftests/kvm/s390x/resets.c         |  140 ++-
+ tools/testing/selftests/kvm/s390x/sync_regs_test.c |   64 +-
+ tools/testing/selftests/kvm/s390x/tprot.c          |   31 +-
+ .../testing/selftests/kvm/set_memory_region_test.c |   43 +-
+ tools/testing/selftests/kvm/steal_time.c           |  120 +-
+ .../selftests/kvm/system_counter_offset_test.c     |   35 +-
+ tools/testing/selftests/kvm/x86_64/amx_test.c      |   56 +-
+ tools/testing/selftests/kvm/x86_64/cpuid_test.c    |   29 +-
+ .../selftests/kvm/x86_64/cr4_cpuid_sync_test.c     |   22 +-
+ tools/testing/selftests/kvm/x86_64/debug_regs.c    |   77 +-
+ .../selftests/kvm/x86_64/emulator_error_test.c     |   74 +-
+ tools/testing/selftests/kvm/x86_64/evmcs_test.c    |   62 +-
+ .../selftests/kvm/x86_64/fix_hypercall_test.c      |   45 +-
+ .../selftests/kvm/x86_64/get_msr_index_features.c  |  117 +-
+ tools/testing/selftests/kvm/x86_64/hyperv_clock.c  |   25 +-
+ tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c  |   34 +-
+ .../testing/selftests/kvm/x86_64/hyperv_features.c |  296 ++---
+ .../testing/selftests/kvm/x86_64/hyperv_svm_test.c |   25 +-
+ .../testing/selftests/kvm/x86_64/kvm_clock_test.c  |   29 +-
+ tools/testing/selftests/kvm/x86_64/kvm_pv_test.c   |  107 +-
+ .../selftests/kvm/x86_64/max_vcpuid_cap_test.c     |   44 +
+ .../selftests/kvm/x86_64/mmio_warning_test.c       |   16 +-
+ tools/testing/selftests/kvm/x86_64/mmu_role_test.c |   30 +-
+ .../selftests/kvm/x86_64/monitor_mwait_test.c      |  137 +++
+ .../selftests/kvm/x86_64/nx_huge_pages_test.c      |  269 +++++
+ .../selftests/kvm/x86_64/nx_huge_pages_test.sh     |   59 +
+ .../selftests/kvm/x86_64/platform_info_test.c      |   51 +-
+ .../selftests/kvm/x86_64/pmu_event_filter_test.c   |  103 +-
+ .../testing/selftests/kvm/x86_64/set_boot_cpu_id.c |   91 +-
+ .../testing/selftests/kvm/x86_64/set_sregs_test.c  |   47 +-
+ .../selftests/kvm/x86_64/sev_migrate_tests.c       |  126 +-
+ tools/testing/selftests/kvm/x86_64/smm_test.c      |   39 +-
+ tools/testing/selftests/kvm/x86_64/state_test.c    |   31 +-
+ .../selftests/kvm/x86_64/svm_int_ctl_test.c        |   21 +-
+ .../kvm/x86_64/svm_nested_soft_inject_test.c       |  216 ++++
+ .../testing/selftests/kvm/x86_64/svm_vmcall_test.c |   16 +-
+ .../testing/selftests/kvm/x86_64/sync_regs_test.c  |   62 +-
+ .../selftests/kvm/x86_64/triple_fault_event_test.c |   90 ++
+ tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c |   35 +-
+ .../selftests/kvm/x86_64/tsc_scaling_sync.c        |   25 +-
+ .../selftests/kvm/x86_64/ucna_injection_test.c     |  316 +++++
+ .../selftests/kvm/x86_64/userspace_io_test.c       |   18 +-
+ .../selftests/kvm/x86_64/userspace_msr_exit_test.c |  187 ++-
+ .../selftests/kvm/x86_64/vmx_apic_access_test.c    |   27 +-
+ .../kvm/x86_64/vmx_close_while_nested_test.c       |   17 +-
+ .../selftests/kvm/x86_64/vmx_dirty_log_test.c      |   13 +-
+ .../vmx_exception_with_invalid_guest_state.c       |   68 +-
+ .../kvm/x86_64/vmx_invalid_nested_guest_state.c    |   18 +-
+ .../kvm/x86_64/vmx_nested_tsc_scaling_test.c       |   29 +-
+ .../selftests/kvm/x86_64/vmx_pmu_caps_test.c       |   48 +-
+ .../kvm/x86_64/vmx_preemption_timer_test.c         |   35 +-
+ .../kvm/x86_64/vmx_set_nested_state_test.c         |   91 +-
+ .../selftests/kvm/x86_64/vmx_tsc_adjust_test.c     |   13 +-
+ .../testing/selftests/kvm/x86_64/xapic_ipi_test.c  |   48 +-
+ .../selftests/kvm/x86_64/xapic_state_test.c        |   76 +-
+ .../testing/selftests/kvm/x86_64/xen_shinfo_test.c |   73 +-
+ .../testing/selftests/kvm/x86_64/xen_vmcall_test.c |   25 +-
+ tools/testing/selftests/kvm/x86_64/xss_msr_test.c  |   56 +-
+ virt/kvm/kvm_main.c                                |  193 +++-
+ 180 files changed, 8375 insertions(+), 5599 deletions(-)
+ create mode 100644 Documentation/virt/kvm/s390/s390-pv-dump.rst
+ delete mode 100644 arch/x86/kvm/mmu/paging.h
+ create mode 100644 tools/testing/selftests/kvm/include/x86_64/mce.h
+ delete mode 100644 tools/testing/selftests/kvm/lib/kvm_util_internal.h
+ create mode 100644 tools/testing/selftests/kvm/x86_64/max_vcpuid_cap_test.c
+ create mode 100644 tools/testing/selftests/kvm/x86_64/monitor_mwait_test.c
+ create mode 100644 tools/testing/selftests/kvm/x86_64/nx_huge_pages_test.c
+ create mode 100755 tools/testing/selftests/kvm/x86_64/nx_huge_pages_test.sh
+ create mode 100644 tools/testing/selftests/kvm/x86_64/svm_nested_soft_inject_test.c
+ create mode 100644 tools/testing/selftests/kvm/x86_64/triple_fault_event_test.c
+ create mode 100644 tools/testing/selftests/kvm/x86_64/ucna_injection_test.c
+Merging kvm-arm/next (df6b5b914e0c Merge branch kvm-arm64/misc-5.20 into kvmarm-master/next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next
+Auto-merging arch/arm64/kvm/arm.c
+Auto-merging arch/arm64/kvm/hyp/nvhe/Makefile
+Auto-merging arch/arm64/kvm/hyp/nvhe/sys_regs.c
+Auto-merging arch/arm64/kvm/sys_regs.c
+Merge made by the 'ort' strategy.
+ arch/arm64/include/asm/kvm_emulate.h       |  11 +-
+ arch/arm64/include/asm/kvm_host.h          | 203 +++++++++++++++++++++--------
+ arch/arm64/kvm/arch_timer.c                |   2 +-
+ arch/arm64/kvm/arm.c                       |  12 +-
+ arch/arm64/kvm/debug.c                     |  25 ++--
+ arch/arm64/kvm/fpsimd.c                    |  39 +++---
+ arch/arm64/kvm/handle_exit.c               |   2 +-
+ arch/arm64/kvm/hyp/exception.c             |  23 ++--
+ arch/arm64/kvm/hyp/include/hyp/debug-sr.h  |   6 +-
+ arch/arm64/kvm/hyp/include/hyp/switch.h    |  24 +---
+ arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h |   4 +-
+ arch/arm64/kvm/hyp/nvhe/Makefile           |  12 +-
+ arch/arm64/kvm/hyp/nvhe/debug-sr.c         |   8 +-
+ arch/arm64/kvm/hyp/nvhe/switch.c           |   8 +-
+ arch/arm64/kvm/hyp/nvhe/sys_regs.c         |   4 +-
+ arch/arm64/kvm/hyp/vhe/switch.c            |   6 +-
+ arch/arm64/kvm/hyp/vhe/sysreg-sr.c         |   4 +-
+ arch/arm64/kvm/inject_fault.c              |  17 +--
+ arch/arm64/kvm/reset.c                     |   6 +-
+ arch/arm64/kvm/sys_regs.c                  |  12 +-
+ 20 files changed, 256 insertions(+), 172 deletions(-)
+Merging kvms390/next (ff63b9bfa56d KVM: s390: pv: destroy the configuration before its memory)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next
+Auto-merging Documentation/virt/kvm/api.rst
+Auto-merging MAINTAINERS
+Auto-merging arch/s390/pci/pci_clp.c
+Auto-merging drivers/s390/crypto/ap_bus.c
+Auto-merging drivers/s390/virtio/virtio_ccw.c
+Auto-merging drivers/vfio/pci/vfio_pci_core.c
+Auto-merging include/uapi/linux/kvm.h
+Merge made by the 'ort' strategy.
+ Documentation/virt/kvm/api.rst      |  46 +++
+ MAINTAINERS                         |   1 +
+ arch/s390/boot/uv.c                 |   2 +
+ arch/s390/include/asm/airq.h        |   7 +-
+ arch/s390/include/asm/gmap.h        |  39 +-
+ arch/s390/include/asm/kvm_host.h    |  25 ++
+ arch/s390/include/asm/mmu.h         |   2 +-
+ arch/s390/include/asm/mmu_context.h |   2 +-
+ arch/s390/include/asm/pci.h         |  11 +
+ arch/s390/include/asm/pci_clp.h     |   9 +-
+ arch/s390/include/asm/pci_insn.h    |  29 +-
+ arch/s390/include/asm/pgtable.h     |  21 +-
+ arch/s390/include/asm/sclp.h        |   4 +
+ arch/s390/include/asm/tpi.h         |  13 +
+ arch/s390/include/asm/uv.h          |   8 +-
+ arch/s390/kernel/uv.c               | 103 ++++++
+ arch/s390/kvm/Kconfig               |   1 +
+ arch/s390/kvm/Makefile              |   1 +
+ arch/s390/kvm/interrupt.c           |  98 ++++-
+ arch/s390/kvm/kvm-s390.c            | 129 ++++++-
+ arch/s390/kvm/kvm-s390.h            |  11 +
+ arch/s390/kvm/pci.c                 | 690 ++++++++++++++++++++++++++++++++++++
+ arch/s390/kvm/pci.h                 |  87 +++++
+ arch/s390/kvm/pv.c                  |  71 +++-
+ arch/s390/mm/fault.c                |  23 +-
+ arch/s390/mm/gmap.c                 | 177 +++++++--
+ arch/s390/pci/pci.c                 |  16 +
+ arch/s390/pci/pci_clp.c             |   7 +
+ arch/s390/pci/pci_insn.c            |   4 +-
+ arch/s390/pci/pci_irq.c             |  48 +--
+ arch/s390/tools/gen_facilities.c    |   1 +
+ drivers/s390/char/sclp_early.c      |   4 +
+ drivers/s390/cio/airq.c             |  12 +-
+ drivers/s390/cio/qdio_thinint.c     |   6 +-
+ drivers/s390/crypto/ap_bus.c        |   9 +-
+ drivers/s390/virtio/virtio_ccw.c    |   6 +-
+ drivers/vfio/pci/Kconfig            |  11 +
+ drivers/vfio/pci/Makefile           |   2 +-
+ drivers/vfio/pci/vfio_pci_core.c    |  10 +-
+ drivers/vfio/pci/vfio_pci_zdev.c    |  35 +-
+ include/linux/sched/user.h          |   3 +-
+ include/linux/vfio_pci_core.h       |  12 +-
+ include/uapi/linux/kvm.h            |  31 ++
+ include/uapi/linux/vfio_zdev.h      |   7 +
+ 44 files changed, 1725 insertions(+), 109 deletions(-)
+ create mode 100644 arch/s390/kvm/pci.c
+ create mode 100644 arch/s390/kvm/pci.h
+Merging xen-tip/linux-next (a47336535f0f xen: don't require virtio with grants for non-PV guests)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS                            |  8 --------
+ arch/arm/xen/enlighten.c               |  4 +++-
+ arch/s390/mm/init.c                    |  4 ++--
+ arch/x86/mm/mem_encrypt_amd.c          |  4 ++--
+ arch/x86/xen/enlighten_hvm.c           |  4 +++-
+ arch/x86/xen/enlighten_pv.c            |  5 ++++-
+ drivers/virtio/Kconfig                 |  4 ++++
+ drivers/virtio/Makefile                |  1 +
+ drivers/virtio/virtio.c                |  4 ++--
+ drivers/virtio/virtio_anchor.c         | 18 ++++++++++++++++++
+ drivers/xen/Kconfig                    |  9 +++++++++
+ drivers/xen/gntdev.c                   |  6 ++++--
+ drivers/xen/grant-dma-ops.c            | 10 ++++++++++
+ drivers/xen/manage.c                   |  2 +-
+ drivers/xen/xen-front-pgdir-shbuf.c    |  4 ++--
+ include/asm-generic/Kbuild             |  1 -
+ include/asm-generic/platform-feature.h |  8 --------
+ include/linux/platform-feature.h       | 19 -------------------
+ include/linux/virtio_anchor.h          | 19 +++++++++++++++++++
+ include/xen/xen-ops.h                  |  9 +++++++++
+ include/xen/xen.h                      |  8 --------
+ kernel/Makefile                        |  2 +-
+ kernel/platform-feature.c              | 27 ---------------------------
+ 23 files changed, 94 insertions(+), 86 deletions(-)
+ create mode 100644 drivers/virtio/virtio_anchor.c
+ delete mode 100644 include/asm-generic/platform-feature.h
+ delete mode 100644 include/linux/platform-feature.h
+ create mode 100644 include/linux/virtio_anchor.h
+ delete mode 100644 kernel/platform-feature.c
+Merging percpu/for-next (a111daf0c53a Linux 5.19-rc3)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next
+Already up to date.
+Merging workqueues/for-next (8bee9dd953b6 workqueue: Switch to new kerneldoc syntax for named variable macro argument)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next
+Already up to date.
+Merging drivers-x86/for-next (fe16ecaa0e62 platform/x86: intel_atomisp2_led: Also turn off the always-on camera LED on the Asus T100TAF)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/acpi/acpi_video.c
+CONFLICT (content): Merge conflict in drivers/acpi/acpi_video.c
+Auto-merging drivers/platform/surface/surface_aggregator_cdev.c
+Auto-merging drivers/platform/surface/surface_dtx.c
+Auto-merging drivers/platform/x86/Kconfig
+Auto-merging drivers/platform/x86/panasonic-laptop.c
+Auto-merging drivers/platform/x86/thinkpad_acpi.c
+Recorded preimage for 'drivers/acpi/acpi_video.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'drivers/acpi/acpi_video.c'.
+[master 2419a9cfd9e2] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
+$ git diff -M --stat --summary HEAD^..
+ .../testing/sysfs-bus-surface_aggregator-tabletsw  |  57 +++
+ .../driver-api/surface_aggregator/client.rst       |   6 +-
+ MAINTAINERS                                        |  16 +-
+ drivers/clk/x86/Makefile                           |   4 +-
+ drivers/hid/surface-hid/surface_hid_core.c         |  38 +-
+ drivers/platform/Kconfig                           |   5 +-
+ drivers/platform/surface/Kconfig                   |  58 ++-
+ drivers/platform/surface/Makefile                  |   2 +
+ drivers/platform/surface/aggregator/Kconfig        |   2 +-
+ drivers/platform/surface/aggregator/Makefile       |   2 +-
+ drivers/platform/surface/aggregator/bus.c          | 151 +++++-
+ drivers/platform/surface/aggregator/bus.h          |   2 +-
+ drivers/platform/surface/aggregator/controller.c   |  55 ++-
+ drivers/platform/surface/aggregator/controller.h   |   2 +-
+ drivers/platform/surface/aggregator/core.c         |   2 +-
+ drivers/platform/surface/aggregator/ssh_msgb.h     |   2 +-
+ .../platform/surface/aggregator/ssh_packet_layer.c |   2 +-
+ .../platform/surface/aggregator/ssh_packet_layer.h |   2 +-
+ drivers/platform/surface/aggregator/ssh_parser.c   |   2 +-
+ drivers/platform/surface/aggregator/ssh_parser.h   |   2 +-
+ .../surface/aggregator/ssh_request_layer.c         |   2 +-
+ .../surface/aggregator/ssh_request_layer.h         |   2 +-
+ drivers/platform/surface/aggregator/trace.h        |  82 ++--
+ drivers/platform/surface/surface_acpi_notify.c     |  29 +-
+ drivers/platform/surface/surface_aggregator_cdev.c |   2 +-
+ drivers/platform/surface/surface_aggregator_hub.c  | 371 ++++++++++++++
+ .../platform/surface/surface_aggregator_registry.c | 362 ++------------
+ .../platform/surface/surface_aggregator_tabletsw.c | 533 +++++++++++++++++++++
+ drivers/platform/surface/surface_dtx.c             |   2 +-
+ drivers/platform/surface/surface_gpe.c             |   2 +-
+ drivers/platform/surface/surface_hotplug.c         |   2 +-
+ .../platform/surface/surface_platform_profile.c    |   2 +-
+ drivers/platform/x86/Kconfig                       |  40 +-
+ drivers/platform/x86/Makefile                      |   5 +-
+ drivers/platform/x86/acer-wmi.c                    |   7 +-
+ drivers/platform/x86/amd/Kconfig                   |  31 ++
+ drivers/platform/x86/amd/Makefile                  |  10 +
+ drivers/platform/x86/{amd_hsmp.c => amd/hsmp.c}    |   0
+ drivers/platform/x86/{amd-pmc.c => amd/pmc.c}      |   0
+ drivers/platform/x86/apple-gmux.c                  |   5 +-
+ drivers/platform/x86/compal-laptop.c               |   4 +-
+ drivers/platform/x86/dell/Kconfig                  |   1 -
+ drivers/platform/x86/intel/pmt/class.c             |  23 +-
+ drivers/platform/x86/intel/pmt/telemetry.c         |  18 +-
+ .../x86/intel/speed_select_if/isst_if_common.c     |  39 +-
+ drivers/platform/x86/intel/vsec.c                  | 130 ++++-
+ drivers/platform/x86/intel/vsec.h                  |  11 +-
+ drivers/platform/x86/panasonic-laptop.c            |  28 +-
+ drivers/platform/x86/serial-multi-instantiate.c    |  69 ++-
+ drivers/platform/x86/system76_acpi.c               |   4 +-
+ drivers/platform/x86/thinkpad_acpi.c               | 168 ++++---
+ drivers/power/supply/surface_battery.c             |   4 +-
+ drivers/power/supply/surface_charger.c             |   4 +-
+ include/linux/surface_aggregator/controller.h      | 149 +++++-
+ include/linux/surface_aggregator/device.h          | 213 +++++++-
+ include/linux/surface_aggregator/serial_hub.h      |  75 +--
+ 56 files changed, 2161 insertions(+), 680 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-surface_aggregator-tabletsw
+ create mode 100644 drivers/platform/surface/surface_aggregator_hub.c
+ create mode 100644 drivers/platform/surface/surface_aggregator_tabletsw.c
+ create mode 100644 drivers/platform/x86/amd/Kconfig
+ create mode 100644 drivers/platform/x86/amd/Makefile
+ rename drivers/platform/x86/{amd_hsmp.c => amd/hsmp.c} (100%)
+ rename drivers/platform/x86/{amd-pmc.c => amd/pmc.c} (100%)
+Merging chrome-platform/for-next (3de7203115af platform/chrome: wilco_ec: event: Fix typo in comment)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next
+Auto-merging drivers/mfd/cros_ec_dev.c
+Auto-merging drivers/platform/chrome/wilco_ec/event.c
+Auto-merging include/linux/platform_data/cros_ec_commands.h
+Auto-merging include/linux/platform_data/cros_ec_proto.h
+Merge made by the 'ort' strategy.
+ .../chrome/google,cros-kbd-led-backlight.yaml      |   35 +
+ .../devicetree/bindings/mfd/google,cros-ec.yaml    |    3 +
+ drivers/mfd/cros_ec_dev.c                          |    4 +-
+ drivers/platform/chrome/Kconfig                    |   17 +-
+ drivers/platform/chrome/Makefile                   |    4 +
+ drivers/platform/chrome/cros_ec.c                  |   11 +-
+ drivers/platform/chrome/cros_ec_proto.c            |  371 ++---
+ drivers/platform/chrome/cros_ec_proto_test.c       | 1616 ++++++++++++++++++++
+ drivers/platform/chrome/cros_ec_trace.h            |    8 +-
+ drivers/platform/chrome/cros_ec_typec.c            |   39 +-
+ drivers/platform/chrome/cros_kbd_led_backlight.c   |  196 ++-
+ drivers/platform/chrome/cros_kunit_util.c          |   98 ++
+ drivers/platform/chrome/cros_kunit_util.h          |   36 +
+ drivers/platform/chrome/cros_usbpd_notify.c        |    4 +-
+ drivers/platform/chrome/wilco_ec/event.c           |    2 +-
+ drivers/regulator/cros-ec-regulator.c              |   36 +-
+ include/linux/platform_data/cros_ec_commands.h     |    6 +-
+ include/linux/platform_data/cros_ec_proto.h        |    7 +-
+ 18 files changed, 2217 insertions(+), 276 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/chrome/google,cros-kbd-led-backlight.yaml
+ create mode 100644 drivers/platform/chrome/cros_ec_proto_test.c
+ create mode 100644 drivers/platform/chrome/cros_kunit_util.c
+ create mode 100644 drivers/platform/chrome/cros_kunit_util.h
+Merging hsi/for-next (43c14f8d18a7 HSI: omap_ssi: Fix refcount leak in ssi_probe)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next
+Merge made by the 'ort' strategy.
+ drivers/hsi/clients/ssi_protocol.c      | 1 -
+ drivers/hsi/controllers/omap_ssi_core.c | 1 +
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+Merging leds/for-next (f2906aa86338 Linux 5.19-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next
+Already up to date.
+Merging ipmi/for-next (a508e33956b5 ipmi:ipmb: Fix refcount leak in ipmi_ipmb_probe)
+$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next
+Already up to date.
+Merging driver-core/driver-core-next (4a4e8f7f625b MAINTAINERS: Change mentions of mpm to olivia)
+$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next
+Auto-merging Documentation/ABI/testing/sysfs-devices-system-cpu
+Auto-merging MAINTAINERS
+Auto-merging drivers/base/core.c
+Auto-merging drivers/of/base.c
+Auto-merging drivers/spi/spi.c
+Auto-merging net/ipv4/ipconfig.c
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-class-pwm          |   2 +-
+ Documentation/ABI/testing/sysfs-devices-soc        |  14 +-
+ Documentation/ABI/testing/sysfs-devices-system-cpu |   7 +-
+ .../process/embargoed-hardware-issues.rst          |   3 +
+ MAINTAINERS                                        |   4 +-
+ drivers/base/base.h                                |   1 +
+ drivers/base/core.c                                | 123 ++++++++++++-
+ drivers/base/dd.c                                  |  59 +++---
+ drivers/base/devtmpfs.c                            |   1 +
+ drivers/base/power/domain.c                        |   2 +-
+ drivers/iommu/of_iommu.c                           |   2 +-
+ drivers/net/mdio/fwnode_mdio.c                     |   4 +-
+ drivers/of/base.c                                  |   2 +
+ drivers/pinctrl/devicetree.c                       |   2 +-
+ drivers/spi/spi.c                                  |   9 +-
+ fs/kernfs/dir.c                                    |   7 +-
+ fs/kernfs/file.c                                   | 203 ++++++++++++++-------
+ fs/kernfs/kernfs-internal.h                        |   4 +
+ fs/kernfs/mount.c                                  |  19 ++
+ include/linux/device.h                             |   2 +
+ include/linux/device/driver.h                      |   2 +-
+ include/linux/firmware/trusted_foundations.h       |   8 +-
+ include/linux/fwnode.h                             |   4 +
+ include/linux/kernfs.h                             |  59 +++++-
+ net/ipv4/ipconfig.c                                |   6 +
+ 25 files changed, 401 insertions(+), 148 deletions(-)
+Merging usb/usb-next (8affe37c525d usb: dwc3: gadget: fix high speed multiplier setting)
+$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Auto-merging drivers/usb/dwc3/gadget.c
+Auto-merging drivers/usb/gadget/legacy/inode.c
+Auto-merging drivers/usb/gadget/udc/atmel_usba_udc.c
+Auto-merging drivers/usb/typec/class.c
+Resolved 'MAINTAINERS' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 8d7953ed4b0b] Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
+$ git diff -M --stat --summary HEAD^..
+ .../ABI/testing/sysfs-bus-platform-onboard-usb-hub |    8 +
+ Documentation/ABI/testing/sysfs-bus-usb            |   11 +
+ Documentation/ABI/testing/sysfs-class-typec        |    8 +
+ .../ABI/testing/sysfs-class-usb_power_delivery     |  240 +++
+ .../bindings/usb/aspeed,ast2600-udc.yaml           |   52 +
+ Documentation/devicetree/bindings/usb/dwc2.yaml    |    3 +
+ .../devicetree/bindings/usb/mediatek,mtk-xhci.yaml |    9 +-
+ .../devicetree/bindings/usb/mediatek,mtu3.yaml     |    3 +
+ .../devicetree/bindings/usb/realtek,rts5411.yaml   |   10 +-
+ .../devicetree/bindings/usb/snps,dwc3.yaml         |    5 +
+ MAINTAINERS                                        |   15 +
+ arch/mips/configs/cavium_octeon_defconfig          |    2 +-
+ drivers/staging/Kconfig                            |    2 -
+ drivers/staging/Makefile                           |    1 -
+ drivers/staging/octeon-usb/Kconfig                 |   11 -
+ drivers/staging/octeon-usb/Makefile                |    2 -
+ drivers/staging/octeon-usb/TODO                    |    8 -
+ drivers/thunderbolt/ctl.c                          |    6 +-
+ drivers/thunderbolt/ctl.h                          |    2 +-
+ drivers/thunderbolt/icm.c                          |    2 +
+ drivers/thunderbolt/nhi.c                          |    4 +
+ drivers/thunderbolt/nhi.h                          |    2 +
+ drivers/thunderbolt/switch.c                       |   91 +-
+ drivers/thunderbolt/tb.c                           |   68 +-
+ drivers/thunderbolt/tb.h                           |   48 +-
+ drivers/thunderbolt/tb_regs.h                      |    6 +
+ drivers/thunderbolt/tmu.c                          |  221 ++-
+ drivers/usb/cdns3/cdns3-gadget.c                   |    4 +-
+ drivers/usb/chipidea/ci.h                          |    1 +
+ drivers/usb/chipidea/ci_hdrc_imx.c                 |   23 +-
+ drivers/usb/chipidea/ci_hdrc_imx.h                 |    2 +-
+ drivers/usb/chipidea/core.c                        |    2 +
+ drivers/usb/chipidea/udc.c                         |   14 +
+ drivers/usb/class/cdc-acm.c                        |    2 +-
+ drivers/usb/common/usb-conn-gpio.c                 |   17 +
+ drivers/usb/core/Makefile                          |    4 +
+ drivers/usb/core/hub.c                             |  108 +-
+ drivers/usb/core/hub.h                             |    4 +
+ drivers/usb/core/port.c                            |   83 +
+ drivers/usb/core/sysfs.c                           |   79 +-
+ drivers/usb/dwc2/gadget.c                          |    3 +-
+ drivers/usb/dwc2/hcd.c                             |    5 +-
+ drivers/usb/dwc3/Kconfig                           |    4 +-
+ drivers/usb/dwc3/core.c                            |   50 +-
+ drivers/usb/dwc3/core.h                            |    3 +
+ drivers/usb/dwc3/dwc3-qcom.c                       |  140 +-
+ drivers/usb/dwc3/ep0.c                             |    2 +-
+ drivers/usb/dwc3/gadget.c                          |   93 +-
+ drivers/usb/gadget/function/f_mass_storage.c       |   11 +-
+ drivers/usb/gadget/function/f_uvc.c                |   30 +-
+ drivers/usb/gadget/function/u_ether.c              |    1 -
+ drivers/usb/gadget/function/uvc_queue.c            |   23 +-
+ drivers/usb/gadget/function/uvc_video.c            |   14 +-
+ drivers/usb/gadget/legacy/inode.c                  |    1 +
+ drivers/usb/gadget/udc/Kconfig                     |   13 +
+ drivers/usb/gadget/udc/Makefile                    |    1 +
+ drivers/usb/gadget/udc/aspeed_udc.c                | 1597 ++++++++++++++++++++
+ drivers/usb/gadget/udc/atmel_usba_udc.c            |   10 +-
+ drivers/usb/gadget/udc/bdc/bdc_cmd.c               |    2 +-
+ drivers/usb/gadget/udc/tegra-xudc.c                |    8 +-
+ drivers/usb/gadget/udc/trace.h                     |    8 +-
+ drivers/usb/host/Kconfig                           |   10 +
+ drivers/usb/host/Makefile                          |    1 +
+ drivers/usb/host/ehci-platform.c                   |    2 +
+ drivers/usb/host/ehci-ppc-of.c                     |    1 +
+ drivers/usb/host/ehci-q.c                          |    2 +-
+ drivers/usb/host/max3421-hcd.c                     |    2 +-
+ .../{staging/octeon-usb => usb/host}/octeon-hcd.c  |    0
+ .../{staging/octeon-usb => usb/host}/octeon-hcd.h  |    0
+ drivers/usb/host/ohci-at91.c                       |   69 +-
+ drivers/usb/host/ohci-nxp.c                        |    1 +
+ drivers/usb/host/ohci-platform.c                   |    3 +
+ drivers/usb/host/ohci-ppc-of.c                     |    1 +
+ drivers/usb/host/ohci-sm501.c                      |    2 +-
+ drivers/usb/host/xhci-mtk.c                        |    7 +
+ drivers/usb/host/xhci-tegra.c                      |    8 +-
+ drivers/usb/host/xhci.h                            |    2 +-
+ drivers/usb/misc/Kconfig                           |   16 +
+ drivers/usb/misc/Makefile                          |    1 +
+ drivers/usb/misc/onboard_usb_hub.c                 |  428 ++++++
+ drivers/usb/misc/onboard_usb_hub.h                 |   17 +
+ drivers/usb/misc/onboard_usb_hub_pdevs.c           |  142 ++
+ drivers/usb/mtu3/mtu3.h                            |    5 +-
+ drivers/usb/mtu3/mtu3_core.c                       |   35 +-
+ drivers/usb/mtu3/mtu3_debugfs.c                    |    8 +-
+ drivers/usb/mtu3/mtu3_gadget.c                     |   38 +-
+ drivers/usb/mtu3/mtu3_gadget_ep0.c                 |   10 +-
+ drivers/usb/mtu3/mtu3_hw_regs.h                    |   16 +
+ drivers/usb/mtu3/mtu3_plat.c                       |   43 +-
+ drivers/usb/mtu3/mtu3_trace.h                      |    4 +-
+ drivers/usb/musb/Kconfig                           |   13 +-
+ drivers/usb/musb/Makefile                          |    1 +
+ drivers/usb/musb/mpfs.c                            |  269 ++++
+ drivers/usb/musb/musb_core.c                       |   16 +-
+ drivers/usb/musb/musb_gadget.c                     |    2 -
+ drivers/usb/renesas_usbhs/rza.c                    |    4 +
+ drivers/usb/storage/transport.c                    |    2 +-
+ drivers/usb/typec/Makefile                         |    2 +-
+ drivers/usb/typec/class.c                          |  149 ++
+ drivers/usb/typec/class.h                          |    4 +
+ drivers/usb/typec/mux.c                            |    8 +-
+ drivers/usb/typec/pd.c                             |  708 +++++++++
+ drivers/usb/typec/pd.h                             |   30 +
+ drivers/usb/typec/tcpm/tcpci.c                     |    3 +-
+ drivers/usb/typec/tcpm/tcpci_maxim.c               |    3 +-
+ drivers/usb/typec/tcpm/tcpci_mt6360.c              |    3 +-
+ drivers/usb/typec/tcpm/tcpci_rt1711h.c             |    2 +-
+ drivers/usb/typec/tcpm/tcpm.c                      |  144 +-
+ drivers/usb/typec/ucsi/ucsi_ccg.c                  |   28 +-
+ drivers/usb/usbip/vudc_rx.c                        |    6 +-
+ drivers/usb/usbip/vudc_sysfs.c                     |   14 +-
+ include/linux/of_platform.h                        |   22 +-
+ include/linux/usb.h                                |    2 +
+ include/linux/usb/onboard_hub.h                    |   18 +
+ include/linux/usb/pd.h                             |   38 +
+ .../usb/typec/tcpm => include/linux/usb}/tcpci.h   |    1 +
+ include/linux/usb/typec.h                          |   23 +
+ include/linux/usb/typec_altmode.h                  |    2 +-
+ include/linux/usb/typec_mux.h                      |   44 +-
+ tools/usb/testusb.c                                |   18 +-
+ 120 files changed, 5110 insertions(+), 545 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-platform-onboard-usb-hub
+ create mode 100644 Documentation/ABI/testing/sysfs-class-usb_power_delivery
+ create mode 100644 Documentation/devicetree/bindings/usb/aspeed,ast2600-udc.yaml
+ delete mode 100644 drivers/staging/octeon-usb/Kconfig
+ delete mode 100644 drivers/staging/octeon-usb/Makefile
+ delete mode 100644 drivers/staging/octeon-usb/TODO
+ create mode 100644 drivers/usb/gadget/udc/aspeed_udc.c
+ rename drivers/{staging/octeon-usb => usb/host}/octeon-hcd.c (100%)
+ rename drivers/{staging/octeon-usb => usb/host}/octeon-hcd.h (100%)
+ create mode 100644 drivers/usb/misc/onboard_usb_hub.c
+ create mode 100644 drivers/usb/misc/onboard_usb_hub.h
+ create mode 100644 drivers/usb/misc/onboard_usb_hub_pdevs.c
+ create mode 100644 drivers/usb/musb/mpfs.c
+ create mode 100644 drivers/usb/typec/pd.c
+ create mode 100644 drivers/usb/typec/pd.h
+ create mode 100644 include/linux/usb/onboard_hub.h
+ rename {drivers/usb/typec/tcpm => include/linux/usb}/tcpci.h (99%)
+Merging thunderbolt/next (34b9715b7cae thunderbolt: Fix typo in comment)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next
+Already up to date.
+Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget/next
+Already up to date.
+Merging usb-serial/usb-next (9ec7e8d5fae3 USB: serial: fix repeated word "the" in comments)
+$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next
+Merge made by the 'ort' strategy.
+ drivers/usb/serial/cypress_m8.c  | 2 +-
+ drivers/usb/serial/garmin_gps.c  | 4 +---
+ drivers/usb/serial/io_edgeport.c | 4 ++--
+ drivers/usb/serial/mos7720.c     | 2 +-
+ drivers/usb/serial/opticon.c     | 4 +---
+ drivers/usb/serial/sierra.c      | 4 +---
+ 6 files changed, 7 insertions(+), 13 deletions(-)
+Merging tty/tty-next (7e5b4322cde0 tty: n_gsm: fix missing corner cases in gsmld_poll())
+$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/of/fdt.c
+Auto-merging drivers/tty/serial/8250/8250_core.c
+Auto-merging drivers/tty/serial/8250/8250_dw.c
+Auto-merging drivers/tty/serial/8250/8250_port.c
+Auto-merging drivers/tty/serial/Kconfig
+Auto-merging drivers/tty/serial/amba-pl011.c
+Auto-merging drivers/tty/serial/samsung_tty.c
+Auto-merging drivers/tty/serial/serial_core.c
+Auto-merging drivers/tty/serial/stm32-usart.c
+Auto-merging drivers/tty/tty_buffer.c
+Auto-merging drivers/tty/tty_io.c
+Auto-merging drivers/tty/vt/vt.c
+Auto-merging drivers/video/fbdev/core/fbcon.c
+Auto-merging include/linux/serial_core.h
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/serial/8250.yaml |   1 +
+ .../devicetree/bindings/serial/mediatek,uart.yaml  | 120 ++++
+ .../devicetree/bindings/serial/mtk-uart.txt        |  59 --
+ .../devicetree/bindings/serial/renesas,hscif.yaml  |   1 +
+ .../bindings/serial/snps-dw-apb-uart.yaml          |   1 +
+ Documentation/driver-api/serial/driver.rst         |   7 +-
+ Documentation/driver-api/serial/serial-rs485.rst   |  38 +-
+ MAINTAINERS                                        |   3 +-
+ arch/mips/ath79/early_printk.c                     |  17 +-
+ drivers/accessibility/braille/braille_console.c    |   2 +-
+ drivers/accessibility/speakup/main.c               |   2 +-
+ drivers/accessibility/speakup/serialio.h           |   3 +-
+ drivers/of/fdt.c                                   |   4 +-
+ drivers/tty/amiserial.c                            |  18 +-
+ drivers/tty/mips_ejtag_fdc.c                       |   4 +-
+ drivers/tty/n_gsm.c                                | 757 +++++++++++++++------
+ drivers/tty/n_tty.c                                |  92 ++-
+ drivers/tty/serial/8250/8250.h                     |  24 +-
+ drivers/tty/serial/8250/8250_bcm2835aux.c          |   1 +
+ drivers/tty/serial/8250/8250_core.c                |   8 +-
+ drivers/tty/serial/8250/8250_dw.c                  |  55 +-
+ drivers/tty/serial/8250/8250_dwlib.c               | 142 +++-
+ drivers/tty/serial/8250/8250_early.c               |   4 +-
+ drivers/tty/serial/8250/8250_exar.c                |  25 +-
+ drivers/tty/serial/8250/8250_fintek.c              |  31 +-
+ drivers/tty/serial/8250/8250_fsl.c                 |   4 +-
+ drivers/tty/serial/8250/8250_ingenic.c             |   2 +-
+ drivers/tty/serial/8250/8250_lpc18xx.c             |  22 +-
+ drivers/tty/serial/8250/8250_lpss.c                |   2 +-
+ drivers/tty/serial/8250/8250_of.c                  |   1 +
+ drivers/tty/serial/8250/8250_omap.c                |   7 +-
+ drivers/tty/serial/8250/8250_pci.c                 |  26 +-
+ drivers/tty/serial/8250/8250_pericom.c             |   2 +-
+ drivers/tty/serial/8250/8250_port.c                | 154 ++---
+ drivers/tty/serial/Kconfig                         |   1 +
+ drivers/tty/serial/amba-pl011.c                    |  15 +-
+ drivers/tty/serial/ar933x_uart.c                   |   9 +-
+ drivers/tty/serial/atmel_serial.c                  | 103 +--
+ drivers/tty/serial/earlycon.c                      |   3 +
+ drivers/tty/serial/fsl_lpuart.c                    |  29 +-
+ drivers/tty/serial/imx.c                           |  21 +-
+ drivers/tty/serial/kgdboc.c                        |   2 +-
+ drivers/tty/serial/max310x.c                       | 272 ++++++--
+ drivers/tty/serial/mcf.c                           |  10 +-
+ drivers/tty/serial/meson_uart.c                    |   2 +-
+ drivers/tty/serial/msm_serial.c                    | 550 +++++++--------
+ drivers/tty/serial/mux.c                           |   6 -
+ drivers/tty/serial/omap-serial.c                   |  18 +-
+ drivers/tty/serial/owl-uart.c                      |   2 +-
+ drivers/tty/serial/pch_uart.c                      |   7 +-
+ drivers/tty/serial/pic32_uart.c                    |   4 +-
+ drivers/tty/serial/pmac_zilog.c                    |   1 -
+ drivers/tty/serial/pxa.c                           |   5 +-
+ drivers/tty/serial/rda-uart.c                      |   2 +-
+ drivers/tty/serial/samsung_tty.c                   |  90 +--
+ drivers/tty/serial/sc16is7xx.c                     |  10 +-
+ drivers/tty/serial/serial-tegra.c                  |   5 +-
+ drivers/tty/serial/serial_core.c                   | 179 +++--
+ drivers/tty/serial/sifive.c                        |  10 -
+ drivers/tty/serial/st-asc.c                        |   1 -
+ drivers/tty/serial/stm32-usart.c                   |  10 +-
+ drivers/tty/serial/sunsu.c                         |   4 +-
+ drivers/tty/serial/ucc_uart.c                      |   2 +
+ drivers/tty/serial/vr41xx_siu.c                    |   4 +-
+ drivers/tty/tty_buffer.c                           |  59 +-
+ drivers/tty/tty_io.c                               |   2 +-
+ drivers/tty/tty_ioctl.c                            |   4 +
+ drivers/tty/tty_port.c                             |  21 +
+ drivers/tty/vt/Makefile                            |   2 +-
+ drivers/tty/vt/consolemap.c                        | 684 ++++++++++---------
+ drivers/tty/vt/defkeymap.c_shipped                 |   6 +-
+ drivers/tty/vt/selection.c                         |   3 +-
+ drivers/tty/vt/vt.c                                |  14 +-
+ drivers/usb/misc/sisusbvga/sisusb_con.c            |   2 +-
+ drivers/video/console/vgacon.c                     |  12 +-
+ drivers/video/fbdev/core/fbcon.c                   |   8 +-
+ include/linux/console_struct.h                     |   6 +-
+ include/linux/consolemap.h                         |  60 +-
+ include/linux/serial.h                             |  15 +-
+ include/linux/serial_8250.h                        |   7 +-
+ include/linux/serial_core.h                        |  19 +-
+ include/linux/serial_s3c.h                         |   2 +-
+ include/linux/tty_buffer.h                         |   1 +
+ include/linux/tty_ldisc.h                          |  14 +
+ include/linux/tty_port.h                           |   2 +
+ include/uapi/asm-generic/termbits-common.h         |   1 +
+ include/uapi/linux/serial.h                        |  20 +-
+ include/uapi/linux/serial_reg.h                    |   4 +-
+ 88 files changed, 2483 insertions(+), 1501 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/serial/mediatek,uart.yaml
+ delete mode 100644 Documentation/devicetree/bindings/serial/mtk-uart.txt
+Merging char-misc/char-misc-next (c524193f1cfb MAINTAINERS: Update 104-QUAD-8 driver maintainers list)
+$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/bus/mvebu-mbus.c
+Auto-merging drivers/hwtracing/coresight/coresight-etm4x-core.c
+Auto-merging drivers/hwtracing/coresight/coresight-etm4x.h
+Auto-merging drivers/hwtracing/intel_th/msu.c
+Auto-merging kernel/rcu/Kconfig.debug
+Merge made by the 'ort' strategy.
+ .../ABI/testing/debugfs-driver-habanalabs          |    38 +-
+ Documentation/ABI/testing/sysfs-bus-iio            |     5 +
+ Documentation/ABI/testing/sysfs-class-vduse        |    33 +
+ .../testing/sysfs-driver-intel-m10-bmc-sec-update  |    61 +
+ .../bindings/arm/arm,coresight-catu.yaml           |   101 +
+ .../bindings/arm/arm,coresight-cpu-debug.yaml      |    81 +
+ .../{coresight-cti.yaml => arm,coresight-cti.yaml} |     5 +-
+ .../bindings/arm/arm,coresight-dynamic-funnel.yaml |   126 +
+ .../arm/arm,coresight-dynamic-replicator.yaml      |   126 +
+ .../bindings/arm/arm,coresight-etb10.yaml          |    92 +
+ .../devicetree/bindings/arm/arm,coresight-etm.yaml |   156 +
+ .../bindings/arm/arm,coresight-static-funnel.yaml  |    90 +
+ .../arm/arm,coresight-static-replicator.yaml       |    91 +
+ .../devicetree/bindings/arm/arm,coresight-stm.yaml |   101 +
+ .../devicetree/bindings/arm/arm,coresight-tmc.yaml |   131 +
+ .../bindings/arm/arm,coresight-tpiu.yaml           |    91 +
+ ...{ete.yaml => arm,embedded-trace-extension.yaml} |     3 +-
+ .../{trbe.yaml => arm,trace-buffer-extension.yaml} |     2 +-
+ .../bindings/arm/coresight-cpu-debug.txt           |    49 -
+ .../devicetree/bindings/arm/coresight.txt          |   402 -
+ .../bindings/fpga/microchip,mpf-spi-fpga-mgr.yaml  |    44 +
+ .../bindings/iio/accel/adi,adis16240.yaml          |     2 +-
+ .../devicetree/bindings/iio/accel/adi,adxl345.yaml |     2 +-
+ .../bindings/iio/accel/bosch,bmi088.yaml           |     2 +
+ .../bindings/iio/accel/murata,sca3300.yaml         |     1 +
+ .../devicetree/bindings/iio/adc/adi,ad9467.yaml    |     1 -
+ .../devicetree/bindings/iio/adc/adi,axi-adc.yaml   |     1 -
+ .../bindings/iio/adc/qcom,spmi-rradc.yaml          |    51 +
+ .../bindings/iio/adc/renesas,rzg2l-adc.yaml        |    28 +-
+ .../devicetree/bindings/iio/dac/adi,ad5770r.yaml   |     2 +-
+ .../bindings/iio/dac/microchip,mcp4922.yaml        |     1 +
+ .../devicetree/bindings/iio/dac/ti,dac5571.yaml    |     1 +
+ .../devicetree/bindings/iio/imu/adi,adis16480.yaml |     2 +-
+ .../bindings/iio/proximity/semtech,sx9324.yaml     |    39 +
+ .../bindings/iio/proximity/semtech,sx9360.yaml     |     9 +
+ .../bindings/iio/proximity/st,vl53l0x.yaml         |     5 +
+ .../bindings/misc/qemu,vcpu-stall-detector.yaml    |    51 +
+ .../devicetree/bindings/nvmem/mediatek,efuse.yaml  |    89 +
+ .../bindings/nvmem/microchip,sama7g5-otpc.yaml     |    50 +
+ .../devicetree/bindings/nvmem/mtk-efuse.txt        |    43 -
+ Documentation/driver-api/fpga/fpga-mgr.rst         |    27 +-
+ .../trace/coresight/coresight-etm4x-reference.rst  |    17 +-
+ Documentation/trace/coresight/coresight.rst        |    58 +-
+ MAINTAINERS                                        |    64 +-
+ drivers/Makefile                                   |     2 +-
+ drivers/accessibility/speakup/.gitignore           |     4 +
+ drivers/accessibility/speakup/Makefile             |    28 +
+ drivers/accessibility/speakup/genmap.c             |   162 +
+ drivers/accessibility/speakup/makemapdata.c        |   125 +
+ drivers/accessibility/speakup/speakupmap.h         |    66 -
+ drivers/accessibility/speakup/utils.h              |   102 +
+ drivers/android/Kconfig                            |     9 -
+ drivers/android/binder.c                           |   199 +-
+ drivers/android/binder_internal.h                  |    46 +-
+ drivers/android/binder_trace.h                     |     4 +
+ drivers/android/binderfs.c                         |    47 +-
+ drivers/bus/mhi/ep/main.c                          |    11 +-
+ drivers/bus/mhi/host/init.c                        |    17 +-
+ drivers/bus/mhi/host/pci_generic.c                 |     8 +
+ drivers/bus/mhi/host/pm.c                          |    19 +-
+ drivers/bus/mvebu-mbus.c                           |     6 +-
+ drivers/char/apm-emulation.c                       |     2 +-
+ drivers/char/random.c                              |     4 +-
+ drivers/counter/104-quad-8.c                       |   203 +-
+ drivers/firmware/stratix10-rsu.c                   |   129 +-
+ drivers/firmware/stratix10-svc.c                   |   201 +-
+ drivers/fpga/Kconfig                               |    20 +
+ drivers/fpga/Makefile                              |     4 +
+ drivers/fpga/altera-pr-ip-core.c                   |     2 +-
+ drivers/fpga/dfl.c                                 |     4 +-
+ drivers/fpga/fpga-bridge.c                         |     6 +-
+ drivers/fpga/fpga-mgr.c                            |   229 +-
+ drivers/fpga/fpga-region.c                         |     6 +-
+ drivers/fpga/intel-m10-bmc-sec-update.c            |   625 +
+ drivers/fpga/microchip-spi.c                       |   398 +
+ drivers/hwtracing/coresight/coresight-config.h     |     2 +
+ drivers/hwtracing/coresight/coresight-core.c       |     1 +
+ drivers/hwtracing/coresight/coresight-etm-perf.c   |     2 +
+ drivers/hwtracing/coresight/coresight-etm4x-core.c |    14 +
+ drivers/hwtracing/coresight/coresight-etm4x.h      |     3 +-
+ drivers/hwtracing/coresight/coresight-syscfg.c     |   295 +-
+ drivers/hwtracing/coresight/coresight-syscfg.h     |    13 +
+ drivers/hwtracing/intel_th/msu-sink.c              |     3 +
+ drivers/hwtracing/intel_th/msu.c                   |    14 +-
+ drivers/hwtracing/intel_th/pci.c                   |    25 +-
+ drivers/iio/accel/Kconfig                          |     2 +
+ drivers/iio/accel/adxl313_core.c                   |     2 +-
+ drivers/iio/accel/adxl355_core.c                   |     2 +-
+ drivers/iio/accel/adxl367.c                        |    48 +-
+ drivers/iio/accel/adxl367_spi.c                    |     8 +-
+ drivers/iio/accel/bma220_spi.c                     |     2 +-
+ drivers/iio/accel/bma400.h                         |    50 +-
+ drivers/iio/accel/bma400_core.c                    |   710 +-
+ drivers/iio/accel/bma400_i2c.c                     |    10 +-
+ drivers/iio/accel/bma400_spi.c                     |     8 +-
+ drivers/iio/accel/bmi088-accel-core.c              |    99 +-
+ drivers/iio/accel/bmi088-accel-spi.c               |    17 +-
+ drivers/iio/accel/bmi088-accel.h                   |     9 +-
+ drivers/iio/accel/cros_ec_accel_legacy.c           |     2 +-
+ drivers/iio/accel/kxsd9-i2c.c                      |     2 +-
+ drivers/iio/accel/kxsd9-spi.c                      |     2 +-
+ drivers/iio/accel/kxsd9.c                          |    11 +-
+ drivers/iio/accel/mc3230.c                         |     4 +-
+ drivers/iio/accel/mma7660.c                        |     6 +-
+ drivers/iio/accel/sca3000.c                        |     6 +-
+ drivers/iio/accel/sca3300.c                        |   325 +-
+ drivers/iio/accel/stk8312.c                        |     4 +-
+ drivers/iio/accel/stk8ba50.c                       |     4 +-
+ drivers/iio/adc/Kconfig                            |    17 +-
+ drivers/iio/adc/Makefile                           |     1 +
+ drivers/iio/adc/ad7266.c                           |     4 +-
+ drivers/iio/adc/ad7280a.c                          |     2 +-
+ drivers/iio/adc/ad7292.c                           |     2 +-
+ drivers/iio/adc/ad7298.c                           |     2 +-
+ drivers/iio/adc/ad7476.c                           |     5 +-
+ drivers/iio/adc/ad7606.c                           |     1 +
+ drivers/iio/adc/ad7606.h                           |     4 +-
+ drivers/iio/adc/ad7606_par.c                       |     1 +
+ drivers/iio/adc/ad7766.c                           |     5 +-
+ drivers/iio/adc/ad7768-1.c                         |     6 +-
+ drivers/iio/adc/ad7887.c                           |     5 +-
+ drivers/iio/adc/ad7923.c                           |     4 +-
+ drivers/iio/adc/ad7949.c                           |     2 +-
+ drivers/iio/adc/ad9467.c                           |     1 +
+ drivers/iio/adc/adi-axi-adc.c                      |    11 +-
+ drivers/iio/adc/at91-sama5d2_adc.c                 |     2 +-
+ drivers/iio/adc/berlin2-adc.c                      |     2 +
+ drivers/iio/adc/hi8435.c                           |     2 +-
+ drivers/iio/adc/imx7d_adc.c                        |     1 +
+ drivers/iio/adc/imx8qxp-adc.c                      |     1 +
+ drivers/iio/adc/ina2xx-adc.c                       |    10 +-
+ drivers/iio/adc/ingenic-adc.c                      |     2 +
+ drivers/iio/adc/intel_mrfld_adc.c                  |     1 +
+ drivers/iio/adc/lpc18xx_adc.c                      |     3 +-
+ drivers/iio/adc/ltc2496.c                          |     4 +-
+ drivers/iio/adc/ltc2497.c                          |     4 +-
+ drivers/iio/adc/max1027.c                          |     2 +-
+ drivers/iio/adc/max11100.c                         |     4 +-
+ drivers/iio/adc/max1118.c                          |     2 +-
+ drivers/iio/adc/max1241.c                          |     2 +-
+ drivers/iio/adc/mcp320x.c                          |     2 +-
+ drivers/iio/adc/meson_saradc.c                     |   177 +-
+ drivers/iio/adc/mp2629_adc.c                       |     1 +
+ drivers/iio/adc/mt6360-adc.c                       |     1 +
+ drivers/iio/adc/nau7802.c                          |    16 +-
+ drivers/iio/adc/npcm_adc.c                         |     1 +
+ drivers/iio/adc/qcom-spmi-rradc.c                  |  1022 +
+ drivers/iio/adc/rzg2l_adc.c                        |     4 +-
+ drivers/iio/adc/sc27xx_adc.c                       |    15 +-
+ drivers/iio/adc/stm32-adc-core.c                   |     2 +-
+ drivers/iio/adc/stm32-adc.c                        |     6 +
+ drivers/iio/adc/stx104.c                           |    56 +-
+ drivers/iio/adc/ti-adc0832.c                       |     2 +-
+ drivers/iio/adc/ti-adc084s021.c                    |     4 +-
+ drivers/iio/adc/ti-adc108s102.c                    |     4 +-
+ drivers/iio/adc/ti-adc12138.c                      |     2 +-
+ drivers/iio/adc/ti-adc128s052.c                    |     2 +-
+ drivers/iio/adc/ti-adc161s626.c                    |     2 +-
+ drivers/iio/adc/ti-ads1015.c                       |     8 +-
+ drivers/iio/adc/ti-ads124s08.c                     |     2 +-
+ drivers/iio/adc/ti-ads131e08.c                     |     2 +-
+ drivers/iio/adc/ti-ads7950.c                       |     4 +-
+ drivers/iio/adc/ti-ads8344.c                       |     2 +-
+ drivers/iio/adc/ti-ads8688.c                       |     2 +-
+ drivers/iio/adc/ti-tlc4541.c                       |     4 +-
+ drivers/iio/adc/ti-tsc2046.c                       |     2 +-
+ drivers/iio/adc/vf610_adc.c                        |    15 +-
+ drivers/iio/adc/xilinx-xadc-core.c                 |    69 +-
+ drivers/iio/addac/ad74413r.c                       |    12 +-
+ drivers/iio/amplifiers/ad8366.c                    |     4 +-
+ drivers/iio/chemical/atlas-sensor.c                |     8 +-
+ drivers/iio/chemical/bme680_core.c                 |     2 +-
+ drivers/iio/chemical/ccs811.c                      |    10 +-
+ drivers/iio/chemical/sps30.c                       |     2 +-
+ drivers/iio/chemical/sps30_i2c.c                   |     1 +
+ drivers/iio/chemical/sps30_serial.c                |     1 +
+ .../iio/common/cros_ec_sensors/cros_ec_lid_angle.c |     1 +
+ .../iio/common/cros_ec_sensors/cros_ec_sensors.c   |     1 +
+ .../common/cros_ec_sensors/cros_ec_sensors_core.c  |    30 +-
+ drivers/iio/common/ssp_sensors/ssp.h               |     3 +-
+ drivers/iio/dac/Kconfig                            |     2 +-
+ drivers/iio/dac/ad5064.c                           |     4 +-
+ drivers/iio/dac/ad5360.c                           |     4 +-
+ drivers/iio/dac/ad5380.c                           |     4 +-
+ drivers/iio/dac/ad5421.c                           |     4 +-
+ drivers/iio/dac/ad5449.c                           |     4 +-
+ drivers/iio/dac/ad5504.c                           |     2 +-
+ drivers/iio/dac/ad5592r-base.c                     |     2 +-
+ drivers/iio/dac/ad5592r-base.h                     |     4 +-
+ drivers/iio/dac/ad5686.h                           |     6 +-
+ drivers/iio/dac/ad5755.c                           |     4 +-
+ drivers/iio/dac/ad5761.c                           |     4 +-
+ drivers/iio/dac/ad5764.c                           |     4 +-
+ drivers/iio/dac/ad5766.c                           |     2 +-
+ drivers/iio/dac/ad5770r.c                          |     2 +-
+ drivers/iio/dac/ad5791.c                           |     2 +-
+ drivers/iio/dac/ad7293.c                           |     2 +-
+ drivers/iio/dac/ad7303.c                           |     4 +-
+ drivers/iio/dac/ad8801.c                           |     2 +-
+ drivers/iio/dac/cio-dac.c                          |    14 +-
+ drivers/iio/dac/ltc2688.c                          |     4 +-
+ drivers/iio/dac/mcp4922.c                          |    13 +-
+ drivers/iio/dac/stm32-dac.c                        |     6 +-
+ drivers/iio/dac/ti-dac082s085.c                    |     2 +-
+ drivers/iio/dac/ti-dac5571.c                       |     5 +-
+ drivers/iio/dac/ti-dac7311.c                       |     2 +-
+ drivers/iio/dac/ti-dac7612.c                       |     4 +-
+ drivers/iio/dac/vf610_dac.c                        |     1 +
+ drivers/iio/frequency/ad9523.c                     |     6 +-
+ drivers/iio/frequency/adf4350.c                    |     6 +-
+ drivers/iio/frequency/adf4371.c                    |     2 +-
+ drivers/iio/frequency/admv1013.c                   |     2 +-
+ drivers/iio/frequency/admv1014.c                   |     2 +-
+ drivers/iio/frequency/admv4420.c                   |     2 +-
+ drivers/iio/frequency/adrf6780.c                   |     2 +-
+ drivers/iio/gyro/adis16080.c                       |     2 +-
+ drivers/iio/gyro/adis16130.c                       |     2 +-
+ drivers/iio/gyro/adxrs450.c                        |     2 +-
+ drivers/iio/gyro/bmg160_core.c                     |     2 +-
+ drivers/iio/gyro/fxas21002c_core.c                 |     6 +-
+ drivers/iio/gyro/mpu3050-core.c                    |    14 +-
+ drivers/iio/gyro/mpu3050-i2c.c                     |     2 +-
+ drivers/iio/health/afe4404.c                       |     4 +-
+ drivers/iio/humidity/hts221_buffer.c               |     1 +
+ drivers/iio/humidity/hts221_core.c                 |    12 +-
+ drivers/iio/humidity/hts221_i2c.c                  |     3 +-
+ drivers/iio/humidity/hts221_spi.c                  |     3 +-
+ drivers/iio/imu/bmi160/bmi160_core.c               |     6 +-
+ drivers/iio/imu/bmi160/bmi160_i2c.c                |     1 +
+ drivers/iio/imu/bmi160/bmi160_spi.c                |     1 +
+ drivers/iio/imu/fxos8700_core.c                    |     2 +-
+ drivers/iio/imu/inv_icm42600/inv_icm42600.h        |     2 +-
+ drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.h |     2 +-
+ drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h          |     2 +-
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c       |    16 +-
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c        |     3 +-
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c        |     5 +-
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c        |     3 +-
+ drivers/iio/industrialio-buffer.c                  |    66 +-
+ drivers/iio/industrialio-core.c                    |    70 +-
+ drivers/iio/industrialio-sw-device.c               |     2 +-
+ drivers/iio/industrialio-sw-trigger.c              |     2 +-
+ drivers/iio/industrialio-trigger.c                 |    37 +-
+ drivers/iio/light/bh1780.c                         |     7 +-
+ drivers/iio/light/cm32181.c                        |    22 +
+ drivers/iio/light/cros_ec_light_prox.c             |     3 +-
+ drivers/iio/light/isl29028.c                       |     4 +-
+ drivers/iio/light/jsa1212.c                        |     4 +-
+ drivers/iio/light/opt3001.c                        |     3 +-
+ drivers/iio/light/pa12203001.c                     |     8 +-
+ drivers/iio/light/stk3310.c                        |     4 +-
+ drivers/iio/light/tsl2563.c                        |     7 +-
+ drivers/iio/light/tsl2583.c                        |     4 +-
+ drivers/iio/light/us5182d.c                        |     8 +-
+ drivers/iio/light/vcnl4000.c                       |     8 +-
+ drivers/iio/light/vcnl4035.c                       |    10 +-
+ drivers/iio/magnetometer/bmc150_magn.c             |     3 +-
+ drivers/iio/magnetometer/bmc150_magn.h             |     2 +-
+ drivers/iio/magnetometer/bmc150_magn_i2c.c         |     4 +-
+ drivers/iio/potentiometer/ad5110.c                 |     4 +-
+ drivers/iio/potentiometer/ad5272.c                 |     2 +-
+ drivers/iio/potentiometer/max5481.c                |     2 +-
+ drivers/iio/potentiometer/mcp41010.c               |     2 +-
+ drivers/iio/potentiometer/mcp4131.c                |     2 +-
+ drivers/iio/pressure/bmp280-core.c                 |     2 +-
+ drivers/iio/pressure/bmp280-i2c.c                  |     1 +
+ drivers/iio/pressure/bmp280-regmap.c               |     4 +-
+ drivers/iio/pressure/bmp280-spi.c                  |     1 +
+ drivers/iio/pressure/cros_ec_baro.c                |     3 +-
+ drivers/iio/pressure/dlhl60d.c                     |     2 +-
+ drivers/iio/proximity/as3935.c                     |     2 +-
+ drivers/iio/proximity/ping.c                       |     2 +-
+ drivers/iio/proximity/srf04.c                      |    11 +-
+ drivers/iio/proximity/srf08.c                      |     2 +-
+ drivers/iio/proximity/sx9324.c                     |    76 +-
+ drivers/iio/proximity/sx9360.c                     |    15 +-
+ drivers/iio/proximity/vcnl3020.c                   |     4 +-
+ drivers/iio/proximity/vl53l0x-i2c.c                |    55 +-
+ drivers/iio/resolver/ad2s1200.c                    |     2 +-
+ drivers/iio/resolver/ad2s90.c                      |     2 +-
+ drivers/iio/temperature/ltc2983.c                  |     4 +-
+ drivers/iio/temperature/max31865.c                 |     2 +-
+ drivers/iio/temperature/maxim_thermocouple.c       |     2 +-
+ drivers/iio/trigger/stm32-lptimer-trigger.c        |     4 +-
+ drivers/mcb/mcb-core.c                             |     4 +-
+ drivers/mfd/intel-m10-bmc.c                        |     2 +-
+ drivers/mfd/qcom-spmi-pmic.c                       |   272 +-
+ drivers/misc/Kconfig                               |    13 +
+ drivers/misc/Makefile                              |     1 +
+ drivers/misc/cardreader/rtsx_pcr.c                 |     8 +-
+ drivers/misc/cxl/context.c                         |     2 +-
+ drivers/misc/cxl/guest.c                           |     2 +-
+ drivers/misc/cxl/irq.c                             |     4 +-
+ drivers/misc/cxl/of.c                              |     5 +-
+ drivers/misc/eeprom/idt_89hpesx.c                  |    14 +-
+ drivers/misc/habanalabs/Makefile                   |     3 +
+ drivers/misc/habanalabs/common/Makefile            |     3 +-
+ drivers/misc/habanalabs/common/asid.c              |     5 +-
+ drivers/misc/habanalabs/common/command_buffer.c    |    12 +-
+ .../misc/habanalabs/common/command_submission.c    |   296 +-
+ drivers/misc/habanalabs/common/context.c           |    73 +-
+ drivers/misc/habanalabs/common/debugfs.c           |   221 +-
+ drivers/misc/habanalabs/common/decoder.c           |   133 +
+ drivers/misc/habanalabs/common/device.c            |   242 +-
+ drivers/misc/habanalabs/common/firmware_if.c       |   211 +-
+ drivers/misc/habanalabs/common/habanalabs.h        |   756 +-
+ drivers/misc/habanalabs/common/habanalabs_drv.c    |    82 +-
+ drivers/misc/habanalabs/common/habanalabs_ioctl.c  |    54 +-
+ drivers/misc/habanalabs/common/hw_queue.c          |    45 +-
+ drivers/misc/habanalabs/common/irq.c               |   160 +-
+ drivers/misc/habanalabs/common/memory.c            |   115 +-
+ drivers/misc/habanalabs/common/memory_mgr.c        |     2 +-
+ drivers/misc/habanalabs/common/mmu/Makefile        |     3 +-
+ drivers/misc/habanalabs/common/mmu/mmu.c           |   496 +-
+ drivers/misc/habanalabs/common/mmu/mmu_v1.c        |     9 +-
+ drivers/misc/habanalabs/common/mmu/mmu_v2_hr.c     |   399 +
+ drivers/misc/habanalabs/common/pci/pci.c           |    40 +-
+ drivers/misc/habanalabs/common/security.c          |   600 +
+ drivers/misc/habanalabs/common/sysfs.c             |    10 +-
+ drivers/misc/habanalabs/gaudi/gaudi.c              |   681 +-
+ drivers/misc/habanalabs/gaudi/gaudi_security.c     |     2 +-
+ drivers/misc/habanalabs/gaudi2/Makefile            |     4 +
+ drivers/misc/habanalabs/gaudi2/gaudi2.c            |  9986 ++++
+ drivers/misc/habanalabs/gaudi2/gaudi2P.h           |   566 +
+ drivers/misc/habanalabs/gaudi2/gaudi2_coresight.c  |  2720 ++
+ .../misc/habanalabs/gaudi2/gaudi2_coresight_regs.h |  1063 +
+ drivers/misc/habanalabs/gaudi2/gaudi2_masks.h      |   141 +
+ drivers/misc/habanalabs/gaudi2/gaudi2_security.c   |  3849 ++
+ drivers/misc/habanalabs/goya/goya.c                |   160 +-
+ drivers/misc/habanalabs/goya/goyaP.h               |     6 +-
+ drivers/misc/habanalabs/goya/goya_hwmgr.c          |     2 +
+ drivers/misc/habanalabs/include/common/cpucp_if.h  |   297 +-
+ .../misc/habanalabs/include/common/hl_boot_if.h    |     7 +
+ .../misc/habanalabs/include/gaudi/gaudi_masks.h    |     1 +
+ .../include/gaudi2/arc/gaudi2_arc_common_packets.h |   213 +
+ .../gaudi2/asic_reg/arc_farm_arc0_acp_eng_regs.h   |   567 +
+ .../gaudi2/asic_reg/arc_farm_arc0_aux_masks.h      |   819 +
+ .../gaudi2/asic_reg/arc_farm_arc0_aux_regs.h       |   591 +
+ .../asic_reg/arc_farm_arc0_dup_eng_axuser_regs.h   |    61 +
+ .../gaudi2/asic_reg/arc_farm_arc0_dup_eng_regs.h   |   575 +
+ .../asic_reg/arc_farm_kdma_ctx_axuser_masks.h      |   135 +
+ .../asic_reg/arc_farm_kdma_ctx_axuser_regs.h       |    61 +
+ .../gaudi2/asic_reg/arc_farm_kdma_ctx_masks.h      |   221 +
+ .../gaudi2/asic_reg/arc_farm_kdma_ctx_regs.h       |    95 +
+ .../gaudi2/asic_reg/arc_farm_kdma_kdma_cgm_regs.h  |    29 +
+ .../include/gaudi2/asic_reg/arc_farm_kdma_masks.h  |   415 +
+ .../include/gaudi2/asic_reg/arc_farm_kdma_regs.h   |   157 +
+ .../include/gaudi2/asic_reg/cpu_if_regs.h          |   777 +
+ .../gaudi2/asic_reg/dcore0_dec0_cmd_masks.h        |   229 +
+ .../include/gaudi2/asic_reg/dcore0_dec0_cmd_regs.h |    85 +
+ .../asic_reg/dcore0_edma0_core_ctx_axuser_regs.h   |    61 +
+ .../gaudi2/asic_reg/dcore0_edma0_core_ctx_regs.h   |    95 +
+ .../gaudi2/asic_reg/dcore0_edma0_core_masks.h      |   415 +
+ .../gaudi2/asic_reg/dcore0_edma0_core_regs.h       |   157 +
+ .../gaudi2/asic_reg/dcore0_edma0_qm_arc_aux_regs.h |   591 +
+ .../dcore0_edma0_qm_axuser_nonsecured_regs.h       |    61 +
+ .../gaudi2/asic_reg/dcore0_edma0_qm_cgm_regs.h     |    29 +
+ .../gaudi2/asic_reg/dcore0_edma0_qm_masks.h        |  1165 +
+ .../include/gaudi2/asic_reg/dcore0_edma0_qm_regs.h |  1057 +
+ .../asic_reg/dcore0_edma1_core_ctx_axuser_regs.h   |    61 +
+ .../dcore0_edma1_qm_axuser_nonsecured_regs.h       |    61 +
+ .../gaudi2/asic_reg/dcore0_hmmu0_mmu_masks.h       |   294 +
+ .../gaudi2/asic_reg/dcore0_hmmu0_mmu_regs.h        |   237 +
+ .../gaudi2/asic_reg/dcore0_hmmu0_stlb_masks.h      |   348 +
+ .../gaudi2/asic_reg/dcore0_hmmu0_stlb_regs.h       |   141 +
+ .../include/gaudi2/asic_reg/dcore0_mme_acc_regs.h  |    73 +
+ ...dcore0_mme_ctrl_lo_arch_agu_cout0_master_regs.h |    33 +
+ .../dcore0_mme_ctrl_lo_arch_agu_cout0_slave_regs.h |    33 +
+ ...dcore0_mme_ctrl_lo_arch_agu_cout1_master_regs.h |    33 +
+ .../dcore0_mme_ctrl_lo_arch_agu_cout1_slave_regs.h |    33 +
+ .../dcore0_mme_ctrl_lo_arch_agu_in0_master_regs.h  |    33 +
+ .../dcore0_mme_ctrl_lo_arch_agu_in0_slave_regs.h   |    33 +
+ .../dcore0_mme_ctrl_lo_arch_agu_in1_master_regs.h  |    33 +
+ .../dcore0_mme_ctrl_lo_arch_agu_in1_slave_regs.h   |    33 +
+ .../dcore0_mme_ctrl_lo_arch_agu_in2_master_regs.h  |    33 +
+ .../dcore0_mme_ctrl_lo_arch_agu_in2_slave_regs.h   |    33 +
+ .../dcore0_mme_ctrl_lo_arch_agu_in3_master_regs.h  |    33 +
+ .../dcore0_mme_ctrl_lo_arch_agu_in3_slave_regs.h   |    33 +
+ .../dcore0_mme_ctrl_lo_arch_agu_in4_master_regs.h  |    33 +
+ .../dcore0_mme_ctrl_lo_arch_agu_in4_slave_regs.h   |    33 +
+ .../dcore0_mme_ctrl_lo_arch_base_addr_regs.h       |    39 +
+ .../dcore0_mme_ctrl_lo_arch_non_tensor_end_regs.h  |    73 +
+ ...dcore0_mme_ctrl_lo_arch_non_tensor_start_regs.h |    35 +
+ .../dcore0_mme_ctrl_lo_arch_tensor_a_regs.h        |    67 +
+ .../dcore0_mme_ctrl_lo_arch_tensor_b_regs.h        |    67 +
+ .../dcore0_mme_ctrl_lo_arch_tensor_cout_regs.h     |    67 +
+ .../gaudi2/asic_reg/dcore0_mme_ctrl_lo_masks.h     |   468 +
+ .../asic_reg/dcore0_mme_ctrl_lo_mme_axuser_regs.h  |    61 +
+ .../gaudi2/asic_reg/dcore0_mme_ctrl_lo_regs.h      |   163 +
+ .../asic_reg/dcore0_mme_qm_arc_acp_eng_regs.h      |   567 +
+ .../gaudi2/asic_reg/dcore0_mme_qm_arc_aux_regs.h   |   591 +
+ .../dcore0_mme_qm_arc_dup_eng_axuser_regs.h        |    61 +
+ .../asic_reg/dcore0_mme_qm_arc_dup_eng_regs.h      |   575 +
+ .../dcore0_mme_qm_axuser_nonsecured_regs.h         |    61 +
+ .../asic_reg/dcore0_mme_qm_axuser_secured_regs.h   |    61 +
+ .../gaudi2/asic_reg/dcore0_mme_qm_cgm_regs.h       |    29 +
+ .../include/gaudi2/asic_reg/dcore0_mme_qm_regs.h   |  1057 +
+ .../gaudi2/asic_reg/dcore0_mme_sbte0_masks.h       |   107 +
+ .../dcore0_mme_sbte0_mstr_if_axuser_regs.h         |    61 +
+ .../asic_reg/dcore0_mme_wb0_mstr_if_axuser_regs.h  |    61 +
+ .../gaudi2/asic_reg/dcore0_rtr0_ctrl_regs.h        |   291 +
+ .../dcore0_rtr0_mstr_if_rr_prvt_hbw_regs.h         |   213 +
+ .../dcore0_rtr0_mstr_if_rr_prvt_lbw_regs.h         |   189 +
+ .../dcore0_rtr0_mstr_if_rr_shrd_hbw_regs.h         |   213 +
+ .../dcore0_rtr0_mstr_if_rr_shrd_lbw_regs.h         |   189 +
+ .../gaudi2/asic_reg/dcore0_sync_mngr_glbl_masks.h  |   135 +
+ .../gaudi2/asic_reg/dcore0_sync_mngr_glbl_regs.h   |  1203 +
+ .../dcore0_sync_mngr_mstr_if_axuser_masks.h        |   135 +
+ .../dcore0_sync_mngr_mstr_if_axuser_regs.h         |    61 +
+ .../gaudi2/asic_reg/dcore0_sync_mngr_objs_masks.h  |    87 +
+ .../gaudi2/asic_reg/dcore0_sync_mngr_objs_regs.h   | 43543 ++++++++++++++++++
+ .../gaudi2/asic_reg/dcore0_tpc0_cfg_axuser_regs.h  |    61 +
+ .../gaudi2/asic_reg/dcore0_tpc0_cfg_kernel_regs.h  |   129 +
+ .../dcore0_tpc0_cfg_kernel_tensor_0_regs.h         |    63 +
+ .../gaudi2/asic_reg/dcore0_tpc0_cfg_masks.h        |   509 +
+ .../gaudi2/asic_reg/dcore0_tpc0_cfg_qm_regs.h      |   129 +
+ .../asic_reg/dcore0_tpc0_cfg_qm_sync_object_regs.h |    27 +
+ .../asic_reg/dcore0_tpc0_cfg_qm_tensor_0_regs.h    |    63 +
+ .../include/gaudi2/asic_reg/dcore0_tpc0_cfg_regs.h |   229 +
+ .../gaudi2/asic_reg/dcore0_tpc0_cfg_special_regs.h |   185 +
+ .../asic_reg/dcore0_tpc0_eml_busmon_0_regs.h       |   163 +
+ .../gaudi2/asic_reg/dcore0_tpc0_eml_etf_regs.h     |   113 +
+ .../gaudi2/asic_reg/dcore0_tpc0_eml_funnel_regs.h  |    75 +
+ .../gaudi2/asic_reg/dcore0_tpc0_eml_spmu_regs.h    |   151 +
+ .../gaudi2/asic_reg/dcore0_tpc0_eml_stm_regs.h     |   131 +
+ .../gaudi2/asic_reg/dcore0_tpc0_qm_arc_aux_regs.h  |   591 +
+ .../dcore0_tpc0_qm_axuser_nonsecured_regs.h        |    61 +
+ .../gaudi2/asic_reg/dcore0_tpc0_qm_cgm_regs.h      |    29 +
+ .../include/gaudi2/asic_reg/dcore0_tpc0_qm_regs.h  |  1057 +
+ .../dcore0_vdec0_brdg_ctrl_axuser_dec_regs.h       |    61 +
+ ...dcore0_vdec0_brdg_ctrl_axuser_msix_abnrm_regs.h |    61 +
+ .../dcore0_vdec0_brdg_ctrl_axuser_msix_l2c_regs.h  |    61 +
+ .../dcore0_vdec0_brdg_ctrl_axuser_msix_nrm_regs.h  |    61 +
+ .../dcore0_vdec0_brdg_ctrl_axuser_msix_vcd_regs.h  |    61 +
+ .../gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_masks.h |   581 +
+ .../gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_regs.h  |   245 +
+ .../asic_reg/dcore0_vdec0_ctrl_special_regs.h      |   185 +
+ .../gaudi2/asic_reg/dcore1_mme_ctrl_lo_regs.h      |   163 +
+ .../gaudi2/asic_reg/dcore3_mme_ctrl_lo_regs.h      |   163 +
+ .../gaudi2/asic_reg/gaudi2_blocks_linux_driver.h   | 45067 +++++++++++++++++++
+ .../include/gaudi2/asic_reg/gaudi2_regs.h          |   550 +
+ .../include/gaudi2/asic_reg/nic0_qm0_cgm_regs.h    |    29 +
+ .../include/gaudi2/asic_reg/nic0_qm0_regs.h        |  1057 +
+ .../gaudi2/asic_reg/nic0_qm_arc_aux0_regs.h        |   591 +
+ .../include/gaudi2/asic_reg/nic0_qpc0_regs.h       |   905 +
+ .../nic0_umr0_0_completion_queue_ci_1_regs.h       |    27 +
+ .../asic_reg/nic0_umr0_0_unsecure_doorbell0_regs.h |    31 +
+ .../include/gaudi2/asic_reg/pcie_aux_regs.h        |   293 +
+ .../include/gaudi2/asic_reg/pcie_dbi_regs.h        |   422 +
+ .../include/gaudi2/asic_reg/pcie_dec0_cmd_masks.h  |   229 +
+ .../include/gaudi2/asic_reg/pcie_dec0_cmd_regs.h   |    85 +
+ .../pcie_vdec0_brdg_ctrl_axuser_dec_regs.h         |    61 +
+ .../pcie_vdec0_brdg_ctrl_axuser_msix_abnrm_regs.h  |    61 +
+ .../pcie_vdec0_brdg_ctrl_axuser_msix_l2c_regs.h    |    61 +
+ .../pcie_vdec0_brdg_ctrl_axuser_msix_nrm_regs.h    |    61 +
+ .../pcie_vdec0_brdg_ctrl_axuser_msix_vcd_regs.h    |    61 +
+ .../gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_masks.h   |   580 +
+ .../gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_regs.h    |   245 +
+ .../gaudi2/asic_reg/pcie_vdec0_ctrl_special_regs.h |   185 +
+ .../include/gaudi2/asic_reg/pcie_wrap_regs.h       |   601 +
+ .../gaudi2/asic_reg/pdma0_core_ctx_axuser_regs.h   |    61 +
+ .../include/gaudi2/asic_reg/pdma0_core_ctx_regs.h  |    95 +
+ .../include/gaudi2/asic_reg/pdma0_core_masks.h     |   415 +
+ .../include/gaudi2/asic_reg/pdma0_core_regs.h      |   157 +
+ .../gaudi2/asic_reg/pdma0_core_special_masks.h     |   135 +
+ .../gaudi2/asic_reg/pdma0_qm_arc_aux_regs.h        |   591 +
+ .../asic_reg/pdma0_qm_axuser_nonsecured_regs.h     |    61 +
+ .../gaudi2/asic_reg/pdma0_qm_axuser_secured_regs.h |    61 +
+ .../include/gaudi2/asic_reg/pdma0_qm_cgm_regs.h    |    29 +
+ .../include/gaudi2/asic_reg/pdma0_qm_masks.h       |  1165 +
+ .../include/gaudi2/asic_reg/pdma0_qm_regs.h        |  1057 +
+ .../gaudi2/asic_reg/pdma1_core_ctx_axuser_regs.h   |    61 +
+ .../asic_reg/pdma1_qm_axuser_nonsecured_regs.h     |    61 +
+ .../include/gaudi2/asic_reg/pmmu_hbw_stlb_masks.h  |   334 +
+ .../include/gaudi2/asic_reg/pmmu_hbw_stlb_regs.h   |   141 +
+ .../include/gaudi2/asic_reg/pmmu_pif_regs.h        |   135 +
+ .../include/gaudi2/asic_reg/psoc_etr_masks.h       |   311 +
+ .../include/gaudi2/asic_reg/psoc_etr_regs.h        |   115 +
+ .../gaudi2/asic_reg/psoc_global_conf_masks.h       |  1406 +
+ .../gaudi2/asic_reg/psoc_global_conf_regs.h        |  1337 +
+ .../gaudi2/asic_reg/psoc_reset_conf_masks.h        |  2321 +
+ .../include/gaudi2/asic_reg/psoc_reset_conf_regs.h |   989 +
+ .../include/gaudi2/asic_reg/psoc_timestamp_regs.h  |    57 +
+ .../include/gaudi2/asic_reg/rot0_desc_regs.h       |   155 +
+ .../include/gaudi2/asic_reg/rot0_masks.h           |   313 +
+ .../include/gaudi2/asic_reg/rot0_qm_arc_aux_regs.h |   591 +
+ .../asic_reg/rot0_qm_axuser_nonsecured_regs.h      |    61 +
+ .../include/gaudi2/asic_reg/rot0_qm_cgm_regs.h     |    29 +
+ .../include/gaudi2/asic_reg/rot0_qm_regs.h         |  1057 +
+ .../habanalabs/include/gaudi2/asic_reg/rot0_regs.h |   111 +
+ .../include/gaudi2/asic_reg/xbar_edge_0_regs.h     |   199 +
+ .../include/gaudi2/asic_reg/xbar_mid_0_regs.h      |   199 +
+ drivers/misc/habanalabs/include/gaudi2/gaudi2.h    |   123 +
+ .../include/gaudi2/gaudi2_async_events.h           |   963 +
+ .../include/gaudi2/gaudi2_async_ids_map_extended.h |  2668 ++
+ .../include/gaudi2/gaudi2_async_virt_events.h      |    57 +
+ .../habanalabs/include/gaudi2/gaudi2_coresight.h   |   984 +
+ .../misc/habanalabs/include/gaudi2/gaudi2_fw_if.h  |    99 +
+ .../habanalabs/include/gaudi2/gaudi2_packets.h     |   197 +
+ .../habanalabs/include/gaudi2/gaudi2_reg_map.h     |    59 +
+ .../misc/habanalabs/include/goya/goya_packets.h    |    12 -
+ .../habanalabs/include/hw_ip/mmu/mmu_general.h     |    14 +-
+ .../misc/habanalabs/include/hw_ip/mmu/mmu_v2_0.h   |    51 +
+ drivers/misc/lkdtm/cfi.c                           |     2 +-
+ drivers/misc/mei/hw-me.c                           |     2 +-
+ drivers/misc/sgi-gru/grukservices.c                |     2 +-
+ drivers/misc/sgi-xp/xpc_uv.c                       |     2 +-
+ drivers/misc/sgi-xp/xpnet.c                        |    13 +-
+ drivers/misc/uacce/uacce.c                         |   133 +-
+ drivers/misc/vcpu_stall_detector.c                 |   223 +
+ drivers/net/wireguard/device.c                     |     3 +-
+ drivers/nvmem/Kconfig                              |     7 +
+ drivers/nvmem/Makefile                             |     2 +
+ drivers/nvmem/microchip-otpc.c                     |   288 +
+ drivers/nvmem/mtk-efuse.c                          |     3 +-
+ drivers/slimbus/core.c                             |     6 +-
+ drivers/slimbus/messaging.c                        |     4 +-
+ drivers/spmi/spmi.c                                |    17 +
+ drivers/virt/acrn/ioreq.c                          |     6 +-
+ drivers/virt/vboxguest/vboxguest_linux.c           |     9 +-
+ include/dt-bindings/nvmem/microchip,sama7g5-otpc.h |    12 +
+ include/linux/coresight-pmu.h                      |     2 +
+ include/linux/firmware/intel/stratix10-smc.h       |   175 +
+ .../linux/firmware/intel/stratix10-svc-client.h    |    56 +-
+ include/linux/fpga/fpga-mgr.h                      |    24 +-
+ include/linux/iio/common/cros_ec_sensors_core.h    |     2 -
+ include/linux/iio/iio.h                            |    14 +-
+ include/linux/iio/trigger.h                        |     5 +
+ include/linux/spmi.h                               |     3 +
+ include/linux/uacce.h                              |     6 +-
+ include/soc/qcom/qcom-spmi-pmic.h                  |    61 +
+ include/uapi/linux/android/binder.h                |     1 +
+ include/uapi/misc/habanalabs.h                     |   541 +-
+ kernel/configs/android-base.config                 |     1 -
+ kernel/power/Kconfig                               |    20 +
+ kernel/rcu/Kconfig.debug                           |     3 +-
+ scripts/tags.sh                                    |     9 +-
+ .../testing/selftests/filesystems/binderfs/config  |     1 -
+ tools/testing/selftests/sync/config                |     1 -
+ 539 files changed, 167931 insertions(+), 3128 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-class-vduse
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update
+ create mode 100644 Documentation/devicetree/bindings/arm/arm,coresight-catu.yaml
+ create mode 100644 Documentation/devicetree/bindings/arm/arm,coresight-cpu-debug.yaml
+ rename Documentation/devicetree/bindings/arm/{coresight-cti.yaml => arm,coresight-cti.yaml} (98%)
+ create mode 100644 Documentation/devicetree/bindings/arm/arm,coresight-dynamic-funnel.yaml
+ create mode 100644 Documentation/devicetree/bindings/arm/arm,coresight-dynamic-replicator.yaml
+ create mode 100644 Documentation/devicetree/bindings/arm/arm,coresight-etb10.yaml
+ create mode 100644 Documentation/devicetree/bindings/arm/arm,coresight-etm.yaml
+ create mode 100644 Documentation/devicetree/bindings/arm/arm,coresight-static-funnel.yaml
+ create mode 100644 Documentation/devicetree/bindings/arm/arm,coresight-static-replicator.yaml
+ create mode 100644 Documentation/devicetree/bindings/arm/arm,coresight-stm.yaml
+ create mode 100644 Documentation/devicetree/bindings/arm/arm,coresight-tmc.yaml
+ create mode 100644 Documentation/devicetree/bindings/arm/arm,coresight-tpiu.yaml
+ rename Documentation/devicetree/bindings/arm/{ete.yaml => arm,embedded-trace-extension.yaml} (95%)
+ rename Documentation/devicetree/bindings/arm/{trbe.yaml => arm,trace-buffer-extension.yaml} (94%)
+ delete mode 100644 Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt
+ delete mode 100644 Documentation/devicetree/bindings/arm/coresight.txt
+ create mode 100644 Documentation/devicetree/bindings/fpga/microchip,mpf-spi-fpga-mgr.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/qcom,spmi-rradc.yaml
+ create mode 100644 Documentation/devicetree/bindings/misc/qemu,vcpu-stall-detector.yaml
+ create mode 100644 Documentation/devicetree/bindings/nvmem/mediatek,efuse.yaml
+ create mode 100644 Documentation/devicetree/bindings/nvmem/microchip,sama7g5-otpc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/nvmem/mtk-efuse.txt
+ create mode 100644 drivers/accessibility/speakup/.gitignore
+ create mode 100644 drivers/accessibility/speakup/genmap.c
+ create mode 100644 drivers/accessibility/speakup/makemapdata.c
+ delete mode 100644 drivers/accessibility/speakup/speakupmap.h
+ create mode 100644 drivers/accessibility/speakup/utils.h
+ create mode 100644 drivers/fpga/intel-m10-bmc-sec-update.c
+ create mode 100644 drivers/fpga/microchip-spi.c
+ create mode 100644 drivers/iio/adc/qcom-spmi-rradc.c
+ create mode 100644 drivers/misc/habanalabs/common/decoder.c
+ create mode 100644 drivers/misc/habanalabs/common/mmu/mmu_v2_hr.c
+ create mode 100644 drivers/misc/habanalabs/common/security.c
+ create mode 100644 drivers/misc/habanalabs/gaudi2/Makefile
+ create mode 100644 drivers/misc/habanalabs/gaudi2/gaudi2.c
+ create mode 100644 drivers/misc/habanalabs/gaudi2/gaudi2P.h
+ create mode 100644 drivers/misc/habanalabs/gaudi2/gaudi2_coresight.c
+ create mode 100644 drivers/misc/habanalabs/gaudi2/gaudi2_coresight_regs.h
+ create mode 100644 drivers/misc/habanalabs/gaudi2/gaudi2_masks.h
+ create mode 100644 drivers/misc/habanalabs/gaudi2/gaudi2_security.c
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/arc/gaudi2_arc_common_packets.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_acp_eng_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_aux_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_aux_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_dup_eng_axuser_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_dup_eng_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_ctx_axuser_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_ctx_axuser_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_ctx_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_ctx_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_kdma_cgm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/cpu_if_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_dec0_cmd_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_dec0_cmd_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_core_ctx_axuser_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_core_ctx_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_core_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_core_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_arc_aux_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_axuser_nonsecured_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_cgm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_edma1_core_ctx_axuser_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_edma1_qm_axuser_nonsecured_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_hmmu0_mmu_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_hmmu0_mmu_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_hmmu0_stlb_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_hmmu0_stlb_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_acc_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_cout0_master_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_cout0_slave_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_cout1_master_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_cout1_slave_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in0_master_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in0_slave_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in1_master_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in1_slave_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in2_master_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in2_slave_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in3_master_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in3_slave_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in4_master_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in4_slave_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_base_addr_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_non_tensor_end_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_non_tensor_start_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_tensor_a_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_tensor_b_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_tensor_cout_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_mme_axuser_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_arc_acp_eng_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_arc_aux_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_arc_dup_eng_axuser_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_arc_dup_eng_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_axuser_nonsecured_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_axuser_secured_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_cgm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_sbte0_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_sbte0_mstr_if_axuser_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_mme_wb0_mstr_if_axuser_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_ctrl_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_mstr_if_rr_prvt_hbw_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_mstr_if_rr_prvt_lbw_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_mstr_if_rr_shrd_hbw_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_mstr_if_rr_shrd_lbw_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_glbl_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_glbl_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_mstr_if_axuser_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_mstr_if_axuser_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_objs_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_objs_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_axuser_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_kernel_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_kernel_tensor_0_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_qm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_qm_sync_object_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_qm_tensor_0_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_special_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_busmon_0_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_etf_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_funnel_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_spmu_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_stm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_qm_arc_aux_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_qm_axuser_nonsecured_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_qm_cgm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_qm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_dec_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_msix_abnrm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_msix_l2c_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_msix_nrm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_msix_vcd_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_ctrl_special_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore1_mme_ctrl_lo_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/dcore3_mme_ctrl_lo_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/gaudi2_blocks_linux_driver.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/gaudi2_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/nic0_qm0_cgm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/nic0_qm0_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/nic0_qm_arc_aux0_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/nic0_qpc0_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/nic0_umr0_0_completion_queue_ci_1_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/nic0_umr0_0_unsecure_doorbell0_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pcie_aux_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pcie_dbi_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pcie_dec0_cmd_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pcie_dec0_cmd_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_dec_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_msix_abnrm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_msix_l2c_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_msix_nrm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_msix_vcd_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_ctrl_special_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pcie_wrap_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pdma0_core_ctx_axuser_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pdma0_core_ctx_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pdma0_core_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pdma0_core_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pdma0_core_special_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pdma0_qm_arc_aux_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pdma0_qm_axuser_nonsecured_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pdma0_qm_axuser_secured_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pdma0_qm_cgm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pdma0_qm_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pdma0_qm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pdma1_core_ctx_axuser_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pdma1_qm_axuser_nonsecured_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pmmu_hbw_stlb_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pmmu_hbw_stlb_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/pmmu_pif_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/psoc_etr_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/psoc_etr_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/psoc_global_conf_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/psoc_global_conf_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/psoc_reset_conf_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/psoc_reset_conf_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/psoc_timestamp_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/rot0_desc_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/rot0_masks.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/rot0_qm_arc_aux_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/rot0_qm_axuser_nonsecured_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/rot0_qm_cgm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/rot0_qm_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/rot0_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/xbar_edge_0_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/asic_reg/xbar_mid_0_regs.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/gaudi2.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/gaudi2_async_events.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/gaudi2_async_ids_map_extended.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/gaudi2_async_virt_events.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/gaudi2_coresight.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/gaudi2_fw_if.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/gaudi2_packets.h
+ create mode 100644 drivers/misc/habanalabs/include/gaudi2/gaudi2_reg_map.h
+ create mode 100644 drivers/misc/habanalabs/include/hw_ip/mmu/mmu_v2_0.h
+ create mode 100644 drivers/misc/vcpu_stall_detector.c
+ create mode 100644 drivers/nvmem/microchip-otpc.c
+ create mode 100644 include/dt-bindings/nvmem/microchip,sama7g5-otpc.h
+ create mode 100644 include/soc/qcom/qcom-spmi-pmic.h
+Merging coresight/next (4d45bc82df66 coresight: etm4x: avoid build failure with unrolled loops)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next
+Already up to date.
+Merging fpga/for-next (ee794221a6f6 fpga: fpga-mgr: Fix spelling mistake "bitsream" -> "bitstream")
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next
+Already up to date.
+Merging icc/icc-next (a6339ac8a104 Merge branch 'icc-rpm' into icc-next)
+$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next
+Auto-merging drivers/devfreq/imx-bus.c
+Merge made by the 'ort' strategy.
+ .../bindings/interconnect/fsl,imx8m-noc.yaml       |   6 +-
+ .../devicetree/bindings/interconnect/qcom,rpm.yaml |   6 +-
+ .../bindings/interconnect/qcom,rpmh-common.yaml    |  43 ++
+ .../bindings/interconnect/qcom,rpmh.yaml           |  22 +-
+ .../bindings/interconnect/qcom,sm6350-rpmh.yaml    |  82 ++++
+ drivers/devfreq/imx-bus.c                          |   1 +
+ drivers/interconnect/bulk.c                        |  42 ++
+ drivers/interconnect/imx/Kconfig                   |   4 +
+ drivers/interconnect/imx/Makefile                  |   2 +
+ drivers/interconnect/imx/imx.c                     |  84 +++-
+ drivers/interconnect/imx/imx.h                     |  49 +-
+ drivers/interconnect/imx/imx8mm.c                  |   2 +-
+ drivers/interconnect/imx/imx8mn.c                  |   2 +-
+ drivers/interconnect/imx/imx8mp.c                  | 259 +++++++++++
+ drivers/interconnect/imx/imx8mq.c                  |   2 +-
+ drivers/interconnect/qcom/Kconfig                  |   9 +
+ drivers/interconnect/qcom/Makefile                 |   5 +
+ drivers/interconnect/qcom/icc-common.c             |  34 ++
+ drivers/interconnect/qcom/icc-common.h             |  13 +
+ drivers/interconnect/qcom/icc-rpm.c                | 168 +++++--
+ drivers/interconnect/qcom/icc-rpm.h                |   6 +
+ drivers/interconnect/qcom/icc-rpmh.c               |  30 +-
+ drivers/interconnect/qcom/icc-rpmh.h               |   1 -
+ drivers/interconnect/qcom/msm8939.c                |   1 +
+ drivers/interconnect/qcom/sm6350.c                 | 493 +++++++++++++++++++++
+ drivers/interconnect/qcom/sm6350.h                 | 139 ++++++
+ drivers/interconnect/qcom/sm8450.c                 |   1 +
+ include/dt-bindings/interconnect/fsl,imx8mp.h      |  59 +++
+ include/dt-bindings/interconnect/qcom,sm6350.h     | 148 +++++++
+ include/linux/interconnect.h                       |   7 +
+ 30 files changed, 1627 insertions(+), 93 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,rpmh-common.yaml
+ create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sm6350-rpmh.yaml
+ create mode 100644 drivers/interconnect/imx/imx8mp.c
+ create mode 100644 drivers/interconnect/qcom/icc-common.c
+ create mode 100644 drivers/interconnect/qcom/icc-common.h
+ create mode 100644 drivers/interconnect/qcom/sm6350.c
+ create mode 100644 drivers/interconnect/qcom/sm6350.h
+ create mode 100644 include/dt-bindings/interconnect/fsl,imx8mp.h
+ create mode 100644 include/dt-bindings/interconnect/qcom,sm6350.h
+Merging iio/togreg (568f6869e680 iio: adc: xilinx-xadc: Drop duplicate NULL check in xadc_parse_dt())
+$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg
+Already up to date.
+Merging phy-next/next (08fd292fdffc phy: phy-mtk-dp: change mtk_dp_phy_driver to static)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging MAINTAINERS
+Auto-merging drivers/gpu/drm/msm/dp/dp_parser.c
+Auto-merging drivers/gpu/drm/msm/dp/dp_parser.h
+CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/dp/dp_parser.h
+Auto-merging drivers/gpu/drm/msm/dp/dp_power.c
+Resolved 'drivers/gpu/drm/msm/dp/dp_parser.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 1fed51f7d677] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git
+$ git diff -M --stat --summary HEAD^..
+ .../phy/amlogic,g12a-mipi-dphy-analog.yaml         |   35 +
+ .../devicetree/bindings/phy/cdns,dphy.yaml         |    5 +-
+ .../bindings/phy/fsl,imx8qm-lvds-phy.yaml          |   61 +
+ .../devicetree/bindings/phy/mediatek,dsi-phy.yaml  |    4 +
+ .../devicetree/bindings/phy/mediatek,pcie-phy.yaml |   75 +
+ .../devicetree/bindings/phy/mediatek,tphy.yaml     |    1 +
+ .../devicetree/bindings/phy/mxs-usb-phy.txt        |    1 +
+ .../devicetree/bindings/phy/phy-tegra194-p2u.yaml  |   17 +-
+ .../devicetree/bindings/phy/qcom,edp-phy.yaml      |    6 +
+ .../devicetree/bindings/phy/qcom,qmp-phy.yaml      |    2 +
+ .../devicetree/bindings/phy/renesas,usb3-phy.yaml  |    2 +-
+ .../devicetree/bindings/phy/samsung,ufs-phy.yaml   |   15 +-
+ .../devicetree/bindings/vendor-prefixes.yaml       |    2 +
+ MAINTAINERS                                        |    2 +
+ drivers/gpu/drm/msm/dp/dp_parser.c                 |   14 -
+ drivers/gpu/drm/msm/dp/dp_parser.h                 |    8 -
+ drivers/gpu/drm/msm/dp/dp_power.c                  |   95 +-
+ drivers/phy/amlogic/Kconfig                        |   12 +
+ drivers/phy/amlogic/Makefile                       |    1 +
+ drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c      |    2 +-
+ .../phy/amlogic/phy-meson-g12a-mipi-dphy-analog.c  |  171 +
+ drivers/phy/broadcom/phy-brcm-usb-init.c           |    2 +-
+ drivers/phy/cadence/cdns-dphy.c                    |  101 +-
+ drivers/phy/cadence/phy-cadence-sierra.c           |    1 -
+ drivers/phy/cadence/phy-cadence-torrent.c          |    1 -
+ drivers/phy/freescale/Kconfig                      |    9 +
+ drivers/phy/freescale/Makefile                     |    1 +
+ drivers/phy/freescale/phy-fsl-imx8qm-lvds-phy.c    |  450 ++
+ drivers/phy/mediatek/Kconfig                       |   19 +
+ drivers/phy/mediatek/Makefile                      |    2 +
+ drivers/phy/mediatek/phy-mtk-dp.c                  |  202 +
+ drivers/phy/mediatek/phy-mtk-pcie.c                |  267 +
+ drivers/phy/qualcomm/Makefile                      |    8 +-
+ drivers/phy/qualcomm/phy-qcom-edp.c                |   12 +
+ drivers/phy/qualcomm/phy-qcom-qmp-combo.c          | 2621 ++++++++
+ drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c   | 1054 ++++
+ drivers/phy/qualcomm/phy-qcom-qmp-pcie-qhp.h       |  123 +
+ drivers/phy/qualcomm/phy-qcom-qmp-pcie.c           | 2556 ++++++++
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-misc-v3.h    |   17 +
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v4.h    |   72 +
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v4_20.h |   17 +
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v5.h    |   16 +
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v5_20.h |   17 +
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v3.h     |   18 +
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v4.h     |   31 +
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v5.h     |   27 +
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-usb-v4.h     |   34 +
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-usb-v5.h     |   36 +
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-v2.h         |   46 +
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-v3.h         |  145 +
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-v4.h         |  135 +
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-v4_20.h      |   15 +
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-v5.h         |   17 +
+ drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v3.h |  111 +
+ drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v4.h |  123 +
+ drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v5.h |  124 +
+ drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com.h    |  140 +
+ drivers/phy/qualcomm/phy-qcom-qmp-qserdes-pll.h    |   66 +
+ .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v3.h    |   68 +
+ .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v4.h    |  233 +
+ .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v4_20.h |   43 +
+ .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v5.h    |  231 +
+ .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v5_20.h |   60 +
+ drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx.h   |  205 +
+ drivers/phy/qualcomm/phy-qcom-qmp-ufs.c            | 1383 +++++
+ drivers/phy/qualcomm/phy-qcom-qmp-usb.c            | 2765 +++++++++
+ drivers/phy/qualcomm/phy-qcom-qmp.c                | 6350 --------------------
+ drivers/phy/qualcomm/phy-qcom-qmp.h                | 1242 +---
+ drivers/phy/rockchip/phy-rockchip-inno-usb2.c      |    8 +-
+ drivers/phy/samsung/Makefile                       |    1 +
+ drivers/phy/samsung/phy-exynos7-ufs.c              |   12 +-
+ drivers/phy/samsung/phy-exynosautov9-ufs.c         |   29 +-
+ drivers/phy/samsung/phy-fsd-ufs.c                  |   63 +
+ drivers/phy/samsung/phy-samsung-ufs.c              |  138 +-
+ drivers/phy/samsung/phy-samsung-ufs.h              |   34 +-
+ drivers/phy/tegra/phy-tegra194-p2u.c               |   48 +-
+ drivers/phy/ti/phy-j721e-wiz.c                     |   75 +-
+ drivers/phy/ti/phy-tusb1210.c                      |    5 +-
+ 78 files changed, 14318 insertions(+), 7842 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/phy/amlogic,g12a-mipi-dphy-analog.yaml
+ create mode 100644 Documentation/devicetree/bindings/phy/fsl,imx8qm-lvds-phy.yaml
+ create mode 100644 Documentation/devicetree/bindings/phy/mediatek,pcie-phy.yaml
+ create mode 100644 drivers/phy/amlogic/phy-meson-g12a-mipi-dphy-analog.c
+ create mode 100644 drivers/phy/freescale/phy-fsl-imx8qm-lvds-phy.c
+ create mode 100644 drivers/phy/mediatek/phy-mtk-dp.c
+ create mode 100644 drivers/phy/mediatek/phy-mtk-pcie.c
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-combo.c
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcie-qhp.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-misc-v3.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v4.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v4_20.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v5.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v5_20.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v3.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v4.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v5.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-usb-v4.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-usb-v5.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-v2.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-v3.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-v4.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-v4_20.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-v5.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v3.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v4.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v5.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-pll.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v3.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v4.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v4_20.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v5.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v5_20.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx.h
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+ delete mode 100644 drivers/phy/qualcomm/phy-qcom-qmp.c
+ create mode 100644 drivers/phy/samsung/phy-fsd-ufs.c
+Merging soundwire/next (3f4a70268d54 soundwire: qcom: Enable software clock gating requirement flag)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next
+Auto-merging drivers/soundwire/intel.c
+CONFLICT (content): Merge conflict in drivers/soundwire/intel.c
+Auto-merging drivers/soundwire/qcom.c
+Auto-merging drivers/soundwire/slave.c
+Resolved 'drivers/soundwire/intel.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master addd5d5b1b4d] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git
+$ git diff -M --stat --summary HEAD^..
+ drivers/soundwire/bus.c       | 75 ++++++++++++++++++++++++-------------------
+ drivers/soundwire/bus_type.c  | 38 +++++++++++++++-------
+ drivers/soundwire/intel.c     | 18 +++++++++++
+ drivers/soundwire/qcom.c      | 22 ++++++++++++-
+ drivers/soundwire/slave.c     |  3 +-
+ drivers/soundwire/stream.c    | 53 +++++++++++++++++++-----------
+ include/linux/soundwire/sdw.h |  8 ++---
+ 7 files changed, 147 insertions(+), 70 deletions(-)
+Merging extcon/extcon-next (3a06ed80265f extcon: Add EXTCON_DISP_CVBS and EXTCON_DISP_EDP)
+$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next
+Merge made by the 'ort' strategy.
+ drivers/extcon/extcon-fsa9480.c |  6 ------
+ drivers/extcon/extcon-palmas.c  |  2 +-
+ drivers/extcon/extcon-rt8973a.c |  1 -
+ drivers/extcon/extcon-sm5502.c  |  2 --
+ drivers/extcon/extcon.c         | 12 +++++++++++-
+ include/linux/extcon.h          |  2 ++
+ 6 files changed, 14 insertions(+), 11 deletions(-)
+Merging gnss/gnss-next (c0c725d7350e gnss: replace ida_simple API)
+$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next
+Auto-merging drivers/gnss/core.c
+Merge made by the 'ort' strategy.
+ drivers/gnss/core.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging vfio/next (2a8ed7ef00b9 Merge branches 'v5.20/vfio/spapr_tce-unused-arg-v1', 'v5.20/vfio/comment-typo-v1' and 'v5.20/vfio/vfio-ccw-rework-v4' into v5.20/vfio/next)
+$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next
+Auto-merging Documentation/driver-api/vfio-mediated-device.rst
+Auto-merging drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
+Auto-merging drivers/vfio/pci/mlx5/main.c
+Auto-merging drivers/vfio/pci/vfio_pci_core.c
+Auto-merging drivers/vfio/vfio.c
+CONFLICT (content): Merge conflict in drivers/vfio/vfio.c
+Auto-merging include/linux/vfio_pci_core.h
+CONFLICT (content): Merge conflict in include/linux/vfio_pci_core.h
+Resolved 'drivers/vfio/vfio.c' using previous resolution.
+Resolved 'include/linux/vfio_pci_core.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master def18c3b29ed] Merge branch 'next' of git://github.com/awilliam/linux-vfio.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/driver-api/vfio-mediated-device.rst |  10 +--
+ drivers/s390/cio/vfio_ccw_async.c                 |   1 -
+ drivers/s390/cio/vfio_ccw_cp.h                    |  12 +--
+ drivers/s390/cio/vfio_ccw_drv.c                   |  59 ++++---------
+ drivers/s390/cio/vfio_ccw_fsm.c                   |  99 +++++++++++++++++----
+ drivers/s390/cio/vfio_ccw_ops.c                   |  77 +++++------------
+ drivers/s390/cio/vfio_ccw_private.h               |  11 +--
+ drivers/vfio/fsl-mc/vfio_fsl_mc_private.h         |   2 +-
+ drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c    |  11 ++-
+ drivers/vfio/pci/mlx5/cmd.c                       |  14 ++-
+ drivers/vfio/pci/mlx5/cmd.h                       |   4 +-
+ drivers/vfio/pci/mlx5/main.c                      |  11 ++-
+ drivers/vfio/pci/vfio_pci_config.c                |   2 +-
+ drivers/vfio/pci/vfio_pci_core.c                  |   7 ++
+ drivers/vfio/platform/vfio_platform_private.h     |  21 +++--
+ drivers/vfio/vfio.c                               |  30 ++++---
+ drivers/vfio/vfio_iommu_spapr_tce.c               |   9 +-
+ drivers/vfio/vfio_iommu_type1.c                   |  49 +++++------
+ include/linux/mdev.h                              |   5 --
+ include/linux/vfio.h                              | 100 ++++++++++++----------
+ include/linux/vfio_pci_core.h                     |  65 +++++++-------
+ 21 files changed, 318 insertions(+), 281 deletions(-)
+Merging staging/staging-next (042f1a6f434a staging: r8188eu: remove HW_VAR_MLME_SITESURVEY from SetHwReg8188EU())
+$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/Makefile
+Auto-merging drivers/staging/qlge/qlge_main.c
+Auto-merging drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+Auto-merging drivers/staging/vt6655/device_main.c
+Auto-merging drivers/staging/vt6655/rxtx.c
+Merge made by the 'ort' strategy.
+ Documentation/driver-api/vme.rst                   |    4 +-
+ MAINTAINERS                                        |    5 +-
+ drivers/Kconfig                                    |    2 -
+ drivers/Makefile                                   |    1 -
+ drivers/staging/fbtft/fb_ssd1351.c                 |    3 +-
+ drivers/staging/fbtft/fbtft-core.c                 |    3 +-
+ drivers/staging/greybus/audio_helper.c             |   14 +-
+ drivers/staging/greybus/fw-management.c            |    6 +-
+ drivers/staging/greybus/loopback.c                 |    2 +-
+ drivers/staging/octeon/ethernet-rx.c               |    4 +-
+ drivers/staging/olpc_dcon/olpc_dcon.c              |    7 +-
+ drivers/staging/qlge/qlge_main.c                   |   30 +-
+ drivers/staging/r8188eu/Makefile                   |    1 -
+ drivers/staging/r8188eu/core/rtw_ap.c              |   23 +-
+ drivers/staging/r8188eu/core/rtw_cmd.c             |   15 +-
+ drivers/staging/r8188eu/core/rtw_efuse.c           |   61 +-
+ drivers/staging/r8188eu/core/rtw_fw.c              |   78 +-
+ drivers/staging/r8188eu/core/rtw_ieee80211.c       |    1 +
+ drivers/staging/r8188eu/core/rtw_ioctl_set.c       |    1 -
+ drivers/staging/r8188eu/core/rtw_iol.c             |    8 +-
+ drivers/staging/r8188eu/core/rtw_led.c             |   43 +-
+ drivers/staging/r8188eu/core/rtw_mlme.c            |    6 +-
+ drivers/staging/r8188eu/core/rtw_mlme_ext.c        |  301 ++-
+ drivers/staging/r8188eu/core/rtw_p2p.c             |    9 +-
+ drivers/staging/r8188eu/core/rtw_pwrctrl.c         |   11 +-
+ drivers/staging/r8188eu/core/rtw_recv.c            |   80 +-
+ drivers/staging/r8188eu/core/rtw_wlan_util.c       |  125 +-
+ drivers/staging/r8188eu/core/rtw_xmit.c            |   34 +-
+ drivers/staging/r8188eu/hal/Hal8188EPwrSeq.c       |   45 -
+ drivers/staging/r8188eu/hal/Hal8188ERateAdaptive.c |   33 +-
+ drivers/staging/r8188eu/hal/HalPhyRf_8188e.c       |   21 +-
+ drivers/staging/r8188eu/hal/HalPwrSeqCmd.c         |  118 +-
+ drivers/staging/r8188eu/hal/hal_com.c              |   27 +-
+ drivers/staging/r8188eu/hal/rtl8188e_cmd.c         |   37 +-
+ drivers/staging/r8188eu/hal/rtl8188e_dm.c          |    6 +-
+ drivers/staging/r8188eu/hal/rtl8188e_hal_init.c    |  171 +-
+ drivers/staging/r8188eu/hal/rtl8188e_phycfg.c      |   30 +-
+ drivers/staging/r8188eu/hal/rtl8188eu_recv.c       |    2 +-
+ drivers/staging/r8188eu/hal/usb_halinit.c          |  385 ++--
+ drivers/staging/r8188eu/hal/usb_ops_linux.c        |   33 +-
+ drivers/staging/r8188eu/include/Hal8188EPwrSeq.h   |   13 -
+ .../staging/r8188eu/include/Hal8188ERateAdaptive.h |   13 -
+ drivers/staging/r8188eu/include/HalPwrSeqCmd.h     |   51 +-
+ drivers/staging/r8188eu/include/basic_types.h      |   52 -
+ drivers/staging/r8188eu/include/hal_intf.h         |   13 +-
+ drivers/staging/r8188eu/include/ieee80211.h        |    7 -
+ drivers/staging/r8188eu/include/osdep_service.h    |    3 -
+ drivers/staging/r8188eu/include/rtl8188e_hal.h     |    5 -
+ drivers/staging/r8188eu/include/rtl8188e_spec.h    |  143 --
+ drivers/staging/r8188eu/include/rtw_eeprom.h       |   10 -
+ drivers/staging/r8188eu/include/rtw_efuse.h        |    2 -
+ drivers/staging/r8188eu/include/rtw_io.h           |    8 +-
+ drivers/staging/r8188eu/include/rtw_iol.h          |   24 +-
+ drivers/staging/r8188eu/include/rtw_led.h          |    9 +-
+ drivers/staging/r8188eu/include/rtw_mlme_ext.h     |   10 +-
+ drivers/staging/r8188eu/include/usb_ops_linux.h    |    2 -
+ drivers/staging/r8188eu/os_dep/ioctl_linux.c       |   59 +-
+ drivers/staging/r8188eu/os_dep/os_intfs.c          |   19 +-
+ drivers/staging/r8188eu/os_dep/osdep_service.c     |    8 -
+ drivers/staging/r8188eu/os_dep/usb_intf.c          |    2 +-
+ drivers/staging/r8188eu/os_dep/usb_ops_linux.c     |    2 +-
+ drivers/staging/r8188eu/os_dep/xmit_linux.c        |    2 +-
+ drivers/staging/rtl8192e/rtllib_tx.c               |   24 +-
+ drivers/staging/rtl8192e/rtllib_wx.c               |   37 +-
+ drivers/staging/rtl8192u/r8192U.h                  |    2 +-
+ drivers/staging/rtl8192u/r8192U_dm.c               |   40 +-
+ drivers/staging/rtl8192u/r8192U_dm.h               |    2 +-
+ drivers/staging/rtl8723bs/core/rtw_mlme_ext.c      |    2 +-
+ drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c  |  225 +--
+ drivers/staging/rts5208/spi.c                      |    6 +-
+ drivers/staging/sm750fb/ddk750_dvi.c               |    2 +-
+ drivers/staging/sm750fb/ddk750_power.h             |    2 +-
+ drivers/staging/sm750fb/ddk750_sii164.c            |    6 +-
+ drivers/staging/sm750fb/ddk750_sii164.h            |    2 +-
+ .../vc04_services/bcm2835-audio/bcm2835-vchiq.c    |   40 +-
+ .../include/linux/raspberrypi/vchiq.h              |   48 +-
+ drivers/staging/vc04_services/interface/TESTING    |   82 +
+ .../vc04_services/interface/vchiq_arm/vchiq_arm.c  |   96 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_arm.h  |    8 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_core.c |  106 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_core.h |   38 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_dev.c  |   40 +-
+ .../staging/vc04_services/vchiq-mmal/mmal-vchiq.c  |   63 +-
+ drivers/staging/vme_user/Kconfig                   |   27 +
+ drivers/staging/vme_user/Makefile                  |    3 +
+ drivers/{vme => staging/vme_user}/vme.c            |    2 +-
+ {include/linux => drivers/staging/vme_user}/vme.h  |    0
+ drivers/{vme => staging/vme_user}/vme_bridge.h     |    2 +-
+ .../{vme/bridges => staging/vme_user}/vme_fake.c   |    4 +-
+ .../{vme/bridges => staging/vme_user}/vme_tsi148.c |    4 +-
+ .../{vme/bridges => staging/vme_user}/vme_tsi148.h |    0
+ drivers/staging/vme_user/vme_user.c                |    2 +-
+ drivers/staging/vt6655/baseband.c                  |    2 +-
+ drivers/staging/vt6655/card.c                      |   71 +-
+ drivers/staging/vt6655/device_main.c               |   51 +-
+ drivers/staging/vt6655/mac.c                       |    2 +-
+ drivers/staging/vt6655/mac.h                       |   81 +-
+ drivers/staging/vt6655/power.c                     |    4 +-
+ drivers/staging/vt6655/rf.c                        |    4 +-
+ drivers/staging/vt6655/rxtx.c                      |    4 +-
+ drivers/staging/vt6655/srom.c                      |    2 +-
+ drivers/staging/vt6655/upc.h                       |   35 -
+ drivers/vme/Kconfig                                |   18 -
+ drivers/vme/Makefile                               |    8 -
+ drivers/vme/boards/Kconfig                         |   10 -
+ drivers/vme/boards/Makefile                        |    6 -
+ drivers/vme/boards/vme_vmivme7805.c                |  106 --
+ drivers/vme/boards/vme_vmivme7805.h                |   33 -
+ drivers/vme/bridges/Kconfig                        |   24 -
+ drivers/vme/bridges/Makefile                       |    4 -
+ drivers/vme/bridges/vme_ca91cx42.c                 | 1928 --------------------
+ drivers/vme/bridges/vme_ca91cx42.h                 |  579 ------
+ 112 files changed, 1745 insertions(+), 4385 deletions(-)
+ delete mode 100644 drivers/staging/r8188eu/hal/Hal8188EPwrSeq.c
+ delete mode 100644 drivers/staging/r8188eu/include/Hal8188EPwrSeq.h
+ delete mode 100644 drivers/staging/r8188eu/include/basic_types.h
+ create mode 100644 drivers/staging/vc04_services/interface/TESTING
+ rename drivers/{vme => staging/vme_user}/vme.c (99%)
+ rename {include/linux => drivers/staging/vme_user}/vme.h (100%)
+ rename drivers/{vme => staging/vme_user}/vme_bridge.h (99%)
+ rename drivers/{vme/bridges => staging/vme_user}/vme_fake.c (99%)
+ rename drivers/{vme/bridges => staging/vme_user}/vme_tsi148.c (99%)
+ rename drivers/{vme/bridges => staging/vme_user}/vme_tsi148.h (100%)
+ delete mode 100644 drivers/staging/vt6655/upc.h
+ delete mode 100644 drivers/vme/Kconfig
+ delete mode 100644 drivers/vme/Makefile
+ delete mode 100644 drivers/vme/boards/Kconfig
+ delete mode 100644 drivers/vme/boards/Makefile
+ delete mode 100644 drivers/vme/boards/vme_vmivme7805.c
+ delete mode 100644 drivers/vme/boards/vme_vmivme7805.h
+ delete mode 100644 drivers/vme/bridges/Kconfig
+ delete mode 100644 drivers/vme/bridges/Makefile
+ delete mode 100644 drivers/vme/bridges/vme_ca91cx42.c
+ delete mode 100644 drivers/vme/bridges/vme_ca91cx42.h
+Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4)
+$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next
+Already up to date.
+Merging dmaengine/next (4348d99efa01 dmaengine: altera-msgdma: Fixed some inconsistent function name descriptions)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next
+Auto-merging MAINTAINERS
+Auto-merging drivers/dma/at_xdmac.c
+Auto-merging drivers/dma/dmatest.c
+Auto-merging drivers/dma/dw-edma/dw-edma-v0-core.c
+Auto-merging drivers/dma/imx-sdma.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/dma/apple,admac.yaml       |  80 ++
+ .../devicetree/bindings/dma/fsl,edma.yaml          | 155 ++++
+ Documentation/devicetree/bindings/dma/fsl-edma.txt | 111 ---
+ .../devicetree/bindings/dma/mediatek,uart-dma.yaml |   1 +
+ .../devicetree/bindings/dma/snps,dw-axi-dmac.yaml  |   7 +-
+ .../devicetree/bindings/dma/ste-dma40.txt          | 138 ----
+ .../devicetree/bindings/dma/stericsson,dma40.yaml  | 159 ++++
+ Documentation/driver-api/dmaengine/provider.rst    |  10 -
+ MAINTAINERS                                        |   6 +-
+ drivers/dma/Kconfig                                |   8 +
+ drivers/dma/Makefile                               |   1 +
+ drivers/dma/altera-msgdma.c                        |   4 +-
+ drivers/dma/amba-pl08x.c                           |   2 +-
+ drivers/dma/apple-admac.c                          | 818 +++++++++++++++++++++
+ drivers/dma/at_xdmac.c                             |   2 +-
+ drivers/dma/dma-jz4780.c                           |   2 +-
+ drivers/dma/dmaengine.c                            |   7 -
+ drivers/dma/dmatest.c                              |  45 +-
+ drivers/dma/dw-edma/dw-edma-v0-core.c              |   8 -
+ drivers/dma/dw/rzn1-dmamux.c                       |   3 +
+ drivers/dma/ep93xx_dma.c                           |   2 +-
+ drivers/dma/fsl-edma-common.c                      |   3 -
+ drivers/dma/imx-sdma.c                             |  11 +-
+ drivers/dma/mediatek/mtk-cqdma.c                   |   2 +-
+ drivers/dma/mediatek/mtk-hsdma.c                   |   2 +-
+ drivers/dma/mv_xor_v2.c                            |   2 +-
+ drivers/dma/owl-dma.c                              |   2 +-
+ drivers/dma/s3c24xx-dma.c                          |   2 +-
+ drivers/dma/sf-pdma/sf-pdma.c                      |  44 +-
+ drivers/dma/ste_dma40.c                            |   2 +-
+ drivers/dma/stm32-mdma.c                           |   5 -
+ drivers/dma/sun4i-dma.c                            |  32 +-
+ drivers/dma/ti/k3-psil-j721s2.c                    |   8 +
+ drivers/dma/xilinx/xilinx_dma.c                    | 122 ---
+ drivers/dma/xilinx/xilinx_dpdma.c                  |   4 +-
+ include/linux/dma/qcom-gpi-dma.h                   |   2 +-
+ include/linux/dmaengine.h                          |  20 -
+ 37 files changed, 1345 insertions(+), 487 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dma/apple,admac.yaml
+ create mode 100644 Documentation/devicetree/bindings/dma/fsl,edma.yaml
+ delete mode 100644 Documentation/devicetree/bindings/dma/fsl-edma.txt
+ delete mode 100644 Documentation/devicetree/bindings/dma/ste-dma40.txt
+ create mode 100644 Documentation/devicetree/bindings/dma/stericsson,dma40.yaml
+ create mode 100644 drivers/dma/apple-admac.c
+Merging cgroup/for-next (27924b13fcce Merge branch 'for-5.20' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next
+Merge made by the 'ort' strategy.
+ include/linux/cgroup-defs.h |  2 +-
+ include/linux/cgroup.h      |  2 +-
+ kernel/cgroup/cgroup.c      | 70 ++++++++++++++++++++-------------------------
+ kernel/sched/psi.c          | 19 ++++++++----
+ 4 files changed, 46 insertions(+), 47 deletions(-)
+Merging scsi/for-next (9009b3dfd4a2 Merge branch 'misc' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/scsi/hosts.c
+Auto-merging drivers/scsi/mpi3mr/mpi3mr_os.c
+Auto-merging drivers/scsi/scsi_error.c
+Auto-merging drivers/scsi/scsi_lib.c
+Auto-merging drivers/scsi/sd.c
+Auto-merging drivers/scsi/snic/snic_fwint.h
+Auto-merging drivers/target/target_core_iblock.c
+Auto-merging drivers/ufs/core/ufshcd.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/ufs/renesas,ufs.yaml       |   61 +
+ .../bindings/ufs/samsung,exynos-ufs.yaml           |    1 +
+ Documentation/userspace-api/ioctl/ioctl-number.rst |    2 +-
+ MAINTAINERS                                        |   19 +-
+ block/bsg.c                                        |    4 +-
+ drivers/infiniband/ulp/iser/iscsi_iser.c           |    4 +-
+ drivers/message/fusion/mptspi.c                    |    2 +-
+ drivers/s390/scsi/zfcp_diag.h                      |    2 +-
+ drivers/s390/scsi/zfcp_sysfs.c                     |    2 +-
+ drivers/scsi/BusLogic.c                            |   35 +-
+ drivers/scsi/Kconfig                               |   13 +-
+ drivers/scsi/Makefile                              |    1 -
+ drivers/scsi/a2091.c                               |   63 +-
+ drivers/scsi/a3000.c                               |   53 +-
+ drivers/scsi/aacraid/aachba.c                      |    2 +-
+ drivers/scsi/aic94xx/aic94xx_dev.c                 |    2 +-
+ drivers/scsi/be2iscsi/be_main.c                    |   21 +-
+ drivers/scsi/bnx2i/bnx2i_iscsi.c                   |    2 +-
+ drivers/scsi/cxgbi/libcxgbi.c                      |    4 +-
+ drivers/scsi/dpt/dpti_i2o.h                        |  441 ---
+ drivers/scsi/dpt/dpti_ioctl.h                      |  136 -
+ drivers/scsi/dpt/dptsig.h                          |  336 --
+ drivers/scsi/dpt/osd_defs.h                        |   79 -
+ drivers/scsi/dpt/osd_util.h                        |  358 --
+ drivers/scsi/dpt/sys_info.h                        |  417 ---
+ drivers/scsi/dpt_i2o.c                             | 3545 --------------------
+ drivers/scsi/dpti.h                                |  331 --
+ drivers/scsi/fcoe/fcoe.c                           |    1 -
+ drivers/scsi/gvp11.c                               |   95 +-
+ drivers/scsi/hisi_sas/hisi_sas_v2_hw.c             |    4 +-
+ drivers/scsi/hosts.c                               |    4 +-
+ drivers/scsi/iscsi_tcp.c                           |   74 +-
+ drivers/scsi/iscsi_tcp.h                           |    2 +
+ drivers/scsi/libiscsi.c                            |  313 +-
+ drivers/scsi/libiscsi_tcp.c                        |    6 +-
+ drivers/scsi/libsas/sas_expander.c                 |   67 +-
+ drivers/scsi/libsas/sas_internal.h                 |    2 +-
+ drivers/scsi/lpfc/lpfc.h                           |   11 +-
+ drivers/scsi/lpfc/lpfc_attr.c                      |   27 +-
+ drivers/scsi/lpfc/lpfc_bsg.c                       |  324 --
+ drivers/scsi/lpfc/lpfc_bsg.h                       |   14 +-
+ drivers/scsi/lpfc/lpfc_crtn.h                      |    2 +-
+ drivers/scsi/lpfc/lpfc_debugfs.c                   |   22 +-
+ drivers/scsi/lpfc/lpfc_els.c                       |   32 +-
+ drivers/scsi/lpfc/lpfc_hbadisc.c                   |   60 +-
+ drivers/scsi/lpfc/lpfc_hw.h                        |   10 -
+ drivers/scsi/lpfc/lpfc_hw4.h                       |    1 -
+ drivers/scsi/lpfc/lpfc_ids.h                       |    4 +-
+ drivers/scsi/lpfc/lpfc_init.c                      |   19 +-
+ drivers/scsi/lpfc/lpfc_nvme.c                      |    1 +
+ drivers/scsi/lpfc/lpfc_nvmet.c                     |   54 +-
+ drivers/scsi/lpfc/lpfc_scsi.c                      |    1 -
+ drivers/scsi/lpfc/lpfc_sli.c                       |   38 +-
+ drivers/scsi/lpfc/lpfc_sli.h                       |    1 -
+ drivers/scsi/lpfc/lpfc_version.h                   |    2 +-
+ drivers/scsi/megaraid/megaraid_sas_base.c          |    4 +-
+ drivers/scsi/mpi3mr/mpi3mr.h                       |    2 +-
+ drivers/scsi/mpi3mr/mpi3mr_os.c                    |    2 +
+ drivers/scsi/mpt3sas/mpt3sas_base.c                |    8 +-
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c               |    3 +-
+ drivers/scsi/pm8001/pm8001_hwi.c                   |    5 +
+ drivers/scsi/pm8001/pm8001_init.c                  |   73 +-
+ drivers/scsi/pm8001/pm8001_sas.c                   |   10 +-
+ drivers/scsi/pm8001/pm8001_sas.h                   |    3 +
+ drivers/scsi/pm8001/pm80xx_hwi.c                   |   46 +-
+ drivers/scsi/qedi/qedi_main.c                      |   11 +-
+ drivers/scsi/qla2xxx/qla_attr.c                    |   29 +-
+ drivers/scsi/qla2xxx/qla_bsg.c                     |   96 +-
+ drivers/scsi/qla2xxx/qla_bsg.h                     |   15 +
+ drivers/scsi/qla2xxx/qla_dbg.h                     |    2 +-
+ drivers/scsi/qla2xxx/qla_def.h                     |   33 +-
+ drivers/scsi/qla2xxx/qla_edif.c                    |  585 ++--
+ drivers/scsi/qla2xxx/qla_edif.h                    |    7 +-
+ drivers/scsi/qla2xxx/qla_edif_bsg.h                |  106 +-
+ drivers/scsi/qla2xxx/qla_fw.h                      |    2 +-
+ drivers/scsi/qla2xxx/qla_gbl.h                     |    8 +-
+ drivers/scsi/qla2xxx/qla_gs.c                      |  120 +-
+ drivers/scsi/qla2xxx/qla_init.c                    |   56 +-
+ drivers/scsi/qla2xxx/qla_iocb.c                    |    5 +-
+ drivers/scsi/qla2xxx/qla_isr.c                     |   58 +-
+ drivers/scsi/qla2xxx/qla_mbx.c                     |   60 +-
+ drivers/scsi/qla2xxx/qla_mid.c                     |    6 +-
+ drivers/scsi/qla2xxx/qla_os.c                      |   93 +-
+ drivers/scsi/qla2xxx/qla_target.c                  |   35 +-
+ drivers/scsi/qla2xxx/qla_version.h                 |    4 +-
+ drivers/scsi/scsi_error.c                          |    4 +-
+ drivers/scsi/scsi_lib.c                            |   14 +-
+ drivers/scsi/scsi_transport_iscsi.c                |   98 +-
+ drivers/scsi/sd.c                                  |   84 +-
+ drivers/scsi/sd.h                                  |    5 +
+ drivers/scsi/snic/snic_fwint.h                     |    2 +-
+ drivers/scsi/sym53c8xx_2/sym_hipd.c                |    2 +-
+ drivers/target/iscsi/iscsi_target_configfs.c       |  113 +-
+ drivers/target/iscsi/iscsi_target_nego.c           |  147 +-
+ drivers/target/iscsi/iscsi_target_nodeattrib.c     |    1 +
+ drivers/target/iscsi/iscsi_target_tpg.c            |    3 +-
+ drivers/target/target_core_alua.c                  |    2 +-
+ drivers/target/target_core_configfs.c              |   27 +-
+ drivers/target/target_core_device.c                |    6 +
+ drivers/target/target_core_file.c                  |   37 +-
+ drivers/target/target_core_iblock.c                |   13 +-
+ drivers/ufs/core/ufshcd-priv.h                     |    6 +-
+ drivers/ufs/core/ufshcd.c                          |   67 +-
+ drivers/ufs/host/Kconfig                           |   12 +
+ drivers/ufs/host/Makefile                          |    1 +
+ drivers/ufs/host/ufs-exynos.c                      |  165 +-
+ drivers/ufs/host/ufs-exynos.h                      |    1 +
+ drivers/ufs/host/ufs-mediatek.c                    |  324 +-
+ drivers/ufs/host/ufs-mediatek.h                    |   74 +
+ drivers/ufs/host/ufs-qcom.c                        |   23 -
+ drivers/ufs/host/ufs-renesas.c                     |  412 +++
+ drivers/ufs/host/ufshcd-pci.c                      |    1 +
+ drivers/ufs/host/ufshcd-pltfrm.c                   |   15 +-
+ drivers/ufs/host/ufshcd-pltfrm.h                   |    6 +-
+ include/scsi/libiscsi.h                            |   13 +-
+ include/scsi/libsas.h                              |    2 +-
+ include/scsi/sas.h                                 |   42 +-
+ include/scsi/scsi_transport_iscsi.h                |    3 +-
+ include/target/iscsi/iscsi_target_core.h           |   14 +
+ include/target/target_core_backend.h               |    1 +
+ include/trace/events/scsi.h                        |   35 +-
+ include/ufs/ufshcd.h                               |   21 +-
+ include/ufs/unipro.h                               |  104 +-
+ 123 files changed, 3240 insertions(+), 7274 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/ufs/renesas,ufs.yaml
+ delete mode 100644 drivers/scsi/dpt/dpti_i2o.h
+ delete mode 100644 drivers/scsi/dpt/dpti_ioctl.h
+ delete mode 100644 drivers/scsi/dpt/dptsig.h
+ delete mode 100644 drivers/scsi/dpt/osd_defs.h
+ delete mode 100644 drivers/scsi/dpt/osd_util.h
+ delete mode 100644 drivers/scsi/dpt/sys_info.h
+ delete mode 100644 drivers/scsi/dpt_i2o.c
+ delete mode 100644 drivers/scsi/dpti.h
+ create mode 100644 drivers/ufs/host/ufs-renesas.c
+Merging scsi-mkp/for-next (f095c3cd1b69 scsi: qla2xxx: Update version to 10.02.07.800-k)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next
+Auto-merging drivers/scsi/fnic/fnic_main.c
+Auto-merging drivers/scsi/mpi3mr/mpi3mr_os.c
+Auto-merging drivers/scsi/sd.c
+Auto-merging drivers/scsi/sg.c
+Auto-merging drivers/ufs/core/ufshcd.c
+Auto-merging include/scsi/scsi_device.h
+Merge made by the 'ort' strategy.
+ drivers/scsi/fnic/fnic_main.c                  |  45 ++-
+ drivers/scsi/gvp11.c                           |   6 +-
+ drivers/scsi/mpi3mr/mpi3mr.h                   |  71 ++++-
+ drivers/scsi/mpi3mr/mpi3mr_fw.c                |  66 ++++
+ drivers/scsi/mpi3mr/mpi3mr_os.c                | 290 +++++++++++++++++-
+ drivers/scsi/qla2xxx/qla_bsg.c                 |   4 +-
+ drivers/scsi/qla2xxx/qla_def.h                 |   3 +-
+ drivers/scsi/qla2xxx/qla_gbl.h                 |   5 +-
+ drivers/scsi/qla2xxx/qla_gs.c                  |  11 +-
+ drivers/scsi/qla2xxx/qla_init.c                |  40 ++-
+ drivers/scsi/qla2xxx/qla_isr.c                 |  80 +++--
+ drivers/scsi/qla2xxx/qla_mbx.c                 |   7 +-
+ drivers/scsi/qla2xxx/qla_nvme.c                |   5 -
+ drivers/scsi/qla2xxx/qla_os.c                  |  10 +
+ drivers/scsi/qla2xxx/qla_version.h             |   4 +-
+ drivers/scsi/scsi.c                            |   1 +
+ drivers/scsi/scsi_trace.c                      |   3 +-
+ drivers/scsi/sd.c                              | 360 +++++++++++++++++-----
+ drivers/scsi/sd.h                              |  24 +-
+ drivers/scsi/sg.c                              |  53 ++--
+ drivers/scsi/smartpqi/Kconfig                  |   2 +-
+ drivers/scsi/smartpqi/smartpqi.h               |  27 +-
+ drivers/scsi/smartpqi/smartpqi_init.c          | 405 +++++++++++++++++++------
+ drivers/scsi/smartpqi/smartpqi_sas_transport.c |   2 +-
+ drivers/scsi/smartpqi/smartpqi_sis.c           |  11 +-
+ drivers/scsi/smartpqi/smartpqi_sis.h           |   4 +-
+ drivers/ufs/core/ufshcd.c                      |   3 -
+ drivers/ufs/host/ufs-exynos.c                  |  17 +-
+ include/scsi/scsi_device.h                     |  14 +
+ 29 files changed, 1271 insertions(+), 302 deletions(-)
+Merging vhost/linux-next (6a9720576cd0 virtio: VIRTIO_HARDEN_NOTIFICATION is broken)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next
+Auto-merging drivers/virtio/Kconfig
+Merge made by the 'ort' strategy.
+ drivers/nvdimm/virtio_pmem.c           |  9 +++-
+ drivers/remoteproc/remoteproc_core.c   |  4 +-
+ drivers/remoteproc/remoteproc_virtio.c | 10 ++---
+ drivers/vdpa/vdpa_sim/vdpa_sim.c       | 21 +++++++++
+ drivers/vdpa/vdpa_sim/vdpa_sim.h       |  1 +
+ drivers/vdpa/vdpa_sim/vdpa_sim_blk.c   |  3 ++
+ drivers/vdpa/vdpa_sim/vdpa_sim_net.c   |  3 ++
+ drivers/vhost/vdpa.c                   | 35 ++++++++++++++-
+ drivers/vhost/vringh.c                 | 78 ++++++++++++++++++++++++----------
+ drivers/virtio/Kconfig                 |  3 +-
+ drivers/virtio/virtio_ring.c           |  7 ++-
+ include/linux/remoteproc.h             |  4 +-
+ include/linux/vdpa.h                   |  4 ++
+ include/uapi/linux/vhost.h             | 14 ++++++
+ include/uapi/linux/vhost_types.h       |  2 +
+ 15 files changed, 160 insertions(+), 38 deletions(-)
+Merging rpmsg/for-next (c6a669485125 Merge branches 'rpmsg-next', 'rproc-next' and 'hwspinlock-next' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next
+Auto-merging drivers/remoteproc/remoteproc_core.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/remoteproc/qcom,adsp.yaml  | 74 +++++++------------
+ .../bindings/remoteproc/qcom,glink-edge.yaml       | 72 ++++++++++++++++++
+ .../devicetree/bindings/remoteproc/qcom,q6v5.txt   | 41 ++++++-----
+ .../bindings/remoteproc/qcom,qcs404-cdsp-pil.yaml  |  1 -
+ .../bindings/remoteproc/qcom,sc7280-wpss-pil.yaml  | 21 ++----
+ .../bindings/remoteproc/qcom,sdm845-adsp-pil.yaml  |  1 -
+ .../bindings/remoteproc/qcom,smd-edge.yaml         | 85 ++++++++++++++++++++++
+ .../bindings/remoteproc/ti,pru-rproc.yaml          |  5 +-
+ .../devicetree/bindings/soc/qcom/qcom,smd.yaml     | 50 +------------
+ drivers/hwspinlock/omap_hwspinlock.c               |  6 +-
+ drivers/remoteproc/imx_rproc.c                     |  7 +-
+ drivers/remoteproc/mtk_scp.c                       | 10 ++-
+ drivers/remoteproc/omap_remoteproc.c               |  6 +-
+ drivers/remoteproc/pru_rproc.c                     |  1 +
+ drivers/remoteproc/qcom_wcnss.c                    | 10 ++-
+ drivers/remoteproc/remoteproc_core.c               |  1 +
+ drivers/remoteproc/ti_k3_r5_remoteproc.c           |  2 +
+ drivers/rpmsg/mtk_rpmsg.c                          |  2 +
+ drivers/rpmsg/rpmsg_char.c                         |  7 +-
+ drivers/rpmsg/rpmsg_core.c                         |  3 +-
+ drivers/rpmsg/rpmsg_internal.h                     |  4 +-
+ include/linux/dma-map-ops.h                        |  3 +
+ kernel/dma/coherent.c                              | 10 ++-
+ 23 files changed, 270 insertions(+), 152 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,glink-edge.yaml
+ create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,smd-edge.yaml
+Merging gpio/for-next (e73f0f0ee754 Linux 5.14-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next
+Already up to date.
+Merging gpio-brgl/gpio/for-next (63e90bf07778 gpio: 104-idi-48: unsigned to unsigned int cleanup)
+$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/gpio/gpio-brcmstb.c
+Auto-merging include/linux/mfd/twl.h
+Merge made by the 'ort' strategy.
+ .../arm/marvell/ap80x-system-controller.txt        |   2 +-
+ .../arm/marvell/cp110-system-controller.txt        |   2 +-
+ .../devicetree/bindings/gpio/gpio-mvebu.txt        |  93 -------------
+ .../devicetree/bindings/gpio/gpio-mvebu.yaml       | 146 +++++++++++++++++++++
+ .../devicetree/bindings/gpio/gpio-pca9570.yaml     |   1 +
+ .../devicetree/bindings/gpio/gpio-tpic2810.txt     |  16 ---
+ .../devicetree/bindings/gpio/gpio-tpic2810.yaml    |  51 +++++++
+ .../bindings/gpio/renesas,rcar-gpio.yaml           |   4 +-
+ .../bindings/gpio/rockchip,gpio-bank.yaml          |   2 +
+ Documentation/driver-api/driver-model/devres.rst   |   1 -
+ MAINTAINERS                                        |   2 +-
+ drivers/gpio/Kconfig                               |   1 +
+ drivers/gpio/gpio-104-idi-48.c                     |  30 ++---
+ drivers/gpio/gpio-adnp.c                           |  19 +--
+ drivers/gpio/gpio-adp5588.c                        |  26 ++--
+ drivers/gpio/gpio-brcmstb.c                        |   9 +-
+ drivers/gpio/gpio-davinci.c                        |  83 ++++++++++++
+ drivers/gpio/gpio-lp3943.c                         |  16 +--
+ drivers/gpio/gpio-pca9570.c                        |   2 +
+ drivers/gpio/gpio-pch.c                            |  43 +++---
+ drivers/gpio/gpio-rockchip.c                       |   3 +-
+ drivers/gpio/gpio-twl4030.c                        |  18 +--
+ drivers/gpio/gpio-ucb1400.c                        |  20 ---
+ drivers/gpio/gpio-xgs-iproc.c                      |   6 +-
+ drivers/gpio/gpiolib-devres.c                      |  32 -----
+ drivers/gpio/gpiolib-of.c                          |   6 +-
+ drivers/mfd/ucb1400_core.c                         |   6 +-
+ include/linux/gpio.h                               |   6 -
+ include/linux/mfd/twl.h                            |   2 -
+ include/linux/ucb1400.h                            |   2 -
+ 30 files changed, 362 insertions(+), 288 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-mvebu.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-mvebu.yaml
+ delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-tpic2810.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-tpic2810.yaml
+Merging gpio-intel/for-next (b65bb2c14891 gpio: pch: Change PCI device macros)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next
+Already up to date.
+Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4)
+$ git merge -m Merge branch 'gpio/gpio-sim' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-sim/gpio/gpio-sim
+Already up to date.
+Merging pinctrl/for-next (2ec1aa95dafb Merge branch 'devel' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next
+Auto-merging Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yaml
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/boot/dts/sun6i-a31.dtsi
+Auto-merging arch/arm/boot/dts/sun8i-a23-a33.dtsi
+Auto-merging drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
+Auto-merging drivers/pinctrl/renesas/pinctrl-rzg2l.c
+Auto-merging include/linux/firmware/xlnx-zynqmp.h
+Merge made by the 'ort' strategy.
+ .../bindings/gpio/x-powers,axp209-gpio.yaml        |    6 +
+ .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml       |   18 +-
+ .../bindings/pinctrl/nuvoton,wpcm450-pinctrl.yaml  |    2 +-
+ .../bindings/pinctrl/pinctrl-mt8192.yaml           |   64 +-
+ .../bindings/pinctrl/pinctrl-mt8195.yaml           |   39 +-
+ .../bindings/pinctrl/qcom,msm8909-tlmm.yaml        |  152 +
+ .../pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml     |    5 +
+ .../devicetree/bindings/pinctrl/renesas,pfc.yaml   |    1 +
+ .../bindings/pinctrl/renesas,rzv2m-pinctrl.yaml    |  170 +
+ .../bindings/pinctrl/sunplus,sp7021-pinctrl.yaml   |    5 +-
+ .../bindings/pinctrl/xlnx,zynqmp-pinctrl.yaml      |    4 +
+ MAINTAINERS                                        |    3 +-
+ arch/arm/boot/dts/sun6i-a31.dtsi                   |    1 -
+ arch/arm/boot/dts/sun8i-a23-a33.dtsi               |    1 -
+ arch/arm/boot/dts/sun9i-a80.dtsi                   |    1 -
+ drivers/pinctrl/Kconfig                            |    2 +-
+ drivers/pinctrl/aspeed/pinmux-aspeed.h             |    2 +-
+ drivers/pinctrl/bcm/pinctrl-bcm2835.c              |   21 +-
+ drivers/pinctrl/core.c                             |    2 +-
+ drivers/pinctrl/intel/Kconfig                      |    8 +
+ drivers/pinctrl/intel/Makefile                     |    1 +
+ drivers/pinctrl/intel/pinctrl-baytrail.c           |   18 +-
+ drivers/pinctrl/intel/pinctrl-cherryview.c         |   16 +-
+ drivers/pinctrl/intel/pinctrl-intel.c              |   14 +-
+ drivers/pinctrl/intel/pinctrl-intel.h              |   25 +-
+ drivers/pinctrl/intel/pinctrl-lynxpoint.c          |   10 +-
+ drivers/pinctrl/intel/pinctrl-merrifield.c         |   14 +-
+ drivers/pinctrl/intel/pinctrl-meteorlake.c         |  417 ++
+ drivers/pinctrl/mediatek/pinctrl-mt8192.c          |  296 +-
+ drivers/pinctrl/nomadik/pinctrl-nomadik.c          |    4 +-
+ drivers/pinctrl/pinctrl-amd.c                      |  127 +-
+ drivers/pinctrl/pinctrl-amd.h                      | 1376 ++++++-
+ drivers/pinctrl/pinctrl-at91-pio4.c                |    7 +-
+ drivers/pinctrl/pinctrl-at91.c                     |    8 +-
+ drivers/pinctrl/pinctrl-axp209.c                   |   14 +-
+ drivers/pinctrl/pinctrl-ingenic.c                  |   64 +-
+ drivers/pinctrl/pinctrl-ocelot.c                   |    4 +-
+ drivers/pinctrl/pinctrl-starfive.c                 |    5 +
+ drivers/pinctrl/pinctrl-zynqmp.c                   |   11 +
+ drivers/pinctrl/qcom/Kconfig                       |    8 +
+ drivers/pinctrl/qcom/Makefile                      |    1 +
+ drivers/pinctrl/qcom/pinctrl-lpass-lpi.c           |    2 +-
+ drivers/pinctrl/qcom/pinctrl-lpass-lpi.h           |    1 -
+ drivers/pinctrl/qcom/pinctrl-msm8909.c             |  956 +++++
+ drivers/pinctrl/qcom/pinctrl-msm8916.c             |    4 +-
+ drivers/pinctrl/qcom/pinctrl-sc7280-lpass-lpi.c    |    1 -
+ drivers/pinctrl/qcom/pinctrl-spmi-gpio.c           |   23 +-
+ drivers/pinctrl/ralink/pinctrl-ralink.c            |    2 +
+ drivers/pinctrl/renesas/Kconfig                    |   18 +
+ drivers/pinctrl/renesas/Makefile                   |    2 +
+ drivers/pinctrl/renesas/core.c                     |    6 +
+ drivers/pinctrl/renesas/pfc-r8a779f0.c             |    2 -
+ drivers/pinctrl/renesas/pfc-r8a779g0.c             | 4262 ++++++++++++++++++++
+ drivers/pinctrl/renesas/pinctrl-rzg2l.c            |    2 +
+ drivers/pinctrl/renesas/pinctrl-rzv2m.c            | 1119 +++++
+ drivers/pinctrl/renesas/sh_pfc.h                   |    9 +-
+ drivers/pinctrl/samsung/pinctrl-exynos.c           |    6 +-
+ drivers/pinctrl/samsung/pinctrl-exynos.h           |    3 +
+ drivers/pinctrl/samsung/pinctrl-samsung.c          |    4 +-
+ drivers/pinctrl/samsung/pinctrl-samsung.h          |    8 +
+ drivers/pinctrl/sunplus/sppctl.c                   |    3 +
+ drivers/pinctrl/sunxi/Kconfig                      |    8 +-
+ drivers/pinctrl/sunxi/Makefile                     |    1 +
+ drivers/pinctrl/sunxi/pinctrl-sun50i-a100-r.c      |    1 +
+ drivers/pinctrl/sunxi/pinctrl-sun50i-a100.c        |    2 +-
+ drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c       |    1 -
+ drivers/pinctrl/sunxi/pinctrl-sun50i-h6-r.c        |    2 +-
+ drivers/pinctrl/sunxi/pinctrl-sun50i-h616-r.c      |    1 -
+ drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c        |    2 +-
+ drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c        |   22 +-
+ drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c        |   25 +-
+ drivers/pinctrl/sunxi/pinctrl-sun8i-a83t-r.c       |    1 -
+ drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c        |    1 -
+ drivers/pinctrl/sunxi/pinctrl-sunxi.c              |  156 +-
+ drivers/pinctrl/sunxi/pinctrl-sunxi.h              |  110 +-
+ include/dt-bindings/pinctrl/r7s9210-pinctrl.h      |    2 +-
+ include/dt-bindings/pinctrl/rzg2l-pinctrl.h        |    2 +-
+ include/dt-bindings/pinctrl/rzv2m-pinctrl.h        |   23 +
+ include/linux/firmware/xlnx-zynqmp.h               |    5 +
+ include/linux/pinctrl/pinctrl.h                    |   20 +
+ 80 files changed, 9178 insertions(+), 587 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8909-tlmm.yaml
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/renesas,rzv2m-pinctrl.yaml
+ create mode 100644 drivers/pinctrl/intel/pinctrl-meteorlake.c
+ create mode 100644 drivers/pinctrl/qcom/pinctrl-msm8909.c
+ create mode 100644 drivers/pinctrl/renesas/pfc-r8a779g0.c
+ create mode 100644 drivers/pinctrl/renesas/pinctrl-rzv2m.c
+ create mode 100644 include/dt-bindings/pinctrl/rzv2m-pinctrl.h
+Merging pinctrl-intel/for-next (25097de7b236 pinctrl: intel: Add Intel Meteor Lake pin controller support)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next
+Already up to date.
+Merging pinctrl-renesas/renesas-pinctrl (36611d28f513 pinctrl: renesas: r8a779g0: Add missing MODSELx for AVBx)
+$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl
+Already up to date.
+Merging pinctrl-samsung/for-next (c98ebe065e07 pinctrl: samsung: do not use bindings header with constants)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next
+Merge made by the 'ort' strategy.
+Merging pwm/for-next (394b517585da pwm: mediatek: Add MT8365 support)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/pwm/pwm-mediatek.txt       |  2 +
+ drivers/pwm/core.c                                 | 82 +---------------------
+ drivers/pwm/pwm-atmel-tcb.c                        |  2 +-
+ drivers/pwm/pwm-mediatek.c                         |  7 ++
+ include/linux/pwm.h                                | 35 +++------
+ 5 files changed, 21 insertions(+), 107 deletions(-)
+Merging userns/for-next (9aafa63eb9f5 Merge of free-mq_sysctls-for-v5.19, ptrace_unfreeze_fix-for-v5.19, and ucount-rlimits-cleanups-for-v5.19 for testing in linux-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next
+Auto-merging fs/exec.c
+Auto-merging kernel/fork.c
+Merge made by the 'ort' strategy.
+ fs/exec.c                      |  2 +-
+ fs/proc/array.c                |  2 +-
+ include/linux/user_namespace.h | 35 ++++++++++++++++++++++-------------
+ kernel/fork.c                  | 12 ++++++------
+ kernel/sys.c                   |  2 +-
+ kernel/ucount.c                | 34 +++++++++++++++-------------------
+ kernel/user_namespace.c        | 10 +++++-----
+ 7 files changed, 51 insertions(+), 46 deletions(-)
+Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next
+Already up to date.
+Merging kselftest/next (a917dd94b832 selftests/landlock: drop deprecated headers dependency)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next
+Auto-merging Makefile
+Auto-merging tools/testing/selftests/kvm/Makefile
+Auto-merging tools/testing/selftests/net/Makefile
+Auto-merging tools/testing/selftests/net/mptcp/Makefile
+Merge made by the 'ort' strategy.
+ Makefile                                           |  4 +-
+ tools/testing/selftests/Makefile                   | 30 +--------
+ tools/testing/selftests/arm64/mte/Makefile         |  1 -
+ tools/testing/selftests/arm64/signal/Makefile      |  1 -
+ .../testing/selftests/arm64/signal/test_signals.h  |  4 +-
+ tools/testing/selftests/damon/_chk_dependency.sh   | 10 +++
+ tools/testing/selftests/drivers/dma-buf/udmabuf.c  |  3 +-
+ tools/testing/selftests/drivers/gpu/drm_mm.sh      |  4 +-
+ .../selftests/drivers/s390x/uvdevice/Makefile      |  1 -
+ tools/testing/selftests/futex/functional/Makefile  |  1 -
+ tools/testing/selftests/kcmp/kcmp_test.c           |  6 +-
+ tools/testing/selftests/kselftest_deps.sh          |  2 +-
+ tools/testing/selftests/kvm/Makefile               |  1 -
+ tools/testing/selftests/landlock/Makefile          | 10 +--
+ tools/testing/selftests/lib.mk                     | 38 ------------
+ tools/testing/selftests/net/Makefile               |  1 -
+ tools/testing/selftests/net/mptcp/Makefile         |  1 -
+ tools/testing/selftests/tc-testing/Makefile        |  1 -
+ tools/testing/selftests/timers/adjtick.c           |  2 +-
+ .../testing/selftests/timers/alarmtimer-suspend.c  |  2 +-
+ tools/testing/selftests/timers/change_skew.c       |  2 +-
+ .../testing/selftests/timers/clocksource-switch.c  | 71 ++++++++++++++--------
+ .../testing/selftests/timers/inconsistency-check.c | 32 +++++-----
+ tools/testing/selftests/timers/nanosleep.c         | 18 +++---
+ tools/testing/selftests/timers/raw_skew.c          |  2 +-
+ tools/testing/selftests/timers/skew_consistency.c  |  2 +-
+ tools/testing/selftests/timers/valid-adjtimex.c    |  2 +-
+ tools/testing/selftests/tpm2/settings              |  1 +
+ tools/testing/selftests/vm/Makefile                |  1 -
+ tools/testing/selftests/vm/userfaultfd.c           |  2 +-
+ 30 files changed, 111 insertions(+), 145 deletions(-)
+ create mode 100644 tools/testing/selftests/tpm2/settings
+Merging livepatching/for-next (df44b1ee72f4 Merge branch 'for-5.20/selftests-fixes' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next
+Merge made by the 'ort' strategy.
+ lib/livepatch/test_klp_callbacks_busy.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+Merging rtc/rtc-next (592ff0c8d064 rtc: Directly use ida_alloc()/free())
+$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Auto-merging drivers/rtc/dev.c
+Resolved 'MAINTAINERS' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master f9ff80b52f16] Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml   |   2 +-
+ .../devicetree/bindings/rtc/rtc-mt6397.txt         |   2 +
+ .../devicetree/bindings/rtc/ti,k3-rtc.yaml         |  62 ++
+ MAINTAINERS                                        |   1 +
+ drivers/rtc/Kconfig                                |  21 +
+ drivers/rtc/Makefile                               |   2 +
+ drivers/rtc/class.c                                |   6 +-
+ drivers/rtc/dev.c                                  |   8 +-
+ drivers/rtc/rtc-ab-b5ze-s3.c                       |   5 +-
+ drivers/rtc/rtc-ab-eoz9.c                          |   5 +-
+ drivers/rtc/rtc-bq32k.c                            |   5 +-
+ drivers/rtc/rtc-core.h                             |   5 -
+ drivers/rtc/rtc-ds1374.c                           |   5 +-
+ drivers/rtc/rtc-ds1672.c                           |   5 +-
+ drivers/rtc/rtc-ds3232.c                           |   5 +-
+ drivers/rtc/rtc-em3027.c                           |   5 +-
+ drivers/rtc/rtc-fm3130.c                           |   5 +-
+ drivers/rtc/rtc-hym8563.c                          |   5 +-
+ drivers/rtc/rtc-isl12022.c                         |   5 +-
+ drivers/rtc/rtc-isl1208.c                          |  10 +-
+ drivers/rtc/rtc-max6900.c                          |   5 +-
+ drivers/rtc/rtc-mc146818-lib.c                     |   8 +-
+ drivers/rtc/rtc-mpfs.c                             | 326 ++++++++++
+ drivers/rtc/rtc-pcf8523.c                          |   5 +-
+ drivers/rtc/rtc-pcf85363.c                         |   5 +-
+ drivers/rtc/rtc-pcf8563.c                          |   5 +-
+ drivers/rtc/rtc-pcf8583.c                          |   5 +-
+ drivers/rtc/rtc-rv3029c2.c                         |   5 +-
+ drivers/rtc/rtc-rv8803.c                           |  96 ++-
+ drivers/rtc/rtc-rx6110.c                           |   5 +-
+ drivers/rtc/rtc-rx8581.c                           |   5 +-
+ drivers/rtc/rtc-s35390a.c                          |   5 +-
+ drivers/rtc/rtc-sd3078.c                           |   5 +-
+ drivers/rtc/rtc-ti-k3.c                            | 680 +++++++++++++++++++++
+ drivers/rtc/rtc-x1205.c                            |   5 +-
+ 35 files changed, 1232 insertions(+), 102 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/rtc/ti,k3-rtc.yaml
+ create mode 100644 drivers/rtc/rtc-mpfs.c
+ create mode 100644 drivers/rtc/rtc-ti-k3.c
+Merging nvdimm/libnvdimm-for-next (f42e8e5088b9 pmem: implement pmem_recovery_write())
+$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next
+Already up to date.
+Merging at24/at24/for-next (312310928417 Linux 5.18-rc1)
+$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next
+Already up to date.
+Merging ntb/ntb-next (ca151bc47cf2 ntb: idt: fix clang -Wformat warnings)
+$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next
+Auto-merging drivers/pci/controller/dwc/pcie-designware-ep.c
+Merge made by the 'ort' strategy.
+ Documentation/PCI/endpoint/index.rst             |    2 +
+ Documentation/PCI/endpoint/pci-vntb-function.rst |  126 ++
+ Documentation/PCI/endpoint/pci-vntb-howto.rst    |  161 +++
+ drivers/ntb/hw/epf/ntb_hw_epf.c                  |   48 +-
+ drivers/ntb/hw/idt/ntb_hw_idt.c                  |    6 +-
+ drivers/ntb/test/ntb_perf.c                      |  826 ++++++++++++-
+ drivers/pci/controller/dwc/pcie-designware-ep.c  |   10 +-
+ drivers/pci/endpoint/functions/Kconfig           |   11 +
+ drivers/pci/endpoint/functions/Makefile          |    1 +
+ drivers/pci/endpoint/functions/pci-epf-vntb.c    | 1425 ++++++++++++++++++++++
+ 10 files changed, 2583 insertions(+), 33 deletions(-)
+ create mode 100644 Documentation/PCI/endpoint/pci-vntb-function.rst
+ create mode 100644 Documentation/PCI/endpoint/pci-vntb-howto.rst
+ create mode 100644 drivers/pci/endpoint/functions/pci-epf-vntb.c
+Merging seccomp/for-next/seccomp (73a8dbafd31a selftests/seccomp: Fix compile warning when CC=clang)
+$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp
+Merge made by the 'ort' strategy.
+ tools/testing/selftests/seccomp/seccomp_bpf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
+$ git merge -m Merge branch 'for-next' of https://github.com/daniel-walker/cisco-linux.git cisco/for-next
+Already up to date.
+Merging fsi/next (04823dd2af87 fsi: master-ast-cf: Fix missing of_node_put in fsi_master_acf_probe)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next
+Auto-merging drivers/hwmon/occ/p9_sbe.c
+Merge made by the 'ort' strategy.
+ drivers/fsi/fsi-core.c          |  8 ++++----
+ drivers/fsi/fsi-master-ast-cf.c |  2 ++
+ drivers/fsi/fsi-master.h        |  2 +-
+ drivers/fsi/fsi-occ.c           | 25 ++++++++++++++++++++-----
+ drivers/fsi/fsi-sbefifo.c       | 15 +++++++++------
+ drivers/hwmon/occ/p9_sbe.c      | 15 ++++++++++-----
+ 6 files changed, 46 insertions(+), 21 deletions(-)
+Merging slimbus/for-next (4ad3deabeea2 slimbus: messaging: fix typos in comments)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next
+Merge made by the 'ort' strategy.
+Merging nvmem/for-next (432ee5a3cfcf nvmem: mtk-efuse: Simplify with devm_platform_get_and_ioremap_resource())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was allocated)
+$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main
+Merge made by the 'ort' strategy.
+ Documentation/core-api/idr.rst |  3 +++
+ include/linux/xarray.h         | 15 +++++++++++++++
+ lib/idr.c                      | 14 ++++----------
+ tools/include/linux/sched/mm.h |  2 ++
+ 4 files changed, 24 insertions(+), 10 deletions(-)
+Merging hyperv/hyperv-next (e237eed373cc Drivers: hv: Create debugfs file with hyper-v balloon usage information)
+$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next
+Auto-merging drivers/pci/controller/pci-hyperv.c
+Merge made by the 'ort' strategy.
+ drivers/hv/connection.c   |  11 ++++
+ drivers/hv/hv_balloon.c   | 135 +++++++++++++++++++++++++++++++++++++++++++---
+ drivers/hv/hyperv_vmbus.h |   7 +++
+ drivers/hv/vmbus_drv.c    |  27 +++++++---
+ 4 files changed, 166 insertions(+), 14 deletions(-)
+Merging auxdisplay/auxdisplay (13de23494f38 auxdisplay: lcd2s: Use array size explicitly in lcd2s_gotoxy())
+$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay
+Already up to date.
+Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function)
+$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next
+Already up to date.
+Merging hmm/hmm (efa0855c5b84 RDMA/erdma: Add driver to kernel build environment)
+$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS                               |    8 +
+ drivers/infiniband/Kconfig                |   15 +-
+ drivers/infiniband/hw/Makefile            |    1 +
+ drivers/infiniband/hw/erdma/Kconfig       |   12 +
+ drivers/infiniband/hw/erdma/Makefile      |    4 +
+ drivers/infiniband/hw/erdma/erdma.h       |  287 ++++++
+ drivers/infiniband/hw/erdma/erdma_cm.c    | 1430 ++++++++++++++++++++++++++++
+ drivers/infiniband/hw/erdma/erdma_cm.h    |  167 ++++
+ drivers/infiniband/hw/erdma/erdma_cmdq.c  |  498 ++++++++++
+ drivers/infiniband/hw/erdma/erdma_cq.c    |  205 ++++
+ drivers/infiniband/hw/erdma/erdma_eq.c    |  329 +++++++
+ drivers/infiniband/hw/erdma/erdma_hw.h    |  508 ++++++++++
+ drivers/infiniband/hw/erdma/erdma_main.c  |  630 +++++++++++++
+ drivers/infiniband/hw/erdma/erdma_qp.c    |  566 +++++++++++
+ drivers/infiniband/hw/erdma/erdma_verbs.c | 1460 +++++++++++++++++++++++++++++
+ drivers/infiniband/hw/erdma/erdma_verbs.h |  342 +++++++
+ include/uapi/rdma/erdma-abi.h             |   49 +
+ include/uapi/rdma/ib_user_ioctl_verbs.h   |    1 +
+ 18 files changed, 6505 insertions(+), 7 deletions(-)
+ create mode 100644 drivers/infiniband/hw/erdma/Kconfig
+ create mode 100644 drivers/infiniband/hw/erdma/Makefile
+ create mode 100644 drivers/infiniband/hw/erdma/erdma.h
+ create mode 100644 drivers/infiniband/hw/erdma/erdma_cm.c
+ create mode 100644 drivers/infiniband/hw/erdma/erdma_cm.h
+ create mode 100644 drivers/infiniband/hw/erdma/erdma_cmdq.c
+ create mode 100644 drivers/infiniband/hw/erdma/erdma_cq.c
+ create mode 100644 drivers/infiniband/hw/erdma/erdma_eq.c
+ create mode 100644 drivers/infiniband/hw/erdma/erdma_hw.h
+ create mode 100644 drivers/infiniband/hw/erdma/erdma_main.c
+ create mode 100644 drivers/infiniband/hw/erdma/erdma_qp.c
+ create mode 100644 drivers/infiniband/hw/erdma/erdma_verbs.c
+ create mode 100644 drivers/infiniband/hw/erdma/erdma_verbs.h
+ create mode 100644 include/uapi/rdma/erdma-abi.h
+Merging kunit/test (f2906aa86338 Linux 5.19-rc1)
+$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test
+Already up to date.
+Merging cfi/cfi/next (312310928417 Linux 5.18-rc1)
+$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next
+Already up to date.
+Merging kunit-next/kunit (94681e289bf5 kunit: executor: Fix a memory leak on failure in kunit_filter_tests)
+$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit
+Auto-merging Documentation/dev-tools/kselftest.rst
+Auto-merging drivers/thunderbolt/tb.h
+Auto-merging kernel/module/main.c
+Auto-merging kernel/panic.c
+Auto-merging scripts/mod/modpost.c
+Auto-merging security/apparmor/policy_unpack_test.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/tainted-kernels.rst   |   1 +
+ Documentation/dev-tools/kselftest.rst           |   9 +
+ Documentation/dev-tools/kunit/run_wrapper.rst   |  18 +-
+ Documentation/dev-tools/kunit/running_tips.rst  |   5 +-
+ drivers/clk/.kunitconfig                        |   1 +
+ drivers/mmc/host/Kconfig                        |   5 +-
+ drivers/mmc/host/sdhci-of-aspeed-test.c         |   8 +-
+ drivers/mmc/host/sdhci-of-aspeed.c              |  34 +---
+ drivers/thunderbolt/Kconfig                     |   6 +-
+ drivers/thunderbolt/domain.c                    |   3 -
+ drivers/thunderbolt/tb.h                        |   8 -
+ drivers/thunderbolt/test.c                      |  12 +-
+ drivers/virt/nitro_enclaves/Kconfig             |   5 +-
+ drivers/virt/nitro_enclaves/ne_misc_dev.c       |  27 ---
+ drivers/virt/nitro_enclaves/ne_misc_dev_test.c  |   5 +-
+ include/kunit/test.h                            |  63 ++-----
+ include/linux/module.h                          |   5 +
+ include/linux/panic.h                           |   3 +-
+ kernel/module/main.c                            |  13 ++
+ kernel/panic.c                                  |   1 +
+ lib/kunit/executor.c                            | 125 ++++----------
+ lib/kunit/executor_test.c                       | 144 +++++-----------
+ lib/kunit/test.c                                |  58 ++++++-
+ scripts/mod/modpost.c                           |   3 +
+ tools/testing/kunit/configs/arch_uml.config     |   5 +
+ tools/testing/kunit/configs/coverage_uml.config |  11 ++
+ tools/testing/kunit/kunit.py                    |  83 +++++----
+ tools/testing/kunit/kunit_config.py             |  54 +++---
+ tools/testing/kunit/kunit_kernel.py             | 104 +++++++-----
+ tools/testing/kunit/kunit_parser.py             |  63 +++----
+ tools/testing/kunit/kunit_printer.py            |  48 ++++++
+ tools/testing/kunit/kunit_tool_test.py          | 214 +++++++++++++++---------
+ tools/testing/selftests/kselftest_module.h      |   4 +
+ 33 files changed, 564 insertions(+), 584 deletions(-)
+ create mode 100644 tools/testing/kunit/configs/arch_uml.config
+ create mode 100644 tools/testing/kunit/configs/coverage_uml.config
+ create mode 100644 tools/testing/kunit/kunit_printer.py
+Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next
+Already up to date.
+Merging mhi/mhi-next (9df125af0822 bus: mhi: ep: Check dev_set_name() return value)
+$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next
+Merge made by the 'ort' strategy.
+Merging memblock/for-next (fe833b4edc59 memblock tests: remove completed TODO items)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next
+Merge made by the 'ort' strategy.
+ mm/memblock.c                                    |  11 +
+ tools/testing/memblock/Makefile                  |   4 +
+ tools/testing/memblock/README                    |  10 +-
+ tools/testing/memblock/TODO                      |  14 +-
+ tools/testing/memblock/internal.h                |   7 +
+ tools/testing/memblock/scripts/Makefile.include  |  10 +
+ tools/testing/memblock/tests/alloc_api.c         | 225 ++++++++++-----
+ tools/testing/memblock/tests/alloc_helpers_api.c | 129 ++++++---
+ tools/testing/memblock/tests/alloc_nid_api.c     | 351 +++++++++++++++--------
+ tools/testing/memblock/tests/basic_api.c         | 337 +++++++++++++++-------
+ tools/testing/memblock/tests/common.c            |  57 ++++
+ tools/testing/memblock/tests/common.h            |  62 ++++
+ 12 files changed, 861 insertions(+), 356 deletions(-)
+Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy)
+$ git merge -m Merge branch 'init-user-pointers' of git://git.infradead.org/users/hch/misc.git init/init-user-pointers
+Already up to date.
+Merging counters/counters (e71ba9452f0b Linux 5.11-rc2)
+$ git merge -m Merge branch 'counters' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git counters/counters
+Already up to date.
+Merging cxl/next (a111daf0c53a Linux 5.19-rc3)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next
+Already up to date.
+Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller)
+$ git merge -m Merge branch 'folio-iomap' of git://git.infradead.org/users/willy/linux.git folio-iomap/folio-iomap
+Already up to date.
+Merging zstd/zstd-next (88a309465b3f lib: zstd: clean up double word in comment.)
+$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next
+Already up to date.
+Merging efi/next (df3c9072ef90 Merge branch 'efivars-cleanup' into efi/next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next
+Auto-merging arch/arm64/mm/init.c
+Auto-merging arch/x86/include/asm/efi.h
+Auto-merging drivers/acpi/Kconfig
+Auto-merging drivers/input/keyboard/applespi.c
+Auto-merging fs/pstore/platform.c
+Auto-merging mm/memblock.c
+Auto-merging mm/page_alloc.c
+Auto-merging mm/sparse-vmemmap.c
+Merge made by the 'ort' strategy.
+ Documentation/x86/x86_64/uefi.rst                  |    2 +-
+ arch/arm/configs/milbeaut_m10v_defconfig           |    1 -
+ arch/arm/include/asm/efi.h                         |    7 -
+ arch/arm64/include/asm/efi.h                       |    7 +-
+ arch/arm64/mm/init.c                               |    2 +-
+ arch/ia64/configs/bigsur_defconfig                 |    1 -
+ arch/ia64/configs/generic_defconfig                |    1 -
+ arch/ia64/configs/gensparse_defconfig              |    1 -
+ arch/ia64/configs/tiger_defconfig                  |    1 -
+ arch/ia64/configs/zx1_defconfig                    |    1 -
+ arch/loongarch/include/asm/efi.h                   |   16 +-
+ arch/riscv/include/asm/efi.h                       |    2 -
+ arch/x86/configs/i386_defconfig                    |    1 -
+ arch/x86/configs/x86_64_defconfig                  |    1 -
+ arch/x86/include/asm/efi.h                         |    7 +-
+ arch/x86/platform/efi/efi.c                        |   23 -
+ drivers/acpi/Kconfig                               |   30 +-
+ drivers/acpi/prmt.c                                |    4 +-
+ drivers/firmware/efi/Kconfig                       |   14 +-
+ drivers/firmware/efi/Makefile                      |    1 -
+ drivers/firmware/efi/efi-init.c                    |    1 +
+ drivers/firmware/efi/efi-pstore.c                  |  377 ++----
+ drivers/firmware/efi/efi.c                         |  127 +-
+ drivers/firmware/efi/efibc.c                       |   76 +-
+ drivers/firmware/efi/efivars.c                     |  671 -----------
+ drivers/firmware/efi/memmap.c                      |    5 +-
+ drivers/firmware/efi/vars.c                        | 1219 +++-----------------
+ drivers/input/keyboard/applespi.c                  |   42 +-
+ .../broadcom/brcm80211/brcmfmac/firmware.c         |   25 +-
+ drivers/net/wireless/intel/iwlwifi/fw/uefi.c       |   96 +-
+ fs/efivarfs/Makefile                               |    2 +-
+ fs/efivarfs/internal.h                             |   40 +
+ fs/efivarfs/super.c                                |   15 +-
+ fs/efivarfs/vars.c                                 |  738 ++++++++++++
+ fs/pstore/inode.c                                  |    1 +
+ fs/pstore/platform.c                               |    1 +
+ include/linux/efi.h                                |   85 +-
+ include/linux/pstore.h                             |    4 +
+ mm/internal.h                                      |    2 +
+ mm/memblock.c                                      |    7 +-
+ mm/page_alloc.c                                    |    2 +-
+ mm/sparse-vmemmap.c                                |    2 +-
+ tools/testing/selftests/kexec/kexec_common_lib.sh  |   36 +-
+ 43 files changed, 1221 insertions(+), 2476 deletions(-)
+ delete mode 100644 drivers/firmware/efi/efivars.c
+ create mode 100644 fs/efivarfs/vars.c
+Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next
+Merge made by the 'ort' strategy.
+ fs/unicode/mkutf8data.c | 38 ++++++++++++++++++++++++--------------
+ 1 file changed, 24 insertions(+), 14 deletions(-)
+Merging slab/for-next (b77d5b1b83e3 mm: slab: optimize memcg_slab_free_hook())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next
+Merge made by the 'ort' strategy.
+ include/trace/events/kmem.h | 40 ++++++++++++-------
+ mm/slab.c                   | 18 ++++-----
+ mm/slab.h                   | 30 ++++-----------
+ mm/slab_common.c            |  9 ++---
+ mm/slob.c                   |  8 ++--
+ mm/slub.c                   | 94 +++++++++++++++++----------------------------
+ tools/vm/slabinfo.c         | 26 ++++++++++++-
+ 7 files changed, 110 insertions(+), 115 deletions(-)
+Merging random/master (9ddd36047681 x86/rdrand: Remove "nordrand" flag in favor of "random.trust_cpu")
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm64/kernel/cpufeature.c
+Auto-merging arch/powerpc/Kconfig
+CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
+Auto-merging arch/powerpc/include/asm/machdep.h
+Auto-merging arch/powerpc/platforms/powernv/Kconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/x86/kernel/cpu/amd.c
+Auto-merging drivers/char/random.c
+Auto-merging include/asm-generic/Kbuild
+Resolved 'arch/powerpc/Kconfig' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master c3b1a7dbe8bd] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/kernel-parameters.txt    |  5 --
+ arch/arm/include/asm/archrandom.h                  |  2 +
+ arch/arm64/Kconfig                                 |  8 ---
+ arch/arm64/include/asm/archrandom.h                | 10 ---
+ arch/arm64/kernel/cpufeature.c                     |  2 -
+ arch/powerpc/Kconfig                               |  3 -
+ arch/powerpc/include/asm/archrandom.h              |  3 -
+ arch/powerpc/include/asm/machdep.h                 |  2 -
+ arch/powerpc/platforms/microwatt/Kconfig           |  1 -
+ arch/powerpc/platforms/powernv/Kconfig             |  1 -
+ arch/powerpc/platforms/pseries/Kconfig             |  1 -
+ arch/s390/Kconfig                                  | 15 -----
+ arch/s390/configs/zfcpdump_defconfig               |  1 -
+ arch/s390/crypto/Makefile                          |  2 +-
+ arch/s390/include/asm/archrandom.h                 |  3 -
+ arch/s390/kernel/setup.c                           |  2 -
+ arch/x86/Kconfig                                   |  9 ---
+ arch/x86/include/asm/archrandom.h                  | 14 ++--
+ arch/x86/kernel/cpu/amd.c                          |  2 +-
+ arch/x86/kernel/cpu/rdrand.c                       | 75 ++++++++++------------
+ drivers/char/Kconfig                               |  1 -
+ drivers/char/hw_random/s390-trng.c                 |  9 ---
+ drivers/char/random.c                              |  2 +-
+ include/asm-generic/Kbuild                         |  1 +
+ include/asm-generic/archrandom.h                   | 25 ++++++++
+ include/linux/random.h                             |  9 +--
+ .../testing/selftests/wireguard/qemu/kernel.config |  1 -
+ 27 files changed, 71 insertions(+), 138 deletions(-)
+ create mode 100644 include/asm-generic/archrandom.h
+Merging landlock/next (b13baccc3850 Linux 5.19-rc2)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next
+Already up to date.
+Merging rust/rust-next (9a5fe747d99e init/Kconfig: Specify the interpreter for rust-is-available.sh)
+$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next
+Auto-merging .gitignore
+Auto-merging Documentation/doc-guide/kernel-doc.rst
+Auto-merging Documentation/index.rst
+Auto-merging Documentation/process/changes.rst
+Auto-merging MAINTAINERS
+Auto-merging Makefile
+CONFLICT (content): Merge conflict in Makefile
+Auto-merging arch/Kconfig
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/riscv/Kconfig
+Auto-merging arch/riscv/Makefile
+Auto-merging arch/um/Kconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/x86/Makefile
+CONFLICT (content): Merge conflict in arch/x86/Makefile
+Auto-merging drivers/android/Kconfig
+Auto-merging drivers/gpio/Kconfig
+Auto-merging include/kunit/test.h
+Auto-merging include/linux/kallsyms.h
+Auto-merging include/uapi/linux/android/binder.h
+CONFLICT (content): Merge conflict in include/uapi/linux/android/binder.h
+Auto-merging init/Kconfig
+Auto-merging kernel/kallsyms.c
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/kunit/test.c
+Auto-merging lib/vsprintf.c
+Auto-merging scripts/Makefile
+Auto-merging scripts/Makefile.build
+Auto-merging scripts/Makefile.lib
+Auto-merging scripts/Makefile.modfinal
+Auto-merging scripts/checkpatch.pl
+Auto-merging scripts/decode_stacktrace.sh
+Auto-merging scripts/kallsyms.c
+Auto-merging scripts/min-tool-version.sh
+Auto-merging tools/lib/perf/include/perf/event.h
+Resolved 'Makefile' using previous resolution.
+Resolved 'arch/x86/Makefile' using previous resolution.
+Resolved 'include/uapi/linux/android/binder.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 55dfd001c5f8] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git
+$ git diff -M --stat --summary HEAD^..
+ .gitignore                                   |    5 +
+ .rustfmt.toml                                |   12 +
+ Documentation/core-api/printk-formats.rst    |   10 +
+ Documentation/doc-guide/kernel-doc.rst       |    3 +
+ Documentation/index.rst                      |    1 +
+ Documentation/kbuild/kbuild.rst              |   17 +
+ Documentation/kbuild/makefiles.rst           |   50 +-
+ Documentation/process/changes.rst            |   41 +
+ Documentation/rust/arch-support.rst          |   25 +
+ Documentation/rust/coding-guidelines.rst     |  216 ++
+ Documentation/rust/general-information.rst   |   79 +
+ Documentation/rust/index.rst                 |   22 +
+ Documentation/rust/quick-start.rst           |  232 ++
+ MAINTAINERS                                  |   15 +
+ Makefile                                     |  176 +-
+ arch/Kconfig                                 |    6 +
+ arch/arm/Kconfig                             |    1 +
+ arch/arm64/Kconfig                           |    1 +
+ arch/powerpc/Kconfig                         |    1 +
+ arch/riscv/Kconfig                           |    1 +
+ arch/riscv/Makefile                          |    5 +
+ arch/um/Kconfig                              |    1 +
+ arch/x86/Kconfig                             |    1 +
+ arch/x86/Makefile                            |   13 +
+ drivers/android/Kconfig                      |    6 +
+ drivers/android/Makefile                     |    2 +
+ drivers/android/allocation.rs                |  266 ++
+ drivers/android/context.rs                   |   80 +
+ drivers/android/defs.rs                      |   99 +
+ drivers/android/node.rs                      |  476 ++++
+ drivers/android/process.rs                   |  960 ++++++++
+ drivers/android/range_alloc.rs               |  189 ++
+ drivers/android/rust_binder.rs               |  111 +
+ drivers/android/thread.rs                    |  870 +++++++
+ drivers/android/transaction.rs               |  326 +++
+ drivers/gpio/Kconfig                         |    8 +
+ drivers/gpio/Makefile                        |    1 +
+ drivers/gpio/gpio_pl061_rust.rs              |  370 +++
+ include/linux/kallsyms.h                     |    2 +-
+ include/linux/spinlock.h                     |   25 +-
+ include/uapi/linux/android/binder.h          |   30 +-
+ init/Kconfig                                 |   51 +-
+ kernel/kallsyms.c                            |   26 +-
+ kernel/livepatch/core.c                      |    4 +-
+ lib/Kconfig.debug                            |  155 ++
+ lib/vsprintf.c                               |   13 +
+ rust/.gitignore                              |   10 +
+ rust/Makefile                                |  398 +++
+ rust/alloc/README.md                         |   33 +
+ rust/alloc/alloc.rs                          |  438 ++++
+ rust/alloc/borrow.rs                         |  498 ++++
+ rust/alloc/boxed.rs                          | 2007 +++++++++++++++
+ rust/alloc/collections/mod.rs                |  156 ++
+ rust/alloc/fmt.rs                            |  601 +++++
+ rust/alloc/lib.rs                            |  226 ++
+ rust/alloc/macros.rs                         |  127 +
+ rust/alloc/raw_vec.rs                        |  567 +++++
+ rust/alloc/slice.rs                          | 1282 ++++++++++
+ rust/alloc/str.rs                            |  632 +++++
+ rust/alloc/string.rs                         | 2869 ++++++++++++++++++++++
+ rust/alloc/vec/drain.rs                      |  186 ++
+ rust/alloc/vec/drain_filter.rs               |  145 ++
+ rust/alloc/vec/into_iter.rs                  |  356 +++
+ rust/alloc/vec/is_zero.rs                    |  106 +
+ rust/alloc/vec/mod.rs                        | 3362 ++++++++++++++++++++++++++
+ rust/alloc/vec/partial_eq.rs                 |   49 +
+ rust/alloc/vec/set_len_on_drop.rs            |   30 +
+ rust/alloc/vec/spec_extend.rs                |  174 ++
+ rust/bindgen_parameters                      |   17 +
+ rust/build_error.rs                          |   29 +
+ rust/compiler_builtins.rs                    |   57 +
+ rust/exports.c                               |   20 +
+ rust/helpers.c                               |  644 +++++
+ rust/kernel/allocator.rs                     |   65 +
+ rust/kernel/amba.rs                          |  257 ++
+ rust/kernel/bindings.rs                      |   47 +
+ rust/kernel/bindings_helper.h                |   46 +
+ rust/kernel/build_assert.rs                  |   82 +
+ rust/kernel/c_types.rs                       |  119 +
+ rust/kernel/chrdev.rs                        |  207 ++
+ rust/kernel/clk.rs                           |   79 +
+ rust/kernel/cred.rs                          |   46 +
+ rust/kernel/device.rs                        |  546 +++++
+ rust/kernel/driver.rs                        |  442 ++++
+ rust/kernel/error.rs                         |  565 +++++
+ rust/kernel/file.rs                          |  860 +++++++
+ rust/kernel/gpio.rs                          |  478 ++++
+ rust/kernel/hwrng.rs                         |  242 ++
+ rust/kernel/io_buffer.rs                     |  153 ++
+ rust/kernel/io_mem.rs                        |  275 +++
+ rust/kernel/iov_iter.rs                      |   81 +
+ rust/kernel/irq.rs                           |  411 ++++
+ rust/kernel/kasync.rs                        |    6 +
+ rust/kernel/kasync/net.rs                    |  322 +++
+ rust/kernel/kunit.rs                         |   91 +
+ rust/kernel/lib.rs                           |  261 ++
+ rust/kernel/linked_list.rs                   |  247 ++
+ rust/kernel/miscdev.rs                       |  291 +++
+ rust/kernel/mm.rs                            |  149 ++
+ rust/kernel/module_param.rs                  |  498 ++++
+ rust/kernel/net.rs                           |  392 +++
+ rust/kernel/net/filter.rs                    |  447 ++++
+ rust/kernel/of.rs                            |   63 +
+ rust/kernel/pages.rs                         |  144 ++
+ rust/kernel/platform.rs                      |  223 ++
+ rust/kernel/power.rs                         |  118 +
+ rust/kernel/prelude.rs                       |   36 +
+ rust/kernel/print.rs                         |  405 ++++
+ rust/kernel/random.rs                        |   42 +
+ rust/kernel/raw_list.rs                      |  361 +++
+ rust/kernel/rbtree.rs                        |  563 +++++
+ rust/kernel/revocable.rs                     |  161 ++
+ rust/kernel/security.rs                      |   38 +
+ rust/kernel/static_assert.rs                 |   38 +
+ rust/kernel/std_vendor.rs                    |  160 ++
+ rust/kernel/str.rs                           |  597 +++++
+ rust/kernel/sync.rs                          |  161 ++
+ rust/kernel/sync/arc.rs                      |  503 ++++
+ rust/kernel/sync/condvar.rs                  |  138 ++
+ rust/kernel/sync/guard.rs                    |  169 ++
+ rust/kernel/sync/locked_by.rs                |  111 +
+ rust/kernel/sync/mutex.rs                    |  153 ++
+ rust/kernel/sync/nowait.rs                   |  188 ++
+ rust/kernel/sync/revocable.rs                |  250 ++
+ rust/kernel/sync/rwsem.rs                    |  197 ++
+ rust/kernel/sync/seqlock.rs                  |  202 ++
+ rust/kernel/sync/smutex.rs                   |  295 +++
+ rust/kernel/sync/spinlock.rs                 |  360 +++
+ rust/kernel/sysctl.rs                        |  199 ++
+ rust/kernel/task.rs                          |  175 ++
+ rust/kernel/types.rs                         |  679 ++++++
+ rust/kernel/user_ptr.rs                      |  175 ++
+ rust/macros/helpers.rs                       |   79 +
+ rust/macros/lib.rs                           |   94 +
+ rust/macros/module.rs                        |  631 +++++
+ samples/Kconfig                              |    2 +
+ samples/Makefile                             |    1 +
+ samples/rust/Kconfig                         |  140 ++
+ samples/rust/Makefile                        |   16 +
+ samples/rust/hostprogs/.gitignore            |    3 +
+ samples/rust/hostprogs/Makefile              |    5 +
+ samples/rust/hostprogs/a.rs                  |    7 +
+ samples/rust/hostprogs/b.rs                  |    5 +
+ samples/rust/hostprogs/single.rs             |   12 +
+ samples/rust/rust_chrdev.rs                  |   50 +
+ samples/rust/rust_minimal.rs                 |   35 +
+ samples/rust/rust_miscdev.rs                 |  143 ++
+ samples/rust/rust_module_parameters.rs       |   69 +
+ samples/rust/rust_netfilter.rs               |   54 +
+ samples/rust/rust_platform.rs                |   22 +
+ samples/rust/rust_print.rs                   |   54 +
+ samples/rust/rust_random.rs                  |   60 +
+ samples/rust/rust_semaphore.rs               |  171 ++
+ samples/rust/rust_semaphore_c.c              |  212 ++
+ samples/rust/rust_stack_probing.rs           |   36 +
+ samples/rust/rust_sync.rs                    |   93 +
+ scripts/.gitignore                           |    1 +
+ scripts/Kconfig.include                      |    6 +-
+ scripts/Makefile                             |    3 +
+ scripts/Makefile.build                       |   60 +
+ scripts/Makefile.debug                       |   10 +
+ scripts/Makefile.host                        |   34 +-
+ scripts/Makefile.lib                         |   12 +
+ scripts/Makefile.modfinal                    |    8 +-
+ scripts/cc-version.sh                        |   12 +-
+ scripts/checkpatch.pl                        |    8 +-
+ scripts/decode_stacktrace.sh                 |   14 +
+ scripts/generate_rust_analyzer.py            |  134 +
+ scripts/generate_rust_target.rs              |  227 ++
+ scripts/is_rust_module.sh                    |   13 +
+ scripts/kallsyms.c                           |   47 +-
+ scripts/kconfig/confdata.c                   |   75 +
+ scripts/min-tool-version.sh                  |    6 +
+ scripts/rust-is-available-bindgen-libclang.h |    2 +
+ scripts/rust-is-available.sh                 |  158 ++
+ scripts/rustdoc_test_builder.py              |   59 +
+ scripts/rustdoc_test_gen.py                  |  164 ++
+ tools/include/linux/kallsyms.h               |    2 +-
+ tools/lib/perf/include/perf/event.h          |    2 +-
+ tools/lib/symbol/kallsyms.h                  |    2 +-
+ 180 files changed, 37617 insertions(+), 68 deletions(-)
+ create mode 100644 .rustfmt.toml
+ create mode 100644 Documentation/rust/arch-support.rst
+ create mode 100644 Documentation/rust/coding-guidelines.rst
+ create mode 100644 Documentation/rust/general-information.rst
+ create mode 100644 Documentation/rust/index.rst
+ create mode 100644 Documentation/rust/quick-start.rst
+ create mode 100644 drivers/android/allocation.rs
+ create mode 100644 drivers/android/context.rs
+ create mode 100644 drivers/android/defs.rs
+ create mode 100644 drivers/android/node.rs
+ create mode 100644 drivers/android/process.rs
+ create mode 100644 drivers/android/range_alloc.rs
+ create mode 100644 drivers/android/rust_binder.rs
+ create mode 100644 drivers/android/thread.rs
+ create mode 100644 drivers/android/transaction.rs
+ create mode 100644 drivers/gpio/gpio_pl061_rust.rs
+ create mode 100644 rust/.gitignore
+ create mode 100644 rust/Makefile
+ create mode 100644 rust/alloc/README.md
+ create mode 100644 rust/alloc/alloc.rs
+ create mode 100644 rust/alloc/borrow.rs
+ create mode 100644 rust/alloc/boxed.rs
+ create mode 100644 rust/alloc/collections/mod.rs
+ create mode 100644 rust/alloc/fmt.rs
+ create mode 100644 rust/alloc/lib.rs
+ create mode 100644 rust/alloc/macros.rs
+ create mode 100644 rust/alloc/raw_vec.rs
+ create mode 100644 rust/alloc/slice.rs
+ create mode 100644 rust/alloc/str.rs
+ create mode 100644 rust/alloc/string.rs
+ create mode 100644 rust/alloc/vec/drain.rs
+ create mode 100644 rust/alloc/vec/drain_filter.rs
+ create mode 100644 rust/alloc/vec/into_iter.rs
+ create mode 100644 rust/alloc/vec/is_zero.rs
+ create mode 100644 rust/alloc/vec/mod.rs
+ create mode 100644 rust/alloc/vec/partial_eq.rs
+ create mode 100644 rust/alloc/vec/set_len_on_drop.rs
+ create mode 100644 rust/alloc/vec/spec_extend.rs
+ create mode 100644 rust/bindgen_parameters
+ create mode 100644 rust/build_error.rs
+ create mode 100644 rust/compiler_builtins.rs
+ create mode 100644 rust/exports.c
+ create mode 100644 rust/helpers.c
+ create mode 100644 rust/kernel/allocator.rs
+ create mode 100644 rust/kernel/amba.rs
+ create mode 100644 rust/kernel/bindings.rs
+ create mode 100644 rust/kernel/bindings_helper.h
+ create mode 100644 rust/kernel/build_assert.rs
+ create mode 100644 rust/kernel/c_types.rs
+ create mode 100644 rust/kernel/chrdev.rs
+ create mode 100644 rust/kernel/clk.rs
+ create mode 100644 rust/kernel/cred.rs
+ create mode 100644 rust/kernel/device.rs
+ create mode 100644 rust/kernel/driver.rs
+ create mode 100644 rust/kernel/error.rs
+ create mode 100644 rust/kernel/file.rs
+ create mode 100644 rust/kernel/gpio.rs
+ create mode 100644 rust/kernel/hwrng.rs
+ create mode 100644 rust/kernel/io_buffer.rs
+ create mode 100644 rust/kernel/io_mem.rs
+ create mode 100644 rust/kernel/iov_iter.rs
+ create mode 100644 rust/kernel/irq.rs
+ create mode 100644 rust/kernel/kasync.rs
+ create mode 100644 rust/kernel/kasync/net.rs
+ create mode 100644 rust/kernel/kunit.rs
+ create mode 100644 rust/kernel/lib.rs
+ create mode 100644 rust/kernel/linked_list.rs
+ create mode 100644 rust/kernel/miscdev.rs
+ create mode 100644 rust/kernel/mm.rs
+ create mode 100644 rust/kernel/module_param.rs
+ create mode 100644 rust/kernel/net.rs
+ create mode 100644 rust/kernel/net/filter.rs
+ create mode 100644 rust/kernel/of.rs
+ create mode 100644 rust/kernel/pages.rs
+ create mode 100644 rust/kernel/platform.rs
+ create mode 100644 rust/kernel/power.rs
+ create mode 100644 rust/kernel/prelude.rs
+ create mode 100644 rust/kernel/print.rs
+ create mode 100644 rust/kernel/random.rs
+ create mode 100644 rust/kernel/raw_list.rs
+ create mode 100644 rust/kernel/rbtree.rs
+ create mode 100644 rust/kernel/revocable.rs
+ create mode 100644 rust/kernel/security.rs
+ create mode 100644 rust/kernel/static_assert.rs
+ create mode 100644 rust/kernel/std_vendor.rs
+ create mode 100644 rust/kernel/str.rs
+ create mode 100644 rust/kernel/sync.rs
+ create mode 100644 rust/kernel/sync/arc.rs
+ create mode 100644 rust/kernel/sync/condvar.rs
+ create mode 100644 rust/kernel/sync/guard.rs
+ create mode 100644 rust/kernel/sync/locked_by.rs
+ create mode 100644 rust/kernel/sync/mutex.rs
+ create mode 100644 rust/kernel/sync/nowait.rs
+ create mode 100644 rust/kernel/sync/revocable.rs
+ create mode 100644 rust/kernel/sync/rwsem.rs
+ create mode 100644 rust/kernel/sync/seqlock.rs
+ create mode 100644 rust/kernel/sync/smutex.rs
+ create mode 100644 rust/kernel/sync/spinlock.rs
+ create mode 100644 rust/kernel/sysctl.rs
+ create mode 100644 rust/kernel/task.rs
+ create mode 100644 rust/kernel/types.rs
+ create mode 100644 rust/kernel/user_ptr.rs
+ create mode 100644 rust/macros/helpers.rs
+ create mode 100644 rust/macros/lib.rs
+ create mode 100644 rust/macros/module.rs
+ create mode 100644 samples/rust/Kconfig
+ create mode 100644 samples/rust/Makefile
+ create mode 100644 samples/rust/hostprogs/.gitignore
+ create mode 100644 samples/rust/hostprogs/Makefile
+ create mode 100644 samples/rust/hostprogs/a.rs
+ create mode 100644 samples/rust/hostprogs/b.rs
+ create mode 100644 samples/rust/hostprogs/single.rs
+ create mode 100644 samples/rust/rust_chrdev.rs
+ create mode 100644 samples/rust/rust_minimal.rs
+ create mode 100644 samples/rust/rust_miscdev.rs
+ create mode 100644 samples/rust/rust_module_parameters.rs
+ create mode 100644 samples/rust/rust_netfilter.rs
+ create mode 100644 samples/rust/rust_platform.rs
+ create mode 100644 samples/rust/rust_print.rs
+ create mode 100644 samples/rust/rust_random.rs
+ create mode 100644 samples/rust/rust_semaphore.rs
+ create mode 100644 samples/rust/rust_semaphore_c.c
+ create mode 100644 samples/rust/rust_stack_probing.rs
+ create mode 100644 samples/rust/rust_sync.rs
+ create mode 100755 scripts/generate_rust_analyzer.py
+ create mode 100644 scripts/generate_rust_target.rs
+ create mode 100755 scripts/is_rust_module.sh
+ create mode 100644 scripts/rust-is-available-bindgen-libclang.h
+ create mode 100755 scripts/rust-is-available.sh
+ create mode 100755 scripts/rustdoc_test_builder.py
+ create mode 100755 scripts/rustdoc_test_gen.py
+Merging sysctl/sysctl-next (acdc07ace871 kernel/sysctl.c: Clean up indentation, replace spaces with tab.)
+$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next
+Auto-merging kernel/sysctl.c
+Merge made by the 'ort' strategy.
+ kernel/sysctl.c | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+Merging folio/for-next (03b33c09ea22 fs: remove the NULL get_block case in mpage_writepages)
+$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next
+Auto-merging block/fops.c
+Auto-merging block/partitions/core.c
+Auto-merging fs/aio.c
+Auto-merging fs/btrfs/disk-io.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/buffer.c
+CONFLICT (content): Merge conflict in fs/buffer.c
+Auto-merging fs/ext2/inode.c
+Auto-merging fs/ext2/super.c
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/f2fs/compress.c
+Auto-merging fs/f2fs/data.c
+Auto-merging fs/f2fs/f2fs.h
+Auto-merging fs/f2fs/node.c
+Auto-merging fs/gfs2/lops.c
+Auto-merging fs/hugetlbfs/inode.c
+Auto-merging fs/inode.c
+Auto-merging fs/iomap/buffered-io.c
+Auto-merging fs/mpage.c
+Auto-merging fs/ntfs/aops.c
+Auto-merging fs/ntfs/file.c
+Auto-merging fs/ntfs3/inode.c
+Auto-merging fs/ntfs3/ntfs_fs.h
+Auto-merging fs/ocfs2/aops.c
+Auto-merging fs/remap_range.c
+Auto-merging fs/zonefs/super.c
+Auto-merging include/linux/buffer_head.h
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/iomap.h
+Auto-merging include/linux/netfs.h
+Auto-merging mm/filemap.c
+Auto-merging mm/huge_memory.c
+Auto-merging mm/hugetlb.c
+Auto-merging mm/memory-failure.c
+Auto-merging mm/secretmem.c
+Auto-merging mm/shmem.c
+Auto-merging mm/swap.c
+Recorded preimage for 'fs/buffer.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'fs/buffer.c'.
+[master 0775d92978a8] Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/cgroup-v1/memcg_test.rst |   2 +-
+ Documentation/filesystems/ext2.rst                 |   2 -
+ Documentation/filesystems/locking.rst              |   9 +-
+ Documentation/filesystems/vfs.rst                  |  65 ++--
+ Documentation/vm/page_migration.rst                | 113 +------
+ arch/powerpc/platforms/pseries/cmm.c               |  60 +---
+ block/fops.c                                       |   2 +-
+ block/partitions/check.h                           |   4 +-
+ block/partitions/core.c                            |  20 +-
+ drivers/gpu/drm/i915/gem/i915_gem_userptr.c        |   4 +-
+ drivers/misc/vmw_balloon.c                         |  61 +---
+ drivers/virtio/virtio_balloon.c                    |  47 +--
+ fs/afs/mntpt.c                                     |   6 -
+ fs/aio.c                                           |  36 +-
+ fs/befs/linuxvfs.c                                 |  16 +-
+ fs/btrfs/disk-io.c                                 |  41 +--
+ fs/btrfs/inode.c                                   |  26 +-
+ fs/buffer.c                                        | 363 ++-------------------
+ fs/coda/symlink.c                                  |  11 +-
+ fs/cramfs/inode.c                                  |  17 +-
+ fs/ext2/dir.c                                      |  20 +-
+ fs/ext2/ext2.h                                     |   1 -
+ fs/ext2/inode.c                                    |  53 +--
+ fs/ext2/namei.c                                    |  10 +-
+ fs/ext2/super.c                                    |   6 +-
+ fs/ext4/inode.c                                    |  44 +--
+ fs/f2fs/checkpoint.c                               |   4 +-
+ fs/f2fs/compress.c                                 |  35 +-
+ fs/f2fs/data.c                                     |  40 +--
+ fs/f2fs/f2fs.h                                     |   4 -
+ fs/f2fs/node.c                                     |   4 +-
+ fs/freevxfs/vxfs_immed.c                           |  43 ++-
+ fs/freevxfs/vxfs_subr.c                            |   6 -
+ fs/gfs2/aops.c                                     |   2 +-
+ fs/gfs2/lops.c                                     |  28 +-
+ fs/hfs/bnode.c                                     |   4 -
+ fs/hfsplus/bnode.c                                 |   4 -
+ fs/hostfs/hostfs_kern.c                            |   6 +-
+ fs/hugetlbfs/inode.c                               |  69 ++--
+ fs/inode.c                                         |   2 +-
+ fs/iomap/buffered-io.c                             |  28 --
+ fs/jfs/inode.c                                     |  18 +-
+ fs/jfs/jfs_metapage.c                              |   2 +-
+ fs/mpage.c                                         | 125 +++----
+ fs/nfs/file.c                                      |   4 +-
+ fs/nfs/internal.h                                  |   6 +-
+ fs/nfs/read.c                                      |   4 -
+ fs/nfs/write.c                                     |  16 +-
+ fs/nilfs2/dir.c                                    |   2 +-
+ fs/nilfs2/page.c                                   |  60 ++--
+ fs/ntfs/aops.c                                     |   6 +-
+ fs/ntfs/aops.h                                     |   7 +-
+ fs/ntfs/file.c                                     |   5 -
+ fs/ntfs3/inode.c                                   |   8 +-
+ fs/ntfs3/ntfs_fs.h                                 |   7 +-
+ fs/ocfs2/aops.c                                    |  28 +-
+ fs/ocfs2/refcounttree.c                            |  42 +--
+ fs/orangefs/inode.c                                |   4 +-
+ fs/reiserfs/xattr.c                                |   9 +-
+ fs/remap_range.c                                   |  11 +-
+ fs/squashfs/file.c                                 |  15 +-
+ fs/ubifs/file.c                                    |  29 +-
+ fs/ufs/dir.c                                       |   2 +-
+ fs/ufs/util.c                                      |  11 -
+ fs/xfs/xfs_aops.c                                  |   2 +-
+ fs/zonefs/super.c                                  |   2 +-
+ include/linux/balloon_compaction.h                 |   6 +-
+ include/linux/buffer_head.h                        |  18 +-
+ include/linux/fs.h                                 |  20 +-
+ include/linux/iomap.h                              |   6 -
+ include/linux/migrate.h                            |  78 +++--
+ include/linux/mpage.h                              |   2 -
+ include/linux/netfs.h                              |  23 +-
+ include/linux/page-flags.h                         |   2 +-
+ include/linux/pagemap.h                            |  33 +-
+ include/linux/pagevec.h                            |  10 -
+ include/linux/swap.h                               |   3 +-
+ include/uapi/linux/magic.h                         |   4 -
+ mm/balloon_compaction.c                            |  10 +-
+ mm/compaction.c                                    |  34 +-
+ mm/filemap.c                                       | 139 +++-----
+ mm/folio-compat.c                                  |  22 --
+ mm/huge_memory.c                                   |  11 +-
+ mm/hugetlb.c                                       |  14 +-
+ mm/ksm.c                                           |   2 +-
+ mm/memory-failure.c                                |   2 +-
+ mm/migrate.c                                       | 238 ++++++++------
+ mm/migrate_device.c                                |   3 +-
+ mm/secretmem.c                                     |  13 +-
+ mm/shmem.c                                         |  19 +-
+ mm/swap.c                                          |  29 --
+ mm/swap_state.c                                    |   4 +-
+ mm/truncate.c                                      |   2 +-
+ mm/util.c                                          |   4 +-
+ mm/vmscan.c                                        |  56 ++--
+ mm/z3fold.c                                        |  84 +----
+ mm/zsmalloc.c                                      | 102 ++----
+ 97 files changed, 838 insertions(+), 1898 deletions(-)
+Merging execve/for-next/execve (5036793d7dbd exec: Fix a spelling mistake)
+$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve
+Auto-merging fs/exec.c
+Auto-merging kernel/fork.c
+Merge made by the 'ort' strategy.
+ fs/exec.c                                   |  9 ++-
+ kernel/fork.c                               |  5 +-
+ kernel/nsproxy.c                            |  3 +-
+ tools/testing/selftests/timens/Makefile     |  2 +-
+ tools/testing/selftests/timens/vfork_exec.c | 90 +++++++++++++++++++++++++++++
+ 5 files changed, 105 insertions(+), 4 deletions(-)
+ create mode 100644 tools/testing/selftests/timens/vfork_exec.c
+Merging bitmap/bitmap-for-next (ae3f9b705709 lib/cpumask: move some one-line wrappers to header file)
+$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next
+Auto-merging MAINTAINERS
+Auto-merging arch/m68k/include/asm/bitops.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
+Auto-merging drivers/gpu/drm/i915/display/intel_display_power.c
+Auto-merging drivers/iommu/intel/dmar.c
+Auto-merging drivers/iommu/intel/iommu.c
+Auto-merging drivers/net/ethernet/intel/ice/ice_switch.c
+Auto-merging include/linux/gfp.h
+CONFLICT (content): Merge conflict in include/linux/gfp.h
+Recorded preimage for 'include/linux/gfp.h'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'include/linux/gfp.h'.
+[master 459a55919cb9] Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/core-api/mm-api.rst                  |   8 +-
+ MAINTAINERS                                        |   1 +
+ arch/alpha/include/asm/bitops.h                    |  32 +-
+ arch/arm/include/asm/bitops.h                      |  18 +-
+ arch/hexagon/include/asm/bitops.h                  |  24 +-
+ arch/ia64/include/asm/bitops.h                     |  42 +--
+ arch/ia64/include/asm/processor.h                  |   2 +-
+ arch/m68k/include/asm/bitops.h                     |  49 ++-
+ arch/s390/include/asm/bitops.h                     |  61 ++--
+ arch/sh/include/asm/bitops-op32.h                  |  34 +-
+ arch/sparc/include/asm/bitops_32.h                 |  18 +-
+ arch/sparc/lib/atomic32.c                          |  12 +-
+ arch/x86/include/asm/bitops.h                      |  22 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c            |   2 +-
+ drivers/gpu/drm/i915/display/intel_display_power.c |   2 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c           |   2 +-
+ drivers/iommu/intel/dmar.c                         |   2 +-
+ drivers/iommu/intel/iommu.c                        |   2 +-
+ drivers/net/ethernet/intel/ice/ice_switch.c        |   2 +-
+ drivers/net/ethernet/mellanox/mlx4/fw.c            |   2 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_debug.c     |   2 +-
+ drivers/net/wireless/ath/carl9170/debug.c          |   2 +-
+ include/asm-generic/bitops/generic-non-atomic.h    | 161 ++++++++++
+ .../asm-generic/bitops/instrumented-non-atomic.h   |  35 ++-
+ include/asm-generic/bitops/non-atomic.h            | 121 +------
+ .../bitops/non-instrumented-non-atomic.h           |  16 +
+ include/linux/bitmap.h                             |  37 ++-
+ include/linux/bitops.h                             |  50 +++
+ include/linux/cpumask.h                            | 125 ++++++--
+ include/linux/gfp.h                                | 348 +--------------------
+ include/linux/gfp_types.h                          | 348 +++++++++++++++++++++
+ lib/bitmap.c                                       |  11 +-
+ lib/cpumask.c                                      |  97 +-----
+ lib/test_bitmap.c                                  |  68 ++++
+ tools/include/asm-generic/bitops/non-atomic.h      |  34 +-
+ tools/include/linux/bitmap.h                       |  12 +-
+ tools/include/linux/bitops.h                       |  16 +
+ tools/lib/bitmap.c                                 |   6 +-
+ 38 files changed, 1054 insertions(+), 772 deletions(-)
+ create mode 100644 include/asm-generic/bitops/generic-non-atomic.h
+ create mode 100644 include/asm-generic/bitops/non-instrumented-non-atomic.h
+ create mode 100644 include/linux/gfp_types.h
+$ git am -3 ../patches/0001-fix-up-for-mm-kasan-Skip-unpoisoning-of-user-pages.patch
+Applying: fix up for "mm: kasan: Skip unpoisoning of user pages"
+$ git reset HEAD^
+Unstaged changes after reset:
+M	include/linux/gfp_types.h
+$ git add -A .
+$ git commit -v -a --amend
+[master a0ad8d6c4ccf] Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git
+ Date: Fri Jul 15 19:40:35 2022 +1000
+$ git am -3 ../patches/0001-fix-up-for-bitmap_weight-return-value-changing.patch
+Applying: fix up for bitmap_weight return value changing
+$ git reset HEAD^
+Unstaged changes after reset:
+M	drivers/gpu/drm/i915/gt/intel_sseu.c
+M	drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c
+$ git add -A .
+$ git commit -v -a --amend
+[master c4bf71bd2294] Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git
+ Date: Fri Jul 15 19:40:35 2022 +1000
+Merging hte/hte/for-next (85ff37e302ef gpiolib: cdev: Fix kernel doc for struct line)
+$ git merge -m Merge branch 'hte/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git hte/hte/for-next
+Auto-merging drivers/gpio/gpiolib-cdev.c
+Merge made by the 'ort' strategy.
+ drivers/gpio/gpiolib-cdev.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+Merging kspp/for-next/kspp (e1d337335207 cfi: Fix __cfi_slowpath_diag RCU usage with cpuidle)
+$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp
+Auto-merging kernel/cfi.c
+CONFLICT (content): Merge conflict in kernel/cfi.c
+Resolved 'kernel/cfi.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 3d77743a09cf] Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git
+$ git diff -M --stat --summary HEAD^..
+Merging kspp-gustavo/for-next/kspp (94dfc73e7cf4 treewide: uapi: Replace zero-length arrays with flexible-array members)
+$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp
+Auto-merging arch/x86/include/uapi/asm/bootparam.h
+Auto-merging arch/x86/include/uapi/asm/kvm.h
+Auto-merging include/uapi/drm/i915_drm.h
+Auto-merging include/uapi/linux/bpf.h
+Auto-merging include/uapi/linux/btrfs.h
+Auto-merging include/uapi/linux/fanotify.h
+Auto-merging include/uapi/linux/kvm.h
+Auto-merging include/uapi/linux/perf_event.h
+Auto-merging include/uapi/linux/vhost_types.h
+Auto-merging include/uapi/linux/xfrm.h
+Auto-merging include/uapi/sound/sof/header.h
+Auto-merging tools/arch/x86/include/uapi/asm/kvm.h
+Auto-merging tools/include/uapi/drm/i915_drm.h
+Auto-merging tools/include/uapi/linux/kvm.h
+Merge made by the 'ort' strategy.
+ arch/m68k/include/uapi/asm/bootinfo.h           |  4 +-
+ arch/mips/include/uapi/asm/ucontext.h           |  2 +-
+ arch/s390/include/uapi/asm/hwctrset.h           |  6 +--
+ arch/x86/include/uapi/asm/bootparam.h           |  2 +-
+ arch/x86/include/uapi/asm/kvm.h                 | 12 ++---
+ include/uapi/drm/i915_drm.h                     |  6 +--
+ include/uapi/linux/blkzoned.h                   |  2 +-
+ include/uapi/linux/bpf.h                        |  2 +-
+ include/uapi/linux/btrfs.h                      | 10 ++--
+ include/uapi/linux/btrfs_tree.h                 |  2 +-
+ include/uapi/linux/can/bcm.h                    |  2 +-
+ include/uapi/linux/connector.h                  |  2 +-
+ include/uapi/linux/cycx_cfm.h                   |  2 +-
+ include/uapi/linux/dm-ioctl.h                   |  8 +--
+ include/uapi/linux/dm-log-userspace.h           |  2 +-
+ include/uapi/linux/ethtool.h                    | 28 +++++-----
+ include/uapi/linux/fanotify.h                   |  2 +-
+ include/uapi/linux/fiemap.h                     |  2 +-
+ include/uapi/linux/firewire-cdev.h              | 12 ++---
+ include/uapi/linux/fs.h                         |  2 +-
+ include/uapi/linux/if_alg.h                     |  2 +-
+ include/uapi/linux/if_arcnet.h                  |  6 +--
+ include/uapi/linux/if_pppox.h                   |  4 +-
+ include/uapi/linux/if_tun.h                     |  2 +-
+ include/uapi/linux/igmp.h                       |  6 +--
+ include/uapi/linux/inet_diag.h                  |  2 +-
+ include/uapi/linux/inotify.h                    |  2 +-
+ include/uapi/linux/ip.h                         |  4 +-
+ include/uapi/linux/ip_vs.h                      |  4 +-
+ include/uapi/linux/iso_fs.h                     |  4 +-
+ include/uapi/linux/jffs2.h                      |  8 +--
+ include/uapi/linux/kcov.h                       |  2 +-
+ include/uapi/linux/kvm.h                        |  8 +--
+ include/uapi/linux/minix_fs.h                   |  4 +-
+ include/uapi/linux/mmc/ioctl.h                  |  2 +-
+ include/uapi/linux/ndctl.h                      | 10 ++--
+ include/uapi/linux/net_dropmon.h                |  4 +-
+ include/uapi/linux/netfilter/x_tables.h         |  4 +-
+ include/uapi/linux/netfilter_arp/arp_tables.h   |  6 +--
+ include/uapi/linux/netfilter_bridge/ebt_among.h |  2 +-
+ include/uapi/linux/netfilter_ipv4/ip_tables.h   |  6 +--
+ include/uapi/linux/netfilter_ipv6/ip6_tables.h  |  4 +-
+ include/uapi/linux/perf_event.h                 |  2 +-
+ include/uapi/linux/pkt_cls.h                    |  4 +-
+ include/uapi/linux/raid/md_p.h                  |  2 +-
+ include/uapi/linux/random.h                     |  2 +-
+ include/uapi/linux/romfs_fs.h                   |  4 +-
+ include/uapi/linux/rtnetlink.h                  |  2 +-
+ include/uapi/linux/sctp.h                       | 10 ++--
+ include/uapi/linux/seg6.h                       |  2 +-
+ include/uapi/linux/seg6_iptunnel.h              |  2 +-
+ include/uapi/linux/stm.h                        |  2 +-
+ include/uapi/linux/target_core_user.h           |  2 +-
+ include/uapi/linux/usb/audio.h                  |  2 +-
+ include/uapi/linux/usb/cdc.h                    |  6 +--
+ include/uapi/linux/usb/ch9.h                    |  2 +-
+ include/uapi/linux/usb/raw_gadget.h             |  4 +-
+ include/uapi/linux/usbdevice_fs.h               |  4 +-
+ include/uapi/linux/vhost_types.h                |  4 +-
+ include/uapi/linux/virtio_9p.h                  |  2 +-
+ include/uapi/linux/xfrm.h                       |  4 +-
+ include/uapi/rdma/hfi/hfi1_user.h               |  2 +-
+ include/uapi/rdma/ib_user_verbs.h               | 72 ++++++++++++-------------
+ include/uapi/rdma/rdma_user_cm.h                |  2 +-
+ include/uapi/rdma/rdma_user_ioctl_cmds.h        |  2 +-
+ include/uapi/scsi/fc/fc_els.h                   | 18 +++----
+ include/uapi/scsi/scsi_bsg_fc.h                 |  2 +-
+ include/uapi/sound/asound.h                     |  2 +-
+ include/uapi/sound/firewire.h                   |  6 +--
+ include/uapi/sound/skl-tplg-interface.h         |  2 +-
+ include/uapi/sound/sof/header.h                 |  2 +-
+ include/uapi/sound/usb_stream.h                 |  2 +-
+ tools/arch/x86/include/uapi/asm/kvm.h           | 12 ++---
+ tools/include/uapi/drm/i915_drm.h               |  6 +--
+ tools/include/uapi/linux/fs.h                   |  2 +-
+ tools/include/uapi/linux/if_tun.h               |  2 +-
+ tools/include/uapi/linux/kvm.h                  |  8 +--
+ tools/include/uapi/linux/perf_event.h           |  2 +-
+ tools/include/uapi/linux/pkt_cls.h              |  4 +-
+ tools/include/uapi/linux/seg6.h                 |  4 +-
+ tools/include/uapi/linux/usbdevice_fs.h         |  4 +-
+ tools/include/uapi/sound/asound.h               |  2 +-
+ 82 files changed, 213 insertions(+), 213 deletions(-)
+Merging mm-stable/mm-stable (4f2930c6718a selftests/vm: only run 128TBswitch with 5-level paging)
+$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging Documentation/core-api/index.rst
+Auto-merging Documentation/index.rst
+Auto-merging Documentation/translations/zh_CN/core-api/index.rst
+Auto-merging Documentation/translations/zh_CN/mm/free_page_reporting.rst
+CONFLICT (content): Merge conflict in Documentation/translations/zh_CN/mm/free_page_reporting.rst
+Auto-merging Documentation/translations/zh_CN/mm/frontswap.rst
+CONFLICT (content): Merge conflict in Documentation/translations/zh_CN/mm/frontswap.rst
+Auto-merging Documentation/translations/zh_CN/mm/highmem.rst
+Auto-merging Documentation/translations/zh_CN/mm/index.rst
+Auto-merging Documentation/translations/zh_CN/mm/page_frags.rst
+CONFLICT (content): Merge conflict in Documentation/translations/zh_CN/mm/page_frags.rst
+CONFLICT (file location): Documentation/translations/zh_CN/vm/page_migration.rst added in HEAD inside a directory that was renamed in mm-stable/mm-stable, suggesting it should perhaps be moved to Documentation/translations/zh_CN/mm/page_migration.rst.
+Auto-merging Documentation/translations/zh_CN/mm/page_owner.rst
+CONFLICT (file location): Documentation/translations/zh_CN/vm/vmalloced-kernel-stacks.rst added in HEAD inside a directory that was renamed in mm-stable/mm-stable, suggesting it should perhaps be moved to Documentation/translations/zh_CN/mm/vmalloced-kernel-stacks.rst.
+Auto-merging Documentation/translations/zh_CN/mm/zsmalloc.rst
+CONFLICT (content): Merge conflict in Documentation/translations/zh_CN/mm/zsmalloc.rst
+Auto-merging MAINTAINERS
+Auto-merging arch/arm64/mm/fault.c
+Auto-merging arch/arm64/mm/hugetlbpage.c
+Auto-merging arch/loongarch/Kconfig
+Auto-merging arch/s390/mm/fault.c
+Auto-merging arch/x86/kvm/mmu/mmu.c
+Auto-merging arch/x86/mm/fault.c
+Auto-merging drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
+Auto-merging drivers/gpu/drm/msm/msm_gem_shrinker.c
+Auto-merging drivers/md/dm-bufio.c
+Auto-merging drivers/md/dm-zoned-metadata.c
+Auto-merging drivers/md/raid5.c
+Auto-merging drivers/misc/vmw_balloon.c
+Auto-merging drivers/of/fdt.c
+Auto-merging drivers/virtio/virtio_balloon.c
+Auto-merging fs/btrfs/super.c
+Auto-merging fs/f2fs/super.c
+Auto-merging fs/gfs2/glock.c
+Auto-merging fs/jbd2/journal.c
+Auto-merging fs/nfsd/filecache.c
+Auto-merging fs/quota/dquot.c
+Auto-merging fs/xfs/xfs_buf.c
+Auto-merging fs/xfs/xfs_icache.c
+Auto-merging fs/xfs/xfs_qm.c
+Auto-merging include/linux/highmem.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/page-flags.h
+Auto-merging include/linux/pagemap.h
+Auto-merging include/linux/pagevec.h
+CONFLICT (content): Merge conflict in include/linux/pagevec.h
+Auto-merging include/linux/swap.h
+Auto-merging kernel/rcu/tree.c
+Auto-merging lib/Kconfig.debug
+Auto-merging mm/Kconfig
+Auto-merging mm/compaction.c
+Auto-merging mm/gup.c
+Auto-merging mm/huge_memory.c
+Auto-merging mm/hugetlb.c
+Auto-merging mm/ksm.c
+Auto-merging mm/memblock.c
+Auto-merging mm/memory-failure.c
+Auto-merging mm/memory.c
+Auto-merging mm/memremap.c
+Auto-merging mm/migrate.c
+Auto-merging mm/page_alloc.c
+Auto-merging mm/rmap.c
+Auto-merging mm/shmem.c
+Auto-merging mm/slab.c
+Auto-merging mm/sparse-vmemmap.c
+Auto-merging mm/swap.c
+Auto-merging mm/swap_state.c
+Auto-merging mm/util.c
+Auto-merging mm/vmscan.c
+Auto-merging mm/zsmalloc.c
+Auto-merging net/core/page_pool.c
+Auto-merging tools/testing/selftests/vm/Makefile
+Auto-merging tools/testing/selftests/vm/userfaultfd.c
+Auto-merging tools/vm/slabinfo.c
+Resolved 'Documentation/translations/zh_CN/mm/free_page_reporting.rst' using previous resolution.
+Resolved 'Documentation/translations/zh_CN/mm/frontswap.rst' using previous resolution.
+Resolved 'Documentation/translations/zh_CN/mm/page_frags.rst' using previous resolution.
+Resolved 'Documentation/translations/zh_CN/mm/zsmalloc.rst' using previous resolution.
+Resolved 'include/linux/pagevec.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 4c95c380782d] Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/procfs-smaps_rollup      |   1 +
+ Documentation/ABI/testing/sysfs-kernel-mm-ksm      |   2 +-
+ Documentation/ABI/testing/sysfs-kernel-slab        |   4 +-
+ Documentation/admin-guide/cgroup-v2.rst            |  24 +-
+ Documentation/admin-guide/kernel-parameters.txt    |  32 +-
+ Documentation/admin-guide/mm/concepts.rst          |   2 +-
+ Documentation/admin-guide/mm/damon/index.rst       |   3 +-
+ Documentation/admin-guide/mm/damon/lru_sort.rst    | 294 ++++++++++
+ Documentation/admin-guide/mm/damon/reclaim.rst     |   8 +-
+ Documentation/admin-guide/mm/damon/usage.rst       |  10 +-
+ Documentation/admin-guide/mm/index.rst             |   1 +
+ Documentation/admin-guide/mm/shrinker_debugfs.rst  | 135 +++++
+ Documentation/admin-guide/sysctl/vm.rst            |   7 +-
+ Documentation/core-api/index.rst                   |   2 +-
+ Documentation/dev-tools/kmemleak.rst               |   1 -
+ Documentation/filesystems/proc.rst                 |   7 +-
+ Documentation/index.rst                            |   2 +-
+ Documentation/{vm => mm}/active_mm.rst             |   0
+ Documentation/{vm => mm}/arch_pgtable_helpers.rst  |   0
+ Documentation/{vm => mm}/balance.rst               |   0
+ Documentation/{vm => mm}/bootmem.rst               |   0
+ Documentation/{vm => mm}/damon/api.rst             |   0
+ Documentation/{vm => mm}/damon/design.rst          |   0
+ Documentation/{vm => mm}/damon/faq.rst             |   0
+ Documentation/{vm => mm}/damon/index.rst           |   0
+ Documentation/{vm => mm}/free_page_reporting.rst   |   0
+ Documentation/{vm => mm}/frontswap.rst             |   0
+ Documentation/{vm => mm}/highmem.rst               |   0
+ Documentation/{vm => mm}/hmm.rst                   |   0
+ Documentation/{vm => mm}/hugetlbfs_reserv.rst      |   0
+ Documentation/{vm => mm}/hwpoison.rst              |   0
+ Documentation/{vm => mm}/index.rst                 |   0
+ Documentation/{vm => mm}/ksm.rst                   |   0
+ Documentation/{vm => mm}/memory-model.rst          |   2 +-
+ Documentation/{vm => mm}/mmu_notifier.rst          |   0
+ Documentation/{vm => mm}/numa.rst                  |   0
+ Documentation/{vm => mm}/oom.rst                   |   0
+ Documentation/{vm => mm}/overcommit-accounting.rst |   0
+ Documentation/{vm => mm}/page_allocation.rst       |   0
+ Documentation/{vm => mm}/page_cache.rst            |   0
+ Documentation/{vm => mm}/page_frags.rst            |   0
+ Documentation/{vm => mm}/page_migration.rst        |   0
+ Documentation/{vm => mm}/page_owner.rst            |   0
+ Documentation/{vm => mm}/page_reclaim.rst          |   0
+ Documentation/{vm => mm}/page_table_check.rst      |   0
+ Documentation/{vm => mm}/page_tables.rst           |   0
+ Documentation/{vm => mm}/physical_memory.rst       |   0
+ Documentation/{vm => mm}/process_addrs.rst         |   0
+ Documentation/{vm => mm}/remap_file_pages.rst      |   0
+ Documentation/{vm => mm}/shmfs.rst                 |   0
+ Documentation/{vm => mm}/slab.rst                  |   0
+ Documentation/{vm => mm}/slub.rst                  |   0
+ Documentation/{vm => mm}/split_page_table_lock.rst |   0
+ Documentation/{vm => mm}/swap.rst                  |   0
+ Documentation/{vm => mm}/transhuge.rst             |   0
+ Documentation/{vm => mm}/unevictable-lru.rst       |   0
+ Documentation/{vm => mm}/vmalloc.rst               |   0
+ .../{vm => mm}/vmalloced-kernel-stacks.rst         |   0
+ Documentation/{vm => mm}/vmemmap_dedup.rst         |   0
+ Documentation/{vm => mm}/z3fold.rst                |   0
+ Documentation/{vm => mm}/zsmalloc.rst              |   0
+ .../zh_CN/admin-guide/mm/damon/index.rst           |   2 +-
+ .../zh_CN/admin-guide/mm/damon/reclaim.rst         |   2 +-
+ .../zh_CN/admin-guide/mm/damon/usage.rst           |   8 +-
+ .../translations/zh_CN/core-api/index.rst          |   2 +-
+ Documentation/translations/zh_CN/index.rst         |   2 +-
+ .../translations/zh_CN/{vm => mm}/active_mm.rst    |   2 +-
+ .../translations/zh_CN/{vm => mm}/balance.rst      |   2 +-
+ .../translations/zh_CN/{vm => mm}/damon/api.rst    |   2 +-
+ .../translations/zh_CN/{vm => mm}/damon/design.rst |   2 +-
+ .../translations/zh_CN/{vm => mm}/damon/faq.rst    |   2 +-
+ .../translations/zh_CN/{vm => mm}/damon/index.rst  |   5 +-
+ .../zh_CN/{vm => mm}/free_page_reporting.rst       |   2 +-
+ .../translations/zh_CN/{vm => mm}/frontswap.rst    |   2 +-
+ .../translations/zh_CN/{vm => mm}/highmem.rst      |   2 +-
+ .../translations/zh_CN/{vm => mm}/hmm.rst          |   2 +-
+ .../zh_CN/{vm => mm}/hugetlbfs_reserv.rst          |   2 +-
+ .../translations/zh_CN/{vm => mm}/hwpoison.rst     |   2 +-
+ .../translations/zh_CN/{vm => mm}/index.rst        |   2 +-
+ .../translations/zh_CN/{vm => mm}/ksm.rst          |   2 +-
+ .../translations/zh_CN/{vm => mm}/memory-model.rst |   4 +-
+ .../translations/zh_CN/{vm => mm}/mmu_notifier.rst |   2 +-
+ .../translations/zh_CN/{vm => mm}/numa.rst         |   2 +-
+ .../zh_CN/{vm => mm}/overcommit-accounting.rst     |   2 +-
+ .../translations/zh_CN/{vm => mm}/page_frags.rst   |   2 +-
+ .../zh_CN/{vm => mm}/page_migration.rst            |   0
+ .../translations/zh_CN/{vm => mm}/page_owner.rst   |   2 +-
+ .../zh_CN/{vm => mm}/page_table_check.rst          |   2 +-
+ .../zh_CN/{vm => mm}/remap_file_pages.rst          |   2 +-
+ .../zh_CN/{vm => mm}/split_page_table_lock.rst     |   2 +-
+ .../zh_CN/{vm => mm}/vmalloced-kernel-stacks.rst   |   0
+ .../translations/zh_CN/{vm => mm}/z3fold.rst       |   2 +-
+ .../translations/zh_CN/{vm => mm}/zsmalloc.rst     |   2 +-
+ Documentation/translations/zh_TW/index.rst         |   2 +-
+ Documentation/vm/.gitignore                        |   3 -
+ MAINTAINERS                                        |  12 +-
+ arch/alpha/mm/fault.c                              |   4 +
+ arch/arc/mm/fault.c                                |   4 +
+ arch/arm/mm/fault.c                                |   4 +
+ arch/arm64/include/asm/hugetlb.h                   |   3 -
+ arch/arm64/mm/fault.c                              |   4 +
+ arch/arm64/mm/hugetlbpage.c                        |  34 +-
+ arch/csky/mm/fault.c                               |   4 +
+ arch/hexagon/mm/vm_fault.c                         |   4 +
+ arch/ia64/mm/fault.c                               |   4 +
+ arch/loongarch/Kconfig                             |   2 +-
+ arch/m68k/mm/fault.c                               |   4 +
+ arch/microblaze/mm/fault.c                         |   4 +
+ arch/mips/mm/fault.c                               |   4 +
+ arch/nios2/mm/fault.c                              |   4 +
+ arch/openrisc/mm/fault.c                           |   4 +
+ arch/parisc/mm/fault.c                             |   4 +
+ arch/powerpc/include/asm/book3s/64/pgtable.h       |   2 +-
+ arch/powerpc/mm/copro_fault.c                      |   5 +
+ arch/powerpc/mm/fault.c                            |   5 +
+ arch/riscv/mm/fault.c                              |   4 +
+ arch/s390/mm/fault.c                               |  12 +
+ arch/sh/mm/fault.c                                 |   4 +
+ arch/sparc/mm/fault_32.c                           |   4 +
+ arch/sparc/mm/fault_64.c                           |   5 +
+ arch/um/kernel/trap.c                              |   4 +
+ arch/x86/kvm/mmu/mmu.c                             |   2 +-
+ arch/x86/mm/fault.c                                |   4 +
+ arch/x86/mm/hugetlbpage.c                          |  39 --
+ arch/xtensa/mm/fault.c                             |   4 +
+ drivers/android/binder_alloc.c                     |   2 +-
+ drivers/block/zram/zcomp.c                         |  11 +-
+ drivers/gpu/drm/i915/gem/i915_gem_shrinker.c       |   3 +-
+ drivers/gpu/drm/msm/msm_gem_shrinker.c             |   2 +-
+ drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c   |   2 +-
+ drivers/gpu/drm/ttm/ttm_pool.c                     |   2 +-
+ drivers/md/bcache/btree.c                          |   2 +-
+ drivers/md/dm-bufio.c                              |   3 +-
+ drivers/md/dm-zoned-metadata.c                     |   4 +-
+ drivers/md/raid5.c                                 |   2 +-
+ drivers/misc/vmw_balloon.c                         |   2 +-
+ drivers/of/fdt.c                                   |   2 +-
+ drivers/virtio/virtio_balloon.c                    |   2 +-
+ drivers/xen/xenbus/xenbus_probe_backend.c          |   2 +-
+ fs/btrfs/super.c                                   |   2 +
+ fs/erofs/utils.c                                   |   2 +-
+ fs/ext4/extents_status.c                           |   3 +-
+ fs/f2fs/super.c                                    |   2 +-
+ fs/gfs2/glock.c                                    |   2 +-
+ fs/gfs2/main.c                                     |   2 +-
+ fs/jbd2/journal.c                                  |   3 +-
+ fs/mbcache.c                                       |   2 +-
+ fs/nfs/nfs42xattr.c                                |   7 +-
+ fs/nfs/super.c                                     |   2 +-
+ fs/nfsd/filecache.c                                |   2 +-
+ fs/nfsd/nfscache.c                                 |   3 +-
+ fs/proc/task_mmu.c                                 |   3 +
+ fs/quota/dquot.c                                   |   2 +-
+ fs/super.c                                         |   6 +-
+ fs/ubifs/super.c                                   |   2 +-
+ fs/xfs/xfs_buf.c                                   |   3 +-
+ fs/xfs/xfs_icache.c                                |   2 +-
+ fs/xfs/xfs_qm.c                                    |   3 +-
+ include/linux/damon.h                              |  25 +-
+ include/linux/highmem.h                            |  23 +-
+ include/linux/hmm.h                                |   4 +-
+ include/linux/huge_mm.h                            |   8 +-
+ include/linux/hugetlb.h                            |  19 +-
+ include/linux/kmemleak.h                           |   8 +-
+ include/linux/memcontrol.h                         |  74 ++-
+ include/linux/memory_hotplug.h                     |   9 -
+ include/linux/memremap.h                           |   2 +-
+ include/linux/mm.h                                 |  39 +-
+ include/linux/mm_types.h                           |   2 +
+ include/linux/mmu_notifier.h                       |   2 +-
+ include/linux/mmzone.h                             |  47 +-
+ include/linux/page-flags.h                         |  17 +
+ include/linux/pagemap.h                            |   2 -
+ include/linux/pagevec.h                            |   1 -
+ include/linux/rmap.h                               |   4 +-
+ include/linux/sched/mm.h                           |   4 +-
+ include/linux/shrinker.h                           |  33 +-
+ include/linux/swap.h                               |   7 +-
+ include/linux/swapops.h                            |  12 +-
+ kernel/rcu/tree.c                                  |   2 +-
+ lib/Kconfig.debug                                  |   9 +
+ lib/test_hmm.c                                     |  10 +-
+ lib/test_vmalloc.c                                 |  15 +-
+ mm/Kconfig                                         |   2 +-
+ mm/Makefile                                        |   1 +
+ mm/compaction.c                                    |   2 +-
+ mm/damon/Kconfig                                   |   8 +
+ mm/damon/Makefile                                  |   1 +
+ mm/damon/dbgfs.c                                   |  79 ++-
+ mm/damon/lru_sort.c                                | 546 +++++++++++++++++++
+ mm/damon/ops-common.c                              |  42 ++
+ mm/damon/ops-common.h                              |   2 +
+ mm/damon/paddr.c                                   |  60 ++-
+ mm/damon/reclaim.c                                 |  40 +-
+ mm/damon/sysfs.c                                   |  69 +--
+ mm/debug_vm_pgtable.c                              |   2 +-
+ mm/frontswap.c                                     |   2 +-
+ mm/gup.c                                           |  36 +-
+ mm/huge_memory.c                                   |   6 +-
+ mm/hugetlb.c                                       |  49 +-
+ mm/hugetlb_vmemmap.c                               |  68 ++-
+ mm/kasan/hw_tags.c                                 |  32 +-
+ mm/khugepaged.c                                    | 137 +++--
+ mm/kmemleak.c                                      | 260 ++++++---
+ mm/ksm.c                                           |   4 +-
+ mm/list_lru.c                                      |   2 +-
+ mm/madvise.c                                       |  10 +-
+ mm/memblock.c                                      |  14 +-
+ mm/memcontrol.c                                    | 149 +++--
+ mm/memory-failure.c                                |   7 +-
+ mm/memory.c                                        |   2 +-
+ mm/memory_hotplug.c                                |  55 +-
+ mm/mempolicy.c                                     |   4 +-
+ mm/mempool.c                                       |   2 +-
+ mm/memremap.c                                      |   6 +-
+ mm/migrate.c                                       |  39 +-
+ mm/mmap.c                                          |   2 +-
+ mm/mprotect.c                                      |  77 ++-
+ mm/page_alloc.c                                    |  33 +-
+ mm/page_vma_mapped.c                               |   2 +-
+ mm/rmap.c                                          | 109 ++--
+ mm/shmem.c                                         |  14 +-
+ mm/shrinker_debug.c                                | 285 ++++++++++
+ mm/slab.c                                          |  10 -
+ mm/sparse-vmemmap.c                                |  10 +-
+ mm/sparse.c                                        |   2 +-
+ mm/swap.c                                          | 599 ++++++++++-----------
+ mm/swap.h                                          |  19 +-
+ mm/swap_state.c                                    |  56 +-
+ mm/swapfile.c                                      |  31 +-
+ mm/util.c                                          |   2 +-
+ mm/vmalloc.c                                       | 148 ++---
+ mm/vmscan.c                                        | 300 ++++++-----
+ mm/workingset.c                                    |   2 +-
+ mm/zsmalloc.c                                      |   3 +-
+ net/core/net_namespace.c                           |   7 +
+ net/core/page_pool.c                               |   2 +-
+ net/sunrpc/auth.c                                  |   2 +-
+ tools/cgroup/memcg_shrinker.py                     |  71 +++
+ tools/testing/memblock/linux/kmemleak.h            |   2 +-
+ tools/testing/selftests/vm/Makefile                |   1 +
+ tools/testing/selftests/vm/run_vmtests.sh          |   2 +-
+ tools/testing/selftests/vm/userfaultfd.c           |   4 +-
+ tools/testing/selftests/vm/va_128TBswitch.sh       |  54 ++
+ tools/vm/page_owner_sort.c                         |   2 +-
+ tools/vm/slabinfo.c                                |  32 +-
+ 246 files changed, 3490 insertions(+), 1413 deletions(-)
+ create mode 100644 Documentation/admin-guide/mm/damon/lru_sort.rst
+ create mode 100644 Documentation/admin-guide/mm/shrinker_debugfs.rst
+ rename Documentation/{vm => mm}/active_mm.rst (100%)
+ rename Documentation/{vm => mm}/arch_pgtable_helpers.rst (100%)
+ rename Documentation/{vm => mm}/balance.rst (100%)
+ rename Documentation/{vm => mm}/bootmem.rst (100%)
+ rename Documentation/{vm => mm}/damon/api.rst (100%)
+ rename Documentation/{vm => mm}/damon/design.rst (100%)
+ rename Documentation/{vm => mm}/damon/faq.rst (100%)
+ rename Documentation/{vm => mm}/damon/index.rst (100%)
+ rename Documentation/{vm => mm}/free_page_reporting.rst (100%)
+ rename Documentation/{vm => mm}/frontswap.rst (100%)
+ rename Documentation/{vm => mm}/highmem.rst (100%)
+ rename Documentation/{vm => mm}/hmm.rst (100%)
+ rename Documentation/{vm => mm}/hugetlbfs_reserv.rst (100%)
+ rename Documentation/{vm => mm}/hwpoison.rst (100%)
+ rename Documentation/{vm => mm}/index.rst (100%)
+ rename Documentation/{vm => mm}/ksm.rst (100%)
+ rename Documentation/{vm => mm}/memory-model.rst (99%)
+ rename Documentation/{vm => mm}/mmu_notifier.rst (100%)
+ rename Documentation/{vm => mm}/numa.rst (100%)
+ rename Documentation/{vm => mm}/oom.rst (100%)
+ rename Documentation/{vm => mm}/overcommit-accounting.rst (100%)
+ rename Documentation/{vm => mm}/page_allocation.rst (100%)
+ rename Documentation/{vm => mm}/page_cache.rst (100%)
+ rename Documentation/{vm => mm}/page_frags.rst (100%)
+ rename Documentation/{vm => mm}/page_migration.rst (100%)
+ rename Documentation/{vm => mm}/page_owner.rst (100%)
+ rename Documentation/{vm => mm}/page_reclaim.rst (100%)
+ rename Documentation/{vm => mm}/page_table_check.rst (100%)
+ rename Documentation/{vm => mm}/page_tables.rst (100%)
+ rename Documentation/{vm => mm}/physical_memory.rst (100%)
+ rename Documentation/{vm => mm}/process_addrs.rst (100%)
+ rename Documentation/{vm => mm}/remap_file_pages.rst (100%)
+ rename Documentation/{vm => mm}/shmfs.rst (100%)
+ rename Documentation/{vm => mm}/slab.rst (100%)
+ rename Documentation/{vm => mm}/slub.rst (100%)
+ rename Documentation/{vm => mm}/split_page_table_lock.rst (100%)
+ rename Documentation/{vm => mm}/swap.rst (100%)
+ rename Documentation/{vm => mm}/transhuge.rst (100%)
+ rename Documentation/{vm => mm}/unevictable-lru.rst (100%)
+ rename Documentation/{vm => mm}/vmalloc.rst (100%)
+ rename Documentation/{vm => mm}/vmalloced-kernel-stacks.rst (100%)
+ rename Documentation/{vm => mm}/vmemmap_dedup.rst (100%)
+ rename Documentation/{vm => mm}/z3fold.rst (100%)
+ rename Documentation/{vm => mm}/zsmalloc.rst (100%)
+ rename Documentation/translations/zh_CN/{vm => mm}/active_mm.rst (98%)
+ rename Documentation/translations/zh_CN/{vm => mm}/balance.rst (99%)
+ rename Documentation/translations/zh_CN/{vm => mm}/damon/api.rst (91%)
+ rename Documentation/translations/zh_CN/{vm => mm}/damon/design.rst (98%)
+ rename Documentation/translations/zh_CN/{vm => mm}/damon/faq.rst (98%)
+ rename Documentation/translations/zh_CN/{vm => mm}/damon/index.rst (90%)
+ rename Documentation/translations/zh_CN/{vm => mm}/free_page_reporting.rst (97%)
+ rename Documentation/translations/zh_CN/{vm => mm}/frontswap.rst (99%)
+ rename Documentation/translations/zh_CN/{vm => mm}/highmem.rst (99%)
+ rename Documentation/translations/zh_CN/{vm => mm}/hmm.rst (99%)
+ rename Documentation/translations/zh_CN/{vm => mm}/hugetlbfs_reserv.rst (99%)
+ rename Documentation/translations/zh_CN/{vm => mm}/hwpoison.rst (99%)
+ rename Documentation/translations/zh_CN/{vm => mm}/index.rst (97%)
+ rename Documentation/translations/zh_CN/{vm => mm}/ksm.rst (98%)
+ rename Documentation/translations/zh_CN/{vm => mm}/memory-model.rst (98%)
+ rename Documentation/translations/zh_CN/{vm => mm}/mmu_notifier.rst (98%)
+ rename Documentation/translations/zh_CN/{vm => mm}/numa.rst (99%)
+ rename Documentation/translations/zh_CN/{vm => mm}/overcommit-accounting.rst (98%)
+ rename Documentation/translations/zh_CN/{vm => mm}/page_frags.rst (97%)
+ rename Documentation/translations/zh_CN/{vm => mm}/page_migration.rst (100%)
+ rename Documentation/translations/zh_CN/{vm => mm}/page_owner.rst (99%)
+ rename Documentation/translations/zh_CN/{vm => mm}/page_table_check.rst (97%)
+ rename Documentation/translations/zh_CN/{vm => mm}/remap_file_pages.rst (97%)
+ rename Documentation/translations/zh_CN/{vm => mm}/split_page_table_lock.rst (98%)
+ rename Documentation/translations/zh_CN/{vm => mm}/vmalloced-kernel-stacks.rst (100%)
+ rename Documentation/translations/zh_CN/{vm => mm}/z3fold.rst (96%)
+ rename Documentation/translations/zh_CN/{vm => mm}/zsmalloc.rst (98%)
+ delete mode 100644 Documentation/vm/.gitignore
+ create mode 100644 mm/damon/lru_sort.c
+ create mode 100644 mm/shrinker_debug.c
+ create mode 100644 tools/cgroup/memcg_shrinker.py
+ create mode 100644 tools/testing/selftests/vm/va_128TBswitch.sh
+Merging mm-nonmm-stable/mm-nonmm-stable (ee56c3e8eec1 Merge branch 'master' into mm-nonmm-stable)
+$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable
+Auto-merging MAINTAINERS
+Auto-merging kernel/kexec_file.c
+Auto-merging scripts/checkpatch.pl
+Auto-merging tools/testing/selftests/Makefile
+Merge made by the 'ort' strategy.
+ MAINTAINERS                                        |   1 +
+ arch/ia64/include/uapi/asm/cmpxchg.h               |  28 +--
+ fs/fat/namei_vfat.c                                | 231 +++++++++++++++++----
+ fs/kernel_read_file.c                              |  38 ++--
+ fs/ocfs2/dlmfs/dlmfs.c                             |  14 +-
+ fs/squashfs/block.c                                |  10 +-
+ fs/squashfs/decompressor.h                         |   1 +
+ fs/squashfs/file_direct.c                          |  90 ++------
+ fs/squashfs/lz4_wrapper.c                          |   7 +-
+ fs/squashfs/lzo_wrapper.c                          |   7 +-
+ fs/squashfs/page_actor.c                           |  55 ++++-
+ fs/squashfs/page_actor.h                           |  21 +-
+ fs/squashfs/xz_wrapper.c                           |  11 +-
+ fs/squashfs/zlib_wrapper.c                         |  12 +-
+ fs/squashfs/zstd_wrapper.c                         |  12 +-
+ include/linux/kernel_read_file.h                   |  32 +--
+ include/linux/limits.h                             |   1 +
+ include/linux/rbtree.h                             |   2 +-
+ include/uapi/linux/swab.h                          |   6 +-
+ kernel/kexec_file.c                                |  10 +-
+ kernel/profile.c                                   |   7 +
+ lib/btree.c                                        |  30 ++-
+ lib/error-inject.c                                 |  16 +-
+ lib/flex_proportions.c                             |  10 +-
+ lib/list_debug.c                                   |  12 +-
+ scripts/checkpatch.pl                              |   5 +-
+ tools/accounting/getdelays.c                       |   4 -
+ tools/testing/selftests/Makefile                   |   1 +
+ tools/testing/selftests/filesystems/fat/.gitignore |   2 +
+ tools/testing/selftests/filesystems/fat/Makefile   |   7 +
+ tools/testing/selftests/filesystems/fat/config     |   2 +
+ .../selftests/filesystems/fat/rename_exchange.c    |  37 ++++
+ .../selftests/filesystems/fat/run_fat_tests.sh     |  82 ++++++++
+ 33 files changed, 569 insertions(+), 235 deletions(-)
+ create mode 100644 tools/testing/selftests/filesystems/fat/.gitignore
+ create mode 100644 tools/testing/selftests/filesystems/fat/Makefile
+ create mode 100644 tools/testing/selftests/filesystems/fat/config
+ create mode 100644 tools/testing/selftests/filesystems/fat/rename_exchange.c
+ create mode 100644 tools/testing/selftests/filesystems/fat/run_fat_tests.sh
+Merging mm/mm-everything (1c4730066710 Merge branch 'mm-nonmm-unstable' into mm-everything)
+$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging Documentation/core-api/index.rst
+Auto-merging MAINTAINERS
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/mm/mmu.c
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm64/mm/hugetlbpage.c
+Auto-merging arch/loongarch/kernel/asm-offsets.c
+Auto-merging arch/mips/include/asm/pgtable-32.h
+Auto-merging arch/mips/include/asm/pgtable-64.h
+Auto-merging arch/mips/mm/tlbex.c
+Auto-merging arch/parisc/kernel/cache.c
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/riscv/include/asm/pgtable.h
+Auto-merging arch/s390/include/asm/pgtable.h
+Auto-merging arch/s390/mm/gmap.c
+Auto-merging arch/sparc/Kconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/x86/mm/mem_encrypt_amd.c
+Auto-merging drivers/block/zram/zram_drv.c
+Auto-merging drivers/dma-buf/dma-buf.c
+Auto-merging drivers/firmware/efi/efi.c
+Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
+Auto-merging drivers/gpu/drm/i915/gem/i915_gem_userptr.c
+Auto-merging drivers/iommu/tegra-smmu.c
+Auto-merging drivers/md/dm.c
+Auto-merging drivers/nvdimm/pmem.c
+Auto-merging drivers/nvme/target/io-cmd-bdev.c
+Auto-merging fs/coredump.c
+Auto-merging fs/dax.c
+Auto-merging fs/exec.c
+Auto-merging fs/ext2/super.c
+Auto-merging fs/ext4/super.c
+Auto-merging fs/ocfs2/refcounttree.c
+Auto-merging fs/proc/array.c
+Auto-merging fs/remap_range.c
+Auto-merging fs/squashfs/file.c
+Auto-merging fs/xfs/Makefile
+Auto-merging fs/xfs/xfs_buf.c
+Auto-merging fs/xfs/xfs_file.c
+Auto-merging fs/xfs/xfs_fsops.c
+Auto-merging fs/xfs/xfs_inode.c
+Auto-merging fs/xfs/xfs_inode.h
+Auto-merging fs/xfs/xfs_iomap.c
+Auto-merging fs/xfs/xfs_mount.h
+Auto-merging fs/xfs/xfs_reflink.c
+Auto-merging include/linux/cpumask.h
+CONFLICT (content): Merge conflict in include/linux/cpumask.h
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/gfp.h
+CONFLICT (content): Merge conflict in include/linux/gfp.h
+Auto-merging include/linux/highmem.h
+Auto-merging include/linux/kexec.h
+CONFLICT (content): Merge conflict in include/linux/kexec.h
+Auto-merging include/linux/migrate.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/net.h
+Auto-merging include/linux/page-flags.h
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/sysctl.h
+Auto-merging kernel/events/core.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/kallsyms.c
+Auto-merging kernel/kexec_file.c
+CONFLICT (content): Merge conflict in kernel/kexec_file.c
+Auto-merging kernel/sched/fair.c
+Auto-merging lib/Kconfig
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/Makefile
+Auto-merging lib/cpumask.c
+Auto-merging lib/test_printf.c
+Auto-merging mm/Kconfig
+Auto-merging mm/compaction.c
+Auto-merging mm/filemap.c
+Auto-merging mm/gup.c
+Auto-merging mm/highmem.c
+Auto-merging mm/huge_memory.c
+Auto-merging mm/hugetlb.c
+Auto-merging mm/hugetlb.c
+Auto-merging mm/internal.h
+Auto-merging mm/kasan/common.c
+Auto-merging mm/ksm.c
+Auto-merging mm/memory-failure.c
+Auto-merging mm/memory.c
+Auto-merging mm/memremap.c
+Auto-merging mm/migrate.c
+Auto-merging mm/migrate_device.c
+Auto-merging mm/page_alloc.c
+Auto-merging mm/rmap.c
+Auto-merging mm/shmem.c
+Auto-merging mm/sparse-vmemmap.c
+Auto-merging mm/sparse-vmemmap.c
+Auto-merging mm/util.c
+Resolved 'include/linux/cpumask.h' using previous resolution.
+Recorded preimage for 'include/linux/gfp.h'
+Recorded preimage for 'include/linux/kexec.h'
+Recorded preimage for 'kernel/kexec_file.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'include/linux/gfp.h'.
+Recorded resolution for 'include/linux/kexec.h'.
+Recorded resolution for 'kernel/kexec_file.c'.
+[master 3f85ee781ddc] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/kernel-parameters.txt    |    20 +-
+ Documentation/admin-guide/mm/hugetlbpage.rst       |     4 +-
+ Documentation/admin-guide/mm/memory-hotplug.rst    |     4 +-
+ Documentation/admin-guide/mm/userfaultfd.rst       |    40 +-
+ Documentation/admin-guide/sysctl/vm.rst            |     6 +-
+ Documentation/core-api/index.rst                   |     1 +
+ Documentation/core-api/maple_tree.rst              |   217 +
+ Documentation/filesystems/proc.rst                 |    32 +-
+ Documentation/mm/balance.rst                       |     2 +-
+ Documentation/mm/vmemmap_dedup.rst                 |    72 +-
+ MAINTAINERS                                        |    12 +
+ arch/alpha/include/asm/pgtable.h                   |    17 -
+ arch/alpha/include/uapi/asm/mman.h                 |     2 +
+ arch/alpha/mm/init.c                               |    22 +
+ arch/arc/include/asm/pgtable-bits-arcv2.h          |    18 -
+ arch/arc/mm/mmap.c                                 |    20 +
+ arch/arm/include/asm/pgtable.h                     |    17 -
+ arch/arm/kernel/head.S                             |    34 +-
+ arch/arm/lib/uaccess_with_memcpy.c                 |     2 +-
+ arch/arm/mm/mmu.c                                  |    20 +
+ arch/arm64/Kconfig                                 |     1 -
+ arch/arm64/include/asm/pgtable-prot.h              |    18 -
+ arch/arm64/kernel/elfcore.c                        |    16 +-
+ arch/arm64/kernel/vdso.c                           |     3 +-
+ arch/arm64/mm/flush.c                              |    13 +-
+ arch/arm64/mm/hugetlbpage.c                        |    22 +
+ arch/arm64/mm/mmap.c                               |    21 +
+ arch/csky/include/asm/pgalloc.h                    |     2 +-
+ arch/csky/include/asm/pgtable.h                    |    24 +-
+ arch/csky/mm/init.c                                |    20 +
+ arch/hexagon/include/asm/pgtable.h                 |    27 -
+ arch/hexagon/mm/init.c                             |    42 +
+ arch/ia64/include/asm/mmu_context.h                |     5 +-
+ arch/ia64/include/asm/pgtable.h                    |    18 -
+ arch/ia64/mm/init.c                                |    28 +-
+ arch/loongarch/include/asm/pgalloc.h               |     6 +-
+ arch/loongarch/include/asm/pgtable-bits.h          |    19 -
+ arch/loongarch/include/asm/pgtable.h               |    27 +-
+ arch/loongarch/kernel/asm-offsets.c                |     6 -
+ arch/loongarch/mm/cache.c                          |    46 +
+ arch/loongarch/mm/pgtable.c                        |     2 +-
+ arch/loongarch/mm/tlbex.S                          |     6 +-
+ arch/m68k/include/asm/mcf_pgtable.h                |    59 -
+ arch/m68k/include/asm/motorola_pgtable.h           |    29 -
+ arch/m68k/include/asm/sun3_pgtable.h               |    23 -
+ arch/m68k/mm/mcfmmu.c                              |    55 +
+ arch/m68k/mm/motorola.c                            |    29 +
+ arch/m68k/mm/sun3mmu.c                             |    20 +
+ arch/microblaze/include/asm/pgtable.h              |    17 -
+ arch/microblaze/mm/init.c                          |    20 +
+ arch/mips/include/asm/pgalloc.h                    |     8 +-
+ arch/mips/include/asm/pgtable-32.h                 |    19 +-
+ arch/mips/include/asm/pgtable-64.h                 |    61 +-
+ arch/mips/include/asm/pgtable.h                    |    22 -
+ arch/mips/include/uapi/asm/mman.h                  |     2 +
+ arch/mips/kernel/asm-offsets.c                     |     5 -
+ arch/mips/kernel/mips-mt.c                         |     4 +-
+ arch/mips/kvm/mmu.c                                |     2 +-
+ arch/mips/mm/cache.c                               |     3 +
+ arch/mips/mm/pgtable.c                             |     2 +-
+ arch/mips/mm/tlbex.c                               |    14 +-
+ arch/nios2/include/asm/pgtable.h                   |    23 +-
+ arch/nios2/mm/init.c                               |    25 +-
+ arch/nios2/mm/pgtable.c                            |     2 +-
+ arch/openrisc/include/asm/pgtable.h                |    18 -
+ arch/openrisc/mm/init.c                            |    20 +
+ arch/parisc/include/asm/pgalloc.h                  |     6 +-
+ arch/parisc/include/asm/pgtable.h                  |    26 +-
+ arch/parisc/include/uapi/asm/mman.h                |     2 +
+ arch/parisc/kernel/cache.c                         |     9 +-
+ arch/parisc/mm/init.c                              |    20 +
+ arch/powerpc/Kconfig                               |     1 -
+ arch/powerpc/include/asm/pgtable.h                 |    20 +-
+ arch/powerpc/kernel/vdso.c                         |     6 +-
+ arch/powerpc/mm/book3s32/tlb.c                     |    11 +-
+ arch/powerpc/mm/book3s64/subpage_prot.c            |    13 +-
+ arch/powerpc/mm/pgtable.c                          |    24 +
+ arch/riscv/include/asm/pgtable.h                   |    20 -
+ arch/riscv/kernel/vdso.c                           |     3 +-
+ arch/riscv/mm/init.c                               |    20 +
+ arch/s390/include/asm/pgtable.h                    |    17 -
+ arch/s390/kernel/vdso.c                            |     3 +-
+ arch/s390/mm/gmap.c                                |     6 +-
+ arch/s390/mm/mmap.c                                |    20 +
+ arch/sh/include/asm/pgtable.h                      |    17 -
+ arch/sh/mm/mmap.c                                  |    20 +
+ arch/sparc/Kconfig                                 |     1 -
+ arch/sparc/include/asm/pgtable_32.h                |    19 -
+ arch/sparc/include/asm/pgtable_64.h                |    19 -
+ arch/sparc/mm/init_32.c                            |    20 +
+ arch/sparc/mm/init_64.c                            |     3 +
+ arch/um/include/asm/pgtable.h                      |    17 -
+ arch/um/kernel/mem.c                               |    20 +
+ arch/um/kernel/tlb.c                               |    14 +-
+ arch/x86/Kconfig                                   |     1 -
+ arch/x86/entry/vdso/vma.c                          |     9 +-
+ arch/x86/include/asm/mem_encrypt.h                 |     2 +
+ arch/x86/include/asm/pgtable_types.h               |    19 -
+ arch/x86/kernel/cpu/cacheinfo.c                    |     6 +
+ arch/x86/kernel/smpboot.c                          |     4 -
+ arch/x86/kernel/tboot.c                            |     2 +-
+ arch/x86/mm/mem_encrypt_amd.c                      |     6 +-
+ arch/x86/mm/pgprot.c                               |    28 +
+ arch/x86/um/mem_32.c                               |     2 +-
+ arch/xtensa/include/asm/pgalloc.h                  |     2 +-
+ arch/xtensa/include/asm/pgtable.h                  |    19 -
+ arch/xtensa/include/uapi/asm/mman.h                |     2 +
+ arch/xtensa/kernel/syscall.c                       |    18 +-
+ arch/xtensa/mm/init.c                              |    22 +
+ drivers/android/binder_alloc.c                     |    35 +-
+ drivers/android/binder_alloc.h                     |     2 +-
+ drivers/android/binder_alloc_selftest.c            |     2 +-
+ drivers/block/zram/zram_drv.c                      |     2 +
+ drivers/dax/super.c                                |    67 +-
+ drivers/dma-buf/dma-buf.c                          |     1 -
+ drivers/firmware/efi/efi.c                         |     2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_migrate.c           |    34 +-
+ drivers/gpu/drm/i915/gem/i915_gem_userptr.c        |    14 +-
+ drivers/infiniband/core/rw.c                       |     1 -
+ drivers/iommu/tegra-smmu.c                         |     4 +-
+ drivers/md/dm.c                                    |     2 +-
+ drivers/misc/cxl/fault.c                           |    45 +-
+ drivers/nvdimm/pmem.c                              |    17 +
+ drivers/nvme/target/io-cmd-bdev.c                  |     1 -
+ drivers/tee/optee/call.c                           |    18 +-
+ drivers/xen/privcmd.c                              |     2 +-
+ fs/Kconfig                                         |    12 +-
+ fs/autofs/autofs_i.h                               |     7 +-
+ fs/autofs/expire.c                                 |     2 +-
+ fs/autofs/inode.c                                  |     1 +
+ fs/autofs/root.c                                   |   108 +-
+ fs/coredump.c                                      |    34 +-
+ fs/dax.c                                           |   401 +-
+ fs/erofs/super.c                                   |    10 +-
+ fs/eventpoll.c                                     |    22 +
+ fs/exec.c                                          |    12 +-
+ fs/ext2/super.c                                    |     7 +-
+ fs/ext4/super.c                                    |     9 +-
+ fs/libfs.c                                         |     9 +
+ fs/ocfs2/namei.c                                   |    49 +-
+ fs/ocfs2/namei.h                                   |     2 +
+ fs/ocfs2/refcounttree.c                            |    15 +-
+ fs/ocfs2/xattr.c                                   |    12 +-
+ fs/ocfs2/xattr.h                                   |     1 +
+ fs/proc/array.c                                    |     1 -
+ fs/proc/base.c                                     |    51 +-
+ fs/proc/fd.c                                       |    18 +-
+ fs/proc/inode.c                                    |     2 -
+ fs/proc/internal.h                                 |     2 +-
+ fs/proc/kmsg.c                                     |     1 -
+ fs/proc/nommu.c                                    |     1 -
+ fs/proc/proc_net.c                                 |     3 -
+ fs/proc/proc_tty.c                                 |     2 -
+ fs/proc/root.c                                     |     3 -
+ fs/proc/task_mmu.c                                 |    80 +-
+ fs/proc/task_nommu.c                               |    45 +-
+ fs/proc/vmcore.c                                   |     1 -
+ fs/remap_range.c                                   |    31 +-
+ fs/squashfs/Makefile                               |     4 +-
+ fs/squashfs/file.c                                 |   133 +-
+ fs/squashfs/page_actor.h                           |    46 -
+ fs/squashfs/super.c                                |    33 -
+ fs/userfaultfd.c                                   |   138 +-
+ fs/xfs/Makefile                                    |     5 +
+ fs/xfs/xfs_buf.c                                   |    10 +-
+ fs/xfs/xfs_file.c                                  |    35 +-
+ fs/xfs/xfs_fsops.c                                 |     3 +
+ fs/xfs/xfs_inode.c                                 |    69 +-
+ fs/xfs/xfs_inode.h                                 |     1 +
+ fs/xfs/xfs_iomap.c                                 |    30 +-
+ fs/xfs/xfs_iomap.h                                 |     1 +
+ fs/xfs/xfs_mount.h                                 |     1 +
+ fs/xfs/xfs_notify_failure.c                        |   220 +
+ fs/xfs/xfs_reflink.c                               |    12 +-
+ fs/xfs/xfs_super.h                                 |     1 +
+ include/linux/backing-dev.h                        |     6 -
+ include/linux/compiler-gcc.h                       |    11 -
+ include/linux/cpumask.h                            |   107 +-
+ include/linux/dax.h                                |    56 +-
+ include/linux/fs.h                                 |    13 +-
+ include/linux/huge_mm.h                            |    99 +-
+ include/linux/hugetlb.h                            |    16 +-
+ include/linux/kfifo.h                              |     2 +-
+ include/linux/khugepaged.h                         |    30 -
+ include/linux/maple_tree.h                         |   686 +
+ include/linux/memremap.h                           |   125 +-
+ include/linux/migrate.h                            |     1 +
+ include/linux/mm.h                                 |   178 +-
+ include/linux/mm_types.h                           |    48 +-
+ include/linux/mm_types_task.h                      |    12 -
+ include/linux/mmzone.h                             |    12 +-
+ include/linux/net.h                                |     2 -
+ include/linux/once.h                               |     2 -
+ include/linux/oom.h                                |    11 -
+ include/linux/page-flags.h                         |    38 +-
+ include/linux/page_zone.h                          |   213 +
+ include/linux/pgtable.h                            |    28 +
+ include/linux/sched.h                              |     1 -
+ include/linux/sched/coredump.h                     |     7 +-
+ include/linux/sysctl.h                             |     4 +
+ include/linux/userfaultfd_k.h                      |     7 +-
+ include/linux/vm_event_item.h                      |     4 -
+ include/linux/vmacache.h                           |    28 -
+ include/linux/vmstat.h                             |     6 -
+ include/trace/events/huge_memory.h                 |    23 +
+ include/trace/events/maple_tree.h                  |   123 +
+ include/trace/events/mmap.h                        |    73 +
+ include/trace/events/mmflags.h                     |     1 -
+ include/uapi/asm-generic/mman-common.h             |     2 +
+ include/uapi/linux/userfaultfd.h                   |     4 +
+ init/main.c                                        |    27 +-
+ init/version.c                                     |    17 +
+ ipc/mqueue.c                                       |     2 +-
+ ipc/shm.c                                          |    21 +-
+ kernel/acct.c                                      |    11 +-
+ kernel/bpf/task_iter.c                             |    10 +-
+ kernel/crash_core.c                                |    28 +-
+ kernel/debug/debug_core.c                          |    12 -
+ kernel/events/core.c                               |     3 +-
+ kernel/events/uprobes.c                            |     9 +-
+ kernel/fork.c                                      |    57 +-
+ kernel/kallsyms.c                                  |    23 +-
+ kernel/kallsyms_internal.h                         |    30 +
+ kernel/resource.c                                  |    19 +-
+ kernel/sched/fair.c                                |    10 +-
+ lib/Kconfig                                        |     9 -
+ lib/Kconfig.debug                                  |    26 +-
+ lib/Makefile                                       |     7 +-
+ lib/cpumask.c                                      |     2 +
+ lib/debugobjects.c                                 |    10 +
+ lib/devres.c                                       |    15 +-
+ lib/error-inject.c                                 |    12 +-
+ lib/lru_cache.c                                    |     4 +-
+ lib/lz4/lz4_decompress.c                           |     6 +-
+ lib/maple_tree.c                                   |  7067 ++++
+ lib/radix-tree.c                                   |     4 +-
+ lib/scatterlist.c                                  |     4 +-
+ lib/smp_processor_id.c                             |     2 +-
+ lib/stackdepot.c                                   |    59 +-
+ lib/test_cpumask.c                                 |   138 +
+ lib/test_free_pages.c                              |     2 +-
+ lib/test_hmm.c                                     |   337 +-
+ lib/test_hmm_uapi.h                                |    19 +-
+ lib/test_maple_tree.c                              | 38208 +++++++++++++++++++
+ lib/test_printf.c                                  |     8 +-
+ lib/ts_bm.c                                        |     2 +-
+ mm/Kconfig                                         |     3 -
+ mm/Makefile                                        |     2 +-
+ mm/compaction.c                                    |     3 +
+ mm/damon/vaddr-test.h                              |    36 +-
+ mm/damon/vaddr.c                                   |    53 +-
+ mm/debug.c                                         |    14 +-
+ mm/filemap.c                                       |    18 +-
+ mm/gup.c                                           |    58 +-
+ mm/gup_test.c                                      |     2 +-
+ mm/highmem.c                                       |     2 +-
+ mm/huge_memory.c                                   |   200 +-
+ mm/hugetlb.c                                       |   135 +-
+ mm/hugetlb_vmemmap.c                               |   589 +-
+ mm/hugetlb_vmemmap.h                               |    45 +-
+ mm/init-mm.c                                       |     4 +-
+ mm/internal.h                                      |    13 +-
+ mm/kasan/common.c                                  |     8 +-
+ mm/kasan/kasan.h                                   |     3 +-
+ mm/kasan/report.c                                  |    12 +-
+ mm/kfence/core.c                                   |     4 +-
+ mm/khugepaged.c                                    |   838 +-
+ mm/ksm.c                                           |    34 +-
+ mm/madvise.c                                       |    17 +-
+ mm/memcontrol.c                                    |    29 +-
+ mm/memory-failure.c                                |   265 +-
+ mm/memory.c                                        |    53 +-
+ mm/mempolicy.c                                     |    58 +-
+ mm/memremap.c                                      |    10 +
+ mm/migrate.c                                       |     4 +-
+ mm/migrate_device.c                                |   115 +-
+ mm/mlock.c                                         |    39 +-
+ mm/mmap.c                                          |  2324 +-
+ mm/mprotect.c                                      |    11 +-
+ mm/mremap.c                                        |    41 +-
+ mm/msync.c                                         |     2 +-
+ mm/nommu.c                                         |   251 +-
+ mm/oom_kill.c                                      |     9 +-
+ mm/page_alloc.c                                    |   437 +-
+ mm/page_vma_mapped.c                               |     3 +-
+ mm/pagewalk.c                                      |     2 +-
+ mm/percpu.c                                        |     6 +-
+ mm/rmap.c                                          |    24 +-
+ mm/sparse-vmemmap.c                                |   399 -
+ mm/swapfile.c                                      |     4 +-
+ mm/util.c                                          |    32 -
+ mm/vmacache.c                                      |   117 -
+ mm/vmstat.c                                        |     4 -
+ scripts/bloat-o-meter                              |    47 +-
+ tools/include/linux/gfp.h                          |     3 +-
+ tools/include/linux/slab.h                         |     4 +
+ tools/include/uapi/asm-generic/mman-common.h       |     2 +
+ tools/perf/builtin-kmem.c                          |     1 -
+ tools/testing/radix-tree/.gitignore                |     2 +
+ tools/testing/radix-tree/Makefile                  |     9 +-
+ tools/testing/radix-tree/generated/autoconf.h      |     1 +
+ tools/testing/radix-tree/linux.c                   |   160 +-
+ tools/testing/radix-tree/linux/kernel.h            |     1 +
+ tools/testing/radix-tree/linux/lockdep.h           |     2 +
+ tools/testing/radix-tree/linux/maple_tree.h        |     7 +
+ tools/testing/radix-tree/maple.c                   |    59 +
+ tools/testing/radix-tree/trace/events/maple_tree.h |     5 +
+ tools/testing/selftests/proc/proc-pid-vm.c         |    75 +-
+ tools/testing/selftests/vm/hmm-tests.c             |   311 +-
+ tools/testing/selftests/vm/khugepaged.c            |   563 +-
+ tools/testing/selftests/vm/mrelease_test.c         |    16 +-
+ tools/testing/selftests/vm/mremap_test.c           |    49 +-
+ tools/testing/selftests/vm/run_vmtests.sh          |   251 +-
+ tools/testing/selftests/vm/test_hmm.sh             |    24 +-
+ tools/testing/selftests/vm/userfaultfd.c           |    66 +-
+ tools/testing/selftests/vm/va_128TBswitch.c        |     8 +-
+ 316 files changed, 54580 insertions(+), 5497 deletions(-)
+ create mode 100644 Documentation/core-api/maple_tree.rst
+ create mode 100644 fs/xfs/xfs_notify_failure.c
+ create mode 100644 include/linux/maple_tree.h
+ create mode 100644 include/linux/page_zone.h
+ delete mode 100644 include/linux/vmacache.h
+ create mode 100644 include/trace/events/maple_tree.h
+ create mode 100644 kernel/kallsyms_internal.h
+ create mode 100644 lib/maple_tree.c
+ create mode 100644 lib/test_cpumask.c
+ create mode 100644 lib/test_maple_tree.c
+ delete mode 100644 mm/vmacache.c
+ create mode 100644 tools/testing/radix-tree/linux/maple_tree.h
+ create mode 100644 tools/testing/radix-tree/maple.c
+ create mode 100644 tools/testing/radix-tree/trace/events/maple_tree.h
+$ git am -3 ../patches/0001-fix-up-for-xfs-pass-perag-to-xfs_alloc_read_agf.patch
+Applying: fix up for "xfs: pass perag to xfs_alloc_read_agf()"
+$ git reset HEAD^
+Unstaged changes after reset:
+M	fs/xfs/xfs_notify_failure.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 65797f537a91] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
+ Date: Fri Jul 15 21:02:42 2022 +1000
+$ git am -3 ../patches/0001-fix-up-for-headers-deps-mm-Split-linux-gfp_types.h-o.patch
+Applying: fix up for "headers/deps: mm: Split <linux/gfp_types.h> out of <linux/gfp.h>"
+$ git reset HEAD^
+Unstaged changes after reset:
+M	include/linux/gfp_types.h
+$ git add -A .
+$ git commit -v -a --amend
+[master da04d36d46d1] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
+ Date: Fri Jul 15 21:02:42 2022 +1000
+$ git am -3 ../patches/0001-fix-up-for-io_uring-support-multishot-in-recvmsg.patch
+Applying: fix up for "io_uring: support multishot in recvmsg"
+$ git am -3 ../patches/0001-fix-up-for-k3-udma.c.patch
+Applying: fix up for k3-udma.c
+$ git am -3 ../patches/0001-Revert-ALSA-hda-cs35l41-Allow-compilation-test-on-no.patch
+Applying: Revert "ALSA: hda: cs35l41: Allow compilation test on non-ACPI configurations"
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 0000000000000..1b4cb569aa410
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20220715