summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Next/SHA1s332
-rw-r--r--Next/Trees334
-rw-r--r--Next/merge.log15834
-rw-r--r--localversion-next1
4 files changed, 16501 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 000000000000..e595015ab80b
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,332 @@
+Name SHA1
+---- ----
+origin 7426cedc7dad67bf3c71ea6cc29ab7822e1a453f
+fixes 614124bea77e452aa6df7a8714e8bc820b489922
+kbuild-current c4681547bcce777daf576925a966ffa824edd09d
+arc-current 13311e74253fe64329390df80bed3f07314ddd61
+arm-current dad7b9896a5dbac5da8275d5a6147c65c81fb5f2
+arm64-fixes e69012400b0cb42b2070748322cb72f9effec00f
+arm-soc-fixes f2a4ba9ec23b79285f7e260abffdedefadc73302
+drivers-memory-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5
+m68k-current 34e5269bf987aff9a33ad3ab4f5d65c02913cbc1
+powerpc-fixes 60b7ed54a41b550d50caf7f2418db4a7e75b5bdc
+s390-fixes 67147e96a332b56c7206238162771d82467f86c0
+sparc 05a59d79793d482f628a31753c671f2e92178a21
+fscrypt-current d19d8d345eecd9247cbe6cbf27aef271bd88aba7
+net c2f5c57d99debf471a1b263cdf227e55f1364e95
+bpf c2f5c57d99debf471a1b263cdf227e55f1364e95
+ipsec dd72fadf2186fc8a6018f97fe72f4d5ca05df440
+netfilter f4b29d2ee903f15b5e3f9bbb485079b2a7fe6616
+ipvs f4cdcae03f9cfbfd6a74b8d785c92a6b48fd833e
+wireless-drivers 1f9482aa8d412b4ba06ce6ab8e333fb8ca29a06e
+mac80211 f4b29d2ee903f15b5e3f9bbb485079b2a7fe6616
+rdma-fixes 13311e74253fe64329390df80bed3f07314ddd61
+sound-current 83e197a8414c0ba545e7e3916ce05f836f349273
+sound-asoc-fixes 1aab0f8da491e573e7dadf403b6035fe8072d227
+regmap-fixes 614124bea77e452aa6df7a8714e8bc820b489922
+regulator-fixes ebad413c3cb04d60bb6b5f2ec4009af52a8761cb
+spi-fixes 721c34719532d29d951d82c844fcf5776f381765
+pci-current f18139966d072dab8e4398c95ce955a9742e04f7
+driver-core.current 009c9aa5be652675a06d5211e1640e02bbb1c33d
+tty.current 009c9aa5be652675a06d5211e1640e02bbb1c33d
+usb.current 13311e74253fe64329390df80bed3f07314ddd61
+usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120
+usb-serial-fixes 009c9aa5be652675a06d5211e1640e02bbb1c33d
+usb-chipidea-fixes c6d580d96f140596d69220f60ce0cfbea4ee5c0f
+phy d1ce245fe409241ed6168c835a5b55ef52bdb6a9
+staging.current 009c9aa5be652675a06d5211e1640e02bbb1c33d
+iio-fixes e9de1ecadeab5fbffd873b9110e969c869554a56
+char-misc.current 009c9aa5be652675a06d5211e1640e02bbb1c33d
+soundwire-fixes da096fbccd52803db3edd9dd0c5ae4079d31c456
+thunderbolt-fixes 13311e74253fe64329390df80bed3f07314ddd61
+input-current 45a4b68354ffccbc9ca71027bd34754ca24f5183
+crypto-current e3a606f2c544b231f6079c8c5fea451e772e1139
+ide 6800cd8cbc6e35989f8d1aa20fac58031231b90f
+vfio-fixes dc51ff91cf2d1e9a2d941da483602f71d4a51472
+kselftest-fixes d07f6ca923ea0927a1024dfccafc5b53b61cfecc
+modules-fixes 055f23b74b20f2824ce33047b4cf2e2aa856bf3b
+dmaengine-fixes 9041575348b21ade1fb74d790f1aac85d68198c7
+backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15
+mtd-fixes 562b4e91d3b221f737f84ff78ee7d348c8a6891f
+mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6
+v4l-dvb-fixes 1e67a81775cb14614d57c57c4f14944d1202f015
+reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26
+mips-fixes 78cf0eb926cb1abeff2106bae67752e032fe5f3e
+at91-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5
+omap-fixes 3ff340e24c9dd5cff9fc07d67914c5adf67f80d6
+kvm-fixes d8ac05ea13d789d5491a5920d70a05659015441d
+kvms390-fixes 735931f9a51ab09cf795721b37696b420484625f
+hwmon-fixes 6e9ef8ca687e69e9d4cc89033d98e06350b0f3e0
+nvdimm-fixes de80d578113605164c358e4b532db2be5b71b1a7
+cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28
+btrfs-fixes 9d7848127f9705ae4d574c2985d70254dfb074a9
+vfs-fixes 173e84953eaaf17864a707efa2b8cd4c233b3129
+dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c
+i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8
+drivers-x86-fixes 701b54bcb7d0d72ee3f032afc900608708409be0
+samsung-krzk-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5
+pinctrl-samsung-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5
+devicetree-fixes 8929ef8d4dfd53a05913e22561784ece5f6419c7
+scsi-fixes d1b7f92035c6fb42529ada531e2cbf3534544c82
+drm-fixes 13311e74253fe64329390df80bed3f07314ddd61
+amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01
+drm-intel-fixes 97ece1dfb2ebabda0be9b2e754d4423a47b60321
+mmc-fixes 103a5348c22c3fca8b96c735a9e353b8a0801842
+rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d
+gnss-fixes a38fd8748464831584a19438cbb3082b5a2dab15
+hyperv-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5
+soc-fsl-fixes 2663b3388551230cbc4606a40fabf3331ceb59e4
+risc-v-fixes 7ede12b01b59dc67bef2e2035297dd2da5bfe427
+pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d
+fpga-fixes 2e8496f31d0be8f43849b2980b069f3a9805d047
+spdx 009c9aa5be652675a06d5211e1640e02bbb1c33d
+gpio-brgl-fixes cb8f63b8cbf39845244f3ccae43bb7e63bd70543
+gpio-intel-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5
+pinctrl-intel-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5
+erofs-fixes 0852b6ca941ef3ff75076e85738877bd3271e1cd
+integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf
+kunit-fixes 87c9c16317882dd6dbbc07e349bc3223e14f3244
+ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06
+memblock-fixes 17cbe03872be8878e2f84047424350d036915df1
+cel-fixes 9f4ad9e425a1d3b6a34617b8ea226d56a119a717
+drm-misc-fixes 6fd8f323b3e4e5290d02174559308669507c00dd
+kspp-gustavo a73bbfba991f8bb5d1814affcf1f7642ca0cdd35
+kbuild c7c90e121e992eefdf07945e5a6e9cf097b29463
+compiler-attributes ca0760e7d79e2bb9c342e6b3f925b1ef01c6303e
+dma-mapping 2b4bbc6231d789f58676d2ccc42177df163e1c4a
+asm-generic 14462376858e35b83932f94616effc2f49fd8494
+arc def9d2780727cec3313ed3522d0123158d87224d
+arm 2ac9912d2041a99007159d08c93d248ca4392bec
+arm64 cdc03d4eb6232beb819a2e5448e0bfa9601b70ef
+arm-perf d96b1b8c9f79b6bb234a31c80972a6f422079376
+arm-soc e12b6e5b0ac36aa01939c1e765486f1b02030724
+actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6
+amlogic b03485fe99f23d95bb43b5b77df7b83121905a06
+aspeed cd946cfe2e7e86de5617a87a96619e7a90a300d4
+at91 80cbaa6d3450ca330a004953cffeffb76d35553d
+drivers-memory 316ce128fbbe40c6685d2015456faf14616058ce
+imx-mxs 5004b2d188273494aa12eabb45a61d0ccc8ecaf4
+keystone 9d2e21ed98a24584daa3c90698ce81f5cc307a27
+mediatek a1c8c49de3d7859db3f5dea72a049b92d7ad2e20
+mvebu 72a0a49b7c77b77ca7a1d03c38138166136d1a88
+omap 91ee322340fb88eacf437367562a3b9a0428a362
+qcom c275bbc84be9f166fc1dcedf60bb6e6a7fbf540d
+raspberrypi 21c6bf8304f0141af6460cfe404dbbdeb96bdd62
+renesas 23df6d1f09712871dfba619729a8a165f147c17e
+reset 48a74b1147f7db4623eaed591cc01eb740b871c0
+rockchip 764f25388c384744ac83adae0240ac6a513e2542
+samsung-krzk 5ce16705e00d9c48384201fdd5e9eb6adf59ada5
+scmi 8a0039412d3574937652f193cf3c8e8d10a9033a
+stm32 4bf4abe19089245b7b12f35e5cafb5477b3e2c48
+sunxi 3f1c53207cf051d9aec85e9139bd35ada6184143
+tegra eac9ab885bb501d624c78ddbdac153b02d67d154
+ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53
+ti-k3-new d71abfcc6c050b72ba735b74f3e3848ce07ddd15
+xilinx d98fb9ab6255136813af65d17524cb224ddd9829
+clk 0eb0a122fa4def158838b379190efa4c38d6cdcc
+clk-imx c586f53ae159c6c1390f093a1ec94baef2df9f3a
+clk-renesas 2cd1e3883a5739e89bb8bc6050c6f900cf5cc1da
+clk-samsung a38fd8748464831584a19438cbb3082b5a2dab15
+csky 280af034a71ddfa98910077a7ee079a142ec20cc
+h8300 6e5e55227c959716103945e7140614c4c2faf439
+m68k c1367ee016e3550745315fb9a2dd1e4ce02cdcf6
+m68knommu 3f605ee17f8e785ba6ff69bee8e584e377a3cf28
+microblaze 14a832498c23cf480243222189066a8006182b9d
+mips a2cdc24e20573cf719f3171071368f4f7781d970
+nds32 40e0dd851e7b7afe219820fb270b09016e41d4fc
+nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae
+openrisc ad4e600cbf897f47525b342cd4b02e88ed300a83
+parisc-hd 9f4ad9e425a1d3b6a34617b8ea226d56a119a717
+powerpc a736143afd036f2078fe19435b16fd55abc789a9
+soc-fsl 242b0b398ccd34f73772120bd27a87a1bf00e30b
+risc-v 01d13185f183120e651b55736080cc717b95745e
+s390 6de0091b92786189fdffca3a62808e5ccd72bc14
+sh 2882b7626f4903a8e9250b328cdf7396a6deecac
+sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5
+uml 1aee020155f364ef538370d3392969f1077b9bae
+xtensa 21e0c3d5f633efba365d64c58979a9e9e9ebd572
+pidfd 5ddf9602d7112188cb20aa5a33fd8440fb4567bd
+fscrypt 2fc2b430f559fdf32d5d1dd5ceaa40e12fb77bdf
+fscache 18d5803bc50ec2a38d053ed730f7194fa4f983f2
+afs 7af08140979a6e7e12b78c93b8625c8d25b084e2
+btrfs 5980d0eb3f937021e594131a03d4edb4674796fb
+ceph 99a539b222a4c565e19c56b9f40f6c1debe309fa
+cifs 632096b66b2fa2621e3d2d02c2c2fd436975810b
+cifsd be8bcf8baaec8e063da56797dda48075bb8198d2
+configfs c886fa3cf6ffbe13006053ceb27c93d41928de30
+ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f
+erofs c5fcb51111b85323cafe3f02784f7f0bf6a7cf07
+exfat 5264f724cf1fb2ae3eeace247052d0531c5d1d4d
+ext3 7d7204936dd9ccbfd6a03920ecb995b395ade5a1
+ext4 f9505c72b2ee80cb68af95449a5215906130e3be
+f2fs 4effcf27f123ca1da4d77941aa750d1e1f72dd71
+fsverity 07c99001312cbf90a357d4877a358f796eede65b
+fuse c4e0cd4e0c16544ff0afecf07a5fe17de6077233
+gfs2 4304d3be8754ed5f4de1eb69e4c029944d5c946b
+jfs 5d299f44d7658f4423e33a0b9915bc8d81687511
+nfs 009c9aa5be652675a06d5211e1640e02bbb1c33d
+nfs-anna 4f8be1f53bf615102d103c0509ffa9596f65b718
+nfsd 8f83fd6fbab8fe4560a4ee7ce3aefd5b3bb98737
+cel b9f83ffaa0c096b4c832a43964fe6bff3acffe10
+orangefs 211f9f2e0503efa4023a46920e7ad07377b4ec58
+overlayfs 5e717c6fa41ff9b9b0c1e5959ccf5d8ef42f804b
+ubifs a801fcfeef96702fa3f9b22ad56c5eb1989d9221
+v9fs cba7dcd8878e04647c47c829846bbde91e67ca2f
+xfs a8f3522c9a1f4a31e93b17f2b5310a2b615f5581
+zonefs 6980d29ce4da223ad7f0751c7f1d61d3c6b54ab3
+iomap 6e552494fb90acae005d74ce6a2ee102d965184b
+djw-vfs 9b8523423b23ee3dfd88e32f5b7207be56a4e782
+file-locks cbe6fc4e01421c890d74422cdd04c6b1c8f62dda
+vfs 1130294f14404a953f2a068288099db3b52a4715
+printk 48e72544d6f06daedbf1d9b14610be89dba67526
+pci f25d926127a2a75b3b3599e2d3d3f4442bebc8bb
+pstore 1d1f6cc5818c750ac69473e4951e7165913fbf16
+hid 88bcf9de46df6d2e705d8569ae82521755c9ef71
+i2c 078de1e62c8345b5b3e95fa3cf7e9f2c307a5d9a
+i3c 3e5feb11a82945c88a1518fd2682ca8de66c37d3
+dmi 3cb4d29a2633170208c96240c7e85148679ceee3
+hwmon-staging 4c7f85a321a1ac265159c22a6998ef4f2a60c21d
+jc_docs 98cf4951842adbb03079dadedddf30b95e623cb0
+v4l-dvb 198bb646e8553e8abd8d83492a27b601ab97b75d
+v4l-dvb-next 86734f2e678a40a0d5b1f6f4d82e66c32d22a72b
+pm a51c80057a887e0f24bd8303b0791a130ff04121
+cpufreq-arm 8cf958d05d3a8f2ed7f38d1541c797f80430b0fd
+cpupower d07f6ca923ea0927a1024dfccafc5b53b61cfecc
+devfreq 6b61f55ecbe693d9d0d7ae14ebce01dabe10ecf1
+opp 4fa82a87ba55f5eca7d194055572110652daa264
+thermal c5c9dfdcaea216bc1bd21402081540a8f9940e1a
+dlm 957adb68b3f7df8421a05f1647d3027f2acad310
+swiotlb 81367cf6df62de2206298463263c49da043c3680
+rdma e7c07d5e0750e921d60e63dd181886c479a0ee19
+net-next 35713d9b8f090d7a226e4aaeeb742265cde33c82
+bpf-next 4b9718b5a201eddcd00d9db6c36b18840125c7ee
+ipsec-next b5a1d1fe0cbb9d20ba661134a09561af1dc9ebf5
+mlx5-next 9a1ac95a59d0724ffac2181a98b232c3f94f49f5
+netfilter-next a2f7dc00ea51a9dbb7c5b4ca8e508acb24f7ca8c
+ipvs-next a212d9f33ed0b8399bd9829a779c4024068742a2
+wireless-drivers-next 559c664751e54f5ddebd91ef640f7d346132ee44
+bluetooth 190de68ba85c60c14d6b1bb930e259ca6be15e2d
+mac80211-next 2433647bc8d983a543e7d31b41ca2de1c7e2c198
+mtd 6aa12138cd9aeb01308a3da8b23451dcf7f00d52
+nand c06dd49fd59a0abd6fa3d9fc5f6eb1776af4e5e4
+spi-nor c17e5c85b32f8809135f3211ba2525fb98b5c09f
+crypto 38a9eb8182a24c7ef2dbe82ab46cafe8f8e9b271
+drm b322a50d17ede5cff6622040f345228afecdcc45
+drm-misc eed75ce7c8260e0d5612ced4a88180ab991e207c
+amdgpu 464c4e66f99bafa04fe932620265d1d11a86e7ac
+drm-intel 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2
+drm-tegra a562c0783b5f36cc5b0c4e52d6125e28ab89e65d
+drm-msm e88bbc91849b2bf57683119c339e52916d34433f
+imx-drm fc1e985b67f9f318bc5797c9370715f5d020dac3
+etnaviv 989c9dad613155a60f15747e3f1db210a6304ecf
+regmap d17032f2befaceef2c8c6b761ae657bc700b0be3
+sound 3099406ef4832124ce572cfbbc914e8a385ca38f
+sound-asoc c07adf6925ff47ca90a6ce7fe66fa91071bf56db
+modules 2c0f0f3639562d6e38ee9705303c6457c4936eac
+input cac7100d4c51c04979dacdfe6c9a5e400d3f0a27
+block 444ef33be31f3c27ea24e60d5d9f2de9247d64be
+device-mapper b8e0c7f90e6f99ee64ea60e39253d5fcfb445f9e
+pcmcia e9d503fef7da2cc0610ce9cd056d0347ec9cafc4
+mmc 98b5ce4c08ca85727888fdbd362d574bcfa18e3c
+mfd 495fb48dbd9bcbe15859e086edd24519a6bd2961
+backlight 6fc632d3e3e09958f15a4cc8eb37accbb8c60cf0
+battery eab4e6d953c1059a30ac0f15826abc7dd2374d3c
+regulator 7fb593cbd88cf4df01c096d4dc320f027dfa2560
+security 047843bdb3160e8fb225f3752616ac7257033fe4
+apparmor d108370c644b153382632b3e5511ade575c91c86
+integrity 907a399de7b0566236c480d0c01ff52220532fb1
+keys e377c31f788fc98815e1ab90b5a35704ce35843a
+safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5
+selinux d99cf13f14200cdb5cbb704345774c9c0698612d
+smack fe6bde732be8c4711a878b11491d9a2749b03909
+tomoyo 98eaa63e96273de075f3ce4eac0f18b33d28b84c
+tpmdd 87e9688481163dee836c7f86e02f9aaf3240af2e
+watchdog cf813c67d9619fd474c785698cbed543b94209dd
+iommu 23f66fc785b5073967d31702aa7b824d61ca2423
+audit 0ecc617858fce305bedcf735eb18a46cb7e9921f
+devicetree 972d6a7dcec3ad3226661034c5d8cb2d30585157
+mailbox 6393989e2a31914bdc50211ff350dade6c729ea7
+spi a9a38d725ce1f513a342bbc47b117c6b45b25d9d
+tip f10bd30916ba18da9085350f175605c756f40dcb
+clockevents 6f64c8159af9a4c46aea60344d5ab66a9bb24bc0
+edac 0a9ece9ba154dd6205709108180952c55e630833
+irqchip c51e96dace68a67f1fcfa49d4ad1577875f50bf1
+ftrace 3105497b8ae7d523f1aff1b4fbb62d2ecd940a6c
+rcu 00b1a0341c16253f614d045ed84942971463b0e9
+kvm c3ab0e28a437c213e5e2c1d890f3891b6952b9ca
+kvm-arm 9f03db6673598f618f10ba01b3f8824bd5f31a41
+kvm-ppc 72476aaa469179222b92c380de60c76b4cb9a318
+kvms390 1f703d2cf20464338c3d5279dddfb65ac79b8782
+xen-tip 107866a8eb0b664675a260f1ba0655010fac1e08
+percpu 5c28d6836dc7b975980c48d8a9c3259a1b980695
+workqueues f2ccd0a922b38300c78e779436929853a42455f8
+drivers-x86 71d69e82f4168713afd89804d6e5f52d0e3848a2
+chrome-platform 6efb943b8616ec53a5e444193dccf1af9ad627b5
+hsi 6efb943b8616ec53a5e444193dccf1af9ad627b5
+leds 7b97174cc93fadb055258f4f8f3b964e9968e59f
+ipmi 5b32dd281ee0a269f39ecf6b48f0cd3f37264842
+driver-core 09705dcb63d269000595284b5dd7f5c938d647b9
+usb 00a738b86ec0c88ad4745f658966f951cbe4c885
+usb-gadget e49d033bddf5b565044e2abe4241353959bc9120
+usb-serial 8051334e901f2f7ab9fa30a15b74cdc8e58dfde2
+usb-chipidea-next 956df1bb0ab8bb823541e66d186ed65559541b69
+tty b61c8bf4694b5115766849378dcb8787ff54e65e
+char-misc f274e2962677d77bcd0d1d767e1d2737edf07893
+extcon d97c0ff5a124f48109c4b32d6471c7bccd497009
+phy-next 15692a80d9491b42f910f61f5ef2171b3c2eb15c
+soundwire 3d3e88e336338834086278236d42039f3cde50e1
+thunderbolt b18f901382fdb74a138a0bf30458c54a023a1d86
+vfio c7396f2eac2bf9d767d9cf49bd26224fbb894aaf
+staging 6cbb3aa0f9d5d23221df787cf36f74d3866fdb78
+iio 6cbb3aa0f9d5d23221df787cf36f74d3866fdb78
+mux 3516bd729358a2a9b090c1905bd2a3fa926e24c6
+icc 46bdcac533cca06c481524343de7d9cc46d67093
+dmaengine 656758425f98693bd61a08f6b51c4c5aa26c9d50
+cgroup cfeaa699186e2d5dfaca67184d734e44c13f51ee
+scsi 5c1d996e5af669f109f974b856516ed22e5f431b
+scsi-mkp 2506f5dcb8282aa7adf77965ef147bb5b68973e3
+vhost 7ff6e99e021caa41b2fa183d9ca9b9da3a86e2e5
+rpmsg f3dbc1aa6b4993434b9843cca086484106c9d93b
+gpio 7ac554888233468a9fd7c4f28721396952dd9959
+gpio-brgl 45ca16072b700f1e62a908f2de4a12d39edbb49e
+gpio-intel 043d7f09bf614809c10c4acbf0695ef731958300
+pinctrl 18a332087fa9b370db08a991063c193b90c48437
+pinctrl-intel 258435a1c8187f559549e515d2f77fa0b57bcd27
+pinctrl-renesas c3975a73ca9410519cf62531f640b68d69b0d798
+pinctrl-samsung 6efb943b8616ec53a5e444193dccf1af9ad627b5
+pwm d233504af7db9f4ddbbc4b04513d5ca657e7ae1f
+userns 5e6b8a50a7cec5686ee2c4bda1d49899c79a7eae
+ktest 170f4869e66275f498ae4736106fb54c0fdcd036
+kselftest 4896df9d53ae5521f3ce83751e828ad70bc65c80
+livepatching c150bbbb1731c5b6c0b232320c450dcd3b5c9fde
+coresight 1efbcec2ef8c037f1e801c76e4b9434ee2400be7
+rtc 94af1e732abe6e83fb146fc89d6f520e6a939c6a
+nvdimm 30c10d32152dd09c2158e9cab8a6c7adaa09278e
+at24 6efb943b8616ec53a5e444193dccf1af9ad627b5
+ntb 28293b6c68cd93178f021f51b1b504f3ec33f463
+seccomp fe092fc9f14baca61d5f159cd00e2c9f9a60c2ef
+kspp a0dc429c3e36e00d48a072aef14be066148f16d3
+cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b
+gnss 994adcbd37148acfa593c9ec2880a81ef97c7041
+fsi 9ab1428dfe2c66b51e0b41337cd0164da0ab6080
+slimbus 0320ed0a82364b3b175ab83ad11c7e4d9ad828a9
+nvmem 76a2b9a8ab441e4505cebe658feb0c27ba209d44
+xarray 2c7e57a02708a69d0194f9ef2a7b7e54f5a0484a
+hyperv 7d815f4afa87f2032b650ae1bba7534b550a6b8b
+auxdisplay c784e46c8445635afd81bd4089fc5e87271a8f3b
+kgdb c8daba4640ac9619f9cb34ca7c314ff1eaff5f33
+hmm fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8
+fpga 92c5ddbc93abddab737df19655787ca354a3a397
+kunit d07f6ca923ea0927a1024dfccafc5b53b61cfecc
+cfi 6efb943b8616ec53a5e444193dccf1af9ad627b5
+kunit-next d07f6ca923ea0927a1024dfccafc5b53b61cfecc
+trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529
+mhi c0da39de3274af541a389b730b9c21dd984ea4f6
+memblock 990e6d0e1de8308c6d1cc2241b76b994209466dd
+init 38b082236e77d403fed23ac2d30d570598744ec3
+counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62
+rust fef0214731ccdff3f674940e579903ccc9638f93
+cxl 21083f51521fb0f60dbac591f175c3ed48435af4
+tpmdd-jejb 69977d1aeeca7b18001ef462002f20b5f0e89e8b
+akpm-current 6234befd55b952cc0583e055df13e36fdc292314
+akpm 879e26014f75dc307a7ef8a74c5be07ba2a1dea8
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 000000000000..6750ad41d857
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,334 @@
+Trees included into this release:
+
+Name Type URL
+---- ---- ---
+origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master
+fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes
+kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes
+arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr
+arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes
+arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes
+arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes
+drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes
+m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus
+powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes
+s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes
+sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master
+fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable
+net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master
+bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master
+ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master
+netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master
+ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master
+wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master
+mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master
+rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc
+sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus
+sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus
+regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus
+regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus
+spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus
+pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus
+driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus
+tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus
+usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus
+usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes
+usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus
+usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#for-usb-fixes
+phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes
+staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus
+iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg
+char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus
+soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes
+thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes
+input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus
+crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master
+ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master
+vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus
+kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes
+modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-linus
+dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes
+backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes
+mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes
+mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes
+v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes
+reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes
+mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes
+at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes
+omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes
+kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master
+kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master
+hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon
+nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes
+cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes
+btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes
+vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes
+dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus
+i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/fixes
+drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes
+samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes
+pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes
+devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus
+scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes
+drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes
+amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#drm-fixes
+drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes
+mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes
+rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes
+gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus
+hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes
+soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix
+risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes
+pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes
+fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#fixes
+spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus
+gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current
+gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes
+pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes
+erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes
+integrity-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#fixes
+kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes
+ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes
+memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes
+cel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-rc
+drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes
+kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp
+kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next
+compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes
+dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next
+asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master
+arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next
+arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next
+arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core
+arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf
+arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next
+actions git git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git#for-next
+amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next
+aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next
+at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next
+drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next
+imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next
+keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next
+mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next
+mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next
+omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next
+qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next
+raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next
+renesas git git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next
+reset git https://git.pengutronix.de/git/pza/linux#reset/next
+rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next
+samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next
+scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next
+stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next
+sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next
+tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next
+ti-k3 git git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux.git#ti-k3-next
+ti-k3-new git git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git#ti-k3-next
+xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next
+clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next
+clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next
+clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk
+clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next
+csky git git://github.com/c-sky/csky-linux.git#linux-next
+h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next
+m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next
+m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next
+microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next
+mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next
+nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#next
+nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next
+openrisc git git://github.com/openrisc/linux.git#for-next
+parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next
+powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next
+soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next
+risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next
+s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next
+sh git git://git.libc.org/linux-sh#for-next
+sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master
+uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next
+xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next
+pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next
+fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master
+fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next
+afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next
+btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next
+ceph git git://github.com/ceph/ceph-client.git#master
+cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next
+cifsd git https://github.com/smfrench/smb3-kernel.git#cifsd-for-next
+configfs git git://git.infradead.org/users/hch/configfs.git#for-next
+ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next
+erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev
+exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev
+ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next
+ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev
+f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev
+fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity
+fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next
+gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next
+jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next
+nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next
+nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next
+nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next
+cel git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-next
+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
+dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next
+swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next
+rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next
+net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master
+bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next
+ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master
+mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next
+netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master
+ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master
+wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master
+bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master
+mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master
+mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next
+nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next
+spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next
+crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master
+drm git git://git.freedesktop.org/git/drm/drm.git#drm-next
+drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next
+amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next
+drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next
+drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next
+drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next
+imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next
+etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next
+regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next
+sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next
+sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next
+modules git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-next
+input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next
+block git git://git.kernel.dk/linux-block.git#for-next
+device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next
+pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next
+mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next
+mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next
+backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next
+battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next
+regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next
+security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing
+apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next
+integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity
+keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next
+safesetid git https://github.com/micah-morton/linux.git#safesetid-next
+selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next
+smack git git://github.com/cschaufler/smack-next#next
+tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master
+tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next
+watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master
+iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next
+audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next
+devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next
+mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next
+spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next
+tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest
+clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next
+edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next
+irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next
+ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next
+rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next
+kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next
+kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next
+kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next
+kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next
+xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next
+percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next
+workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next
+drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next
+chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next
+hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next
+leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next
+ipmi git git://github.com/cminyard/linux-ipmi.git#for-next
+driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next
+usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next
+usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next
+usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next
+usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#for-usb-next
+tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next
+char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next
+extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next
+phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next
+soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next
+thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next
+vfio git git://github.com/awilliam/linux-vfio.git#next
+staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next
+iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg
+mux git https://gitlab.com/peda-linux/mux.git#for-next
+icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next
+dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next
+cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next
+scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next
+scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next
+vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next
+rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git#for-next
+gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next
+gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next
+gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next
+pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next
+pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next
+pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl
+pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next
+pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next
+userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next
+ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next
+kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next
+livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next
+coresight git git://git.linaro.org/kernel/coresight.git#next
+rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next
+nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next
+at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next
+ntb git https://github.com/jonmason/ntb.git#ntb-next
+seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp
+kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp
+cisco git https://github.com/daniel-walker/cisco-linux.git#for-next
+gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next
+fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next
+slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next
+nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next
+xarray git git://git.infradead.org/users/willy/xarray.git#main
+hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next
+auxdisplay git https://github.com/ojeda/linux.git#auxdisplay
+kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next
+hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm
+fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next
+kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test
+cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next
+kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit
+trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next
+mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next
+memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next
+init git git://git.infradead.org/users/hch/misc.git#init-user-pointers
+counters git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#counters
+rust git https://github.com/Rust-for-Linux/linux.git#rust-next
+cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next
+tpmdd-jejb git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/tpmdd.git#tpmdd-for-next
+akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/
+akpm mmotm https://www.ozlabs.org/~akpm/mmotm/
diff --git a/Next/merge.log b/Next/merge.log
new file mode 100644
index 000000000000..9f43b77c0c34
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,15834 @@
+$ date -R
+Thu, 24 Jun 2021 08:58:18 +1000
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+Updating files: 67% (7360/10967) Updating files: 68% (7458/10967) Updating files: 69% (7568/10967) Updating files: 70% (7677/10967) Updating files: 71% (7787/10967) Updating files: 72% (7897/10967) Updating files: 73% (8006/10967) Updating files: 74% (8116/10967) Updating files: 75% (8226/10967) Updating files: 76% (8335/10967) Updating files: 77% (8445/10967) Updating files: 78% (8555/10967) Updating files: 79% (8664/10967) Updating files: 80% (8774/10967) Updating files: 81% (8884/10967) Updating files: 82% (8993/10967) Updating files: 83% (9103/10967) Updating files: 84% (9213/10967) Updating files: 85% (9322/10967) Updating files: 86% (9432/10967) Updating files: 87% (9542/10967) Updating files: 88% (9651/10967) Updating files: 89% (9761/10967) Updating files: 90% (9871/10967) Updating files: 91% (9980/10967) Updating files: 92% (10090/10967) Updating files: 93% (10200/10967) Updating files: 94% (10309/10967) Updating files: 95% (10419/10967) Updating files: 96% (10529/10967) Updating files: 97% (10638/10967) Updating files: 98% (10748/10967) Updating files: 99% (10858/10967) Updating files: 100% (10967/10967) Updating files: 100% (10967/10967), done.
+HEAD is now at 0c18f29aae7c module: limit enabling module.sig_enforce
+Merging origin/master (7426cedc7dad Merge tag 'spi-fix-v5.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi)
+$ git merge origin/master
+Updating 0c18f29aae7c..7426cedc7dad
+Fast-forward
+ drivers/pci/pci.c | 16 +++++++++++++---
+ drivers/spi/spi-nxp-fspi.c | 11 +++++------
+ drivers/spi/spi-tegra20-slink.c | 5 +++++
+ kernel/dma/swiotlb.c | 23 +++++++++++++++--------
+ 4 files changed, 38 insertions(+), 17 deletions(-)
+Merging fixes/fixes (614124bea77e Linux 5.13-rc5)
+$ git merge fixes/fixes
+Already up to date.
+Merging kbuild-current/fixes (c4681547bcce Linux 5.13-rc3)
+$ git merge kbuild-current/fixes
+Already up to date.
+Merging arc-current/for-curr (13311e74253f Linux 5.13-rc7)
+$ git merge arc-current/for-curr
+Already up to date.
+Merging arm-current/fixes (dad7b9896a5d ARM: 9081/1: fix gcc-10 thumb2-kernel regression)
+$ git merge arm-current/fixes
+Already up to date.
+Merging arm64-fixes/for-next/fixes (e69012400b0c arm64: mm: don't use CON and BLK mapping if KFENCE is enabled)
+$ git merge arm64-fixes/for-next/fixes
+Already up to date.
+Merging arm-soc-fixes/arm/fixes (f2a4ba9ec23b Merge tag 'qcom-dts-fixes-for-5.13' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes)
+$ git merge arm-soc-fixes/arm/fixes
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/qcom-sdx55-t55.dts | 2 +-
+ arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts | 4 ++--
+ arch/arm/boot/dts/ste-href.dtsi | 7 +++++++
+ arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 2 +-
+ arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +-
+ 6 files changed, 13 insertions(+), 6 deletions(-)
+Merging drivers-memory-fixes/fixes (6efb943b8616 Linux 5.13-rc1)
+$ git merge drivers-memory-fixes/fixes
+Already up to date.
+Merging m68k-current/for-linus (34e5269bf987 m68k: sun3x: Remove unneeded semicolon)
+$ git merge m68k-current/for-linus
+Already up to date.
+Merging powerpc-fixes/fixes (60b7ed54a41b powerpc/perf: Fix crash in perf_instruction_pointer() when ppmu is not set)
+$ git merge powerpc-fixes/fixes
+Already up to date.
+Merging s390-fixes/fixes (67147e96a332 s390/stack: fix possible register corruption with stack switch helper)
+$ git merge s390-fixes/fixes
+Merge made by the 'recursive' strategy.
+ arch/s390/include/asm/stacktrace.h | 18 +++++++++++-------
+ arch/s390/kernel/entry.S | 1 +
+ arch/s390/kernel/signal.c | 1 -
+ arch/s390/kernel/topology.c | 12 +++++++++---
+ drivers/s390/crypto/vfio_ap_ops.c | 10 ----------
+ 5 files changed, 21 insertions(+), 21 deletions(-)
+Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net)
+$ git merge sparc/master
+Already up to date.
+Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files)
+$ git merge fscrypt-current/for-stable
+Already up to date.
+Merging net/master (c2f5c57d99de Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf)
+$ git merge net/master
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 1 +
+ drivers/atm/nicstar.c | 24 ++++---
+ drivers/net/bonding/bond_main.c | 8 +++
+ drivers/net/can/usb/ems_usb.c | 3 +-
+ drivers/net/dsa/mv88e6xxx/chip.c | 6 +-
+ drivers/net/ethernet/aeroflex/greth.c | 3 +-
+ drivers/net/ethernet/broadcom/bcm4908_enet.c | 6 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.c | 1 +
+ drivers/net/ethernet/ezchip/nps_enet.c | 7 +-
+ drivers/net/ethernet/microsoft/mana/mana_en.c | 6 +-
+ drivers/net/ethernet/sfc/ef10.c | 3 +-
+ drivers/net/ethernet/sfc/ef10_sriov.c | 36 +++++-----
+ drivers/net/ethernet/ti/am65-cpsw-nuss.c | 18 ++---
+ drivers/net/hyperv/netvsc_drv.c | 5 ++
+ drivers/net/vrf.c | 14 ++--
+ drivers/net/vxlan.c | 2 +
+ drivers/net/wireless/marvell/mwifiex/main.c | 13 +++-
+ include/linux/skmsg.h | 2 -
+ include/net/sch_generic.h | 12 ++++
+ include/net/xfrm.h | 2 +-
+ include/net/xsk_buff_pool.h | 9 ++-
+ kernel/bpf/devmap.c | 4 +-
+ kernel/bpf/inode.c | 2 +-
+ kernel/bpf/verifier.c | 6 +-
+ net/can/bcm.c | 7 +-
+ net/can/gw.c | 3 +
+ net/can/isotp.c | 7 +-
+ net/can/j1939/main.c | 4 ++
+ net/can/j1939/socket.c | 3 +
+ net/core/dev.c | 4 +-
+ net/core/skmsg.c | 82 ++++++++++------------
+ net/core/sock_map.c | 2 +-
+ net/ipv4/esp4.c | 2 +-
+ net/ipv4/fib_frontend.c | 2 +
+ net/ipv4/tcp_bpf.c | 24 ++++++-
+ net/ipv4/udp.c | 2 +
+ net/ipv4/udp_bpf.c | 47 +++++++++++--
+ net/ipv6/esp6.c | 2 +-
+ net/ipv6/exthdrs.c | 4 +-
+ net/ipv6/ip6_tunnel.c | 4 +-
+ net/mptcp/options.c | 29 ++++----
+ net/mptcp/protocol.c | 5 ++
+ net/mptcp/protocol.h | 13 +++-
+ net/mptcp/subflow.c | 47 ++++++-------
+ net/netfilter/nf_tables_api.c | 65 ++++++++++-------
+ net/netfilter/nf_tables_offload.c | 34 ++-------
+ net/netfilter/nft_exthdr.c | 3 +
+ net/netfilter/nft_osf.c | 5 ++
+ net/netfilter/nft_tproxy.c | 9 ++-
+ net/sched/sch_qfq.c | 8 +--
+ net/tls/tls_sw.c | 2 +-
+ net/vmw_vsock/af_vsock.c | 2 +-
+ net/xdp/xsk_queue.h | 11 +--
+ net/xfrm/xfrm_device.c | 1 +
+ net/xfrm/xfrm_output.c | 7 --
+ net/xfrm/xfrm_policy.c | 21 ++++--
+ net/xfrm/xfrm_state.c | 14 +++-
+ net/xfrm/xfrm_user.c | 28 ++++----
+ tools/bpf/resolve_btfids/main.c | 3 +
+ .../selftests/bpf/prog_tests/sockmap_listen.c | 7 +-
+ 60 files changed, 435 insertions(+), 271 deletions(-)
+Merging bpf/master (c2f5c57d99de Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf)
+$ git merge bpf/master
+Already up to date.
+Merging ipsec/master (dd72fadf2186 xfrm: Fix xfrm offload fallback fail case)
+$ git merge ipsec/master
+Already up to date.
+Merging netfilter/master (f4b29d2ee903 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf)
+$ git merge netfilter/master
+Already up to date.
+Merging ipvs/master (f4cdcae03f9c Merge branch 'cxgb4-fixes')
+$ git merge ipvs/master
+Already up to date.
+Merging wireless-drivers/master (1f9482aa8d41 mwifiex: bring down link before deleting interface)
+$ git merge wireless-drivers/master
+Already up to date.
+Merging mac80211/master (f4b29d2ee903 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf)
+$ git merge mac80211/master
+Already up to date.
+Merging rdma-fixes/for-rc (13311e74253f Linux 5.13-rc7)
+$ git merge rdma-fixes/for-rc
+Already up to date.
+Merging sound-current/for-linus (83e197a8414c ALSA: seq: Fix race of snd_seq_timer_open())
+$ git merge sound-current/for-linus
+Already up to date.
+Merging sound-asoc-fixes/for-linus (1aab0f8da491 Merge remote-tracking branch 'asoc/for-5.13' into asoc-linus)
+$ git merge sound-asoc-fixes/for-linus
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/sound/sgtl5000.yaml | 4 ++
+ MAINTAINERS | 1 -
+ drivers/soundwire/bus.c | 17 ++++++-
+ drivers/soundwire/bus.h | 13 -----
+ include/linux/soundwire/sdw.h | 3 ++
+ sound/soc/atmel/atmel-i2s.c | 35 ++++++++++---
+ sound/soc/codecs/cs42l42.h | 2 +-
+ sound/soc/codecs/max98373-sdw.c | 14 +++---
+ sound/soc/codecs/max98373.h | 2 +-
+ sound/soc/codecs/rt1308-sdw.c | 2 +-
+ sound/soc/codecs/rt1316-sdw.c | 2 +-
+ sound/soc/codecs/rt5645.c | 49 ++++--------------
+ sound/soc/codecs/rt5682-sdw.c | 57 +++++++++++++++++----
+ sound/soc/codecs/rt5682.h | 2 +
+ sound/soc/codecs/rt700-sdw.c | 36 ++++++++++++--
+ sound/soc/codecs/rt700.c | 4 ++
+ sound/soc/codecs/rt700.h | 2 +
+ sound/soc/codecs/rt711-sdca-sdw.c | 58 ++++++++++++++++++++--
+ sound/soc/codecs/rt711-sdca.c | 8 +++
+ sound/soc/codecs/rt711-sdca.h | 2 +
+ sound/soc/codecs/rt711-sdw.c | 36 ++++++++++++--
+ sound/soc/codecs/rt711.c | 4 ++
+ sound/soc/codecs/rt711.h | 2 +
+ sound/soc/codecs/rt715-sdca-sdw.c | 3 +-
+ sound/soc/codecs/rt715-sdca-sdw.h | 1 +
+ sound/soc/codecs/rt715-sdca.c | 9 ++--
+ sound/soc/codecs/rt715-sdca.h | 3 +-
+ sound/soc/codecs/rt715-sdw.c | 2 +-
+ sound/soc/fsl/fsl_spdif.c | 23 +++++++--
+ 29 files changed, 297 insertions(+), 99 deletions(-)
+Merging regmap-fixes/for-linus (614124bea77e Linux 5.13-rc5)
+$ git merge regmap-fixes/for-linus
+Already up to date.
+Merging regulator-fixes/for-linus (ebad413c3cb0 Merge remote-tracking branch 'regulator/for-5.13' into regulator-linus)
+$ git merge regulator-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/regulator/hi655x-regulator.c | 16 +++++-----------
+ drivers/regulator/mt6358-regulator.c | 2 +-
+ 2 files changed, 6 insertions(+), 12 deletions(-)
+Merging spi-fixes/for-linus (721c34719532 Merge remote-tracking branch 'spi/for-5.13' into spi-linus)
+$ git merge spi-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/spi/spi-sun6i.c | 6 +++++-
+ drivers/spi/spi.c | 8 +++++---
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+Merging pci-current/for-linus (f18139966d07 PCI: aardvark: Fix kernel panic during PIO transfer)
+$ git merge pci-current/for-linus
+Already up to date.
+Merging driver-core.current/driver-core-linus (009c9aa5be65 Linux 5.13-rc6)
+$ git merge driver-core.current/driver-core-linus
+Already up to date.
+Merging tty.current/tty-linus (009c9aa5be65 Linux 5.13-rc6)
+$ git merge tty.current/tty-linus
+Already up to date.
+Merging usb.current/usb-linus (13311e74253f Linux 5.13-rc7)
+$ git merge usb.current/usb-linus
+Already up to date.
+Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6)
+$ git merge usb-gadget-fixes/fixes
+Already up to date.
+Merging usb-serial-fixes/usb-linus (009c9aa5be65 Linux 5.13-rc6)
+$ git merge usb-serial-fixes/usb-linus
+Already up to date.
+Merging usb-chipidea-fixes/for-usb-fixes (c6d580d96f14 usb: chipidea: imx: Fix Battery Charger 1.2 CDP detection)
+$ git merge usb-chipidea-fixes/for-usb-fixes
+Already up to date.
+Merging phy/fixes (d1ce245fe409 phy: Sparx5 Eth SerDes: check return value after calling platform_get_resource())
+$ git merge phy/fixes
+Already up to date.
+Merging staging.current/staging-linus (009c9aa5be65 Linux 5.13-rc6)
+$ git merge staging.current/staging-linus
+Already up to date.
+Merging iio-fixes/fixes-togreg (e9de1ecadeab staging: ralink-gdma: Remove incorrect author information)
+$ git merge iio-fixes/fixes-togreg
+Already up to date.
+Merging char-misc.current/char-misc-linus (009c9aa5be65 Linux 5.13-rc6)
+$ git merge char-misc.current/char-misc-linus
+Already up to date.
+Merging soundwire-fixes/fixes (da096fbccd52 soundwire: qcom: fix handling of qcom,ports-block-pack-mode)
+$ git merge soundwire-fixes/fixes
+Already up to date.
+Merging thunderbolt-fixes/fixes (13311e74253f Linux 5.13-rc7)
+$ git merge thunderbolt-fixes/fixes
+Already up to date.
+Merging input-current/for-linus (45a4b68354ff Input: elants_i2c - switch to probe_new)
+$ git merge input-current/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/input/joystick/xpad.c | 6 ++++++
+ drivers/input/touchscreen/elants_i2c.c | 11 +++++------
+ drivers/input/touchscreen/usbtouchscreen.c | 8 ++++----
+ 3 files changed, 15 insertions(+), 10 deletions(-)
+Merging crypto-current/master (e3a606f2c544 fsverity: relax build time dependency on CRYPTO_SHA256)
+$ git merge crypto-current/master
+Already up to date.
+Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer)
+$ git merge ide/master
+Auto-merging include/linux/ide.h
+Auto-merging drivers/ide/sis5513.c
+Auto-merging drivers/ide/ide-acpi.c
+Auto-merging drivers/ide/hpt366.c
+Auto-merging drivers/ide/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/ide/Kconfig | 2 +-
+ drivers/ide/aec62xx.c | 3 +--
+ drivers/ide/alim15x3.c | 3 +--
+ drivers/ide/amd74xx.c | 3 +--
+ drivers/ide/atiixp.c | 3 +--
+ drivers/ide/cmd64x.c | 3 +--
+ drivers/ide/cs5520.c | 3 +--
+ drivers/ide/cs5530.c | 3 +--
+ drivers/ide/cs5535.c | 3 +--
+ drivers/ide/cs5536.c | 3 +--
+ drivers/ide/cy82c693.c | 3 +--
+ drivers/ide/delkin_cb.c | 32 ++++++--------------------------
+ drivers/ide/hpt366.c | 5 ++---
+ drivers/ide/ide-acpi.c | 5 +----
+ drivers/ide/ide-pci-generic.c | 3 +--
+ drivers/ide/it8172.c | 3 +--
+ drivers/ide/it8213.c | 3 +--
+ drivers/ide/it821x.c | 3 +--
+ drivers/ide/jmicron.c | 3 +--
+ drivers/ide/ns87415.c | 3 +--
+ drivers/ide/opti621.c | 3 +--
+ drivers/ide/pdc202xx_new.c | 3 +--
+ drivers/ide/pdc202xx_old.c | 3 +--
+ drivers/ide/piix.c | 3 +--
+ drivers/ide/sc1200.c | 43 ++++++++++++++-----------------------------
+ drivers/ide/serverworks.c | 3 +--
+ drivers/ide/setup-pci.c | 29 ++++++-----------------------
+ drivers/ide/siimage.c | 3 +--
+ drivers/ide/sis5513.c | 3 +--
+ drivers/ide/sl82c105.c | 3 +--
+ drivers/ide/slc90e66.c | 3 +--
+ drivers/ide/triflex.c | 24 ++++++++----------------
+ drivers/ide/via82cxxx.c | 3 +--
+ include/linux/ide.h | 8 +-------
+ 34 files changed, 65 insertions(+), 161 deletions(-)
+Merging vfio-fixes/for-linus (dc51ff91cf2d vfio/platform: fix module_put call in error flow)
+$ git merge vfio-fixes/for-linus
+Already up to date.
+Merging kselftest-fixes/fixes (d07f6ca923ea Linux 5.13-rc2)
+$ git merge kselftest-fixes/fixes
+Already up to date.
+Merging modules-fixes/modules-linus (055f23b74b20 module: check for exit sections in layout_sections() instead of module_init_section())
+$ git merge modules-fixes/modules-linus
+Already up to date.
+Merging dmaengine-fixes/fixes (9041575348b2 dmaengine: mediatek: use GFP_NOWAIT instead of GFP_ATOMIC in prep_dma)
+$ git merge dmaengine-fixes/fixes
+Already up to date.
+Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2)
+$ git merge backlight-fixes/for-backlight-fixes
+Already up to date.
+Merging mtd-fixes/mtd/fixes (562b4e91d3b2 mtd: parsers: ofpart: fix parsing subpartitions)
+$ git merge mtd-fixes/mtd/fixes
+Already up to date.
+Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources")
+$ git merge mfd-fixes/for-mfd-fixes
+Already up to date.
+Merging v4l-dvb-fixes/fixes (1e67a81775cb media: s5p-mfc: Fix display delay control creation)
+$ git merge v4l-dvb-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/media/platform/mtk-vpu/mtk_vpu.c | 6 ++++++
+ drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 1 +
+ drivers/media/platform/video-mux.c | 10 +++++++++-
+ 3 files changed, 16 insertions(+), 1 deletion(-)
+Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency)
+$ git merge reset-fixes/reset/fixes
+Already up to date.
+Merging mips-fixes/mips-fixes (78cf0eb926cb MIPS: Fix kernel hang under FUNCTION_GRAPH_TRACER and PREEMPT_TRACER)
+$ git merge mips-fixes/mips-fixes
+Already up to date.
+Merging at91-fixes/at91-fixes (6efb943b8616 Linux 5.13-rc1)
+$ git merge at91-fixes/at91-fixes
+Already up to date.
+Merging omap-fixes/fixes (3ff340e24c9d bus: ti-sysc: Fix gpt12 system timer issue with reserved status)
+$ git merge omap-fixes/fixes
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/am5718.dtsi | 6 +--
+ arch/arm/boot/dts/dra7-l4.dtsi | 22 ----------
+ arch/arm/boot/dts/dra71x.dtsi | 4 --
+ arch/arm/boot/dts/dra72x.dtsi | 4 --
+ arch/arm/boot/dts/dra74x.dtsi | 92 ++++++++++++++++++++++--------------------
+ drivers/bus/ti-sysc.c | 20 +++++----
+ 6 files changed, 63 insertions(+), 85 deletions(-)
+Merging kvm-fixes/master (d8ac05ea13d7 KVM: selftests: Fix kvm_check_cap() assertion)
+$ git merge kvm-fixes/master
+Already up to date.
+Merging kvms390-fixes/master (735931f9a51a MAINTAINERS: add uv.c also to KVM/s390)
+$ git merge kvms390-fixes/master
+Already up to date.
+Merging hwmon-fixes/hwmon (6e9ef8ca687e hwmon: (pmbus/bpa-rs600) Handle Vin readings >= 256V)
+$ git merge hwmon-fixes/hwmon
+Merge made by the 'recursive' strategy.
+ drivers/hwmon/pmbus/bpa-rs600.c | 29 +++++++++++++++++++++++++++++
+ 1 file changed, 29 insertions(+)
+Merging nvdimm-fixes/libnvdimm-fixes (de80d5781136 Merge branch 'for-5.13/dax' into libnvdimm-fixes)
+$ git merge nvdimm-fixes/libnvdimm-fixes
+Merge made by the 'recursive' strategy.
+Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing)
+$ git merge cxl-fixes/fixes
+Already up to date.
+Merging btrfs-fixes/next-fixes (9d7848127f97 Merge branch 'misc-5.13' into next-fixes)
+$ git merge btrfs-fixes/next-fixes
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging vfs-fixes/fixes (173e84953eaa fs: fix reporting supported extra file attributes for statx())
+$ git merge vfs-fixes/fixes
+Merge made by the 'recursive' strategy.
+Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
+$ git merge dma-mapping-fixes/for-linus
+Already up to date.
+Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1)
+$ git merge i3c-fixes/i3c/fixes
+Already up to date.
+Merging drivers-x86-fixes/fixes (701b54bcb7d0 platform/mellanox: mlxreg-hotplug: Revert "move to use request_irq by IRQF_NO_AUTOEN flag")
+$ git merge drivers-x86-fixes/fixes
+Already up to date.
+Merging samsung-krzk-fixes/fixes (6efb943b8616 Linux 5.13-rc1)
+$ git merge samsung-krzk-fixes/fixes
+Already up to date.
+Merging pinctrl-samsung-fixes/fixes (6efb943b8616 Linux 5.13-rc1)
+$ git merge pinctrl-samsung-fixes/fixes
+Already up to date.
+Merging devicetree-fixes/dt/linus (8929ef8d4dfd media: dt-bindings: media: renesas,drif: Fix fck definition)
+$ git merge devicetree-fixes/dt/linus
+Already up to date.
+Merging scsi-fixes/fixes (d1b7f92035c6 scsi: sd: Call sd_revalidate_disk() for ioctl(BLKRRPART))
+$ git merge scsi-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/scsi/sd.c | 22 ++++++++++++++++++----
+ drivers/scsi/sr.c | 2 ++
+ 2 files changed, 20 insertions(+), 4 deletions(-)
+Merging drm-fixes/drm-fixes (13311e74253f Linux 5.13-rc7)
+$ git merge drm-fixes/drm-fixes
+Already up to date.
+Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
+$ git merge amdgpu-fixes/drm-fixes
+Already up to date.
+Merging drm-intel-fixes/for-linux-next-fixes (97ece1dfb2eb drm/i915/display: Do not zero past infoframes.vsc)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/display/intel_dp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging mmc-fixes/fixes (103a5348c22c mmc: meson-gx: use memcpy_to/fromio for dram-access-quirk)
+$ git merge mmc-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/mmc/host/meson-gx-mmc.c | 50 ++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 45 insertions(+), 5 deletions(-)
+Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt())
+$ git merge rtc-fixes/rtc-fixes
+Merge made by the 'recursive' strategy.
+ drivers/rtc/rtc-cmos.c | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging gnss-fixes/gnss-linus (a38fd8748464 Linux 5.12-rc2)
+$ git merge gnss-fixes/gnss-linus
+Already up to date.
+Merging hyperv-fixes/hyperv-fixes (6efb943b8616 Linux 5.13-rc1)
+$ git merge hyperv-fixes/hyperv-fixes
+Already up to date.
+Merging soc-fsl-fixes/fix (2663b3388551 soc: fsl: dpio: Get the cpumask through cpumask_of(cpu))
+$ git merge soc-fsl-fixes/fix
+Already up to date.
+Merging risc-v-fixes/fixes (7ede12b01b59 riscv: dts: fu740: fix cache-controller interrupts)
+$ git merge risc-v-fixes/fixes
+Already up to date.
+Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range())
+$ git merge pidfd-fixes/fixes
+Auto-merging fs/file.c
+Merge made by the 'recursive' strategy.
+ fs/file.c | 64 +++++++++++++++++++++++++++++++++++++++------------------------
+ 1 file changed, 40 insertions(+), 24 deletions(-)
+Merging fpga-fixes/fixes (2e8496f31d0b firmware: stratix10-svc: reset COMMAND_RECONFIG_FLAG_PARTIAL to 0)
+$ git merge fpga-fixes/fixes
+Already up to date.
+Merging spdx/spdx-linus (009c9aa5be65 Linux 5.13-rc6)
+$ git merge spdx/spdx-linus
+Already up to date.
+Merging gpio-brgl-fixes/gpio/for-current (cb8f63b8cbf3 gpiolib: cdev: zero padding during conversion to gpioline_info_changed)
+$ git merge gpio-brgl-fixes/gpio/for-current
+Merge made by the 'recursive' strategy.
+ drivers/gpio/gpio-mxc.c | 2 +-
+ drivers/gpio/gpiolib-cdev.c | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+Merging gpio-intel-fixes/fixes (6efb943b8616 Linux 5.13-rc1)
+$ git merge gpio-intel-fixes/fixes
+Already up to date.
+Merging pinctrl-intel-fixes/fixes (6efb943b8616 Linux 5.13-rc1)
+$ git merge pinctrl-intel-fixes/fixes
+Already up to date.
+Merging erofs-fixes/fixes (0852b6ca941e erofs: fix 1 lcluster-sized pcluster for big pcluster)
+$ git merge erofs-fixes/fixes
+Already up to date.
+Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc())
+$ git merge integrity-fixes/fixes
+Already up to date.
+Merging kunit-fixes/kunit-fixes (87c9c1631788 kunit: tool: add support for QEMU)
+$ git merge kunit-fixes/kunit-fixes
+Merge made by the 'recursive' strategy.
+ Documentation/dev-tools/kunit/index.rst | 1 +
+ Documentation/dev-tools/kunit/kunit-tool.rst | 188 +++++++++++++++++-
+ Documentation/dev-tools/kunit/running_tips.rst | 259 +++++++++++++++++++++++++
+ Documentation/dev-tools/kunit/start.rst | 2 +
+ Documentation/dev-tools/kunit/usage.rst | 50 +++--
+ lib/kunit/executor.c | 20 ++
+ lib/kunit/test.c | 7 +-
+ tools/testing/kunit/kunit.py | 57 +++++-
+ tools/testing/kunit/kunit_config.py | 7 +-
+ tools/testing/kunit/kunit_kernel.py | 177 ++++++++++++++---
+ tools/testing/kunit/kunit_parser.py | 2 +-
+ tools/testing/kunit/kunit_tool_test.py | 18 +-
+ tools/testing/kunit/qemu_config.py | 16 ++
+ tools/testing/kunit/qemu_configs/alpha.py | 10 +
+ tools/testing/kunit/qemu_configs/arm.py | 13 ++
+ tools/testing/kunit/qemu_configs/arm64.py | 12 ++
+ tools/testing/kunit/qemu_configs/i386.py | 10 +
+ tools/testing/kunit/qemu_configs/powerpc.py | 12 ++
+ tools/testing/kunit/qemu_configs/riscv.py | 31 +++
+ tools/testing/kunit/qemu_configs/s390.py | 14 ++
+ tools/testing/kunit/qemu_configs/sparc.py | 10 +
+ tools/testing/kunit/qemu_configs/x86_64.py | 10 +
+ 22 files changed, 860 insertions(+), 66 deletions(-)
+ create mode 100644 Documentation/dev-tools/kunit/running_tips.rst
+ create mode 100644 tools/testing/kunit/qemu_config.py
+ create mode 100644 tools/testing/kunit/qemu_configs/alpha.py
+ create mode 100644 tools/testing/kunit/qemu_configs/arm.py
+ create mode 100644 tools/testing/kunit/qemu_configs/arm64.py
+ create mode 100644 tools/testing/kunit/qemu_configs/i386.py
+ create mode 100644 tools/testing/kunit/qemu_configs/powerpc.py
+ create mode 100644 tools/testing/kunit/qemu_configs/riscv.py
+ create mode 100644 tools/testing/kunit/qemu_configs/s390.py
+ create mode 100644 tools/testing/kunit/qemu_configs/sparc.py
+ create mode 100644 tools/testing/kunit/qemu_configs/x86_64.py
+Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes)
+$ git merge ubifs-fixes/fixes
+Already up to date.
+Merging memblock-fixes/fixes (17cbe03872be mm/memblock: Fix typo in comment of memblock_phys_alloc_try_nid())
+$ git merge memblock-fixes/fixes
+Already up to date.
+Merging cel-fixes/for-rc (9f4ad9e425a1 Linux 5.12)
+$ git merge cel-fixes/for-rc
+Already up to date.
+Merging drm-misc-fixes/for-linux-next-fixes (6fd8f323b3e4 drm/kmb: Fix error return code in kmb_hw_init())
+$ git merge drm-misc-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 14 +++++++-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 17 ++++++----
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 1 +
+ drivers/gpu/drm/kmb/kmb_drv.c | 1 +
+ drivers/gpu/drm/nouveau/nouveau_prime.c | 17 +++++++++-
+ drivers/gpu/drm/panel/panel-samsung-ld9040.c | 1 +
+ drivers/gpu/drm/radeon/radeon_prime.c | 16 ++++++++--
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 44 ++++++++++++++++++++------
+ 8 files changed, 89 insertions(+), 22 deletions(-)
+Merging kspp-gustavo/for-next/kspp (a73bbfba991f media: siano: Fix out-of-bounds warnings in smscore_load_firmware_family2())
+$ git merge kspp-gustavo/for-next/kspp
+Auto-merging net/tipc/link.c
+Auto-merging net/packet/af_packet.c
+Auto-merging net/ipv4/esp4.c
+Auto-merging fs/xfs/xfs_ioctl.c
+Auto-merging fs/xfs/xfs_inode.c
+Auto-merging fs/xfs/xfs_bmap_util.c
+Auto-merging fs/xfs/scrub/common.c
+Auto-merging fs/xfs/libxfs/xfs_ag_resv.c
+Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c
+Auto-merging drivers/ide/siimage.c
+Merge made by the 'recursive' strategy.
+ drivers/accessibility/braille/braille_console.c | 1 +
+ drivers/atm/fore200e.c | 1 +
+ drivers/firewire/core-topology.c | 1 +
+ drivers/gpu/drm/nouveau/nouveau_bo.c | 1 +
+ drivers/gpu/drm/nouveau/nouveau_connector.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv50.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf119.c | 1 +
+ drivers/hwmon/corsair-cpro.c | 1 +
+ drivers/hwmon/max6621.c | 2 +-
+ drivers/ide/siimage.c | 1 +
+ drivers/media/common/siano/smscoreapi.c | 22 +++++++++-------------
+ drivers/media/common/siano/smscoreapi.h | 4 ++--
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 1 +
+ drivers/net/ethernet/neterion/vxge/vxge-config.c | 1 +
+ drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 1 +
+ .../net/ethernet/qlogic/netxen/netxen_nic_init.c | 1 +
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 1 +
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 +
+ drivers/tee/tee_core.c | 1 +
+ drivers/watchdog/machzwd.c | 1 +
+ fs/reiserfs/namei.c | 1 +
+ fs/xfs/libxfs/xfs_ag_resv.c | 4 ++--
+ fs/xfs/libxfs/xfs_alloc.c | 2 +-
+ fs/xfs/libxfs/xfs_da_btree.c | 2 +-
+ fs/xfs/scrub/agheader.c | 1 +
+ fs/xfs/scrub/bmap.c | 2 +-
+ fs/xfs/scrub/btree.c | 2 +-
+ fs/xfs/scrub/common.c | 6 +++---
+ fs/xfs/scrub/dabtree.c | 2 +-
+ fs/xfs/scrub/repair.c | 2 +-
+ fs/xfs/xfs_bmap_util.c | 2 +-
+ fs/xfs/xfs_export.c | 4 ++--
+ fs/xfs/xfs_file.c | 2 +-
+ fs/xfs/xfs_inode.c | 2 +-
+ fs/xfs/xfs_ioctl.c | 4 ++--
+ fs/xfs/xfs_iomap.c | 2 +-
+ fs/xfs/xfs_log.c | 1 +
+ fs/xfs/xfs_trans_buf.c | 2 +-
+ net/ipv4/ah4.c | 1 +
+ net/ipv4/esp4.c | 1 +
+ net/ipv4/fib_semantics.c | 1 +
+ net/ipv4/ip_vti.c | 1 +
+ net/ipv4/ipcomp.c | 1 +
+ net/netrom/nr_route.c | 4 ++++
+ net/packet/af_packet.c | 1 +
+ net/rds/tcp_connect.c | 1 +
+ net/rds/threads.c | 2 ++
+ net/rxrpc/af_rxrpc.c | 1 +
+ net/sctp/input.c | 3 ++-
+ net/tipc/link.c | 1 +
+ net/xfrm/xfrm_interface.c | 1 +
+ 51 files changed, 70 insertions(+), 37 deletions(-)
+Merging kbuild/for-next (c7c90e121e99 kconfig.h: explain IS_MODULE(), IS_ENABLED())
+$ git merge kbuild/for-next
+Removing scripts/mkmakefile
+Auto-merging scripts/link-vmlinux.sh
+Auto-merging scripts/Makefile.modfinal
+Auto-merging arch/x86/Makefile
+Auto-merging arch/riscv/Makefile
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ Makefile | 125 +++++++++++++++++++---------------------------
+ arch/alpha/Kbuild | 3 ++
+ arch/alpha/Makefile | 2 -
+ arch/arc/Makefile | 3 --
+ arch/arm/Makefile | 1 -
+ arch/arm64/Makefile | 1 -
+ arch/csky/Kbuild | 1 +
+ arch/h8300/Kbuild | 2 +
+ arch/h8300/Makefile | 3 --
+ arch/hexagon/Kbuild | 2 +
+ arch/hexagon/Makefile | 4 --
+ arch/ia64/Kbuild | 1 +
+ arch/m68k/Makefile | 1 -
+ arch/microblaze/Kbuild | 1 +
+ arch/mips/Makefile | 3 --
+ arch/nds32/Kbuild | 1 +
+ arch/nios2/Kbuild | 1 +
+ arch/openrisc/Makefile | 1 -
+ arch/parisc/Kbuild | 1 +
+ arch/powerpc/Makefile | 3 --
+ arch/riscv/Makefile | 1 -
+ arch/s390/Makefile | 3 --
+ arch/sh/Kbuild | 4 ++
+ arch/sh/Makefile | 5 --
+ arch/sparc/Makefile | 3 --
+ arch/um/Kbuild | 1 +
+ arch/x86/Makefile | 3 --
+ arch/xtensa/Kbuild | 1 +
+ include/linux/kconfig.h | 6 ++-
+ init/Makefile | 12 ++---
+ kernel/gen_kheaders.sh | 4 +-
+ lib/Kconfig.debug | 4 +-
+ scripts/Kbuild.include | 7 ++-
+ scripts/Makefile.build | 2 -
+ scripts/Makefile.modfinal | 2 -
+ scripts/kconfig/conf.c | 2 +-
+ scripts/link-vmlinux.sh | 4 +-
+ scripts/mkcompile_h | 4 +-
+ scripts/mkmakefile | 17 -------
+ scripts/setlocalversion | 75 +++++-----------------------
+ 40 files changed, 103 insertions(+), 217 deletions(-)
+ create mode 100644 arch/alpha/Kbuild
+ create mode 100644 arch/csky/Kbuild
+ create mode 100644 arch/h8300/Kbuild
+ create mode 100644 arch/hexagon/Kbuild
+ create mode 100644 arch/ia64/Kbuild
+ create mode 100644 arch/microblaze/Kbuild
+ create mode 100644 arch/nds32/Kbuild
+ create mode 100644 arch/nios2/Kbuild
+ create mode 100644 arch/parisc/Kbuild
+ create mode 100644 arch/sh/Kbuild
+ create mode 100644 arch/um/Kbuild
+ create mode 100644 arch/xtensa/Kbuild
+ delete mode 100755 scripts/mkmakefile
+Merging compiler-attributes/compiler-attributes (ca0760e7d79e Compiler Attributes: Add continue in comment)
+$ git merge compiler-attributes/compiler-attributes
+Already up to date.
+Merging dma-mapping/for-next (2b4bbc6231d7 dma-debug: report -EEXIST errors in add_dma_entry)
+$ git merge dma-mapping/for-next
+Merge made by the 'recursive' strategy.
+ kernel/dma/coherent.c | 2 +-
+ kernel/dma/debug.c | 6 ++----
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+Merging asm-generic/master (14462376858e Merge branch 'asm-generic-unaligned' into asm-generic)
+$ git merge asm-generic/master
+Removing include/linux/unaligned/memmove.h
+Removing include/linux/unaligned/le_struct.h
+Removing include/linux/unaligned/le_memmove.h
+Removing include/linux/unaligned/le_byteshift.h
+Removing include/linux/unaligned/generic.h
+Removing include/linux/unaligned/be_struct.h
+Removing include/linux/unaligned/be_memmove.h
+Removing include/linux/unaligned/be_byteshift.h
+Removing include/linux/unaligned/access_ok.h
+Removing arch/xtensa/include/asm/unaligned.h
+Removing arch/x86/include/asm/unaligned.h
+Removing arch/sparc/include/asm/unaligned.h
+Removing arch/sh/include/asm/unaligned.h
+Removing arch/sh/include/asm/unaligned-sh4a.h
+Removing arch/powerpc/include/asm/unaligned.h
+Removing arch/openrisc/include/asm/unaligned.h
+Removing arch/microblaze/include/asm/unaligned.h
+Removing arch/m68k/include/asm/unaligned.h
+Removing arch/ia64/include/asm/unaligned.h
+Removing arch/arm/include/asm/unaligned.h
+Removing arch/alpha/include/asm/unaligned.h
+Merge made by the 'recursive' strategy.
+ arch/alpha/include/asm/unaligned.h | 12 --
+ arch/arm/include/asm/unaligned.h | 27 ----
+ arch/ia64/include/asm/unaligned.h | 12 --
+ arch/m68k/Kconfig | 1 +
+ arch/m68k/include/asm/unaligned.h | 26 ----
+ arch/microblaze/include/asm/unaligned.h | 27 ----
+ arch/mips/crypto/crc32-mips.c | 2 +-
+ arch/openrisc/include/asm/unaligned.h | 47 -------
+ arch/parisc/include/asm/unaligned.h | 6 +-
+ arch/powerpc/include/asm/unaligned.h | 22 ---
+ arch/riscv/include/asm/io.h | 5 +-
+ arch/sh/include/asm/unaligned-sh4a.h | 199 ----------------------------
+ arch/sh/include/asm/unaligned.h | 13 --
+ arch/sparc/include/asm/io.h | 8 ++
+ arch/sparc/include/asm/unaligned.h | 11 --
+ arch/x86/include/asm/unaligned.h | 15 ---
+ arch/xtensa/include/asm/unaligned.h | 29 ----
+ block/partitions/ldm.c | 2 +-
+ block/partitions/ldm.h | 3 -
+ block/partitions/msdos.c | 24 ++--
+ drivers/net/wireless/marvell/mwifiex/pcie.c | 10 +-
+ include/asm-generic/io.h | 68 +++++++++-
+ include/asm-generic/uaccess.h | 4 +-
+ include/asm-generic/unaligned.h | 141 ++++++++++++++++----
+ include/linux/unaligned/access_ok.h | 68 ----------
+ include/linux/unaligned/be_byteshift.h | 71 ----------
+ include/linux/unaligned/be_memmove.h | 37 ------
+ include/linux/unaligned/be_struct.h | 37 ------
+ include/linux/unaligned/generic.h | 115 ----------------
+ include/linux/unaligned/le_byteshift.h | 71 ----------
+ include/linux/unaligned/le_memmove.h | 37 ------
+ include/linux/unaligned/le_struct.h | 37 ------
+ include/linux/unaligned/memmove.h | 46 -------
+ net/core/netpoll.c | 4 +-
+ security/apparmor/policy_unpack.c | 2 +-
+ 35 files changed, 216 insertions(+), 1023 deletions(-)
+ delete mode 100644 arch/alpha/include/asm/unaligned.h
+ delete mode 100644 arch/arm/include/asm/unaligned.h
+ delete mode 100644 arch/ia64/include/asm/unaligned.h
+ delete mode 100644 arch/m68k/include/asm/unaligned.h
+ delete mode 100644 arch/microblaze/include/asm/unaligned.h
+ delete mode 100644 arch/openrisc/include/asm/unaligned.h
+ delete mode 100644 arch/powerpc/include/asm/unaligned.h
+ delete mode 100644 arch/sh/include/asm/unaligned-sh4a.h
+ delete mode 100644 arch/sh/include/asm/unaligned.h
+ delete mode 100644 arch/sparc/include/asm/unaligned.h
+ delete mode 100644 arch/x86/include/asm/unaligned.h
+ delete mode 100644 arch/xtensa/include/asm/unaligned.h
+ delete mode 100644 include/linux/unaligned/access_ok.h
+ delete mode 100644 include/linux/unaligned/be_byteshift.h
+ delete mode 100644 include/linux/unaligned/be_memmove.h
+ delete mode 100644 include/linux/unaligned/be_struct.h
+ delete mode 100644 include/linux/unaligned/generic.h
+ delete mode 100644 include/linux/unaligned/le_byteshift.h
+ delete mode 100644 include/linux/unaligned/le_memmove.h
+ delete mode 100644 include/linux/unaligned/le_struct.h
+ delete mode 100644 include/linux/unaligned/memmove.h
+Merging arc/for-next (def9d2780727 Linux 5.5-rc7)
+$ git merge arc/for-next
+Already up to date.
+Merging arm/for-next (2ac9912d2041 Merge branches 'fixes' and 'misc' into for-next)
+$ git merge arm/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/Kconfig.debug | 2 +
+ arch/arm/boot/compressed/Makefile | 2 +-
+ arch/arm/boot/compressed/atags_to_fdt.c | 2 +-
+ arch/arm/include/asm/ftrace.h | 3 +
+ arch/arm/include/asm/insn.h | 8 +-
+ arch/arm/include/asm/memory.h | 15 ++-
+ arch/arm/include/asm/module.h | 10 ++
+ arch/arm/include/asm/pgtable.h | 2 +-
+ arch/arm/include/asm/system_misc.h | 1 -
+ arch/arm/kernel/ftrace.c | 46 +++++++--
+ arch/arm/kernel/head.S | 30 +++++-
+ arch/arm/kernel/insn.c | 19 ++--
+ arch/arm/kernel/module-plts.c | 49 +++++++---
+ arch/arm/kernel/reboot.c | 6 +-
+ arch/arm/kernel/setup.c | 20 +++-
+ arch/arm/kernel/vmlinux.lds.S | 2 +-
+ arch/arm/mm/Kconfig | 2 -
+ arch/arm/mm/abort-ev7.S | 26 -----
+ arch/arm/mm/mmu.c | 166 +++++++++++++++++++++++---------
+ arch/arm/probes/kprobes/test-thumb.c | 10 +-
+ arch/arm/tools/Makefile | 25 ++---
+ arch/arm/tools/syscallnr.sh | 3 +-
+ arch/arm/xen/enlighten.c | 12 ++-
+ arch/arm64/include/asm/system_misc.h | 2 -
+ arch/arm64/kernel/process.c | 7 +-
+ drivers/firmware/psci/psci.c | 12 ++-
+ 26 files changed, 323 insertions(+), 159 deletions(-)
+Merging arm64/for-next/core (cdc03d4eb623 Merge branch 'for-next/mm' into for-next/core)
+$ git merge arm64/for-next/core
+Auto-merging mm/page_alloc.c
+Auto-merging drivers/firmware/psci/psci.c
+Auto-merging arch/arm64/mm/mmu.c
+Removing arch/arm64/lib/memmove.S
+Auto-merging arch/arm64/kvm/hyp/nvhe/setup.c
+Auto-merging arch/arm64/kvm/arm.c
+Auto-merging arch/arm64/kernel/process.c
+CONFLICT (content): Merge conflict in arch/arm64/kernel/process.c
+Auto-merging arch/arm64/include/asm/kvm_asm.h
+Auto-merging arch/arm64/Makefile
+Auto-merging arch/arm/include/asm/cpuidle.h
+Auto-merging Makefile
+Resolved 'arch/arm64/kernel/process.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 9cb5af5d8c98] Merge remote-tracking branch 'arm64/for-next/core'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/arm64/booting.rst | 6 +
+ Makefile | 2 +-
+ arch/alpha/include/asm/page.h | 6 +-
+ arch/arm/include/asm/cpuidle.h | 5 +
+ arch/arm/kernel/perf_event_v7.c | 4 +-
+ arch/arm64/Kconfig | 33 +-
+ arch/arm64/Makefile | 2 +-
+ arch/arm64/include/asm/alternative-macros.h | 9 +-
+ arch/arm64/include/asm/arch_gicv3.h | 3 +-
+ arch/arm64/include/asm/asm-prototypes.h | 6 +
+ arch/arm64/include/asm/asm_pointer_auth.h | 49 +--
+ arch/arm64/include/asm/assembler.h | 98 +++---
+ arch/arm64/include/asm/cache.h | 2 +-
+ arch/arm64/include/asm/cacheflush.h | 71 ++--
+ arch/arm64/include/asm/cpu.h | 45 +--
+ arch/arm64/include/asm/cpufeature.h | 15 +-
+ arch/arm64/include/asm/cpuidle.h | 35 ++
+ arch/arm64/include/asm/efi.h | 2 +-
+ arch/arm64/include/asm/exception.h | 34 +-
+ arch/arm64/include/asm/fpsimd.h | 2 +-
+ arch/arm64/include/asm/fpsimdmacros.h | 4 +-
+ arch/arm64/include/asm/insn-def.h | 9 +
+ arch/arm64/include/asm/insn.h | 67 +++-
+ arch/arm64/include/asm/kernel-pgtable.h | 19 +-
+ arch/arm64/include/asm/kvm_asm.h | 1 +
+ arch/arm64/include/asm/kvm_mmu.h | 7 +-
+ arch/arm64/include/asm/linkage.h | 8 +
+ arch/arm64/include/asm/memory.h | 6 +-
+ arch/arm64/include/asm/mmu_context.h | 4 +-
+ arch/arm64/include/asm/module.lds.h | 17 +-
+ arch/arm64/include/asm/mte-kasan.h | 93 ++++--
+ arch/arm64/include/asm/mte.h | 4 +
+ arch/arm64/include/asm/page.h | 10 +-
+ arch/arm64/include/asm/patching.h | 13 +
+ arch/arm64/include/asm/perf_event.h | 5 +
+ arch/arm64/include/asm/pgtable-hwdef.h | 7 -
+ arch/arm64/include/asm/pgtable-prot.h | 1 -
+ arch/arm64/include/asm/pgtable.h | 5 +-
+ arch/arm64/include/asm/pointer_auth.h | 59 ++--
+ arch/arm64/include/asm/processor.h | 16 +-
+ arch/arm64/include/asm/scs.h | 8 +-
+ arch/arm64/include/asm/sdei.h | 10 +-
+ arch/arm64/include/asm/smp.h | 2 -
+ arch/arm64/include/asm/stacktrace.h | 32 +-
+ arch/arm64/include/asm/sysreg.h | 2 -
+ arch/arm64/include/asm/tlb.h | 4 +
+ arch/arm64/kernel/Makefile | 11 +-
+ arch/arm64/kernel/acpi.c | 22 +-
+ arch/arm64/kernel/alternative.c | 2 +-
+ arch/arm64/kernel/asm-offsets.c | 15 +-
+ arch/arm64/kernel/cpufeature.c | 210 +++++++++---
+ arch/arm64/kernel/cpuinfo.c | 58 ++--
+ arch/arm64/kernel/efi-entry.S | 9 +-
+ arch/arm64/kernel/entry-common.c | 256 +++++++++++++-
+ arch/arm64/kernel/entry-fpsimd.S | 22 +-
+ arch/arm64/kernel/entry.S | 369 ++++++--------------
+ arch/arm64/kernel/fpsimd.c | 6 +-
+ arch/arm64/kernel/ftrace.c | 1 +
+ arch/arm64/kernel/head.S | 76 +++--
+ arch/arm64/kernel/hibernate-asm.S | 7 +-
+ arch/arm64/kernel/hibernate.c | 20 +-
+ arch/arm64/kernel/idle.c | 46 +++
+ arch/arm64/kernel/idreg-override.c | 3 +-
+ arch/arm64/kernel/image-vars.h | 2 +-
+ arch/arm64/kernel/jump_label.c | 1 +
+ arch/arm64/kernel/kaslr.c | 12 +-
+ arch/arm64/kernel/kgdb.c | 1 +
+ arch/arm64/kernel/machine_kexec.c | 30 +-
+ arch/arm64/kernel/patching.c | 150 +++++++++
+ arch/arm64/kernel/perf_callchain.c | 2 +-
+ arch/arm64/kernel/perf_event.c | 40 ++-
+ arch/arm64/kernel/probes/kprobes.c | 18 +-
+ arch/arm64/kernel/probes/simulate-insn.c | 1 +
+ arch/arm64/kernel/probes/uprobes.c | 2 +-
+ arch/arm64/kernel/process.c | 99 ++----
+ arch/arm64/kernel/ptrace.c | 2 +-
+ arch/arm64/kernel/sdei.c | 64 +---
+ arch/arm64/kernel/setup.c | 8 +-
+ arch/arm64/kernel/signal.c | 26 ++
+ arch/arm64/kernel/smccc-call.S | 83 +++++
+ arch/arm64/kernel/smp.c | 16 +-
+ arch/arm64/kernel/smp_spin_table.c | 7 +-
+ arch/arm64/kernel/stacktrace.c | 18 +-
+ arch/arm64/kernel/suspend.c | 12 +-
+ arch/arm64/kernel/sys_compat.c | 2 +-
+ arch/arm64/kernel/traps.c | 135 ++++++--
+ arch/arm64/kvm/arm.c | 13 +-
+ arch/arm64/kvm/hyp/nvhe/cache.S | 4 +-
+ arch/arm64/kvm/hyp/nvhe/setup.c | 3 +-
+ arch/arm64/kvm/hyp/nvhe/tlb.c | 2 +-
+ arch/arm64/kvm/hyp/pgtable.c | 13 +-
+ arch/arm64/lib/Makefile | 4 +-
+ arch/arm64/lib/clear_user.S | 47 +--
+ arch/arm64/{kernel => lib}/insn.c | 249 +-------------
+ arch/arm64/lib/kasan_sw_tags.S | 76 +++++
+ arch/arm64/lib/memchr.S | 65 +++-
+ arch/arm64/lib/memcmp.S | 346 +++++++------------
+ arch/arm64/lib/memcpy.S | 272 ++++++++++++---
+ arch/arm64/lib/memmove.S | 189 -----------
+ arch/arm64/lib/mte.S | 20 ++
+ arch/arm64/lib/strcmp.S | 289 +++++++---------
+ arch/arm64/lib/strlen.S | 258 +++++++++-----
+ arch/arm64/lib/strncmp.S | 406 ++++++++++-------------
+ arch/arm64/lib/uaccess_flushcache.c | 4 +-
+ arch/arm64/mm/cache.S | 158 ++++-----
+ arch/arm64/mm/context.c | 6 +-
+ arch/arm64/mm/fault.c | 50 ++-
+ arch/arm64/mm/flush.c | 29 +-
+ arch/arm64/mm/init.c | 7 +
+ arch/arm64/mm/mmu.c | 13 +-
+ arch/arm64/mm/proc.S | 24 +-
+ arch/arm64/mm/ptdump.c | 4 -
+ arch/arm64/net/bpf_jit_comp.c | 1 +
+ arch/arm64/tools/cpucaps | 3 +-
+ arch/ia64/include/asm/page.h | 6 +-
+ arch/m68k/include/asm/page_no.h | 6 +-
+ arch/s390/include/asm/page.h | 6 +-
+ arch/x86/include/asm/page.h | 6 +-
+ drivers/firmware/psci/psci.c | 9 +-
+ drivers/firmware/smccc/smccc.c | 4 +
+ drivers/misc/lkdtm/bugs.c | 6 +-
+ drivers/perf/arm-cci.c | 4 +-
+ drivers/perf/arm-ccn.c | 6 +-
+ drivers/perf/arm-cmn.c | 13 +-
+ drivers/perf/arm_dmc620_pmu.c | 5 +-
+ drivers/perf/arm_dsu_pmu.c | 8 +-
+ drivers/perf/arm_pmu.c | 16 +-
+ drivers/perf/arm_smmuv3_pmu.c | 35 +-
+ drivers/perf/arm_spe_pmu.c | 12 +-
+ drivers/perf/fsl_imx8_ddr_perf.c | 18 +-
+ drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 5 +-
+ drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 9 +-
+ drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 5 +-
+ drivers/perf/hisilicon/hisi_uncore_pa_pmu.c | 5 +-
+ drivers/perf/hisilicon/hisi_uncore_pmu.c | 6 +-
+ drivers/perf/hisilicon/hisi_uncore_pmu.h | 2 +-
+ drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c | 7 +-
+ drivers/perf/qcom_l2_pmu.c | 11 +-
+ drivers/perf/qcom_l3_pmu.c | 15 +-
+ drivers/perf/thunderx2_pmu.c | 4 +-
+ drivers/perf/xgene_pmu.c | 17 +-
+ include/linux/arm-smccc.h | 88 ++++-
+ include/linux/gfp.h | 18 +-
+ include/linux/highmem.h | 43 +--
+ include/linux/interrupt.h | 35 +-
+ include/linux/kasan.h | 64 ++--
+ include/linux/page-flags.h | 9 +
+ include/linux/perf_event.h | 6 +
+ include/trace/events/mmflags.h | 9 +-
+ kernel/irq/manage.c | 33 +-
+ mm/kasan/common.c | 4 +-
+ mm/kasan/hw_tags.c | 32 ++
+ mm/kasan/sw_tags.c | 7 +
+ mm/mempool.c | 6 +-
+ mm/page_alloc.c | 66 ++--
+ scripts/Makefile.kasan | 1 +
+ scripts/tools-support-relr.sh | 3 +-
+ tools/testing/selftests/arm64/fp/sve-probe-vls.c | 2 +-
+ 158 files changed, 3370 insertions(+), 2563 deletions(-)
+ create mode 100644 arch/arm64/include/asm/insn-def.h
+ create mode 100644 arch/arm64/include/asm/patching.h
+ create mode 100644 arch/arm64/kernel/idle.c
+ create mode 100644 arch/arm64/kernel/patching.c
+ rename arch/arm64/{kernel => lib}/insn.c (86%)
+ create mode 100644 arch/arm64/lib/kasan_sw_tags.S
+ delete mode 100644 arch/arm64/lib/memmove.S
+Merging arm-perf/for-next/perf (d96b1b8c9f79 drivers/perf: fix the missed ida_simple_remove() in ddr_perf_probe())
+$ git merge arm-perf/for-next/perf
+Already up to date.
+Merging arm-soc/for-next (e12b6e5b0ac3 ARM: Document merges)
+$ git merge arm-soc/for-next
+Removing include/linux/pl353-smc.h
+Auto-merging drivers/regulator/core.c
+Removing arch/arm64/boot/dts/qcom/msm8996-pins.dtsi
+Auto-merging arch/arm/boot/dts/dra74x.dtsi
+Auto-merging arch/arm/boot/dts/dra72x.dtsi
+Auto-merging arch/arm/boot/dts/dra7-l4.dtsi
+Auto-merging arch/arm/Kconfig.debug
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/memory-controllers/pl353-smc.txt
+Removing Documentation/devicetree/bindings/clock/nvidia,tegra30-car.txt
+Removing Documentation/devicetree/bindings/clock/nvidia,tegra210-car.txt
+Removing Documentation/devicetree/bindings/clock/nvidia,tegra20-car.txt
+Removing Documentation/devicetree/bindings/clock/nvidia,tegra124-car.txt
+Removing Documentation/devicetree/bindings/clock/nvidia,tegra114-car.txt
+Removing Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/amlogic.yaml | 1 +
+ .../devicetree/bindings/arm/bcm/bcm2835.yaml | 1 +
+ Documentation/devicetree/bindings/arm/fsl.yaml | 13 +
+ .../devicetree/bindings/arm/intel-ixp4xx.yaml | 1 +
+ .../devicetree/bindings/arm/mediatek.yaml | 29 +-
+ Documentation/devicetree/bindings/arm/qcom.yaml | 1 +
+ Documentation/devicetree/bindings/arm/renesas.yaml | 18 +
+ Documentation/devicetree/bindings/arm/sunxi.yaml | 11 +
+ .../bindings/arm/tegra/nvidia,tegra20-pmc.yaml | 35 +
+ .../bindings/clock/brcm,iproc-clocks.txt | 313 ---
+ .../bindings/clock/brcm,iproc-clocks.yaml | 395 ++++
+ .../bindings/clock/nvidia,tegra114-car.txt | 63 -
+ .../bindings/clock/nvidia,tegra124-car.txt | 107 -
+ .../bindings/clock/nvidia,tegra124-car.yaml | 115 ++
+ .../bindings/clock/nvidia,tegra20-car.txt | 63 -
+ .../bindings/clock/nvidia,tegra20-car.yaml | 69 +
+ .../bindings/clock/nvidia,tegra210-car.txt | 56 -
+ .../bindings/clock/nvidia,tegra30-car.txt | 63 -
+ .../devicetree/bindings/firmware/qcom,scm.txt | 1 +
+ Documentation/devicetree/bindings/i2c/i2c-at91.txt | 2 +-
+ .../devicetree/bindings/iommu/arm,smmu.yaml | 11 +-
+ .../bindings/memory-controllers/arm,pl353-smc.yaml | 131 ++
+ .../bindings/memory-controllers/pl353-smc.txt | 47 -
+ .../devicetree/bindings/net/stm32-dwmac.yaml | 6 +-
+ .../devicetree/bindings/power/fsl,imx-gpcv2.yaml | 13 +
+ .../devicetree/bindings/power/qcom,rpmpd.yaml | 2 +
+ .../bindings/power/renesas,rzg2l-sysc.yaml | 63 +
+ .../bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 3 +
+ .../devicetree/bindings/reset/microchip,rst.yaml | 58 +
+ .../devicetree/bindings/soc/mediatek/pwrap.txt | 1 +
+ .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 2 +
+ .../bindings/sound/allwinner,sun4i-a10-i2s.yaml | 3 +
+ .../sound/allwinner,sun8i-a23-codec-analog.yaml | 9 +-
+ .../bindings/sound/allwinner,sun8i-a33-codec.yaml | 8 +-
+ .../bindings/timer/allwinner,sun4i-a10-timer.yaml | 42 +-
+ .../devicetree/bindings/vendor-prefixes.yaml | 8 +
+ MAINTAINERS | 27 +-
+ arch/arm/Kconfig.debug | 11 +
+ arch/arm/arm-soc-for-next-contents.txt | 158 ++
+ arch/arm/boot/dts/Makefile | 13 +-
+ arch/arm/boot/dts/am335x-baltos.dtsi | 4 +-
+ arch/arm/boot/dts/am335x-boneblack-wireless.dts | 2 +-
+ arch/arm/boot/dts/am335x-boneblue.dts | 2 +-
+ arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 4 +-
+ arch/arm/boot/dts/am335x-evmsk.dts | 2 +-
+ arch/arm/boot/dts/am335x-icev2.dts | 4 +-
+ arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi | 2 +-
+ arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi | 2 +-
+ arch/arm/boot/dts/am335x-osd3358-sm-red.dts | 132 +-
+ arch/arm/boot/dts/am335x-shc.dts | 8 +-
+ arch/arm/boot/dts/am33xx-l4.dtsi | 4 +-
+ arch/arm/boot/dts/am437x-gp-evm.dts | 9 +-
+ arch/arm/boot/dts/am437x-l4.dtsi | 16 +-
+ arch/arm/boot/dts/am43x-epos-evm.dts | 2 +-
+ arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 13 +-
+ arch/arm/boot/dts/aspeed-ast2500-evb.dts | 2 +-
+ arch/arm/boot/dts/aspeed-ast2600-evb-a1.dts | 15 +
+ arch/arm/boot/dts/aspeed-ast2600-evb.dts | 119 +-
+ arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 2 +-
+ arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts | 59 +-
+ .../boot/dts/aspeed-bmc-arm-centriq2400-rep.dts | 2 +-
+ .../dts/aspeed-bmc-arm-stardragon4800-rep2.dts | 2 +-
+ arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts | 2 +-
+ arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts | 2 +-
+ arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts | 2 +-
+ .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 2 +-
+ arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 2060 ++++++++++++++++++--
+ arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts | 30 -
+ arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts | 2 +-
+ arch/arm/boot/dts/aspeed-bmc-inspur-on5263m5.dts | 2 +-
+ arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 2 +-
+ arch/arm/boot/dts/aspeed-bmc-lenovo-hr630.dts | 2 +-
+ arch/arm/boot/dts/aspeed-bmc-lenovo-hr855xg2.dts | 2 +-
+ arch/arm/boot/dts/aspeed-bmc-microsoft-olympus.dts | 2 +-
+ arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 2 +-
+ arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts | 2 +-
+ arch/arm/boot/dts/aspeed-bmc-opp-mowgli.dts | 2 +-
+ 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 | 2 +-
+ arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 2 +-
+ arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts | 2 +-
+ arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 2 +-
+ arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 2 +-
+ arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts | 2 +-
+ arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts | 2 +-
+ arch/arm/boot/dts/aspeed-bmc-supermicro-x11spi.dts | 2 +-
+ arch/arm/boot/dts/aspeed-g5.dtsi | 1 +
+ arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi | 10 +
+ arch/arm/boot/dts/bcm-cygnus.dtsi | 2 +-
+ arch/arm/boot/dts/bcm-hr2.dtsi | 2 +-
+ arch/arm/boot/dts/bcm-nsp.dtsi | 2 +-
+ arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 85 +-
+ arch/arm/boot/dts/bcm2711-rpi-400.dts | 45 +
+ arch/arm/boot/dts/bcm2711-rpi.dtsi | 74 +
+ arch/arm/boot/dts/bcm2711.dtsi | 3 +-
+ arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 4 +-
+ arch/arm/boot/dts/bcm2835-rpi-a.dts | 2 +-
+ arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 4 +-
+ arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 2 +-
+ arch/arm/boot/dts/bcm2835-rpi-b.dts | 2 +-
+ arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi | 2 +-
+ arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 2 +-
+ arch/arm/boot/dts/bcm2835-rpi-zero.dts | 2 +-
+ arch/arm/boot/dts/bcm2835-rpi.dtsi | 2 +-
+ arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 4 +-
+ arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 4 +-
+ arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 4 +-
+ arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 2 +-
+ arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 2 +-
+ arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi | 2 +-
+ arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi | 2 +-
+ arch/arm/boot/dts/bcm283x.dtsi | 2 +-
+ arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 4 +-
+ arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 4 +-
+ arch/arm/boot/dts/bcm47094.dtsi | 2 +-
+ arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 4 +-
+ arch/arm/boot/dts/bcm5301x.dtsi | 26 +-
+ arch/arm/boot/dts/bcm63138.dtsi | 2 +-
+ arch/arm/boot/dts/bcm7445-bcm97445svmb.dts | 4 +-
+ arch/arm/boot/dts/bcm7445.dtsi | 2 +-
+ arch/arm/boot/dts/bcm911360_entphn.dts | 4 +-
+ arch/arm/boot/dts/bcm953012k.dts | 4 +-
+ arch/arm/boot/dts/bcm958300k.dts | 4 +-
+ arch/arm/boot/dts/bcm958305k.dts | 4 +-
+ arch/arm/boot/dts/bcm958522er.dts | 4 +-
+ arch/arm/boot/dts/bcm958525er.dts | 4 +-
+ arch/arm/boot/dts/bcm958525xmc.dts | 4 +-
+ arch/arm/boot/dts/bcm958622hr.dts | 4 +-
+ arch/arm/boot/dts/bcm958623hr.dts | 4 +-
+ arch/arm/boot/dts/bcm958625hr.dts | 4 +-
+ arch/arm/boot/dts/bcm958625k.dts | 4 +-
+ arch/arm/boot/dts/bcm963138dvt.dts | 4 +-
+ arch/arm/boot/dts/bcm988312hr.dts | 4 +-
+ arch/arm/boot/dts/dm816x.dtsi | 2 +-
+ arch/arm/boot/dts/dra7-evm.dts | 2 +-
+ arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi | 6 +-
+ arch/arm/boot/dts/dra7-l4.dtsi | 24 +-
+ arch/arm/boot/dts/dra71-evm.dts | 2 +-
+ arch/arm/boot/dts/dra72-evm-common.dtsi | 2 +-
+ arch/arm/boot/dts/dra72x.dtsi | 6 +-
+ arch/arm/boot/dts/dra74-ipu-dsp-common.dtsi | 2 +-
+ arch/arm/boot/dts/dra74x.dtsi | 8 +-
+ arch/arm/boot/dts/dra76-evm.dts | 37 +-
+ arch/arm/boot/dts/exynos3250-rinato.dts | 2 +-
+ arch/arm/boot/dts/exynos4210-i9100.dts | 8 +-
+ arch/arm/boot/dts/exynos4210-trats.dts | 2 +-
+ arch/arm/boot/dts/exynos4210-universal_c210.dts | 2 +-
+ arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 1 +
+ arch/arm/boot/dts/exynos4412-midas.dtsi | 1 +
+ arch/arm/boot/dts/exynos4412-n710x.dts | 4 +-
+ arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 1 +
+ arch/arm/boot/dts/exynos4412-origen.dts | 1 +
+ arch/arm/boot/dts/exynos4412-p4note.dtsi | 1 +
+ arch/arm/boot/dts/exynos5250-arndale.dts | 1 +
+ arch/arm/boot/dts/exynos5410-odroidxu.dts | 1 +
+ arch/arm/boot/dts/exynos5420-arndale-octa.dts | 1 +
+ arch/arm/boot/dts/exynos5420-smdk5420.dts | 1 +
+ arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 1 +
+ arch/arm/boot/dts/exynos5422-odroidhc1.dts | 2 +-
+ arch/arm/boot/dts/exynos5422-odroidxu4.dts | 2 +-
+ arch/arm/boot/dts/exynos54xx-odroidxu-leds.dtsi | 4 +-
+ arch/arm/boot/dts/gemini-dlink-dir-685.dts | 11 +-
+ arch/arm/boot/dts/gemini-dlink-dns-313.dts | 4 +-
+ arch/arm/boot/dts/gemini-nas4220b.dts | 2 +-
+ arch/arm/boot/dts/gemini-rut1xx.dts | 14 +-
+ arch/arm/boot/dts/gemini-sl93512r.dts | 6 +-
+ arch/arm/boot/dts/gemini-sq201.dts | 6 +-
+ arch/arm/boot/dts/gemini-wbd111.dts | 2 +-
+ arch/arm/boot/dts/gemini-wbd222.dts | 2 +-
+ arch/arm/boot/dts/gemini.dtsi | 13 +-
+ arch/arm/boot/dts/imx25-pinfunc.h | 12 +-
+ arch/arm/boot/dts/imx28-lwe.dtsi | 170 ++
+ arch/arm/boot/dts/imx28-xea.dts | 99 +
+ arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 2 +-
+ arch/arm/boot/dts/imx53-ard.dts | 2 +-
+ arch/arm/boot/dts/imx6dl-b105pv2.dts | 32 +
+ arch/arm/boot/dts/imx6dl-b105v2.dts | 32 +
+ arch/arm/boot/dts/imx6dl-b125pv2.dts | 30 +
+ arch/arm/boot/dts/imx6dl-b125v2.dts | 30 +
+ arch/arm/boot/dts/imx6dl-b155v2.dts | 32 +
+ arch/arm/boot/dts/imx6dl-b1x5pv2.dtsi | 413 ++++
+ arch/arm/boot/dts/imx6dl-b1x5v2.dtsi | 58 +
+ arch/arm/boot/dts/imx6dl-plym2m.dts | 6 +-
+ arch/arm/boot/dts/imx6dl-prtvt7.dts | 36 +-
+ arch/arm/boot/dts/imx6dl-qmx6.dtsi | 612 ++++++
+ arch/arm/boot/dts/imx6dl-riotboard.dts | 2 +
+ arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 3 +
+ arch/arm/boot/dts/imx6q-dhcom-som.dtsi | 71 +-
+ arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 2 +-
+ arch/arm/boot/dts/imx6q-ds.dts | 17 +
+ arch/arm/boot/dts/imx6qdl-ds.dtsi | 458 +++++
+ arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 5 +-
+ arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 10 +
+ arch/arm/boot/dts/imx6qdl-vicut1.dtsi | 41 +-
+ arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi | 1 -
+ arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 50 +-
+ arch/arm/boot/dts/imx7d-sdb.dts | 7 +
+ arch/arm/boot/dts/intel-ixp42x-linksys-nslu2.dts | 79 +-
+ .../arm/boot/dts/intel-ixp42x-welltech-epbx100.dts | 76 +
+ arch/arm/boot/dts/intel-ixp42x.dtsi | 4 +
+ .../arm/boot/dts/intel-ixp43x-gateworks-gw2358.dts | 104 +-
+ arch/arm/boot/dts/intel-ixp43x.dtsi | 4 +
+ arch/arm/boot/dts/intel-ixp45x-ixp46x.dtsi | 33 +
+ arch/arm/boot/dts/intel-ixp4xx.dtsi | 92 +-
+ arch/arm/boot/dts/keystone-k2g-evm.dts | 11 +-
+ arch/arm/boot/dts/keystone-k2g.dtsi | 6 +-
+ arch/arm/boot/dts/meson.dtsi | 1 +
+ arch/arm/boot/dts/mstar-v7.dtsi | 14 +
+ arch/arm/boot/dts/omap2420.dtsi | 5 +-
+ arch/arm/boot/dts/omap2430.dtsi | 2 +-
+ arch/arm/boot/dts/omap3-evm-processor-common.dtsi | 2 +-
+ arch/arm/boot/dts/omap3-gta04a5.dts | 2 +-
+ arch/arm/boot/dts/omap3.dtsi | 2 +-
+ arch/arm/boot/dts/omap4-l4.dtsi | 4 +-
+ arch/arm/boot/dts/omap5-board-common.dtsi | 2 +-
+ arch/arm/boot/dts/omap5-l4.dtsi | 4 +-
+ arch/arm/boot/dts/openbmc-flash-layout-64.dtsi | 18 +-
+ arch/arm/boot/dts/qcom-ipq8064-rb3011.dts | 58 +
+ arch/arm/boot/dts/qcom-ipq8064.dtsi | 425 ++++
+ arch/arm/boot/dts/r8a7742.dtsi | 6 +-
+ arch/arm/boot/dts/r8a7743.dtsi | 4 +-
+ arch/arm/boot/dts/r8a7744.dtsi | 4 +-
+ arch/arm/boot/dts/r8a7745.dtsi | 4 +-
+ arch/arm/boot/dts/r8a77470.dtsi | 4 +-
+ arch/arm/boot/dts/r8a7778.dtsi | 3 +
+ arch/arm/boot/dts/r8a7779-marzen.dts | 2 +-
+ arch/arm/boot/dts/r8a7779.dtsi | 4 +
+ arch/arm/boot/dts/r8a7790-lager.dts | 8 +
+ arch/arm/boot/dts/r8a7790.dtsi | 10 +-
+ arch/arm/boot/dts/r8a7791-koelsch.dts | 4 +-
+ arch/arm/boot/dts/r8a7791.dtsi | 4 +-
+ arch/arm/boot/dts/r8a7792-blanche.dts | 8 +
+ arch/arm/boot/dts/r8a7792.dtsi | 4 +-
+ arch/arm/boot/dts/r8a7793-gose.dts | 10 +-
+ arch/arm/boot/dts/r8a7793.dtsi | 3 +-
+ arch/arm/boot/dts/r8a7794-alt.dts | 42 +
+ arch/arm/boot/dts/r8a7794-silk.dts | 10 +-
+ arch/arm/boot/dts/r8a7794.dtsi | 4 +-
+ arch/arm/boot/dts/s5pv210-goni.dts | 9 -
+ arch/arm/boot/dts/sama5d4.dtsi | 2 +-
+ arch/arm/boot/dts/ste-ab8500.dtsi | 28 +-
+ arch/arm/boot/dts/ste-ab8505.dtsi | 24 +-
+ arch/arm/boot/dts/ste-href-ab8500.dtsi | 2 +-
+ arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi | 6 +
+ arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi | 4 +-
+ arch/arm/boot/dts/ste-href.dtsi | 2 +-
+ arch/arm/boot/dts/ste-snowball.dts | 2 +-
+ arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 3 +-
+ arch/arm/boot/dts/ste-ux500-samsung-janice.dts | 11 +-
+ arch/arm/boot/dts/ste-ux500-samsung-skomer.dts | 3 +-
+ arch/arm/boot/dts/stm32429i-eval.dts | 8 +-
+ arch/arm/boot/dts/stm32746g-eval.dts | 6 +-
+ arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 2 +-
+ arch/arm/boot/dts/stm32f429-disco.dts | 6 +-
+ arch/arm/boot/dts/stm32f429-pinctrl.dtsi | 72 +-
+ arch/arm/boot/dts/stm32f429.dtsi | 10 +-
+ arch/arm/boot/dts/stm32f469-disco.dts | 6 +-
+ arch/arm/boot/dts/stm32f469-pinctrl.dtsi | 74 +-
+ arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 2 +-
+ arch/arm/boot/dts/stm32f746.dtsi | 12 +-
+ arch/arm/boot/dts/stm32f769-disco.dts | 6 +-
+ arch/arm/boot/dts/stm32h743.dtsi | 4 -
+ arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 33 +
+ arch/arm/boot/dts/stm32mp151.dtsi | 16 +-
+ ...m32mp157a-microgea-stm32mp1-microdev2.0-of7.dts | 2 +-
+ arch/arm/boot/dts/stm32mp157a-stinger96.dtsi | 7 +-
+ arch/arm/boot/dts/stm32mp157c-odyssey-som.dtsi | 7 +-
+ arch/arm/boot/dts/stm32mp157c-odyssey.dts | 2 +-
+ arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi | 7 +-
+ arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 17 +-
+ arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 2 +-
+ arch/arm/boot/dts/stm32mp15xx-osd32.dtsi | 7 +-
+ arch/arm/boot/dts/sun8i-a33.dtsi | 4 +-
+ arch/arm/boot/dts/sun8i-r40-feta40i.dtsi | 106 +
+ arch/arm/boot/dts/sun8i-r40-oka40i-c.dts | 203 ++
+ arch/arm/boot/dts/sun8i-r40.dtsi | 56 +
+ arch/arm/boot/dts/sun8i-v3.dtsi | 31 +
+ arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts | 17 +-
+ arch/arm/boot/dts/sun8i-v3s.dtsi | 48 +
+ arch/arm/boot/dts/tegra124.dtsi | 3 +-
+ arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 21 +-
+ arch/arm/boot/dts/tegra20-harmony.dts | 2 +-
+ arch/arm/boot/dts/tegra20-medcom-wide.dts | 2 +-
+ arch/arm/boot/dts/tegra20-paz00.dts | 43 +-
+ arch/arm/boot/dts/tegra20-plutux.dts | 2 +-
+ arch/arm/boot/dts/tegra20-seaboard.dts | 2 +-
+ arch/arm/boot/dts/tegra20-tec.dts | 2 +-
+ arch/arm/boot/dts/tegra20-ventana.dts | 2 +-
+ .../dts/tegra30-asus-nexus7-grouper-common.dtsi | 16 +-
+ .../tegra30-asus-nexus7-grouper-maxim-pmic.dtsi | 9 +
+ .../dts/tegra30-asus-nexus7-grouper-ti-pmic.dtsi | 11 +-
+ arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +-
+ arch/arm/boot/dts/tegra30-ouya.dts | 4 +-
+ arch/arm/boot/dts/tegra30.dtsi | 3 +-
+ arch/arm/configs/aspeed_g4_defconfig | 1 +
+ arch/arm/configs/aspeed_g5_defconfig | 2 +
+ arch/arm/configs/at91_dt_defconfig | 2 +
+ arch/arm/configs/exynos_defconfig | 1 +
+ arch/arm/configs/imx_v6_v7_defconfig | 2 +
+ arch/arm/configs/ixp4xx_defconfig | 3 +
+ arch/arm/configs/omap2plus_defconfig | 5 +
+ arch/arm/configs/shmobile_defconfig | 1 -
+ arch/arm/configs/tegra_defconfig | 1 +
+ arch/arm/mach-exynos/exynos.c | 2 +
+ arch/arm/mach-imx/Makefile | 2 +-
+ arch/arm/mach-imx/common.h | 3 +
+ arch/arm/mach-imx/headsmp.S | 9 +
+ arch/arm/mach-imx/hotplug.c | 3 +
+ arch/arm/mach-imx/mach-imx50.c | 7 +
+ arch/arm/mach-imx/mach-imx6q.c | 88 -
+ arch/arm/mach-imx/mach-imx6sx.c | 26 -
+ arch/arm/mach-imx/mach-imx7d.c | 25 +-
+ arch/arm/mach-imx/platsmp.c | 26 +
+ arch/arm/mach-imx/src.c | 101 +-
+ arch/arm/mach-imx/suspend-imx53.S | 4 +-
+ arch/arm/mach-omap1/Kconfig | 12 +-
+ arch/arm/mach-omap2/cm.h | 1 -
+ arch/arm/mach-omap2/cm_common.c | 13 -
+ arch/arm/mach-omap2/control.c | 5 -
+ arch/arm/mach-omap2/control.h | 1 -
+ arch/arm/mach-s3c/mach-rx1950.c | 1 -
+ arch/arm64/Kconfig.platforms | 1 +
+ arch/arm64/boot/dts/allwinner/Makefile | 1 +
+ .../boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 25 +
+ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 62 +-
+ .../boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts | 195 ++
+ arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 9 +
+ arch/arm64/boot/dts/amlogic/Makefile | 1 +
+ arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 1 +
+ arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 1 +
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 1 +
+ arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 41 +-
+ .../boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 646 ++++++
+ .../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 13 +
+ .../arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts | 17 -
+ .../boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 48 +-
+ arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 9 +-
+ arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 10 +
+ arch/arm64/boot/dts/arm/juno-base.dtsi | 6 +-
+ arch/arm64/boot/dts/broadcom/Makefile | 3 +-
+ arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts | 2 +
+ arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 2 +-
+ .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 8 +-
+ .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 1 +
+ arch/arm64/boot/dts/freescale/Makefile | 1 +
+ arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts | 4 +
+ arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 14 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 4 +
+ arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 24 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 12 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 24 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 24 +-
+ arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 16 +-
+ arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi | 16 +-
+ arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 1 -
+ arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 24 +-
+ arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi | 50 +-
+ arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 1 +
+ .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 1019 ++++++++++
+ arch/arm64/boot/dts/freescale/imx8mm.dtsi | 363 ++--
+ .../boot/dts/freescale/imx8mn-beacon-som.dtsi | 3 +
+ arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 1 +
+ arch/arm64/boot/dts/freescale/imx8mn.dtsi | 147 +-
+ arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 139 ++
+ .../boot/dts/freescale/imx8mp-phycore-som.dtsi | 25 +
+ arch/arm64/boot/dts/freescale/imx8mp.dtsi | 18 +-
+ arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 1 +
+ arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dts | 182 ++
+ arch/arm64/boot/dts/freescale/imx8mq.dtsi | 16 +
+ arch/arm64/boot/dts/mediatek/Makefile | 8 +
+ arch/arm64/boot/dts/mediatek/mt8167.dtsi | 121 ++
+ arch/arm64/boot/dts/mediatek/mt8173.dtsi | 60 +-
+ arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 5 +
+ .../dts/mediatek/mt8183-kukui-jacuzzi-burnet.dts | 30 +
+ .../mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts | 44 +
+ .../mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts | 32 +
+ .../dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi | 27 +
+ .../dts/mediatek/mt8183-kukui-jacuzzi-fennel14.dts | 16 +
+ .../dts/mediatek/mt8183-kukui-jacuzzi-kappa.dts | 16 +
+ .../dts/mediatek/mt8183-kukui-jacuzzi-kenzo.dts | 12 +
+ .../mediatek/mt8183-kukui-jacuzzi-willow-sku0.dts | 13 +
+ .../mediatek/mt8183-kukui-jacuzzi-willow-sku1.dts | 12 +
+ .../dts/mediatek/mt8183-kukui-jacuzzi-willow.dtsi | 26 +
+ .../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 8 +
+ .../boot/dts/mediatek/mt8183-kukui-kakadu.dtsi | 4 +
+ .../boot/dts/mediatek/mt8183-kukui-kodama.dtsi | 4 +
+ .../boot/dts/mediatek/mt8183-kukui-krane.dtsi | 4 +
+ arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 23 +
+ arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts | 5 +
+ arch/arm64/boot/dts/mediatek/mt8183.dtsi | 110 +-
+ arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 4 +-
+ arch/arm64/boot/dts/nvidia/tegra186.dtsi | 4 +-
+ arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 4 +-
+ .../arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi | 595 +++++-
+ arch/arm64/boot/dts/nvidia/tegra194.dtsi | 100 +
+ arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 2 +-
+ arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 2 +-
+ arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 4 +-
+ arch/arm64/boot/dts/qcom/Makefile | 10 +-
+ arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 93 +-
+ arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 24 +-
+ arch/arm64/boot/dts/qcom/ipq8074-hk10-c1.dts | 11 +
+ arch/arm64/boot/dts/qcom/ipq8074-hk10-c2.dts | 10 +
+ arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi | 76 +
+ arch/arm64/boot/dts/qcom/ipq8074.dtsi | 5 +-
+ .../boot/dts/qcom/msm8916-alcatel-idol347.dts | 26 +
+ arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 454 +++++
+ .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 131 ++
+ .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 47 +
+ .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 26 +
+ .../arm64/boot/dts/qcom/msm8994-angler-rev-101.dts | 4 +
+ arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/msm8996-pins.dtsi | 653 -------
+ arch/arm64/boot/dts/qcom/msm8996.dtsi | 999 +++++++++-
+ arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/pm6150.dtsi | 24 +
+ arch/arm64/boot/dts/qcom/pm7325.dtsi | 53 +
+ arch/arm64/boot/dts/qcom/pm8350c.dtsi | 32 +-
+ arch/arm64/boot/dts/qcom/pm8994.dtsi | 8 +-
+ arch/arm64/boot/dts/qcom/pmi8994.dtsi | 13 +
+ arch/arm64/boot/dts/qcom/pmk8350.dtsi | 51 +-
+ arch/arm64/boot/dts/qcom/pmr735a.dtsi | 32 +-
+ arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/qcs404.dtsi | 4 +-
+ arch/arm64/boot/dts/qcom/sc7180-idp.dts | 169 +-
+ .../boot/dts/qcom/sc7180-trogdor-coachz-r1-lte.dts | 4 +-
+ .../boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 22 +-
+ ...r2-lte.dts => sc7180-trogdor-coachz-r3-lte.dts} | 6 +-
+ ...-coachz-r2.dts => sc7180-trogdor-coachz-r3.dts} | 4 +-
+ .../arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 64 +
+ .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 9 -
+ .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 9 -
+ .../boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 9 -
+ arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 9 +
+ .../boot/dts/qcom/sc7180-trogdor-pompom-r1.dts | 12 +
+ .../boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts | 4 +-
+ .../boot/dts/qcom/sc7180-trogdor-pompom-r2.dts | 38 +-
+ .../boot/dts/qcom/sc7180-trogdor-pompom-r3-lte.dts | 14 +
+ .../boot/dts/qcom/sc7180-trogdor-pompom-r3.dts | 15 +
+ .../arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 29 +
+ arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 121 +-
+ arch/arm64/boot/dts/qcom/sc7180.dtsi | 122 +-
+ arch/arm64/boot/dts/qcom/sc7280-idp.dts | 36 +-
+ arch/arm64/boot/dts/qcom/sc7280.dtsi | 1171 +++++++++++
+ arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 4 -
+ arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 5 +
+ .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 18 +
+ .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 114 ++
+ arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 +-
+ .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 2 +
+ .../boot/dts/qcom/sm8150-microsoft-surface-duo.dts | 543 ++++++
+ arch/arm64/boot/dts/qcom/sm8150.dtsi | 72 +-
+ arch/arm64/boot/dts/qcom/sm8250.dtsi | 4 +-
+ arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 6 +
+ arch/arm64/boot/dts/qcom/sm8350.dtsi | 64 +-
+ arch/arm64/boot/dts/renesas/Makefile | 2 +
+ .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 4 +-
+ .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 8 +-
+ arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 2 +
+ arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/r8a77951.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/r8a77960.dtsi | 8 +-
+ arch/arm64/boot/dts/renesas/r8a77961.dtsi | 19 +-
+ arch/arm64/boot/dts/renesas/r8a77965.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 8 +
+ arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 2 +-
+ arch/arm64/boot/dts/renesas/r8a77970.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 8 +-
+ arch/arm64/boot/dts/renesas/r8a77980.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/r8a77990.dtsi | 1 +
+ arch/arm64/boot/dts/renesas/r8a77995.dtsi | 1 +
+ .../boot/dts/renesas/r8a779a0-falcon-csi-dsi.dtsi | 21 +
+ arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 7 +-
+ arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 132 ++
+ arch/arm64/boot/dts/renesas/r9a07g044l1.dtsi | 25 +
+ arch/arm64/boot/dts/renesas/r9a07g044l2-smarc.dts | 21 +
+ arch/arm64/boot/dts/renesas/r9a07g044l2.dtsi | 13 +
+ arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 27 +
+ arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts | 8 +
+ arch/arm64/boot/dts/toshiba/tmpv7708.dtsi | 9 +
+ arch/arm64/boot/dts/toshiba/tmpv7708_pins.dtsi | 5 +
+ arch/arm64/configs/defconfig | 15 +-
+ drivers/bus/qcom-ebi2.c | 4 +-
+ drivers/clk/tegra/clk-periph-gate.c | 80 +-
+ drivers/clk/tegra/clk-periph.c | 11 +
+ drivers/clk/tegra/clk-pll.c | 12 +-
+ drivers/clk/tegra/clk-tegra-periph.c | 6 +-
+ drivers/clk/tegra/clk-tegra-super-cclk.c | 16 +-
+ drivers/clk/tegra/clk-tegra20.c | 6 +-
+ drivers/clk/tegra/clk-tegra30.c | 6 +-
+ drivers/clk/tegra/clk.h | 4 -
+ drivers/firmware/Kconfig | 3 +-
+ drivers/firmware/Makefile | 1 +
+ drivers/firmware/arm_ffa/Kconfig | 21 +
+ drivers/firmware/arm_ffa/Makefile | 6 +
+ drivers/firmware/arm_ffa/bus.c | 210 ++
+ drivers/firmware/arm_ffa/common.h | 31 +
+ drivers/firmware/arm_ffa/driver.c | 731 +++++++
+ drivers/firmware/arm_ffa/smccc.c | 39 +
+ drivers/firmware/arm_scmi/common.h | 2 +-
+ drivers/firmware/arm_scmi/driver.c | 24 +-
+ drivers/firmware/arm_scmi/mailbox.c | 3 +
+ drivers/firmware/arm_scmi/scmi_pm_domain.c | 26 +
+ drivers/firmware/arm_scmi/smc.c | 3 +
+ drivers/firmware/arm_scpi.c | 11 +
+ drivers/firmware/qcom_scm.c | 3 +
+ drivers/firmware/tegra/Makefile | 1 +
+ drivers/firmware/tegra/bpmp-private.h | 3 +-
+ drivers/firmware/tegra/bpmp-tegra210.c | 2 +-
+ drivers/firmware/tegra/bpmp.c | 3 +-
+ drivers/iommu/arm/arm-smmu/arm-smmu-impl.c | 3 +-
+ drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c | 90 +-
+ drivers/iommu/arm/arm-smmu/arm-smmu.c | 13 +
+ drivers/iommu/arm/arm-smmu/arm-smmu.h | 1 +
+ drivers/iommu/tegra-smmu.c | 16 +-
+ drivers/memory/atmel-ebi.c | 4 +-
+ drivers/memory/emif.c | 678 -------
+ drivers/memory/fsl_ifc.c | 8 +-
+ drivers/memory/pl353-smc.c | 315 +--
+ drivers/memory/stm32-fmc2-ebi.c | 4 +
+ drivers/memory/tegra/Kconfig | 18 +-
+ drivers/memory/tegra/Makefile | 6 +-
+ drivers/memory/tegra/mc.c | 321 ++-
+ drivers/memory/tegra/mc.h | 25 +
+ drivers/memory/tegra/tegra114.c | 1245 ++++++------
+ drivers/memory/tegra/tegra124-emc.c | 8 +-
+ drivers/memory/tegra/tegra124.c | 1306 +++++++------
+ drivers/memory/tegra/tegra186.c | 1679 +++++-----------
+ drivers/memory/tegra/tegra194.c | 1351 +++++++++++++
+ drivers/memory/tegra/tegra20-emc.c | 52 +-
+ drivers/memory/tegra/tegra20.c | 110 +-
+ drivers/memory/tegra/tegra210-emc-core.c | 4 -
+ drivers/memory/tegra/tegra210.c | 1433 ++++++++------
+ drivers/memory/tegra/tegra30-emc.c | 56 +-
+ drivers/memory/tegra/tegra30.c | 1292 ++++++------
+ drivers/regulator/core.c | 23 +
+ drivers/reset/Kconfig | 17 +-
+ drivers/reset/Makefile | 1 +
+ drivers/reset/core.c | 25 +-
+ drivers/reset/hisilicon/hi6220_reset.c | 2 +-
+ drivers/reset/reset-a10sr.c | 1 +
+ drivers/reset/reset-bcm6345.c | 2 +-
+ drivers/reset/reset-berlin.c | 12 +-
+ drivers/reset/reset-brcmstb.c | 1 +
+ drivers/reset/reset-lantiq.c | 2 +-
+ drivers/reset/reset-microchip-sparx5.c | 146 ++
+ drivers/reset/reset-oxnas.c | 2 +-
+ drivers/reset/reset-ti-syscon.c | 4 +-
+ drivers/reset/reset-uniphier.c | 2 +-
+ drivers/reset/reset-zynqmp.c | 4 +-
+ drivers/reset/sti/reset-syscfg.c | 2 +-
+ drivers/soc/amlogic/meson-ee-pwrc.c | 46 +-
+ drivers/soc/bcm/brcmstb/common.c | 5 -
+ drivers/soc/imx/gpcv2.c | 634 ++++--
+ drivers/soc/imx/soc-imx.c | 3 +
+ drivers/soc/mediatek/mtk-devapc.c | 1 +
+ drivers/soc/mediatek/mtk-pm-domains.c | 42 +-
+ drivers/soc/mediatek/mtk-pmic-wrap.c | 35 +
+ drivers/soc/qcom/rpmhpd.c | 21 +
+ drivers/soc/qcom/rpmpd.c | 22 +
+ drivers/soc/qcom/smd-rpm.c | 2 +
+ drivers/soc/qcom/socinfo.c | 56 +-
+ drivers/soc/renesas/Kconfig | 5 +
+ drivers/soc/renesas/renesas-soc.c | 33 +-
+ drivers/soc/tegra/Kconfig | 2 +
+ drivers/soc/tegra/common.c | 97 +
+ drivers/soc/tegra/fuse/fuse-tegra.c | 6 +-
+ drivers/soc/tegra/fuse/fuse-tegra30.c | 3 +-
+ drivers/soc/tegra/pmc.c | 149 +-
+ drivers/soc/tegra/regulators-tegra20.c | 94 +-
+ drivers/soc/tegra/regulators-tegra30.c | 93 +-
+ drivers/soc/ti/smartreflex.c | 4 +-
+ drivers/soc/ti/wkup_m3_ipc.c | 4 +-
+ include/dt-bindings/clock/r9a07g044-cpg.h | 89 +
+ include/dt-bindings/mailbox/qcom-ipcc.h | 1 +
+ include/dt-bindings/power/imx8mm-power.h | 22 +
+ include/dt-bindings/power/imx8mn-power.h | 15 +
+ include/dt-bindings/power/qcom-rpmpd.h | 21 +
+ include/linux/arm_ffa.h | 267 +++
+ include/linux/clk/tegra.h | 100 +-
+ include/linux/pl353-smc.h | 30 -
+ include/linux/regulator/driver.h | 1 +
+ include/linux/reset-controller.h | 22 +
+ include/linux/soc/samsung/exynos-regs-pmu.h | 6 -
+ include/memory/renesas-rpc-if.h | 6 +-
+ include/soc/imx/cpu.h | 1 +
+ include/soc/tegra/common.h | 31 +
+ include/soc/tegra/fuse.h | 20 +-
+ include/soc/tegra/mc.h | 65 +-
+ include/soc/tegra/pmc.h | 7 +
+ 594 files changed, 25094 insertions(+), 8626 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/brcm,iproc-clocks.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra114-car.txt
+ delete mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra124-car.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra124-car.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra20-car.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra20-car.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra210-car.txt
+ delete mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra30-car.txt
+ create mode 100644 Documentation/devicetree/bindings/memory-controllers/arm,pl353-smc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/memory-controllers/pl353-smc.txt
+ create mode 100644 Documentation/devicetree/bindings/power/renesas,rzg2l-sysc.yaml
+ create mode 100644 Documentation/devicetree/bindings/reset/microchip,rst.yaml
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 arch/arm/boot/dts/aspeed-ast2600-evb-a1.dts
+ create mode 100644 arch/arm/boot/dts/bcm2711-rpi-400.dts
+ create mode 100644 arch/arm/boot/dts/bcm2711-rpi.dtsi
+ create mode 100644 arch/arm/boot/dts/imx28-lwe.dtsi
+ create mode 100644 arch/arm/boot/dts/imx28-xea.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-b105pv2.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-b105v2.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-b125pv2.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-b125v2.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-b155v2.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-b1x5pv2.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6dl-b1x5v2.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6dl-qmx6.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6q-ds.dts
+ create mode 100644 arch/arm/boot/dts/imx6qdl-ds.dtsi
+ create mode 100644 arch/arm/boot/dts/intel-ixp42x-welltech-epbx100.dts
+ create mode 100644 arch/arm/boot/dts/sun8i-r40-feta40i.dtsi
+ create mode 100644 arch/arm/boot/dts/sun8i-r40-oka40i-c.dts
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
+ create mode 100644 arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw7901.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-burnet.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel14.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-kappa.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-kenzo.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow-sku0.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow-sku1.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/ipq8074-hk10-c1.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/ipq8074-hk10-c2.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
+ delete mode 100644 arch/arm64/boot/dts/qcom/msm8996-pins.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/pm7325.dtsi
+ rename arch/arm64/boot/dts/qcom/{sc7180-trogdor-coachz-r2-lte.dts => sc7180-trogdor-coachz-r3-lte.dts} (69%)
+ rename arch/arm64/boot/dts/qcom/{sc7180-trogdor-coachz-r2.dts => sc7180-trogdor-coachz-r3.dts} (75%)
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3-lte.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sm8150-microsoft-surface-duo.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044l1.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044l2-smarc.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044l2.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi
+ create mode 100644 drivers/firmware/arm_ffa/Kconfig
+ create mode 100644 drivers/firmware/arm_ffa/Makefile
+ create mode 100644 drivers/firmware/arm_ffa/bus.c
+ create mode 100644 drivers/firmware/arm_ffa/common.h
+ create mode 100644 drivers/firmware/arm_ffa/driver.c
+ create mode 100644 drivers/firmware/arm_ffa/smccc.c
+ create mode 100644 drivers/memory/tegra/tegra194.c
+ create mode 100644 drivers/reset/reset-microchip-sparx5.c
+ create mode 100644 include/dt-bindings/clock/r9a07g044-cpg.h
+ create mode 100644 include/dt-bindings/power/imx8mm-power.h
+ create mode 100644 include/dt-bindings/power/imx8mn-power.h
+ create mode 100644 include/linux/arm_ffa.h
+ delete mode 100644 include/linux/pl353-smc.h
+Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC)
+$ git merge actions/for-next
+Merge made by the 'recursive' strategy.
+Merging amlogic/for-next (b03485fe99f2 Merge tags 'amlogic-arm64-dt-for-v5.14-v2' and 'amlogic-arm-dt-for-v5.14' into for-next)
+$ git merge amlogic/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging aspeed/for-next (cd946cfe2e7e Merge branches 'defconfig-for-v5.14' and 'dt-for-v5.14' into for-next)
+$ git merge aspeed/for-next
+Merge made by the 'recursive' strategy.
+Merging at91/at91-next (80cbaa6d3450 Merge branches 'at91-dt' and 'at91-defconfig' into at91-next)
+$ git merge at91/at91-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging drivers-memory/for-next (316ce128fbbe Merge branch 'for-v5.14/tegra-mc-late-or-fixes' into for-next)
+$ git merge drivers-memory/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 6 ++----
+ include/soc/tegra/mc.h | 9 +++++++--
+ 2 files changed, 9 insertions(+), 6 deletions(-)
+Merging imx-mxs/for-next (5004b2d18827 Merge branch 'imx/defconfig' into for-next)
+$ git merge imx-mxs/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging keystone/next (9d2e21ed98a2 Merge branch 'for_5.12/drivers-soc' into next)
+$ git merge keystone/next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging mediatek/for-next (a1c8c49de3d7 Merge branch 'v5.13-next/soc' into for-next)
+$ git merge mediatek/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging mvebu/for-next (72a0a49b7c77 Merge branch 'mvebu/dt64' into mvebu/for-next)
+$ git merge mvebu/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/phy/phy-mvebu-comphy.txt | 12 ++---
+ .../boot/dts/marvell/armada-3720-turris-mox.dts | 6 +--
+ arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 8 ++++
+ arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 3 +-
+ arch/arm64/boot/dts/marvell/cn9130-db.dts | 2 +-
+ drivers/firmware/turris-mox-rwtm.c | 56 ++++++++++++++++++----
+ 6 files changed, 67 insertions(+), 20 deletions(-)
+Merging omap/for-next (91ee322340fb Merge branch 'omap-for-v5.14/dt' into for-next)
+$ git merge omap/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/am335x-cm-t335.dts | 4 ++--
+ arch/arm/boot/dts/am335x-evm.dts | 2 +-
+ arch/arm/boot/dts/am335x-evmsk.dts | 2 +-
+ arch/arm/boot/dts/am33xx-l4.dtsi | 30 ++++++++-----------------
+ arch/arm/boot/dts/am437x-l4.dtsi | 33 ++++++++++-----------------
+ arch/arm/boot/dts/am43x-epos-evm.dts | 4 ++--
+ arch/arm/boot/dts/da850.dtsi | 21 +++++++----------
+ arch/arm/boot/dts/dm816x.dtsi | 4 ----
+ arch/arm/boot/dts/dra7-evm.dts | 6 ++---
+ arch/arm/boot/dts/dra7-l4.dtsi | 6 ++---
+ arch/arm/boot/dts/dra72-evm-common.dtsi | 4 ++--
+ arch/arm/boot/dts/dra76-evm.dts | 6 ++---
+ arch/arm/boot/dts/omap2.dtsi | 4 ----
+ arch/arm/boot/dts/omap3.dtsi | 6 -----
+ arch/arm/mach-omap2/common.h | 1 -
+ arch/arm/mach-omap2/pm33xx-core.c | 40 +++++++++++++++++++++++++++++++++
+ drivers/bus/ti-sysc.c | 8 +++----
+ 17 files changed, 89 insertions(+), 92 deletions(-)
+Merging qcom/for-next (c275bbc84be9 Merge branches 'arm64-defconfig-for-5.14', 'arm64-for-5.14', 'drivers-for-5.14' and 'dts-for-5.14' into for-next)
+$ git merge qcom/for-next
+Auto-merging arch/arm64/configs/defconfig
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/qcom.yaml | 13 +
+ arch/arm64/boot/dts/qcom/Makefile | 5 +
+ arch/arm64/boot/dts/qcom/ipq8074.dtsi | 15 +
+ arch/arm64/boot/dts/qcom/pm8150.dtsi | 12 +-
+ arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi | 135 +++++
+ arch/arm64/boot/dts/qcom/pmm8155au_2.dtsi | 108 ++++
+ arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 98 +---
+ arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 360 ++++++++++++
+ arch/arm64/boot/dts/qcom/sc7180.dtsi | 20 +-
+ arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 28 +-
+ arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 28 +-
+ .../dts/qcom/sm8150-sony-xperia-kumano-bahamut.dts | 19 +
+ .../dts/qcom/sm8150-sony-xperia-kumano-griffin.dts | 13 +
+ .../boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi | 452 +++++++++++++++
+ arch/arm64/boot/dts/qcom/sm8150.dtsi | 6 +
+ arch/arm64/boot/dts/qcom/sm8250-hdk.dts | 33 +-
+ arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 10 +
+ .../dts/qcom/sm8250-sony-xperia-edo-pdx203.dts | 15 +
+ .../dts/qcom/sm8250-sony-xperia-edo-pdx206.dts | 35 ++
+ .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 636 +++++++++++++++++++++
+ arch/arm64/boot/dts/qcom/sm8250.dtsi | 188 +++++-
+ arch/arm64/configs/defconfig | 2 +
+ 22 files changed, 2092 insertions(+), 139 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/pmm8155au_2.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sa8155p-adp.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano-bahamut.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano-griffin.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx203.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx206.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi
+Merging raspberrypi/for-next (21c6bf8304f0 arm64: dts: broadcom: Add reference to RPi 400)
+$ git merge raspberrypi/for-next
+Already up to date.
+Merging renesas/next (23df6d1f0971 Merge branches 'renesas-arm-defconfig-for-v5.14', 'renesas-arm-dt-for-v5.14', 'renesas-drivers-for-v5.14' and 'renesas-dt-bindings-for-v5.14' into renesas-next)
+$ git merge renesas/next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging reset/reset/next (48a74b1147f7 reset: Add compile-test stubs)
+$ git merge reset/reset/next
+Already up to date.
+Merging rockchip/for-next (764f25388c38 Merge branch 'v5.14-clk/next' into for-next)
+$ git merge rockchip/for-next
+Auto-merging arch/arm64/boot/dts/rockchip/rk3399.dtsi
+Removing Documentation/devicetree/bindings/soc/rockchip/power_domain.txt
+Removing Documentation/devicetree/bindings/soc/rockchip/grf.txt
+Removing Documentation/devicetree/bindings/arm/rockchip/pmu.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/rockchip.yaml | 5 +
+ .../devicetree/bindings/arm/rockchip/pmu.txt | 16 -
+ .../devicetree/bindings/arm/rockchip/pmu.yaml | 55 +
+ .../bindings/phy/phy-rockchip-inno-usb2.yaml | 11 +-
+ .../bindings/power/rockchip,power-controller.yaml | 248 ++
+ .../devicetree/bindings/soc/rockchip/grf.txt | 61 -
+ .../devicetree/bindings/soc/rockchip/grf.yaml | 261 ++
+ .../bindings/soc/rockchip/power_domain.txt | 136 -
+ arch/arm/boot/dts/rk3036-kylin.dts | 2 +-
+ arch/arm/boot/dts/rk3036.dtsi | 72 +-
+ arch/arm/boot/dts/rk3066a-bqcurie2.dts | 5 +
+ arch/arm/boot/dts/rk3066a-marsboard.dts | 4 +
+ arch/arm/boot/dts/rk3066a-mk808.dts | 5 +
+ arch/arm/boot/dts/rk3066a-rayeager.dts | 8 +-
+ arch/arm/boot/dts/rk3066a.dtsi | 71 +-
+ arch/arm/boot/dts/rk3188-bqedison2qc.dts | 6 +
+ arch/arm/boot/dts/rk3188-px3-evb.dts | 5 +
+ arch/arm/boot/dts/rk3188-radxarock.dts | 4 +
+ arch/arm/boot/dts/rk3188.dtsi | 74 +-
+ arch/arm/boot/dts/rk322x.dtsi | 158 +-
+ arch/arm/boot/dts/rk3288-rock2-som.dtsi | 2 +-
+ arch/arm/boot/dts/rk3288-vyasa.dts | 4 +-
+ arch/arm/boot/dts/rk3288.dtsi | 18 +-
+ arch/arm/boot/dts/rk3xxx.dtsi | 17 +-
+ arch/arm/boot/dts/rv1108.dtsi | 2 +-
+ arch/arm64/boot/dts/rockchip/Makefile | 1 +
+ arch/arm64/boot/dts/rockchip/px30.dtsi | 28 +-
+ arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 4 +-
+ arch/arm64/boot/dts/rockchip/rk3308.dtsi | 74 +-
+ arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 37 +-
+ arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 36 +-
+ arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 9 +-
+ arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 7 +-
+ arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 5 +
+ arch/arm64/boot/dts/rockchip/rk3328.dtsi | 13 +-
+ arch/arm64/boot/dts/rockchip/rk3368.dtsi | 2 +
+ arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 162 +-
+ .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 4 +-
+ .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 121 +
+ arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 1 -
+ arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 16 +
+ arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 1 -
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 66 +-
+ .../boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 1 -
+ arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 79 +
+ arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi | 3111 ++++++++++++++++++++
+ arch/arm64/boot/dts/rockchip/rk3568.dtsi | 593 ++++
+ arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi | 344 +++
+ drivers/clk/rockchip/clk-rk3036.c | 2 +-
+ drivers/clk/rockchip/clk-rk3568.c | 10 +-
+ drivers/clk/rockchip/clk.h | 29 +-
+ drivers/soc/rockchip/pm_domains.c | 252 +-
+ include/dt-bindings/power/rk3568-power.h | 32 +
+ 55 files changed, 5778 insertions(+), 516 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/arm/rockchip/pmu.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/rockchip/pmu.yaml
+ create mode 100644 Documentation/devicetree/bindings/power/rockchip,power-controller.yaml
+ delete mode 100644 Documentation/devicetree/bindings/soc/rockchip/grf.txt
+ create mode 100644 Documentation/devicetree/bindings/soc/rockchip/grf.yaml
+ delete mode 100644 Documentation/devicetree/bindings/soc/rockchip/power_domain.txt
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3568.dtsi
+ create mode 100644 arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi
+ create mode 100644 include/dt-bindings/power/rk3568-power.h
+Merging samsung-krzk/for-next (5ce16705e00d Merge branch 'next/defconfig' into for-next)
+$ git merge samsung-krzk/for-next
+Merge made by the 'recursive' strategy.
+Merging scmi/for-linux-next (8a0039412d35 Merge branch 'for-next/ffa' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
+$ git merge scmi/for-linux-next
+Merge made by the 'recursive' strategy.
+ drivers/firmware/arm_ffa/bus.c | 6 +++---
+ drivers/firmware/arm_ffa/driver.c | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+Merging stm32/stm32-next (4bf4abe19089 ARM: dts: stm32: fix stpmic node for stm32mp1 boards)
+$ git merge stm32/stm32-next
+Already up to date.
+Merging sunxi/sunxi/for-next (3f1c53207cf0 Merge branches 'sunxi/dt-for-5.14' and 'sunxi/fixes-for-5.13' into sunxi/for-next)
+$ git merge sunxi/sunxi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging tegra/for-next (eac9ab885bb5 Merge branch for-5.14/arm64/dt into for-next)
+$ git merge tegra/for-next
+Merge made by the 'recursive' strategy.
+ drivers/clk/tegra/clk-tegra124-emc.c | 4 +-
+ drivers/phy/tegra/xusb-tegra186.c | 550 +++++++++-
+ drivers/phy/tegra/xusb-tegra210.c | 1877 ++++++++++++++++++++++++++--------
+ drivers/phy/tegra/xusb.c | 92 +-
+ drivers/phy/tegra/xusb.h | 22 +-
+ drivers/usb/host/xhci-tegra.c | 613 ++++++++---
+ include/linux/phy/tegra/xusb.h | 10 +-
+ 7 files changed, 2612 insertions(+), 556 deletions(-)
+Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next)
+$ git merge ti-k3/ti-k3-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging ti-k3-new/ti-k3-next (d71abfcc6c05 arm64: dts: ti: k3-am642-evm/sk: Add DDR carveout memory nodes for R5Fs)
+$ git merge ti-k3-new/ti-k3-next
+Merge made by the 'recursive' strategy.
+ .../bindings/remoteproc/ti,k3-r5f-rproc.yaml | 31 ++-
+ arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 222 +++++++++++++++++++--
+ arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi | 6 +-
+ arch/arm64/boot/dts/ti/k3-am642-evm.dts | 110 +++++++++-
+ arch/arm64/boot/dts/ti/k3-am642-sk.dts | 121 +++++++++++
+ arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 63 +++++-
+ arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 37 +++-
+ arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 2 -
+ arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 2 -
+ arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic.dts | 5 +
+ arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 49 ++++-
+ .../boot/dts/ti/k3-j7200-common-proc-board.dts | 2 +-
+ arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 25 +--
+ arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 6 -
+ .../boot/dts/ti/k3-j721e-common-proc-board.dts | 62 +++++-
+ arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 126 ++++++------
+ arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 4 -
+ 17 files changed, 734 insertions(+), 139 deletions(-)
+Merging xilinx/for-next (d98fb9ab6255 Merge branch 'zynq/dt' into for-next)
+$ git merge xilinx/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/zynq-7000.dtsi | 21 +++++++++++++++++++++
+ arch/arm/boot/dts/zynq-ebaz4205.dts | 12 ++++++++++++
+ arch/arm/configs/multi_v7_defconfig | 1 +
+ 3 files changed, 34 insertions(+)
+Merging clk/clk-next (0eb0a122fa4d Merge branch 'clk-amlogic' into clk-next)
+$ git merge clk/clk-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/freescale/fsl,scu.txt | 10 +-
+ .../bindings/clock/qcom,dispcc-sm8x50.yaml | 1 +
+ .../devicetree/bindings/clock/qcom,gcc.yaml | 2 +
+ .../devicetree/bindings/clock/qcom,rpmcc.txt | 1 +
+ .../bindings/clock/renesas,rzg2l-cpg.yaml | 83 +
+ .../devicetree/bindings/clock/ti/dpll.txt | 20 +
+ arch/arm/Kconfig | 2 -
+ arch/arm/boot/dts/am33xx-clocks.dtsi | 10 +-
+ arch/arm/boot/dts/am43xx-clocks.dtsi | 12 +-
+ arch/m68k/coldfire/clk.c | 21 -
+ arch/m68k/coldfire/m5206.c | 25 +-
+ arch/m68k/coldfire/m520x.c | 51 +-
+ arch/m68k/coldfire/m523x.c | 42 +-
+ arch/m68k/coldfire/m5249.c | 33 +-
+ arch/m68k/coldfire/m525x.c | 33 +-
+ arch/m68k/coldfire/m5272.c | 35 +-
+ arch/m68k/coldfire/m527x.c | 44 +-
+ arch/m68k/coldfire/m528x.c | 42 +-
+ arch/m68k/coldfire/m5307.c | 27 +-
+ arch/m68k/coldfire/m53xx.c | 78 +-
+ arch/m68k/coldfire/m5407.c | 25 +-
+ arch/m68k/coldfire/m5441x.c | 126 +-
+ arch/m68k/coldfire/m54xx.c | 33 +-
+ arch/m68k/include/asm/mcfclk.h | 5 -
+ arch/mips/Kconfig | 6 +-
+ arch/mips/ar7/clock.c | 113 +-
+ arch/mips/include/asm/mach-ar7/ar7.h | 4 -
+ arch/mips/pic32/Kconfig | 1 -
+ arch/mips/ralink/Kconfig | 5 -
+ arch/mips/ralink/clk.c | 64 +-
+ arch/sh/Kconfig | 1 -
+ drivers/clk/Kconfig | 6 +-
+ drivers/clk/Makefile | 3 +-
+ drivers/clk/analogbits/wrpll-cln28hpc.c | 2 +-
+ drivers/clk/clk-versaclock5.c | 27 +-
+ drivers/clk/clkdev.c | 28 -
+ drivers/clk/imx/Makefile | 3 +-
+ drivers/clk/imx/clk-imx8mp.c | 1 -
+ drivers/clk/imx/clk-imx8mq.c | 56 +-
+ drivers/clk/imx/clk-imx8qm-rsrc.c | 116 ++
+ drivers/clk/imx/clk-imx8qxp-rsrc.c | 89 ++
+ drivers/clk/imx/clk-imx8qxp.c | 377 +++--
+ drivers/clk/imx/clk-scu.c | 312 +++-
+ drivers/clk/imx/clk-scu.h | 56 +-
+ drivers/clk/meson/axg-audio.c | 5 +-
+ drivers/clk/meson/clk-pll.c | 26 +-
+ drivers/clk/meson/g12a.c | 8 +-
+ drivers/clk/qcom/Kconfig | 7 +
+ drivers/clk/qcom/Makefile | 1 +
+ drivers/clk/qcom/apcs-sdx55.c | 18 +-
+ drivers/clk/qcom/clk-rcg2.c | 81 +
+ drivers/clk/qcom/clk-smd-rpm.c | 672 ++++----
+ drivers/clk/qcom/dispcc-sm8250.c | 190 ++-
+ drivers/clk/qcom/gcc-mdm9607.c | 1655 ++++++++++++++++++++
+ drivers/clk/renesas/Kconfig | 9 +
+ drivers/clk/renesas/Makefile | 2 +
+ drivers/clk/renesas/clk-div6.c | 80 +-
+ drivers/clk/renesas/r8a77995-cpg-mssr.c | 1 +
+ drivers/clk/renesas/r8a779a0-cpg-mssr.c | 4 +
+ drivers/clk/renesas/r9a06g032-clocks.c | 25 +-
+ drivers/clk/renesas/r9a07g044-cpg.c | 127 ++
+ drivers/clk/renesas/rcar-gen3-cpg.c | 183 ++-
+ drivers/clk/renesas/rcar-usb2-clock-sel.c | 24 +-
+ drivers/clk/renesas/renesas-cpg-mssr.c | 10 +-
+ drivers/clk/renesas/renesas-rzg2l-cpg.c | 750 +++++++++
+ drivers/clk/renesas/renesas-rzg2l-cpg.h | 136 ++
+ drivers/clk/sifive/sifive-prci.c | 2 +-
+ drivers/clk/ti/dpll.c | 39 +
+ drivers/clk/ti/dpll3xxx.c | 87 +-
+ drivers/clk/versatile/Kconfig | 3 +-
+ drivers/clocksource/Kconfig | 6 +-
+ drivers/mmc/host/Kconfig | 4 +-
+ drivers/staging/board/Kconfig | 2 +-
+ include/dt-bindings/clock/imx8-clock.h | 128 --
+ include/dt-bindings/clock/imx8mq-clock.h | 19 -
+ include/dt-bindings/clock/qcom,dispcc-sm8250.h | 9 +
+ include/dt-bindings/clock/qcom,gcc-mdm9607.h | 104 ++
+ include/linux/clk/ti.h | 22 +
+ include/linux/clkdev.h | 5 -
+ sound/soc/dwc/Kconfig | 2 +-
+ sound/soc/rockchip/Kconfig | 14 +-
+ 81 files changed, 5030 insertions(+), 1461 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/renesas,rzg2l-cpg.yaml
+ create mode 100644 drivers/clk/imx/clk-imx8qm-rsrc.c
+ create mode 100644 drivers/clk/imx/clk-imx8qxp-rsrc.c
+ create mode 100644 drivers/clk/qcom/gcc-mdm9607.c
+ create mode 100644 drivers/clk/renesas/r9a07g044-cpg.c
+ create mode 100644 drivers/clk/renesas/renesas-rzg2l-cpg.c
+ create mode 100644 drivers/clk/renesas/renesas-rzg2l-cpg.h
+ create mode 100644 include/dt-bindings/clock/qcom,gcc-mdm9607.h
+Merging clk-imx/for-next (c586f53ae159 clk: imx8mq: remove SYS PLL 1/2 clock gates)
+$ git merge clk-imx/for-next
+Already up to date.
+Merging clk-renesas/renesas-clk (2cd1e3883a57 clk: renesas: rzg2l: Fix off-by-one check in rzg2l_cpg_clk_src_twocell_get())
+$ git merge clk-renesas/renesas-clk
+Merge made by the 'recursive' strategy.
+ drivers/clk/renesas/renesas-rzg2l-cpg.c | 20 ++++++--------------
+ 1 file changed, 6 insertions(+), 14 deletions(-)
+Merging clk-samsung/for-next (a38fd8748464 Linux 5.12-rc2)
+$ git merge clk-samsung/for-next
+Already up to date.
+Merging csky/linux-next (280af034a71d csky: Kconfig: Remove unused selects)
+$ git merge csky/linux-next
+Merge made by the 'recursive' strategy.
+ arch/csky/Kconfig | 3 ---
+ arch/csky/mm/syscache.c | 12 +++++++-----
+ 2 files changed, 7 insertions(+), 8 deletions(-)
+Merging h8300/h8300-next (6e5e55227c95 Merge tag 'v5.11' into h8300-next)
+$ git merge h8300/h8300-next
+Auto-merging drivers/tty/serial/sh-sci.c
+Auto-merging drivers/net/ethernet/smsc/smc91x.c
+Merge made by the 'recursive' strategy.
+ arch/h8300/Kconfig.cpu | 4 ++
+ arch/h8300/boot/dts/edosk2674.dts | 10 ++++-
+ arch/h8300/boot/dts/h8300h_sim.dts | 2 +-
+ arch/h8300/boot/dts/h8s_sim.dts | 2 +-
+ arch/h8300/configs/edosk2674_defconfig | 10 ++---
+ arch/h8300/configs/h8300h-sim_defconfig | 8 +---
+ arch/h8300/configs/h8s-sim_defconfig | 8 +---
+ arch/h8300/kernel/setup.c | 2 +-
+ arch/h8300/lib/memset.S | 17 +++++----
+ drivers/clocksource/h8300_timer8.c | 20 +++++-----
+ drivers/irqchip/irq-renesas-h8300h.c | 19 +++++++++-
+ drivers/irqchip/irq-renesas-h8s.c | 67 +++++++++++++++++++++++++--------
+ drivers/net/ethernet/smsc/Kconfig | 1 -
+ drivers/net/ethernet/smsc/smc91x.c | 10 +++++
+ drivers/tty/serial/sh-sci.c | 5 +--
+ 15 files changed, 123 insertions(+), 62 deletions(-)
+Merging m68k/for-next (c1367ee016e3 m68k: atari: Fix ATARI_KBD_CORE kconfig unmet dependency warning)
+$ git merge m68k/for-next
+Auto-merging arch/m68k/Makefile
+Auto-merging MAINTAINERS
+Auto-merging .mailmap
+Merge made by the 'recursive' strategy.
+ .mailmap | 1 +
+ MAINTAINERS | 4 ++--
+ arch/m68k/Kconfig.machine | 3 +++
+ arch/m68k/Makefile | 3 +--
+ arch/m68k/configs/amiga_defconfig | 5 +++--
+ arch/m68k/configs/apollo_defconfig | 5 +++--
+ arch/m68k/configs/atari_defconfig | 5 +++--
+ arch/m68k/configs/bvme6000_defconfig | 5 +++--
+ arch/m68k/configs/hp300_defconfig | 5 +++--
+ arch/m68k/configs/mac_defconfig | 5 +++--
+ arch/m68k/configs/multi_defconfig | 5 +++--
+ arch/m68k/configs/mvme147_defconfig | 5 +++--
+ arch/m68k/configs/mvme16x_defconfig | 5 +++--
+ arch/m68k/configs/q40_defconfig | 5 +++--
+ arch/m68k/configs/sun3_defconfig | 5 +++--
+ arch/m68k/configs/sun3x_defconfig | 5 +++--
+ arch/m68k/kernel/dma.c | 3 ---
+ drivers/input/keyboard/Kconfig | 3 ---
+ 18 files changed, 43 insertions(+), 34 deletions(-)
+Merging m68knommu/for-next (3f605ee17f8e m68knommu: fix missing LCD splash screen data initializer)
+$ git merge m68knommu/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/68000/dragen2.c | 1 +
+ arch/m68k/68000/screen.h | 804 ++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 805 insertions(+)
+ create mode 100644 arch/m68k/68000/screen.h
+Merging microblaze/next (14a832498c23 arch: microblaze: Fix spelling mistake "vesion" -> "version")
+$ git merge microblaze/next
+Merge made by the 'recursive' strategy.
+ arch/microblaze/Makefile | 2 +-
+ arch/microblaze/include/asm/page.h | 3 ---
+ 2 files changed, 1 insertion(+), 4 deletions(-)
+Merging mips/mips-next (a2cdc24e2057 mips/kvm: Use BUG_ON instead of if condition followed by BUG)
+$ git merge mips/mips-next
+Auto-merging arch/mips/Kconfig
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ arch/mips/Kconfig | 7 +-
+ arch/mips/Kconfig.debug | 8 ++
+ arch/mips/boot/compressed/uart-16550.c | 4 +-
+ arch/mips/boot/dts/ingenic/gcw0.dts | 5 +-
+ arch/mips/boot/dts/ingenic/jz4780.dtsi | 10 +-
+ arch/mips/boot/dts/ingenic/rs90.dts | 14 +++
+ arch/mips/boot/dts/loongson/Makefile | 2 +-
+ arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi | 18 ++--
+ .../boot/dts/loongson/loongson64g-package.dtsi | 4 +-
+ .../boot/dts/loongson/loongson64v_4core_virtio.dts | 2 +-
+ arch/mips/boot/dts/loongson/ls7a-pch.dtsi | 2 +-
+ arch/mips/boot/dts/loongson/rs780e-pch.dtsi | 2 +-
+ arch/mips/boot/dts/mti/sead3.dts | 2 +-
+ arch/mips/boot/dts/qca/Makefile | 1 +
+ arch/mips/boot/dts/qca/ar9331.dtsi | 2 +
+ .../dts/qca/ar9331_openembed_som9331_board.dts | 110 +++++++++++++++++++++
+ arch/mips/cavium-octeon/octeon-usb.c | 9 +-
+ arch/mips/configs/loongson3_defconfig | 12 +--
+ arch/mips/include/asm/hugetlb.h | 8 +-
+ arch/mips/include/asm/pgalloc.h | 10 +-
+ arch/mips/include/asm/unistd.h | 4 +
+ arch/mips/ingenic/Kconfig | 2 +
+ arch/mips/kernel/cpu-probe.c | 5 +
+ arch/mips/kernel/syscalls/Makefile | 34 +------
+ arch/mips/kernel/syscalls/syscallnr.sh | 2 -
+ arch/mips/kvm/tlb.c | 3 +-
+ arch/mips/loongson64/env.c | 3 +-
+ arch/mips/loongson64/reset.c | 5 +-
+ arch/mips/loongson64/smp.c | 10 +-
+ arch/mips/mm/dma-noncoherent.c | 1 +
+ 31 files changed, 209 insertions(+), 94 deletions(-)
+ create mode 100644 arch/mips/boot/dts/qca/ar9331_openembed_som9331_board.dts
+Merging nds32/next (40e0dd851e7b nds32: Fix bogus reference to <asm/procinfo.h>)
+$ git merge nds32/next
+Already up to date.
+Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn)
+$ git merge nios2/for-next
+Already up to date.
+Merging openrisc/for-next (ad4e600cbf89 drivers/soc/litex: remove 8-bit subregister option)
+$ git merge openrisc/for-next
+Merge made by the 'recursive' strategy.
+ drivers/soc/litex/Kconfig | 12 -----
+ drivers/soc/litex/litex_soc_ctrl.c | 3 +-
+ include/linux/litex.h | 103 ++++++-------------------------------
+ 3 files changed, 16 insertions(+), 102 deletions(-)
+Merging parisc-hd/for-next (9f4ad9e425a1 Linux 5.12)
+$ git merge parisc-hd/for-next
+Already up to date.
+Merging powerpc/next (a736143afd03 Merge branch 'topic/ppc-kvm' into next)
+$ git merge powerpc/next
+Auto-merging include/uapi/linux/kvm.h
+Removing arch/powerpc/platforms/powernv/vas-api.c
+Auto-merging arch/powerpc/perf/core-book3s.c
+Auto-merging arch/powerpc/kvm/book3s_hv.c
+Auto-merging arch/powerpc/include/asm/kvm_host.h
+Removing arch/powerpc/include/asm/book3s/32/hash.h
+Auto-merging arch/powerpc/Makefile
+Merge made by the 'recursive' strategy.
+ Documentation/virt/kvm/api.rst | 18 +
+ arch/powerpc/Kconfig | 6 +-
+ arch/powerpc/Makefile | 10 +
+ arch/powerpc/boot/Makefile | 6 +-
+ arch/powerpc/boot/decompress.c | 4 +-
+ arch/powerpc/boot/devtree.c | 59 +-
+ arch/powerpc/boot/dts/microwatt.dts | 138 ++++
+ arch/powerpc/boot/microwatt.c | 24 +
+ arch/powerpc/boot/ns16550.c | 9 +-
+ arch/powerpc/boot/wrapper | 5 +
+ arch/powerpc/boot/zImage.ps3.lds.S | 2 +-
+ arch/powerpc/configs/32-bit.config | 1 +
+ arch/powerpc/configs/64-bit.config | 1 +
+ arch/powerpc/configs/microwatt_defconfig | 98 +++
+ arch/powerpc/configs/mpc885_ads_defconfig | 25 +
+ arch/powerpc/include/asm/asm-prototypes.h | 3 +-
+ arch/powerpc/include/asm/barrier.h | 2 +
+ arch/powerpc/include/asm/book3s/32/hash.h | 45 --
+ arch/powerpc/include/asm/book3s/32/kup.h | 195 +++--
+ arch/powerpc/include/asm/book3s/32/mmu-hash.h | 41 ++
+ arch/powerpc/include/asm/book3s/32/pgtable.h | 38 +-
+ arch/powerpc/include/asm/book3s/64/kup.h | 3 +-
+ arch/powerpc/include/asm/book3s/64/mmu.h | 1 +
+ arch/powerpc/include/asm/book3s/64/pgtable.h | 3 +
+ .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 4 +
+ arch/powerpc/include/asm/checksum.h | 2 +-
+ arch/powerpc/include/asm/code-patching.h | 34 +-
+ arch/powerpc/include/asm/cputhreads.h | 30 +
+ arch/powerpc/include/asm/exception-64s.h | 13 +
+ arch/powerpc/include/asm/hvcall.h | 14 +-
+ arch/powerpc/include/asm/inst.h | 94 +--
+ arch/powerpc/include/asm/kup.h | 50 +-
+ arch/powerpc/include/asm/kvm_asm.h | 1 +
+ arch/powerpc/include/asm/kvm_book3s.h | 3 +
+ arch/powerpc/include/asm/kvm_book3s_64.h | 8 +
+ arch/powerpc/include/asm/kvm_host.h | 8 +-
+ arch/powerpc/include/asm/kvm_ppc.h | 18 +-
+ arch/powerpc/include/asm/mmu.h | 19 +-
+ arch/powerpc/include/asm/mmu_context.h | 19 +-
+ arch/powerpc/include/asm/nohash/32/kup-8xx.h | 46 +-
+ arch/powerpc/include/asm/nohash/32/mmu-44x.h | 1 +
+ arch/powerpc/include/asm/paca.h | 2 -
+ arch/powerpc/include/asm/pgtable.h | 5 +
+ arch/powerpc/include/asm/ppc-opcode.h | 84 ++-
+ arch/powerpc/include/asm/processor.h | 21 +-
+ arch/powerpc/include/asm/ps3.h | 4 +-
+ arch/powerpc/include/asm/ptrace.h | 3 +-
+ arch/powerpc/include/asm/reg.h | 13 +-
+ arch/powerpc/include/asm/security_features.h | 4 +
+ arch/powerpc/include/asm/set_memory.h | 34 +
+ arch/powerpc/include/asm/time.h | 12 +
+ arch/powerpc/include/asm/uprobes.h | 4 +-
+ arch/powerpc/include/asm/vas.h | 109 ++-
+ arch/powerpc/include/asm/xics.h | 4 +
+ arch/powerpc/include/uapi/asm/vas-api.h | 6 +-
+ arch/powerpc/kernel/asm-offsets.c | 67 +-
+ arch/powerpc/kernel/crash_dump.c | 6 +-
+ arch/powerpc/kernel/entry_32.S | 35 -
+ arch/powerpc/kernel/epapr_paravirt.c | 4 +-
+ arch/powerpc/kernel/exceptions-64s.S | 250 +------
+ arch/powerpc/kernel/head_40x.S | 36 -
+ arch/powerpc/kernel/head_44x.S | 50 +-
+ arch/powerpc/kernel/head_64.S | 20 -
+ arch/powerpc/kernel/head_8xx.S | 25 -
+ arch/powerpc/kernel/head_book3s_32.S | 133 +---
+ arch/powerpc/kernel/head_fsl_booke.S | 37 -
+ arch/powerpc/kernel/jump_label.c | 4 +-
+ arch/powerpc/kernel/kgdb.c | 9 +-
+ arch/powerpc/kernel/kprobes.c | 34 +-
+ arch/powerpc/kernel/mce_power.c | 50 +-
+ arch/powerpc/kernel/misc_32.S | 6 -
+ arch/powerpc/kernel/module.c | 4 +-
+ arch/powerpc/kernel/module_32.c | 19 +-
+ arch/powerpc/kernel/module_64.c | 55 +-
+ arch/powerpc/kernel/optprobes.c | 147 ++--
+ arch/powerpc/kernel/paca.c | 2 -
+ arch/powerpc/kernel/process.c | 17 +-
+ arch/powerpc/kernel/prom_init.c | 17 +-
+ arch/powerpc/kernel/security.c | 24 +-
+ arch/powerpc/kernel/setup_32.c | 4 +-
+ arch/powerpc/kernel/signal_32.c | 66 +-
+ arch/powerpc/kernel/signal_64.c | 19 +-
+ arch/powerpc/kernel/smp.c | 4 +
+ arch/powerpc/kernel/stacktrace.c | 8 +-
+ arch/powerpc/kernel/tau_6xx.c | 2 +-
+ arch/powerpc/kernel/time.c | 10 -
+ arch/powerpc/kernel/trace/ftrace.c | 51 +-
+ arch/powerpc/kernel/traps.c | 7 +-
+ arch/powerpc/kernel/udbg_16550.c | 39 +
+ arch/powerpc/kernel/uprobes.c | 6 +-
+ arch/powerpc/kernel/watchdog.c | 1 +
+ arch/powerpc/kvm/Makefile | 2 +
+ arch/powerpc/kvm/book3s.c | 17 +-
+ arch/powerpc/kvm/book3s_32_mmu_host.c | 3 -
+ arch/powerpc/kvm/book3s_64_entry.S | 416 +++++++++++
+ arch/powerpc/kvm/book3s_64_mmu_radix.c | 27 +-
+ arch/powerpc/kvm/book3s_64_vio_hv.c | 12 -
+ arch/powerpc/kvm/book3s_hv.c | 798 +++++++++++++--------
+ arch/powerpc/kvm/book3s_hv_builtin.c | 137 +---
+ arch/powerpc/kvm/book3s_hv_interrupts.S | 9 +-
+ arch/powerpc/kvm/book3s_hv_nested.c | 122 +++-
+ arch/powerpc/kvm/book3s_hv_p9_entry.c | 508 +++++++++++++
+ arch/powerpc/kvm/book3s_hv_rm_mmu.c | 14 +-
+ arch/powerpc/kvm/book3s_hv_rm_xics.c | 15 -
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 684 +-----------------
+ arch/powerpc/kvm/book3s_segment.S | 3 +
+ arch/powerpc/kvm/book3s_xive.c | 113 ++-
+ arch/powerpc/kvm/book3s_xive.h | 7 -
+ arch/powerpc/kvm/book3s_xive_native.c | 10 -
+ arch/powerpc/kvm/powerpc.c | 3 +
+ arch/powerpc/lib/code-patching.c | 178 ++---
+ arch/powerpc/lib/feature-fixups.c | 214 +++---
+ arch/powerpc/lib/sstep.c | 22 +
+ arch/powerpc/lib/test_emulate_step.c | 37 +-
+ arch/powerpc/mm/Makefile | 2 +-
+ arch/powerpc/mm/book3s32/Makefile | 1 +
+ arch/powerpc/mm/book3s32/hash_low.S | 6 +-
+ arch/powerpc/mm/book3s32/kuap.c | 33 +
+ arch/powerpc/mm/book3s32/kuep.c | 42 +-
+ arch/powerpc/mm/book3s32/mmu.c | 20 -
+ arch/powerpc/mm/book3s32/mmu_context.c | 48 +-
+ arch/powerpc/mm/book3s64/radix_pgtable.c | 32 +-
+ arch/powerpc/mm/book3s64/radix_tlb.c | 228 ++++--
+ arch/powerpc/mm/maccess.c | 4 +-
+ arch/powerpc/mm/mem.c | 7 +
+ arch/powerpc/mm/mmu_context.c | 4 +-
+ arch/powerpc/mm/nohash/44x.c | 13 +
+ arch/powerpc/mm/nohash/8xx.c | 42 +-
+ arch/powerpc/mm/nohash/mmu_context.c | 173 ++---
+ arch/powerpc/mm/nohash/tlb_low.S | 13 -
+ arch/powerpc/mm/pageattr.c | 134 ++++
+ arch/powerpc/mm/pgtable.c | 2 +
+ arch/powerpc/mm/pgtable_32.c | 60 +-
+ arch/powerpc/net/bpf_jit_comp.c | 13 +-
+ arch/powerpc/net/bpf_jit_comp32.c | 218 +++---
+ arch/powerpc/net/bpf_jit_comp64.c | 2 +-
+ arch/powerpc/perf/Makefile | 6 +-
+ arch/powerpc/perf/callchain.c | 2 +-
+ arch/powerpc/perf/core-book3s.c | 4 +-
+ arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 1 +
+ arch/powerpc/platforms/86xx/mpc86xx_smp.c | 4 +-
+ arch/powerpc/platforms/Kconfig | 2 +
+ arch/powerpc/platforms/Kconfig.cputype | 15 +-
+ arch/powerpc/platforms/Makefile | 2 +
+ arch/powerpc/platforms/book3s/Kconfig | 15 +
+ arch/powerpc/platforms/book3s/Makefile | 2 +
+ arch/powerpc/platforms/book3s/vas-api.c | 493 +++++++++++++
+ arch/powerpc/platforms/cell/spider-pci.c | 3 +-
+ arch/powerpc/platforms/cell/spufs/switch.c | 6 +-
+ arch/powerpc/platforms/microwatt/Kconfig | 13 +
+ arch/powerpc/platforms/microwatt/Makefile | 1 +
+ arch/powerpc/platforms/microwatt/rng.c | 48 ++
+ arch/powerpc/platforms/microwatt/setup.c | 41 ++
+ arch/powerpc/platforms/powermac/smp.c | 4 +-
+ arch/powerpc/platforms/powernv/Kconfig | 14 -
+ arch/powerpc/platforms/powernv/Makefile | 2 +-
+ arch/powerpc/platforms/powernv/idle.c | 52 +-
+ arch/powerpc/platforms/powernv/pci.c | 2 +-
+ arch/powerpc/platforms/powernv/subcore.c | 10 +
+ arch/powerpc/platforms/powernv/vas-api.c | 278 -------
+ arch/powerpc/platforms/powernv/vas-debug.c | 27 +-
+ arch/powerpc/platforms/powernv/vas-fault.c | 173 +----
+ arch/powerpc/platforms/powernv/vas-trace.h | 4 +-
+ arch/powerpc/platforms/powernv/vas-window.c | 264 ++++---
+ arch/powerpc/platforms/powernv/vas.h | 50 +-
+ arch/powerpc/platforms/ps3/Kconfig | 9 +
+ arch/powerpc/platforms/ps3/mm.c | 12 +
+ arch/powerpc/platforms/ps3/setup.c | 43 +-
+ arch/powerpc/platforms/ps3/system-bus.c | 9 +-
+ arch/powerpc/platforms/pseries/Makefile | 1 +
+ arch/powerpc/platforms/pseries/hotplug-memory.c | 58 +-
+ arch/powerpc/platforms/pseries/papr_scm.c | 7 +
+ arch/powerpc/platforms/pseries/ras.c | 2 -
+ arch/powerpc/platforms/pseries/setup.c | 9 +
+ arch/powerpc/platforms/pseries/vas.c | 594 +++++++++++++++
+ arch/powerpc/platforms/pseries/vas.h | 125 ++++
+ arch/powerpc/sysdev/xics/Kconfig | 3 +
+ arch/powerpc/sysdev/xics/Makefile | 1 +
+ arch/powerpc/sysdev/xics/ics-native.c | 257 +++++++
+ arch/powerpc/sysdev/xics/xics-common.c | 2 +
+ arch/powerpc/xmon/xmon.c | 12 +-
+ drivers/crypto/nx/Kconfig | 1 +
+ drivers/crypto/nx/Makefile | 2 +-
+ drivers/crypto/nx/nx-common-powernv.c | 6 +-
+ .../nx/{nx-842-pseries.c => nx-common-pseries.c} | 138 ++++
+ drivers/ps3/ps3-vuart.c | 2 +-
+ drivers/ps3/ps3av.c | 22 +-
+ drivers/tty/hvc/hvc_vio.c | 2 +-
+ include/linux/kprobes.h | 3 +
+ include/uapi/linux/kvm.h | 1 +
+ kernel/kprobes.c | 14 +-
+ .../selftests/powerpc/benchmarks/null_syscall.c | 3 +-
+ tools/testing/selftests/powerpc/pmu/ebb/Makefile | 2 +-
+ tools/testing/selftests/powerpc/pmu/ebb/ebb.h | 2 -
+ .../selftests/powerpc/pmu/ebb/no_handler_test.c | 2 -
+ .../powerpc/pmu/ebb/regs_access_pmccext_test.c | 63 ++
+ tools/testing/selftests/powerpc/security/Makefile | 2 +
+ .../powerpc/security/mitigation-patching.sh | 75 ++
+ .../testing/selftests/powerpc/tm/tm-vmx-unavail.c | 1 -
+ 199 files changed, 6263 insertions(+), 3882 deletions(-)
+ create mode 100644 arch/powerpc/boot/dts/microwatt.dts
+ create mode 100644 arch/powerpc/boot/microwatt.c
+ create mode 100644 arch/powerpc/configs/32-bit.config
+ create mode 100644 arch/powerpc/configs/64-bit.config
+ create mode 100644 arch/powerpc/configs/microwatt_defconfig
+ delete mode 100644 arch/powerpc/include/asm/book3s/32/hash.h
+ create mode 100644 arch/powerpc/include/asm/set_memory.h
+ create mode 100644 arch/powerpc/kvm/book3s_64_entry.S
+ create mode 100644 arch/powerpc/kvm/book3s_hv_p9_entry.c
+ create mode 100644 arch/powerpc/mm/book3s32/kuap.c
+ create mode 100644 arch/powerpc/mm/pageattr.c
+ create mode 100644 arch/powerpc/platforms/book3s/Kconfig
+ create mode 100644 arch/powerpc/platforms/book3s/Makefile
+ create mode 100644 arch/powerpc/platforms/book3s/vas-api.c
+ create mode 100644 arch/powerpc/platforms/microwatt/Kconfig
+ create mode 100644 arch/powerpc/platforms/microwatt/Makefile
+ create mode 100644 arch/powerpc/platforms/microwatt/rng.c
+ create mode 100644 arch/powerpc/platforms/microwatt/setup.c
+ delete mode 100644 arch/powerpc/platforms/powernv/vas-api.c
+ create mode 100644 arch/powerpc/platforms/pseries/vas.c
+ create mode 100644 arch/powerpc/platforms/pseries/vas.h
+ create mode 100644 arch/powerpc/sysdev/xics/ics-native.c
+ rename drivers/crypto/nx/{nx-842-pseries.c => nx-common-pseries.c} (90%)
+ create mode 100644 tools/testing/selftests/powerpc/pmu/ebb/regs_access_pmccext_test.c
+ create mode 100755 tools/testing/selftests/powerpc/security/mitigation-patching.sh
+Merging soc-fsl/next (242b0b398ccd soc: fsl: enable acpi support in RCPM driver)
+$ git merge soc-fsl/next
+Already up to date.
+Merging risc-v/for-next (01d13185f183 riscv: add ASID-based tlbflushing methods)
+$ git merge risc-v/for-next
+Auto-merging arch/riscv/kernel/setup.c
+Auto-merging arch/riscv/kernel/probes/kprobes.c
+Auto-merging arch/riscv/include/asm/pgtable.h
+Auto-merging arch/riscv/Kconfig
+CONFLICT (content): Merge conflict in arch/riscv/Kconfig
+Resolved 'arch/riscv/Kconfig' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 8ef7d4a4b83c] Merge remote-tracking branch 'risc-v/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/riscv/Kconfig | 9 +-
+ arch/riscv/include/asm/kprobes.h | 7 --
+ arch/riscv/include/asm/mmu_context.h | 2 +
+ arch/riscv/include/asm/page.h | 37 +++----
+ arch/riscv/include/asm/pci.h | 2 +
+ arch/riscv/include/asm/pgtable-64.h | 3 +-
+ arch/riscv/include/asm/pgtable-bits.h | 5 +
+ arch/riscv/include/asm/pgtable.h | 176 +++++++++++++++++++++++++++++++--
+ arch/riscv/include/asm/sections.h | 17 ++++
+ arch/riscv/include/asm/set_memory.h | 13 +--
+ arch/riscv/include/asm/switch_to.h | 11 ++-
+ arch/riscv/include/asm/tlbflush.h | 5 +
+ arch/riscv/kernel/cpufeature.c | 6 +-
+ arch/riscv/kernel/probes/kprobes.c | 40 ++------
+ arch/riscv/kernel/process.c | 2 +-
+ arch/riscv/kernel/setup.c | 17 +---
+ arch/riscv/kernel/signal.c | 4 +-
+ arch/riscv/mm/context.c | 14 +--
+ arch/riscv/mm/init.c | 179 +++++++++++++++++++---------------
+ arch/riscv/mm/pageattr.c | 10 ++
+ arch/riscv/mm/tlbflush.c | 69 ++++++++++---
+ 21 files changed, 418 insertions(+), 210 deletions(-)
+Merging s390/for-next (6de0091b9278 Merge branch 'features' into for-next)
+$ git merge s390/for-next
+Auto-merging arch/s390/include/asm/page.h
+Auto-merging arch/s390/Makefile
+Merge made by the 'recursive' strategy.
+ arch/s390/Kconfig | 4 +-
+ arch/s390/Makefile | 1 +
+ arch/s390/boot/als.c | 6 +-
+ arch/s390/boot/boot.h | 1 +
+ arch/s390/boot/compressed/Makefile | 6 +-
+ arch/s390/boot/compressed/decompressor.c | 8 +-
+ arch/s390/boot/head.S | 3 +
+ arch/s390/boot/ipl_parm.c | 59 ++++++-----
+ arch/s390/boot/mem_detect.c | 73 +++++++------
+ arch/s390/boot/startup.c | 91 ++++++++++++++++
+ arch/s390/boot/uv.c | 25 +++++
+ arch/s390/include/asm/bitops.h | 10 +-
+ arch/s390/include/asm/ccwgroup.h | 3 +-
+ arch/s390/include/asm/checksum.h | 10 +-
+ arch/s390/include/asm/cio.h | 1 +
+ arch/s390/include/asm/cpu_mcf.h | 3 +-
+ arch/s390/include/asm/facility.h | 25 +++--
+ arch/s390/include/asm/irqflags.h | 16 +--
+ arch/s390/include/asm/kasan.h | 1 -
+ arch/s390/include/asm/lowcore.h | 38 ++++---
+ arch/s390/include/asm/mmu_context.h | 15 ++-
+ arch/s390/include/asm/page.h | 15 +--
+ arch/s390/include/asm/pgtable.h | 62 +++++++----
+ arch/s390/include/asm/processor.h | 6 +-
+ arch/s390/include/asm/ptrace.h | 12 ++-
+ arch/s390/include/asm/setup.h | 3 +-
+ arch/s390/include/asm/sigp.h | 14 +--
+ arch/s390/include/asm/tpi.h | 24 +++++
+ arch/s390/include/asm/types.h | 19 ++++
+ arch/s390/include/asm/uaccess.h | 36 +++----
+ arch/s390/include/uapi/asm/schid.h | 3 +
+ arch/s390/kernel/alternative.c | 3 +-
+ arch/s390/kernel/asm-offsets.c | 7 +-
+ arch/s390/kernel/cpcmd.c | 42 ++++----
+ arch/s390/kernel/debug.c | 2 +-
+ arch/s390/kernel/diag.c | 11 +-
+ arch/s390/kernel/early.c | 6 +-
+ arch/s390/kernel/entry.S | 61 +++++------
+ arch/s390/kernel/ipl.c | 14 +--
+ arch/s390/kernel/irq.c | 6 +-
+ arch/s390/kernel/nospec-branch.c | 14 +--
+ arch/s390/kernel/nospec-sysfs.c | 2 +-
+ arch/s390/kernel/perf_cpum_cf.c | 92 +---------------
+ arch/s390/kernel/perf_cpum_cf_common.c | 1 -
+ arch/s390/kernel/processor.c | 4 +-
+ arch/s390/kernel/ptrace.c | 4 +-
+ arch/s390/kernel/setup.c | 107 ++-----------------
+ arch/s390/kernel/smp.c | 131 +++++++++++++++--------
+ arch/s390/kernel/sthyi.c | 13 ++-
+ arch/s390/kernel/syscall.c | 5 +-
+ arch/s390/kernel/sysinfo.c | 19 ++--
+ arch/s390/kernel/traps.c | 4 +-
+ arch/s390/kernel/uv.c | 8 +-
+ arch/s390/kvm/kvm-s390.c | 12 +--
+ arch/s390/mm/kasan_init.c | 35 ++-----
+ arch/s390/mm/maccess.c | 19 ++--
+ arch/s390/pci/pci_insn.c | 55 +++++-----
+ arch/s390/pci/pci_mmio.c | 24 ++---
+ arch/s390/purgatory/Makefile | 1 +
+ drivers/s390/block/dcssblk.c | 106 +------------------
+ drivers/s390/block/xpram.c | 63 +----------
+ drivers/s390/char/monreader.c | 125 +---------------------
+ drivers/s390/char/monwriter.c | 90 +---------------
+ drivers/s390/char/sclp.c | 174 +------------------------------
+ drivers/s390/char/sclp.h | 13 ---
+ drivers/s390/char/sclp_cmd.c | 34 ------
+ drivers/s390/char/sclp_con.c | 53 +---------
+ drivers/s390/char/sclp_ftp.c | 1 -
+ drivers/s390/char/sclp_quiesce.c | 37 +------
+ drivers/s390/char/sclp_rw.c | 7 --
+ drivers/s390/char/sclp_rw.h | 6 --
+ drivers/s390/char/sclp_tty.c | 4 +-
+ drivers/s390/char/sclp_vt220.c | 56 +---------
+ drivers/s390/char/vmlogrdr.c | 24 -----
+ drivers/s390/cio/airq.c | 2 +-
+ drivers/s390/cio/ccwgroup.c | 60 ++++-------
+ drivers/s390/cio/chp.c | 3 +
+ drivers/s390/cio/chsc.c | 2 -
+ drivers/s390/cio/cio.c | 2 +-
+ drivers/s390/cio/cio.h | 13 +--
+ drivers/s390/cio/trace.h | 6 +-
+ drivers/s390/crypto/ap_bus.c | 84 ++++++++++++---
+ drivers/s390/crypto/ap_bus.h | 3 +
+ drivers/s390/crypto/ap_card.c | 2 +
+ drivers/s390/crypto/vfio_ap_drv.c | 13 ++-
+ drivers/s390/crypto/zcrypt_api.c | 1 -
+ drivers/s390/crypto/zcrypt_api.h | 3 +-
+ drivers/s390/crypto/zcrypt_card.c | 30 +++++-
+ drivers/s390/crypto/zcrypt_ccamisc.c | 8 +-
+ drivers/s390/crypto/zcrypt_ccamisc.h | 4 +-
+ drivers/s390/crypto/zcrypt_msgtype50.c | 2 +
+ drivers/s390/crypto/zcrypt_msgtype6.c | 5 +
+ drivers/s390/crypto/zcrypt_queue.c | 16 +--
+ drivers/tty/hvc/hvc_iucv.c | 51 ---------
+ scripts/min-tool-version.sh | 7 +-
+ 95 files changed, 869 insertions(+), 1536 deletions(-)
+ create mode 100644 arch/s390/include/asm/tpi.h
+ create mode 100644 arch/s390/include/asm/types.h
+Merging sh/for-next (2882b7626f49 sh: kernel: traps: remove unused variable)
+$ git merge sh/for-next
+Auto-merging drivers/sh/maple/maple.c
+Merge made by the 'recursive' strategy.
+ arch/sh/boards/mach-landisk/irq.c | 4 ++--
+ arch/sh/boot/Makefile | 4 ++--
+ arch/sh/boot/compressed/.gitignore | 5 -----
+ arch/sh/boot/compressed/Makefile | 32 +++++++++++++-------------------
+ arch/sh/boot/compressed/ashiftrt.S | 2 ++
+ arch/sh/boot/compressed/ashldi3.c | 2 ++
+ arch/sh/boot/compressed/ashlsi3.S | 2 ++
+ arch/sh/boot/compressed/ashrsi3.S | 2 ++
+ arch/sh/boot/compressed/lshrsi3.S | 2 ++
+ arch/sh/include/asm/checksum_32.h | 5 +++--
+ arch/sh/include/asm/uaccess.h | 4 ++--
+ arch/sh/kernel/cpu/sh4a/smp-shx3.c | 5 +++--
+ arch/sh/kernel/crash_dump.c | 4 ++--
+ arch/sh/kernel/traps_32.c | 8 ++++----
+ arch/sh/math-emu/math.c | 4 ++--
+ arch/sh/mm/nommu.c | 4 ++--
+ drivers/sh/maple/maple.c | 5 ++++-
+ 17 files changed, 49 insertions(+), 45 deletions(-)
+ create mode 100644 arch/sh/boot/compressed/ashiftrt.S
+ create mode 100644 arch/sh/boot/compressed/ashldi3.c
+ create mode 100644 arch/sh/boot/compressed/ashlsi3.S
+ create mode 100644 arch/sh/boot/compressed/ashrsi3.S
+ create mode 100644 arch/sh/boot/compressed/lshrsi3.S
+Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi)
+$ git merge sparc-next/master
+Already up to date.
+Merging uml/linux-next (1aee020155f3 um: remove unneeded semicolon in um_arch.c)
+$ git merge uml/linux-next
+Merge made by the 'recursive' strategy.
+ arch/um/Kconfig | 33 +-
+ arch/um/Makefile | 3 +-
+ arch/um/drivers/Kconfig | 20 +
+ arch/um/drivers/Makefile | 1 +
+ arch/um/drivers/chan_user.c | 3 +-
+ arch/um/drivers/slip_user.c | 3 +-
+ arch/um/drivers/ubd_kern.c | 3 +-
+ arch/um/drivers/virt-pci.c | 895 ++++++++++++++++++++++++++++++++
+ arch/um/drivers/virtio_uml.c | 40 +-
+ arch/um/include/asm/Kbuild | 4 +-
+ arch/um/include/asm/cacheflush.h | 9 +
+ arch/um/include/asm/cpufeature.h | 157 ++++++
+ arch/um/include/asm/fpu/api.h | 20 +
+ arch/um/include/asm/futex.h | 14 +
+ arch/um/include/asm/io.h | 7 +
+ arch/um/include/asm/irq.h | 8 +-
+ arch/um/include/asm/irqflags.h | 10 +-
+ arch/um/include/asm/msi.h | 1 +
+ arch/um/include/asm/pci.h | 39 ++
+ arch/um/include/asm/processor-generic.h | 8 +
+ arch/um/include/asm/tlb.h | 2 +-
+ arch/um/include/asm/xor.h | 17 +-
+ arch/um/include/linux/time-internal.h | 12 +-
+ arch/um/include/linux/virtio-uml.h | 13 +
+ arch/um/include/shared/irq_user.h | 1 +
+ arch/um/include/shared/kern_util.h | 1 -
+ arch/um/include/shared/longjmp.h | 14 +-
+ arch/um/include/shared/os.h | 8 +-
+ arch/um/include/shared/timetravel.h | 22 +
+ arch/um/kernel/Makefile | 14 +-
+ arch/um/kernel/ioport.c | 13 +
+ arch/um/kernel/irq.c | 52 +-
+ arch/um/kernel/ksyms.c | 2 +-
+ arch/um/kernel/skas/clone.c | 2 +-
+ arch/um/kernel/skas/uaccess.c | 136 +++++
+ arch/um/kernel/time.c | 35 +-
+ arch/um/kernel/um_arch.c | 48 +-
+ arch/um/os-Linux/helper.c | 4 +-
+ arch/um/os-Linux/signal.c | 64 ++-
+ arch/um/os-Linux/skas/process.c | 2 +-
+ arch/um/os-Linux/start_up.c | 32 ++
+ arch/x86/Makefile.um | 2 +-
+ drivers/input/Kconfig | 1 -
+ drivers/input/gameport/Kconfig | 1 +
+ drivers/input/joystick/Kconfig | 1 +
+ drivers/tty/Kconfig | 5 +-
+ drivers/video/console/Kconfig | 2 +-
+ include/asm-generic/logic_io.h | 78 +++
+ include/linux/logic_iomem.h | 62 +++
+ include/uapi/linux/virtio_pcidev.h | 64 +++
+ lib/Kconfig | 14 +
+ lib/Makefile | 2 +
+ lib/logic_iomem.c | 318 ++++++++++++
+ 53 files changed, 2211 insertions(+), 111 deletions(-)
+ create mode 100644 arch/um/drivers/virt-pci.c
+ create mode 100644 arch/um/include/asm/cacheflush.h
+ create mode 100644 arch/um/include/asm/cpufeature.h
+ create mode 100644 arch/um/include/asm/fpu/api.h
+ create mode 100644 arch/um/include/asm/futex.h
+ create mode 100644 arch/um/include/asm/msi.h
+ create mode 100644 arch/um/include/asm/pci.h
+ create mode 100644 arch/um/include/linux/virtio-uml.h
+ create mode 100644 arch/um/include/shared/timetravel.h
+ create mode 100644 arch/um/kernel/ioport.c
+ create mode 100644 include/asm-generic/logic_io.h
+ create mode 100644 include/linux/logic_iomem.h
+ create mode 100644 include/uapi/linux/virtio_pcidev.h
+ create mode 100644 lib/logic_iomem.c
+Merging xtensa/xtensa-for-next (21e0c3d5f633 xtensa: fix kconfig unmet dependency warning for HAVE_FUTEX_CMPXCHG)
+$ git merge xtensa/xtensa-for-next
+Merge made by the 'recursive' strategy.
+ arch/xtensa/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging pidfd/for-next (5ddf9602d711 Merge branch 'fs.mount_setattr.nosymfollow' into for-next)
+$ git merge pidfd/for-next
+Merge made by the 'recursive' strategy.
+ fs/namespace.c | 9 ++-
+ fs/open.c | 14 +++-
+ include/linux/fcntl.h | 4 -
+ include/uapi/linux/mount.h | 1 +
+ .../selftests/mount_setattr/mount_setattr_test.c | 88 +++++++++++++++++++++-
+ tools/testing/selftests/openat2/openat2_test.c | 7 +-
+ 6 files changed, 109 insertions(+), 14 deletions(-)
+Merging fscrypt/master (2fc2b430f559 fscrypt: fix derivation of SipHash keys on big endian CPUs)
+$ git merge fscrypt/master
+Merge made by the 'recursive' strategy.
+ fs/crypto/fname.c | 10 +++-------
+ fs/crypto/keysetup.c | 40 ++++++++++++++++++++++++++++++++--------
+ 2 files changed, 35 insertions(+), 15 deletions(-)
+Merging fscache/fscache-next (18d5803bc50e fscache: Use refcount_t for the cookie refcount instead of atomic_t)
+$ git merge fscache/fscache-next
+Removing fs/fscache/object-list.c
+Removing fs/fscache/histogram.c
+Removing fs/cachefiles/proc.c
+Merge made by the 'recursive' strategy.
+ fs/cachefiles/Kconfig | 19 --
+ fs/cachefiles/Makefile | 2 -
+ fs/cachefiles/bind.c | 2 -
+ fs/cachefiles/interface.c | 6 +-
+ fs/cachefiles/internal.h | 25 ---
+ fs/cachefiles/io.c | 6 +-
+ fs/cachefiles/key.c | 2 +-
+ fs/cachefiles/main.c | 7 -
+ fs/cachefiles/namei.c | 61 ++----
+ fs/cachefiles/proc.c | 114 -----------
+ fs/cachefiles/xattr.c | 4 +-
+ fs/fscache/Kconfig | 25 +--
+ fs/fscache/Makefile | 2 -
+ fs/fscache/cache.c | 11 +-
+ fs/fscache/cookie.c | 201 +++++++++++++-----
+ fs/fscache/fsdef.c | 3 +-
+ fs/fscache/histogram.c | 87 --------
+ fs/fscache/internal.h | 57 ++----
+ fs/fscache/main.c | 39 ++++
+ fs/fscache/netfs.c | 2 +-
+ fs/fscache/object-list.c | 414 --------------------------------------
+ fs/fscache/object.c | 8 -
+ fs/fscache/operation.c | 3 -
+ fs/fscache/page.c | 6 -
+ fs/fscache/proc.c | 20 +-
+ include/linux/fscache-cache.h | 4 -
+ include/linux/fscache.h | 4 +-
+ include/linux/netfs.h | 2 +-
+ include/trace/events/cachefiles.h | 68 +++----
+ include/trace/events/fscache.h | 160 +++++++--------
+ include/trace/events/netfs.h | 2 +-
+ 31 files changed, 368 insertions(+), 998 deletions(-)
+ delete mode 100644 fs/cachefiles/proc.c
+ delete mode 100644 fs/fscache/histogram.c
+ delete mode 100644 fs/fscache/object-list.c
+Merging afs/afs-next (7af08140979a Revert "gcov: clang: fix clang-11+ build")
+$ git merge afs/afs-next
+Already up to date.
+Merging btrfs/for-next (5980d0eb3f93 Merge branch 'for-next-next-v5.13-20210621' into for-next-20210621)
+$ git merge btrfs/for-next
+Merge made by the 'recursive' strategy.
+ fs/btrfs/Kconfig | 2 +
+ fs/btrfs/backref.c | 2 +-
+ fs/btrfs/block-group.c | 31 +-
+ fs/btrfs/compression.c | 618 +++++++++++++-----------
+ fs/btrfs/compression.h | 30 +-
+ fs/btrfs/ctree.c | 5 +-
+ fs/btrfs/ctree.h | 134 +++---
+ fs/btrfs/delalloc-space.c | 2 +-
+ fs/btrfs/delayed-inode.c | 41 +-
+ fs/btrfs/delayed-ref.c | 26 -
+ fs/btrfs/dev-replace.c | 2 +-
+ fs/btrfs/discard.c | 2 +-
+ fs/btrfs/disk-io.c | 63 +--
+ fs/btrfs/extent-tree.c | 18 +-
+ fs/btrfs/extent_io.c | 975 ++++++++++++++++++++++----------------
+ fs/btrfs/extent_io.h | 29 +-
+ fs/btrfs/file-item.c | 2 +-
+ fs/btrfs/file.c | 46 +-
+ fs/btrfs/free-space-cache.c | 2 +-
+ fs/btrfs/inode.c | 557 +++++++++++-----------
+ fs/btrfs/ioctl.c | 184 +++++--
+ fs/btrfs/locking.c | 4 +-
+ fs/btrfs/ordered-data.c | 253 +++++++---
+ fs/btrfs/ordered-data.h | 10 +-
+ fs/btrfs/props.c | 16 +-
+ fs/btrfs/qgroup.c | 10 +-
+ fs/btrfs/reflink.c | 14 +-
+ fs/btrfs/relocation.c | 75 ++-
+ fs/btrfs/scrub.c | 161 +++++--
+ fs/btrfs/send.c | 43 +-
+ fs/btrfs/space-info.c | 294 ++++--------
+ fs/btrfs/space-info.h | 30 --
+ fs/btrfs/subpage.c | 155 +++++-
+ fs/btrfs/subpage.h | 33 +-
+ fs/btrfs/super.c | 18 +-
+ fs/btrfs/sysfs.c | 74 ++-
+ fs/btrfs/tests/extent-map-tests.c | 2 +-
+ fs/btrfs/transaction.c | 70 +--
+ fs/btrfs/transaction.h | 6 +-
+ fs/btrfs/tree-log.c | 40 +-
+ fs/btrfs/volumes.c | 24 +-
+ fs/btrfs/volumes.h | 5 +-
+ fs/btrfs/zoned.c | 43 +-
+ fs/btrfs/zoned.h | 9 +
+ include/trace/events/btrfs.h | 24 +-
+ include/uapi/linux/btrfs.h | 4 +-
+ include/uapi/linux/btrfs_tree.h | 4 +-
+ 47 files changed, 2448 insertions(+), 1744 deletions(-)
+Merging ceph/master (99a539b222a4 libceph: fix doc warnings in cls_lock_client.c)
+$ git merge ceph/master
+Merge made by the 'recursive' strategy.
+ fs/ceph/addr.c | 12 ++----------
+ fs/ceph/dir.c | 22 ++++++++++++----------
+ fs/ceph/file.c | 17 +++++++++++------
+ fs/ceph/inode.c | 2 ++
+ fs/ceph/snap.c | 2 +-
+ fs/ceph/super.h | 3 +--
+ net/ceph/auth.c | 7 +------
+ net/ceph/auth_none.c | 4 ++--
+ net/ceph/auth_none.h | 1 -
+ net/ceph/auth_x_protocol.h | 2 +-
+ net/ceph/cls_lock_client.c | 12 +++++++++---
+ net/ceph/mon_client.c | 2 +-
+ net/ceph/osdmap.c | 4 ++--
+ 13 files changed, 45 insertions(+), 45 deletions(-)
+Merging cifs/for-next (632096b66b2f cifs: missing null pointer check in cifs_mount)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/Kconfig | 6 +-
+ fs/cifs/Makefile | 8 +-
+ fs/cifs/asn1.c | 623 ++-----------------
+ fs/cifs/cache.c | 14 +-
+ fs/cifs/cifs_debug.c | 24 +-
+ fs/cifs/cifs_debug.h | 2 +-
+ fs/cifs/cifs_dfs_ref.c | 2 +-
+ fs/cifs/cifs_fs_sb.h | 18 +-
+ fs/cifs/cifs_ioctl.h | 11 +-
+ fs/cifs/cifs_spnego.c | 14 +-
+ fs/cifs/cifs_spnego.h | 14 +-
+ fs/cifs/cifs_spnego_negtokeninit.asn1 | 40 ++
+ fs/cifs/cifs_swn.c | 10 +-
+ fs/cifs/cifsacl.c | 18 +-
+ fs/cifs/cifsacl.h | 15 +-
+ fs/cifs/cifsencrypt.c | 14 +-
+ fs/cifs/cifsfs.c | 14 +-
+ fs/cifs/cifsfs.h | 14 +-
+ fs/cifs/cifsglob.h | 14 +-
+ fs/cifs/cifspdu.h | 14 +-
+ fs/cifs/cifsproto.h | 14 +-
+ fs/cifs/cifssmb.c | 16 +-
+ fs/cifs/connect.c | 153 +++--
+ fs/cifs/dfs_cache.c | 1079 +++++++++++++++------------------
+ fs/cifs/dfs_cache.h | 45 +-
+ fs/cifs/dir.c | 27 +-
+ fs/cifs/dns_resolve.c | 14 +-
+ fs/cifs/dns_resolve.h | 14 +-
+ fs/cifs/export.c | 14 +-
+ fs/cifs/file.c | 14 +-
+ fs/cifs/fscache.c | 14 +-
+ fs/cifs/fscache.h | 14 +-
+ fs/cifs/inode.c | 19 +-
+ fs/cifs/ioctl.c | 14 +-
+ fs/cifs/link.c | 14 +-
+ fs/cifs/misc.c | 14 +-
+ fs/cifs/netlink.c | 2 +-
+ fs/cifs/ntlmssp.h | 14 +-
+ fs/cifs/readdir.c | 16 +-
+ fs/cifs/rfc1002pdu.h | 14 +-
+ fs/cifs/sess.c | 16 +-
+ fs/cifs/smb2file.c | 14 +-
+ fs/cifs/smb2glob.h | 11 +-
+ fs/cifs/smb2inode.c | 14 +-
+ fs/cifs/smb2maperror.c | 14 +-
+ fs/cifs/smb2misc.c | 52 +-
+ fs/cifs/smb2ops.c | 138 +++++
+ fs/cifs/smb2pdu.c | 49 +-
+ fs/cifs/smb2pdu.h | 53 +-
+ fs/cifs/smb2proto.h | 16 +-
+ fs/cifs/smb2status.h | 14 +-
+ fs/cifs/smb2transport.c | 26 +-
+ fs/cifs/smbdirect.c | 14 +-
+ fs/cifs/smberr.h | 14 +-
+ fs/cifs/smbfsctl.h | 14 +-
+ fs/cifs/transport.c | 14 +-
+ fs/cifs/xattr.c | 14 +-
+ include/linux/oid_registry.h | 8 +
+ 58 files changed, 964 insertions(+), 1945 deletions(-)
+ create mode 100644 fs/cifs/cifs_spnego_negtokeninit.asn1
+Merging cifsd/cifsd-for-next (be8bcf8baaec Merge pull request #55 from namjaejeon/cifsd-for-next)
+$ git merge cifsd/cifsd-for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/cifs/cifsd.rst | 164 +
+ Documentation/filesystems/cifs/index.rst | 10 +
+ Documentation/filesystems/index.rst | 2 +-
+ MAINTAINERS | 12 +-
+ fs/Kconfig | 1 +
+ fs/Makefile | 1 +
+ fs/cifsd/Kconfig | 68 +
+ fs/cifsd/Makefile | 20 +
+ fs/cifsd/asn1.c | 342 ++
+ fs/cifsd/asn1.h | 21 +
+ fs/cifsd/auth.c | 1355 +++++
+ fs/cifsd/auth.h | 65 +
+ fs/cifsd/buffer_pool.c | 265 +
+ fs/cifsd/buffer_pool.h | 17 +
+ fs/cifsd/connection.c | 411 ++
+ fs/cifsd/connection.h | 204 +
+ fs/cifsd/crypto_ctx.c | 283 ++
+ fs/cifsd/crypto_ctx.h | 74 +
+ fs/cifsd/glob.h | 64 +
+ fs/cifsd/ksmbd_server.h | 283 ++
+ fs/cifsd/ksmbd_spnego_negtokeninit.asn1 | 31 +
+ fs/cifsd/ksmbd_spnego_negtokentarg.asn1 | 19 +
+ fs/cifsd/ksmbd_work.c | 93 +
+ fs/cifsd/ksmbd_work.h | 110 +
+ fs/cifsd/mgmt/ksmbd_ida.c | 46 +
+ fs/cifsd/mgmt/ksmbd_ida.h | 34 +
+ fs/cifsd/mgmt/share_config.c | 239 +
+ fs/cifsd/mgmt/share_config.h | 81 +
+ fs/cifsd/mgmt/tree_connect.c | 122 +
+ fs/cifsd/mgmt/tree_connect.h | 56 +
+ fs/cifsd/mgmt/user_config.c | 70 +
+ fs/cifsd/mgmt/user_config.h | 66 +
+ fs/cifsd/mgmt/user_session.c | 328 ++
+ fs/cifsd/mgmt/user_session.h | 101 +
+ fs/cifsd/misc.c | 338 ++
+ fs/cifsd/misc.h | 35 +
+ fs/cifsd/ndr.c | 348 ++
+ fs/cifsd/ndr.h | 22 +
+ fs/cifsd/nterr.h | 543 ++
+ fs/cifsd/ntlmssp.h | 169 +
+ fs/cifsd/oplock.c | 1704 +++++++
+ fs/cifsd/oplock.h | 137 +
+ fs/cifsd/server.c | 627 +++
+ fs/cifsd/server.h | 60 +
+ fs/cifsd/smb2misc.c | 435 ++
+ fs/cifsd/smb2ops.c | 300 ++
+ fs/cifsd/smb2pdu.c | 8168 ++++++++++++++++++++++++++++++
+ fs/cifsd/smb2pdu.h | 1683 ++++++
+ fs/cifsd/smb_common.c | 655 +++
+ fs/cifsd/smb_common.h | 544 ++
+ fs/cifsd/smbacl.c | 1321 +++++
+ fs/cifsd/smbacl.h | 202 +
+ fs/cifsd/smbfsctl.h | 91 +
+ fs/cifsd/smbstatus.h | 1822 +++++++
+ fs/cifsd/transport_ipc.c | 880 ++++
+ fs/cifsd/transport_ipc.h | 47 +
+ fs/cifsd/transport_rdma.c | 2040 ++++++++
+ fs/cifsd/transport_rdma.h | 61 +
+ fs/cifsd/transport_tcp.c | 620 +++
+ fs/cifsd/transport_tcp.h | 13 +
+ fs/cifsd/unicode.c | 384 ++
+ fs/cifsd/unicode.h | 357 ++
+ fs/cifsd/uniupr.h | 268 +
+ fs/cifsd/vfs.c | 2015 ++++++++
+ fs/cifsd/vfs.h | 275 +
+ fs/cifsd/vfs_cache.c | 685 +++
+ fs/cifsd/vfs_cache.h | 185 +
+ 67 files changed, 32090 insertions(+), 2 deletions(-)
+ create mode 100644 Documentation/filesystems/cifs/cifsd.rst
+ create mode 100644 Documentation/filesystems/cifs/index.rst
+ create mode 100644 fs/cifsd/Kconfig
+ create mode 100644 fs/cifsd/Makefile
+ create mode 100644 fs/cifsd/asn1.c
+ create mode 100644 fs/cifsd/asn1.h
+ create mode 100644 fs/cifsd/auth.c
+ create mode 100644 fs/cifsd/auth.h
+ create mode 100644 fs/cifsd/buffer_pool.c
+ create mode 100644 fs/cifsd/buffer_pool.h
+ create mode 100644 fs/cifsd/connection.c
+ create mode 100644 fs/cifsd/connection.h
+ create mode 100644 fs/cifsd/crypto_ctx.c
+ create mode 100644 fs/cifsd/crypto_ctx.h
+ create mode 100644 fs/cifsd/glob.h
+ create mode 100644 fs/cifsd/ksmbd_server.h
+ create mode 100644 fs/cifsd/ksmbd_spnego_negtokeninit.asn1
+ create mode 100644 fs/cifsd/ksmbd_spnego_negtokentarg.asn1
+ create mode 100644 fs/cifsd/ksmbd_work.c
+ create mode 100644 fs/cifsd/ksmbd_work.h
+ create mode 100644 fs/cifsd/mgmt/ksmbd_ida.c
+ create mode 100644 fs/cifsd/mgmt/ksmbd_ida.h
+ create mode 100644 fs/cifsd/mgmt/share_config.c
+ create mode 100644 fs/cifsd/mgmt/share_config.h
+ create mode 100644 fs/cifsd/mgmt/tree_connect.c
+ create mode 100644 fs/cifsd/mgmt/tree_connect.h
+ create mode 100644 fs/cifsd/mgmt/user_config.c
+ create mode 100644 fs/cifsd/mgmt/user_config.h
+ create mode 100644 fs/cifsd/mgmt/user_session.c
+ create mode 100644 fs/cifsd/mgmt/user_session.h
+ create mode 100644 fs/cifsd/misc.c
+ create mode 100644 fs/cifsd/misc.h
+ create mode 100644 fs/cifsd/ndr.c
+ create mode 100644 fs/cifsd/ndr.h
+ create mode 100644 fs/cifsd/nterr.h
+ create mode 100644 fs/cifsd/ntlmssp.h
+ create mode 100644 fs/cifsd/oplock.c
+ create mode 100644 fs/cifsd/oplock.h
+ create mode 100644 fs/cifsd/server.c
+ create mode 100644 fs/cifsd/server.h
+ create mode 100644 fs/cifsd/smb2misc.c
+ create mode 100644 fs/cifsd/smb2ops.c
+ create mode 100644 fs/cifsd/smb2pdu.c
+ create mode 100644 fs/cifsd/smb2pdu.h
+ create mode 100644 fs/cifsd/smb_common.c
+ create mode 100644 fs/cifsd/smb_common.h
+ create mode 100644 fs/cifsd/smbacl.c
+ create mode 100644 fs/cifsd/smbacl.h
+ create mode 100644 fs/cifsd/smbfsctl.h
+ create mode 100644 fs/cifsd/smbstatus.h
+ create mode 100644 fs/cifsd/transport_ipc.c
+ create mode 100644 fs/cifsd/transport_ipc.h
+ create mode 100644 fs/cifsd/transport_rdma.c
+ create mode 100644 fs/cifsd/transport_rdma.h
+ create mode 100644 fs/cifsd/transport_tcp.c
+ create mode 100644 fs/cifsd/transport_tcp.h
+ create mode 100644 fs/cifsd/unicode.c
+ create mode 100644 fs/cifsd/unicode.h
+ create mode 100644 fs/cifsd/uniupr.h
+ create mode 100644 fs/cifsd/vfs.c
+ create mode 100644 fs/cifsd/vfs.h
+ create mode 100644 fs/cifsd/vfs_cache.c
+ create mode 100644 fs/cifsd/vfs_cache.h
+Merging configfs/for-next (c886fa3cf6ff configfs: simplify configfs_release_bin_file)
+$ git merge configfs/for-next
+Merge made by the 'recursive' strategy.
+ fs/configfs/file.c | 181 +++++++++++++++--------------------------------------
+ 1 file changed, 51 insertions(+), 130 deletions(-)
+Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs)
+$ git merge ecryptfs/next
+Already up to date.
+Merging erofs/dev (c5fcb51111b8 erofs: clean up file headers & footers)
+$ git merge erofs/dev
+Merge made by the 'recursive' strategy.
+ fs/erofs/Kconfig | 1 -
+ fs/erofs/compress.h | 2 --
+ fs/erofs/data.c | 2 --
+ fs/erofs/decompressor.c | 2 --
+ fs/erofs/dir.c | 2 --
+ fs/erofs/erofs_fs.h | 2 --
+ fs/erofs/inode.c | 2 --
+ fs/erofs/internal.h | 2 --
+ fs/erofs/namei.c | 2 --
+ fs/erofs/super.c | 3 +--
+ fs/erofs/tagptr.h | 3 ---
+ fs/erofs/utils.c | 2 --
+ fs/erofs/xattr.c | 2 --
+ fs/erofs/xattr.h | 1 -
+ fs/erofs/zdata.c | 6 +-----
+ fs/erofs/zdata.h | 1 -
+ fs/erofs/zmap.c | 2 --
+ fs/erofs/zpvec.h | 7 +------
+ 18 files changed, 3 insertions(+), 41 deletions(-)
+Merging exfat/dev (5264f724cf1f exfat: handle wrong stream entry size in exfat_readdir())
+$ git merge exfat/dev
+Merge made by the 'recursive' strategy.
+ fs/exfat/dir.c | 8 +++++---
+ fs/exfat/super.c | 2 +-
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+Merging ext3/for_next (7d7204936dd9 Merge tag 'hole_punch_fixes_for_5.14-rc1' into for_next)
+$ git merge ext3/for_next
+Auto-merging mm/truncate.c
+Auto-merging mm/rmap.c
+Auto-merging mm/memory-failure.c
+Auto-merging include/uapi/asm-generic/unistd.h
+CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h
+Auto-merging fs/xfs/xfs_inode.c
+Auto-merging fs/xfs/xfs_file.c
+Auto-merging fs/xfs/xfs_bmap_util.c
+Auto-merging fs/cifs/smb2ops.c
+Auto-merging fs/ceph/file.c
+Auto-merging fs/ceph/addr.c
+Resolved 'include/uapi/asm-generic/unistd.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 10f1f122d9d3] Merge remote-tracking branch 'ext3/for_next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/locking.rst | 77 ++++++++++++------
+ arch/alpha/kernel/syscalls/syscall.tbl | 2 +-
+ arch/arm/tools/syscall.tbl | 2 +-
+ arch/arm64/include/asm/unistd32.h | 3 +-
+ arch/ia64/kernel/syscalls/syscall.tbl | 2 +-
+ arch/m68k/kernel/syscalls/syscall.tbl | 2 +-
+ arch/microblaze/kernel/syscalls/syscall.tbl | 2 +-
+ arch/mips/kernel/syscalls/syscall_n32.tbl | 2 +-
+ arch/mips/kernel/syscalls/syscall_n64.tbl | 2 +-
+ arch/mips/kernel/syscalls/syscall_o32.tbl | 2 +-
+ arch/parisc/kernel/syscalls/syscall.tbl | 2 +-
+ arch/powerpc/kernel/syscalls/syscall.tbl | 2 +-
+ arch/s390/kernel/syscalls/syscall.tbl | 2 +-
+ arch/sh/kernel/syscalls/syscall.tbl | 2 +-
+ arch/sparc/kernel/syscalls/syscall.tbl | 2 +-
+ arch/x86/entry/syscalls/syscall_32.tbl | 2 +-
+ arch/x86/entry/syscalls/syscall_64.tbl | 2 +-
+ arch/xtensa/kernel/syscalls/syscall.tbl | 2 +-
+ fs/ceph/addr.c | 9 ++-
+ fs/ceph/file.c | 2 +
+ fs/cifs/smb2ops.c | 2 +
+ fs/ext2/ext2.h | 11 ---
+ fs/ext2/file.c | 7 +-
+ fs/ext2/inode.c | 12 +--
+ fs/ext2/super.c | 3 -
+ fs/ext4/ext4.h | 10 ---
+ fs/ext4/extents.c | 25 +++---
+ fs/ext4/file.c | 13 +--
+ fs/ext4/inode.c | 47 ++++-------
+ fs/ext4/ioctl.c | 4 +-
+ fs/ext4/super.c | 13 ++-
+ fs/ext4/truncate.h | 8 +-
+ fs/f2fs/data.c | 4 +-
+ fs/f2fs/f2fs.h | 1 -
+ fs/f2fs/file.c | 62 +++++++-------
+ fs/f2fs/super.c | 1 -
+ fs/fuse/dax.c | 50 ++++++------
+ fs/fuse/dir.c | 11 +--
+ fs/fuse/file.c | 10 +--
+ fs/fuse/fuse_i.h | 7 --
+ fs/fuse/inode.c | 1 -
+ fs/inode.c | 2 +
+ fs/isofs/dir.c | 2 -
+ fs/quota/quota.c | 28 +++----
+ fs/quota/quota_tree.c | 33 +++-----
+ fs/reiserfs/inode.c | 4 +-
+ fs/reiserfs/journal.c | 14 ++++
+ fs/udf/namei.c | 4 +
+ fs/xfs/xfs_bmap_util.c | 15 ++--
+ fs/xfs/xfs_file.c | 13 +--
+ fs/xfs/xfs_inode.c | 121 +++++++++++++++-------------
+ fs/xfs/xfs_inode.h | 3 +-
+ fs/xfs/xfs_super.c | 2 -
+ fs/zonefs/super.c | 23 ++----
+ fs/zonefs/zonefs.h | 7 +-
+ include/linux/fs.h | 39 +++++++++
+ include/linux/syscalls.h | 4 +-
+ include/uapi/asm-generic/unistd.h | 3 +-
+ kernel/sys_ni.c | 2 +-
+ mm/filemap.c | 113 ++++++++++++++++++++++----
+ mm/madvise.c | 2 +-
+ mm/memory-failure.c | 2 +-
+ mm/readahead.c | 2 +
+ mm/rmap.c | 41 +++++-----
+ mm/shmem.c | 20 ++---
+ mm/truncate.c | 9 ++-
+ 66 files changed, 520 insertions(+), 413 deletions(-)
+Merging ext4/dev (f9505c72b2ee ext4: use local variable ei instead of EXT4_I() macro)
+$ git merge ext4/dev
+Auto-merging fs/ext4/super.c
+Auto-merging fs/ext4/ioctl.c
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/ext4/extents.c
+Auto-merging fs/ext4/ext4.h
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/ext4/journal.rst | 39 ++++++++--
+ fs/ext4/ext4.h | 15 +++-
+ fs/ext4/extents.c | 3 +
+ fs/ext4/extents_status.c | 4 +-
+ fs/ext4/ialloc.c | 11 ++-
+ fs/ext4/inode.c | 8 +-
+ fs/ext4/ioctl.c | 66 ++++++++++++++--
+ fs/ext4/mmp.c | 28 ++++---
+ fs/ext4/namei.c | 2 +-
+ fs/ext4/super.c | 26 ++++---
+ fs/jbd2/journal.c | 119 ++++++++++++++++++++++++++++-
+ fs/ocfs2/alloc.c | 2 +-
+ fs/ocfs2/journal.c | 8 +-
+ include/linux/jbd2.h | 6 +-
+ 14 files changed, 274 insertions(+), 63 deletions(-)
+Merging f2fs/dev (4effcf27f123 f2fs: remove false alarm on iget failure during GC)
+$ git merge f2fs/dev
+Auto-merging fs/f2fs/super.c
+Auto-merging fs/f2fs/file.c
+Auto-merging fs/f2fs/f2fs.h
+Auto-merging fs/f2fs/data.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-fs-f2fs | 57 ++++-
+ Documentation/filesystems/f2fs.rst | 19 +-
+ fs/f2fs/checkpoint.c | 4 +-
+ fs/f2fs/compress.c | 255 +++++++++++++++++------
+ fs/f2fs/data.c | 358 ++++++++++++++------------------
+ fs/f2fs/debug.c | 13 ++
+ fs/f2fs/dir.c | 25 ++-
+ fs/f2fs/f2fs.h | 223 ++++++++++++++++----
+ fs/f2fs/file.c | 37 ++--
+ fs/f2fs/gc.c | 16 +-
+ fs/f2fs/inline.c | 4 +-
+ fs/f2fs/inode.c | 23 +-
+ fs/f2fs/namei.c | 16 +-
+ fs/f2fs/node.c | 24 ++-
+ fs/f2fs/node.h | 33 +--
+ fs/f2fs/recovery.c | 29 ++-
+ fs/f2fs/segment.c | 34 ++-
+ fs/f2fs/super.c | 109 +++++++++-
+ fs/f2fs/sysfs.c | 232 +++++++++++++++------
+ include/linux/f2fs_fs.h | 2 +
+ 20 files changed, 1033 insertions(+), 480 deletions(-)
+$ git am -3 ../patches/0001-fix-up-for-f2fs-Convert-to-using-invalidate_lock.patch
+Applying: fix up for "f2fs: Convert to using invalidate_lock"
+$ git reset HEAD^
+Unstaged changes after reset:
+M fs/f2fs/data.c
+$ git add -A .
+$ git commit -v -a --amend
+[master d97a1da884ac] Merge remote-tracking branch 'f2fs/dev'
+ Date: Thu Jun 24 10:04:18 2021 +1000
+Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl)
+$ git merge fsverity/fsverity
+Already up to date.
+Merging fuse/for-next (c4e0cd4e0c16 virtiofs: Fix spelling mistakes)
+$ git merge fuse/for-next
+Auto-merging fs/fuse/inode.c
+Auto-merging fs/fuse/fuse_i.h
+Auto-merging fs/fuse/file.c
+Auto-merging fs/fuse/dir.c
+Auto-merging fs/fuse/dax.c
+Merge made by the 'recursive' strategy.
+ fs/fuse/dax.c | 6 +--
+ fs/fuse/dev.c | 14 ++++++-
+ fs/fuse/dir.c | 63 +++++------------------------
+ fs/fuse/file.c | 14 ++++---
+ fs/fuse/fuse_i.h | 24 ++++++-----
+ fs/fuse/inode.c | 100 ++++++++++++++++++++++++++++++++++++++++++++--
+ fs/fuse/readdir.c | 7 +++-
+ fs/fuse/virtio_fs.c | 4 ++
+ include/uapi/linux/fuse.h | 10 ++++-
+ 9 files changed, 161 insertions(+), 81 deletions(-)
+Merging gfs2/for-next (4304d3be8754 gfs2: Fix underflow in gfs2_page_mkwrite)
+$ git merge gfs2/for-next
+Merge made by the 'recursive' strategy.
+ fs/gfs2/file.c | 6 +++---
+ fs/gfs2/glock.c | 3 +--
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+Merging jfs/jfs-next (5d299f44d765 jfs: Avoid field-overflowing memcpy())
+$ git merge jfs/jfs-next
+Merge made by the 'recursive' strategy.
+ fs/jfs/inode.c | 3 ++-
+ fs/jfs/jfs_dinode.h | 14 ++++++++++----
+ fs/jfs/jfs_dmap.c | 2 +-
+ fs/jfs/jfs_imap.c | 8 +++-----
+ fs/jfs/jfs_incore.h | 12 ++++++++++--
+ fs/jfs/jfs_logmgr.c | 1 +
+ fs/jfs/jfs_txnmgr.c | 2 +-
+ fs/jfs/super.c | 3 ++-
+ 8 files changed, 30 insertions(+), 15 deletions(-)
+Merging nfs/linux-next (009c9aa5be65 Linux 5.13-rc6)
+$ git merge nfs/linux-next
+Already up to date.
+Merging nfs-anna/linux-next (4f8be1f53bf6 nfs: we don't support removing system.nfs4_acl)
+$ git merge nfs-anna/linux-next
+Already up to date.
+Merging nfsd/nfsd-next (8f83fd6fbab8 lockd: Update the NLMv4 SHARE results encoder to use struct xdr_stream)
+$ git merge nfsd/nfsd-next
+Auto-merging fs/nfs/nfs4file.c
+Merge made by the 'recursive' strategy.
+ fs/lockd/svc.c | 43 ++++
+ fs/lockd/svcxdr.h | 151 ++++++++++++++
+ fs/lockd/xdr.c | 402 +++++++++++++++++++------------------
+ fs/lockd/xdr4.c | 403 ++++++++++++++++++++------------------
+ fs/nfs/nfs4file.c | 10 +-
+ fs/nfs_common/grace.c | 1 +
+ fs/nfsd/netns.h | 6 +
+ fs/nfsd/nfs4callback.c | 47 ++---
+ fs/nfsd/nfs4proc.c | 152 +++++++++++++-
+ fs/nfsd/nfs4state.c | 177 +++++++++++++----
+ fs/nfsd/nfsd.h | 4 +
+ fs/nfsd/nfsfh.h | 7 +-
+ fs/nfsd/nfssvc.c | 3 +
+ fs/nfsd/trace.h | 249 +++++++++++++++++------
+ fs/nfsd/vfs.c | 8 +-
+ fs/nfsd/xdr4.h | 1 +
+ include/linux/lockd/xdr.h | 6 -
+ include/linux/lockd/xdr4.h | 7 +-
+ include/linux/nfs_ssc.h | 14 ++
+ net/sunrpc/auth_gss/svcauth_gss.c | 2 +-
+ net/sunrpc/xprtrdma/svc_rdma_rw.c | 6 +-
+ 21 files changed, 1160 insertions(+), 539 deletions(-)
+ create mode 100644 fs/lockd/svcxdr.h
+Merging cel/for-next (b9f83ffaa0c0 SUNRPC: Fix null pointer dereference in svc_rqst_free())
+$ git merge cel/for-next
+Already up to date.
+Merging orangefs/for-next (211f9f2e0503 orangefs: leave files in the page cache for a few micro seconds at least)
+$ git merge orangefs/for-next
+Already up to date.
+Merging overlayfs/overlayfs-next (5e717c6fa41f ovl: add debug print to ovl_do_getxattr())
+$ git merge overlayfs/overlayfs-next
+Already up to date.
+Merging ubifs/next (a801fcfeef96 ubifs: Set/Clear I_LINKABLE under i_lock for whiteout inode)
+$ git merge ubifs/next
+Merge made by the 'recursive' strategy.
+ drivers/mtd/ubi/debug.c | 2 +-
+ fs/ubifs/debug.c | 2 +-
+ fs/ubifs/dir.c | 7 +++++++
+ fs/ubifs/journal.c | 3 ++-
+ fs/ubifs/master.c | 2 +-
+ fs/ubifs/replay.c | 2 +-
+ fs/ubifs/super.c | 3 ++-
+ fs/ubifs/tnc_commit.c | 2 +-
+ fs/ubifs/ubifs.h | 4 +++-
+ fs/ubifs/xattr.c | 48 +++++++++++++++++++++++++++++++++---------------
+ 10 files changed, 52 insertions(+), 23 deletions(-)
+Merging v9fs/9p-next (cba7dcd8878e 9p/trans_virtio: Remove sysfs file on probe failure)
+$ git merge v9fs/9p-next
+Merge made by the 'recursive' strategy.
+ net/9p/trans_virtio.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+Merging xfs/for-next (a8f3522c9a1f xfs: fix endianness issue in xfs_ag_shrink_space)
+$ git merge xfs/for-next
+Auto-merging fs/xfs/xfs_super.c
+Auto-merging fs/xfs/xfs_log.c
+Auto-merging fs/xfs/xfs_ioctl.c
+Auto-merging fs/xfs/xfs_inode.h
+Auto-merging fs/xfs/xfs_inode.c
+Auto-merging fs/xfs/xfs_file.c
+Auto-merging fs/xfs/xfs_bmap_util.c
+Auto-merging fs/xfs/scrub/repair.c
+Auto-merging fs/xfs/scrub/common.c
+Auto-merging fs/xfs/scrub/bmap.c
+Auto-merging fs/xfs/scrub/agheader.c
+Auto-merging fs/xfs/libxfs/xfs_alloc.c
+Auto-merging fs/xfs/libxfs/xfs_ag_resv.c
+Merge made by the 'recursive' strategy.
+ fs/xfs/libxfs/xfs_ag.c | 280 +++++++-
+ fs/xfs/libxfs/xfs_ag.h | 136 ++++
+ fs/xfs/libxfs/xfs_ag_resv.c | 11 +-
+ fs/xfs/libxfs/xfs_ag_resv.h | 15 +
+ fs/xfs/libxfs/xfs_alloc.c | 111 ++--
+ fs/xfs/libxfs/xfs_alloc.h | 2 +-
+ fs/xfs/libxfs/xfs_alloc_btree.c | 31 +-
+ fs/xfs/libxfs/xfs_alloc_btree.h | 9 +-
+ fs/xfs/libxfs/xfs_attr.c | 910 +++++++++++++++-----------
+ fs/xfs/libxfs/xfs_attr.h | 403 ++++++++++++
+ fs/xfs/libxfs/xfs_attr_leaf.c | 5 +-
+ fs/xfs/libxfs/xfs_attr_leaf.h | 2 +-
+ fs/xfs/libxfs/xfs_attr_remote.c | 167 +++--
+ fs/xfs/libxfs/xfs_attr_remote.h | 8 +-
+ fs/xfs/libxfs/xfs_bmap.c | 3 +-
+ fs/xfs/libxfs/xfs_bmap.h | 1 -
+ fs/xfs/libxfs/xfs_btree.c | 15 +-
+ fs/xfs/libxfs/xfs_btree.h | 10 +-
+ fs/xfs/libxfs/xfs_ialloc.c | 637 +++++++++----------
+ fs/xfs/libxfs/xfs_ialloc.h | 40 +-
+ fs/xfs/libxfs/xfs_ialloc_btree.c | 46 +-
+ fs/xfs/libxfs/xfs_ialloc_btree.h | 13 +-
+ fs/xfs/libxfs/xfs_inode_buf.c | 2 +-
+ fs/xfs/libxfs/xfs_log_format.h | 3 -
+ fs/xfs/libxfs/xfs_refcount.c | 122 ++--
+ fs/xfs/libxfs/xfs_refcount.h | 9 +-
+ fs/xfs/libxfs/xfs_refcount_btree.c | 39 +-
+ fs/xfs/libxfs/xfs_refcount_btree.h | 7 +-
+ fs/xfs/libxfs/xfs_rmap.c | 147 +++--
+ fs/xfs/libxfs/xfs_rmap.h | 6 +-
+ fs/xfs/libxfs/xfs_rmap_btree.c | 46 +-
+ fs/xfs/libxfs/xfs_rmap_btree.h | 6 +-
+ fs/xfs/libxfs/xfs_sb.c | 146 +----
+ fs/xfs/libxfs/xfs_sb.h | 9 -
+ fs/xfs/libxfs/xfs_shared.h | 20 +-
+ fs/xfs/libxfs/xfs_types.c | 4 +-
+ fs/xfs/libxfs/xfs_types.h | 1 +
+ fs/xfs/scrub/agheader.c | 1 +
+ fs/xfs/scrub/agheader_repair.c | 33 +-
+ fs/xfs/scrub/alloc.c | 3 +-
+ fs/xfs/scrub/bmap.c | 21 +-
+ fs/xfs/scrub/common.c | 15 +-
+ fs/xfs/scrub/fscounters.c | 42 +-
+ fs/xfs/scrub/health.c | 2 +-
+ fs/xfs/scrub/ialloc.c | 9 +-
+ fs/xfs/scrub/refcount.c | 3 +-
+ fs/xfs/scrub/repair.c | 14 +-
+ fs/xfs/scrub/rmap.c | 3 +-
+ fs/xfs/scrub/trace.c | 3 +-
+ fs/xfs/xfs_attr_inactive.c | 2 +-
+ fs/xfs/xfs_bio_io.c | 35 +
+ fs/xfs/xfs_bmap_util.c | 6 +-
+ fs/xfs/xfs_buf.c | 311 ++++-----
+ fs/xfs/xfs_buf.h | 3 +-
+ fs/xfs/xfs_buf_item.c | 97 ++-
+ fs/xfs/xfs_discard.c | 6 +-
+ fs/xfs/xfs_dquot_item.c | 2 +-
+ fs/xfs/xfs_extent_busy.c | 33 +-
+ fs/xfs/xfs_extent_busy.h | 7 +-
+ fs/xfs/xfs_file.c | 70 +-
+ fs/xfs/xfs_filestream.c | 2 +-
+ fs/xfs/xfs_fsmap.c | 80 ++-
+ fs/xfs/xfs_fsops.c | 24 +-
+ fs/xfs/xfs_health.c | 15 +-
+ fs/xfs/xfs_icache.c | 1226 ++++++++++++++++++++----------------
+ fs/xfs/xfs_icache.h | 58 +-
+ fs/xfs/xfs_inode.c | 234 +++----
+ fs/xfs/xfs_inode.h | 9 +-
+ fs/xfs/xfs_inode_item.c | 18 +-
+ fs/xfs/xfs_inode_item.h | 2 +-
+ fs/xfs/xfs_ioctl.c | 43 +-
+ fs/xfs/xfs_iops.c | 4 +-
+ fs/xfs/xfs_iwalk.c | 84 ++-
+ fs/xfs/xfs_linux.h | 2 +
+ fs/xfs/xfs_log.c | 223 ++++---
+ fs/xfs/xfs_log.h | 5 +-
+ fs/xfs/xfs_log_cil.c | 103 ++-
+ fs/xfs/xfs_log_priv.h | 38 +-
+ fs/xfs/xfs_log_recover.c | 61 +-
+ fs/xfs/xfs_mount.c | 136 +---
+ fs/xfs/xfs_mount.h | 110 +---
+ fs/xfs/xfs_qm.c | 10 +-
+ fs/xfs/xfs_qm.h | 1 -
+ fs/xfs/xfs_qm_syscalls.c | 54 +-
+ fs/xfs/xfs_reflink.c | 13 +-
+ fs/xfs/xfs_super.c | 10 +-
+ fs/xfs/xfs_super.h | 1 -
+ fs/xfs/xfs_symlink.c | 9 +-
+ fs/xfs/xfs_trace.c | 2 +
+ fs/xfs/xfs_trace.h | 115 +++-
+ fs/xfs/xfs_trans.c | 6 +-
+ fs/xfs/xfs_trans.h | 4 +-
+ 92 files changed, 3823 insertions(+), 3022 deletions(-)
+Merging zonefs/for-next (6980d29ce4da zonefs: fix to update .i_wr_refcnt correctly in zonefs_open_zone())
+$ git merge zonefs/for-next
+Already up to date.
+Merging iomap/iomap-for-next (6e552494fb90 iomap: remove unused private field from ioend)
+$ git merge iomap/iomap-for-next
+Already up to date.
+Merging djw-vfs/vfs-for-next (9b8523423b23 vfs: move __sb_{start,end}_write* to fs.h)
+$ git merge djw-vfs/vfs-for-next
+Already up to date.
+Merging file-locks/locks-next (cbe6fc4e0142 fs/locks: remove useless assignment in fcntl_getlk)
+$ git merge file-locks/locks-next
+Already up to date.
+Merging vfs/for-next (1130294f1440 Merge branch 'work.iov_iter' into for-next)
+$ git merge vfs/for-next
+Auto-merging mm/filemap.c
+Auto-merging include/linux/fs.h
+Auto-merging fs/open.c
+Auto-merging fs/nfs/nfstrace.h
+Auto-merging fs/iomap/buffered-io.c
+Auto-merging fs/fuse/file.c
+Auto-merging fs/coredump.c
+Auto-merging fs/btrfs/file.c
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/path-lookup.rst | 6 +-
+ Documentation/filesystems/porting.rst | 18 +
+ arch/um/drivers/mconsole_kern.c | 2 +-
+ fs/btrfs/file.c | 23 +-
+ fs/coredump.c | 4 +-
+ fs/d_path.c | 324 ++++----
+ fs/fhandle.c | 2 +-
+ fs/fuse/file.c | 4 +-
+ fs/internal.h | 2 +-
+ fs/iomap/buffered-io.c | 35 +-
+ fs/kernel_read_file.c | 2 +-
+ fs/namei.c | 80 +-
+ fs/nfs/nfstrace.h | 4 -
+ fs/ntfs/file.c | 33 +-
+ fs/open.c | 4 +-
+ fs/proc/proc_sysctl.c | 2 +-
+ include/linux/fs.h | 8 +-
+ include/linux/namei.h | 3 -
+ include/linux/uio.h | 66 +-
+ include/net/checksum.h | 14 +-
+ kernel/usermode_driver.c | 2 +-
+ lib/iov_iter.c | 1231 +++++++++++++----------------
+ mm/filemap.c | 36 +-
+ 23 files changed, 850 insertions(+), 1055 deletions(-)
+Merging printk/for-next (48e72544d6f0 Merge branch 'printk-rework' into for-next)
+$ git merge printk/for-next
+Auto-merging lib/vsprintf.c
+Auto-merging lib/test_printf.c
+Auto-merging lib/Makefile
+Auto-merging lib/Kconfig.debug
+Auto-merging drivers/usb/host/xhci-tegra.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/core-api/printk-formats.rst
+Merge made by the 'recursive' strategy.
+ Documentation/core-api/printk-formats.rst | 7 +-
+ MAINTAINERS | 1 +
+ drivers/usb/host/xhci-tegra.c | 6 +-
+ fs/nilfs2/sysfs.c | 19 +-
+ include/linux/dev_printk.h | 2 +-
+ include/linux/prandom.h | 2 +-
+ include/linux/printk.h | 41 ++
+ kernel/debug/kdb/kdb_main.c | 9 +-
+ kernel/printk/printk.c | 116 +++++
+ lib/Kconfig.debug | 3 +
+ lib/Makefile | 1 +
+ lib/dump_stack.c | 38 +-
+ lib/kstrtox.c | 13 +-
+ lib/kstrtox.h | 2 +
+ lib/test_printf.c | 5 +
+ lib/test_scanf.c | 750 ++++++++++++++++++++++++++++++
+ lib/vsprintf.c | 110 +++--
+ tools/testing/selftests/lib/Makefile | 2 +-
+ tools/testing/selftests/lib/config | 1 +
+ tools/testing/selftests/lib/scanf.sh | 4 +
+ 20 files changed, 1020 insertions(+), 112 deletions(-)
+ create mode 100644 lib/test_scanf.c
+ create mode 100755 tools/testing/selftests/lib/scanf.sh
+Merging pci/next (f25d926127a2 Merge branch 'remotes/lorenzo/pci/xgene')
+$ git merge pci/next
+Auto-merging drivers/pci/quirks.c
+Auto-merging drivers/pci/probe.c
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/pci/controller/dwc/pcie-tegra194.c
+Merge made by the 'recursive' strategy.
+ Documentation/PCI/pci-error-recovery.rst | 2 +-
+ arch/x86/pci/mmconfig-shared.c | 10 +-
+ drivers/pci/controller/dwc/pci-imx6.c | 4 +-
+ drivers/pci/controller/dwc/pcie-tegra194.c | 2 +
+ .../pci/controller/mobiveil/pcie-layerscape-gen4.c | 11 -
+ drivers/pci/controller/pci-ftpci100.c | 30 +--
+ drivers/pci/controller/pci-hyperv.c | 64 ++---
+ drivers/pci/controller/pci-tegra.c | 1 +
+ drivers/pci/controller/pci-xgene.c | 4 +-
+ drivers/pci/controller/pcie-mediatek.c | 4 +-
+ drivers/pci/controller/pcie-microchip-host.c | 2 +-
+ drivers/pci/ecam.c | 54 +++-
+ drivers/pci/hotplug/pci_hotplug_core.c | 8 +-
+ drivers/pci/hotplug/pciehp_hpc.c | 36 +++
+ drivers/pci/hotplug/rpadlpar_sysfs.c | 4 +-
+ drivers/pci/hotplug/shpchp_sysfs.c | 38 +--
+ drivers/pci/iov.c | 23 +-
+ drivers/pci/msi.c | 8 +-
+ drivers/pci/p2pdma.c | 286 ++++++++++-----------
+ drivers/pci/pci-label.c | 22 +-
+ drivers/pci/pci-sysfs.c | 2 +-
+ drivers/pci/pci.c | 34 ++-
+ drivers/pci/pci.h | 4 +
+ drivers/pci/pcie/aer.c | 24 +-
+ drivers/pci/pcie/aspm.c | 4 +-
+ drivers/pci/pcie/dpc.c | 74 +++++-
+ drivers/pci/probe.c | 51 +++-
+ drivers/pci/quirks.c | 11 +
+ drivers/pci/slot.c | 18 +-
+ drivers/pci/switch/switchtec.c | 18 +-
+ include/linux/pci-ecam.h | 1 +
+ 31 files changed, 516 insertions(+), 338 deletions(-)
+Merging pstore/for-next/pstore (1d1f6cc5818c pstore/blk: Include zone in pstore_device_info)
+$ git merge pstore/for-next/pstore
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/pstore-blk.rst | 14 +-
+ drivers/mtd/mtdpstore.c | 10 +-
+ fs/pstore/blk.c | 403 ++++++++++++-------------------
+ include/linux/pstore_blk.h | 27 +--
+ 4 files changed, 171 insertions(+), 283 deletions(-)
+Merging hid/for-next (88bcf9de46df Merge branch 'for-5.13/upstream-fixes' into for-next)
+$ git merge hid/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 2 +-
+ drivers/hid/hid-core.c | 10 +-
+ drivers/hid/hid-google-hammer.c | 10 ++
+ drivers/hid/hid-ids.h | 2 +
+ drivers/hid/hid-input.c | 8 +-
+ drivers/hid/hid-ite.c | 1 +
+ drivers/hid/hid-lg-g15.c | 141 ++++++++++++++++++---------
+ drivers/hid/hid-logitech-dj.c | 8 ++
+ drivers/hid/hid-logitech-hidpp.c | 12 +++
+ drivers/hid/hid-sony.c | 98 +++++++++----------
+ drivers/hid/intel-ish-hid/Kconfig | 1 +
+ drivers/hid/intel-ish-hid/ipc/ipc.c | 28 +++++-
+ drivers/hid/intel-ish-hid/ipc/pci-ish.c | 3 +-
+ drivers/hid/intel-ish-hid/ishtp-fw-loader.c | 51 +++++-----
+ drivers/hid/intel-ish-hid/ishtp-hid-client.c | 15 +--
+ drivers/hid/intel-ish-hid/ishtp-hid.c | 2 +-
+ drivers/hid/intel-ish-hid/ishtp-hid.h | 9 +-
+ drivers/hid/intel-ish-hid/ishtp/bus.c | 24 +++--
+ drivers/hid/intel-ish-hid/ishtp/client.c | 23 ++++-
+ drivers/hid/intel-ish-hid/ishtp/hbm.c | 10 +-
+ drivers/hid/intel-ish-hid/ishtp/hbm.h | 1 +
+ drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h | 5 +-
+ drivers/hid/surface-hid/surface_hid.c | 2 +-
+ drivers/hid/usbhid/usbkbd.c | 4 +-
+ drivers/hid/usbhid/usbmouse.c | 2 +-
+ drivers/platform/chrome/cros_ec_ishtp.c | 4 +-
+ include/linux/intel-ish-client-if.h | 10 +-
+ 27 files changed, 305 insertions(+), 181 deletions(-)
+Merging i2c/i2c/for-next (078de1e62c83 Merge branch 'i2c/for-mergewindow' into i2c/for-next)
+$ git merge i2c/i2c/for-next
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/i2c/renesas,riic.txt
+Removing Documentation/devicetree/bindings/i2c/renesas,iic.txt
+Removing Documentation/devicetree/bindings/i2c/renesas,iic-emev2.txt
+Removing Documentation/devicetree/bindings/i2c/renesas,i2c.txt
+Removing Documentation/devicetree/bindings/i2c/i2c-omap.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/i2c/i2c-mt65xx.txt | 1 +
+ .../devicetree/bindings/i2c/i2c-mux-gpio.txt | 1 -
+ Documentation/devicetree/bindings/i2c/i2c-omap.txt | 37 -----
+ .../devicetree/bindings/i2c/i2c-pxa-pci-ce4100.txt | 4 +-
+ .../devicetree/bindings/i2c/i2c-qcom-cci.txt | 5 +-
+ .../devicetree/bindings/i2c/i2c-rk3x.yaml | 1 +
+ Documentation/devicetree/bindings/i2c/i2c.txt | 7 +-
+ .../devicetree/bindings/i2c/renesas,i2c.txt | 67 ---------
+ .../devicetree/bindings/i2c/renesas,iic-emev2.txt | 22 ---
+ .../devicetree/bindings/i2c/renesas,iic-emev2.yaml | 54 +++++++
+ .../devicetree/bindings/i2c/renesas,iic.txt | 72 ----------
+ .../devicetree/bindings/i2c/renesas,rcar-i2c.yaml | 158 +++++++++++++++++++++
+ .../devicetree/bindings/i2c/renesas,riic.txt | 32 -----
+ .../devicetree/bindings/i2c/renesas,riic.yaml | 93 ++++++++++++
+ .../bindings/i2c/renesas,rmobile-iic.yaml | 149 +++++++++++++++++++
+ .../devicetree/bindings/i2c/ti,omap4-i2c.yaml | 102 +++++++++++++
+ MAINTAINERS | 13 +-
+ drivers/gpu/drm/i915/selftests/i915_gem.c | 20 +--
+ drivers/i2c/busses/i2c-aspeed.c | 12 +-
+ drivers/i2c/busses/i2c-cht-wc.c | 3 +-
+ drivers/i2c/busses/i2c-cp2615.c | 14 +-
+ drivers/i2c/busses/i2c-i801.c | 139 +++++++-----------
+ drivers/i2c/busses/i2c-mt65xx.c | 9 +-
+ drivers/i2c/busses/i2c-qcom-cci.c | 1 +
+ drivers/i2c/busses/i2c-rcar.c | 1 -
+ drivers/i2c/busses/i2c-riic.c | 23 ++-
+ drivers/i2c/busses/i2c-stm32f7.c | 73 ++++++++++
+ drivers/i2c/i2c-core-base.c | 105 +++++++++++++-
+ include/linux/i2c.h | 2 +
+ 29 files changed, 867 insertions(+), 353 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-omap.txt
+ delete mode 100644 Documentation/devicetree/bindings/i2c/renesas,i2c.txt
+ delete mode 100644 Documentation/devicetree/bindings/i2c/renesas,iic-emev2.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/renesas,iic-emev2.yaml
+ delete mode 100644 Documentation/devicetree/bindings/i2c/renesas,iic.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/renesas,rcar-i2c.yaml
+ delete mode 100644 Documentation/devicetree/bindings/i2c/renesas,riic.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/renesas,riic.yaml
+ create mode 100644 Documentation/devicetree/bindings/i2c/renesas,rmobile-iic.yaml
+ create mode 100644 Documentation/devicetree/bindings/i2c/ti,omap4-i2c.yaml
+Merging i3c/i3c/next (3e5feb11a829 i3c: master: svc: fix doc warning in svc-i3c-master.c)
+$ git merge i3c/i3c/next
+Merge made by the 'recursive' strategy.
+ drivers/i3c/master/svc-i3c-master.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved)
+$ git merge dmi/dmi-for-next
+Already up to date.
+Merging hwmon-staging/hwmon-next (4c7f85a321a1 hwmon: (lm90) Disable interrupt on suspend)
+$ git merge hwmon-staging/hwmon-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/hwmon/lm75.yaml | 1 +
+ .../devicetree/bindings/trivial-devices.yaml | 4 +
+ Documentation/hwmon/adm1177.rst | 3 +-
+ Documentation/hwmon/dps920ab.rst | 73 ++++
+ Documentation/hwmon/index.rst | 4 +
+ Documentation/hwmon/ir36021.rst | 2 +-
+ Documentation/hwmon/lm75.rst | 6 +-
+ Documentation/hwmon/ltc2992.rst | 2 +-
+ Documentation/hwmon/max31790.rst | 5 +-
+ Documentation/hwmon/mp2888.rst | 113 ++++++
+ Documentation/hwmon/pim4328.rst | 105 ++++++
+ Documentation/hwmon/pm6764tr.rst | 2 +-
+ Documentation/hwmon/pmbus-core.rst | 42 ++-
+ Documentation/hwmon/pmbus.rst | 11 +-
+ Documentation/hwmon/sht4x.rst | 45 +++
+ Documentation/hwmon/zl6100.rst | 132 ++++---
+ MAINTAINERS | 7 +
+ drivers/hwmon/Kconfig | 11 +
+ drivers/hwmon/Makefile | 1 +
+ drivers/hwmon/bt1-pvt.c | 4 +-
+ drivers/hwmon/ina3221.c | 22 +-
+ drivers/hwmon/lm70.c | 28 +-
+ drivers/hwmon/lm75.c | 13 +
+ drivers/hwmon/lm90.c | 79 +++-
+ drivers/hwmon/max31722.c | 9 -
+ drivers/hwmon/max31790.c | 72 ++--
+ drivers/hwmon/ntc_thermistor.c | 4 -
+ drivers/hwmon/pmbus/Kconfig | 34 +-
+ drivers/hwmon/pmbus/Makefile | 3 +
+ drivers/hwmon/pmbus/adm1275.c | 14 +-
+ drivers/hwmon/pmbus/dps920ab.c | 206 +++++++++++
+ drivers/hwmon/pmbus/mp2888.c | 408 +++++++++++++++++++++
+ drivers/hwmon/pmbus/pim4328.c | 233 ++++++++++++
+ drivers/hwmon/pmbus/pmbus.c | 19 +-
+ drivers/hwmon/pmbus/pmbus.h | 2 +-
+ drivers/hwmon/pmbus/pmbus_core.c | 151 +++++++-
+ drivers/hwmon/pmbus/zl6100.c | 94 ++++-
+ drivers/hwmon/sch5627.c | 18 +-
+ drivers/hwmon/sch5636.c | 9 +-
+ drivers/hwmon/sch56xx-common.c | 65 +---
+ drivers/hwmon/sch56xx-common.h | 4 +-
+ drivers/hwmon/sht4x.c | 296 +++++++++++++++
+ include/linux/pmbus.h | 30 ++
+ 43 files changed, 2126 insertions(+), 260 deletions(-)
+ create mode 100644 Documentation/hwmon/dps920ab.rst
+ create mode 100644 Documentation/hwmon/mp2888.rst
+ create mode 100644 Documentation/hwmon/pim4328.rst
+ create mode 100644 Documentation/hwmon/sht4x.rst
+ create mode 100644 drivers/hwmon/pmbus/dps920ab.c
+ create mode 100644 drivers/hwmon/pmbus/mp2888.c
+ create mode 100644 drivers/hwmon/pmbus/pim4328.c
+ create mode 100644 drivers/hwmon/sht4x.c
+Merging jc_docs/docs-next (98cf4951842a Merge branch 'path-lookup' into docs-next)
+$ git merge jc_docs/docs-next
+Auto-merging include/linux/device.h
+Auto-merging Documentation/virt/kvm/vcpu-requests.rst
+Auto-merging Documentation/virt/kvm/api.rst
+Auto-merging Documentation/filesystems/path-lookup.rst
+Auto-merging Documentation/filesystems/index.rst
+Removing Documentation/filesystems/dax.txt
+Auto-merging Documentation/dev-tools/kunit/usage.rst
+Auto-merging Documentation/dev-tools/kunit/start.rst
+Auto-merging Documentation/dev-tools/kunit/index.rst
+Auto-merging Documentation/core-api/printk-formats.rst
+Auto-merging Documentation/admin-guide/sysctl/kernel.rst
+Auto-merging Documentation/ABI/testing/sysfs-fs-f2fs
+Removing Documentation/ABI/testing/sysfs-class-led-driver-el15203000
+Removing Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870
+Removing Documentation/ABI/testing/sysfs-class-backlight-adp8860
+Removing Documentation/ABI/testing/sysfs-class-backlight-adp5520
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/obsolete/sysfs-cpuidle | 2 +-
+ Documentation/ABI/removed/sysfs-kernel-uids | 2 +-
+ Documentation/ABI/stable/sysfs-bus-vmbus | 2 +-
+ Documentation/ABI/stable/sysfs-bus-xen-backend | 2 +-
+ Documentation/ABI/stable/sysfs-devices-system-cpu | 83 +++
+ Documentation/ABI/stable/sysfs-driver-dma-idxd | 2 +-
+ Documentation/ABI/stable/sysfs-driver-mlxreg-io | 4 +-
+ Documentation/ABI/testing/configfs-iio | 2 +-
+ Documentation/ABI/testing/configfs-most | 8 +-
+ Documentation/ABI/testing/configfs-usb-gadget | 2 +-
+ Documentation/ABI/testing/configfs-usb-gadget-uvc | 4 +-
+ Documentation/ABI/testing/debugfs-driver-genwqe | 2 +-
+ .../ABI/testing/debugfs-driver-habanalabs | 2 +-
+ Documentation/ABI/testing/sysfs-bus-fsi | 2 +-
+ Documentation/ABI/testing/sysfs-bus-iio | 6 +-
+ Documentation/ABI/testing/sysfs-bus-pci | 4 +-
+ Documentation/ABI/testing/sysfs-class-backlight | 100 ++++
+ .../ABI/testing/sysfs-class-backlight-adp5520 | 31 --
+ .../ABI/testing/sysfs-class-backlight-adp8860 | 37 --
+ .../testing/sysfs-class-backlight-driver-adp8870 | 32 --
+ .../ABI/testing/sysfs-class-led-driver-el15203000 | 9 -
+ .../ABI/testing/sysfs-class-led-trigger-pattern | 3 +
+ Documentation/ABI/testing/sysfs-devices-system-cpu | 10 +-
+ Documentation/ABI/testing/sysfs-driver-ufs | 4 +-
+ Documentation/ABI/testing/sysfs-fs-f2fs | 2 +-
+ .../ABI/testing/sysfs-kernel-iommu_groups | 12 +-
+ Documentation/Makefile | 2 +-
+ Documentation/PCI/acpi-info.rst | 18 +-
+ Documentation/PCI/endpoint/pci-endpoint-cfs.rst | 2 +-
+ Documentation/PCI/pci.rst | 6 +-
+ Documentation/admin-guide/cputopology.rst | 85 +--
+ Documentation/admin-guide/ext4.rst | 2 +-
+ .../special-register-buffer-data-sampling.rst | 3 +-
+ Documentation/admin-guide/kdump/kdump.rst | 170 +++---
+ Documentation/admin-guide/kernel-parameters.txt | 3 +
+ Documentation/admin-guide/pm/intel_idle.rst | 16 +-
+ Documentation/admin-guide/pm/intel_pstate.rst | 9 +-
+ Documentation/admin-guide/reporting-issues.rst | 2 +-
+ Documentation/admin-guide/sysctl/abi.rst | 2 +-
+ Documentation/admin-guide/sysctl/kernel.rst | 44 +-
+ Documentation/arm/marvell.rst | 2 +-
+ Documentation/block/biodoc.rst | 2 +-
+ Documentation/block/blk-mq.rst | 4 +-
+ Documentation/block/stat.rst | 2 +-
+ Documentation/bpf/bpf_lsm.rst | 13 +-
+ Documentation/conf.py | 24 +-
+ Documentation/core-api/bus-virt-phys-mapping.rst | 2 +-
+ Documentation/core-api/dma-api.rst | 5 +-
+ Documentation/core-api/dma-isa-lpc.rst | 2 +-
+ Documentation/core-api/index.rst | 4 +-
+ Documentation/core-api/printk-formats.rst | 9 +-
+ Documentation/dev-tools/checkpatch.rst | 509 ++++++++++++++++--
+ Documentation/dev-tools/kunit/api/index.rst | 8 +-
+ Documentation/dev-tools/kunit/faq.rst | 2 +-
+ Documentation/dev-tools/kunit/index.rst | 14 +-
+ Documentation/dev-tools/kunit/start.rst | 4 +-
+ Documentation/dev-tools/kunit/tips.rst | 5 +-
+ Documentation/dev-tools/kunit/usage.rst | 8 +-
+ Documentation/dev-tools/testing-overview.rst | 18 +-
+ .../devicetree/bindings/submitting-patches.rst | 11 +-
+ Documentation/doc-guide/contributing.rst | 8 +-
+ Documentation/driver-api/acpi/linuxized-acpica.rst | 2 +-
+ Documentation/driver-api/gpio/using-gpio.rst | 4 +-
+ Documentation/driver-api/ioctl.rst | 10 +-
+ Documentation/driver-api/pm/devices.rst | 8 +-
+ .../surface_aggregator/clients/index.rst | 3 +-
+ .../driver-api/surface_aggregator/internal.rst | 15 +-
+ .../driver-api/surface_aggregator/overview.rst | 6 +-
+ Documentation/driver-api/usb/dma.rst | 6 +-
+ Documentation/fault-injection/fault-injection.rst | 24 +-
+ Documentation/filesystems/dax.rst | 291 ++++++++++
+ Documentation/filesystems/dax.txt | 257 ---------
+ Documentation/filesystems/ext2.rst | 2 +-
+ Documentation/filesystems/ext4/blockgroup.rst | 2 +-
+ Documentation/filesystems/index.rst | 1 +
+ Documentation/filesystems/path-lookup.rst | 194 +++----
+ .../acpi/dsd/data-node-references.rst | 3 +-
+ Documentation/firmware-guide/acpi/dsd/graph.rst | 2 +-
+ Documentation/firmware-guide/acpi/enumeration.rst | 7 +-
+ Documentation/i2c/instantiating-devices.rst | 2 +-
+ Documentation/i2c/old-module-parameters.rst | 3 +-
+ Documentation/i2c/smbus-protocol.rst | 4 +-
+ Documentation/input/joydev/joystick-api.rst | 2 +-
+ Documentation/kernel-hacking/hacking.rst | 4 +-
+ .../device_drivers/ethernet/intel/i40e.rst | 6 +-
+ .../device_drivers/ethernet/intel/iavf.rst | 2 +-
+ .../networking/devlink/devlink-region.rst | 2 +-
+ Documentation/networking/devlink/devlink-trap.rst | 4 +-
+ Documentation/networking/packet_mmap.rst | 2 +-
+ Documentation/networking/tuntap.rst | 2 +-
+ Documentation/process/submitting-patches.rst | 32 +-
+ Documentation/scheduler/sched-bwc.rst | 2 +-
+ Documentation/scheduler/sched-nice-design.rst | 2 +-
+ Documentation/security/landlock.rst | 3 +-
+ .../trace/coresight/coresight-etm4x-reference.rst | 2 +-
+ Documentation/trace/coresight/coresight.rst | 8 +-
+ Documentation/trace/ftrace.rst | 6 +-
+ Documentation/translations/index.rst | 4 +
+ Documentation/translations/it_IT/index.rst | 4 +
+ .../translations/it_IT/process/coding-style.rst | 2 +-
+ Documentation/translations/ja_JP/index.rst | 5 +-
+ Documentation/translations/ko_KR/index.rst | 5 +-
+ .../translations/zh_CN/admin-guide/index.rst | 2 +-
+ .../zh_CN/admin-guide/lockup-watchdogs.rst | 66 +++
+ .../translations/zh_CN/core-api/cachetlb.rst | 336 ++++++++++++
+ .../translations/zh_CN/core-api/index.rst | 24 +-
+ .../translations/zh_CN/core-api/kernel-api.rst | 369 +++++++++++++
+ .../translations/zh_CN/core-api/kobject.rst | 378 +++++++++++++
+ .../translations/zh_CN/core-api/local_ops.rst | 194 +++++++
+ .../translations/zh_CN/core-api/padata.rst | 158 ++++++
+ .../translations/zh_CN/core-api/printk-basics.rst | 110 ++++
+ .../translations/zh_CN/core-api/printk-formats.rst | 595 +++++++++++++++++++++
+ .../zh_CN/core-api/refcount-vs-atomic.rst | 154 ++++++
+ .../zh_CN/core-api/symbol-namespaces.rst | 142 +++++
+ .../translations/zh_CN/core-api/workqueue.rst | 337 ++++++++++++
+ .../translations/zh_CN/dev-tools/index.rst | 2 +-
+ .../translations/zh_CN/dev-tools/kasan.rst | 417 +++++++++++++++
+ Documentation/translations/zh_CN/index.rst | 5 +-
+ .../zh_CN/maintainer/configure-git.rst | 62 +++
+ .../translations/zh_CN/maintainer/index.rst | 21 +
+ .../zh_CN/maintainer/maintainer-entry-profile.rst | 92 ++++
+ .../zh_CN/maintainer/modifying-patches.rst | 51 ++
+ .../zh_CN/maintainer/pull-requests.rst | 148 +++++
+ .../zh_CN/maintainer/rebasing-and-merging.rst | 165 ++++++
+ .../translations/zh_CN/parisc/debugging.rst | 42 ++
+ Documentation/translations/zh_CN/parisc/index.rst | 28 +
+ .../translations/zh_CN/parisc/registers.rst | 153 ++++++
+ .../translations/zh_CN/process/8.Conclusion.rst | 2 +-
+ .../translations/zh_CN/process/coding-style.rst | 2 +-
+ Documentation/usb/ehci.rst | 2 +-
+ Documentation/usb/gadget_printer.rst | 2 +-
+ Documentation/userspace-api/landlock.rst | 11 +-
+ Documentation/virt/kvm/api.rst | 2 +-
+ Documentation/virt/kvm/s390-pv-boot.rst | 2 +-
+ Documentation/virt/kvm/vcpu-requests.rst | 2 +-
+ Documentation/vm/zswap.rst | 4 +-
+ Documentation/x86/boot.rst | 4 +-
+ Documentation/x86/mtrr.rst | 2 +-
+ include/linux/device.h | 2 +-
+ include/linux/mfd/madera/pdata.h | 2 +-
+ include/linux/pinctrl/pinconf-generic.h | 2 +-
+ include/linux/platform_profile.h | 2 +-
+ samples/kprobes/kprobe_example.c | 33 +-
+ scripts/documentation-file-ref-check | 2 +-
+ scripts/kernel-doc | 71 ++-
+ scripts/sphinx-pre-install | 262 ++++++---
+ tools/debugging/kernel-chktaint | 2 +-
+ 147 files changed, 5721 insertions(+), 1077 deletions(-)
+ delete mode 100644 Documentation/ABI/testing/sysfs-class-backlight-adp5520
+ delete mode 100644 Documentation/ABI/testing/sysfs-class-backlight-adp8860
+ delete mode 100644 Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870
+ delete mode 100644 Documentation/ABI/testing/sysfs-class-led-driver-el15203000
+ create mode 100644 Documentation/filesystems/dax.rst
+ delete mode 100644 Documentation/filesystems/dax.txt
+ create mode 100644 Documentation/translations/zh_CN/admin-guide/lockup-watchdogs.rst
+ create mode 100644 Documentation/translations/zh_CN/core-api/cachetlb.rst
+ create mode 100644 Documentation/translations/zh_CN/core-api/kernel-api.rst
+ create mode 100644 Documentation/translations/zh_CN/core-api/kobject.rst
+ create mode 100644 Documentation/translations/zh_CN/core-api/local_ops.rst
+ create mode 100644 Documentation/translations/zh_CN/core-api/padata.rst
+ create mode 100644 Documentation/translations/zh_CN/core-api/printk-basics.rst
+ create mode 100644 Documentation/translations/zh_CN/core-api/printk-formats.rst
+ create mode 100644 Documentation/translations/zh_CN/core-api/refcount-vs-atomic.rst
+ create mode 100644 Documentation/translations/zh_CN/core-api/symbol-namespaces.rst
+ create mode 100644 Documentation/translations/zh_CN/core-api/workqueue.rst
+ create mode 100644 Documentation/translations/zh_CN/dev-tools/kasan.rst
+ create mode 100644 Documentation/translations/zh_CN/maintainer/configure-git.rst
+ create mode 100644 Documentation/translations/zh_CN/maintainer/index.rst
+ create mode 100644 Documentation/translations/zh_CN/maintainer/maintainer-entry-profile.rst
+ create mode 100644 Documentation/translations/zh_CN/maintainer/modifying-patches.rst
+ create mode 100644 Documentation/translations/zh_CN/maintainer/pull-requests.rst
+ create mode 100644 Documentation/translations/zh_CN/maintainer/rebasing-and-merging.rst
+ create mode 100644 Documentation/translations/zh_CN/parisc/debugging.rst
+ create mode 100644 Documentation/translations/zh_CN/parisc/index.rst
+ create mode 100644 Documentation/translations/zh_CN/parisc/registers.rst
+Merging v4l-dvb/master (198bb646e855 media: i2c: rdacm20: Re-work ov10635 reset)
+$ git merge v4l-dvb/master
+Removing include/media/mpeg2-ctrls.h
+Removing drivers/staging/media/hantro/rk3399_vpu_hw.c
+Removing drivers/staging/media/hantro/rk3288_vpu_hw.c
+Removing drivers/staging/media/atomisp/pci/atomisp_compat_ioctl32.c
+Removing drivers/media/v4l2-core/v4l2-ctrls.c
+Removing drivers/media/rc/tango-ir.c
+Removing drivers/media/rc/keymaps/rc-tango.c
+Auto-merging drivers/media/platform/video-mux.c
+Auto-merging drivers/media/platform/mtk-vpu/mtk_vpu.c
+Auto-merging arch/arm/boot/dts/sama5d4.dtsi
+Auto-merging MAINTAINERS
+Removing Documentation/userspace-api/media/video.h.rst.exceptions
+Removing Documentation/userspace-api/media/audio.h.rst.exceptions
+Removing Documentation/devicetree/bindings/media/tango-ir.txt
+Removing Documentation/devicetree/bindings/media/atmel-isc.txt
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/media/bt8xx.rst | 15 +-
+ Documentation/admin-guide/media/bttv.rst | 21 +-
+ Documentation/admin-guide/media/index.rst | 12 +-
+ Documentation/admin-guide/media/ipu3.rst | 35 +-
+ Documentation/admin-guide/media/saa7134.rst | 3 +-
+ .../devicetree/bindings/media/atmel,isc.yaml | 114 +
+ .../devicetree/bindings/media/atmel-isc.txt | 65 -
+ .../devicetree/bindings/media/i2c/rda,rda5807.yaml | 67 +
+ .../devicetree/bindings/media/mediatek-vcodec.txt | 2 +
+ .../bindings/media/microchip,sama5d4-vdec.yaml | 47 +
+ .../devicetree/bindings/media/microchip,xisc.yaml | 129 +
+ .../bindings/media/nxp,imx7-mipi-csi2.yaml | 109 +-
+ Documentation/devicetree/bindings/media/rc.yaml | 2 +-
+ .../devicetree/bindings/media/renesas,csi2.yaml | 1 +
+ .../devicetree/bindings/media/renesas,isp.yaml | 196 +
+ .../devicetree/bindings/media/renesas,vin.yaml | 27 +-
+ .../devicetree/bindings/media/rockchip,vdec.yaml | 10 +-
+ .../devicetree/bindings/media/rockchip-vpu.yaml | 33 +-
+ .../devicetree/bindings/media/tango-ir.txt | 21 -
+ .../driver-api/media/drivers/bttv-devel.rst | 2 +-
+ .../driver-api/media/drivers/ccs/ccs-regs.asc | 2 +-
+ .../driver-api/media/drivers/ccs/mk-ccs-regs | 5 +-
+ Documentation/driver-api/media/drivers/zoran.rst | 2 +-
+ Documentation/driver-api/media/index.rst | 10 +-
+ Documentation/userspace-api/media/Makefile | 10 +-
+ .../userspace-api/media/audio.h.rst.exceptions | 19 -
+ .../userspace-api/media/drivers/hantro.rst | 19 +
+ .../userspace-api/media/drivers/index.rst | 1 +
+ .../userspace-api/media/dvb/dmx-fopen.rst | 2 +-
+ .../userspace-api/media/dvb/dmx-fread.rst | 2 +-
+ .../userspace-api/media/dvb/dmx-set-filter.rst | 2 +-
+ Documentation/userspace-api/media/dvb/headers.rst | 7 -
+ Documentation/userspace-api/media/dvb/intro.rst | 6 +-
+ .../userspace-api/media/dvb/legacy_dvb_apis.rst | 7 -
+ Documentation/userspace-api/media/fdl-appendix.rst | 64 +-
+ Documentation/userspace-api/media/glossary.rst | 2 +-
+ Documentation/userspace-api/media/index.rst | 12 +-
+ Documentation/userspace-api/media/v4l/biblio.rst | 8 +-
+ .../userspace-api/media/v4l/dev-decoder.rst | 6 +-
+ .../media/v4l/ext-ctrls-codec-stateless.rst | 214 +
+ .../userspace-api/media/v4l/ext-ctrls-codec.rst | 333 +-
+ .../userspace-api/media/v4l/pixfmt-compressed.rst | 11 +-
+ .../media/v4l/pixfmt-meta-intel-ipu3.rst | 2 +-
+ .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 12 +
+ .../userspace-api/media/v4l/vidioc-queryctrl.rst | 24 +-
+ .../userspace-api/media/video.h.rst.exceptions | 39 -
+ .../userspace-api/media/videodev2.h.rst.exceptions | 5 +-
+ MAINTAINERS | 13 +-
+ arch/arm/boot/dts/sama5d4.dtsi | 7 +
+ drivers/media/cec/platform/s5p/s5p_cec.c | 7 +-
+ drivers/media/common/Kconfig | 4 +
+ drivers/media/common/Makefile | 1 +
+ drivers/media/common/siano/smsdvb-main.c | 11 +-
+ drivers/media/{pci/ttpci => common}/ttpci-eeprom.c | 0
+ drivers/media/{pci/ttpci => common}/ttpci-eeprom.h | 0
+ drivers/media/common/videobuf2/videobuf2-v4l2.c | 14 +
+ drivers/media/dvb-core/dmxdev.c | 2 +-
+ drivers/media/dvb-core/dvb_ca_en50221.c | 1 +
+ drivers/media/dvb-core/dvb_frontend.c | 222 +-
+ drivers/media/dvb-core/dvb_net.c | 25 +-
+ drivers/media/dvb-core/dvbdev.c | 3 +
+ drivers/media/dvb-frontends/Kconfig | 12 -
+ drivers/media/dvb-frontends/Makefile | 1 -
+ drivers/media/dvb-frontends/drx39xyj/drxj.h | 35 +-
+ drivers/media/dvb-frontends/mxl692.c | 4 +-
+ drivers/media/dvb-frontends/rtl2832_sdr.c | 4 -
+ drivers/media/i2c/Kconfig | 22 +
+ drivers/media/i2c/Makefile | 1 +
+ drivers/media/i2c/adv7170.c | 6 +-
+ drivers/media/i2c/adv7175.c | 6 +-
+ drivers/media/i2c/adv7180.c | 18 +-
+ drivers/media/i2c/adv7183.c | 8 +-
+ drivers/media/i2c/adv748x/adv748x-afe.c | 13 +-
+ drivers/media/i2c/adv748x/adv748x-csi2.c | 14 +-
+ drivers/media/i2c/adv748x/adv748x-hdmi.c | 13 +-
+ drivers/media/i2c/adv7511-v4l2.c | 10 +-
+ drivers/media/i2c/adv7604.c | 12 +-
+ drivers/media/i2c/adv7842.c | 53 +-
+ drivers/media/i2c/ak7375.c | 10 +-
+ drivers/media/i2c/ak881x.c | 6 +-
+ drivers/media/i2c/ccs/ccs-core.c | 125 +-
+ drivers/media/i2c/ccs/ccs-limits.c | 4 +
+ drivers/media/i2c/ccs/ccs-limits.h | 4 +
+ drivers/media/i2c/ccs/ccs-regs.h | 6 +-
+ drivers/media/i2c/cx25840/cx25840-core.c | 2 +-
+ drivers/media/i2c/dw9714.c | 10 +-
+ drivers/media/i2c/dw9768.c | 10 +-
+ drivers/media/i2c/dw9807-vcm.c | 10 +-
+ drivers/media/i2c/et8ek8/et8ek8_driver.c | 23 +-
+ drivers/media/i2c/hi556.c | 18 +-
+ drivers/media/i2c/imx208.c | 1088 +++++
+ drivers/media/i2c/imx214.c | 43 +-
+ drivers/media/i2c/imx219.c | 36 +-
+ drivers/media/i2c/imx258.c | 25 +-
+ drivers/media/i2c/imx274.c | 41 +-
+ drivers/media/i2c/imx290.c | 26 +-
+ drivers/media/i2c/imx319.c | 24 +-
+ drivers/media/i2c/imx334.c | 35 +-
+ drivers/media/i2c/imx355.c | 24 +-
+ drivers/media/i2c/ir-kbd-i2c.c | 4 +-
+ drivers/media/i2c/m5mols/m5mols_core.c | 21 +-
+ drivers/media/i2c/max9271.c | 42 +-
+ drivers/media/i2c/max9271.h | 9 +
+ drivers/media/i2c/max9286.c | 58 +-
+ drivers/media/i2c/ml86v7667.c | 4 +-
+ drivers/media/i2c/mt9m001.c | 27 +-
+ drivers/media/i2c/mt9m032.c | 38 +-
+ drivers/media/i2c/mt9m111.c | 18 +-
+ drivers/media/i2c/mt9p031.c | 45 +-
+ drivers/media/i2c/mt9t001.c | 44 +-
+ drivers/media/i2c/mt9t112.c | 14 +-
+ drivers/media/i2c/mt9v011.c | 6 +-
+ drivers/media/i2c/mt9v032.c | 44 +-
+ drivers/media/i2c/mt9v111.c | 25 +-
+ drivers/media/i2c/noon010pc30.c | 19 +-
+ drivers/media/i2c/ov02a10.c | 23 +-
+ drivers/media/i2c/ov13858.c | 24 +-
+ drivers/media/i2c/ov2640.c | 16 +-
+ drivers/media/i2c/ov2659.c | 47 +-
+ drivers/media/i2c/ov2680.c | 23 +-
+ drivers/media/i2c/ov2685.c | 17 +-
+ drivers/media/i2c/ov2740.c | 21 +-
+ drivers/media/i2c/ov5640.c | 14 +-
+ drivers/media/i2c/ov5645.c | 38 +-
+ drivers/media/i2c/ov5647.c | 35 +-
+ drivers/media/i2c/ov5648.c | 20 +-
+ drivers/media/i2c/ov5670.c | 25 +-
+ drivers/media/i2c/ov5675.c | 18 +-
+ drivers/media/i2c/ov5695.c | 21 +-
+ drivers/media/i2c/ov6650.c | 28 +-
+ drivers/media/i2c/ov7251.c | 39 +-
+ drivers/media/i2c/ov7670.c | 17 +-
+ drivers/media/i2c/ov772x.c | 12 +-
+ drivers/media/i2c/ov7740.c | 23 +-
+ drivers/media/i2c/ov8856.c | 2467 ++++++----
+ drivers/media/i2c/ov8865.c | 22 +-
+ drivers/media/i2c/ov9640.c | 8 +-
+ drivers/media/i2c/ov9650.c | 21 +-
+ drivers/media/i2c/ov9734.c | 18 +-
+ drivers/media/i2c/rdacm20.c | 88 +-
+ drivers/media/i2c/rdacm21.c | 71 +-
+ drivers/media/i2c/rj54n1cb0c.c | 12 +-
+ drivers/media/i2c/s5c73m3/s5c73m3-core.c | 61 +-
+ drivers/media/i2c/s5c73m3/s5c73m3.h | 2 +-
+ drivers/media/i2c/s5k4ecgx.c | 32 +-
+ drivers/media/i2c/s5k5baf.c | 55 +-
+ drivers/media/i2c/s5k6a3.c | 19 +-
+ drivers/media/i2c/s5k6aa.c | 49 +-
+ drivers/media/i2c/saa6588.c | 4 +-
+ drivers/media/i2c/saa6752hs.c | 6 +-
+ drivers/media/i2c/saa7115.c | 2 +-
+ drivers/media/i2c/saa717x.c | 2 +-
+ drivers/media/i2c/sr030pc30.c | 8 +-
+ drivers/media/i2c/st-mipid02.c | 21 +-
+ drivers/media/i2c/tc358743.c | 9 +-
+ drivers/media/i2c/tda1997x.c | 14 +-
+ drivers/media/i2c/tvp514x.c | 12 +-
+ drivers/media/i2c/tvp5150.c | 36 +-
+ drivers/media/i2c/tvp7002.c | 11 +-
+ drivers/media/i2c/tw9910.c | 10 +-
+ drivers/media/i2c/video-i2c.c | 12 +-
+ drivers/media/i2c/vs6624.c | 8 +-
+ drivers/media/mc/mc-entity.c | 2 +-
+ drivers/media/mc/mc-request.c | 3 +-
+ drivers/media/pci/bt8xx/bt878.c | 6 +-
+ drivers/media/pci/bt8xx/bttv-driver.c | 6 +-
+ drivers/media/pci/cobalt/cobalt-driver.c | 1 +
+ drivers/media/pci/cobalt/cobalt-driver.h | 7 +-
+ drivers/media/pci/cx18/cx18-av-core.c | 2 +-
+ drivers/media/pci/cx88/cx88-alsa.c | 6 +-
+ drivers/media/pci/cx88/cx88-blackbird.c | 3 +-
+ drivers/media/pci/cx88/cx88-core.c | 6 +-
+ drivers/media/pci/cx88/cx88-dvb.c | 3 +-
+ drivers/media/pci/cx88/cx88-mpeg.c | 6 +-
+ drivers/media/pci/cx88/cx88-vbi.c | 3 +-
+ drivers/media/pci/cx88/cx88-video.c | 5 +-
+ drivers/media/pci/intel/ipu3/cio2-bridge.c | 10 +-
+ drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 20 +-
+ drivers/media/pci/ivtv/Kconfig | 12 -
+ drivers/media/pci/ivtv/ivtv-driver.h | 2 -
+ drivers/media/pci/ivtv/ivtv-ioctl.c | 221 -
+ drivers/media/pci/saa7134/saa7134-core.c | 40 +-
+ drivers/media/pci/saa7134/saa7134-empress.c | 5 +-
+ drivers/media/pci/saa7134/saa7134-tvaudio.c | 2 +-
+ drivers/media/pci/saa7134/saa7134-video.c | 6 +-
+ drivers/media/pci/ttpci/Kconfig | 74 -
+ drivers/media/pci/ttpci/Makefile | 11 +-
+ drivers/media/pci/ttpci/budget-core.c | 3 +-
+ drivers/media/pci/ttpci/budget.h | 2 +-
+ drivers/media/pci/tw5864/tw5864-reg.h | 62 +-
+ drivers/media/platform/Makefile | 1 +
+ drivers/media/platform/allegro-dvt/nal-h264.c | 2 +-
+ drivers/media/platform/allegro-dvt/nal-hevc.c | 2 +-
+ drivers/media/platform/am437x/am437x-vpfe.c | 15 +-
+ drivers/media/platform/atmel/Kconfig | 11 +
+ drivers/media/platform/atmel/Makefile | 2 +
+ drivers/media/platform/atmel/atmel-isc-base.c | 427 +-
+ drivers/media/platform/atmel/atmel-isc-regs.h | 133 +-
+ drivers/media/platform/atmel/atmel-isc.h | 122 +-
+ drivers/media/platform/atmel/atmel-isi.c | 38 +-
+ drivers/media/platform/atmel/atmel-sama5d2-isc.c | 300 +-
+ drivers/media/platform/atmel/atmel-sama7g5-isc.c | 630 +++
+ drivers/media/platform/cadence/cdns-csi2rx.c | 8 +-
+ drivers/media/platform/cadence/cdns-csi2tx.c | 22 +-
+ drivers/media/platform/coda/coda-common.c | 11 +-
+ drivers/media/platform/davinci/vpbe_display.c | 2 +-
+ drivers/media/platform/davinci/vpbe_venc.c | 6 +-
+ drivers/media/platform/davinci/vpif_capture.c | 2 +-
+ drivers/media/platform/davinci/vpif_display.c | 2 +-
+ drivers/media/platform/exynos-gsc/gsc-core.c | 11 +-
+ drivers/media/platform/exynos-gsc/gsc-m2m.c | 4 +-
+ drivers/media/platform/exynos4-is/fimc-capture.c | 28 +-
+ drivers/media/platform/exynos4-is/fimc-is.c | 4 +-
+ drivers/media/platform/exynos4-is/fimc-isp-video.c | 10 +-
+ drivers/media/platform/exynos4-is/fimc-isp.c | 44 +-
+ drivers/media/platform/exynos4-is/fimc-lite.c | 44 +-
+ drivers/media/platform/exynos4-is/fimc-m2m.c | 5 +-
+ drivers/media/platform/exynos4-is/media-dev.c | 10 +-
+ drivers/media/platform/exynos4-is/mipi-csis.c | 27 +-
+ drivers/media/platform/imx-jpeg/mxc-jpeg.c | 18 +-
+ drivers/media/platform/imx-jpeg/mxc-jpeg.h | 18 +-
+ drivers/media/platform/marvell-ccic/cafe-driver.c | 12 +-
+ drivers/media/platform/marvell-ccic/mcam-core.c | 14 +-
+ drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 +-
+ drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 6 +-
+ .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 4 +-
+ .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 8 +-
+ .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h | 2 +-
+ drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 26 +-
+ drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 92 +-
+ .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 17 +
+ drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h | 2 +-
+ .../media/platform/mtk-vcodec/venc/venc_h264_if.c | 4 +
+ drivers/media/platform/mtk-vcodec/venc_ipi_msg.h | 4 +-
+ drivers/media/platform/mtk-vpu/mtk_vpu.c | 6 +-
+ drivers/media/platform/omap3isp/ispccdc.c | 85 +-
+ drivers/media/platform/omap3isp/ispccp2.c | 49 +-
+ drivers/media/platform/omap3isp/ispcsi2.c | 41 +-
+ drivers/media/platform/omap3isp/isppreview.c | 69 +-
+ drivers/media/platform/omap3isp/ispresizer.c | 70 +-
+ drivers/media/platform/pxa_camera.c | 5 +-
+ drivers/media/platform/qcom/camss/camss-csid.c | 49 +-
+ drivers/media/platform/qcom/camss/camss-csiphy.c | 59 +-
+ drivers/media/platform/qcom/camss/camss-ispif.c | 48 +-
+ drivers/media/platform/qcom/camss/camss-vfe.c | 92 +-
+ drivers/media/platform/qcom/venus/core.c | 60 +-
+ drivers/media/platform/qcom/venus/core.h | 7 +-
+ drivers/media/platform/qcom/venus/helpers.c | 5 +-
+ drivers/media/platform/qcom/venus/hfi_cmds.c | 31 +-
+ drivers/media/platform/qcom/venus/hfi_cmds.h | 2 +-
+ drivers/media/platform/qcom/venus/hfi_helper.h | 10 +-
+ drivers/media/platform/qcom/venus/hfi_msgs.c | 16 +-
+ drivers/media/platform/qcom/venus/hfi_msgs.h | 6 +-
+ drivers/media/platform/qcom/venus/hfi_platform.c | 16 +
+ drivers/media/platform/qcom/venus/hfi_platform.h | 4 +
+ .../media/platform/qcom/venus/hfi_platform_v4.c | 28 +-
+ .../media/platform/qcom/venus/hfi_platform_v6.c | 28 +-
+ drivers/media/platform/qcom/venus/pm_helpers.c | 153 +-
+ drivers/media/platform/qcom/venus/vdec.c | 6 +-
+ drivers/media/platform/qcom/venus/venc.c | 5 +-
+ drivers/media/platform/rcar-fcp.c | 10 +-
+ drivers/media/platform/rcar-vin/rcar-core.c | 4 +
+ drivers/media/platform/rcar-vin/rcar-csi2.c | 34 +-
+ drivers/media/platform/rcar-vin/rcar-dma.c | 6 +-
+ drivers/media/platform/rcar-vin/rcar-v4l2.c | 16 +-
+ drivers/media/platform/rcar_fdp1.c | 28 +-
+ drivers/media/platform/rcar_jpu.c | 6 +-
+ drivers/media/platform/renesas-ceu.c | 11 +-
+ drivers/media/platform/rockchip/rga/rga-buf.c | 3 +-
+ drivers/media/platform/rockchip/rga/rga.c | 4 +-
+ .../platform/rockchip/rkisp1/rkisp1-capture.c | 19 +-
+ .../media/platform/rockchip/rkisp1/rkisp1-isp.c | 112 +-
+ .../media/platform/rockchip/rkisp1/rkisp1-params.c | 5 +-
+ .../platform/rockchip/rkisp1/rkisp1-resizer.c | 95 +-
+ drivers/media/platform/s3c-camif/camif-capture.c | 20 +-
+ drivers/media/platform/s3c-camif/camif-core.c | 5 +-
+ drivers/media/platform/s5p-g2d/g2d.c | 3 +
+ drivers/media/platform/s5p-jpeg/jpeg-core.c | 5 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 6 +-
+ drivers/media/platform/sh_vou.c | 6 +-
+ drivers/media/platform/sti/bdisp/Makefile | 2 +-
+ drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 8 +-
+ drivers/media/platform/sti/delta/Makefile | 2 +-
+ drivers/media/platform/sti/delta/delta-v4l2.c | 9 +-
+ drivers/media/platform/sti/hva/Makefile | 2 +-
+ drivers/media/platform/sti/hva/hva-hw.c | 20 +-
+ drivers/media/platform/stm32/stm32-dcmi.c | 19 +-
+ .../media/platform/sunxi/sun4i-csi/sun4i_v4l2.c | 22 +-
+ .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 4 +-
+ .../platform/sunxi/sun8i-rotate/sun8i_rotate.c | 2 +-
+ drivers/media/platform/ti-vpe/cal-camerarx.c | 35 +-
+ drivers/media/platform/ti-vpe/cal-video.c | 4 +-
+ drivers/media/platform/ti-vpe/cal.c | 8 +-
+ drivers/media/platform/ti-vpe/vpe.c | 8 +-
+ drivers/media/platform/via-camera.c | 5 +-
+ drivers/media/platform/video-mux.c | 22 +-
+ drivers/media/platform/vsp1/vsp1_brx.c | 34 +-
+ drivers/media/platform/vsp1/vsp1_clu.c | 13 +-
+ drivers/media/platform/vsp1/vsp1_drv.c | 10 +-
+ drivers/media/platform/vsp1/vsp1_entity.c | 59 +-
+ drivers/media/platform/vsp1/vsp1_entity.h | 20 +-
+ drivers/media/platform/vsp1/vsp1_histo.c | 51 +-
+ drivers/media/platform/vsp1/vsp1_hsit.c | 14 +-
+ drivers/media/platform/vsp1/vsp1_lif.c | 13 +-
+ drivers/media/platform/vsp1/vsp1_lut.c | 13 +-
+ drivers/media/platform/vsp1/vsp1_rwpf.c | 32 +-
+ drivers/media/platform/vsp1/vsp1_rwpf.h | 2 +-
+ drivers/media/platform/vsp1/vsp1_sru.c | 22 +-
+ drivers/media/platform/vsp1/vsp1_uds.c | 22 +-
+ drivers/media/platform/vsp1/vsp1_uif.c | 27 +-
+ drivers/media/platform/xilinx/xilinx-csi2rxss.c | 26 +-
+ drivers/media/platform/xilinx/xilinx-dma.c | 5 +-
+ drivers/media/platform/xilinx/xilinx-tpg.c | 25 +-
+ drivers/media/platform/xilinx/xilinx-vip.c | 18 +-
+ drivers/media/platform/xilinx/xilinx-vip.h | 4 +-
+ drivers/media/radio/si4713/radio-platform-si4713.c | 2 +-
+ drivers/media/rc/Kconfig | 83 +-
+ drivers/media/rc/Makefile | 1 -
+ drivers/media/rc/imon.c | 15 +-
+ drivers/media/rc/ite-cir.h | 2 +-
+ drivers/media/rc/keymaps/Makefile | 2 +-
+ drivers/media/rc/keymaps/rc-ct-90405.c | 86 +
+ drivers/media/rc/keymaps/rc-tango.c | 89 -
+ drivers/media/rc/st_rc.c | 22 +-
+ drivers/media/rc/tango-ir.c | 267 --
+ drivers/media/spi/cxd2880-spi.c | 12 +-
+ drivers/media/test-drivers/vim2m.c | 5 -
+ drivers/media/test-drivers/vimc/vimc-debayer.c | 20 +-
+ drivers/media/test-drivers/vimc/vimc-scaler.c | 36 +-
+ drivers/media/test-drivers/vimc/vimc-sensor.c | 16 +-
+ drivers/media/test-drivers/vivid/vivid-core.c | 44 +-
+ drivers/media/test-drivers/vivid/vivid-core.h | 1 -
+ .../media/test-drivers/vivid/vivid-kthread-cap.c | 2 +-
+ drivers/media/test-drivers/vivid/vivid-sdr-cap.c | 3 -
+ drivers/media/test-drivers/vivid/vivid-vbi-cap.c | 8 +-
+ drivers/media/usb/Kconfig | 5 -
+ drivers/media/usb/airspy/airspy.c | 3 -
+ drivers/media/usb/au0828/au0828-core.c | 4 +-
+ drivers/media/usb/cpia2/cpia2.h | 1 +
+ drivers/media/usb/cpia2/cpia2_core.c | 12 +
+ drivers/media/usb/cpia2/cpia2_usb.c | 13 +-
+ drivers/media/usb/cpia2/cpia2_v4l.c | 149 +-
+ drivers/media/usb/dvb-usb-v2/lmedm04.c | 9 +-
+ drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 5 +-
+ drivers/media/usb/dvb-usb/Makefile | 2 +-
+ drivers/media/usb/dvb-usb/cinergyT2-core.c | 13 +-
+ drivers/media/usb/dvb-usb/cxusb.c | 2 +-
+ drivers/media/usb/dvb-usb/dtv5100.c | 7 +-
+ drivers/media/usb/em28xx/em28xx-cards.c | 6 +-
+ drivers/media/usb/em28xx/em28xx-input.c | 8 +-
+ drivers/media/usb/go7007/s2250-board.c | 2 +-
+ drivers/media/usb/gspca/cpia1.c | 5 +-
+ drivers/media/usb/gspca/gl860/gl860.c | 4 +-
+ drivers/media/usb/gspca/ov519.c | 2 +-
+ drivers/media/usb/gspca/sq905.c | 2 +-
+ drivers/media/usb/gspca/sunplus.c | 8 +-
+ drivers/media/usb/hackrf/hackrf.c | 3 -
+ drivers/media/usb/msi2500/msi2500.c | 3 -
+ drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 4 +-
+ drivers/media/usb/s2255/s2255drv.c | 2 -
+ drivers/media/usb/ttusb-dec/ttusb_dec.c | 23 +-
+ drivers/media/usb/uvc/uvc_video.c | 27 +
+ drivers/media/usb/zr364xx/zr364xx.c | 1 +
+ drivers/media/v4l2-core/Kconfig | 5 +
+ drivers/media/v4l2-core/Makefile | 8 +-
+ drivers/media/v4l2-core/v4l2-async.c | 23 +-
+ drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 3 +
+ drivers/media/v4l2-core/v4l2-ctrls-api.c | 1225 +++++
+ drivers/media/v4l2-core/v4l2-ctrls-core.c | 1946 ++++++++
+ drivers/media/v4l2-core/v4l2-ctrls-defs.c | 1579 ++++++
+ drivers/media/v4l2-core/v4l2-ctrls-priv.h | 96 +
+ drivers/media/v4l2-core/v4l2-ctrls-request.c | 496 ++
+ drivers/media/v4l2-core/v4l2-ctrls.c | 5035 --------------------
+ drivers/media/v4l2-core/v4l2-dev.c | 10 +-
+ drivers/media/v4l2-core/v4l2-event.c | 6 +-
+ drivers/media/v4l2-core/v4l2-fh.c | 1 +
+ drivers/media/v4l2-core/v4l2-ioctl.c | 38 +-
+ drivers/media/v4l2-core/v4l2-subdev.c | 166 +-
+ drivers/media/v4l2-core/videobuf-dma-sg.c | 1 -
+ drivers/staging/media/Kconfig | 2 +
+ drivers/staging/media/Makefile | 1 +
+ drivers/staging/media/atomisp/Makefile | 1 -
+ drivers/staging/media/atomisp/TODO | 5 +
+ drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 57 +-
+ drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 37 +-
+ .../media/atomisp/i2c/atomisp-libmsrlisthelper.c | 6 +-
+ .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 120 +-
+ drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 36 +-
+ drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 28 +-
+ drivers/staging/media/atomisp/i2c/mt9m114.h | 6 +-
+ drivers/staging/media/atomisp/i2c/ov2680.h | 10 +-
+ .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 10 +-
+ drivers/staging/media/atomisp/pci/atomisp_acc.c | 12 +-
+ drivers/staging/media/atomisp/pci/atomisp_cmd.c | 52 +-
+ drivers/staging/media/atomisp/pci/atomisp_cmd.h | 161 +-
+ .../media/atomisp/pci/atomisp_compat_css20.c | 4 +-
+ .../media/atomisp/pci/atomisp_compat_ioctl32.c | 1202 -----
+ drivers/staging/media/atomisp/pci/atomisp_csi2.c | 28 +-
+ drivers/staging/media/atomisp/pci/atomisp_csi2.h | 2 +-
+ drivers/staging/media/atomisp/pci/atomisp_file.c | 14 +-
+ drivers/staging/media/atomisp/pci/atomisp_fops.c | 18 +-
+ drivers/staging/media/atomisp/pci/atomisp_subdev.c | 68 +-
+ drivers/staging/media/atomisp/pci/atomisp_subdev.h | 9 +-
+ drivers/staging/media/atomisp/pci/atomisp_tpg.c | 12 +-
+ drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 6 +-
+ drivers/staging/media/atomisp/pci/sh_css.c | 2089 ++++----
+ drivers/staging/media/av7110/Kconfig | 94 +
+ drivers/staging/media/av7110/Makefile | 22 +
+ drivers/staging/media/av7110/TODO | 3 +
+ .../av7110}/audio-bilingual-channel-select.rst | 0
+ .../staging/media/av7110}/audio-channel-select.rst | 0
+ .../staging/media/av7110}/audio-clear-buffer.rst | 0
+ .../staging/media/av7110}/audio-continue.rst | 0
+ .../staging/media/av7110}/audio-fclose.rst | 0
+ .../staging/media/av7110}/audio-fopen.rst | 0
+ .../staging/media/av7110}/audio-fwrite.rst | 0
+ .../media/av7110}/audio-get-capabilities.rst | 0
+ .../staging/media/av7110}/audio-get-status.rst | 0
+ .../staging/media/av7110}/audio-pause.rst | 0
+ .../staging/media/av7110}/audio-play.rst | 0
+ .../staging/media/av7110}/audio-select-source.rst | 0
+ .../staging/media/av7110}/audio-set-av-sync.rst | 0
+ .../media/av7110}/audio-set-bypass-mode.rst | 2 +-
+ .../staging/media/av7110}/audio-set-id.rst | 0
+ .../staging/media/av7110}/audio-set-mixer.rst | 0
+ .../staging/media/av7110}/audio-set-mute.rst | 0
+ .../staging/media/av7110}/audio-set-streamtype.rst | 0
+ .../staging/media/av7110}/audio-stop.rst | 0
+ .../dvb => drivers/staging/media/av7110}/audio.h | 0
+ .../dvb => drivers/staging/media/av7110}/audio.rst | 2 +-
+ .../staging/media/av7110}/audio_data_types.rst | 0
+ .../staging/media/av7110}/audio_function_calls.rst | 0
+ .../pci/ttpci => staging/media/av7110}/av7110.c | 0
+ .../pci/ttpci => staging/media/av7110}/av7110.h | 7 +-
+ .../pci/ttpci => staging/media/av7110}/av7110_av.c | 0
+ .../pci/ttpci => staging/media/av7110}/av7110_av.h | 0
+ .../pci/ttpci => staging/media/av7110}/av7110_ca.c | 0
+ .../pci/ttpci => staging/media/av7110}/av7110_ca.h | 0
+ .../pci/ttpci => staging/media/av7110}/av7110_hw.c | 0
+ .../pci/ttpci => staging/media/av7110}/av7110_hw.h | 0
+ .../ttpci => staging/media/av7110}/av7110_ipack.c | 0
+ .../ttpci => staging/media/av7110}/av7110_ipack.h | 0
+ .../pci/ttpci => staging/media/av7110}/av7110_ir.c | 0
+ .../ttpci => staging/media/av7110}/av7110_v4l.c | 0
+ .../ttpci => staging/media/av7110}/budget-patch.c | 0
+ .../ttpci => staging/media/av7110}/dvb_filter.c | 0
+ .../ttpci => staging/media/av7110}/dvb_filter.h | 0
+ .../dvb => drivers/staging/media/av7110}/osd.h | 0
+ .../media/av7110}/sp8870.c | 0
+ .../media/av7110}/sp8870.h | 0
+ .../staging/media/av7110}/video-clear-buffer.rst | 0
+ .../staging/media/av7110}/video-command.rst | 0
+ .../staging/media/av7110}/video-continue.rst | 0
+ .../staging/media/av7110}/video-fast-forward.rst | 0
+ .../staging/media/av7110}/video-fclose.rst | 0
+ .../staging/media/av7110}/video-fopen.rst | 0
+ .../staging/media/av7110}/video-freeze.rst | 0
+ .../staging/media/av7110}/video-fwrite.rst | 0
+ .../media/av7110}/video-get-capabilities.rst | 0
+ .../staging/media/av7110}/video-get-event.rst | 0
+ .../media/av7110}/video-get-frame-count.rst | 0
+ .../staging/media/av7110}/video-get-pts.rst | 0
+ .../staging/media/av7110}/video-get-size.rst | 0
+ .../staging/media/av7110}/video-get-status.rst | 0
+ .../staging/media/av7110}/video-play.rst | 0
+ .../staging/media/av7110}/video-select-source.rst | 0
+ .../staging/media/av7110}/video-set-blank.rst | 0
+ .../media/av7110}/video-set-display-format.rst | 0
+ .../staging/media/av7110}/video-set-format.rst | 0
+ .../staging/media/av7110}/video-set-streamtype.rst | 0
+ .../staging/media/av7110}/video-slowmotion.rst | 0
+ .../staging/media/av7110}/video-stillpicture.rst | 0
+ .../staging/media/av7110}/video-stop.rst | 0
+ .../staging/media/av7110}/video-try-command.rst | 0
+ .../dvb => drivers/staging/media/av7110}/video.h | 0
+ .../dvb => drivers/staging/media/av7110}/video.rst | 2 +-
+ .../staging/media/av7110}/video_function_calls.rst | 0
+ .../staging/media/av7110}/video_types.rst | 0
+ drivers/staging/media/hantro/Kconfig | 10 +-
+ drivers/staging/media/hantro/Makefile | 15 +-
+ drivers/staging/media/hantro/hantro.h | 13 +-
+ drivers/staging/media/hantro/hantro_drv.c | 185 +-
+ drivers/staging/media/hantro/hantro_g1.c | 39 +
+ drivers/staging/media/hantro/hantro_g1_h264_dec.c | 10 +-
+ drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c | 119 +-
+ drivers/staging/media/hantro/hantro_g1_vp8_dec.c | 6 +-
+ drivers/staging/media/hantro/hantro_g2_hevc_dec.c | 586 +++
+ drivers/staging/media/hantro/hantro_g2_regs.h | 198 +
+ drivers/staging/media/hantro/hantro_h1_jpeg_enc.c | 4 +-
+ drivers/staging/media/hantro/hantro_hevc.c | 333 ++
+ drivers/staging/media/hantro/hantro_hw.h | 101 +-
+ drivers/staging/media/hantro/hantro_mpeg2.c | 2 +-
+ drivers/staging/media/hantro/hantro_postproc.c | 14 +
+ drivers/staging/media/hantro/hantro_v4l2.c | 14 +-
+ drivers/staging/media/hantro/imx8m_vpu_hw.c | 79 +-
+ drivers/staging/media/hantro/rk3288_vpu_hw.c | 236 -
+ drivers/staging/media/hantro/rk3399_vpu_hw.c | 222 -
+ ...u_hw_jpeg_enc.c => rockchip_vpu2_hw_jpeg_enc.c} | 32 +-
+ ...hw_mpeg2_dec.c => rockchip_vpu2_hw_mpeg2_dec.c} | 123 +-
+ ...vpu_hw_vp8_dec.c => rockchip_vpu2_hw_vp8_dec.c} | 6 +-
+ .../{rk3399_vpu_regs.h => rockchip_vpu2_regs.h} | 6 +-
+ drivers/staging/media/hantro/rockchip_vpu_hw.c | 526 ++
+ drivers/staging/media/hantro/sama5d4_vdec_hw.c | 117 +
+ drivers/staging/media/imx/imx-ic-prp.c | 19 +-
+ drivers/staging/media/imx/imx-ic-prpencvf.c | 31 +-
+ drivers/staging/media/imx/imx-media-csi.c | 96 +-
+ drivers/staging/media/imx/imx-media-utils.c | 4 +-
+ drivers/staging/media/imx/imx-media-vdic.c | 24 +-
+ drivers/staging/media/imx/imx-media.h | 2 +-
+ drivers/staging/media/imx/imx6-mipi-csi2.c | 12 +-
+ drivers/staging/media/imx/imx7-media-csi.c | 33 +-
+ drivers/staging/media/imx/imx7-mipi-csis.c | 1042 ++--
+ .../media/ipu3/include/{ => uapi}/intel-ipu3.h | 13 +-
+ drivers/staging/media/ipu3/ipu3-abi.h | 2 +-
+ drivers/staging/media/ipu3/ipu3-css-pool.h | 1 +
+ drivers/staging/media/ipu3/ipu3-v4l2.c | 26 +-
+ drivers/staging/media/ipu3/ipu3.c | 3 +-
+ drivers/staging/media/meson/vdec/vdec_helpers.c | 2 +-
+ drivers/staging/media/omap4iss/iss.h | 3 -
+ drivers/staging/media/omap4iss/iss_csi2.c | 37 +-
+ drivers/staging/media/omap4iss/iss_ipipe.c | 37 +-
+ drivers/staging/media/omap4iss/iss_ipipeif.c | 47 +-
+ drivers/staging/media/omap4iss/iss_resizer.c | 39 +-
+ drivers/staging/media/omap4iss/iss_video.c | 4 +-
+ drivers/staging/media/rkvdec/rkvdec.c | 12 +-
+ drivers/staging/media/sunxi/cedrus/cedrus.c | 16 +-
+ drivers/staging/media/sunxi/cedrus/cedrus.h | 6 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 12 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 16 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c | 97 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_video.c | 14 +-
+ drivers/staging/media/tegra-vde/vde.c | 22 +-
+ drivers/staging/media/tegra-video/csi.c | 13 +-
+ drivers/staging/media/tegra-video/vi.c | 31 +-
+ drivers/staging/media/zoran/zoran.h | 1 -
+ drivers/staging/media/zoran/zoran_card.c | 7 +-
+ drivers/staging/media/zoran/zoran_device.c | 65 -
+ drivers/staging/media/zoran/zoran_device.h | 2 -
+ drivers/staging/media/zoran/zoran_driver.c | 6 +-
+ drivers/staging/media/zoran/zr36016.c | 3 +-
+ drivers/staging/media/zoran/zr36050.c | 5 +-
+ drivers/staging/media/zoran/zr36057.h | 14 +-
+ drivers/staging/media/zoran/zr36060.c | 3 +-
+ include/media/hevc-ctrls.h | 52 +-
+ include/media/mpeg2-ctrls.h | 82 -
+ include/media/rc-map.h | 2 +-
+ include/media/v4l2-ctrls.h | 11 +-
+ include/media/v4l2-subdev.h | 78 +-
+ include/media/videobuf2-v4l2.h | 16 +
+ include/uapi/linux/cec-funcs.h | 2 +-
+ include/uapi/linux/lirc.h | 1 -
+ include/uapi/linux/v4l2-controls.h | 135 +-
+ include/uapi/linux/videodev2.h | 7 +
+ 553 files changed, 18916 insertions(+), 14516 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/media/atmel,isc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/media/atmel-isc.txt
+ create mode 100644 Documentation/devicetree/bindings/media/i2c/rda,rda5807.yaml
+ create mode 100644 Documentation/devicetree/bindings/media/microchip,sama5d4-vdec.yaml
+ create mode 100644 Documentation/devicetree/bindings/media/microchip,xisc.yaml
+ create mode 100644 Documentation/devicetree/bindings/media/renesas,isp.yaml
+ delete mode 100644 Documentation/devicetree/bindings/media/tango-ir.txt
+ delete mode 100644 Documentation/userspace-api/media/audio.h.rst.exceptions
+ create mode 100644 Documentation/userspace-api/media/drivers/hantro.rst
+ delete mode 100644 Documentation/userspace-api/media/video.h.rst.exceptions
+ rename drivers/media/{pci/ttpci => common}/ttpci-eeprom.c (100%)
+ rename drivers/media/{pci/ttpci => common}/ttpci-eeprom.h (100%)
+ create mode 100644 drivers/media/i2c/imx208.c
+ create mode 100644 drivers/media/platform/atmel/atmel-sama7g5-isc.c
+ create mode 100644 drivers/media/rc/keymaps/rc-ct-90405.c
+ delete mode 100644 drivers/media/rc/keymaps/rc-tango.c
+ delete mode 100644 drivers/media/rc/tango-ir.c
+ create mode 100644 drivers/media/v4l2-core/v4l2-ctrls-api.c
+ create mode 100644 drivers/media/v4l2-core/v4l2-ctrls-core.c
+ create mode 100644 drivers/media/v4l2-core/v4l2-ctrls-defs.c
+ create mode 100644 drivers/media/v4l2-core/v4l2-ctrls-priv.h
+ create mode 100644 drivers/media/v4l2-core/v4l2-ctrls-request.c
+ delete mode 100644 drivers/media/v4l2-core/v4l2-ctrls.c
+ delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_compat_ioctl32.c
+ create mode 100644 drivers/staging/media/av7110/Kconfig
+ create mode 100644 drivers/staging/media/av7110/Makefile
+ create mode 100644 drivers/staging/media/av7110/TODO
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-bilingual-channel-select.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-channel-select.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-clear-buffer.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-continue.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-fclose.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-fopen.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-fwrite.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-get-capabilities.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-get-status.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-pause.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-play.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-select-source.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-set-av-sync.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-set-bypass-mode.rst (94%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-set-id.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-set-mixer.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-set-mute.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-set-streamtype.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio-stop.rst (100%)
+ rename {include/uapi/linux/dvb => drivers/staging/media/av7110}/audio.h (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio.rst (90%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio_data_types.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/audio_function_calls.rst (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/av7110.c (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/av7110.h (98%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/av7110_av.c (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/av7110_av.h (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/av7110_ca.c (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/av7110_ca.h (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/av7110_hw.c (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/av7110_hw.h (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/av7110_ipack.c (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/av7110_ipack.h (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/av7110_ir.c (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/av7110_v4l.c (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/budget-patch.c (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/dvb_filter.c (100%)
+ rename drivers/{media/pci/ttpci => staging/media/av7110}/dvb_filter.h (100%)
+ rename {include/uapi/linux/dvb => drivers/staging/media/av7110}/osd.h (100%)
+ rename drivers/{media/dvb-frontends => staging/media/av7110}/sp8870.c (100%)
+ rename drivers/{media/dvb-frontends => staging/media/av7110}/sp8870.h (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-clear-buffer.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-command.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-continue.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-fast-forward.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-fclose.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-fopen.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-freeze.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-fwrite.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-get-capabilities.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-get-event.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-get-frame-count.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-get-pts.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-get-size.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-get-status.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-play.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-select-source.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-set-blank.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-set-display-format.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-set-format.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-set-streamtype.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-slowmotion.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-stillpicture.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-stop.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video-try-command.rst (100%)
+ rename {include/uapi/linux/dvb => drivers/staging/media/av7110}/video.h (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video.rst (93%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video_function_calls.rst (100%)
+ rename {Documentation/userspace-api/media/dvb => drivers/staging/media/av7110}/video_types.rst (100%)
+ create mode 100644 drivers/staging/media/hantro/hantro_g1.c
+ create mode 100644 drivers/staging/media/hantro/hantro_g2_hevc_dec.c
+ create mode 100644 drivers/staging/media/hantro/hantro_g2_regs.h
+ create mode 100644 drivers/staging/media/hantro/hantro_hevc.c
+ delete mode 100644 drivers/staging/media/hantro/rk3288_vpu_hw.c
+ delete mode 100644 drivers/staging/media/hantro/rk3399_vpu_hw.c
+ rename drivers/staging/media/hantro/{rk3399_vpu_hw_jpeg_enc.c => rockchip_vpu2_hw_jpeg_enc.c} (87%)
+ rename drivers/staging/media/hantro/{rk3399_vpu_hw_mpeg2_dec.c => rockchip_vpu2_hw_mpeg2_dec.c} (66%)
+ rename drivers/staging/media/hantro/{rk3399_vpu_hw_vp8_dec.c => rockchip_vpu2_hw_vp8_dec.c} (99%)
+ rename drivers/staging/media/hantro/{rk3399_vpu_regs.h => rockchip_vpu2_regs.h} (99%)
+ create mode 100644 drivers/staging/media/hantro/rockchip_vpu_hw.c
+ create mode 100644 drivers/staging/media/hantro/sama5d4_vdec_hw.c
+ rename drivers/staging/media/ipu3/include/{ => uapi}/intel-ipu3.h (99%)
+ delete mode 100644 include/media/mpeg2-ctrls.h
+Merging v4l-dvb-next/master (86734f2e678a media: ivtv: prevent going past the hw arrays)
+$ git merge v4l-dvb-next/master
+Merge made by the 'recursive' strategy.
+ .../userspace-api/media/cec.h.rst.exceptions | 2 +-
+ drivers/media/dvb-frontends/dib8000.c | 58 ++++++++++++------
+ drivers/media/pci/ivtv/ivtv-cards.h | 68 +++++++++++++++-------
+ drivers/media/pci/ivtv/ivtv-i2c.c | 16 +++--
+ drivers/media/platform/sti/delta/delta-ipc.c | 3 +-
+ drivers/media/usb/dvb-usb-v2/dvbsky.c | 37 ++++++++----
+ drivers/media/usb/gspca/Kconfig | 1 -
+ drivers/media/usb/uvc/uvc_v4l2.c | 34 +++++++----
+ drivers/media/v4l2-core/v4l2-flash-led-class.c | 2 +-
+ include/media/dvb-usb-ids.h | 2 +
+ include/uapi/linux/cec.h | 2 +-
+ 11 files changed, 155 insertions(+), 70 deletions(-)
+Merging pm/linux-next (a51c80057a88 Merge branch 'pm-pci' into linux-next)
+$ git merge pm/linux-next
+Auto-merging Documentation/admin-guide/pm/intel_pstate.rst
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 2 +-
+ Documentation/admin-guide/pm/cpuidle.rst | 77 +---
+ Documentation/admin-guide/pm/intel_pstate.rst | 6 +
+ Documentation/power/runtime_pm.rst | 15 +-
+ arch/x86/kernel/acpi/boot.c | 118 +++---
+ drivers/acpi/Kconfig | 5 +
+ drivers/acpi/Makefile | 1 +
+ drivers/acpi/acpi_cmos_rtc.c | 6 +-
+ drivers/acpi/acpi_configfs.c | 5 +-
+ drivers/acpi/acpi_fpdt.c | 4 +-
+ drivers/acpi/acpi_ipmi.c | 7 +-
+ drivers/acpi/acpi_lpss.c | 13 +-
+ drivers/acpi/acpi_video.c | 6 -
+ drivers/acpi/acpica/acutils.h | 2 +
+ drivers/acpi/acpica/exfield.c | 8 +-
+ drivers/acpi/acpica/exserial.c | 12 +
+ drivers/acpi/acpica/nsrepair2.c | 7 +
+ drivers/acpi/acpica/utprint.c | 2 +-
+ drivers/acpi/acpica/utuuid.c | 41 ++
+ drivers/acpi/apei/einj.c | 2 +-
+ drivers/acpi/apei/ghes.c | 81 +++-
+ drivers/acpi/arm64/iort.c | 2 +-
+ drivers/acpi/blacklist.c | 9 +-
+ drivers/acpi/bus.c | 17 +-
+ drivers/acpi/device_pm.c | 6 +-
+ drivers/acpi/device_sysfs.c | 7 +-
+ drivers/acpi/dptf/int340x_thermal.c | 2 +
+ drivers/acpi/ec.c | 39 +-
+ drivers/acpi/event.c | 8 +-
+ drivers/acpi/fan.c | 7 +-
+ drivers/acpi/fan.h | 13 +
+ drivers/acpi/glue.c | 29 +-
+ drivers/acpi/internal.h | 6 +-
+ drivers/acpi/nvs.c | 32 +-
+ drivers/acpi/osl.c | 11 +-
+ drivers/acpi/pci_root.c | 4 +-
+ drivers/acpi/pmic/intel_pmic_chtdc_ti.c | 2 +-
+ drivers/acpi/power.c | 116 +++---
+ drivers/acpi/pptt.c | 18 +-
+ drivers/acpi/prmt.c | 303 +++++++++++++++
+ drivers/acpi/processor_idle.c | 40 ++
+ drivers/acpi/processor_perflib.c | 38 +-
+ drivers/acpi/processor_thermal.c | 2 -
+ drivers/acpi/processor_throttling.c | 75 ++--
+ drivers/acpi/reboot.c | 4 +-
+ drivers/acpi/resource.c | 9 +-
+ drivers/acpi/sbs.c | 12 +-
+ drivers/acpi/sbshc.c | 9 +-
+ drivers/acpi/scan.c | 318 ++++++++++------
+ drivers/acpi/sleep.c | 22 +-
+ drivers/acpi/sysfs.c | 85 ++---
+ drivers/acpi/tables.c | 9 +
+ drivers/acpi/x86/s2idle.c | 145 +++++---
+ drivers/base/power/domain.c | 64 +++-
+ drivers/base/power/domain_governor.c | 1 +
+ drivers/base/power/runtime.c | 18 +-
+ drivers/base/power/wakeirq.c | 4 +-
+ drivers/base/property.c | 31 +-
+ drivers/cpufreq/cpufreq_stats.c | 5 +-
+ drivers/cpufreq/intel_pstate.c | 263 +++++++++++--
+ drivers/cpufreq/loongson2_cpufreq.c | 1 -
+ drivers/cpufreq/sc520_freq.c | 1 +
+ drivers/cpufreq/sh-cpufreq.c | 1 -
+ drivers/cpuidle/governors/teo.c | 476 ++++++++++++------------
+ drivers/gpio/gpiolib-acpi.c | 10 +-
+ drivers/i2c/i2c-core-acpi.c | 8 +-
+ drivers/idle/intel_idle.c | 33 ++
+ drivers/platform/surface/aggregator/core.c | 6 +-
+ drivers/platform/surface/surface3_power.c | 22 +-
+ drivers/platform/surface/surface_acpi_notify.c | 7 +-
+ drivers/pnp/base.h | 1 -
+ drivers/pnp/card.c | 14 +-
+ drivers/pnp/core.c | 17 +-
+ drivers/pnp/interface.c | 4 +-
+ drivers/pnp/isapnp/proc.c | 13 +-
+ drivers/pnp/pnpbios/core.c | 4 +-
+ drivers/pnp/resource.c | 2 +-
+ include/acpi/acbuffer.h | 10 +
+ include/acpi/acconfig.h | 2 +
+ include/acpi/acpi_bus.h | 19 +-
+ include/acpi/acpi_numa.h | 2 +-
+ include/acpi/acpixf.h | 2 +-
+ include/acpi/actbl1.h | 41 +-
+ include/acpi/actbl2.h | 137 +++++++
+ include/linux/acpi.h | 11 +-
+ include/linux/pm_domain.h | 1 +
+ include/linux/pm_runtime.h | 3 +
+ include/linux/prmt.h | 7 +
+ include/linux/property.h | 2 +-
+ kernel/power/Kconfig | 12 +-
+ kernel/power/process.c | 2 +-
+ kernel/power/snapshot.c | 10 +-
+ kernel/power/swap.c | 2 +-
+ 93 files changed, 2073 insertions(+), 1015 deletions(-)
+ create mode 100644 drivers/acpi/fan.h
+ create mode 100644 drivers/acpi/prmt.c
+ create mode 100644 include/linux/prmt.h
+Merging cpufreq-arm/cpufreq/arm/linux-next (8cf958d05d3a Merge branch 'cpufreq/cppc' into cpufreq/arm/linux-next)
+$ git merge cpufreq-arm/cpufreq/arm/linux-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/cpus.yaml | 7 +
+ .../bindings/cpufreq/cpufreq-mediatek.txt | 8 +-
+ .../bindings/dvfs/performance-domain.yaml | 74 +++++
+ drivers/base/arch_topology.c | 27 +-
+ drivers/cpufreq/Kconfig.arm | 10 +
+ drivers/cpufreq/cppc_cpufreq.c | 319 ++++++++++++++++++---
+ drivers/cpufreq/cpufreq-dt-platdev.c | 10 +-
+ drivers/cpufreq/mediatek-cpufreq.c | 1 +
+ drivers/cpufreq/scmi-cpufreq.c | 2 +-
+ include/dt-bindings/clock/mt8173-clk.h | 1 -
+ include/linux/arch_topology.h | 1 +
+ kernel/sched/core.c | 1 +
+ 12 files changed, 402 insertions(+), 59 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dvfs/performance-domain.yaml
+Merging cpupower/cpupower (d07f6ca923ea Linux 5.13-rc2)
+$ git merge cpupower/cpupower
+Already up to date.
+Merging devfreq/devfreq-next (6b61f55ecbe6 dt-bindings: devfreq: tegra30-actmon: Add cooling-cells)
+$ git merge devfreq/devfreq-next
+Removing Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-actmon.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/arm/tegra/nvidia,tegra30-actmon.txt | 57 ----------
+ .../bindings/devfreq/nvidia,tegra30-actmon.yaml | 126 +++++++++++++++++++++
+ drivers/devfreq/Kconfig | 1 -
+ drivers/devfreq/devfreq.c | 1 +
+ drivers/devfreq/governor_userspace.c | 10 +-
+ drivers/devfreq/imx-bus.c | 14 ---
+ drivers/devfreq/tegra30-devfreq.c | 1 +
+ 7 files changed, 133 insertions(+), 77 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-actmon.txt
+ create mode 100644 Documentation/devicetree/bindings/devfreq/nvidia,tegra30-actmon.yaml
+Merging opp/opp/linux-next (4fa82a87ba55 opp: Allow required-opps to be used for non genpd use cases)
+$ git merge opp/opp/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/opp/core.c | 10 ++++++++++
+ drivers/opp/of.c | 27 +++------------------------
+ 2 files changed, 13 insertions(+), 24 deletions(-)
+Merging thermal/thermal/linux-next (c5c9dfdcaea2 dt-bindings: rockchip-thermal: Support the RK3568 SoC compatible)
+$ git merge thermal/thermal/linux-next
+Removing Documentation/devicetree/bindings/thermal/rockchip-thermal.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/thermal/nvidia,tegra30-tsensor.yaml | 73 +++
+ .../devicetree/bindings/thermal/qcom-tsens.yaml | 1 +
+ .../bindings/thermal/rockchip-thermal.txt | 85 ---
+ .../bindings/thermal/rockchip-thermal.yaml | 96 +++
+ drivers/thermal/imx_sc_thermal.c | 3 +
+ .../int340x_thermal/processor_thermal_device.h | 2 +
+ .../intel/int340x_thermal/processor_thermal_mbox.c | 12 +-
+ .../intel/int340x_thermal/processor_thermal_rfim.c | 55 ++
+ drivers/thermal/rcar_gen3_thermal.c | 7 +-
+ drivers/thermal/rockchip_thermal.c | 121 ++++
+ drivers/thermal/sprd_thermal.c | 16 +-
+ drivers/thermal/st/st_thermal_memmap.c | 13 +-
+ drivers/thermal/tegra/Kconfig | 9 +-
+ drivers/thermal/tegra/Makefile | 1 +
+ drivers/thermal/tegra/tegra30-tsensor.c | 673 +++++++++++++++++++++
+ drivers/thermal/thermal_core.c | 2 +-
+ drivers/thermal/thermal_of.c | 3 +
+ 17 files changed, 1061 insertions(+), 111 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/thermal/nvidia,tegra30-tsensor.yaml
+ delete mode 100644 Documentation/devicetree/bindings/thermal/rockchip-thermal.txt
+ create mode 100644 Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml
+ create mode 100644 drivers/thermal/tegra/tegra30-tsensor.c
+Merging dlm/next (957adb68b3f7 fs: dlm: invalid buffer access in lookup error)
+$ git merge dlm/next
+Merge made by the 'recursive' strategy.
+ fs/dlm/config.c | 18 +-
+ fs/dlm/config.h | 5 +-
+ fs/dlm/debug_fs.c | 54 ++
+ fs/dlm/dlm_internal.h | 42 +-
+ fs/dlm/lock.c | 16 +-
+ fs/dlm/lockspace.c | 14 +-
+ fs/dlm/lowcomms.c | 411 +++++++++++----
+ fs/dlm/lowcomms.h | 25 +-
+ fs/dlm/member.c | 37 +-
+ fs/dlm/midcomms.c | 1343 +++++++++++++++++++++++++++++++++++++++++++++++--
+ fs/dlm/midcomms.h | 15 +
+ fs/dlm/rcom.c | 123 +++--
+ fs/dlm/util.c | 10 +-
+ fs/dlm/util.h | 2 +
+ 14 files changed, 1924 insertions(+), 191 deletions(-)
+Merging swiotlb/linux-next (81367cf6df62 of: Add plumbing for restricted DMA pool)
+$ git merge swiotlb/linux-next
+Auto-merging include/linux/device.h
+Auto-merging drivers/xen/swiotlb-xen.c
+Auto-merging drivers/of/of_private.h
+Auto-merging drivers/of/device.c
+Auto-merging drivers/of/address.c
+Auto-merging drivers/iommu/dma-iommu.c
+Auto-merging drivers/gpu/drm/nouveau/nouveau_ttm.c
+Auto-merging drivers/gpu/drm/i915/gem/i915_gem_internal.c
+Auto-merging drivers/base/core.c
+Merge made by the 'recursive' strategy.
+ .../bindings/reserved-memory/reserved-memory.txt | 36 ++-
+ drivers/base/core.c | 4 +
+ drivers/gpu/drm/i915/gem/i915_gem_internal.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 +-
+ drivers/iommu/dma-iommu.c | 12 +-
+ drivers/of/address.c | 33 +++
+ drivers/of/device.c | 3 +
+ drivers/of/of_private.h | 6 +
+ drivers/pci/xen-pcifront.c | 2 +-
+ drivers/xen/swiotlb-xen.c | 4 +-
+ include/linux/device.h | 4 +
+ include/linux/swiotlb.h | 51 ++++-
+ kernel/dma/Kconfig | 14 ++
+ kernel/dma/direct.c | 59 +++--
+ kernel/dma/direct.h | 8 +-
+ kernel/dma/swiotlb.c | 250 ++++++++++++++++-----
+ 16 files changed, 387 insertions(+), 103 deletions(-)
+Merging rdma/for-next (e7c07d5e0750 RDMA/hns: Fix incorrect vlan enable bit in QPC)
+$ git merge rdma/for-next
+Removing include/uapi/rdma/i40iw-abi.h
+Removing drivers/infiniband/hw/i40iw/i40iw_virtchnl.h
+Removing drivers/infiniband/hw/i40iw/i40iw_virtchnl.c
+Removing drivers/infiniband/hw/i40iw/i40iw_vf.h
+Removing drivers/infiniband/hw/i40iw/i40iw_vf.c
+Removing drivers/infiniband/hw/i40iw/i40iw_verbs.h
+Removing drivers/infiniband/hw/i40iw/i40iw_verbs.c
+Removing drivers/infiniband/hw/i40iw/i40iw_utils.c
+Removing drivers/infiniband/hw/i40iw/i40iw_user.h
+Removing drivers/infiniband/hw/i40iw/i40iw_uk.c
+Removing drivers/infiniband/hw/i40iw/i40iw_type.h
+Removing drivers/infiniband/hw/i40iw/i40iw_status.h
+Removing drivers/infiniband/hw/i40iw/i40iw_register.h
+Removing drivers/infiniband/hw/i40iw/i40iw_puda.h
+Removing drivers/infiniband/hw/i40iw/i40iw_puda.c
+Removing drivers/infiniband/hw/i40iw/i40iw_pble.h
+Removing drivers/infiniband/hw/i40iw/i40iw_pble.c
+Removing drivers/infiniband/hw/i40iw/i40iw_p.h
+Removing drivers/infiniband/hw/i40iw/i40iw_osdep.h
+Removing drivers/infiniband/hw/i40iw/i40iw_main.c
+Removing drivers/infiniband/hw/i40iw/i40iw_hw.c
+Removing drivers/infiniband/hw/i40iw/i40iw_hmc.h
+Removing drivers/infiniband/hw/i40iw/i40iw_hmc.c
+Removing drivers/infiniband/hw/i40iw/i40iw_d.h
+Removing drivers/infiniband/hw/i40iw/i40iw_ctrl.c
+Removing drivers/infiniband/hw/i40iw/i40iw_cm.h
+Removing drivers/infiniband/hw/i40iw/i40iw_cm.c
+Removing drivers/infiniband/hw/i40iw/i40iw.h
+Removing drivers/infiniband/hw/i40iw/Makefile
+Removing drivers/infiniband/hw/i40iw/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/stable/sysfs-class-infiniband | 20 -
+ MAINTAINERS | 21 +-
+ drivers/block/rnbd/rnbd-clt.c | 5 +-
+ drivers/block/rnbd/rnbd-clt.h | 5 +-
+ drivers/infiniband/Kconfig | 2 +-
+ drivers/infiniband/core/cache.c | 40 +-
+ drivers/infiniband/core/cm.c | 863 ++-
+ drivers/infiniband/core/core_priv.h | 15 +-
+ drivers/infiniband/core/counters.c | 4 +-
+ drivers/infiniband/core/device.c | 41 +-
+ drivers/infiniband/core/iwcm.c | 9 +-
+ drivers/infiniband/core/iwcm.h | 2 +-
+ drivers/infiniband/core/iwpm_msg.c | 22 +-
+ drivers/infiniband/core/iwpm_util.c | 16 +-
+ drivers/infiniband/core/iwpm_util.h | 4 +-
+ drivers/infiniband/core/mad.c | 27 +-
+ drivers/infiniband/core/mad_priv.h | 1 -
+ drivers/infiniband/core/multicast.c | 20 +-
+ drivers/infiniband/core/netlink.c | 2 +-
+ drivers/infiniband/core/nldev.c | 10 +-
+ drivers/infiniband/core/roce_gid_mgmt.c | 5 +-
+ drivers/infiniband/core/rw.c | 8 +-
+ drivers/infiniband/core/sa_query.c | 4 +-
+ drivers/infiniband/core/security.c | 9 +-
+ drivers/infiniband/core/sysfs.c | 1110 ++--
+ drivers/infiniband/core/ucma.c | 11 +-
+ drivers/infiniband/core/ud_header.c | 8 +-
+ drivers/infiniband/core/umem_odp.c | 2 +-
+ drivers/infiniband/core/user_mad.c | 4 +-
+ drivers/infiniband/core/uverbs.h | 2 +-
+ drivers/infiniband/core/uverbs_cmd.c | 23 +-
+ drivers/infiniband/core/uverbs_main.c | 12 +-
+ drivers/infiniband/core/uverbs_uapi.c | 2 +-
+ drivers/infiniband/core/verbs.c | 23 +-
+ drivers/infiniband/hw/Makefile | 2 +-
+ drivers/infiniband/hw/bnxt_re/hw_counters.c | 7 +-
+ drivers/infiniband/hw/bnxt_re/hw_counters.h | 4 +-
+ drivers/infiniband/hw/bnxt_re/ib_verbs.c | 25 +-
+ drivers/infiniband/hw/bnxt_re/main.c | 19 +-
+ drivers/infiniband/hw/bnxt_re/qplib_fp.h | 2 +
+ drivers/infiniband/hw/bnxt_re/qplib_res.c | 17 +
+ drivers/infiniband/hw/bnxt_re/qplib_res.h | 7 +-
+ drivers/infiniband/hw/bnxt_re/qplib_sp.c | 13 +-
+ drivers/infiniband/hw/bnxt_re/qplib_sp.h | 2 -
+ drivers/infiniband/hw/cxgb4/cq.c | 6 +-
+ drivers/infiniband/hw/cxgb4/ev.c | 8 +-
+ drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 2 +-
+ drivers/infiniband/hw/cxgb4/provider.c | 11 +-
+ drivers/infiniband/hw/cxgb4/qp.c | 2 +-
+ drivers/infiniband/hw/efa/efa.h | 3 +-
+ drivers/infiniband/hw/efa/efa_main.c | 3 +-
+ drivers/infiniband/hw/efa/efa_verbs.c | 11 +-
+ drivers/infiniband/hw/hfi1/chip.c | 4 +-
+ drivers/infiniband/hw/hfi1/file_ops.c | 6 +-
+ drivers/infiniband/hw/hfi1/hfi.h | 9 +-
+ drivers/infiniband/hw/hfi1/init.c | 4 +-
+ drivers/infiniband/hw/hfi1/pio.c | 2 +-
+ drivers/infiniband/hw/hfi1/pio.h | 2 -
+ drivers/infiniband/hw/hfi1/sysfs.c | 530 +-
+ drivers/infiniband/hw/hfi1/tid_rdma.c | 2 +-
+ drivers/infiniband/hw/hfi1/trace.c | 5 +
+ drivers/infiniband/hw/hfi1/verbs.c | 92 +-
+ drivers/infiniband/hw/hns/hns_roce_alloc.c | 114 +-
+ drivers/infiniband/hw/hns/hns_roce_common.h | 12 +-
+ drivers/infiniband/hw/hns/hns_roce_cq.c | 15 +-
+ drivers/infiniband/hw/hns/hns_roce_db.c | 3 +-
+ drivers/infiniband/hw/hns/hns_roce_device.h | 72 +-
+ drivers/infiniband/hw/hns/hns_roce_hem.c | 371 +-
+ drivers/infiniband/hw/hns/hns_roce_hem.h | 13 +-
+ drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 79 +-
+ drivers/infiniband/hw/hns/hns_roce_hw_v1.h | 5 +
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 1971 +++----
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 967 ++--
+ drivers/infiniband/hw/hns/hns_roce_main.c | 40 +-
+ drivers/infiniband/hw/hns/hns_roce_mr.c | 84 +-
+ drivers/infiniband/hw/hns/hns_roce_pd.c | 94 +-
+ drivers/infiniband/hw/hns/hns_roce_qp.c | 47 +-
+ drivers/infiniband/hw/hns/hns_roce_srq.c | 22 +-
+ drivers/infiniband/hw/i40iw/Kconfig | 9 -
+ drivers/infiniband/hw/i40iw/Makefile | 9 -
+ drivers/infiniband/hw/i40iw/i40iw.h | 602 ---
+ drivers/infiniband/hw/i40iw/i40iw_cm.c | 4419 ---------------
+ drivers/infiniband/hw/i40iw/i40iw_cm.h | 462 --
+ drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 5243 ------------------
+ drivers/infiniband/hw/i40iw/i40iw_d.h | 1746 ------
+ drivers/infiniband/hw/i40iw/i40iw_hmc.c | 821 ---
+ drivers/infiniband/hw/i40iw/i40iw_hmc.h | 241 -
+ drivers/infiniband/hw/i40iw/i40iw_hw.c | 851 ---
+ drivers/infiniband/hw/i40iw/i40iw_main.c | 2065 -------
+ drivers/infiniband/hw/i40iw/i40iw_osdep.h | 195 -
+ drivers/infiniband/hw/i40iw/i40iw_p.h | 129 -
+ drivers/infiniband/hw/i40iw/i40iw_pble.c | 611 ---
+ drivers/infiniband/hw/i40iw/i40iw_pble.h | 131 -
+ drivers/infiniband/hw/i40iw/i40iw_puda.c | 1496 ------
+ drivers/infiniband/hw/i40iw/i40iw_puda.h | 188 -
+ drivers/infiniband/hw/i40iw/i40iw_register.h | 1030 ----
+ drivers/infiniband/hw/i40iw/i40iw_status.h | 101 -
+ drivers/infiniband/hw/i40iw/i40iw_type.h | 1358 -----
+ drivers/infiniband/hw/i40iw/i40iw_uk.c | 1200 -----
+ drivers/infiniband/hw/i40iw/i40iw_user.h | 422 --
+ drivers/infiniband/hw/i40iw/i40iw_utils.c | 1518 ------
+ drivers/infiniband/hw/i40iw/i40iw_verbs.c | 2652 ---------
+ drivers/infiniband/hw/i40iw/i40iw_verbs.h | 179 -
+ drivers/infiniband/hw/i40iw/i40iw_vf.c | 85 -
+ drivers/infiniband/hw/i40iw/i40iw_vf.h | 62 -
+ drivers/infiniband/hw/i40iw/i40iw_virtchnl.c | 759 ---
+ drivers/infiniband/hw/i40iw/i40iw_virtchnl.h | 124 -
+ drivers/infiniband/hw/irdma/Kconfig | 12 +
+ drivers/infiniband/hw/irdma/Makefile | 27 +
+ drivers/infiniband/hw/irdma/cm.c | 4421 +++++++++++++++
+ drivers/infiniband/hw/irdma/cm.h | 417 ++
+ drivers/infiniband/hw/irdma/ctrl.c | 5657 ++++++++++++++++++++
+ drivers/infiniband/hw/irdma/defs.h | 1155 ++++
+ drivers/infiniband/hw/irdma/hmc.c | 710 +++
+ drivers/infiniband/hw/irdma/hmc.h | 180 +
+ drivers/infiniband/hw/irdma/hw.c | 2725 ++++++++++
+ drivers/infiniband/hw/irdma/i40iw_hw.c | 216 +
+ drivers/infiniband/hw/irdma/i40iw_hw.h | 160 +
+ drivers/infiniband/hw/irdma/i40iw_if.c | 216 +
+ drivers/infiniband/hw/irdma/icrdma_hw.c | 149 +
+ drivers/infiniband/hw/irdma/icrdma_hw.h | 71 +
+ drivers/infiniband/hw/irdma/irdma.h | 153 +
+ drivers/infiniband/hw/irdma/main.c | 358 ++
+ drivers/infiniband/hw/irdma/main.h | 555 ++
+ drivers/infiniband/hw/irdma/osdep.h | 86 +
+ drivers/infiniband/hw/irdma/pble.c | 520 ++
+ drivers/infiniband/hw/irdma/pble.h | 136 +
+ drivers/infiniband/hw/irdma/protos.h | 116 +
+ drivers/infiniband/hw/irdma/puda.c | 1744 ++++++
+ drivers/infiniband/hw/irdma/puda.h | 194 +
+ drivers/infiniband/hw/irdma/status.h | 71 +
+ drivers/infiniband/hw/irdma/trace.c | 112 +
+ drivers/infiniband/hw/irdma/trace.h | 3 +
+ drivers/infiniband/hw/irdma/trace_cm.h | 458 ++
+ drivers/infiniband/hw/irdma/type.h | 1541 ++++++
+ drivers/infiniband/hw/irdma/uda.c | 271 +
+ drivers/infiniband/hw/irdma/uda.h | 89 +
+ drivers/infiniband/hw/irdma/uda_d.h | 128 +
+ drivers/infiniband/hw/irdma/uk.c | 1684 ++++++
+ drivers/infiniband/hw/irdma/user.h | 437 ++
+ drivers/infiniband/hw/irdma/utils.c | 2541 +++++++++
+ drivers/infiniband/hw/irdma/verbs.c | 4530 ++++++++++++++++
+ drivers/infiniband/hw/irdma/verbs.h | 225 +
+ drivers/infiniband/hw/irdma/ws.c | 406 ++
+ drivers/infiniband/hw/irdma/ws.h | 41 +
+ drivers/infiniband/hw/mlx4/cq.c | 8 +-
+ drivers/infiniband/hw/mlx4/main.c | 27 +-
+ drivers/infiniband/hw/mlx4/qp.c | 11 +-
+ drivers/infiniband/hw/mlx5/counters.c | 42 +-
+ drivers/infiniband/hw/mlx5/cq.c | 10 +-
+ drivers/infiniband/hw/mlx5/doorbell.c | 3 +-
+ drivers/infiniband/hw/mlx5/main.c | 16 +-
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 12 +-
+ drivers/infiniband/hw/mlx5/mr.c | 12 +-
+ drivers/infiniband/hw/mlx5/odp.c | 5 +-
+ drivers/infiniband/hw/mlx5/qp.c | 177 +-
+ drivers/infiniband/hw/mlx5/qpc.c | 6 +
+ drivers/infiniband/hw/mlx5/srq.c | 2 +-
+ drivers/infiniband/hw/mlx5/wr.c | 14 +-
+ drivers/infiniband/hw/mthca/mthca_provider.c | 2 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_main.c | 2 +-
+ drivers/infiniband/hw/qedr/main.c | 2 +-
+ drivers/infiniband/hw/qib/qib.h | 8 +-
+ drivers/infiniband/hw/qib/qib_sysfs.c | 616 +--
+ drivers/infiniband/hw/qib/qib_verbs.c | 6 +-
+ drivers/infiniband/hw/usnic/usnic_ib_main.c | 3 +-
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 2 +-
+ drivers/infiniband/sw/rdmavt/mr.c | 4 +-
+ drivers/infiniband/sw/rdmavt/qp.c | 3 +-
+ drivers/infiniband/sw/rdmavt/vt.c | 6 +-
+ drivers/infiniband/sw/rxe/Makefile | 1 +
+ drivers/infiniband/sw/rxe/rxe.c | 1 +
+ drivers/infiniband/sw/rxe/rxe_comp.c | 36 +-
+ drivers/infiniband/sw/rxe/rxe_cq.c | 32 +-
+ drivers/infiniband/sw/rxe/rxe_hw_counters.c | 7 +-
+ drivers/infiniband/sw/rxe/rxe_hw_counters.h | 4 +-
+ drivers/infiniband/sw/rxe/rxe_loc.h | 38 +-
+ drivers/infiniband/sw/rxe/rxe_mr.c | 130 +-
+ drivers/infiniband/sw/rxe/rxe_mw.c | 343 ++
+ drivers/infiniband/sw/rxe/rxe_net.c | 14 +-
+ drivers/infiniband/sw/rxe/rxe_opcode.c | 11 +-
+ drivers/infiniband/sw/rxe/rxe_opcode.h | 3 +-
+ drivers/infiniband/sw/rxe/rxe_param.h | 19 +-
+ drivers/infiniband/sw/rxe/rxe_pool.c | 45 +-
+ drivers/infiniband/sw/rxe/rxe_pool.h | 8 +-
+ drivers/infiniband/sw/rxe/rxe_qp.c | 23 +-
+ drivers/infiniband/sw/rxe/rxe_queue.c | 21 +-
+ drivers/infiniband/sw/rxe/rxe_queue.h | 272 +-
+ drivers/infiniband/sw/rxe/rxe_req.c | 159 +-
+ drivers/infiniband/sw/rxe/rxe_resp.c | 207 +-
+ drivers/infiniband/sw/rxe/rxe_srq.c | 5 +-
+ drivers/infiniband/sw/rxe/rxe_verbs.c | 101 +-
+ drivers/infiniband/sw/rxe/rxe_verbs.h | 53 +-
+ drivers/infiniband/ulp/ipoib/ipoib.h | 4 +-
+ drivers/infiniband/ulp/ipoib/ipoib_cm.c | 8 +-
+ drivers/infiniband/ulp/ipoib/ipoib_main.c | 48 +-
+ drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 4 +-
+ drivers/infiniband/ulp/iser/iser_verbs.c | 2 +-
+ drivers/infiniband/ulp/isert/ib_isert.c | 14 +-
+ drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 5 +-
+ drivers/infiniband/ulp/rtrs/rtrs-clt.c | 254 +-
+ drivers/infiniband/ulp/rtrs/rtrs-clt.h | 6 +-
+ drivers/infiniband/ulp/rtrs/rtrs-pri.h | 27 +-
+ drivers/infiniband/ulp/rtrs/rtrs-srv-stats.c | 12 +-
+ drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 1 +
+ drivers/infiniband/ulp/rtrs/rtrs-srv.c | 199 +-
+ drivers/infiniband/ulp/rtrs/rtrs-srv.h | 4 +-
+ drivers/infiniband/ulp/rtrs/rtrs.c | 53 +-
+ drivers/infiniband/ulp/rtrs/rtrs.h | 2 +-
+ drivers/infiniband/ulp/srp/ib_srp.c | 256 +-
+ drivers/infiniband/ulp/srp/ib_srp.h | 2 -
+ drivers/infiniband/ulp/srpt/ib_srpt.c | 1 -
+ drivers/net/ethernet/intel/Kconfig | 2 +
+ drivers/net/ethernet/intel/i40e/i40e.h | 2 +
+ drivers/net/ethernet/intel/i40e/i40e_client.c | 253 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 1 +
+ drivers/net/ethernet/intel/ice/Makefile | 1 +
+ drivers/net/ethernet/intel/ice/ice.h | 44 +-
+ drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 33 +
+ drivers/net/ethernet/intel/ice/ice_common.c | 220 +-
+ drivers/net/ethernet/intel/ice/ice_common.h | 9 +
+ drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 19 +
+ drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 3 +-
+ drivers/net/ethernet/intel/ice/ice_idc.c | 334 ++
+ drivers/net/ethernet/intel/ice/ice_idc_int.h | 14 +
+ drivers/net/ethernet/intel/ice/ice_lag.c | 2 +
+ drivers/net/ethernet/intel/ice/ice_lib.c | 11 +
+ drivers/net/ethernet/intel/ice/ice_lib.h | 2 +-
+ drivers/net/ethernet/intel/ice/ice_main.c | 142 +-
+ drivers/net/ethernet/intel/ice/ice_sched.c | 69 +-
+ drivers/net/ethernet/intel/ice/ice_switch.c | 28 +
+ drivers/net/ethernet/intel/ice/ice_switch.h | 4 +
+ drivers/net/ethernet/intel/ice/ice_type.h | 4 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 8 +-
+ .../net/ethernet/mellanox/mlx5/core/lib/clock.h | 10 +-
+ include/linux/mlx5/mlx5_ifc.h | 36 +-
+ include/linux/mlx5/qp.h | 4 +-
+ include/linux/net/intel/i40e_client.h | 15 +-
+ include/linux/net/intel/iidc.h | 100 +
+ include/rdma/ib_hdrs.h | 5 -
+ include/rdma/ib_mad.h | 27 +-
+ include/rdma/ib_sysfs.h | 37 +
+ include/rdma/ib_verbs.h | 83 +-
+ include/scsi/srp.h | 26 +-
+ include/uapi/rdma/bnxt_re-abi.h | 11 +-
+ include/uapi/rdma/i40iw-abi.h | 107 -
+ include/uapi/rdma/ib_user_ioctl_verbs.h | 1 +
+ include/uapi/rdma/ib_user_mad.h | 2 +-
+ include/uapi/rdma/irdma-abi.h | 111 +
+ include/uapi/rdma/mlx5-abi.h | 3 +
+ include/uapi/rdma/rdma_user_rxe.h | 10 +
+ 251 files changed, 39077 insertions(+), 34434 deletions(-)
+ delete mode 100644 drivers/infiniband/hw/i40iw/Kconfig
+ delete mode 100644 drivers/infiniband/hw/i40iw/Makefile
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw.h
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_cm.c
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_cm.h
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_ctrl.c
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_d.h
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_hmc.c
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_hmc.h
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_hw.c
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_main.c
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_osdep.h
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_p.h
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_pble.c
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_pble.h
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_puda.c
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_puda.h
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_register.h
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_status.h
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_type.h
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_uk.c
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_user.h
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_utils.c
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_verbs.c
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_verbs.h
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_vf.c
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_vf.h
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_virtchnl.c
+ delete mode 100644 drivers/infiniband/hw/i40iw/i40iw_virtchnl.h
+ create mode 100644 drivers/infiniband/hw/irdma/Kconfig
+ create mode 100644 drivers/infiniband/hw/irdma/Makefile
+ create mode 100644 drivers/infiniband/hw/irdma/cm.c
+ create mode 100644 drivers/infiniband/hw/irdma/cm.h
+ create mode 100644 drivers/infiniband/hw/irdma/ctrl.c
+ create mode 100644 drivers/infiniband/hw/irdma/defs.h
+ create mode 100644 drivers/infiniband/hw/irdma/hmc.c
+ create mode 100644 drivers/infiniband/hw/irdma/hmc.h
+ create mode 100644 drivers/infiniband/hw/irdma/hw.c
+ create mode 100644 drivers/infiniband/hw/irdma/i40iw_hw.c
+ create mode 100644 drivers/infiniband/hw/irdma/i40iw_hw.h
+ create mode 100644 drivers/infiniband/hw/irdma/i40iw_if.c
+ create mode 100644 drivers/infiniband/hw/irdma/icrdma_hw.c
+ create mode 100644 drivers/infiniband/hw/irdma/icrdma_hw.h
+ create mode 100644 drivers/infiniband/hw/irdma/irdma.h
+ create mode 100644 drivers/infiniband/hw/irdma/main.c
+ create mode 100644 drivers/infiniband/hw/irdma/main.h
+ create mode 100644 drivers/infiniband/hw/irdma/osdep.h
+ create mode 100644 drivers/infiniband/hw/irdma/pble.c
+ create mode 100644 drivers/infiniband/hw/irdma/pble.h
+ create mode 100644 drivers/infiniband/hw/irdma/protos.h
+ create mode 100644 drivers/infiniband/hw/irdma/puda.c
+ create mode 100644 drivers/infiniband/hw/irdma/puda.h
+ create mode 100644 drivers/infiniband/hw/irdma/status.h
+ create mode 100644 drivers/infiniband/hw/irdma/trace.c
+ create mode 100644 drivers/infiniband/hw/irdma/trace.h
+ create mode 100644 drivers/infiniband/hw/irdma/trace_cm.h
+ create mode 100644 drivers/infiniband/hw/irdma/type.h
+ create mode 100644 drivers/infiniband/hw/irdma/uda.c
+ create mode 100644 drivers/infiniband/hw/irdma/uda.h
+ create mode 100644 drivers/infiniband/hw/irdma/uda_d.h
+ create mode 100644 drivers/infiniband/hw/irdma/uk.c
+ create mode 100644 drivers/infiniband/hw/irdma/user.h
+ create mode 100644 drivers/infiniband/hw/irdma/utils.c
+ create mode 100644 drivers/infiniband/hw/irdma/verbs.c
+ create mode 100644 drivers/infiniband/hw/irdma/verbs.h
+ create mode 100644 drivers/infiniband/hw/irdma/ws.c
+ create mode 100644 drivers/infiniband/hw/irdma/ws.h
+ create mode 100644 drivers/infiniband/sw/rxe/rxe_mw.c
+ create mode 100644 drivers/net/ethernet/intel/ice/ice_idc.c
+ create mode 100644 drivers/net/ethernet/intel/ice/ice_idc_int.h
+ create mode 100644 include/linux/net/intel/iidc.h
+ create mode 100644 include/rdma/ib_sysfs.h
+ delete mode 100644 include/uapi/rdma/i40iw-abi.h
+ create mode 100644 include/uapi/rdma/irdma-abi.h
+Merging net-next/master (35713d9b8f09 Merge branch 'devlink-rate-limit-fixes')
+$ git merge net-next/master
+Auto-merging tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
+Auto-merging net/xfrm/xfrm_output.c
+Auto-merging net/vmw_vsock/af_vsock.c
+Auto-merging net/tls/tls_sw.c
+Auto-merging net/tipc/link.c
+Auto-merging net/sctp/input.c
+CONFLICT (content): Merge conflict in net/sctp/input.c
+Auto-merging net/packet/af_packet.c
+Auto-merging net/netfilter/nft_tproxy.c
+Auto-merging net/netfilter/nft_exthdr.c
+Auto-merging net/netfilter/nf_tables_api.c
+CONFLICT (content): Merge conflict in net/netfilter/nf_tables_api.c
+Auto-merging net/mptcp/subflow.c
+Auto-merging net/mptcp/protocol.h
+Auto-merging net/mptcp/protocol.c
+Auto-merging net/mptcp/options.c
+Auto-merging net/ipv4/udp_bpf.c
+CONFLICT (content): Merge conflict in net/ipv4/udp_bpf.c
+Auto-merging net/ipv4/tcp_bpf.c
+CONFLICT (content): Merge conflict in net/ipv4/tcp_bpf.c
+Auto-merging net/ipv4/fib_frontend.c
+Auto-merging net/core/skmsg.c
+CONFLICT (content): Merge conflict in net/core/skmsg.c
+Auto-merging net/core/netpoll.c
+Auto-merging net/core/dev.c
+Auto-merging net/can/isotp.c
+Auto-merging net/9p/trans_virtio.c
+Auto-merging kernel/bpf/verifier.c
+Auto-merging kernel/bpf/devmap.c
+Auto-merging include/net/xfrm.h
+Auto-merging include/net/sch_generic.h
+Auto-merging include/linux/skmsg.h
+CONFLICT (content): Merge conflict in include/linux/skmsg.h
+Auto-merging include/linux/mlx5/mlx5_ifc.h
+Auto-merging include/linux/device.h
+Auto-merging include/linux/acpi.h
+Auto-merging drivers/net/vrf.c
+Auto-merging drivers/net/ethernet/smsc/smc91x.c
+Auto-merging drivers/net/ethernet/sfc/ef10.c
+Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+Auto-merging drivers/net/ethernet/neterion/vxge/vxge-config.c
+Auto-merging drivers/net/ethernet/microsoft/mana/mana_en.c
+Removing drivers/net/ethernet/mellanox/mlxsw/switchx2.c
+Removing drivers/net/ethernet/mellanox/mlxsw/switchib.c
+Removing drivers/net/ethernet/mellanox/mlxsw/ib.h
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+Removing drivers/net/dsa/sja1105/sja1105_sgmii.h
+Auto-merging drivers/net/bonding/bond_main.c
+Auto-merging drivers/infiniband/hw/mlx5/odp.c
+Auto-merging drivers/base/core.c
+Auto-merging drivers/atm/nicstar.c
+Auto-merging arch/mips/boot/dts/loongson/ls7a-pch.dtsi
+Auto-merging arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi
+Auto-merging arch/arm64/net/bpf_jit_comp.c
+Auto-merging arch/arm64/boot/dts/rockchip/rk3308.dtsi
+Auto-merging MAINTAINERS
+Auto-merging Documentation/networking/devlink/devlink-trap.rst
+CONFLICT (content): Merge conflict in Documentation/networking/devlink/devlink-trap.rst
+Removing Documentation/devicetree/bindings/net/dsa/sja1105.txt
+Removing Documentation/devicetree/bindings/net/can/rcar_canfd.txt
+Removing Documentation/devicetree/bindings/net/can/rcar_can.txt
+Removing Documentation/devicetree/bindings/net/brcm,iproc-mdio.txt
+Resolved 'Documentation/networking/devlink/devlink-trap.rst' using previous resolution.
+Resolved 'include/linux/skmsg.h' using previous resolution.
+Resolved 'net/core/skmsg.c' using previous resolution.
+Resolved 'net/ipv4/tcp_bpf.c' using previous resolution.
+Resolved 'net/ipv4/udp_bpf.c' using previous resolution.
+Recorded preimage for 'net/netfilter/nf_tables_api.c'
+Resolved 'net/sctp/input.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'net/netfilter/nf_tables_api.c'.
+[master 511c393c9a98] Merge remote-tracking branch 'net-next/master'
+$ git diff -M --stat --summary HEAD^..
+ .../ABI/testing/sysfs-devices-platform-soc-ipa | 78 +
+ Documentation/bpf/index.rst | 1 +
+ Documentation/bpf/llvm_reloc.rst | 240 +
+ .../devicetree/bindings/net/brcm,iproc-mdio.txt | 23 -
+ .../devicetree/bindings/net/brcm,iproc-mdio.yaml | 38 +
+ .../devicetree/bindings/net/can/rcar_can.txt | 80 -
+ .../devicetree/bindings/net/can/rcar_canfd.txt | 107 -
+ .../bindings/net/can/renesas,rcar-can.yaml | 139 +
+ .../bindings/net/can/renesas,rcar-canfd.yaml | 122 +
+ .../devicetree/bindings/net/dsa/mt7530.txt | 6 +
+ .../devicetree/bindings/net/dsa/nxp,sja1105.yaml | 132 +
+ .../devicetree/bindings/net/dsa/qca8k.txt | 40 +
+ .../devicetree/bindings/net/dsa/sja1105.txt | 156 -
+ .../bindings/net/ethernet-controller.yaml | 2 +
+ .../devicetree/bindings/net/ingenic,mac.yaml | 76 +
+ .../bindings/net/nfc/samsung,s3fwrn5.yaml | 5 +
+ .../devicetree/bindings/net/qcom,ipa.yaml | 1 +
+ .../devicetree/bindings/net/realtek,rtl82xx.yaml | 45 +
+ .../devicetree/bindings/net/rockchip-dwmac.yaml | 30 +-
+ .../devicetree/bindings/net/snps,dwmac.yaml | 21 +
+ Documentation/firmware-guide/acpi/dsd/phy.rst | 199 +
+ Documentation/firmware-guide/acpi/index.rst | 1 +
+ .../device_drivers/cellular/qualcomm/rmnet.rst | 126 +-
+ .../device_drivers/ethernet/amazon/ena.rst | 164 +-
+ .../device_drivers/ethernet/mellanox/mlx5.rst | 88 +
+ Documentation/networking/device_drivers/index.rst | 1 +
+ .../networking/device_drivers/wwan/index.rst | 18 +
+ .../networking/device_drivers/wwan/iosm.rst | 96 +
+ Documentation/networking/devlink/devlink-port.rst | 35 +
+ Documentation/networking/devlink/devlink-trap.rst | 1 +
+ Documentation/networking/devlink/index.rst | 1 +
+ Documentation/networking/devlink/netdevsim.rst | 26 +
+ Documentation/networking/devlink/prestera.rst | 141 +
+ Documentation/networking/dsa/dsa.rst | 21 +-
+ Documentation/networking/ethtool-netlink.rst | 8 +-
+ Documentation/networking/ip-sysctl.rst | 91 +
+ Documentation/networking/mptcp-sysctl.rst | 29 +-
+ Documentation/networking/nf_conntrack-sysctl.rst | 24 +
+ Documentation/networking/phy.rst | 6 +
+ MAINTAINERS | 34 +
+ arch/arm64/boot/dts/rockchip/rk3308.dtsi | 22 +
+ arch/arm64/net/bpf_jit_comp.c | 19 +-
+ arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi | 46 +
+ arch/mips/boot/dts/loongson/ls7a-pch.dtsi | 6 +-
+ arch/s390/include/asm/qdio.h | 4 +-
+ drivers/acpi/utils.c | 14 +
+ drivers/atm/iphase.c | 13 +-
+ drivers/atm/iphase.h | 1 -
+ drivers/atm/nicstar.c | 2 +-
+ drivers/atm/zeprom.h | 2 +-
+ drivers/base/core.c | 7 +
+ drivers/infiniband/hw/mlx5/fs.c | 9 +-
+ drivers/infiniband/hw/mlx5/odp.c | 8 +-
+ drivers/isdn/hardware/mISDN/hfcpci.c | 2 +-
+ drivers/isdn/mISDN/dsp_pipeline.c | 46 +-
+ drivers/net/Kconfig | 23 +-
+ drivers/net/appletalk/cops.c | 30 +-
+ drivers/net/appletalk/ltpc.c | 16 +-
+ drivers/net/bonding/bond_alb.c | 13 +-
+ drivers/net/bonding/bond_debugfs.c | 3 +-
+ drivers/net/bonding/bond_main.c | 31 +-
+ drivers/net/bonding/bond_netlink.c | 2 +-
+ drivers/net/bonding/bond_options.c | 5 +-
+ drivers/net/bonding/bond_procfs.c | 1 +
+ drivers/net/bonding/bond_sysfs.c | 7 +
+ drivers/net/caif/caif_virtio.c | 6 +-
+ drivers/net/can/at91_can.c | 2 +-
+ drivers/net/can/c_can/Makefile | 5 +
+ drivers/net/can/c_can/c_can.h | 3 +-
+ drivers/net/can/c_can/c_can_ethtool.c | 43 +
+ drivers/net/can/c_can/{c_can.c => c_can_main.c} | 2 +-
+ drivers/net/can/m_can/m_can.c | 244 +-
+ drivers/net/can/softing/softing_main.c | 2 -
+ drivers/net/can/spi/hi311x.c | 2 +-
+ drivers/net/can/spi/mcp251x.c | 2 +-
+ drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 2 +-
+ drivers/net/can/usb/Kconfig | 2 +
+ drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 14 +-
+ drivers/net/dsa/b53/b53_common.c | 30 +-
+ drivers/net/dsa/b53/b53_srab.c | 3 +-
+ drivers/net/dsa/hirschmann/hellcreek.c | 3 +-
+ drivers/net/dsa/microchip/ksz8795.c | 214 +-
+ drivers/net/dsa/microchip/ksz8795_reg.h | 67 +-
+ drivers/net/dsa/mt7530.c | 264 +-
+ drivers/net/dsa/mt7530.h | 20 +-
+ drivers/net/dsa/ocelot/felix.c | 2 +
+ drivers/net/dsa/ocelot/seville_vsc9953.c | 5 +
+ drivers/net/dsa/qca8k.c | 803 +-
+ drivers/net/dsa/qca8k.h | 58 +-
+ drivers/net/dsa/sja1105/Kconfig | 1 +
+ drivers/net/dsa/sja1105/Makefile | 1 +
+ drivers/net/dsa/sja1105/sja1105.h | 128 +-
+ drivers/net/dsa/sja1105/sja1105_clocking.c | 170 +-
+ drivers/net/dsa/sja1105/sja1105_dynamic_config.c | 336 +-
+ drivers/net/dsa/sja1105/sja1105_dynamic_config.h | 1 +
+ drivers/net/dsa/sja1105/sja1105_ethtool.c | 1089 +--
+ drivers/net/dsa/sja1105/sja1105_flower.c | 13 +-
+ drivers/net/dsa/sja1105/sja1105_main.c | 763 +-
+ drivers/net/dsa/sja1105/sja1105_mdio.c | 543 ++
+ drivers/net/dsa/sja1105/sja1105_ptp.c | 97 +-
+ drivers/net/dsa/sja1105/sja1105_ptp.h | 13 +
+ drivers/net/dsa/sja1105/sja1105_sgmii.h | 53 -
+ drivers/net/dsa/sja1105/sja1105_spi.c | 518 +-
+ drivers/net/dsa/sja1105/sja1105_static_config.c | 500 +-
+ drivers/net/dsa/sja1105/sja1105_static_config.h | 109 +-
+ drivers/net/dsa/sja1105/sja1105_tas.c | 14 +-
+ drivers/net/dsa/sja1105/sja1105_tas.h | 2 +-
+ drivers/net/dsa/sja1105/sja1105_vl.c | 2 +-
+ drivers/net/dsa/xrs700x/xrs700x.c | 78 +
+ drivers/net/ethernet/3com/3c59x.c | 2 +-
+ drivers/net/ethernet/8390/axnet_cs.c | 14 +-
+ drivers/net/ethernet/8390/pcnet_cs.c | 2 +-
+ drivers/net/ethernet/8390/smc-ultra.c | 6 +-
+ drivers/net/ethernet/8390/stnic.c | 2 +-
+ drivers/net/ethernet/alteon/acenic.c | 26 +-
+ drivers/net/ethernet/amazon/ena/ena_admin_defs.h | 2 -
+ drivers/net/ethernet/amazon/ena/ena_com.c | 3 +-
+ drivers/net/ethernet/amazon/ena/ena_eth_com.c | 30 +-
+ drivers/net/ethernet/amazon/ena/ena_ethtool.c | 18 +-
+ drivers/net/ethernet/amazon/ena/ena_netdev.c | 217 +-
+ drivers/net/ethernet/amazon/ena/ena_netdev.h | 23 +-
+ drivers/net/ethernet/amd/amd8111e.c | 4 +-
+ drivers/net/ethernet/amd/amd8111e.h | 6 +-
+ drivers/net/ethernet/amd/atarilance.c | 2 +-
+ drivers/net/ethernet/amd/declance.c | 2 +-
+ drivers/net/ethernet/amd/lance.c | 4 +-
+ drivers/net/ethernet/amd/ni65.c | 12 +-
+ drivers/net/ethernet/amd/nmclan_cs.c | 12 +-
+ drivers/net/ethernet/amd/sun3lance.c | 12 +-
+ drivers/net/ethernet/apple/bmac.c | 30 +-
+ drivers/net/ethernet/apple/mace.c | 8 +-
+ drivers/net/ethernet/arc/emac_rockchip.c | 2 +-
+ drivers/net/ethernet/atheros/alx/alx.h | 2 +
+ drivers/net/ethernet/atheros/alx/ethtool.c | 21 +-
+ drivers/net/ethernet/atheros/alx/main.c | 84 +-
+ drivers/net/ethernet/atheros/atl1c/atl1c.h | 28 +-
+ drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | 35 +-
+ drivers/net/ethernet/atheros/atl1c/atl1c_hw.h | 42 +-
+ drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 587 +-
+ drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 4 +-
+ drivers/net/ethernet/atheros/atlx/atl1.c | 2 +-
+ drivers/net/ethernet/broadcom/b44.c | 20 +-
+ drivers/net/ethernet/broadcom/bgmac-platform.c | 21 +-
+ drivers/net/ethernet/broadcom/bnx2.c | 6 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 4 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 1 -
+ drivers/net/ethernet/broadcom/genet/bcmmii.c | 4 +
+ drivers/net/ethernet/brocade/bna/bfa_cee.c | 2 +-
+ drivers/net/ethernet/cadence/macb_main.c | 3 +-
+ drivers/net/ethernet/cadence/macb_pci.c | 2 +-
+ drivers/net/ethernet/cadence/macb_ptp.c | 2 +-
+ drivers/net/ethernet/calxeda/xgmac.c | 8 +-
+ drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 3 -
+ drivers/net/ethernet/chelsio/cxgb3/adapter.h | 2 +-
+ drivers/net/ethernet/chelsio/cxgb3/common.h | 2 +
+ drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 19 +-
+ drivers/net/ethernet/chelsio/cxgb3/sge.c | 44 +-
+ drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c | 6 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 7 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 2 +-
+ drivers/net/ethernet/cortina/gemini.c | 34 +-
+ drivers/net/ethernet/dec/tulip/de2104x.c | 4 +-
+ drivers/net/ethernet/dec/tulip/de4x5.c | 6 +-
+ drivers/net/ethernet/dec/tulip/dmfe.c | 18 +-
+ drivers/net/ethernet/dec/tulip/pnic2.c | 4 +-
+ drivers/net/ethernet/dec/tulip/tulip.h | 1 -
+ drivers/net/ethernet/dec/tulip/uli526x.c | 10 +-
+ drivers/net/ethernet/dec/tulip/winbond-840.c | 4 +-
+ drivers/net/ethernet/dlink/sundance.c | 12 +-
+ drivers/net/ethernet/faraday/ftgmac100.c | 6 +-
+ drivers/net/ethernet/fealnx.c | 2 +-
+ drivers/net/ethernet/freescale/Kconfig | 4 +-
+ .../ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c | 6 +-
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 7 +-
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 103 +-
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h | 1 +
+ drivers/net/ethernet/freescale/enetc/enetc_ierb.c | 4 +-
+ drivers/net/ethernet/freescale/enetc/enetc_pf.c | 9 +-
+ drivers/net/ethernet/freescale/enetc/enetc_qos.c | 31 +-
+ drivers/net/ethernet/freescale/fec.h | 5 +
+ drivers/net/ethernet/freescale/fec_main.c | 43 +-
+ drivers/net/ethernet/freescale/gianfar.c | 76 +-
+ drivers/net/ethernet/freescale/gianfar.h | 74 +-
+ drivers/net/ethernet/freescale/ucc_geth.c | 3 +-
+ drivers/net/ethernet/freescale/xgmac_mdio.c | 23 +-
+ drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 6 +-
+ drivers/net/ethernet/hisilicon/Kconfig | 2 +
+ drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 2 -
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 9 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 16 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 76 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 8 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 2 +-
+ .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 4 +-
+ drivers/net/ethernet/hisilicon/hns/hns_enet.c | 2 +-
+ drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 10 +-
+ drivers/net/ethernet/hisilicon/hns3/hnae3.h | 88 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 1457 +++-
+ drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.h | 64 +
+ drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 1225 ++-
+ drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 99 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 86 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/Makefile | 2 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 13 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 32 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 2507 +++---
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h | 47 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 414 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h | 89 +
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 611 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 60 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 115 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 542 ++
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.h | 134 +
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 215 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 19 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 2 +
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.h | 1 +
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 76 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 2 +
+ drivers/net/ethernet/huawei/hinic/hinic_ethtool.c | 1 -
+ drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c | 4 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 18 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.c | 6 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_if.c | 4 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_io.c | 4 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c | 4 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c | 2 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_wq.c | 1 +
+ drivers/net/ethernet/huawei/hinic/hinic_main.c | 5 +-
+ drivers/net/ethernet/huawei/hinic/hinic_port.c | 10 +-
+ drivers/net/ethernet/huawei/hinic/hinic_rx.c | 1 +
+ drivers/net/ethernet/huawei/hinic/hinic_tx.c | 4 +-
+ drivers/net/ethernet/ibm/ehea/ehea_main.c | 27 +-
+ drivers/net/ethernet/ibm/emac/emac.h | 2 +-
+ drivers/net/ethernet/ibm/ibmveth.c | 54 +-
+ drivers/net/ethernet/ibm/ibmvnic.c | 179 +-
+ drivers/net/ethernet/ibm/ibmvnic.h | 6 +-
+ drivers/net/ethernet/intel/Kconfig | 1 +
+ drivers/net/ethernet/intel/e100.c | 12 +-
+ drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 2 +-
+ drivers/net/ethernet/intel/e1000/e1000_hw.c | 4 +-
+ drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +-
+ drivers/net/ethernet/intel/e1000e/ich8lan.c | 2 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 2 +-
+ drivers/net/ethernet/intel/e1000e/phy.c | 2 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 10 +-
+ drivers/net/ethernet/intel/i40e/i40e_common.c | 124 +-
+ drivers/net/ethernet/intel/i40e/i40e_type.h | 1 -
+ drivers/net/ethernet/intel/iavf/iavf_common.c | 124 +-
+ drivers/net/ethernet/intel/iavf/iavf_type.h | 1 -
+ drivers/net/ethernet/intel/ice/Makefile | 1 +
+ drivers/net/ethernet/intel/ice/ice.h | 11 +-
+ drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 47 +-
+ drivers/net/ethernet/intel/ice/ice_arfs.h | 12 +-
+ drivers/net/ethernet/intel/ice/ice_base.c | 134 +-
+ drivers/net/ethernet/intel/ice/ice_base.h | 2 +-
+ drivers/net/ethernet/intel/ice/ice_common.c | 245 +
+ drivers/net/ethernet/intel/ice/ice_common.h | 10 +
+ drivers/net/ethernet/intel/ice/ice_controlq.c | 62 +
+ drivers/net/ethernet/intel/ice/ice_controlq.h | 2 +
+ drivers/net/ethernet/intel/ice/ice_dcb_lib.h | 15 +-
+ drivers/net/ethernet/intel/ice/ice_dcb_nl.h | 9 +-
+ drivers/net/ethernet/intel/ice/ice_devlink.c | 9 +
+ drivers/net/ethernet/intel/ice/ice_ethtool.c | 33 +-
+ drivers/net/ethernet/intel/ice/ice_fw_update.c | 10 +
+ drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 69 +
+ drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 151 +-
+ drivers/net/ethernet/intel/ice/ice_lib.c | 109 +-
+ drivers/net/ethernet/intel/ice/ice_lib.h | 8 +-
+ drivers/net/ethernet/intel/ice/ice_main.c | 153 +-
+ drivers/net/ethernet/intel/ice/ice_ptp.c | 1265 +++
+ drivers/net/ethernet/intel/ice/ice_ptp.h | 161 +
+ drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 651 ++
+ drivers/net/ethernet/intel/ice/ice_ptp_hw.h | 79 +
+ drivers/net/ethernet/intel/ice/ice_sbq_cmd.h | 92 +
+ drivers/net/ethernet/intel/ice/ice_switch.h | 1 -
+ drivers/net/ethernet/intel/ice/ice_txrx.c | 39 +-
+ drivers/net/ethernet/intel/ice/ice_txrx.h | 5 +
+ drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 26 +-
+ drivers/net/ethernet/intel/ice/ice_txrx_lib.h | 2 +-
+ drivers/net/ethernet/intel/ice/ice_type.h | 65 +-
+ drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 226 +-
+ drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 31 +-
+ drivers/net/ethernet/intel/ice/ice_xsk.c | 4 +-
+ drivers/net/ethernet/intel/ice/ice_xsk.h | 4 +-
+ drivers/net/ethernet/intel/igb/e1000_82575.c | 2 +-
+ drivers/net/ethernet/intel/igb/igb_ethtool.c | 2 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 11 +-
+ drivers/net/ethernet/intel/igb/igb_ptp.c | 4 +-
+ drivers/net/ethernet/intel/igbvf/netdev.c | 6 +-
+ drivers/net/ethernet/intel/igbvf/vf.h | 42 +-
+ drivers/net/ethernet/intel/igc/igc.h | 34 +-
+ drivers/net/ethernet/intel/igc/igc_base.h | 2 +
+ drivers/net/ethernet/intel/igc/igc_defines.h | 9 +-
+ drivers/net/ethernet/intel/igc/igc_dump.c | 2 +-
+ drivers/net/ethernet/intel/igc/igc_ethtool.c | 41 +-
+ drivers/net/ethernet/intel/igc/igc_main.c | 730 +-
+ drivers/net/ethernet/intel/igc/igc_regs.h | 2 +-
+ drivers/net/ethernet/intel/igc/igc_xdp.c | 109 +-
+ drivers/net/ethernet/intel/igc/igc_xdp.h | 8 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 9 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 16 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 8 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +-
+ drivers/net/ethernet/lantiq_xrx200.c | 9 +-
+ drivers/net/ethernet/marvell/mvmdio.c | 14 +-
+ drivers/net/ethernet/marvell/mvneta.c | 30 +-
+ drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 3 -
+ drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 119 +-
+ drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 3 -
+ drivers/net/ethernet/marvell/octeontx2/af/common.h | 5 +
+ drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 54 +-
+ drivers/net/ethernet/marvell/octeontx2/af/npc.h | 107 +-
+ .../ethernet/marvell/octeontx2/af/npc_profile.h | 8675 ++++++++++++--------
+ drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 56 +
+ drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 76 +-
+ .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 168 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 923 ++-
+ .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 617 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 33 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_reg.h | 12 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_struct.h | 85 +-
+ drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 323 +
+ drivers/net/ethernet/marvell/octeontx2/nic/cn10k.h | 11 +
+ .../ethernet/marvell/octeontx2/nic/otx2_common.h | 39 +-
+ .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 6 +
+ .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 192 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 143 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 303 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 58 +-
+ drivers/net/ethernet/marvell/prestera/Makefile | 3 +-
+ drivers/net/ethernet/marvell/prestera/prestera.h | 39 +-
+ .../net/ethernet/marvell/prestera/prestera_acl.c | 376 +
+ .../net/ethernet/marvell/prestera/prestera_acl.h | 124 +
+ .../ethernet/marvell/prestera/prestera_devlink.c | 530 +-
+ .../ethernet/marvell/prestera/prestera_devlink.h | 3 +
+ .../net/ethernet/marvell/prestera/prestera_dsa.c | 3 +
+ .../net/ethernet/marvell/prestera/prestera_dsa.h | 1 +
+ .../net/ethernet/marvell/prestera/prestera_flow.c | 194 +
+ .../net/ethernet/marvell/prestera/prestera_flow.h | 14 +
+ .../ethernet/marvell/prestera/prestera_flower.c | 359 +
+ .../ethernet/marvell/prestera/prestera_flower.h | 18 +
+ .../net/ethernet/marvell/prestera/prestera_hw.c | 661 +-
+ .../net/ethernet/marvell/prestera/prestera_hw.h | 51 +-
+ .../net/ethernet/marvell/prestera/prestera_main.c | 301 +-
+ .../net/ethernet/marvell/prestera/prestera_pci.c | 104 +-
+ .../net/ethernet/marvell/prestera/prestera_rxtx.c | 7 +-
+ .../net/ethernet/marvell/prestera/prestera_span.c | 239 +
+ .../net/ethernet/marvell/prestera/prestera_span.h | 20 +
+ .../ethernet/marvell/prestera/prestera_switchdev.c | 180 +-
+ .../ethernet/marvell/prestera/prestera_switchdev.h | 7 +-
+ drivers/net/ethernet/marvell/pxa168_eth.c | 2 +-
+ drivers/net/ethernet/marvell/skge.h | 2 +-
+ drivers/net/ethernet/marvell/sky2.c | 32 +-
+ drivers/net/ethernet/marvell/sky2.h | 8 +-
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 19 +-
+ drivers/net/ethernet/mellanox/mlx5/core/Makefile | 3 +-
+ drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 10 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en.h | 8 +-
+ .../net/ethernet/mellanox/mlx5/core/en/params.c | 8 +-
+ .../ethernet/mellanox/mlx5/core/en/rep/bridge.c | 424 +
+ .../ethernet/mellanox/mlx5/core/en/rep/bridge.h | 21 +
+ .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 58 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h | 23 +-
+ .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 38 +-
+ .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 17 +-
+ .../mellanox/mlx5/core/en_accel/en_accel.h | 4 +-
+ .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 65 +-
+ .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 37 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/ktls.c | 11 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/ktls.h | 24 +
+ .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 5 +-
+ .../mellanox/mlx5/core/en_accel/ktls_txrx.h | 2 +-
+ .../net/ethernet/mellanox/mlx5/core/en_accel/tls.c | 6 +-
+ .../net/ethernet/mellanox/mlx5/core/en_accel/tls.h | 10 +-
+ .../mellanox/mlx5/core/en_accel/tls_rxtx.c | 8 +-
+ .../mellanox/mlx5/core/en_accel/tls_stats.c | 4 +-
+ .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 26 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 11 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 6 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 17 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 86 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 8 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 17 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eq.c | 179 +-
+ .../net/ethernet/mellanox/mlx5/core/esw/bridge.c | 1299 +++
+ .../net/ethernet/mellanox/mlx5/core/esw/bridge.h | 53 +
+ .../ethernet/mellanox/mlx5/core/esw/bridge_priv.h | 53 +
+ .../mlx5/core/esw/diag/bridge_tracepoint.h | 113 +
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 7 +
+ .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 19 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 58 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h | 6 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 66 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 1 +
+ .../net/ethernet/mellanox/mlx5/core/fs_ft_pool.c | 85 +
+ .../net/ethernet/mellanox/mlx5/core/fs_ft_pool.h | 21 +
+ drivers/net/ethernet/mellanox/mlx5/core/fw.c | 6 +
+ .../ethernet/mellanox/mlx5/core/ipoib/ethtool.c | 2 +
+ drivers/net/ethernet/mellanox/mlx5/core/lag.c | 295 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lag.h | 3 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h | 3 +-
+ .../ethernet/mellanox/mlx5/core/lib/fs_chains.c | 94 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lib/sf.h | 45 +
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 3 +
+ .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 25 +-
+ drivers/net/ethernet/mellanox/mlx5/core/mlx5_irq.h | 35 +
+ drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 608 +-
+ .../net/ethernet/mellanox/mlx5/core/sf/hw_table.c | 1 -
+ drivers/net/ethernet/mellanox/mlx5/core/sf/sf.h | 37 +-
+ drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 1 +
+ .../mellanox/mlx5/core/steering/dr_action.c | 187 +-
+ .../ethernet/mellanox/mlx5/core/steering/dr_cmd.c | 7 +-
+ .../ethernet/mellanox/mlx5/core/steering/dr_ste.h | 1 +
+ .../mellanox/mlx5/core/steering/dr_ste_v0.c | 5 +-
+ .../mellanox/mlx5/core/steering/dr_ste_v1.c | 120 +-
+ .../mellanox/mlx5/core/steering/dr_types.h | 23 +-
+ .../ethernet/mellanox/mlx5/core/steering/fs_dr.c | 26 +-
+ .../ethernet/mellanox/mlx5/core/steering/mlx5dr.h | 3 +
+ drivers/net/ethernet/mellanox/mlxsw/Kconfig | 22 -
+ drivers/net/ethernet/mellanox/mlxsw/Makefile | 4 -
+ drivers/net/ethernet/mellanox/mlxsw/core.c | 10 +-
+ drivers/net/ethernet/mellanox/mlxsw/core_env.c | 87 +-
+ drivers/net/ethernet/mellanox/mlxsw/core_env.h | 7 +
+ drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c | 6 +-
+ drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 97 +-
+ drivers/net/ethernet/mellanox/mlxsw/ib.h | 9 -
+ drivers/net/ethernet/mellanox/mlxsw/minimal.c | 17 +
+ drivers/net/ethernet/mellanox/mlxsw/pci.c | 5 -
+ drivers/net/ethernet/mellanox/mlxsw/pci.h | 3 -
+ drivers/net/ethernet/mellanox/mlxsw/reg.h | 124 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 5 +
+ .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 6 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 14 +
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 3 +
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 378 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 1 -
+ .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 4 +
+ drivers/net/ethernet/mellanox/mlxsw/switchib.c | 595 --
+ drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 1691 ----
+ drivers/net/ethernet/micrel/ks8842.c | 4 +
+ drivers/net/ethernet/micrel/ks8851_common.c | 15 +-
+ drivers/net/ethernet/micrel/ksz884x.c | 111 +-
+ drivers/net/ethernet/microsoft/mana/mana_en.c | 3 +-
+ drivers/net/ethernet/moxa/moxart_ether.c | 5 +-
+ drivers/net/ethernet/natsemi/natsemi.c | 6 +-
+ drivers/net/ethernet/neterion/s2io.c | 10 +-
+ drivers/net/ethernet/neterion/vxge/vxge-config.c | 2 +-
+ drivers/net/ethernet/neterion/vxge/vxge-main.c | 36 +-
+ drivers/net/ethernet/netronome/nfp/Makefile | 3 +-
+ drivers/net/ethernet/netronome/nfp/ccm_mbox.c | 2 +-
+ .../net/ethernet/netronome/nfp/flower/conntrack.c | 1180 +++
+ .../net/ethernet/netronome/nfp/flower/conntrack.h | 231 +
+ drivers/net/ethernet/netronome/nfp/flower/main.h | 6 +
+ .../net/ethernet/netronome/nfp/flower/metadata.c | 129 +-
+ .../net/ethernet/netronome/nfp/flower/offload.c | 40 +-
+ .../ethernet/netronome/nfp/flower/tunnel_conf.c | 2 +-
+ .../ethernet/netronome/nfp/nfpcore/nfp_cppcore.c | 3 +-
+ .../net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c | 2 +-
+ drivers/net/ethernet/ni/nixge.c | 8 +-
+ drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 2 -
+ .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 2 +
+ .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 102 +-
+ drivers/net/ethernet/qlogic/Kconfig | 3 +
+ drivers/net/ethernet/qlogic/qed/Makefile | 5 +
+ drivers/net/ethernet/qlogic/qed/qed.h | 14 +
+ drivers/net/ethernet/qlogic/qed/qed_cxt.c | 45 +-
+ drivers/net/ethernet/qlogic/qed/qed_cxt.h | 2 +-
+ drivers/net/ethernet/qlogic/qed/qed_dev.c | 140 +-
+ drivers/net/ethernet/qlogic/qed/qed_hsi.h | 6 +-
+ drivers/net/ethernet/qlogic/qed/qed_iscsi.c | 22 +-
+ drivers/net/ethernet/qlogic/qed/qed_ll2.c | 40 +-
+ drivers/net/ethernet/qlogic/qed/qed_mcp.c | 3 +
+ drivers/net/ethernet/qlogic/qed/qed_mng_tlv.c | 3 +-
+ drivers/net/ethernet/qlogic/qed/qed_nvmetcp.c | 829 ++
+ drivers/net/ethernet/qlogic/qed/qed_nvmetcp.h | 103 +
+ .../net/ethernet/qlogic/qed/qed_nvmetcp_fw_funcs.c | 376 +
+ .../net/ethernet/qlogic/qed/qed_nvmetcp_fw_funcs.h | 39 +
+ .../ethernet/qlogic/qed/qed_nvmetcp_ip_services.c | 238 +
+ drivers/net/ethernet/qlogic/qed/qed_ooo.c | 5 +-
+ drivers/net/ethernet/qlogic/qed/qed_sp.h | 5 +
+ drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 3 +-
+ drivers/net/ethernet/qlogic/qede/qede_rdma.c | 6 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 2 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c | 2 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 8 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h | 1 -
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 7 +-
+ drivers/net/ethernet/qualcomm/qca_debug.c | 1 +
+ drivers/net/ethernet/qualcomm/qca_spi.c | 10 +-
+ drivers/net/ethernet/qualcomm/qca_spi.h | 1 +
+ drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 6 +-
+ drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h | 5 +-
+ .../net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 43 +-
+ drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h | 11 +-
+ .../net/ethernet/qualcomm/rmnet/rmnet_map_data.c | 434 +-
+ drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 2 +
+ drivers/net/ethernet/rdc/r6040.c | 9 +-
+ drivers/net/ethernet/realtek/8139cp.c | 6 +-
+ drivers/net/ethernet/realtek/8139too.c | 6 +-
+ drivers/net/ethernet/realtek/atp.c | 4 +-
+ drivers/net/ethernet/realtek/r8169_main.c | 10 +-
+ drivers/net/ethernet/renesas/ravb_main.c | 15 +-
+ drivers/net/ethernet/renesas/sh_eth.c | 5 +-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 4 +-
+ drivers/net/ethernet/seeq/ether3.c | 10 +-
+ drivers/net/ethernet/sfc/ef10.c | 17 +-
+ drivers/net/ethernet/sfc/efx.c | 19 +-
+ drivers/net/ethernet/sfc/efx_common.c | 12 +-
+ drivers/net/ethernet/sfc/falcon/efx.c | 4 +-
+ drivers/net/ethernet/sfc/falcon/falcon_boards.c | 10 +-
+ drivers/net/ethernet/sfc/farch.c | 13 +-
+ drivers/net/ethernet/sgi/ioc3-eth.c | 4 +
+ drivers/net/ethernet/sis/sis900.c | 22 +-
+ drivers/net/ethernet/smsc/smc9194.c | 42 +-
+ drivers/net/ethernet/smsc/smc91x.c | 14 +-
+ drivers/net/ethernet/socionext/sni_ave.c | 2 +-
+ drivers/net/ethernet/stmicro/stmmac/Kconfig | 21 +
+ drivers/net/ethernet/stmicro/stmmac/Makefile | 2 +
+ drivers/net/ethernet/stmicro/stmmac/common.h | 3 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-ingenic.c | 398 +
+ drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 103 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-intel.h | 29 +
+ .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 219 +
+ .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 207 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 1 +
+ drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 30 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac5.h | 3 +-
+ .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/hwif.h | 15 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac.h | 7 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 8 +
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 82 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 74 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 16 +
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 9 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 4 +-
+ drivers/net/ethernet/sun/cassini.c | 2 +-
+ drivers/net/ethernet/sun/sungem.c | 20 +-
+ drivers/net/ethernet/sun/sunhme.c | 6 +-
+ drivers/net/ethernet/ti/am65-cpts.c | 4 +-
+ drivers/net/ethernet/ti/cpsw-phy-sel.c | 4 +-
+ drivers/net/ethernet/ti/cpsw.c | 7 +-
+ drivers/net/ethernet/ti/cpsw_ale.c | 2 +-
+ drivers/net/ethernet/ti/cpsw_new.c | 7 +-
+ drivers/net/ethernet/ti/davinci_emac.c | 5 +-
+ drivers/net/ethernet/via/via-velocity.c | 6 +-
+ drivers/net/ethernet/wiznet/w5100.c | 7 +-
+ drivers/net/ethernet/xilinx/ll_temac_main.c | 4 +-
+ drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 8 +-
+ drivers/net/ethernet/xilinx/xilinx_emaclite.c | 5 +-
+ drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +-
+ drivers/net/ethernet/xscale/ixp4xx_eth.c | 10 +-
+ drivers/net/fddi/skfp/ess.c | 6 +-
+ drivers/net/fddi/skfp/h/supern_2.h | 2 +-
+ drivers/net/fjes/fjes_main.c | 16 +-
+ drivers/net/gtp.c | 2 +-
+ drivers/net/hamradio/6pack.c | 10 +-
+ drivers/net/hamradio/baycom_epp.c | 4 +-
+ drivers/net/hamradio/bpqether.c | 4 +-
+ drivers/net/hamradio/hdlcdrv.c | 2 +-
+ drivers/net/hamradio/mkiss.c | 6 +-
+ drivers/net/hamradio/scc.c | 20 +-
+ drivers/net/hamradio/yam.c | 2 +-
+ drivers/net/hyperv/hyperv_net.h | 1 +
+ drivers/net/hyperv/rndis_filter.c | 6 +-
+ drivers/net/ifb.c | 4 +-
+ drivers/net/ipa/Makefile | 9 +-
+ drivers/net/ipa/gsi.c | 90 +-
+ drivers/net/ipa/gsi.h | 2 +-
+ drivers/net/ipa/gsi_reg.h | 3 +-
+ drivers/net/ipa/ipa_cmd.c | 40 +-
+ drivers/net/ipa/ipa_data-v3.1.c | 533 ++
+ drivers/net/ipa/ipa_data-v3.5.1.c | 45 +-
+ drivers/net/ipa/ipa_data-v4.11.c | 66 +-
+ drivers/net/ipa/ipa_data-v4.2.c | 54 +-
+ drivers/net/ipa/ipa_data-v4.5.c | 69 +-
+ drivers/net/ipa/ipa_data-v4.9.c | 70 +-
+ drivers/net/ipa/ipa_data.h | 1 +
+ drivers/net/ipa/ipa_endpoint.c | 90 +-
+ drivers/net/ipa/ipa_main.c | 55 +-
+ drivers/net/ipa/ipa_mem.c | 264 +-
+ drivers/net/ipa/ipa_mem.h | 26 +-
+ drivers/net/ipa/ipa_qmi.c | 32 +-
+ drivers/net/ipa/ipa_reg.h | 1 +
+ drivers/net/ipa/ipa_smp2p.c | 5 +-
+ drivers/net/ipa/ipa_sysfs.c | 136 +
+ drivers/net/ipa/ipa_sysfs.h | 15 +
+ drivers/net/ipa/ipa_table.c | 94 +-
+ drivers/net/ipa/ipa_uc.c | 3 +-
+ drivers/net/ipa/ipa_version.h | 2 +
+ drivers/net/macvlan.c | 2 +-
+ drivers/net/mdio/Kconfig | 14 +
+ drivers/net/mdio/Makefile | 4 +-
+ drivers/net/mdio/acpi_mdio.c | 58 +
+ drivers/net/mdio/fwnode_mdio.c | 166 +
+ drivers/net/mdio/mdio-bcm-unimac.c | 2 +-
+ drivers/net/mdio/mdio-ipq8064.c | 70 +-
+ drivers/net/mdio/mdio-mscc-miim.c | 6 +-
+ drivers/net/mdio/mdio-mux-bcm-iproc.c | 9 +-
+ drivers/net/mdio/mdio-mux-meson-g12a.c | 2 +-
+ drivers/net/mdio/of_mdio.c | 149 +-
+ drivers/net/mhi/net.c | 133 +-
+ drivers/net/mhi/proto_mbim.c | 5 +-
+ drivers/net/mii.c | 2 +-
+ drivers/net/netdevsim/bus.c | 129 +-
+ drivers/net/netdevsim/dev.c | 404 +-
+ drivers/net/netdevsim/netdev.c | 95 +-
+ drivers/net/netdevsim/netdevsim.h | 49 +
+ drivers/net/pcs/Makefile | 4 +-
+ drivers/net/pcs/pcs-xpcs-nxp.c | 185 +
+ drivers/net/pcs/pcs-xpcs.c | 659 +-
+ drivers/net/pcs/pcs-xpcs.h | 115 +
+ drivers/net/phy/Kconfig | 16 +-
+ drivers/net/phy/Makefile | 2 +
+ drivers/net/phy/adin.c | 2 +-
+ drivers/net/phy/at803x.c | 162 +-
+ drivers/net/phy/ax88796b.c | 74 +-
+ drivers/net/phy/bcm87xx.c | 4 +-
+ drivers/net/phy/davicom.c | 6 +-
+ drivers/net/phy/dp83640.c | 5 +-
+ drivers/net/phy/et1011c.c | 15 +-
+ drivers/net/phy/fixed_phy.c | 4 +-
+ drivers/net/phy/lxt.c | 4 +-
+ drivers/net/phy/marvell.c | 40 +-
+ drivers/net/phy/mdio_bus.c | 4 +-
+ drivers/net/phy/mdio_device.c | 4 +-
+ drivers/net/phy/mediatek-ge.c | 112 +
+ drivers/net/phy/micrel.c | 410 +-
+ drivers/net/phy/mii_timestamper.c | 3 +
+ drivers/net/phy/motorcomm.c | 137 +
+ drivers/net/phy/national.c | 6 +-
+ drivers/net/phy/nxp-c45-tja11xx.c | 537 +-
+ drivers/net/phy/phy-c45.c | 2 +-
+ drivers/net/phy/phy-core.c | 3 +-
+ drivers/net/phy/phy.c | 6 +-
+ drivers/net/phy/phy_device.c | 132 +-
+ drivers/net/phy/phylink.c | 60 +-
+ drivers/net/phy/qsemi.c | 1 +
+ drivers/net/phy/realtek.c | 76 +-
+ drivers/net/phy/rockchip.c | 2 +-
+ drivers/net/phy/sfp-bus.c | 33 +-
+ drivers/net/phy/sfp.c | 2 +-
+ drivers/net/phy/spi_ks8995.c | 10 +-
+ drivers/net/phy/ste10Xp.c | 6 +-
+ drivers/net/phy/vitesse.c | 3 +-
+ drivers/net/ppp/bsd_comp.c | 2 +-
+ drivers/net/slip/slhc.c | 2 +-
+ drivers/net/tun.c | 16 +-
+ drivers/net/usb/Kconfig | 12 +-
+ drivers/net/usb/asix.h | 13 +-
+ drivers/net/usb/asix_common.c | 106 +-
+ drivers/net/usb/asix_devices.c | 202 +-
+ drivers/net/usb/ax88172a.c | 21 +-
+ drivers/net/usb/cdc_ether.c | 2 +-
+ drivers/net/usb/cdc_mbim.c | 7 +-
+ drivers/net/usb/cdc_ncm.c | 40 +-
+ drivers/net/usb/hso.c | 7 +-
+ drivers/net/usb/huawei_cdc_ncm.c | 1 +
+ drivers/net/usb/int51x1.c | 2 +-
+ drivers/net/usb/lan78xx.c | 2 +-
+ drivers/net/usb/lg-vl600.c | 4 +-
+ drivers/net/usb/mcs7830.c | 2 +-
+ drivers/net/usb/qmi_wwan.c | 3 +-
+ drivers/net/usb/r8152.c | 97 +-
+ drivers/net/usb/rndis_host.c | 2 +-
+ drivers/net/usb/usbnet.c | 6 +-
+ drivers/net/virtio_net.c | 53 +-
+ drivers/net/vrf.c | 2 +-
+ drivers/net/wan/Kconfig | 4 +-
+ drivers/net/wan/c101.c | 46 +-
+ drivers/net/wan/cosa.c | 493 +-
+ drivers/net/wan/farsync.c | 487 +-
+ drivers/net/wan/fsl_ucc_hdlc.c | 3 +-
+ drivers/net/wan/hd64570.c | 124 +-
+ drivers/net/wan/hd64572.c | 95 +-
+ drivers/net/wan/hdlc.c | 63 +-
+ drivers/net/wan/hdlc_cisco.c | 49 +-
+ drivers/net/wan/hdlc_fr.c | 101 +-
+ drivers/net/wan/hdlc_ppp.c | 38 +-
+ drivers/net/wan/hdlc_x25.c | 77 +-
+ drivers/net/wan/hostess_sv11.c | 113 +-
+ drivers/net/wan/ixp4xx_hss.c | 144 +-
+ drivers/net/wan/lapbether.c | 65 +-
+ drivers/net/wan/lmc/lmc.h | 2 +-
+ drivers/net/wan/n2.c | 56 +-
+ drivers/net/wan/pc300too.c | 52 +-
+ drivers/net/wan/pci200syn.c | 51 +-
+ drivers/net/wan/sealevel.c | 126 +-
+ drivers/net/wan/wanxl.c | 190 +-
+ drivers/net/wan/z85230.c | 995 +--
+ drivers/net/wireless/ath/ath10k/ahb.c | 9 +-
+ drivers/net/wireless/ath/ath10k/core.h | 2 +-
+ drivers/net/wireless/ath/ath10k/debug.c | 4 +-
+ drivers/net/wireless/ath/ath10k/htt.h | 4 +-
+ drivers/net/wireless/ath/ath10k/htt_rx.c | 2 -
+ drivers/net/wireless/ath/ath10k/mac.c | 1 +
+ drivers/net/wireless/ath/ath10k/pci.c | 14 +-
+ drivers/net/wireless/ath/ath10k/pci.h | 1 -
+ drivers/net/wireless/ath/ath10k/wmi.c | 6 +-
+ drivers/net/wireless/ath/ath10k/wmi.h | 9 +-
+ drivers/net/wireless/ath/ath11k/core.c | 47 +-
+ drivers/net/wireless/ath/ath11k/core.h | 5 +-
+ .../net/wireless/ath/ath11k/debugfs_htt_stats.c | 2 +-
+ .../net/wireless/ath/ath11k/debugfs_htt_stats.h | 2 +-
+ drivers/net/wireless/ath/ath11k/dp.c | 16 +-
+ drivers/net/wireless/ath/ath11k/hal.c | 10 +
+ drivers/net/wireless/ath/ath11k/hal.h | 3 +-
+ drivers/net/wireless/ath/ath11k/hal_rx.c | 42 +-
+ drivers/net/wireless/ath/ath11k/hal_rx.h | 8 +
+ drivers/net/wireless/ath/ath11k/hw.c | 391 +
+ drivers/net/wireless/ath/ath11k/hw.h | 5 +
+ drivers/net/wireless/ath/ath11k/mac.c | 10 +-
+ drivers/net/wireless/ath/ath11k/mhi.c | 1 +
+ drivers/net/wireless/ath/ath11k/pci.c | 47 +-
+ drivers/net/wireless/ath/ath11k/rx_desc.h | 87 +
+ drivers/net/wireless/ath/ath11k/wmi.c | 4 +-
+ drivers/net/wireless/ath/ath11k/wmi.h | 4 +-
+ drivers/net/wireless/ath/ath5k/pcu.c | 2 +-
+ drivers/net/wireless/ath/ath6kl/cfg80211.c | 4 +-
+ drivers/net/wireless/ath/ath9k/ar9003_mac.c | 2 +
+ drivers/net/wireless/ath/ath9k/main.c | 5 +
+ drivers/net/wireless/ath/carl9170/Kconfig | 8 +-
+ drivers/net/wireless/ath/hw.c | 2 +-
+ drivers/net/wireless/ath/wcn36xx/dxe.c | 2 +-
+ drivers/net/wireless/ath/wcn36xx/hal.h | 20 +-
+ drivers/net/wireless/ath/wcn36xx/main.c | 131 +-
+ drivers/net/wireless/ath/wcn36xx/smd.c | 267 +
+ drivers/net/wireless/ath/wcn36xx/smd.h | 17 +
+ drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 14 +
+ drivers/net/wireless/ath/wil6210/cfg80211.c | 2 -
+ drivers/net/wireless/ath/wil6210/interrupt.c | 2 +-
+ drivers/net/wireless/ath/wil6210/wmi.c | 6 +-
+ drivers/net/wireless/broadcom/b43/phy_n.c | 47 -
+ drivers/net/wireless/broadcom/b43legacy/dma.c | 13 -
+ drivers/net/wireless/broadcom/b43legacy/main.c | 2 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c | 54 +-
+ .../broadcom/brcm80211/brcmfmac/firmware.h | 7 +
+ .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 2 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 4 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 19 +-
+ .../wireless/broadcom/brcm80211/brcmsmac/aiutils.c | 3 -
+ .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 8 +-
+ .../wireless/broadcom/brcm80211/brcmsmac/main.c | 3 +-
+ .../net/wireless/broadcom/brcm80211/brcmsmac/stf.h | 1 -
+ drivers/net/wireless/intel/ipw2x00/ipw2100.c | 2 +-
+ drivers/net/wireless/marvell/libertas/main.c | 2 +-
+ drivers/net/wireless/marvell/libertas/mesh.c | 149 +-
+ drivers/net/wireless/marvell/libertas_tf/if_usb.c | 2 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/soc.c | 3 +-
+ drivers/net/wireless/microchip/wilc1000/spi.c | 2 +-
+ drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 2 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 5 +-
+ .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.c | 20 +-
+ drivers/net/wireless/realtek/rtlwifi/cam.c | 2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/mac.c | 4 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/trx.c | 2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 2 +-
+ drivers/net/wireless/rndis_wlan.c | 5 +-
+ drivers/net/wireless/rsi/rsi_91x_hal.c | 6 +-
+ drivers/net/wireless/rsi/rsi_91x_mac80211.c | 20 +-
+ drivers/net/wireless/rsi/rsi_91x_mgmt.c | 7 +-
+ drivers/net/wireless/rsi/rsi_main.h | 1 -
+ drivers/net/wireless/st/cw1200/cw1200_sdio.c | 1 +
+ drivers/net/wireless/st/cw1200/scan.c | 17 +-
+ drivers/net/wireless/ti/wl1251/cmd.c | 17 +-
+ drivers/net/wireless/ti/wl12xx/main.c | 7 +
+ drivers/net/wireless/ti/wlcore/cmd.c | 6 +-
+ drivers/net/wireless/ti/wlcore/event.c | 67 +-
+ drivers/net/wireless/ti/wlcore/main.c | 4 +-
+ drivers/net/wireless/ti/wlcore/sysfs.c | 24 +-
+ drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 4 +-
+ drivers/net/wwan/Kconfig | 53 +-
+ drivers/net/wwan/Makefile | 6 +-
+ drivers/net/wwan/iosm/Makefile | 23 +
+ drivers/net/wwan/iosm/iosm_ipc_chnl_cfg.c | 88 +
+ drivers/net/wwan/iosm/iosm_ipc_chnl_cfg.h | 59 +
+ drivers/net/wwan/iosm/iosm_ipc_imem.c | 1363 +++
+ drivers/net/wwan/iosm/iosm_ipc_imem.h | 579 ++
+ drivers/net/wwan/iosm/iosm_ipc_imem_ops.c | 346 +
+ drivers/net/wwan/iosm/iosm_ipc_imem_ops.h | 101 +
+ drivers/net/wwan/iosm/iosm_ipc_irq.c | 90 +
+ drivers/net/wwan/iosm/iosm_ipc_irq.h | 33 +
+ drivers/net/wwan/iosm/iosm_ipc_mmio.c | 223 +
+ drivers/net/wwan/iosm/iosm_ipc_mmio.h | 183 +
+ drivers/net/wwan/iosm/iosm_ipc_mux.c | 455 +
+ drivers/net/wwan/iosm/iosm_ipc_mux.h | 343 +
+ drivers/net/wwan/iosm/iosm_ipc_mux_codec.c | 910 ++
+ drivers/net/wwan/iosm/iosm_ipc_mux_codec.h | 193 +
+ drivers/net/wwan/iosm/iosm_ipc_pcie.c | 580 ++
+ drivers/net/wwan/iosm/iosm_ipc_pcie.h | 209 +
+ drivers/net/wwan/iosm/iosm_ipc_pm.c | 333 +
+ drivers/net/wwan/iosm/iosm_ipc_pm.h | 207 +
+ drivers/net/wwan/iosm/iosm_ipc_port.c | 85 +
+ drivers/net/wwan/iosm/iosm_ipc_port.h | 50 +
+ drivers/net/wwan/iosm/iosm_ipc_protocol.c | 283 +
+ drivers/net/wwan/iosm/iosm_ipc_protocol.h | 237 +
+ drivers/net/wwan/iosm/iosm_ipc_protocol_ops.c | 552 ++
+ drivers/net/wwan/iosm/iosm_ipc_protocol_ops.h | 444 +
+ drivers/net/wwan/iosm/iosm_ipc_task_queue.c | 202 +
+ drivers/net/wwan/iosm/iosm_ipc_task_queue.h | 97 +
+ drivers/net/wwan/iosm/iosm_ipc_uevent.c | 44 +
+ drivers/net/wwan/iosm/iosm_ipc_uevent.h | 41 +
+ drivers/net/wwan/iosm/iosm_ipc_wwan.c | 340 +
+ drivers/net/wwan/iosm/iosm_ipc_wwan.h | 55 +
+ drivers/net/wwan/rpmsg_wwan_ctrl.c | 166 +
+ drivers/net/wwan/wwan_core.c | 638 +-
+ drivers/net/wwan/wwan_hwsim.c | 547 ++
+ drivers/nfc/fdp/fdp.c | 42 +-
+ drivers/nfc/fdp/fdp.h | 1 -
+ drivers/nfc/fdp/i2c.c | 14 +-
+ drivers/nfc/mei_phy.c | 8 -
+ drivers/nfc/microread/microread.c | 1 -
+ drivers/nfc/nfcmrvl/fw_dnld.c | 25 +-
+ drivers/nfc/nfcmrvl/fw_dnld.h | 15 +-
+ drivers/nfc/nfcmrvl/i2c.c | 22 +-
+ drivers/nfc/nfcmrvl/main.c | 13 +-
+ drivers/nfc/nfcmrvl/nfcmrvl.h | 27 +-
+ drivers/nfc/nfcmrvl/spi.c | 17 +-
+ drivers/nfc/nfcmrvl/uart.c | 47 +-
+ drivers/nfc/nfcmrvl/usb.c | 29 +-
+ drivers/nfc/nxp-nci/core.c | 39 +-
+ drivers/nfc/nxp-nci/firmware.c | 7 +-
+ drivers/nfc/pn533/i2c.c | 10 +-
+ drivers/nfc/pn533/pn533.c | 46 -
+ drivers/nfc/pn533/uart.c | 2 +-
+ drivers/nfc/pn533/usb.c | 4 -
+ drivers/nfc/pn544/i2c.c | 11 +-
+ drivers/nfc/port100.c | 4 +-
+ drivers/nfc/s3fwrn5/i2c.c | 32 +-
+ drivers/nfc/st-nci/i2c.c | 9 +-
+ drivers/nfc/st-nci/se.c | 14 +-
+ drivers/nfc/st-nci/spi.c | 9 +-
+ drivers/nfc/st-nci/vendor_cmds.c | 15 +-
+ drivers/nfc/st21nfca/dep.c | 59 +-
+ drivers/nfc/st21nfca/i2c.c | 9 +-
+ drivers/nfc/st95hf/core.c | 13 +-
+ drivers/ptp/ptp_clock.c | 21 -
+ drivers/rpmsg/rpmsg_core.c | 4 +-
+ drivers/s390/net/netiucv.c | 28 +-
+ drivers/s390/net/qeth_core.h | 42 +-
+ drivers/s390/net/qeth_core_main.c | 349 +-
+ drivers/s390/net/qeth_ethtool.c | 7 +-
+ drivers/s390/net/qeth_l2_main.c | 12 +-
+ drivers/ssb/driver_gpio.c | 6 +-
+ drivers/ssb/driver_pcicore.c | 18 +-
+ drivers/ssb/main.c | 36 +-
+ drivers/ssb/pci.c | 16 +-
+ drivers/ssb/pcmcia.c | 16 +-
+ drivers/ssb/scan.c | 1 +
+ drivers/ssb/sdio.c | 1 -
+ drivers/staging/mt7621-dts/mt7621.dtsi | 4 +
+ drivers/usb/class/cdc-wdm.c | 181 +-
+ drivers/vhost/net.c | 6 +-
+ drivers/vhost/vsock.c | 56 +-
+ include/linux/acpi.h | 7 +
+ include/linux/acpi_mdio.h | 26 +
+ include/linux/avf/virtchnl.h | 29 +-
+ include/linux/bpf.h | 42 +-
+ include/linux/bpf_local_storage.h | 4 +-
+ include/linux/bpf_types.h | 2 +
+ include/linux/bpf_verifier.h | 9 +
+ include/linux/bpfptr.h | 75 +
+ include/linux/btf.h | 2 +-
+ include/linux/device.h | 1 +
+ include/linux/dsa/8021q.h | 79 +-
+ include/linux/dsa/sja1105.h | 26 +-
+ include/linux/ethtool.h | 12 +-
+ include/linux/filter.h | 21 +-
+ include/linux/fwnode_mdio.h | 47 +
+ include/linux/if_arp.h | 1 +
+ include/linux/if_bridge.h | 8 +
+ include/linux/if_rmnet.h | 32 +-
+ include/linux/kernel.h | 12 +
+ include/linux/micrel_phy.h | 16 +
+ include/linux/mlx5/device.h | 10 +
+ include/linux/mlx5/driver.h | 2 +
+ include/linux/mlx5/eq.h | 1 +
+ include/linux/mlx5/eswitch.h | 17 +-
+ include/linux/mlx5/fs.h | 14 +-
+ include/linux/mlx5/mlx5_ifc.h | 44 +-
+ include/linux/mm.h | 11 +-
+ include/linux/mm_types.h | 7 +
+ include/linux/mod_devicetable.h | 1 +
+ include/linux/netdev_features.h | 2 +-
+ include/linux/netdevice.h | 2 +-
+ include/linux/netfilter.h | 12 +-
+ include/linux/netfilter/nfnetlink.h | 1 +
+ include/linux/netfilter/x_tables.h | 2 +-
+ include/linux/of_mdio.h | 7 +
+ include/linux/pcs/pcs-xpcs.h | 46 +-
+ include/linux/phy.h | 40 +
+ include/linux/phylink.h | 3 +
+ include/linux/poison.h | 3 +
+ include/linux/ptp_clock_kernel.h | 34 +-
+ include/linux/qed/common_hsi.h | 2 +-
+ include/linux/qed/nvmetcp_common.h | 531 ++
+ include/linux/qed/qed_if.h | 18 +
+ include/linux/qed/qed_ll2_if.h | 2 +-
+ include/linux/qed/qed_nvmetcp_if.h | 240 +
+ include/linux/qed/qed_nvmetcp_ip_services_if.h | 29 +
+ include/linux/sctp.h | 7 +
+ include/linux/skbuff.h | 39 +-
+ include/linux/stmmac.h | 16 +
+ include/linux/usb/cdc-wdm.h | 3 +-
+ include/linux/virtio_vsock.h | 10 +
+ include/linux/wwan.h | 71 +-
+ include/net/af_vsock.h | 8 +
+ include/net/bonding.h | 2 +-
+ include/net/devlink.h | 58 +
+ include/net/dsa.h | 23 +-
+ include/net/ip_fib.h | 43 +
+ include/net/ipv6.h | 8 +
+ include/net/mptcp.h | 10 +-
+ include/net/net_namespace.h | 4 +
+ include/net/netfilter/nf_conntrack.h | 7 +
+ include/net/netfilter/nf_conntrack_l4proto.h | 20 +-
+ include/net/netfilter/nf_flow_table.h | 2 +
+ include/net/netfilter/nf_tables.h | 34 +-
+ include/net/netfilter/nf_tables_core.h | 32 +
+ include/net/netfilter/nf_tables_ipv4.h | 40 +-
+ include/net/netfilter/nf_tables_ipv6.h | 42 +-
+ include/net/netns/conntrack.h | 8 +
+ include/net/netns/ipv4.h | 2 +
+ include/net/netns/ipv6.h | 3 +-
+ include/net/netns/sctp.h | 3 +
+ include/net/netns/smc.h | 16 +
+ include/net/page_pool.h | 9 +
+ include/net/protocol.h | 1 -
+ include/net/rtnetlink.h | 8 +
+ include/net/sch_generic.h | 31 +-
+ include/net/sctp/command.h | 1 +
+ include/net/sctp/constants.h | 20 +
+ include/net/sctp/sctp.h | 57 +-
+ include/net/sctp/sm.h | 6 +-
+ include/net/sctp/structs.h | 19 +
+ include/net/sock.h | 3 +
+ include/net/sock_reuseport.h | 9 +-
+ include/net/tc_act/tc_vlan.h | 1 +
+ include/net/tcp.h | 4 +
+ include/net/tls.h | 2 -
+ include/net/xdp.h | 1 +
+ include/net/xfrm.h | 1 +
+ include/trace/events/mptcp.h | 17 +-
+ include/trace/events/tcp.h | 76 +
+ .../trace/events/vsock_virtio_transport_common.h | 5 +-
+ include/trace/events/xdp.h | 6 +-
+ include/uapi/linux/bpf.h | 82 +-
+ include/uapi/linux/can.h | 13 +-
+ include/uapi/linux/devlink.h | 17 +
+ include/uapi/linux/ethtool.h | 4 +-
+ include/uapi/linux/ethtool_netlink.h | 2 +-
+ include/uapi/linux/icmp.h | 3 +-
+ include/uapi/linux/if_bridge.h | 2 +
+ include/uapi/linux/if_link.h | 9 +
+ include/uapi/linux/mptcp.h | 1 +
+ include/uapi/linux/netfilter/nf_tables.h | 17 +
+ include/uapi/linux/netfilter/nfnetlink.h | 3 +-
+ include/uapi/linux/netfilter/nfnetlink_hook.h | 55 +
+ include/uapi/linux/netlink.h | 5 +-
+ include/uapi/linux/sctp.h | 8 +
+ include/uapi/linux/seg6_local.h | 2 +
+ include/uapi/linux/smc.h | 83 +
+ include/uapi/linux/snmp.h | 2 +
+ include/uapi/linux/virtio_vsock.h | 9 +
+ include/uapi/linux/wwan.h | 16 +
+ kernel/bpf/bpf_inode_storage.c | 2 +-
+ kernel/bpf/bpf_iter.c | 13 +-
+ kernel/bpf/bpf_lsm.c | 2 +-
+ kernel/bpf/btf.c | 76 +-
+ kernel/bpf/core.c | 61 +-
+ kernel/bpf/cpumap.c | 3 +-
+ kernel/bpf/devmap.c | 305 +-
+ kernel/bpf/hashtab.c | 102 +-
+ kernel/bpf/preload/iterators/iterators.bpf.c | 1 -
+ kernel/bpf/reuseport_array.c | 2 +-
+ kernel/bpf/syscall.c | 241 +-
+ kernel/bpf/tnum.c | 41 +-
+ kernel/bpf/trampoline.c | 2 +-
+ kernel/bpf/verifier.c | 357 +-
+ net/8021q/vlan.c | 3 +-
+ net/8021q/vlan.h | 6 +-
+ net/8021q/vlan_dev.c | 6 +-
+ net/9p/trans_virtio.c | 6 +-
+ net/appletalk/ddp.c | 6 +-
+ net/atm/atm_sysfs.c | 24 +-
+ net/atm/br2684.c | 4 +-
+ net/atm/resources.c | 7 +-
+ net/batman-adv/bat_iv_ogm.c | 6 +
+ net/batman-adv/bat_v.c | 10 +
+ net/batman-adv/bridge_loop_avoidance.c | 4 +-
+ net/batman-adv/bridge_loop_avoidance.h | 1 -
+ net/batman-adv/hard-interface.c | 65 +-
+ net/batman-adv/hard-interface.h | 3 +-
+ net/batman-adv/hash.h | 2 +-
+ net/batman-adv/main.h | 3 +-
+ net/batman-adv/multicast.c | 41 +-
+ net/batman-adv/netlink.c | 8 +
+ net/batman-adv/routing.c | 9 +-
+ net/batman-adv/send.c | 374 +-
+ net/batman-adv/send.h | 12 +-
+ net/batman-adv/soft-interface.c | 49 +-
+ net/batman-adv/soft-interface.h | 2 -
+ net/bluetooth/hci_conn.c | 2 +-
+ net/bluetooth/hci_core.c | 8 +-
+ net/bluetooth/hci_event.c | 2 +-
+ net/bluetooth/hci_sock.c | 6 +-
+ net/bluetooth/mgmt.c | 2 +-
+ net/bluetooth/smp.c | 6 +-
+ net/bpf/test_run.c | 45 +-
+ net/bridge/br_cfm.c | 2 +-
+ net/bridge/br_forward.c | 5 +-
+ net/bridge/br_input.c | 2 +-
+ net/bridge/br_mdb.c | 57 +-
+ net/bridge/br_mrp.c | 6 +-
+ net/bridge/br_multicast.c | 445 +-
+ net/bridge/br_netlink.c | 1 -
+ net/bridge/br_private.h | 70 +-
+ net/bridge/br_vlan.c | 4 +-
+ net/caif/cfcnfg.c | 2 +-
+ net/caif/chnl_net.c | 2 -
+ net/can/isotp.c | 20 +-
+ net/can/proc.c | 6 +-
+ net/core/bpf_sk_storage.c | 3 +-
+ net/core/dev.c | 38 +-
+ net/core/devlink.c | 716 +-
+ net/core/filter.c | 82 +-
+ net/core/flow_dissector.c | 4 +-
+ net/core/neighbour.c | 2 +-
+ net/core/net-traces.c | 1 +
+ net/core/netpoll.c | 4 +-
+ net/core/page_pool.c | 28 +
+ net/core/pktgen.c | 38 +-
+ net/core/rtnetlink.c | 64 +-
+ net/core/skbuff.c | 20 +-
+ net/core/sock.c | 97 +-
+ net/core/sock_reuseport.c | 366 +-
+ net/core/xdp.c | 28 +
+ net/dcb/dcbnl.c | 6 +-
+ net/dccp/ccids/lib/tfrc_equation.c | 1 +
+ net/dccp/ipv4.c | 1 -
+ net/decnet/dn_nsp_in.c | 2 +-
+ net/decnet/dn_nsp_out.c | 2 +-
+ net/decnet/dn_route.c | 2 +-
+ net/devres.c | 2 +-
+ net/dsa/dsa2.c | 22 +-
+ net/dsa/dsa_priv.h | 9 +-
+ net/dsa/master.c | 6 +-
+ net/dsa/port.c | 4 +-
+ net/dsa/slave.c | 39 +-
+ net/dsa/switch.c | 89 +-
+ net/dsa/tag_8021q.c | 23 +
+ net/dsa/tag_ar9331.c | 2 +-
+ net/dsa/tag_brcm.c | 6 +-
+ net/dsa/tag_dsa.c | 4 +-
+ net/dsa/tag_gswip.c | 2 +-
+ net/dsa/tag_hellcreek.c | 3 +-
+ net/dsa/tag_ksz.c | 9 +-
+ net/dsa/tag_lan9303.c | 2 +-
+ net/dsa/tag_mtk.c | 2 +-
+ net/dsa/tag_ocelot.c | 4 +-
+ net/dsa/tag_ocelot_8021q.c | 20 +-
+ net/dsa/tag_qca.c | 2 +-
+ net/dsa/tag_rtl4_a.c | 2 +-
+ net/dsa/tag_sja1105.c | 312 +-
+ net/dsa/tag_trailer.c | 3 +-
+ net/dsa/tag_xrs700x.c | 3 +-
+ net/ethtool/eeprom.c | 13 +-
+ net/ethtool/netlink.c | 11 +-
+ net/ethtool/netlink.h | 4 +-
+ net/hsr/hsr_framereg.c | 3 +-
+ net/ipv4/af_inet.c | 6 +-
+ net/ipv4/cipso_ipv4.c | 3 +-
+ net/ipv4/devinet.c | 4 +-
+ net/ipv4/fib_frontend.c | 10 +-
+ net/ipv4/fib_lookup.h | 2 +-
+ net/ipv4/gre_demux.c | 1 -
+ net/ipv4/icmp.c | 2 +-
+ net/ipv4/inet_connection_sock.c | 202 +-
+ net/ipv4/inet_diag.c | 12 +-
+ net/ipv4/inet_hashtables.c | 2 +-
+ net/ipv4/ipmr.c | 5 +-
+ net/ipv4/netfilter/nft_reject_ipv4.c | 2 +-
+ net/ipv4/proc.c | 2 +
+ net/ipv4/protocol.c | 6 -
+ net/ipv4/route.c | 127 +-
+ net/ipv4/sysctl_net_ipv4.c | 40 +-
+ net/ipv4/tcp.c | 10 +-
+ net/ipv4/tcp_bpf.c | 13 +-
+ net/ipv4/tcp_fastopen.c | 2 +-
+ net/ipv4/tcp_input.c | 46 +-
+ net/ipv4/tcp_ipv4.c | 23 +-
+ net/ipv4/tcp_minisocks.c | 7 +-
+ net/ipv4/tcp_timer.c | 4 +-
+ net/ipv4/tunnel4.c | 3 -
+ net/ipv4/udp_bpf.c | 12 +-
+ net/ipv4/udplite.c | 1 -
+ net/ipv4/xfrm4_protocol.c | 3 -
+ net/ipv6/addrconf.c | 8 +-
+ net/ipv6/fib6_rules.c | 2 +-
+ net/ipv6/ip6_fib.c | 9 +-
+ net/ipv6/mcast.c | 25 +-
+ net/ipv6/netfilter/ip6_tables.c | 2 +-
+ net/ipv6/netfilter/nft_reject_ipv6.c | 2 +-
+ net/ipv6/output_core.c | 28 +-
+ net/ipv6/route.c | 131 +-
+ net/ipv6/seg6_local.c | 94 +-
+ net/ipv6/sit.c | 2 +-
+ net/ipv6/sysctl_net_ipv6.c | 31 +-
+ net/ipv6/tcp_ipv6.c | 16 +-
+ net/iucv/af_iucv.c | 27 +-
+ net/l2tp/l2tp_ip.c | 3 +-
+ net/l2tp/l2tp_ppp.c | 2 +-
+ net/lapb/lapb_iface.c | 4 +-
+ net/mptcp/ctrl.c | 68 +-
+ net/mptcp/mib.c | 2 +
+ net/mptcp/mib.h | 2 +
+ net/mptcp/mptcp_diag.c | 1 +
+ net/mptcp/options.c | 167 +-
+ net/mptcp/pm.c | 1 +
+ net/mptcp/pm_netlink.c | 28 +-
+ net/mptcp/protocol.c | 226 +-
+ net/mptcp/protocol.h | 37 +-
+ net/mptcp/sockopt.c | 149 +-
+ net/mptcp/subflow.c | 135 +-
+ net/mptcp/token.c | 9 +-
+ net/ncsi/internal.h | 4 +-
+ net/ncsi/ncsi-manage.c | 2 +-
+ net/netfilter/Kconfig | 12 +-
+ net/netfilter/Makefile | 3 +-
+ net/netfilter/ipset/ip_set_core.c | 50 +-
+ net/netfilter/ipvs/Kconfig | 2 +-
+ net/netfilter/nf_conntrack_core.c | 22 +-
+ net/netfilter/nf_conntrack_ecache.c | 8 +-
+ net/netfilter/nf_conntrack_expect.c | 12 +-
+ net/netfilter/nf_conntrack_h323_main.c | 2 +-
+ net/netfilter/nf_conntrack_helper.c | 6 +-
+ net/netfilter/nf_conntrack_netlink.c | 88 +-
+ net/netfilter/nf_conntrack_proto.c | 22 +-
+ net/netfilter/nf_conntrack_proto_dccp.c | 14 +-
+ net/netfilter/nf_conntrack_proto_icmp.c | 7 +-
+ net/netfilter/nf_conntrack_proto_icmpv6.c | 3 +-
+ net/netfilter/nf_conntrack_proto_sctp.c | 2 +-
+ net/netfilter/nf_conntrack_proto_tcp.c | 28 +-
+ net/netfilter/nf_conntrack_proto_udp.c | 11 +-
+ net/netfilter/nf_conntrack_standalone.c | 54 +-
+ net/netfilter/nf_flow_table_core.c | 47 +-
+ net/netfilter/nf_flow_table_offload.c | 4 +-
+ net/netfilter/nf_tables_api.c | 202 +-
+ net/netfilter/nf_tables_core.c | 3 +-
+ net/netfilter/nf_tables_trace.c | 6 +-
+ net/netfilter/nfnetlink.c | 3 +
+ net/netfilter/nfnetlink_acct.c | 9 +-
+ net/netfilter/nfnetlink_cthelper.c | 10 +-
+ net/netfilter/nfnetlink_cttimeout.c | 34 +-
+ net/netfilter/nfnetlink_hook.c | 377 +
+ net/netfilter/nfnetlink_log.c | 5 +-
+ net/netfilter/nfnetlink_queue.c | 9 +-
+ net/netfilter/nft_chain_filter.c | 26 +-
+ net/netfilter/nft_chain_nat.c | 4 +-
+ net/netfilter/nft_chain_route.c | 4 +-
+ net/netfilter/nft_compat.c | 45 +-
+ net/netfilter/nft_exthdr.c | 64 +-
+ net/netfilter/nft_flow_offload.c | 2 +-
+ net/netfilter/nft_last.c | 87 +
+ net/netfilter/nft_lookup.c | 35 +-
+ net/netfilter/nft_objref.c | 4 +-
+ net/netfilter/nft_payload.c | 10 +-
+ net/netfilter/nft_reject_inet.c | 4 +-
+ net/netfilter/nft_set_bitmap.c | 5 +-
+ net/netfilter/nft_set_hash.c | 17 +-
+ net/netfilter/nft_set_pipapo.h | 2 -
+ net/netfilter/nft_set_pipapo_avx2.c | 12 +-
+ net/netfilter/nft_set_pipapo_avx2.h | 2 -
+ net/netfilter/nft_set_rbtree.c | 5 +-
+ net/netfilter/nft_synproxy.c | 4 +-
+ net/netfilter/nft_tproxy.c | 4 +-
+ net/netfilter/xt_AUDIT.c | 2 +-
+ net/netfilter/xt_CT.c | 1 -
+ net/netfilter/xt_limit.c | 46 +-
+ net/netlabel/netlabel_calipso.c | 4 +-
+ net/netlabel/netlabel_cipso_v4.c | 4 +-
+ net/netlabel/netlabel_domainhash.c | 2 +-
+ net/netlabel/netlabel_kapi.c | 2 +-
+ net/netlabel/netlabel_mgmt.c | 27 +-
+ net/netlabel/netlabel_unlabeled.c | 10 +-
+ net/netlabel/netlabel_user.h | 4 +-
+ net/nfc/hci/command.c | 2 +-
+ net/nfc/hci/core.c | 2 +-
+ net/nfc/hci/llc_shdlc.c | 2 +-
+ net/nfc/nci/hci.c | 2 -
+ net/openvswitch/Makefile | 3 +
+ net/openvswitch/actions.c | 4 +
+ net/openvswitch/conntrack.c | 11 +-
+ net/openvswitch/datapath.c | 4 +
+ net/openvswitch/openvswitch_trace.c | 10 +
+ net/openvswitch/openvswitch_trace.h | 158 +
+ net/packet/af_packet.c | 7 +-
+ net/qrtr/ns.c | 4 +-
+ net/rds/ib_ring.c | 2 +-
+ net/rds/tcp_recv.c | 2 +-
+ net/rxrpc/local_event.c | 2 +-
+ net/sched/act_api.c | 3 +-
+ net/sched/act_vlan.c | 11 +-
+ net/sched/cls_api.c | 2 +-
+ net/sched/cls_rsvp.h | 2 +-
+ net/sched/ematch.c | 2 +-
+ net/sched/sch_generic.c | 41 +-
+ net/sched/sch_gred.c | 2 +-
+ net/sched/sch_htb.c | 39 +-
+ net/sched/sch_taprio.c | 88 +-
+ net/sctp/associola.c | 6 +
+ net/sctp/debug.c | 1 +
+ net/sctp/input.c | 133 +-
+ net/sctp/ipv6.c | 112 +-
+ net/sctp/output.c | 33 +-
+ net/sctp/outqueue.c | 13 +-
+ net/sctp/protocol.c | 22 +-
+ net/sctp/sm_make_chunk.c | 31 +-
+ net/sctp/sm_sideeffect.c | 37 +
+ net/sctp/sm_statefuns.c | 67 +-
+ net/sctp/sm_statetable.c | 43 +
+ net/sctp/socket.c | 123 +
+ net/sctp/sysctl.c | 35 +
+ net/sctp/transport.c | 153 +-
+ net/smc/Makefile | 2 +-
+ net/smc/af_smc.c | 102 +-
+ net/smc/smc_core.c | 28 +-
+ net/smc/smc_ism.c | 1 -
+ net/smc/smc_netlink.c | 11 +
+ net/smc/smc_netlink.h | 2 +-
+ net/smc/smc_rx.c | 8 +
+ net/smc/smc_stats.c | 413 +
+ net/smc/smc_stats.h | 266 +
+ net/smc/smc_tx.c | 18 +-
+ net/socket.c | 52 +-
+ net/tipc/link.c | 6 +-
+ net/tipc/name_table.c | 6 +-
+ net/tipc/name_table.h | 4 +-
+ net/tipc/node.c | 2 +-
+ net/tipc/socket.c | 158 +-
+ net/tipc/subscr.c | 2 +-
+ net/tls/tls_device.c | 2 +-
+ net/tls/tls_sw.c | 3 +-
+ net/unix/af_unix.c | 190 +-
+ net/vmw_vsock/af_vsock.c | 466 +-
+ net/vmw_vsock/virtio_transport.c | 28 +
+ net/vmw_vsock/virtio_transport_common.c | 176 +-
+ net/vmw_vsock/vmci_transport.c | 2 +-
+ net/vmw_vsock/vsock_loopback.c | 12 +
+ net/x25/af_x25.c | 2 +-
+ net/x25/x25_forward.c | 8 +-
+ net/x25/x25_link.c | 5 +-
+ net/x25/x25_route.c | 15 +-
+ net/xdp/xdp_umem.c | 7 +-
+ net/xdp/xskmap.c | 3 +-
+ net/xfrm/xfrm_output.c | 41 +-
+ samples/bpf/Makefile | 3 +
+ samples/bpf/ibumad_kern.c | 2 +-
+ samples/bpf/ibumad_user.c | 2 +-
+ samples/bpf/task_fd_query_user.c | 2 +-
+ samples/bpf/xdp_fwd_user.c | 2 +
+ samples/bpf/xdp_redirect_map_multi_kern.c | 88 +
+ samples/bpf/xdp_redirect_map_multi_user.c | 302 +
+ samples/bpf/xdp_sample_pkts_user.c | 3 +-
+ samples/pktgen/parameters.sh | 7 +-
+ samples/pktgen/pktgen_sample01_simple.sh | 2 +
+ samples/pktgen/pktgen_sample02_multiqueue.sh | 2 +
+ .../pktgen/pktgen_sample03_burst_single_flow.sh | 2 +
+ samples/pktgen/pktgen_sample04_many_flows.sh | 2 +
+ samples/pktgen/pktgen_sample05_flow_per_thread.sh | 2 +
+ ...tgen_sample06_numa_awared_queue_irq_affinity.sh | 2 +
+ tools/bpf/bpftool/Makefile | 5 +-
+ tools/bpf/bpftool/gen.c | 421 +-
+ tools/bpf/bpftool/main.c | 11 +-
+ tools/bpf/bpftool/main.h | 1 +
+ tools/bpf/bpftool/prog.c | 107 +-
+ tools/bpf/bpftool/xlated_dumper.c | 3 +
+ tools/include/uapi/linux/bpf.h | 82 +-
+ tools/lib/bpf/Build | 2 +-
+ tools/lib/bpf/Makefile | 18 +-
+ tools/lib/bpf/bpf.c | 179 +-
+ tools/lib/bpf/bpf.h | 2 +
+ tools/lib/bpf/bpf_gen_internal.h | 41 +
+ tools/lib/bpf/bpf_helpers.h | 66 +
+ tools/lib/bpf/bpf_prog_linfo.c | 18 +-
+ tools/lib/bpf/bpf_tracing.h | 108 +-
+ tools/lib/bpf/btf.c | 302 +-
+ tools/lib/bpf/btf_dump.c | 14 +-
+ tools/lib/bpf/gen_loader.c | 729 ++
+ tools/lib/bpf/libbpf.c | 958 ++-
+ tools/lib/bpf/libbpf.h | 68 +-
+ tools/lib/bpf/libbpf.map | 13 +
+ tools/lib/bpf/libbpf_errno.c | 7 +-
+ tools/lib/bpf/libbpf_internal.h | 61 +
+ tools/lib/bpf/libbpf_legacy.h | 59 +
+ tools/lib/bpf/linker.c | 41 +-
+ tools/lib/bpf/netlink.c | 593 +-
+ tools/lib/bpf/nlattr.h | 48 +
+ tools/lib/bpf/ringbuf.c | 26 +-
+ tools/lib/bpf/skel_internal.h | 123 +
+ tools/testing/selftests/bpf/.gitignore | 4 +
+ tools/testing/selftests/bpf/Makefile | 19 +-
+ tools/testing/selftests/bpf/Makefile.docs | 3 +-
+ tools/testing/selftests/bpf/README.rst | 19 +
+ tools/testing/selftests/bpf/bench.c | 1 +
+ tools/testing/selftests/bpf/benchs/bench_rename.c | 2 +-
+ .../testing/selftests/bpf/benchs/bench_ringbufs.c | 6 +-
+ tools/testing/selftests/bpf/benchs/bench_trigger.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/atomics.c | 72 +-
+ .../selftests/bpf/prog_tests/attach_probe.c | 12 +-
+ tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 31 +-
+ .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 8 +-
+ tools/testing/selftests/bpf/prog_tests/btf.c | 93 +-
+ tools/testing/selftests/bpf/prog_tests/btf_dump.c | 8 +-
+ tools/testing/selftests/bpf/prog_tests/btf_write.c | 4 +-
+ .../selftests/bpf/prog_tests/cg_storage_multi.c | 84 +-
+ .../selftests/bpf/prog_tests/cgroup_attach_multi.c | 2 +-
+ .../testing/selftests/bpf/prog_tests/cgroup_link.c | 14 +-
+ .../bpf/prog_tests/cgroup_skb_sk_lookup.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/check_mtu.c | 2 +-
+ .../testing/selftests/bpf/prog_tests/core_reloc.c | 15 +-
+ .../selftests/bpf/prog_tests/fentry_fexit.c | 6 +-
+ .../testing/selftests/bpf/prog_tests/fentry_test.c | 10 +-
+ .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 25 +-
+ .../testing/selftests/bpf/prog_tests/fexit_sleep.c | 6 +-
+ .../testing/selftests/bpf/prog_tests/fexit_test.c | 10 +-
+ .../selftests/bpf/prog_tests/flow_dissector.c | 2 +-
+ .../bpf/prog_tests/flow_dissector_reattach.c | 10 +-
+ .../selftests/bpf/prog_tests/get_stack_raw_tp.c | 10 +-
+ .../bpf/prog_tests/get_stackid_cannot_attach.c | 9 +-
+ tools/testing/selftests/bpf/prog_tests/hashmap.c | 9 +-
+ tools/testing/selftests/bpf/prog_tests/kfree_skb.c | 19 +-
+ .../testing/selftests/bpf/prog_tests/kfunc_call.c | 6 +-
+ tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 3 +-
+ .../selftests/bpf/prog_tests/ksyms_module.c | 2 +-
+ .../selftests/bpf/prog_tests/link_pinning.c | 7 +-
+ .../selftests/bpf/prog_tests/lookup_and_delete.c | 288 +
+ .../selftests/bpf/prog_tests/migrate_reuseport.c | 559 ++
+ tools/testing/selftests/bpf/prog_tests/obj_name.c | 8 +-
+ .../selftests/bpf/prog_tests/perf_branches.c | 4 +-
+ .../testing/selftests/bpf/prog_tests/perf_buffer.c | 2 +-
+ .../selftests/bpf/prog_tests/perf_event_stackmap.c | 3 +-
+ .../testing/selftests/bpf/prog_tests/probe_user.c | 7 +-
+ .../selftests/bpf/prog_tests/prog_run_xattr.c | 4 +-
+ .../selftests/bpf/prog_tests/raw_tp_test_run.c | 4 +-
+ .../testing/selftests/bpf/prog_tests/rdonly_maps.c | 7 +-
+ .../selftests/bpf/prog_tests/reference_tracking.c | 2 +-
+ .../selftests/bpf/prog_tests/resolve_btfids.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/ringbuf.c | 8 +-
+ .../selftests/bpf/prog_tests/ringbuf_multi.c | 2 +-
+ .../selftests/bpf/prog_tests/select_reuseport.c | 53 +-
+ .../testing/selftests/bpf/prog_tests/send_signal.c | 5 +-
+ tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/skeleton.c | 6 +-
+ .../testing/selftests/bpf/prog_tests/sock_fields.c | 14 +-
+ .../selftests/bpf/prog_tests/sockmap_basic.c | 8 +-
+ .../selftests/bpf/prog_tests/sockmap_ktls.c | 2 +-
+ .../selftests/bpf/prog_tests/sockmap_listen.c | 10 +-
+ .../bpf/prog_tests/stacktrace_build_id_nmi.c | 3 +-
+ .../selftests/bpf/prog_tests/stacktrace_map.c | 2 +-
+ .../bpf/prog_tests/stacktrace_map_raw_tp.c | 5 +-
+ .../selftests/bpf/prog_tests/static_linked.c | 9 +-
+ tools/testing/selftests/bpf/prog_tests/syscall.c | 55 +
+ tools/testing/selftests/bpf/prog_tests/tc_bpf.c | 395 +
+ .../selftests/bpf/prog_tests/tcp_hdr_options.c | 15 +-
+ .../selftests/bpf/prog_tests/test_overhead.c | 12 +-
+ .../selftests/bpf/prog_tests/trace_printk.c | 5 +-
+ .../selftests/bpf/prog_tests/trampoline_count.c | 14 +-
+ tools/testing/selftests/bpf/prog_tests/udp_limit.c | 7 +-
+ .../testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/xdp_link.c | 8 +-
+ .../selftests/bpf/progs/bpf_iter_bpf_hash_map.c | 1 -
+ .../testing/selftests/bpf/progs/bpf_iter_bpf_map.c | 1 -
+ .../selftests/bpf/progs/bpf_iter_ipv6_route.c | 1 -
+ .../testing/selftests/bpf/progs/bpf_iter_netlink.c | 1 -
+ tools/testing/selftests/bpf/progs/bpf_iter_task.c | 1 -
+ .../selftests/bpf/progs/bpf_iter_task_btf.c | 1 -
+ .../selftests/bpf/progs/bpf_iter_task_file.c | 1 -
+ .../selftests/bpf/progs/bpf_iter_task_stack.c | 1 -
+ .../selftests/bpf/progs/bpf_iter_task_vma.c | 1 -
+ tools/testing/selftests/bpf/progs/bpf_iter_tcp4.c | 1 -
+ tools/testing/selftests/bpf/progs/bpf_iter_tcp6.c | 1 -
+ .../selftests/bpf/progs/bpf_iter_test_kern4.c | 4 +-
+ tools/testing/selftests/bpf/progs/bpf_iter_udp4.c | 1 -
+ tools/testing/selftests/bpf/progs/bpf_iter_udp6.c | 1 -
+ tools/testing/selftests/bpf/progs/kfree_skb.c | 4 +-
+ tools/testing/selftests/bpf/progs/linked_maps1.c | 2 +-
+ tools/testing/selftests/bpf/progs/syscall.c | 121 +
+ tools/testing/selftests/bpf/progs/tailcall3.c | 2 +-
+ tools/testing/selftests/bpf/progs/tailcall4.c | 2 +-
+ tools/testing/selftests/bpf/progs/tailcall5.c | 2 +-
+ .../selftests/bpf/progs/tailcall_bpf2bpf2.c | 2 +-
+ .../selftests/bpf/progs/tailcall_bpf2bpf4.c | 2 +-
+ tools/testing/selftests/bpf/progs/test_check_mtu.c | 4 +-
+ .../selftests/bpf/progs/test_cls_redirect.c | 4 +-
+ .../selftests/bpf/progs/test_global_func_args.c | 2 +-
+ .../selftests/bpf/progs/test_lookup_and_delete.c | 26 +
+ .../selftests/bpf/progs/test_migrate_reuseport.c | 135 +
+ .../testing/selftests/bpf/progs/test_rdonly_maps.c | 6 +-
+ tools/testing/selftests/bpf/progs/test_ringbuf.c | 4 +-
+ tools/testing/selftests/bpf/progs/test_skeleton.c | 4 +-
+ tools/testing/selftests/bpf/progs/test_snprintf.c | 1 -
+ .../selftests/bpf/progs/test_snprintf_single.c | 2 +-
+ .../selftests/bpf/progs/test_sockmap_listen.c | 4 +-
+ .../selftests/bpf/progs/test_static_linked1.c | 10 +-
+ .../selftests/bpf/progs/test_static_linked2.c | 10 +-
+ tools/testing/selftests/bpf/progs/test_subprogs.c | 13 +
+ tools/testing/selftests/bpf/progs/test_tc_bpf.c | 12 +
+ tools/testing/selftests/bpf/progs/trace_printk.c | 6 +-
+ .../selftests/bpf/progs/xdp_redirect_multi_kern.c | 94 +
+ tools/testing/selftests/bpf/test_doc_build.sh | 1 +
+ tools/testing/selftests/bpf/test_lru_map.c | 8 +
+ tools/testing/selftests/bpf/test_maps.c | 185 +-
+ tools/testing/selftests/bpf/test_progs.c | 3 +
+ tools/testing/selftests/bpf/test_progs.h | 9 +-
+ tools/testing/selftests/bpf/test_tcpnotify_user.c | 7 +-
+ .../selftests/bpf/test_xdp_redirect_multi.sh | 204 +
+ tools/testing/selftests/bpf/xdp_redirect_multi.c | 226 +
+ .../drivers/net/mlxsw/devlink_trap_l3_drops.sh | 3 +
+ .../net/mlxsw/devlink_trap_l3_exceptions.sh | 3 +
+ .../selftests/drivers/net/mlxsw/port_scale.sh | 4 +-
+ .../selftests/drivers/net/mlxsw/qos_dscp_bridge.sh | 2 +
+ .../selftests/drivers/net/mlxsw/qos_headroom.sh | 69 +-
+ .../testing/selftests/drivers/net/mlxsw/qos_lib.sh | 14 -
+ .../testing/selftests/drivers/net/mlxsw/qos_pfc.sh | 24 +-
+ .../selftests/drivers/net/mlxsw/router_scale.sh | 2 +-
+ .../selftests/drivers/net/mlxsw/tc_sample.sh | 12 +-
+ .../selftests/drivers/net/netdevsim/devlink.sh | 167 +-
+ .../drivers/net/netdevsim/devlink_trap.sh | 14 +-
+ .../testing/selftests/drivers/net/netdevsim/fib.sh | 6 +-
+ .../selftests/drivers/net/netdevsim/nexthop.sh | 4 +-
+ .../selftests/drivers/net/netdevsim/psample.sh | 4 +-
+ tools/testing/selftests/net/devlink_port_split.py | 8 +-
+ tools/testing/selftests/net/fib_nexthops.sh | 12 +
+ .../net/forwarding/custom_multipath_hash.sh | 364 +
+ .../selftests/net/forwarding/devlink_lib.sh | 32 +
+ .../net/forwarding/gre_custom_multipath_hash.sh | 456 +
+ .../net/forwarding/ip6gre_custom_multipath_hash.sh | 458 ++
+ .../selftests/net/forwarding/pedit_dsfield.sh | 2 +
+ .../selftests/net/forwarding/pedit_l4port.sh | 2 +
+ .../selftests/net/forwarding/skbedit_priority.sh | 2 +
+ tools/testing/selftests/net/icmp_redirect.sh | 8 +-
+ tools/testing/selftests/net/mptcp/mptcp_connect.c | 125 +-
+ tools/testing/selftests/net/mptcp/mptcp_connect.sh | 65 +-
+ tools/testing/selftests/net/mptcp/mptcp_join.sh | 180 +-
+ tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 4 +-
+ tools/testing/selftests/net/mptcp/simult_flows.sh | 3 +-
+ .../selftests/net/srv6_end_dt46_l3vpn_test.sh | 573 ++
+ tools/testing/selftests/net/tls.c | 87 +-
+ tools/testing/selftests/net/unicast_extensions.sh | 17 +-
+ .../selftests/tc-testing/plugin-lib/scapyPlugin.py | 42 +-
+ .../selftests/tc-testing/tc-tests/actions/ct.json | 45 +
+ .../tc-testing/tc-tests/actions/vlan.json | 28 +-
+ tools/testing/vsock/util.c | 32 +-
+ tools/testing/vsock/util.h | 3 +
+ tools/testing/vsock/vsock_test.c | 116 +
+ 1466 files changed, 78151 insertions(+), 22727 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-devices-platform-soc-ipa
+ create mode 100644 Documentation/bpf/llvm_reloc.rst
+ delete mode 100644 Documentation/devicetree/bindings/net/brcm,iproc-mdio.txt
+ create mode 100644 Documentation/devicetree/bindings/net/brcm,iproc-mdio.yaml
+ delete mode 100644 Documentation/devicetree/bindings/net/can/rcar_can.txt
+ delete mode 100644 Documentation/devicetree/bindings/net/can/rcar_canfd.txt
+ create mode 100644 Documentation/devicetree/bindings/net/can/renesas,rcar-can.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/can/renesas,rcar-canfd.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml
+ delete mode 100644 Documentation/devicetree/bindings/net/dsa/sja1105.txt
+ create mode 100644 Documentation/devicetree/bindings/net/ingenic,mac.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/realtek,rtl82xx.yaml
+ create mode 100644 Documentation/firmware-guide/acpi/dsd/phy.rst
+ create mode 100644 Documentation/networking/device_drivers/wwan/index.rst
+ create mode 100644 Documentation/networking/device_drivers/wwan/iosm.rst
+ create mode 100644 Documentation/networking/devlink/prestera.rst
+ create mode 100644 drivers/net/can/c_can/c_can_ethtool.c
+ rename drivers/net/can/c_can/{c_can.c => c_can_main.c} (99%)
+ create mode 100644 drivers/net/dsa/sja1105/sja1105_mdio.c
+ delete mode 100644 drivers/net/dsa/sja1105/sja1105_sgmii.h
+ create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.h
+ create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c
+ create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.h
+ create mode 100644 drivers/net/ethernet/intel/ice/ice_ptp.c
+ create mode 100644 drivers/net/ethernet/intel/ice/ice_ptp.h
+ create mode 100644 drivers/net/ethernet/intel/ice/ice_ptp_hw.c
+ create mode 100644 drivers/net/ethernet/intel/ice/ice_ptp_hw.h
+ create mode 100644 drivers/net/ethernet/intel/ice/ice_sbq_cmd.h
+ create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_acl.c
+ create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_acl.h
+ create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_flow.c
+ create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_flow.h
+ create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_flower.c
+ create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_flower.h
+ create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_span.c
+ create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_span.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/rep/bridge.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/rep/bridge.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/esw/bridge_priv.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/esw/diag/bridge_tracepoint.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fs_ft_pool.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fs_ft_pool.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/sf.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/mlx5_irq.h
+ delete mode 100644 drivers/net/ethernet/mellanox/mlxsw/ib.h
+ delete mode 100644 drivers/net/ethernet/mellanox/mlxsw/switchib.c
+ delete mode 100644 drivers/net/ethernet/mellanox/mlxsw/switchx2.c
+ create mode 100644 drivers/net/ethernet/netronome/nfp/flower/conntrack.c
+ create mode 100644 drivers/net/ethernet/netronome/nfp/flower/conntrack.h
+ create mode 100644 drivers/net/ethernet/qlogic/qed/qed_nvmetcp.c
+ create mode 100644 drivers/net/ethernet/qlogic/qed/qed_nvmetcp.h
+ create mode 100644 drivers/net/ethernet/qlogic/qed/qed_nvmetcp_fw_funcs.c
+ create mode 100644 drivers/net/ethernet/qlogic/qed/qed_nvmetcp_fw_funcs.h
+ create mode 100644 drivers/net/ethernet/qlogic/qed/qed_nvmetcp_ip_services.c
+ create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c
+ create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
+ create mode 100644 drivers/net/ipa/ipa_data-v3.1.c
+ create mode 100644 drivers/net/ipa/ipa_sysfs.c
+ create mode 100644 drivers/net/ipa/ipa_sysfs.h
+ create mode 100644 drivers/net/mdio/acpi_mdio.c
+ create mode 100644 drivers/net/mdio/fwnode_mdio.c
+ create mode 100644 drivers/net/pcs/pcs-xpcs-nxp.c
+ create mode 100644 drivers/net/pcs/pcs-xpcs.h
+ create mode 100644 drivers/net/phy/mediatek-ge.c
+ create mode 100644 drivers/net/phy/motorcomm.c
+ create mode 100644 drivers/net/wwan/iosm/Makefile
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_chnl_cfg.c
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_chnl_cfg.h
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_imem.c
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_imem.h
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_imem_ops.c
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_imem_ops.h
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_irq.c
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_irq.h
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_mmio.c
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_mmio.h
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_mux.c
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_mux.h
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_mux_codec.c
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_mux_codec.h
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_pcie.c
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_pcie.h
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_pm.c
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_pm.h
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_port.c
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_port.h
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_protocol.c
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_protocol.h
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_protocol_ops.c
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_protocol_ops.h
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_task_queue.c
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_task_queue.h
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_uevent.c
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_uevent.h
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_wwan.c
+ create mode 100644 drivers/net/wwan/iosm/iosm_ipc_wwan.h
+ create mode 100644 drivers/net/wwan/rpmsg_wwan_ctrl.c
+ create mode 100644 drivers/net/wwan/wwan_hwsim.c
+ create mode 100644 include/linux/acpi_mdio.h
+ create mode 100644 include/linux/bpfptr.h
+ create mode 100644 include/linux/fwnode_mdio.h
+ create mode 100644 include/linux/qed/nvmetcp_common.h
+ create mode 100644 include/linux/qed/qed_nvmetcp_if.h
+ create mode 100644 include/linux/qed/qed_nvmetcp_ip_services_if.h
+ create mode 100644 include/net/netns/smc.h
+ create mode 100644 include/uapi/linux/netfilter/nfnetlink_hook.h
+ create mode 100644 include/uapi/linux/wwan.h
+ create mode 100644 net/netfilter/nfnetlink_hook.c
+ create mode 100644 net/netfilter/nft_last.c
+ create mode 100644 net/openvswitch/openvswitch_trace.c
+ create mode 100644 net/openvswitch/openvswitch_trace.h
+ create mode 100644 net/smc/smc_stats.c
+ create mode 100644 net/smc/smc_stats.h
+ create mode 100644 samples/bpf/xdp_redirect_map_multi_kern.c
+ create mode 100644 samples/bpf/xdp_redirect_map_multi_user.c
+ create mode 100644 tools/lib/bpf/bpf_gen_internal.h
+ create mode 100644 tools/lib/bpf/gen_loader.c
+ create mode 100644 tools/lib/bpf/libbpf_legacy.h
+ create mode 100644 tools/lib/bpf/skel_internal.h
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/lookup_and_delete.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/migrate_reuseport.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/syscall.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/tc_bpf.c
+ create mode 100644 tools/testing/selftests/bpf/progs/syscall.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_lookup_and_delete.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_migrate_reuseport.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_tc_bpf.c
+ create mode 100644 tools/testing/selftests/bpf/progs/xdp_redirect_multi_kern.c
+ create mode 100755 tools/testing/selftests/bpf/test_xdp_redirect_multi.sh
+ create mode 100644 tools/testing/selftests/bpf/xdp_redirect_multi.c
+ create mode 100755 tools/testing/selftests/net/forwarding/custom_multipath_hash.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/gre_custom_multipath_hash.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/ip6gre_custom_multipath_hash.sh
+ create mode 100755 tools/testing/selftests/net/srv6_end_dt46_l3vpn_test.sh
+Merging bpf-next/for-next (4b9718b5a201 docs, af_xdp: Consistent indentation in examples)
+$ git merge bpf-next/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/bpf/index.rst | 13 +++
+ Documentation/bpf/libbpf/libbpf.rst | 14 +++
+ Documentation/bpf/libbpf/libbpf_api.rst | 27 +++++
+ Documentation/bpf/libbpf/libbpf_build.rst | 37 +++++++
+ .../bpf/libbpf/libbpf_naming_convention.rst | 30 +++---
+ Documentation/networking/af_xdp.rst | 32 +++---
+ samples/bpf/xdp_redirect_user.c | 4 +-
+ tools/lib/bpf/libbpf.c | 4 +
+ tools/lib/bpf/netlink.c | 115 ++++++++-------------
+ tools/lib/bpf/nlattr.c | 2 +-
+ tools/lib/bpf/nlattr.h | 38 ++++---
+ tools/testing/selftests/bpf/prog_tests/ringbuf.c | 2 +-
+ 12 files changed, 195 insertions(+), 123 deletions(-)
+ create mode 100644 Documentation/bpf/libbpf/libbpf.rst
+ create mode 100644 Documentation/bpf/libbpf/libbpf_api.rst
+ create mode 100644 Documentation/bpf/libbpf/libbpf_build.rst
+ rename tools/lib/bpf/README.rst => Documentation/bpf/libbpf/libbpf_naming_convention.rst (90%)
+Merging ipsec-next/master (b5a1d1fe0cbb xfrm: replay: remove last replay indirection)
+$ git merge ipsec-next/master
+Auto-merging net/xfrm/xfrm_state.c
+Auto-merging net/xfrm/xfrm_policy.c
+Auto-merging net/xfrm/xfrm_output.c
+Auto-merging net/ipv6/esp6.c
+Auto-merging net/ipv4/ipcomp.c
+Auto-merging net/ipv4/esp4.c
+Auto-merging net/ipv4/ah4.c
+Auto-merging include/net/xfrm.h
+Merge made by the 'recursive' strategy.
+ include/net/netns/xfrm.h | 1 +
+ include/net/xfrm.h | 37 +++++-----
+ net/ipv4/ah4.c | 1 -
+ net/ipv4/esp4.c | 1 -
+ net/ipv4/esp4_offload.c | 4 +-
+ net/ipv4/ipcomp.c | 1 -
+ net/ipv4/xfrm4_tunnel.c | 1 -
+ net/ipv6/ah6.c | 2 -
+ net/ipv6/esp6.c | 2 -
+ net/ipv6/esp6_offload.c | 1 -
+ net/ipv6/ipcomp6.c | 2 -
+ net/ipv6/mip6.c | 99 ---------------------------
+ net/ipv6/xfrm6_output.c | 7 --
+ net/ipv6/xfrm6_tunnel.c | 1 -
+ net/key/af_key.c | 6 +-
+ net/xfrm/xfrm_hash.h | 7 ++
+ net/xfrm/xfrm_input.c | 6 +-
+ net/xfrm/xfrm_output.c | 83 ++++++++++++++++++++++-
+ net/xfrm/xfrm_policy.c | 2 +-
+ net/xfrm/xfrm_replay.c | 171 ++++++++++++++++++++++++++++-------------------
+ net/xfrm/xfrm_state.c | 67 +++++++++++++++----
+ 21 files changed, 266 insertions(+), 236 deletions(-)
+Merging mlx5-next/mlx5-next (9a1ac95a59d0 RDMA/mlx5: Refactor get_ts_format functions to simplify code)
+$ git merge mlx5-next/mlx5-next
+Already up to date.
+Merging netfilter-next/master (a2f7dc00ea51 virtio_net: Use virtio_find_vqs_ctx() helper)
+$ git merge netfilter-next/master
+Already up to date.
+Merging ipvs-next/master (a212d9f33ed0 Merge branch 'iosm-driver')
+$ git merge ipvs-next/master
+Already up to date.
+Merging wireless-drivers-next/master (559c664751e5 Merge tag 'iwlwifi-next-for-kalle-2021-06-22' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next)
+$ git merge wireless-drivers-next/master
+Merge made by the 'recursive' strategy.
+ drivers/net/wireless/ath/ath10k/wmi.c | 2 +-
+ drivers/net/wireless/ath/ath11k/mac.c | 14 +-
+ drivers/net/wireless/ath/ath11k/pci.c | 2 +-
+ drivers/net/wireless/ath/wcn36xx/smd.c | 21 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c | 16 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/core.c | 11 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/debug.h | 4 +
+ drivers/net/wireless/intel/iwlwifi/Makefile | 3 +-
+ drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 16 +-
+ drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 6 +-
+ drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 50 +-
+ drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 10 +
+ .../net/wireless/intel/iwlwifi/fw/api/commands.h | 5 -
+ drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 110 +--
+ .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 26 +
+ .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 3 +-
+ .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 19 +
+ drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 47 +-
+ drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 4 +-
+ drivers/net/wireless/intel/iwlwifi/fw/dump.c | 418 ++++++++
+ drivers/net/wireless/intel/iwlwifi/fw/file.h | 25 +-
+ drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 120 +--
+ drivers/net/wireless/intel/iwlwifi/fw/pnvm.h | 4 +-
+ drivers/net/wireless/intel/iwlwifi/fw/uefi.c | 262 +++++
+ drivers/net/wireless/intel/iwlwifi/fw/uefi.h | 42 +
+ drivers/net/wireless/intel/iwlwifi/iwl-config.h | 6 +-
+ .../wireless/intel/iwlwifi/iwl-context-info-gen3.h | 20 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 5 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 13 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 11 +
+ drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 138 +--
+ drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 4 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 20 +
+ drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 118 ++-
+ .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 4 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 4 +-
+ .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 9 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 44 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 25 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 20 +-
+ .../net/wireless/intel/iwlwifi/mvm/offloading.c | 26 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 40 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 26 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 10 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 14 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 8 +-
+ .../net/wireless/intel/iwlwifi/mvm/time-event.c | 45 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 357 +------
+ .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 90 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 19 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 24 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 34 -
+ .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 78 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 39 +-
+ drivers/net/wireless/intersil/orinoco/hw.c | 18 +-
+ drivers/net/wireless/intersil/orinoco/hw.h | 5 +-
+ drivers/net/wireless/intersil/orinoco/wext.c | 2 +-
+ drivers/net/wireless/marvell/mwifiex/fw.h | 6 +
+ drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 11 +-
+ drivers/net/wireless/marvell/mwl8k.c | 4 +-
+ drivers/net/wireless/mediatek/mt76/dma.c | 19 +-
+ drivers/net/wireless/mediatek/mt76/mac80211.c | 64 +-
+ drivers/net/wireless/mediatek/mt76/mt76.h | 56 +-
+ drivers/net/wireless/mediatek/mt76/mt7603/init.c | 32 +-
+ drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 43 +-
+ drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h | 2 +-
+ drivers/net/wireless/mediatek/mt76/mt7603/regs.h | 12 -
+ drivers/net/wireless/mediatek/mt76/mt7615/Makefile | 2 +-
+ .../net/wireless/mediatek/mt76/mt7615/debugfs.c | 22 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/dma.c | 13 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/init.c | 85 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 156 ++-
+ drivers/net/wireless/mediatek/mt76/mt7615/mac.h | 42 -
+ drivers/net/wireless/mediatek/mt76/mt7615/main.c | 60 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 99 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 11 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 19 +-
+ .../net/wireless/mediatek/mt76/mt7615/pci_init.c | 10 +-
+ .../net/wireless/mediatek/mt76/mt7615/pci_mac.c | 12 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/regs.h | 2 +
+ drivers/net/wireless/mediatek/mt76/mt7615/sdio.h | 2 +-
+ .../net/wireless/mediatek/mt76/mt7615/sdio_mcu.c | 39 +-
+ .../net/wireless/mediatek/mt76/mt7615/sdio_txrx.c | 16 +-
+ .../net/wireless/mediatek/mt76/mt7615/usb_sdio.c | 11 +-
+ drivers/net/wireless/mediatek/mt76/mt76_connac.h | 19 +-
+ .../net/wireless/mediatek/mt76/mt76_connac_mac.c | 10 +-
+ .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 228 ++++-
+ .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 72 +-
+ drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c | 2 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 36 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_mac.h | 2 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_regs.h | 18 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 16 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/Makefile | 2 +-
+ .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 78 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/dma.c | 45 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c | 44 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h | 13 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/init.c | 179 +++-
+ drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 384 ++++----
+ drivers/net/wireless/mediatek/mt76/mt7915/mac.h | 56 ++
+ drivers/net/wireless/mediatek/mt76/mt7915/main.c | 103 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 673 +++++++++----
+ drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 80 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 39 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/pci.c | 41 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/regs.h | 32 +-
+ .../net/wireless/mediatek/mt76/mt7915/testmode.c | 21 +-
+ .../net/wireless/mediatek/mt76/mt7915/testmode.h | 2 +-
+ drivers/net/wireless/mediatek/mt76/mt7921/Makefile | 2 +-
+ .../net/wireless/mediatek/mt76/mt7921/debugfs.c | 37 +
+ drivers/net/wireless/mediatek/mt76/mt7921/dma.c | 22 +-
+ drivers/net/wireless/mediatek/mt76/mt7921/init.c | 99 +-
+ drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 248 +++--
+ drivers/net/wireless/mediatek/mt76/mt7921/mac.h | 14 +
+ drivers/net/wireless/mediatek/mt76/mt7921/main.c | 172 ++--
+ drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 203 ++--
+ drivers/net/wireless/mediatek/mt76/mt7921/mcu.h | 166 +---
+ drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 20 +-
+ drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 34 +-
+ drivers/net/wireless/mediatek/mt76/sdio.c | 17 +-
+ drivers/net/wireless/mediatek/mt76/testmode.c | 35 +-
+ drivers/net/wireless/mediatek/mt76/tx.c | 82 +-
+ drivers/net/wireless/mediatek/mt76/usb.c | 1 +
+ drivers/net/wireless/mediatek/mt7601u/usb.c | 1 +
+ drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 11 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 59 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 11 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 2 +-
+ drivers/net/wireless/realtek/rtw88/coex.c | 40 +-
+ drivers/net/wireless/realtek/rtw88/debug.c | 7 +
+ drivers/net/wireless/realtek/rtw88/debug.h | 1 +
+ drivers/net/wireless/realtek/rtw88/fw.c | 112 +++
+ drivers/net/wireless/realtek/rtw88/fw.h | 55 +-
+ drivers/net/wireless/realtek/rtw88/mac80211.c | 9 +
+ drivers/net/wireless/realtek/rtw88/main.c | 195 ++--
+ drivers/net/wireless/realtek/rtw88/main.h | 57 +-
+ drivers/net/wireless/realtek/rtw88/pci.c | 32 +
+ drivers/net/wireless/realtek/rtw88/phy.c | 81 ++
+ drivers/net/wireless/realtek/rtw88/phy.h | 1 +
+ drivers/net/wireless/realtek/rtw88/ps.c | 4 +-
+ drivers/net/wireless/realtek/rtw88/rtw8822c.c | 113 ++-
+ .../net/wireless/realtek/rtw88/rtw8822c_table.c | 1008 ++++++++++----------
+ include/net/cfg80211.h | 2 +
+ 144 files changed, 5486 insertions(+), 3028 deletions(-)
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/dump.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/uefi.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/uefi.h
+Merging bluetooth/master (190de68ba85c Bluetooth: Increment management interface revision)
+$ git merge bluetooth/master
+Auto-merging net/bluetooth/smp.c
+Auto-merging net/bluetooth/mgmt.c
+Auto-merging net/bluetooth/hci_sock.c
+Auto-merging net/bluetooth/hci_event.c
+Auto-merging net/bluetooth/hci_core.c
+Auto-merging net/bluetooth/hci_conn.c
+Auto-merging drivers/bluetooth/btusb.c
+Removing Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/net/qualcomm-bluetooth.txt | 69 -------
+ .../bindings/net/qualcomm-bluetooth.yaml | 183 +++++++++++++++++++
+ drivers/bluetooth/btbcm.c | 1 +
+ drivers/bluetooth/btmrvl_sdio.c | 4 +-
+ drivers/bluetooth/btmtkuart.c | 6 +-
+ drivers/bluetooth/btqca.c | 113 +++++++++---
+ drivers/bluetooth/btqca.h | 14 +-
+ drivers/bluetooth/btrtl.c | 35 ++--
+ drivers/bluetooth/btrtl.h | 7 +
+ drivers/bluetooth/btusb.c | 45 ++++-
+ drivers/bluetooth/hci_h5.c | 5 +-
+ drivers/bluetooth/hci_qca.c | 118 +++++++++---
+ drivers/bluetooth/virtio_bt.c | 3 +
+ include/net/bluetooth/hci.h | 99 +++++-----
+ include/net/bluetooth/hci_core.h | 29 +--
+ include/net/bluetooth/mgmt.h | 3 +-
+ net/bluetooth/6lowpan.c | 54 +-----
+ net/bluetooth/a2mp.c | 24 +--
+ net/bluetooth/amp.c | 6 +-
+ net/bluetooth/bnep/core.c | 8 +-
+ net/bluetooth/cmtp/capi.c | 22 +--
+ net/bluetooth/cmtp/core.c | 5 +
+ net/bluetooth/hci_conn.c | 10 +-
+ net/bluetooth/hci_core.c | 78 +++++---
+ net/bluetooth/hci_debugfs.c | 8 +-
+ net/bluetooth/hci_event.c | 174 ++++++++++--------
+ net/bluetooth/hci_request.c | 203 +++++++++++++--------
+ net/bluetooth/hci_sock.c | 12 +-
+ net/bluetooth/hidp/core.c | 8 +-
+ net/bluetooth/l2cap_core.c | 16 +-
+ net/bluetooth/mgmt.c | 58 +++---
+ net/bluetooth/mgmt_config.c | 4 +-
+ net/bluetooth/msft.c | 8 +-
+ net/bluetooth/rfcomm/tty.c | 10 +-
+ net/bluetooth/sco.c | 8 +-
+ net/bluetooth/smp.c | 78 ++++----
+ net/bluetooth/smp.h | 6 +-
+ 37 files changed, 955 insertions(+), 579 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt
+ create mode 100644 Documentation/devicetree/bindings/net/qualcomm-bluetooth.yaml
+Merging mac80211-next/master (2433647bc8d9 mac80211: Switch to a virtual time-based airtime scheduler)
+$ git merge mac80211-next/master
+Auto-merging include/net/cfg80211.h
+Auto-merging drivers/net/wireless/realtek/rtw88/mac80211.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+Merge made by the 'recursive' strategy.
+ drivers/net/wireless/ath/ath9k/main.c | 2 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 6 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 3 +
+ drivers/net/wireless/mac80211_hwsim.c | 55 ++-
+ drivers/net/wireless/realtek/rtw88/mac80211.c | 2 +-
+ include/linux/ieee80211.h | 10 +-
+ include/net/cfg80211.h | 49 ++-
+ include/net/mac80211.h | 72 +++-
+ include/uapi/linux/nl80211.h | 9 +-
+ net/mac80211/cfg.c | 45 ++-
+ net/mac80211/chan.c | 108 +++--
+ net/mac80211/debugfs.c | 70 +++-
+ net/mac80211/debugfs_netdev.c | 33 +-
+ net/mac80211/debugfs_sta.c | 24 +-
+ net/mac80211/driver-ops.h | 26 +-
+ net/mac80211/he.c | 8 +-
+ net/mac80211/ht.c | 18 +-
+ net/mac80211/ieee80211_i.h | 194 ++++++++-
+ net/mac80211/iface.c | 234 ++++++-----
+ net/mac80211/led.c | 12 +-
+ net/mac80211/main.c | 32 +-
+ net/mac80211/mesh.h | 2 +-
+ net/mac80211/mesh_hwmp.c | 2 +-
+ net/mac80211/mesh_pathtbl.c | 2 +-
+ net/mac80211/mesh_plink.c | 2 +-
+ net/mac80211/mlme.c | 248 +++++-------
+ net/mac80211/rate.c | 13 +-
+ net/mac80211/rc80211_minstrel_ht.c | 34 +-
+ net/mac80211/rx.c | 54 ++-
+ net/mac80211/sta_info.c | 83 ++--
+ net/mac80211/sta_info.h | 11 +-
+ net/mac80211/status.c | 26 +-
+ net/mac80211/tdls.c | 28 +-
+ net/mac80211/trace.h | 33 +-
+ net/mac80211/tx.c | 466 +++++++++++++++-------
+ net/mac80211/util.c | 35 +-
+ net/wireless/chan.c | 43 +-
+ net/wireless/core.c | 50 +--
+ net/wireless/core.h | 3 +-
+ net/wireless/nl80211.c | 22 +-
+ net/wireless/pmsr.c | 12 +
+ net/wireless/rdev-ops.h | 12 +-
+ net/wireless/reg.c | 5 +-
+ net/wireless/scan.c | 22 +-
+ net/wireless/trace.h | 36 +-
+ net/wireless/wext-compat.c | 8 +-
+ net/wireless/wext-spy.c | 14 +-
+ 47 files changed, 1492 insertions(+), 786 deletions(-)
+Merging mtd/mtd/next (6aa12138cd9a mtd: Convert list_for_each to entry variant)
+$ git merge mtd/mtd/next
+Removing Documentation/devicetree/bindings/mtd/ti,am654-hbmc.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mtd/common.txt | 16 +-
+ .../devicetree/bindings/mtd/jedec,spi-nor.yaml | 6 +
+ .../bindings/mtd/microchip,mchp48l640.yaml | 45 +++
+ Documentation/devicetree/bindings/mtd/mtd.yaml | 89 +++++
+ .../bindings/mtd/partitions/brcm,trx.txt | 5 +
+ .../devicetree/bindings/mtd/ti,am654-hbmc.txt | 51 ---
+ .../devicetree/bindings/mtd/ti,am654-hbmc.yaml | 69 ++++
+ drivers/mtd/chips/chipreg.c | 5 +-
+ drivers/mtd/devices/Kconfig | 6 +
+ drivers/mtd/devices/Makefile | 1 +
+ drivers/mtd/devices/mchp48l640.c | 373 +++++++++++++++++++++
+ drivers/mtd/devices/ms02-nv.c | 1 -
+ drivers/mtd/devices/phram.c | 1 +
+ drivers/mtd/inftlmount.c | 17 +-
+ drivers/mtd/maps/amd76xrom.c | 6 +-
+ drivers/mtd/maps/ck804xrom.c | 8 +-
+ drivers/mtd/maps/esb2rom.c | 7 +-
+ drivers/mtd/maps/ichxrom.c | 6 +-
+ drivers/mtd/maps/plat-ram.c | 1 -
+ drivers/mtd/maps/sun_uflash.c | 4 +-
+ drivers/mtd/mtdcore.c | 246 +++++++++++---
+ drivers/mtd/mtdoops.c | 4 +-
+ drivers/mtd/mtdpart.c | 9 +-
+ drivers/mtd/nand/raw/atmel/nand-controller.c | 4 +-
+ drivers/mtd/nand/raw/sunxi_nand.c | 4 +-
+ drivers/mtd/nftlcore.c | 1 -
+ drivers/mtd/nftlmount.c | 7 +-
+ drivers/mtd/parsers/Kconfig | 2 +-
+ drivers/mtd/parsers/parser_trx.c | 9 +-
+ drivers/mtd/parsers/qcomsmempart.c | 10 +
+ drivers/mtd/parsers/redboot.c | 76 +++--
+ drivers/mtd/rfd_ftl.c | 5 +-
+ drivers/mtd/sm_ftl.c | 51 +--
+ drivers/mtd/tests/oobtest.c | 7 +-
+ drivers/mtd/tests/torturetest.c | 2 -
+ drivers/nvmem/core.c | 4 +-
+ include/linux/mtd/mtd.h | 2 +
+ include/linux/nvmem-provider.h | 2 +
+ 38 files changed, 919 insertions(+), 243 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mtd/microchip,mchp48l640.yaml
+ create mode 100644 Documentation/devicetree/bindings/mtd/mtd.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mtd/ti,am654-hbmc.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/ti,am654-hbmc.yaml
+ create mode 100644 drivers/mtd/devices/mchp48l640.c
+Merging nand/nand/next (c06dd49fd59a mtd: rawnand: omap: Add larger page NAND chips support)
+$ git merge nand/nand/next
+Auto-merging drivers/mtd/nand/raw/atmel/nand-controller.c
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/mtd/arm,pl353-nand-r2p1.yaml | 53 +
+ .../devicetree/bindings/mtd/brcm,brcmnand.txt | 186 ---
+ .../devicetree/bindings/mtd/brcm,brcmnand.yaml | 242 ++++
+ .../devicetree/bindings/mtd/nand-controller.yaml | 18 +-
+ MAINTAINERS | 9 +
+ drivers/mtd/nand/bbt.c | 2 +-
+ drivers/mtd/nand/raw/Kconfig | 8 +
+ drivers/mtd/nand/raw/Makefile | 1 +
+ drivers/mtd/nand/raw/arasan-nand-controller.c | 341 +++++-
+ drivers/mtd/nand/raw/atmel/nand-controller.c | 7 +-
+ drivers/mtd/nand/raw/cadence-nand-controller.c | 6 +-
+ drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h | 2 +-
+ drivers/mtd/nand/raw/hisi504_nand.c | 4 +-
+ drivers/mtd/nand/raw/internals.h | 5 +
+ drivers/mtd/nand/raw/marvell_nand.c | 6 +-
+ drivers/mtd/nand/raw/mtk_ecc.c | 4 +-
+ drivers/mtd/nand/raw/nand_base.c | 364 ++++--
+ drivers/mtd/nand/raw/nand_legacy.c | 2 +-
+ drivers/mtd/nand/raw/nand_onfi.c | 5 +-
+ drivers/mtd/nand/raw/nand_timings.c | 370 +++++-
+ drivers/mtd/nand/raw/omap2.c | 229 ++--
+ drivers/mtd/nand/raw/omap_elm.c | 2 +-
+ drivers/mtd/nand/raw/pl35x-nand-controller.c | 1194 ++++++++++++++++++++
+ drivers/mtd/nand/raw/qcom_nandc.c | 23 +-
+ drivers/mtd/nand/raw/r852.c | 7 +-
+ drivers/mtd/nand/spi/core.c | 129 ++-
+ drivers/mtd/nand/spi/macronix.c | 112 ++
+ include/linux/mtd/onfi.h | 41 +-
+ include/linux/mtd/rawnand.h | 161 ++-
+ 29 files changed, 3020 insertions(+), 513 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mtd/arm,pl353-nand-r2p1.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
+ create mode 100644 drivers/mtd/nand/raw/pl35x-nand-controller.c
+Merging spi-nor/spi-nor/next (c17e5c85b32f mtd: spi-nor: remove redundant continue statement)
+$ git merge spi-nor/spi-nor/next
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/sysfs-bus-spi-devices-spi-nor | 31 ++++
+ drivers/mtd/spi-nor/Makefile | 2 +-
+ drivers/mtd/spi-nor/controllers/intel-spi-pci.c | 1 +
+ drivers/mtd/spi-nor/controllers/nxp-spifi.c | 2 +-
+ drivers/mtd/spi-nor/core.c | 22 ++-
+ drivers/mtd/spi-nor/core.h | 16 +++
+ drivers/mtd/spi-nor/macronix.c | 5 +-
+ drivers/mtd/spi-nor/otp.c | 160 +++++++++++++++++++--
+ drivers/mtd/spi-nor/sfdp.c | 58 ++++++++
+ drivers/mtd/spi-nor/sysfs.c | 93 ++++++++++++
+ drivers/mtd/spi-nor/winbond.c | 1 +
+ include/linux/mtd/spi-nor.h | 2 +
+ 12 files changed, 370 insertions(+), 23 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-spi-devices-spi-nor
+ create mode 100644 drivers/mtd/spi-nor/sysfs.c
+Merging crypto/master (38a9eb8182a2 crypto: hisilicon/zip - adds the max shaper type rate)
+$ git merge crypto/master
+Auto-merging drivers/crypto/nx/nx-common-pseries.c
+Auto-merging drivers/crypto/nx/nx-common-powernv.c
+Auto-merging drivers/crypto/cavium/nitrox/nitrox_main.c
+CONFLICT (content): Merge conflict in drivers/crypto/cavium/nitrox/nitrox_main.c
+Removing arch/arm64/crypto/sha512-core.S_shipped
+Removing arch/arm64/crypto/sha256-core.S_shipped
+Removing arch/arm64/crypto/poly1305-core.S_shipped
+Removing arch/arm/crypto/sha512-core.S_shipped
+Removing arch/arm/crypto/sha256-core.S_shipped
+Removing arch/arm/crypto/poly1305-core.S_shipped
+Auto-merging MAINTAINERS
+Resolved 'drivers/crypto/cavium/nitrox/nitrox_main.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 8bf917e1e239] Merge remote-tracking branch 'crypto/master'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/crypto/cortina,sl3516-crypto.yaml | 50 +
+ .../bindings/crypto/intel,ixp4xx-crypto.yaml | 47 +
+ .../intel,ixp4xx-network-processing-engine.yaml | 22 +-
+ MAINTAINERS | 21 +
+ arch/arm/crypto/Makefile | 10 +-
+ arch/arm/crypto/poly1305-core.S_shipped | 1158 --------
+ arch/arm/crypto/sha256-core.S_shipped | 2816 --------------------
+ arch/arm/crypto/sha512-core.S_shipped | 1869 -------------
+ arch/arm/mach-ixp4xx/common.c | 26 +
+ arch/arm64/crypto/Makefile | 10 +-
+ arch/arm64/crypto/poly1305-core.S_shipped | 835 ------
+ arch/arm64/crypto/sha256-core.S_shipped | 2069 --------------
+ arch/arm64/crypto/sha512-core.S_shipped | 1093 --------
+ arch/x86/crypto/curve25519-x86_64.c | 2 +-
+ crypto/af_alg.c | 2 +-
+ crypto/algapi.c | 18 -
+ crypto/algboss.c | 31 +-
+ crypto/drbg.c | 12 +-
+ crypto/ecdh.c | 49 +-
+ crypto/khazad.c | 2 +-
+ crypto/shash.c | 18 +-
+ crypto/sm2.c | 24 +-
+ crypto/tcrypt.c | 36 +
+ crypto/testmgr.c | 10 +-
+ crypto/testmgr.h | 71 +-
+ crypto/wp512.c | 40 +-
+ drivers/char/hw_random/Kconfig | 10 +-
+ drivers/char/hw_random/amd-rng.c | 2 +-
+ drivers/char/hw_random/core.c | 38 +-
+ drivers/char/hw_random/exynos-trng.c | 7 +-
+ drivers/char/hw_random/ks-sa-rng.c | 3 +-
+ drivers/char/hw_random/omap-rng.c | 6 +-
+ drivers/crypto/Kconfig | 39 +
+ drivers/crypto/Makefile | 1 +
+ drivers/crypto/cavium/cpt/cptpf_main.c | 2 +-
+ drivers/crypto/cavium/cpt/cptvf_reqmanager.c | 10 +-
+ drivers/crypto/cavium/nitrox/nitrox_isr.c | 4 +
+ drivers/crypto/cavium/nitrox/nitrox_main.c | 21 +-
+ drivers/crypto/cavium/nitrox/nitrox_mbx.c | 4 +-
+ drivers/crypto/cavium/nitrox/nitrox_reqmgr.c | 16 +-
+ drivers/crypto/cavium/nitrox/nitrox_skcipher.c | 2 +-
+ drivers/crypto/ccp/ccp-dev.c | 2 +-
+ drivers/crypto/ccp/ccp-dmaengine.c | 3 +-
+ drivers/crypto/ccp/sev-dev.c | 4 +
+ drivers/crypto/ccp/sp-pci.c | 6 +-
+ drivers/crypto/gemini/Makefile | 2 +
+ drivers/crypto/gemini/sl3516-ce-cipher.c | 388 +++
+ drivers/crypto/gemini/sl3516-ce-core.c | 535 ++++
+ drivers/crypto/gemini/sl3516-ce-rng.c | 61 +
+ drivers/crypto/gemini/sl3516-ce.h | 347 +++
+ drivers/crypto/hisilicon/hpre/hpre_crypto.c | 185 +-
+ drivers/crypto/hisilicon/hpre/hpre_main.c | 256 +-
+ drivers/crypto/hisilicon/qm.c | 2163 +++++++++++----
+ drivers/crypto/hisilicon/qm.h | 17 +
+ drivers/crypto/hisilicon/sec2/sec.h | 23 +-
+ drivers/crypto/hisilicon/sec2/sec_crypto.c | 1036 ++++++-
+ drivers/crypto/hisilicon/sec2/sec_crypto.h | 193 ++
+ drivers/crypto/hisilicon/sec2/sec_main.c | 100 +-
+ drivers/crypto/hisilicon/zip/zip_main.c | 99 +-
+ drivers/crypto/ixp4xx_crypto.c | 413 +--
+ drivers/crypto/marvell/cesa/cesa.h | 2 +-
+ drivers/crypto/marvell/octeontx2/Makefile | 13 +-
+ drivers/crypto/marvell/octeontx2/cn10k_cpt.c | 93 +
+ drivers/crypto/marvell/octeontx2/cn10k_cpt.h | 36 +
+ drivers/crypto/marvell/octeontx2/otx2_cpt_common.h | 23 +
+ .../crypto/marvell/octeontx2/otx2_cpt_hw_types.h | 16 +-
+ drivers/crypto/marvell/octeontx2/otx2_cptlf.c | 9 +-
+ drivers/crypto/marvell/octeontx2/otx2_cptlf.h | 10 +
+ drivers/crypto/marvell/octeontx2/otx2_cptpf.h | 1 +
+ drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c | 160 +-
+ .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 32 +-
+ .../crypto/marvell/octeontx2/otx2_cptpf_ucode.h | 8 +-
+ drivers/crypto/marvell/octeontx2/otx2_cptvf.h | 3 +
+ drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c | 49 +-
+ drivers/crypto/marvell/octeontx2/otx2_cptvf_mbox.c | 43 +
+ .../crypto/marvell/octeontx2/otx2_cptvf_reqmgr.c | 17 +-
+ drivers/crypto/nx/nx-common-powernv.c | 4 +-
+ drivers/crypto/nx/nx-common-pseries.c | 25 +-
+ drivers/crypto/omap-des.c | 9 +-
+ drivers/crypto/omap-sham.c | 4 +-
+ .../qat/qat_common/icp_qat_fw_loader_handle.h | 2 +-
+ drivers/crypto/qat/qat_common/qat_hal.c | 14 +-
+ drivers/crypto/qat/qat_common/qat_uclo.c | 12 +-
+ drivers/crypto/qce/Makefile | 1 +
+ drivers/crypto/qce/aead.c | 847 ++++++
+ drivers/crypto/qce/aead.h | 56 +
+ drivers/crypto/qce/common.c | 196 +-
+ drivers/crypto/qce/common.h | 9 +-
+ drivers/crypto/qce/core.c | 4 +
+ drivers/crypto/qce/skcipher.c | 19 +-
+ drivers/crypto/sa2ul.c | 46 +-
+ drivers/crypto/ux500/hash/hash_core.c | 1 +
+ drivers/soc/ixp4xx/ixp4xx-npe.c | 7 +
+ include/crypto/aead.h | 2 +-
+ include/crypto/algapi.h | 1 -
+ include/crypto/engine.h | 2 +-
+ include/crypto/hash.h | 2 +-
+ include/crypto/internal/hash.h | 8 +-
+ include/linux/crypto.h | 5 -
+ 99 files changed, 7006 insertions(+), 11124 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/crypto/cortina,sl3516-crypto.yaml
+ create mode 100644 Documentation/devicetree/bindings/crypto/intel,ixp4xx-crypto.yaml
+ delete mode 100644 arch/arm/crypto/poly1305-core.S_shipped
+ delete mode 100644 arch/arm/crypto/sha256-core.S_shipped
+ delete mode 100644 arch/arm/crypto/sha512-core.S_shipped
+ delete mode 100644 arch/arm64/crypto/poly1305-core.S_shipped
+ delete mode 100644 arch/arm64/crypto/sha256-core.S_shipped
+ delete mode 100644 arch/arm64/crypto/sha512-core.S_shipped
+ create mode 100644 drivers/crypto/gemini/Makefile
+ create mode 100644 drivers/crypto/gemini/sl3516-ce-cipher.c
+ create mode 100644 drivers/crypto/gemini/sl3516-ce-core.c
+ create mode 100644 drivers/crypto/gemini/sl3516-ce-rng.c
+ create mode 100644 drivers/crypto/gemini/sl3516-ce.h
+ create mode 100644 drivers/crypto/marvell/octeontx2/cn10k_cpt.c
+ create mode 100644 drivers/crypto/marvell/octeontx2/cn10k_cpt.h
+ create mode 100644 drivers/crypto/qce/aead.c
+ create mode 100644 drivers/crypto/qce/aead.h
+Merging drm/drm-next (b322a50d17ed Merge tag 'amd-drm-next-5.14-2021-06-22-1' of https://gitlab.freedesktop.org/agd5f/linux into drm-next)
+$ git merge drm/drm-next
+Removing include/drm/drm_agpsupport.h
+Auto-merging drivers/iommu/arm/arm-smmu/arm-smmu.h
+Auto-merging drivers/iommu/arm/arm-smmu/arm-smmu.c
+Removing drivers/gpu/drm/vmwgfx/vmwgfx_msg.h
+Removing drivers/gpu/drm/vmwgfx/ttm_lock.h
+Removing drivers/gpu/drm/vmwgfx/ttm_lock.c
+Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/vc4/vc4_hdmi.c
+Auto-merging drivers/gpu/drm/nouveau/nouveau_ttm.c
+Auto-merging drivers/gpu/drm/nouveau/nouveau_connector.c
+Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c
+Removing drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c
+Removing drivers/gpu/drm/i915/selftests/i915_buddy.c
+Removing drivers/gpu/drm/i915/i915_buddy.h
+Removing drivers/gpu/drm/i915/i915_buddy.c
+Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
+Removing drivers/gpu/drm/i915/display/intel_csr.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/display/msm/dsi.txt
+Removing Documentation/devicetree/bindings/display/msm/dpu.txt
+Removing Documentation/devicetree/bindings/display/mediatek/mediatek,hdmi.txt
+Removing Documentation/devicetree/bindings/display/faraday,tve200.txt
+Resolved 'drivers/gpu/drm/vc4/vc4_hdmi.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 401d427379a0] Merge remote-tracking branch 'drm/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/display/brcm,bcm2835-vec.yaml | 4 +-
+ .../bindings/display/bridge/cdns,mhdp8546.yaml | 15 +-
+ .../display/bridge/google,cros-ec-anx7688.yaml | 82 +
+ .../bindings/display/bridge/ite,it66121.yaml | 124 +
+ .../bindings/display/bridge/ti,sn65dsi83.yaml | 159 +
+ .../devicetree/bindings/display/faraday,tve200.txt | 54 -
+ .../bindings/display/faraday,tve200.yaml | 68 +
+ .../bindings/display/mediatek/mediatek,cec.yaml | 52 +
+ .../display/mediatek/mediatek,hdmi-ddc.yaml | 58 +
+ .../bindings/display/mediatek/mediatek,hdmi.txt | 136 -
+ .../bindings/display/mediatek/mediatek,hdmi.yaml | 133 +
+ .../bindings/display/msm/dp-controller.yaml | 146 +
+ .../bindings/display/msm/dpu-sc7180.yaml | 228 +
+ .../bindings/display/msm/dpu-sdm845.yaml | 212 +
+ .../devicetree/bindings/display/msm/dpu.txt | 141 -
+ .../bindings/display/msm/dsi-controller-main.yaml | 185 +
+ .../bindings/display/msm/dsi-phy-10nm.yaml | 68 +
+ .../bindings/display/msm/dsi-phy-14nm.yaml | 66 +
+ .../bindings/display/msm/dsi-phy-20nm.yaml | 71 +
+ .../bindings/display/msm/dsi-phy-28nm.yaml | 68 +
+ .../bindings/display/msm/dsi-phy-common.yaml | 40 +
+ .../devicetree/bindings/display/msm/dsi.txt | 249 -
+ .../bindings/display/panel/samsung,lms397kf04.yaml | 74 +
+ .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 30 +-
+ Documentation/driver-api/dma-buf.rst | 9 +
+ Documentation/gpu/amdgpu-dc.rst | 6 +
+ Documentation/gpu/amdgpu.rst | 21 +
+ Documentation/gpu/driver-uapi.rst | 8 +
+ Documentation/gpu/drm-internals.rst | 12 +
+ Documentation/gpu/drm-mm.rst | 4 +-
+ Documentation/gpu/i915.rst | 12 +-
+ Documentation/gpu/index.rst | 1 +
+ Documentation/gpu/rfc/i915_gem_lmem.rst | 131 +
+ Documentation/gpu/rfc/index.rst | 4 +
+ Documentation/gpu/todo.rst | 2 +
+ MAINTAINERS | 30 +-
+ arch/x86/kernel/early-quirks.c | 2 +
+ drivers/dma-buf/dma-buf.c | 31 +-
+ drivers/dma-buf/dma-resv.c | 211 +-
+ drivers/gpu/drm/Kconfig | 42 +-
+ drivers/gpu/drm/Makefile | 9 +-
+ drivers/gpu/drm/amd/amdgpu/Makefile | 14 +-
+ drivers/gpu/drm/amd/amdgpu/aldebaran.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 69 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 398 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 55 +-
+ .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 42 +-
+ .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 42 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 697 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 196 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 39 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 109 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 237 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 24 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 63 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 2 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 84 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 104 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h | 43 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 32 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fw_attestation.c | 3 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 47 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 76 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfxhub.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 106 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 256 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c | 69 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 13 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 28 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 13 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 31 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 19 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 82 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 90 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h | 7 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 292 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 62 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c | 195 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 491 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 59 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 270 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 18 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 4 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 393 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 21 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 44 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 34 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 4 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 5 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 39 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 21 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 63 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 13 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 68 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 13 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 545 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 40 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 16 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 21 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 328 +-
+ drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 52 +-
+ drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/atom.c | 172 +
+ drivers/gpu/drm/amd/amdgpu/atom.h | 10 +
+ drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/beige_goby_reg_init.c | 54 +
+ drivers/gpu/drm/amd/amdgpu/cik_ih.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/cz_ih.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 20 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 279 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 30 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 669 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 20 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 40 +
+ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 51 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 27 +-
+ drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 31 +-
+ drivers/gpu/drm/amd/amdgpu/hdp_v4_0.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 42 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 74 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 42 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 142 +-
+ drivers/gpu/drm/amd/amdgpu/nv.c | 234 +-
+ drivers/gpu/drm/amd/amdgpu/nv.h | 3 +
+ drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 14 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 58 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 37 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 39 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 119 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 100 +-
+ drivers/gpu/drm/amd/amdgpu/si_dma.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/si_ih.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/smuio_v13_0.c | 20 +-
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 19 +-
+ drivers/gpu/drm/amd/amdgpu/soc15_common.h | 87 +-
+ drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 7 +
+ drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/umc_v8_7.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 26 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 171 +-
+ drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/vi.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/yellow_carp_reg_init.c | 51 +
+ drivers/gpu/drm/amd/amdkfd/Kconfig | 13 +
+ drivers/gpu/drm/amd/amdkfd/Makefile | 5 +
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 120 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 994 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 59 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 82 +-
+ .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 13 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_events.c | 41 +
+ drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 2 +
+ drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 10 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 889 +
+ drivers/gpu/drm/amd/amdkfd/kfd_migrate.h | 65 +
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 14 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 58 +-
+ .../gpu/drm/amd/amdkfd/kfd_pm4_headers_aldebaran.h | 93 +
+ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 43 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 129 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 3102 +
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 213 +
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 105 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 11 +-
+ drivers/gpu/drm/amd/amdkfd/soc15_int.h | 1 +
+ drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 2 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 786 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 33 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 41 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 63 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 4 -
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 156 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 24 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 25 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 27 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 1 +
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 19 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 164 +
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h | 40 +
+ drivers/gpu/drm/amd/display/dc/Makefile | 6 +-
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 6 +-
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 112 +-
+ .../drm/amd/display/dc/bios/bios_parser_helper.c | 5 +-
+ .../drm/amd/display/dc/bios/command_table_helper.c | 2 +-
+ .../amd/display/dc/bios/command_table_helper2.c | 4 +-
+ drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 2 +
+ drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 2 +
+ drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 9 +
+ drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 52 +-
+ .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 70 +-
+ .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.h | 3 +-
+ .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 18 +-
+ .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 4 +-
+ .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 673 +
+ .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.h | 103 +
+ .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 333 +
+ .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.h | 271 +
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 157 +-
+ .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 133 +
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c | 324 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 9 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 862 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dpcd.c | 218 +
+ .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 22 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 45 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 624 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 2 +
+ drivers/gpu/drm/amd/display/dc/dc.h | 34 +-
+ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 133 +-
+ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 8 +
+ drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 6 +
+ drivers/gpu/drm/amd/display/dc/dc_dsc.h | 5 +-
+ drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 3 +
+ drivers/gpu/drm/amd/display/dc/dc_link.h | 31 +-
+ drivers/gpu/drm/amd/display/dc/dc_stream.h | 7 +
+ drivers/gpu/drm/amd/display/dc/dc_types.h | 8 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 42 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 3 +
+ .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 9 +
+ drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 58 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 13 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 3 +
+ drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 2 +
+ drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h | 3 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 10 +-
+ drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 28 +-
+ .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 8 +
+ .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.h | 3 +
+ drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.c | 17 +-
+ drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 41 +-
+ drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h | 17 +-
+ .../amd/display/dc/dce110/dce110_hw_sequencer.c | 62 +-
+ .../drm/amd/display/dc/dce110/dce110_mem_input_v.c | 1 +
+ .../display/dc/dce110/dce110_timing_generator.c | 1 +
+ .../drm/amd/display/dc/dce110/dce110_transform_v.c | 3 +-
+ .../display/dc/dce120/dce120_timing_generator.c | 1 +
+ .../amd/display/dc/dce80/dce80_timing_generator.c | 1 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 9 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 2 -
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 70 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 1 +
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 41 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 17 +-
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 485 +-
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 17 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 7 +-
+ .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 13 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 4 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 12 +
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 6 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 4 +-
+ .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 24 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.c | 36 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 121 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c | 6 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_dpp_cm.c | 4 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 1 +
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h | 7 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 4 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 10 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 79 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 5 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 3 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 10 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h | 9 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 51 +-
+ .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 12 +
+ .../amd/display/dc/dcn20/dcn20_stream_encoder.h | 3 +
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.c | 3 +
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 3 +-
+ .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 4 +-
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.c | 3 +
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.h | 17 +-
+ .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 2 +
+ .../display/dc/dcn30/dcn30_dio_stream_encoder.h | 16 +
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 6 +-
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 16 +
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 3 +-
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 4 +-
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h | 175 +
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 3 +-
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h | 6 +-
+ .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 6 +-
+ .../gpu/drm/amd/display/dc/dcn301/dcn301_dccg.c | 3 +
+ .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 3 +-
+ .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +-
+ .../gpu/drm/amd/display/dc/dcn302/dcn302_hwseq.c | 34 +-
+ .../drm/amd/display/dc/dcn302/dcn302_resource.c | 28 +-
+ drivers/gpu/drm/amd/display/dc/dcn303/Makefile | 39 +
+ .../gpu/drm/amd/display/dc/dcn303/dcn303_dccg.h | 30 +
+ .../gpu/drm/amd/display/dc/dcn303/dcn303_hwseq.c | 45 +
+ .../gpu/drm/amd/display/dc/dcn303/dcn303_hwseq.h | 18 +
+ .../gpu/drm/amd/display/dc/dcn303/dcn303_init.c | 20 +
+ .../gpu/drm/amd/display/dc/dcn303/dcn303_init.h | 15 +
+ .../drm/amd/display/dc/dcn303/dcn303_resource.c | 1695 +
+ .../drm/amd/display/dc/dcn303/dcn303_resource.h | 17 +
+ drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 42 +
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 279 +
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 147 +
+ .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 406 +
+ .../amd/display/dc/dcn31/dcn31_dio_link_encoder.h | 246 +
+ .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c | 956 +
+ .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.h | 122 +
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c | 103 +
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.h | 246 +
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 596 +
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.h | 56 +
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 150 +
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.h | 33 +
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c | 287 +
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.h | 259 +
+ .../drm/amd/display/dc/dcn31/dcn31_panel_cntl.c | 157 +
+ .../drm/amd/display/dc/dcn31/dcn31_panel_cntl.h | 40 +
+ .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 2195 +
+ .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.h | 42 +
+ drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 3 +
+ drivers/gpu/drm/amd/display/dc/dm_helpers.h | 15 +-
+ drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 4 +
+ drivers/gpu/drm/amd/display/dc/dml/Makefile | 5 +
+ .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 26 +-
+ .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 26 +-
+ .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 58 +-
+ .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 126 +-
+ .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 7510 ++
+ .../amd/display/dc/dml/dcn31/display_mode_vba_31.h | 43 +
+ .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 1724 +
+ .../display/dc/dml/dcn31/display_rq_dlg_calc_31.h | 69 +
+ .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 13 +
+ .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 2 +
+ .../drm/amd/display/dc/dml/display_mode_structs.h | 10 +
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 47 +-
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 60 +-
+ drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 128 +-
+ drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 43 -
+ drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h | 2 -
+ drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 12 +-
+ drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 2 +
+ drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 2 +
+ drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 1 +
+ drivers/gpu/drm/amd/display/dc/inc/core_types.h | 4 +
+ drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 100 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 3 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 1 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 56 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 3 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 6 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 1 +
+ .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 10 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 2 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 3 +
+ .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 3 +
+ .../drm/amd/display/dc/inc/hw/timing_generator.h | 3 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 4 -
+ drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 20 +
+ .../drm/amd/display/dc/inc/hw_sequencer_private.h | 5 -
+ drivers/gpu/drm/amd/display/dc/inc/link_dpcd.h | 18 +
+ drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 7 +-
+ drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 14 -
+ drivers/gpu/drm/amd/display/dc/irq/Makefile | 17 +
+ .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 18 +-
+ .../amd/display/dc/irq/dcn303/irq_service_dcn303.c | 262 +
+ .../amd/display/dc/irq/dcn303/irq_service_dcn303.h | 15 +
+ .../amd/display/dc/irq/dcn31/irq_service_dcn31.c | 432 +
+ .../amd/display/dc/irq/dcn31/irq_service_dcn31.h | 34 +
+ drivers/gpu/drm/amd/display/dc/irq_types.h | 2 +-
+ drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 73 +-
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 485 +-
+ drivers/gpu/drm/amd/display/dmub/src/Makefile | 4 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 72 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 19 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c | 5 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 5 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn301.c | 5 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn302.c | 5 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn303.c | 40 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn303.h | 19 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 354 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 230 +
+ drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 56 +
+ .../gpu/drm/amd/display/dmub/src/dmub_srv_stat.c | 19 +-
+ drivers/gpu/drm/amd/display/include/dal_asic_id.h | 15 +-
+ drivers/gpu/drm/amd/display/include/dal_types.h | 2 +
+ .../amd/display/include/gpio_service_interface.h | 4 +-
+ .../drm/amd/display/include/link_service_types.h | 10 +
+ .../drm/amd/display/modules/freesync/freesync.c | 29 +-
+ drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 1 -
+ .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 9 +-
+ .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 5 +
+ .../amd/display/modules/hdcp/hdcp2_transition.c | 2 +-
+ .../gpu/drm/amd/display/modules/hdcp/hdcp_log.c | 2 +
+ .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 144 +-
+ .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.h | 33 +-
+ drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 13 +-
+ .../drm/amd/display/modules/power/power_helpers.c | 35 +-
+ .../drm/amd/display/modules/power/power_helpers.h | 3 +-
+ drivers/gpu/drm/amd/include/aldebaran_ip_offset.h | 2 +-
+ drivers/gpu/drm/amd/include/amd_acpi.h | 18 +
+ drivers/gpu/drm/amd/include/amd_shared.h | 2 +
+ .../amd/include/asic_reg/dcn/dcn_3_0_1_sh_mask.h | 2 +
+ .../amd/include/asic_reg/dcn/dcn_3_0_3_offset.h | 8427 ++
+ .../amd/include/asic_reg/dcn/dcn_3_0_3_sh_mask.h | 35330 ++++++
+ .../amd/include/asic_reg/dcn/dcn_3_1_2_offset.h | 15083 +++
+ .../amd/include/asic_reg/dcn/dcn_3_1_2_sh_mask.h | 60749 ++++++++++
+ .../amd/include/asic_reg/dcn/dpcs_3_0_3_offset.h | 204 +
+ .../amd/include/asic_reg/dcn/dpcs_3_0_3_sh_mask.h | 1192 +
+ .../drm/amd/include/asic_reg/df/df_3_6_offset.h | 3 +
+ .../drm/amd/include/asic_reg/df/df_3_6_sh_mask.h | 1 +
+ .../amd/include/asic_reg/dpcs/dpcs_4_2_0_offset.h | 11936 ++
+ .../amd/include/asic_reg/dpcs/dpcs_4_2_0_sh_mask.h | 103385 ++++++++++++++++++
+ .../drm/amd/include/asic_reg/mp/mp_13_0_1_offset.h | 355 +
+ .../amd/include/asic_reg/mp/mp_13_0_1_sh_mask.h | 531 +
+ drivers/gpu/drm/amd/include/atombios.h | 10 +-
+ drivers/gpu/drm/amd/include/atomfirmware.h | 74 +-
+ drivers/gpu/drm/amd/include/beige_goby_ip_offset.h | 1274 +
+ drivers/gpu/drm/amd/include/kgd_pp_interface.h | 237 +-
+ drivers/gpu/drm/amd/include/yellow_carp_offset.h | 1366 +
+ drivers/gpu/drm/amd/pm/amdgpu_pm.c | 349 +-
+ drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 72 +-
+ .../amd/pm/inc/smu11_driver_if_sienna_cichlid.h | 366 +-
+ .../gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h | 7 +-
+ .../drm/amd/pm/inc/smu13_driver_if_yellow_carp.h | 222 +
+ drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 4 +
+ drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 8 +-
+ drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h | 57 +
+ drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_pmfw.h | 139 +
+ drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_ppsmc.h | 97 +
+ drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 54 +-
+ .../drm/amd/pm/powerplay/hwmgr/hardwaremanager.c | 3 +-
+ .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 8 +-
+ .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 21 +
+ .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_thermal.c | 8 +-
+ .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 26 +-
+ .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 2 +-
+ .../drm/amd/pm/powerplay/hwmgr/vega12_thermal.c | 3 +-
+ .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_baco.c | 2 +-
+ .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 2 +-
+ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 154 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 140 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 224 +-
+ .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 916 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 26 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 51 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 96 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile | 2 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 267 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 9 +
+ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c | 311 +
+ .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 1244 +
+ .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.h | 28 +
+ drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 75 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 5 +
+ drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 4 +-
+ drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 1 -
+ drivers/gpu/drm/arm/malidp_drv.c | 1 -
+ drivers/gpu/drm/arm/malidp_planes.c | 9 +-
+ drivers/gpu/drm/armada/armada_drv.c | 5 +-
+ drivers/gpu/drm/ast/ast_dp501.c | 139 +-
+ drivers/gpu/drm/ast/ast_drv.c | 23 +-
+ drivers/gpu/drm/ast/ast_drv.h | 12 +
+ drivers/gpu/drm/ast/ast_main.c | 14 +-
+ drivers/gpu/drm/bochs/bochs.h | 1 +
+ drivers/gpu/drm/bochs/bochs_drv.c | 3 +-
+ drivers/gpu/drm/bochs/bochs_hw.c | 25 +-
+ drivers/gpu/drm/bochs/bochs_kms.c | 8 +
+ drivers/gpu/drm/bridge/Kconfig | 35 +-
+ drivers/gpu/drm/bridge/Makefile | 3 +
+ drivers/gpu/drm/bridge/adv7511/adv7511.h | 1 +
+ drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 6 +
+ drivers/gpu/drm/bridge/analogix/Kconfig | 2 +-
+ drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 1 +
+ drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 1 +
+ drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1 +
+ drivers/gpu/drm/bridge/analogix/anx7625.c | 183 +-
+ drivers/gpu/drm/bridge/analogix/anx7625.h | 1 -
+ drivers/gpu/drm/bridge/cadence/Makefile | 2 +-
+ .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 146 +-
+ .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 22 +
+ .../gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c | 570 +
+ .../gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.h | 92 +
+ drivers/gpu/drm/bridge/cdns-dsi.c | 2 +-
+ drivers/gpu/drm/bridge/cros-ec-anx7688.c | 191 +
+ drivers/gpu/drm/bridge/ite-it66121.c | 1021 +
+ drivers/gpu/drm/bridge/lontium-lt8912b.c | 3 -
+ drivers/gpu/drm/bridge/lontium-lt9611.c | 1 +
+ drivers/gpu/drm/bridge/nwl-dsi.c | 86 +-
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 22 +-
+ drivers/gpu/drm/bridge/tc358767.c | 1 +
+ drivers/gpu/drm/bridge/ti-sn65dsi83.c | 709 +
+ drivers/gpu/drm/bridge/ti-sn65dsi86.c | 717 +-
+ drivers/gpu/drm/drm_agpsupport.c | 101 +-
+ drivers/gpu/drm/drm_aperture.c | 348 +
+ drivers/gpu/drm/drm_atomic.c | 35 +-
+ drivers/gpu/drm/drm_atomic_helper.c | 40 +-
+ drivers/gpu/drm/drm_atomic_uapi.c | 10 +-
+ drivers/gpu/drm/drm_auth.c | 3 +-
+ drivers/gpu/drm/drm_blend.c | 4 +-
+ drivers/gpu/drm/drm_bridge.c | 3 +
+ drivers/gpu/drm/drm_bufs.c | 34 +-
+ drivers/gpu/drm/drm_cache.c | 148 +
+ drivers/gpu/drm/drm_connector.c | 127 +-
+ drivers/gpu/drm/drm_context.c | 5 +-
+ drivers/gpu/drm/drm_crtc_internal.h | 4 +-
+ drivers/gpu/drm/drm_dma.c | 8 +-
+ drivers/gpu/drm/drm_dp_aux_dev.c | 6 +
+ drivers/gpu/drm/drm_dp_dual_mode_helper.c | 68 +-
+ drivers/gpu/drm/drm_dp_helper.c | 195 +-
+ drivers/gpu/drm/drm_dp_mst_topology.c | 473 +-
+ drivers/gpu/drm/drm_drv.c | 6 +-
+ drivers/gpu/drm/drm_fb_cma_helper.c | 46 +
+ drivers/gpu/drm/drm_fb_helper.c | 2 +-
+ drivers/gpu/drm/drm_file.c | 14 +-
+ drivers/gpu/drm/drm_format_helper.c | 96 +-
+ drivers/gpu/drm/drm_fourcc.c | 29 +-
+ drivers/gpu/drm/drm_gem.c | 7 +-
+ drivers/gpu/drm/drm_gem_atomic_helper.c | 2 +-
+ drivers/gpu/drm/drm_gem_cma_helper.c | 44 +-
+ drivers/gpu/drm/drm_gem_framebuffer_helper.c | 7 +-
+ drivers/gpu/drm/drm_gem_ttm_helper.c | 39 +-
+ drivers/gpu/drm/drm_gem_vram_helper.c | 55 +-
+ drivers/gpu/drm/drm_internal.h | 13 -
+ drivers/gpu/drm/drm_ioc32.c | 19 +-
+ drivers/gpu/drm/drm_ioctl.c | 27 +-
+ drivers/gpu/drm/drm_lease.c | 1 -
+ drivers/gpu/drm/drm_legacy.h | 38 +
+ drivers/gpu/drm/drm_legacy_misc.c | 1 -
+ drivers/gpu/drm/drm_memory.c | 1 -
+ drivers/gpu/drm/drm_modes.c | 13 +-
+ drivers/gpu/drm/drm_pci.c | 89 +-
+ drivers/gpu/drm/drm_plane.c | 18 +-
+ drivers/gpu/drm/drm_vm.c | 2 -
+ drivers/gpu/drm/etnaviv/etnaviv_dump.c | 8 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem.c | 10 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 3 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 20 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 68 +-
+ drivers/gpu/drm/etnaviv/etnaviv_hwdb.c | 31 +
+ drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 7 +-
+ drivers/gpu/drm/exynos/exynos7_drm_decon.c | 9 +-
+ drivers/gpu/drm/exynos/exynos_drm_dsi.c | 7 +-
+ drivers/gpu/drm/exynos/exynos_drm_fb.c | 2 -
+ drivers/gpu/drm/exynos/exynos_drm_fimc.c | 8 +-
+ drivers/gpu/drm/exynos/exynos_drm_fimd.c | 25 +-
+ drivers/gpu/drm/exynos/exynos_drm_g2d.c | 9 +-
+ drivers/gpu/drm/exynos/exynos_drm_gsc.c | 7 +-
+ drivers/gpu/drm/exynos/exynos_drm_ipp.c | 4 +-
+ drivers/gpu/drm/exynos/exynos_drm_mic.c | 6 +-
+ drivers/gpu/drm/exynos/exynos_drm_rotator.c | 7 +-
+ drivers/gpu/drm/exynos/exynos_drm_scaler.c | 10 +-
+ drivers/gpu/drm/exynos/exynos_hdmi.c | 8 +-
+ drivers/gpu/drm/exynos/exynos_mixer.c | 7 +-
+ drivers/gpu/drm/gma500/backlight.c | 4 +-
+ drivers/gpu/drm/gma500/cdv_intel_dp.c | 50 +-
+ drivers/gpu/drm/gma500/cdv_intel_lvds.c | 2 +-
+ drivers/gpu/drm/gma500/intel_gmbus.c | 2 +-
+ drivers/gpu/drm/gma500/psb_drv.h | 2 +-
+ drivers/gpu/drm/gud/gud_internal.h | 4 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 6 +-
+ drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 2 +-
+ drivers/gpu/drm/hisilicon/kirin/dw_dsi_reg.h | 2 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h | 2 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 2 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 2 +-
+ drivers/gpu/drm/hyperv/Makefile | 8 +
+ drivers/gpu/drm/hyperv/hyperv_drm.h | 52 +
+ drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 311 +
+ drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 231 +
+ drivers/gpu/drm/hyperv/hyperv_drm_proto.c | 485 +
+ drivers/gpu/drm/i810/i810_dma.c | 11 +-
+ drivers/gpu/drm/i915/Kconfig | 1 +
+ drivers/gpu/drm/i915/Makefile | 5 +-
+ drivers/gpu/drm/i915/display/g4x_dp.c | 1 +
+ drivers/gpu/drm/i915/display/g4x_hdmi.c | 1 +
+ drivers/gpu/drm/i915/display/i9xx_plane.c | 4 +-
+ drivers/gpu/drm/i915/display/icl_dsi.c | 27 +-
+ drivers/gpu/drm/i915/display/intel_atomic.c | 35 +-
+ drivers/gpu/drm/i915/display/intel_atomic.h | 1 +
+ drivers/gpu/drm/i915/display/intel_atomic_plane.c | 43 +-
+ drivers/gpu/drm/i915/display/intel_atomic_plane.h | 4 +
+ drivers/gpu/drm/i915/display/intel_audio.c | 32 +-
+ drivers/gpu/drm/i915/display/intel_bios.c | 77 +-
+ drivers/gpu/drm/i915/display/intel_bw.c | 26 +-
+ drivers/gpu/drm/i915/display/intel_cdclk.c | 452 +-
+ drivers/gpu/drm/i915/display/intel_color.c | 7 +-
+ drivers/gpu/drm/i915/display/intel_combo_phy.c | 1 +
+ drivers/gpu/drm/i915/display/intel_connector.c | 6 +-
+ drivers/gpu/drm/i915/display/intel_crt.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_crtc.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_crtc.h | 3 +
+ drivers/gpu/drm/i915/display/intel_csr.h | 21 -
+ drivers/gpu/drm/i915/display/intel_cursor.c | 5 +
+ drivers/gpu/drm/i915/display/intel_ddi.c | 162 +-
+ drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 64 +-
+ drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h | 4 +
+ drivers/gpu/drm/i915/display/intel_de.h | 41 +-
+ drivers/gpu/drm/i915/display/intel_display.c | 1031 +-
+ drivers/gpu/drm/i915/display/intel_display.h | 31 +-
+ .../gpu/drm/i915/display/intel_display_debugfs.c | 39 +-
+ drivers/gpu/drm/i915/display/intel_display_power.c | 686 +-
+ drivers/gpu/drm/i915/display/intel_display_power.h | 11 +
+ drivers/gpu/drm/i915/display/intel_display_types.h | 31 +-
+ .../drm/i915/display/{intel_csr.c => intel_dmc.c} | 418 +-
+ drivers/gpu/drm/i915/display/intel_dmc.h | 43 +
+ drivers/gpu/drm/i915/display/intel_dp.c | 133 +-
+ drivers/gpu/drm/i915/display/intel_dp.h | 3 -
+ drivers/gpu/drm/i915/display/intel_dp_aux.c | 24 +-
+ .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_dp_hdcp.h | 15 +
+ .../gpu/drm/i915/display/intel_dp_link_training.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_dp_mst.c | 19 +-
+ drivers/gpu/drm/i915/display/intel_dpio_phy.c | 1 +
+ drivers/gpu/drm/i915/display/intel_dpll.c | 9 +-
+ drivers/gpu/drm/i915/display/intel_dpll.h | 5 +
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 77 +-
+ drivers/gpu/drm/i915/display/intel_dsb.c | 1 +
+ drivers/gpu/drm/i915/display/intel_dsi.h | 1 +
+ drivers/gpu/drm/i915/display/intel_dvo.c | 1 +
+ drivers/gpu/drm/i915/display/intel_fb.c | 115 +-
+ drivers/gpu/drm/i915/display/intel_fb.h | 6 +-
+ drivers/gpu/drm/i915/display/intel_fbc.c | 28 +-
+ drivers/gpu/drm/i915/display/intel_fbdev.c | 51 +-
+ drivers/gpu/drm/i915/display/intel_fdi.c | 1 +
+ drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 62 +-
+ drivers/gpu/drm/i915/display/intel_frontbuffer.c | 9 +-
+ drivers/gpu/drm/i915/display/intel_gmbus.c | 16 +-
+ drivers/gpu/drm/i915/display/intel_hdcp.c | 10 +-
+ drivers/gpu/drm/i915/display/intel_hdmi.c | 230 +-
+ drivers/gpu/drm/i915/display/intel_hotplug.c | 12 +
+ drivers/gpu/drm/i915/display/intel_lspcon.c | 18 +-
+ drivers/gpu/drm/i915/display/intel_lvds.c | 3 +-
+ drivers/gpu/drm/i915/display/intel_overlay.c | 16 +-
+ drivers/gpu/drm/i915/display/intel_panel.c | 67 +-
+ drivers/gpu/drm/i915/display/intel_pipe_crc.c | 56 +-
+ drivers/gpu/drm/i915/display/intel_pps.c | 20 +-
+ drivers/gpu/drm/i915/display/intel_psr.c | 282 +-
+ drivers/gpu/drm/i915/display/intel_psr.h | 5 +
+ drivers/gpu/drm/i915/display/intel_qp_tables.c | 309 +
+ drivers/gpu/drm/i915/display/intel_qp_tables.h | 14 +
+ drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +
+ drivers/gpu/drm/i915/display/intel_sprite.c | 1 +
+ drivers/gpu/drm/i915/display/intel_tc.c | 175 +-
+ drivers/gpu/drm/i915/display/intel_tc.h | 2 +
+ drivers/gpu/drm/i915/display/intel_tv.c | 9 +-
+ drivers/gpu/drm/i915/display/intel_vdsc.c | 156 +-
+ drivers/gpu/drm/i915/display/intel_vdsc.h | 2 +
+ drivers/gpu/drm/i915/display/intel_vrr.c | 59 +-
+ drivers/gpu/drm/i915/display/skl_scaler.c | 1 +
+ drivers/gpu/drm/i915/display/skl_universal_plane.c | 217 +-
+ drivers/gpu/drm/i915/display/vlv_dsi.c | 79 +-
+ drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 1 +
+ drivers/gpu/drm/i915/dma_resv_utils.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_busy.c | 7 +-
+ drivers/gpu/drm/i915/gem/i915_gem_context.c | 9 +-
+ drivers/gpu/drm/i915/gem/i915_gem_create.c | 345 +-
+ drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 34 +-
+ drivers/gpu/drm/i915/gem/i915_gem_ioctls.h | 2 +
+ drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 79 +-
+ drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 5 +
+ drivers/gpu/drm/i915/gem/i915_gem_mman.c | 7 +
+ drivers/gpu/drm/i915/gem/i915_gem_object.c | 13 +
+ drivers/gpu/drm/i915/gem/i915_gem_object.h | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 8 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 36 +-
+ drivers/gpu/drm/i915/gem/i915_gem_pages.c | 3 +-
+ drivers/gpu/drm/i915/gem/i915_gem_phys.c | 3 +-
+ drivers/gpu/drm/i915/gem/i915_gem_region.c | 98 -
+ drivers/gpu/drm/i915/gem/i915_gem_region.h | 4 -
+ drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 4 +-
+ drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 13 +-
+ drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 177 +-
+ drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 8 +-
+ drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 12 +-
+ drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 6 +-
+ drivers/gpu/drm/i915/gem/i915_gem_wait.c | 10 +-
+ .../drm/i915/gem/selftests/i915_gem_client_blt.c | 10 +-
+ .../drm/i915/gem/selftests/i915_gem_coherency.c | 4 +-
+ .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 27 +-
+ drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 40 +-
+ drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c | 10 +-
+ drivers/gpu/drm/i915/gt/debugfs_gt_pm.c | 40 +-
+ drivers/gpu/drm/i915/gt/gen2_engine_cs.c | 2 +-
+ drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 13 +-
+ drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 2 +-
+ drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 33 +-
+ drivers/gpu/drm/i915/gt/gen8_ppgtt.h | 7 +
+ drivers/gpu/drm/i915/gt/intel_context.c | 3 +-
+ drivers/gpu/drm/i915/gt/intel_context_sseu.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_engine.h | 8 +-
+ drivers/gpu/drm/i915/gt/intel_engine_cs.c | 121 +-
+ drivers/gpu/drm/i915/gt/intel_engine_pm.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_engine_types.h | 18 +-
+ .../gpu/drm/i915/gt/intel_execlists_submission.c | 113 +-
+ .../gpu/drm/i915/gt/intel_execlists_submission.h | 3 -
+ drivers/gpu/drm/i915/gt/intel_ggtt.c | 54 +-
+ drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 40 +-
+ drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 2 +-
+ drivers/gpu/drm/i915/gt/intel_gt.c | 29 +-
+ drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c | 3 +-
+ drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c | 12 +-
+ drivers/gpu/drm/i915/gt/intel_gt_irq.c | 106 +-
+ drivers/gpu/drm/i915/gt/intel_gt_irq.h | 23 +
+ drivers/gpu/drm/i915/gt/intel_gt_pm_irq.c | 10 +-
+ drivers/gpu/drm/i915/gt/intel_gt_types.h | 7 +
+ drivers/gpu/drm/i915/gt/intel_gtt.c | 146 +-
+ drivers/gpu/drm/i915/gt/intel_gtt.h | 48 +-
+ drivers/gpu/drm/i915/gt/intel_llc.c | 6 +-
+ drivers/gpu/drm/i915/gt/intel_lrc.c | 50 +-
+ drivers/gpu/drm/i915/gt/intel_mocs.c | 8 +-
+ drivers/gpu/drm/i915/gt/intel_ppgtt.c | 15 +-
+ drivers/gpu/drm/i915/gt/intel_rc6.c | 16 +-
+ drivers/gpu/drm/i915/gt/intel_region_lmem.c | 29 +-
+ drivers/gpu/drm/i915/gt/intel_renderstate.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_reset.c | 213 +-
+ drivers/gpu/drm/i915/gt/intel_ring.c | 11 +-
+ drivers/gpu/drm/i915/gt/intel_ring_submission.c | 76 +-
+ drivers/gpu/drm/i915/gt/intel_rps.c | 62 +-
+ drivers/gpu/drm/i915/gt/intel_sseu.c | 14 +-
+ drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c | 6 +-
+ drivers/gpu/drm/i915/gt/intel_timeline.c | 4 +-
+ drivers/gpu/drm/i915/gt/intel_workarounds.c | 166 +-
+ drivers/gpu/drm/i915/gt/mock_engine.c | 2 +-
+ drivers/gpu/drm/i915/gt/selftest_context.c | 3 +-
+ drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 24 +-
+ .../gpu/drm/i915/gt/selftest_engine_heartbeat.c | 2 +-
+ drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 2 +-
+ drivers/gpu/drm/i915/gt/selftest_execlists.c | 6 +-
+ drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 8 +-
+ drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 12 +-
+ drivers/gpu/drm/i915/gt/selftest_llc.c | 4 +-
+ drivers/gpu/drm/i915/gt/selftest_lrc.c | 12 +-
+ drivers/gpu/drm/i915/gt/selftest_mocs.c | 2 +-
+ drivers/gpu/drm/i915/gt/selftest_rc6.c | 36 +-
+ drivers/gpu/drm/i915/gt/selftest_ring_submission.c | 8 +-
+ drivers/gpu/drm/i915/gt/selftest_rps.c | 22 +-
+ drivers/gpu/drm/i915/gt/selftest_timeline.c | 6 +-
+ drivers/gpu/drm/i915/gt/selftest_workarounds.c | 18 +-
+ drivers/gpu/drm/i915/gt/shmem_utils.c | 4 +-
+ drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h | 51 +
+ .../drm/i915/gt/uc/abi/guc_communication_ctb_abi.h | 106 +
+ .../i915/gt/uc/abi/guc_communication_mmio_abi.h | 52 +
+ drivers/gpu/drm/i915/gt/uc/abi/guc_errors_abi.h | 14 +
+ drivers/gpu/drm/i915/gt/uc/abi/guc_messages_abi.h | 21 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc.c | 67 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 -
+ drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 22 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 532 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h | 14 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 2 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 233 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_log_debugfs.c | 1 -
+ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 101 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h | 1 -
+ drivers/gpu/drm/i915/gt/uc/intel_huc.c | 6 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc.c | 14 +-
+ drivers/gpu/drm/i915/gvt/cmd_parser.c | 8 +-
+ drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +-
+ drivers/gpu/drm/i915/gvt/fb_decoder.c | 10 +-
+ drivers/gpu/drm/i915/gvt/gtt.c | 4 +-
+ drivers/gpu/drm/i915/gvt/handlers.c | 14 +-
+ drivers/gpu/drm/i915/gvt/interrupt.c | 2 +-
+ drivers/gpu/drm/i915/gvt/mmio_context.c | 10 +-
+ drivers/gpu/drm/i915/gvt/scheduler.c | 4 +-
+ drivers/gpu/drm/i915/gvt/vgpu.c | 4 +-
+ drivers/gpu/drm/i915/i915_active.c | 14 +-
+ drivers/gpu/drm/i915/i915_active.h | 11 +-
+ drivers/gpu/drm/i915/i915_active_types.h | 5 -
+ drivers/gpu/drm/i915/i915_buddy.c | 435 -
+ drivers/gpu/drm/i915/i915_buddy.h | 131 -
+ drivers/gpu/drm/i915/i915_cmd_parser.c | 28 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 51 +-
+ drivers/gpu/drm/i915/i915_drv.c | 86 +-
+ drivers/gpu/drm/i915/i915_drv.h | 153 +-
+ drivers/gpu/drm/i915/i915_gem.c | 19 +-
+ drivers/gpu/drm/i915/i915_globals.c | 1 -
+ drivers/gpu/drm/i915/i915_globals.h | 1 -
+ drivers/gpu/drm/i915/i915_gpu_error.c | 98 +-
+ drivers/gpu/drm/i915/i915_gpu_error.h | 4 +-
+ drivers/gpu/drm/i915/i915_irq.c | 140 +-
+ drivers/gpu/drm/i915/i915_irq.h | 1 +
+ drivers/gpu/drm/i915/i915_params.c | 2 +-
+ drivers/gpu/drm/i915/i915_params.h | 11 +-
+ drivers/gpu/drm/i915/i915_pci.c | 59 +-
+ drivers/gpu/drm/i915/i915_perf.c | 55 +-
+ drivers/gpu/drm/i915/i915_pmu.c | 20 +-
+ drivers/gpu/drm/i915/i915_query.c | 62 +
+ drivers/gpu/drm/i915/i915_reg.h | 268 +-
+ drivers/gpu/drm/i915/i915_request.c | 12 +-
+ drivers/gpu/drm/i915/i915_scatterlist.c | 70 +
+ drivers/gpu/drm/i915/i915_scatterlist.h | 20 +-
+ drivers/gpu/drm/i915/i915_suspend.c | 22 +-
+ drivers/gpu/drm/i915/i915_sw_fence.c | 4 +-
+ drivers/gpu/drm/i915/i915_sysfs.c | 62 +-
+ drivers/gpu/drm/i915/i915_trace.h | 39 +
+ drivers/gpu/drm/i915/i915_utils.h | 10 +
+ drivers/gpu/drm/i915/i915_vgpu.c | 2 +-
+ drivers/gpu/drm/i915/i915_vma.c | 62 +-
+ drivers/gpu/drm/i915/i915_vma.h | 12 +-
+ drivers/gpu/drm/i915/i915_vma_types.h | 1 -
+ drivers/gpu/drm/i915/intel_device_info.c | 31 +-
+ drivers/gpu/drm/i915/intel_device_info.h | 17 +-
+ drivers/gpu/drm/i915/intel_dram.c | 14 +-
+ drivers/gpu/drm/i915/intel_memory_region.c | 205 +-
+ drivers/gpu/drm/i915/intel_memory_region.h | 61 +-
+ drivers/gpu/drm/i915/intel_pch.c | 16 +-
+ drivers/gpu/drm/i915/intel_pch.h | 1 +
+ drivers/gpu/drm/i915/intel_pm.c | 445 +-
+ drivers/gpu/drm/i915/intel_pm.h | 4 +-
+ drivers/gpu/drm/i915/intel_region_ttm.c | 226 +
+ drivers/gpu/drm/i915/intel_region_ttm.h | 34 +
+ drivers/gpu/drm/i915/intel_runtime_pm.h | 2 +-
+ drivers/gpu/drm/i915/intel_sideband.c | 2 +-
+ drivers/gpu/drm/i915/intel_step.c | 12 +-
+ drivers/gpu/drm/i915/intel_uncore.c | 44 +-
+ drivers/gpu/drm/i915/intel_wopcm.c | 10 +-
+ drivers/gpu/drm/i915/selftests/i915_active.c | 2 +-
+ drivers/gpu/drm/i915/selftests/i915_buddy.c | 789 -
+ drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 14 +-
+ .../gpu/drm/i915/selftests/i915_mock_selftests.h | 1 -
+ drivers/gpu/drm/i915/selftests/i915_perf.c | 9 +-
+ drivers/gpu/drm/i915/selftests/i915_request.c | 8 +-
+ drivers/gpu/drm/i915/selftests/i915_vma.c | 3 +
+ drivers/gpu/drm/i915/selftests/igt_spinner.c | 16 +-
+ .../gpu/drm/i915/selftests/intel_memory_region.c | 220 +-
+ drivers/gpu/drm/i915/selftests/intel_uncore.c | 10 +-
+ drivers/gpu/drm/i915/selftests/librapl.c | 10 +
+ drivers/gpu/drm/i915/selftests/librapl.h | 4 +
+ drivers/gpu/drm/i915/selftests/mock_gem_device.c | 13 +-
+ drivers/gpu/drm/i915/selftests/mock_region.c | 70 +-
+ drivers/gpu/drm/imx/dcss/dcss-kms.c | 1 -
+ drivers/gpu/drm/imx/imx-drm-core.c | 22 +-
+ drivers/gpu/drm/imx/imx-ldb.c | 5 +
+ drivers/gpu/drm/imx/ipuv3-crtc.c | 11 +-
+ drivers/gpu/drm/imx/ipuv3-plane.c | 115 +-
+ drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 72 +-
+ drivers/gpu/drm/ingenic/ingenic-drm.h | 1 +
+ drivers/gpu/drm/ingenic/ingenic-ipu.c | 23 +-
+ drivers/gpu/drm/kmb/kmb_dsi.c | 10 +-
+ drivers/gpu/drm/mcde/mcde_dsi.c | 4 +-
+ drivers/gpu/drm/mediatek/mtk_disp_color.c | 3 +-
+ drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 4 +-
+ drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 3 +-
+ drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 4 +-
+ drivers/gpu/drm/mediatek/mtk_dpi.c | 129 +-
+ drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 2 +-
+ drivers/gpu/drm/mediatek/mtk_hdmi.c | 17 +
+ drivers/gpu/drm/meson/meson_drv.c | 27 +-
+ drivers/gpu/drm/meson/meson_dw_hdmi.c | 1 +
+ drivers/gpu/drm/mga/mga_dma.c | 29 +-
+ drivers/gpu/drm/mga/mga_drv.h | 1 -
+ drivers/gpu/drm/mga/mga_state.c | 3 +-
+ drivers/gpu/drm/mgag200/mgag200_drv.c | 5 +-
+ drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +-
+ drivers/gpu/drm/msm/Kconfig | 3 +-
+ drivers/gpu/drm/msm/Makefile | 3 +-
+ drivers/gpu/drm/msm/adreno/a2xx.xml.h | 60 +-
+ drivers/gpu/drm/msm/adreno/a3xx.xml.h | 40 +-
+ drivers/gpu/drm/msm/adreno/a4xx.xml.h | 38 +-
+ drivers/gpu/drm/msm/adreno/a5xx.xml.h | 95 +-
+ drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 29 +-
+ drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 +-
+ drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 4 +-
+ drivers/gpu/drm/msm/adreno/a6xx.xml.h | 2201 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 55 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h | 34 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 305 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 2 -
+ drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 44 +-
+ drivers/gpu/drm/msm/adreno/a6xx_hfi.c | 33 +
+ drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 30 +-
+ drivers/gpu/drm/msm/adreno/adreno_device.c | 14 +
+ drivers/gpu/drm/msm/adreno/adreno_gpu.c | 26 +-
+ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 13 +-
+ drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 119 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c | 230 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h | 43 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 22 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 43 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 110 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 4 -
+ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 58 +-
+ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 54 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 6 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c | 139 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h | 22 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 202 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 16 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 6 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c | 7 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 1508 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h | 132 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 6 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 6 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 2 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c | 6 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 6 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h | 4 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 6 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 6 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 75 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 8 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 8 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 23 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 4 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 63 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 14 +-
+ drivers/gpu/drm/msm/disp/mdp4/mdp4.xml.h | 34 +-
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 2 -
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 8 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5.xml.h | 38 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 35 +
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.h | 7 +
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 12 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h | 5 -
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 135 +-
+ drivers/gpu/drm/msm/disp/mdp_common.xml.h | 34 +-
+ drivers/gpu/drm/msm/disp/msm_disp_snapshot.c | 125 +
+ drivers/gpu/drm/msm/disp/msm_disp_snapshot.h | 136 +
+ drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c | 187 +
+ drivers/gpu/drm/msm/dp/dp_aux.c | 181 +-
+ drivers/gpu/drm/msm/dp/dp_aux.h | 8 -
+ drivers/gpu/drm/msm/dp/dp_catalog.c | 18 +-
+ drivers/gpu/drm/msm/dp/dp_catalog.h | 7 +-
+ drivers/gpu/drm/msm/dp/dp_ctrl.c | 93 +-
+ drivers/gpu/drm/msm/dp/dp_ctrl.h | 3 +-
+ drivers/gpu/drm/msm/dp/dp_display.c | 121 +-
+ drivers/gpu/drm/msm/dp/dp_display.h | 1 +
+ drivers/gpu/drm/msm/dp/dp_link.c | 21 +-
+ drivers/gpu/drm/msm/dp/dp_panel.c | 4 +-
+ drivers/gpu/drm/msm/dp/dp_power.h | 4 +-
+ drivers/gpu/drm/msm/dsi/dsi.c | 6 +
+ drivers/gpu/drm/msm/dsi/dsi.h | 4 +-
+ drivers/gpu/drm/msm/dsi/dsi.xml.h | 1722 +-
+ drivers/gpu/drm/msm/dsi/dsi_host.c | 30 +-
+ drivers/gpu/drm/msm/dsi/dsi_manager.c | 12 +-
+ drivers/gpu/drm/msm/dsi/dsi_phy_10nm.xml.h | 228 +
+ drivers/gpu/drm/msm/dsi/dsi_phy_14nm.xml.h | 310 +
+ drivers/gpu/drm/msm/dsi/dsi_phy_20nm.xml.h | 238 +
+ drivers/gpu/drm/msm/dsi/dsi_phy_28nm.xml.h | 385 +
+ drivers/gpu/drm/msm/dsi/dsi_phy_28nm_8960.xml.h | 287 +
+ drivers/gpu/drm/msm/dsi/dsi_phy_5nm.xml.h | 480 +
+ drivers/gpu/drm/msm/dsi/dsi_phy_7nm.xml.h | 482 +
+ drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 34 +-
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 31 +-
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 4 +
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 1 +
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 1 +
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 1 +
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 1 +
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 1 +
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 7 +-
+ drivers/gpu/drm/msm/dsi/sfpb.xml.h | 34 +-
+ drivers/gpu/drm/msm/edp/edp.h | 3 +-
+ drivers/gpu/drm/msm/edp/edp.xml.h | 34 +-
+ drivers/gpu/drm/msm/edp/edp_aux.c | 5 +-
+ drivers/gpu/drm/msm/edp/edp_ctrl.c | 8 +-
+ drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 34 +-
+ drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 34 +-
+ drivers/gpu/drm/msm/msm_debugfs.c | 31 +
+ drivers/gpu/drm/msm/msm_drv.c | 33 +-
+ drivers/gpu/drm/msm/msm_drv.h | 24 +-
+ drivers/gpu/drm/msm/msm_fb.c | 8 +-
+ drivers/gpu/drm/msm/msm_fbdev.c | 5 +-
+ drivers/gpu/drm/msm/msm_gem.c | 49 +-
+ drivers/gpu/drm/msm/msm_gem.h | 1 +
+ drivers/gpu/drm/msm/msm_gem_shrinker.c | 18 +
+ drivers/gpu/drm/msm/msm_gem_submit.c | 1 +
+ drivers/gpu/drm/msm/msm_gpu.c | 51 +-
+ drivers/gpu/drm/msm/msm_gpu.h | 29 +-
+ drivers/gpu/drm/msm/msm_gpummu.c | 5 +
+ drivers/gpu/drm/msm/msm_iommu.c | 22 +-
+ drivers/gpu/drm/msm/msm_kms.h | 9 +
+ drivers/gpu/drm/msm/msm_mmu.h | 5 +-
+ drivers/gpu/drm/mxsfb/Kconfig | 1 -
+ drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +-
+ drivers/gpu/drm/nouveau/dispnv50/wndw.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_abi16.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_bo.c | 59 +-
+ drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_connector.c | 29 +-
+ drivers/gpu/drm/nouveau/nouveau_display.c | 19 -
+ drivers/gpu/drm/nouveau/nouveau_display.h | 2 -
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 9 +-
+ drivers/gpu/drm/nouveau/nouveau_fbcon.c | 6 +-
+ drivers/gpu/drm/nouveau/nouveau_fence.c | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_gem.c | 60 +-
+ drivers/gpu/drm/nouveau/nouveau_mem.c | 11 +-
+ drivers/gpu/drm/nouveau/nouveau_mem.h | 15 +-
+ drivers/gpu/drm/nouveau/nouveau_ttm.c | 83 +-
+ drivers/gpu/drm/nouveau/nouveau_ttm.h | 1 -
+ drivers/gpu/drm/nouveau/nouveau_vmm.c | 4 +-
+ drivers/gpu/drm/nouveau/nv17_fence.c | 2 +-
+ drivers/gpu/drm/nouveau/nv50_fence.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mc/tu102.c | 6 +-
+ drivers/gpu/drm/panel/Kconfig | 1 +
+ drivers/gpu/drm/panel/panel-elida-kd35t133.c | 8 +
+ .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 2 +-
+ drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c | 6 +-
+ drivers/gpu/drm/panel/panel-simple.c | 142 +-
+ drivers/gpu/drm/panel/panel-sitronix-st7701.c | 2 +-
+ drivers/gpu/drm/panfrost/panfrost_devfreq.c | 9 +
+ drivers/gpu/drm/panfrost/panfrost_device.c | 1 -
+ drivers/gpu/drm/panfrost/panfrost_device.h | 1 +
+ drivers/gpu/drm/panfrost/panfrost_drv.c | 17 +-
+ drivers/gpu/drm/panfrost/panfrost_gpu.c | 1 +
+ drivers/gpu/drm/panfrost/panfrost_job.c | 2 +-
+ drivers/gpu/drm/panfrost/panfrost_regs.h | 1 +
+ drivers/gpu/drm/pl111/Kconfig | 1 +
+ drivers/gpu/drm/qxl/qxl_debugfs.c | 2 +-
+ drivers/gpu/drm/qxl/qxl_display.c | 5 +-
+ drivers/gpu/drm/qxl/qxl_drv.c | 8 +-
+ drivers/gpu/drm/qxl/qxl_drv.h | 9 +-
+ drivers/gpu/drm/qxl/qxl_dumb.c | 19 +-
+ drivers/gpu/drm/qxl/qxl_ioctl.c | 4 +-
+ drivers/gpu/drm/qxl/qxl_object.c | 10 +-
+ drivers/gpu/drm/qxl/qxl_object.h | 5 -
+ drivers/gpu/drm/qxl/qxl_ttm.c | 5 +-
+ drivers/gpu/drm/r128/ati_pcigart.c | 35 +-
+ drivers/gpu/drm/r128/r128_cce.c | 2 +-
+ drivers/gpu/drm/r128/r128_drv.c | 4 +-
+ drivers/gpu/drm/r128/r128_drv.h | 2 +-
+ drivers/gpu/drm/r128/r128_state.c | 3 +-
+ drivers/gpu/drm/radeon/atombios_dp.c | 5 +-
+ drivers/gpu/drm/radeon/cik.c | 6 +-
+ drivers/gpu/drm/radeon/evergreen.c | 4 +-
+ drivers/gpu/drm/radeon/evergreen.h | 1 -
+ drivers/gpu/drm/radeon/ni.c | 4 +-
+ drivers/gpu/drm/radeon/r100.c | 6 +-
+ drivers/gpu/drm/radeon/r300.c | 4 +-
+ drivers/gpu/drm/radeon/r420.c | 5 +-
+ drivers/gpu/drm/radeon/r520.c | 4 +-
+ drivers/gpu/drm/radeon/r600.c | 4 +-
+ drivers/gpu/drm/radeon/radeon.h | 44 +-
+ drivers/gpu/drm/radeon/radeon_agp.c | 118 +-
+ drivers/gpu/drm/radeon/radeon_asic.h | 2 -
+ drivers/gpu/drm/radeon/radeon_cs.c | 10 +-
+ drivers/gpu/drm/radeon/radeon_device.c | 3 +-
+ drivers/gpu/drm/radeon/radeon_display.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_dp_mst.c | 7 +
+ drivers/gpu/drm/radeon/radeon_drv.c | 19 +-
+ drivers/gpu/drm/radeon/radeon_fence.c | 5 +-
+ drivers/gpu/drm/radeon/radeon_gem.c | 65 +-
+ drivers/gpu/drm/radeon/radeon_kms.c | 18 +-
+ drivers/gpu/drm/radeon/radeon_mn.c | 4 +-
+ drivers/gpu/drm/radeon/radeon_object.c | 22 +-
+ drivers/gpu/drm/radeon/radeon_object.h | 6 +-
+ drivers/gpu/drm/radeon/radeon_pm.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_sync.c | 4 +-
+ drivers/gpu/drm/radeon/radeon_trace.h | 2 +-
+ drivers/gpu/drm/radeon/radeon_ttm.c | 80 +-
+ drivers/gpu/drm/radeon/radeon_ttm.h | 1 -
+ drivers/gpu/drm/radeon/radeon_uvd.c | 26 +-
+ drivers/gpu/drm/radeon/radeon_vm.c | 4 +-
+ drivers/gpu/drm/radeon/rs400.c | 4 +-
+ drivers/gpu/drm/radeon/rs600.c | 4 +-
+ drivers/gpu/drm/radeon/rs690.c | 4 +-
+ drivers/gpu/drm/radeon/rv515.c | 4 +-
+ drivers/gpu/drm/radeon/rv770.c | 4 +-
+ drivers/gpu/drm/radeon/si.c | 4 +-
+ drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +
+ drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 +-
+ drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 45 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 10 +
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1 +
+ drivers/gpu/drm/rockchip/rockchip_lvds.c | 4 +-
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 54 +-
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.h | 1 +
+ drivers/gpu/drm/savage/savage_bci.c | 26 +-
+ drivers/gpu/drm/scheduler/sched_entity.c | 14 +-
+ drivers/gpu/drm/scheduler/sched_main.c | 44 +-
+ drivers/gpu/drm/selftests/test-drm_framebuffer.c | 1 +
+ drivers/gpu/drm/sis/sis_drv.c | 3 +-
+ drivers/gpu/drm/sti/sti_hda.c | 6 +-
+ drivers/gpu/drm/sti/sti_hdmi_tx3g4c28phy.c | 4 +-
+ drivers/gpu/drm/sti/sti_hqvdp.c | 2 +-
+ drivers/gpu/drm/sti/sti_tvout.c | 18 +-
+ drivers/gpu/drm/stm/ltdc.c | 35 +-
+ drivers/gpu/drm/sun4i/sun4i_drv.c | 5 +-
+ drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 7 +-
+ drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 8 +-
+ drivers/gpu/drm/tegra/dc.c | 12 +-
+ drivers/gpu/drm/tegra/dc.h | 26 +
+ drivers/gpu/drm/tegra/dpaux.c | 5 +-
+ drivers/gpu/drm/tegra/drm.c | 6 +-
+ drivers/gpu/drm/tegra/hub.c | 182 +-
+ drivers/gpu/drm/tegra/plane.c | 23 +-
+ drivers/gpu/drm/tegra/plane.h | 3 +-
+ drivers/gpu/drm/tegra/vic.c | 2 -
+ drivers/gpu/drm/tegra/vic.h | 1 -
+ drivers/gpu/drm/tiny/Kconfig | 16 +
+ drivers/gpu/drm/tiny/Makefile | 1 +
+ drivers/gpu/drm/tiny/cirrus.c | 5 +-
+ drivers/gpu/drm/tiny/hx8357d.c | 6 +-
+ drivers/gpu/drm/tiny/ili9225.c | 12 +-
+ drivers/gpu/drm/tiny/ili9341.c | 12 +-
+ drivers/gpu/drm/tiny/ili9486.c | 12 +-
+ drivers/gpu/drm/tiny/mi0283qt.c | 12 +-
+ drivers/gpu/drm/tiny/simpledrm.c | 901 +
+ drivers/gpu/drm/tiny/st7586.c | 12 +-
+ drivers/gpu/drm/tiny/st7735r.c | 12 +-
+ drivers/gpu/drm/ttm/Makefile | 2 +-
+ drivers/gpu/drm/ttm/ttm_agp_backend.c | 8 +-
+ drivers/gpu/drm/ttm/ttm_bo.c | 250 +-
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 379 +-
+ drivers/gpu/drm/ttm/ttm_bo_vm.c | 156 +-
+ drivers/gpu/drm/ttm/ttm_device.c | 25 +-
+ drivers/gpu/drm/ttm/ttm_module.c | 35 +
+ drivers/gpu/drm/ttm/ttm_module.h | 3 +
+ drivers/gpu/drm/ttm/ttm_range_manager.c | 95 +-
+ drivers/gpu/drm/ttm/ttm_resource.c | 236 +-
+ drivers/gpu/drm/ttm/ttm_sys_manager.c | 48 +
+ drivers/gpu/drm/ttm/ttm_tt.c | 67 +-
+ drivers/gpu/drm/vboxvideo/hgsmi_base.c | 19 +-
+ drivers/gpu/drm/vboxvideo/modesetting.c | 20 +-
+ drivers/gpu/drm/vboxvideo/vbox_drv.c | 3 +-
+ drivers/gpu/drm/vc4/vc4_crtc.c | 68 +-
+ drivers/gpu/drm/vc4/vc4_drv.c | 20 +-
+ drivers/gpu/drm/vc4/vc4_drv.h | 2 +-
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 234 +-
+ drivers/gpu/drm/vc4/vc4_hdmi.h | 16 +-
+ drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 3 +
+ drivers/gpu/drm/vc4/vc4_kms.c | 1 -
+ drivers/gpu/drm/vc4/vc4_txp.c | 2 +-
+ drivers/gpu/drm/vc4/vc4_vec.c | 27 +-
+ drivers/gpu/drm/vgem/vgem_drv.c | 2 +-
+ drivers/gpu/drm/vgem/vgem_fence.c | 3 +-
+ drivers/gpu/drm/via/via_dma.c | 1 -
+ drivers/gpu/drm/via/via_dmablit.c | 15 +-
+ drivers/gpu/drm/via/via_map.c | 3 +-
+ drivers/gpu/drm/virtio/virtgpu_drv.c | 14 +-
+ drivers/gpu/drm/virtio/virtgpu_gem.c | 8 +
+ drivers/gpu/drm/virtio/virtgpu_ioctl.c | 5 +-
+ drivers/gpu/drm/virtio/virtgpu_kms.c | 4 +
+ drivers/gpu/drm/virtio/virtgpu_object.c | 3 +
+ drivers/gpu/drm/vkms/vkms_composer.c | 104 +-
+ drivers/gpu/drm/vkms/vkms_drv.c | 5 +
+ drivers/gpu/drm/vkms/vkms_drv.h | 9 +-
+ drivers/gpu/drm/vkms/vkms_output.c | 28 +-
+ drivers/gpu/drm/vkms/vkms_plane.c | 51 +-
+ drivers/gpu/drm/vmwgfx/Kconfig | 10 +-
+ drivers/gpu/drm/vmwgfx/Makefile | 6 +-
+ .../drm/vmwgfx/device_include/svga3d_surfacedefs.h | 8 +-
+ drivers/gpu/drm/vmwgfx/device_include/svga_reg.h | 55 +-
+ drivers/gpu/drm/vmwgfx/ttm_lock.c | 194 -
+ drivers/gpu/drm/vmwgfx/ttm_lock.h | 218 -
+ drivers/gpu/drm/vmwgfx/ttm_object.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 8 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 10 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 85 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 134 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 6 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 25 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 12 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 169 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 147 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 53 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 8 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 18 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 2 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 30 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 60 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 77 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 36 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 36 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 31 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_msg.h | 214 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_msg_arm64.h | 130 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_msg_x86.h | 219 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 8 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_reg.h | 4 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 10 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 18 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_simple_resource.c | 5 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 6 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_streamoutput.c | 6 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 46 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 53 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 30 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 53 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 4 +-
+ drivers/gpu/drm/xlnx/zynqmp_dp.c | 5 +-
+ drivers/gpu/drm/zte/Kconfig | 1 -
+ drivers/gpu/ipu-v3/ipu-dc.c | 5 +
+ drivers/gpu/ipu-v3/ipu-di.c | 7 +
+ drivers/gpu/ipu-v3/ipu-dp.c | 25 +-
+ drivers/gpu/vga/vgaarb.c | 31 +-
+ drivers/infiniband/core/umem_dmabuf.c | 2 +-
+ drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 50 +
+ drivers/iommu/arm/arm-smmu/arm-smmu.c | 9 +-
+ drivers/iommu/arm/arm-smmu/arm-smmu.h | 2 +
+ drivers/pci/pci-driver.c | 1 +
+ drivers/video/fbdev/Kconfig | 2 +-
+ drivers/video/fbdev/aty/mach64_cursor.c | 2 +-
+ drivers/video/fbdev/imxfb.c | 2 +-
+ drivers/video/fbdev/matrox/matroxfb_base.c | 5 +-
+ drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 6 +-
+ include/drm/amd_asic_type.h | 2 +
+ include/drm/bridge/dw_hdmi.h | 2 +
+ include/drm/drm_agpsupport.h | 117 -
+ include/drm/drm_aperture.h | 35 +
+ include/drm/drm_atomic.h | 16 +
+ include/drm/drm_cache.h | 7 +
+ include/drm/drm_connector.h | 4 +
+ include/drm/drm_device.h | 9 +-
+ include/drm/drm_dp_dual_mode_helper.h | 14 +-
+ include/drm/drm_dp_helper.h | 52 +-
+ include/drm/drm_dp_mst_helper.h | 15 +-
+ include/drm/drm_fb_cma_helper.h | 5 +
+ include/drm/drm_fb_helper.h | 51 -
+ include/drm/drm_format_helper.h | 10 +-
+ include/drm/drm_fourcc.h | 9 -
+ include/drm/drm_gem_cma_helper.h | 3 +
+ include/drm/drm_gem_ttm_helper.h | 5 +-
+ include/drm/drm_gem_vram_helper.h | 7 +-
+ include/drm/drm_legacy.h | 86 +-
+ include/drm/drm_mode_config.h | 2 +
+ include/drm/drm_print.h | 20 +-
+ include/drm/gpu_scheduler.h | 2 +-
+ include/drm/i915_pciids.h | 23 +
+ include/drm/ttm/ttm_bo_api.h | 38 +-
+ include/drm/ttm/ttm_bo_driver.h | 64 +-
+ include/drm/ttm/ttm_caching.h | 2 +
+ include/drm/ttm/ttm_device.h | 15 -
+ include/drm/ttm/ttm_kmap_iter.h | 61 +
+ include/drm/ttm/ttm_range_manager.h | 42 +
+ include/drm/ttm/ttm_resource.h | 113 +-
+ include/drm/ttm/ttm_tt.h | 29 +
+ include/linux/adreno-smmu-priv.h | 38 +-
+ include/linux/dma-resv.h | 75 +-
+ include/linux/pci.h | 3 +
+ include/uapi/drm/amdgpu_drm.h | 18 +-
+ include/uapi/drm/drm.h | 28 +-
+ include/uapi/drm/drm_fourcc.h | 7 +
+ include/uapi/drm/drm_mode.h | 7 +-
+ include/uapi/drm/etnaviv_drm.h | 3 +
+ include/uapi/drm/i915_drm.h | 393 +-
+ include/uapi/drm/msm_drm.h | 7 +-
+ include/uapi/drm/panfrost_drm.h | 1 +
+ include/uapi/linux/kfd_ioctl.h | 171 +-
+ include/video/imx-ipu-v3.h | 2 +
+ 1290 files changed, 312110 insertions(+), 22324 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/google,cros-ec-anx7688.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,sn65dsi83.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/faraday,tve200.txt
+ create mode 100644 Documentation/devicetree/bindings/display/faraday,tve200.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,cec.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,hdmi-ddc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,hdmi.txt
+ create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,hdmi.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/msm/dp-controller.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/msm/dpu-sc7180.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/msm/dpu-sdm845.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/msm/dpu.txt
+ create mode 100644 Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/msm/dsi-phy-10nm.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/msm/dsi-phy-14nm.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/msm/dsi-phy-20nm.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/msm/dsi-phy-28nm.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/msm/dsi-phy-common.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/msm/dsi.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,lms397kf04.yaml
+ create mode 100644 Documentation/gpu/driver-uapi.rst
+ create mode 100644 Documentation/gpu/rfc/i915_gem_lmem.rst
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/beige_goby_reg_init.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/yellow_carp_reg_init.c
+ create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
+ create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_migrate.h
+ create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_aldebaran.h
+ create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_svm.c
+ create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_svm.h
+ create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c
+ create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_dpcd.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/dcn303_dccg.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/dcn303_hwseq.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/dcn303_hwseq.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/dcn303_init.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/dcn303_init.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/dcn303_resource.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/dcn303_resource.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_panel_cntl.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_panel_cntl.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/link_dpcd.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn303/irq_service_dcn303.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn303/irq_service_dcn303.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn31/irq_service_dcn31.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn31/irq_service_dcn31.h
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn303.c
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn303.h
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c
+ create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_3_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_3_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_1_2_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_1_2_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_3_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dpcs_3_0_3_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_4_2_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_4_2_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_1_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_1_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/beige_goby_ip_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/yellow_carp_offset.h
+ create mode 100644 drivers/gpu/drm/amd/pm/inc/smu13_driver_if_yellow_carp.h
+ create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h
+ create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_pmfw.h
+ create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_ppsmc.h
+ create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c
+ create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c
+ create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.h
+ create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c
+ create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.h
+ create mode 100644 drivers/gpu/drm/bridge/cros-ec-anx7688.c
+ create mode 100644 drivers/gpu/drm/bridge/ite-it66121.c
+ create mode 100644 drivers/gpu/drm/bridge/ti-sn65dsi83.c
+ create mode 100644 drivers/gpu/drm/drm_aperture.c
+ create mode 100644 drivers/gpu/drm/hyperv/Makefile
+ create mode 100644 drivers/gpu/drm/hyperv/hyperv_drm.h
+ create mode 100644 drivers/gpu/drm/hyperv/hyperv_drm_drv.c
+ create mode 100644 drivers/gpu/drm/hyperv/hyperv_drm_modeset.c
+ create mode 100644 drivers/gpu/drm/hyperv/hyperv_drm_proto.c
+ delete mode 100644 drivers/gpu/drm/i915/display/intel_csr.h
+ rename drivers/gpu/drm/i915/display/{intel_csr.c => intel_dmc.c} (60%)
+ create mode 100644 drivers/gpu/drm/i915/display/intel_dmc.h
+ create mode 100644 drivers/gpu/drm/i915/display/intel_dp_hdcp.h
+ create mode 100644 drivers/gpu/drm/i915/display/intel_qp_tables.c
+ create mode 100644 drivers/gpu/drm/i915/display/intel_qp_tables.h
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/abi/guc_communication_mmio_abi.h
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/abi/guc_errors_abi.h
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/abi/guc_messages_abi.h
+ delete mode 100644 drivers/gpu/drm/i915/i915_buddy.c
+ delete mode 100644 drivers/gpu/drm/i915/i915_buddy.h
+ create mode 100644 drivers/gpu/drm/i915/intel_region_ttm.c
+ create mode 100644 drivers/gpu/drm/i915/intel_region_ttm.h
+ delete mode 100644 drivers/gpu/drm/i915/selftests/i915_buddy.c
+ delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c
+ create mode 100644 drivers/gpu/drm/msm/disp/msm_disp_snapshot.c
+ create mode 100644 drivers/gpu/drm/msm/disp/msm_disp_snapshot.h
+ create mode 100644 drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c
+ create mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_10nm.xml.h
+ create mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_14nm.xml.h
+ create mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_20nm.xml.h
+ create mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_28nm.xml.h
+ create mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_28nm_8960.xml.h
+ create mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_5nm.xml.h
+ create mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_7nm.xml.h
+ create mode 100644 drivers/gpu/drm/tiny/simpledrm.c
+ create mode 100644 drivers/gpu/drm/ttm/ttm_sys_manager.c
+ delete mode 100644 drivers/gpu/drm/vmwgfx/ttm_lock.c
+ delete mode 100644 drivers/gpu/drm/vmwgfx/ttm_lock.h
+ delete mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_msg.h
+ create mode 100755 drivers/gpu/drm/vmwgfx/vmwgfx_msg_arm64.h
+ create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_msg_x86.h
+ delete mode 100644 include/drm/drm_agpsupport.h
+ create mode 100644 include/drm/drm_aperture.h
+ create mode 100644 include/drm/ttm/ttm_kmap_iter.h
+ create mode 100644 include/drm/ttm/ttm_range_manager.h
+Merging drm-misc/for-linux-next (eed75ce7c826 drm/amdgpu: fix amdgpu_preempt_mgr_new())
+$ git merge drm-misc/for-linux-next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging amdgpu/drm-next (464c4e66f99b PCI: quirks: Quirk PCI d3hot delay for AMD xhci)
+$ git merge amdgpu/drm-next
+Auto-merging drivers/usb/host/xhci-pci.c
+Auto-merging drivers/pci/quirks.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/Kconfig | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 +-
+ drivers/gpu/drm/amd/display/dc/dc.h | 1 +
+ .../amd/display/dc/dce110/dce110_hw_sequencer.c | 31 ++++++-
+ drivers/gpu/drm/amd/include/amd_shared.h | 10 ++-
+ drivers/gpu/drm/amd/pm/inc/smu_types.h | 2 +-
+ drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +-
+ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 8 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 4 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 -
+ drivers/gpu/drm/radeon/radeon.h | 3 +
+ drivers/gpu/drm/radeon/radeon_audio.c | 95 ++++++++++++++++++++++
+ drivers/pci/quirks.c | 1 +
+ drivers/usb/host/xhci-pci.c | 3 +
+ 20 files changed, 168 insertions(+), 20 deletions(-)
+Merging drm-intel/for-linux-next (1bd8a7dc28c1 Merge tag 'exynos-drm-next-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next)
+$ git merge drm-intel/for-linux-next
+Already up to date.
+Merging drm-tegra/drm/tegra/for-next (a562c0783b5f drm/tegra: Don't call SET_APPLICATION_ID in VIC boot)
+$ git merge drm-tegra/drm/tegra/for-next
+Auto-merging drivers/gpu/drm/tegra/dpaux.c
+Merge made by the 'recursive' strategy.
+Merging drm-msm/msm-next (e88bbc91849b Revert "drm/msm/mdp5: provide dynamic bandwidth management")
+$ git merge drm-msm/msm-next
+Already up to date.
+Merging imx-drm/imx-drm/next (fc1e985b67f9 drm/imx: ipuv3-plane: add color encoding and range properties)
+$ git merge imx-drm/imx-drm/next
+Already up to date.
+Merging etnaviv/etnaviv/next (989c9dad6131 drm/etnaviv: add HWDB entry for GC7000 rev 6204)
+$ git merge etnaviv/etnaviv/next
+Already up to date.
+Merging regmap/for-next (d17032f2befa Merge remote-tracking branch 'regmap/for-5.14' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/Kconfig | 6 +-
+ drivers/base/regmap/Makefile | 1 +
+ drivers/base/regmap/regmap-i2c.c | 45 ++++++++++++---
+ drivers/base/regmap/regmap-irq.c | 7 +++
+ drivers/base/regmap/regmap-mdio.c | 116 ++++++++++++++++++++++++++++++++++++++
+ drivers/base/regmap/regmap.c | 15 +++++
+ include/linux/regmap.h | 40 +++++++++++++
+ 7 files changed, 222 insertions(+), 8 deletions(-)
+ create mode 100644 drivers/base/regmap/regmap-mdio.c
+Merging sound/for-next (3099406ef483 ALSA: hda: Release codec display power during shutdown/reboot)
+$ git merge sound/for-next
+Auto-merging sound/soc/soc-core.c
+Auto-merging sound/isa/sb/sb8.c
+Auto-merging sound/isa/sb/sb16_main.c
+Auto-merging sound/isa/gus/gus_main.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/sound/hd-audio/controls.rst | 2 +-
+ MAINTAINERS | 7 +
+ include/sound/core.h | 50 +-
+ include/sound/memalloc.h | 80 +-
+ include/sound/pcm.h | 20 +-
+ include/sound/rawmidi.h | 2 +
+ include/uapi/sound/asound.h | 30 +-
+ sound/ac97/bus.c | 2 +-
+ sound/aoa/soundbus/i2sbus/pcm.c | 4 +-
+ sound/arm/pxa2xx-ac97.c | 4 +-
+ sound/core/control.c | 38 +-
+ sound/core/control_compat.c | 14 +-
+ sound/core/control_led.c | 36 +-
+ sound/core/hwdep.c | 6 +-
+ sound/core/info_oss.c | 3 +-
+ sound/core/init.c | 77 +-
+ sound/core/memalloc.c | 444 ++--
+ sound/core/memalloc_local.h | 19 +
+ sound/core/oss/mixer_oss.c | 45 +-
+ sound/core/oss/pcm_oss.c | 70 +-
+ sound/core/oss/pcm_plugin.c | 26 +-
+ sound/core/pcm.c | 4 +-
+ sound/core/pcm_compat.c | 6 +-
+ sound/core/pcm_lib.c | 64 +-
+ sound/core/pcm_local.h | 5 -
+ sound/core/pcm_memory.c | 21 -
+ sound/core/pcm_misc.c | 12 +-
+ sound/core/pcm_native.c | 51 +-
+ sound/core/rawmidi.c | 93 +-
+ sound/core/rawmidi_compat.c | 4 +-
+ sound/core/seq/oss/seq_oss.c | 26 +-
+ sound/core/seq/oss/seq_oss_init.c | 10 +-
+ sound/core/seq/oss/seq_oss_midi.c | 33 +-
+ sound/core/seq/oss/seq_oss_rw.c | 3 +-
+ sound/core/seq/oss/seq_oss_synth.c | 9 +-
+ sound/core/seq/oss/seq_oss_writeq.c | 3 +-
+ sound/core/seq/seq_clientmgr.c | 51 +-
+ sound/core/seq/seq_dummy.c | 3 +-
+ sound/core/seq/seq_fifo.c | 3 +-
+ sound/core/seq/seq_memory.c | 6 +-
+ sound/core/seq/seq_midi.c | 27 +-
+ sound/core/seq/seq_queue.c | 21 +-
+ sound/core/seq/seq_virmidi.c | 9 +-
+ sound/core/sgbuf.c | 90 +-
+ sound/core/sound.c | 3 +-
+ sound/core/sound_oss.c | 3 +-
+ sound/drivers/mpu401/mpu401.c | 9 +-
+ sound/drivers/mpu401/mpu401_uart.c | 19 +-
+ sound/drivers/mtpav.c | 15 +-
+ sound/drivers/mts64.c | 15 +-
+ sound/drivers/opl3/opl3_lib.c | 42 +-
+ sound/drivers/opl3/opl3_midi.c | 3 +-
+ sound/drivers/opl3/opl3_oss.c | 6 +-
+ sound/drivers/opl3/opl3_seq.c | 9 +-
+ sound/drivers/portman2x4.c | 15 +-
+ sound/drivers/serial-u16550.c | 27 +-
+ sound/drivers/vx/vx_core.c | 60 +-
+ sound/drivers/vx/vx_hwdep.c | 12 +-
+ sound/drivers/vx/vx_mixer.c | 39 +-
+ sound/drivers/vx/vx_pcm.c | 32 +-
+ sound/firewire/Kconfig | 30 +-
+ sound/firewire/amdtp-am824.c | 4 +-
+ sound/firewire/amdtp-am824.h | 2 +-
+ sound/firewire/amdtp-stream-trace.h | 2 +-
+ sound/firewire/amdtp-stream.c | 1222 +++++++---
+ sound/firewire/amdtp-stream.h | 105 +-
+ sound/firewire/bebob/bebob.c | 281 ++-
+ sound/firewire/bebob/bebob.h | 22 +-
+ sound/firewire/bebob/bebob_stream.c | 90 +-
+ sound/firewire/dice/dice-stream.c | 50 +-
+ sound/firewire/dice/dice-transaction.c | 2 +-
+ sound/firewire/dice/dice.c | 138 +-
+ sound/firewire/dice/dice.h | 4 -
+ sound/firewire/digi00x/amdtp-dot.c | 9 +-
+ sound/firewire/digi00x/digi00x-stream.c | 13 +-
+ sound/firewire/digi00x/digi00x.c | 101 +-
+ sound/firewire/digi00x/digi00x.h | 3 -
+ sound/firewire/fireface/amdtp-ff.c | 2 +-
+ sound/firewire/fireface/ff-stream.c | 13 +-
+ sound/firewire/fireface/ff.c | 90 +-
+ sound/firewire/fireface/ff.h | 3 -
+ sound/firewire/fireworks/fireworks.c | 120 +-
+ sound/firewire/fireworks/fireworks.h | 13 +-
+ sound/firewire/fireworks/fireworks_stream.c | 24 +-
+ sound/firewire/lib.c | 32 -
+ sound/firewire/lib.h | 3 -
+ sound/firewire/motu/Makefile | 3 +-
+ sound/firewire/motu/amdtp-motu.c | 139 +-
+ sound/firewire/motu/motu-protocol-v1.c | 470 ++++
+ sound/firewire/motu/motu-protocol-v2.c | 181 +-
+ sound/firewire/motu/motu-protocol-v3.c | 92 +-
+ sound/firewire/motu/motu-stream.c | 34 +-
+ sound/firewire/motu/motu.c | 91 +-
+ sound/firewire/motu/motu.h | 47 +-
+ sound/firewire/oxfw/oxfw-stream.c | 55 +-
+ sound/firewire/oxfw/oxfw.c | 259 +--
+ sound/firewire/oxfw/oxfw.h | 19 +-
+ sound/firewire/tascam/amdtp-tascam.c | 6 +-
+ sound/firewire/tascam/tascam-stream.c | 26 +-
+ sound/firewire/tascam/tascam.c | 92 +-
+ sound/firewire/tascam/tascam.h | 3 +-
+ sound/i2c/cs8427.c | 24 +-
+ sound/i2c/other/ak4114.c | 3 +-
+ sound/i2c/other/ak4117.c | 3 +-
+ sound/i2c/tea6330t.c | 26 +-
+ sound/isa/ad1816a/ad1816a.c | 23 +-
+ sound/isa/ad1816a/ad1816a_lib.c | 27 +-
+ sound/isa/als100.c | 18 +-
+ sound/isa/azt2320.c | 21 +-
+ sound/isa/cmi8330.c | 37 +-
+ sound/isa/cs423x/cs4236.c | 21 +-
+ sound/isa/cs423x/cs4236_lib.c | 12 +-
+ sound/isa/es1688/es1688_lib.c | 3 +-
+ sound/isa/es18xx.c | 51 +-
+ sound/isa/gus/gus_main.c | 20 +-
+ sound/isa/gus/gus_mem.c | 3 +-
+ sound/isa/gus/gus_mixer.c | 6 +-
+ sound/isa/gus/gus_pcm.c | 23 +-
+ sound/isa/gus/gus_uart.c | 3 +-
+ sound/isa/gus/gusclassic.c | 6 +-
+ sound/isa/gus/gusextreme.c | 6 +-
+ sound/isa/gus/gusmax.c | 36 +-
+ sound/isa/gus/interwave.c | 90 +-
+ sound/isa/opl3sa2.c | 68 +-
+ sound/isa/opti9xx/miro.c | 27 +-
+ sound/isa/opti9xx/opti92x-ad1848.c | 27 +-
+ sound/isa/sb/emu8000.c | 21 +-
+ sound/isa/sb/emu8000_patch.c | 3 +-
+ sound/isa/sb/emu8000_pcm.c | 6 +-
+ sound/isa/sb/sb16.c | 65 +-
+ sound/isa/sb/sb16_csp.c | 29 +-
+ sound/isa/sb/sb16_main.c | 6 +-
+ sound/isa/sb/sb8.c | 38 +-
+ sound/isa/sb/sb8_main.c | 3 +-
+ sound/isa/sb/sb8_midi.c | 3 +-
+ sound/isa/sb/sb_common.c | 9 +-
+ sound/isa/sb/sb_mixer.c | 55 +-
+ sound/isa/wavefront/wavefront.c | 6 +-
+ sound/isa/wavefront/wavefront_midi.c | 20 +-
+ sound/isa/wavefront/wavefront_synth.c | 56 +-
+ sound/isa/wss/wss_lib.c | 9 +-
+ sound/mips/snd-n64.c | 4 +
+ sound/oss/dmasound/dmasound_core.c | 14 -
+ sound/parisc/harmony.c | 7 +-
+ sound/pci/ac97/ac97_codec.c | 205 +-
+ sound/pci/ac97/ac97_patch.c | 137 +-
+ sound/pci/ad1889.c | 15 +-
+ sound/pci/ak4531_codec.c | 9 +-
+ sound/pci/als300.c | 22 +-
+ sound/pci/als4000.c | 55 +-
+ sound/pci/atiixp.c | 33 +-
+ sound/pci/atiixp_modem.c | 40 +-
+ sound/pci/au88x0/au88x0.c | 77 +-
+ sound/pci/au88x0/au88x0_a3d.c | 28 +-
+ sound/pci/au88x0/au88x0_core.c | 47 +-
+ sound/pci/au88x0/au88x0_eq.c | 20 +-
+ sound/pci/au88x0/au88x0_mixer.c | 3 +-
+ sound/pci/au88x0/au88x0_mpu401.c | 14 +-
+ sound/pci/au88x0/au88x0_pcm.c | 15 +-
+ sound/pci/azt3328.c | 3 +-
+ sound/pci/bt87x.c | 3 +-
+ sound/pci/ca0106/ca0106_main.c | 18 +-
+ sound/pci/ca0106/ca_midi.c | 3 +-
+ sound/pci/cmipci.c | 83 +-
+ sound/pci/cs4281.c | 54 +-
+ sound/pci/cs46xx/cs46xx.c | 31 +-
+ sound/pci/cs46xx/cs46xx_lib.c | 51 +-
+ sound/pci/cs46xx/dsp_spos.c | 3 +-
+ sound/pci/cs5535audio/cs5535audio.c | 28 +-
+ sound/pci/cs5535audio/cs5535audio_pcm.c | 10 +-
+ sound/pci/echoaudio/darla20_dsp.c | 6 +-
+ sound/pci/echoaudio/darla24_dsp.c | 6 +-
+ sound/pci/echoaudio/echo3g_dsp.c | 3 +-
+ sound/pci/echoaudio/echoaudio.c | 220 +-
+ sound/pci/echoaudio/echoaudio_dsp.c | 12 +-
+ sound/pci/echoaudio/echoaudio_gml.c | 3 +-
+ sound/pci/echoaudio/gina20_dsp.c | 6 +-
+ sound/pci/echoaudio/gina24_dsp.c | 6 +-
+ sound/pci/echoaudio/indigo_dsp.c | 6 +-
+ sound/pci/echoaudio/indigodj_dsp.c | 6 +-
+ sound/pci/echoaudio/indigoio_dsp.c | 6 +-
+ sound/pci/echoaudio/layla20_dsp.c | 6 +-
+ sound/pci/echoaudio/layla24_dsp.c | 9 +-
+ sound/pci/echoaudio/mia_dsp.c | 6 +-
+ sound/pci/echoaudio/midi.c | 4 +-
+ sound/pci/echoaudio/mona_dsp.c | 6 +-
+ sound/pci/emu10k1/emu10k1.c | 42 +-
+ sound/pci/emu10k1/emu10k1_callback.c | 3 +-
+ sound/pci/emu10k1/emu10k1x.c | 85 +-
+ sound/pci/emu10k1/emufx.c | 13 +-
+ sound/pci/emu10k1/emumixer.c | 78 +-
+ sound/pci/emu10k1/emumpu401.c | 12 +-
+ sound/pci/emu10k1/emupcm.c | 24 +-
+ sound/pci/emu10k1/memory.c | 21 +-
+ sound/pci/emu10k1/p16v.c | 13 +-
+ sound/pci/emu10k1/timer.c | 3 +-
+ sound/pci/ens1370.c | 45 +-
+ sound/pci/es1938.c | 42 +-
+ sound/pci/es1968.c | 75 +-
+ sound/pci/fm801.c | 63 +-
+ sound/pci/hda/hda_bind.c | 7 +-
+ sound/pci/hda/hda_codec.c | 10 +-
+ sound/pci/hda/hda_generic.c | 2 +-
+ sound/pci/hda/hda_intel.c | 22 +-
+ sound/pci/hda/hda_local.h | 2 +
+ sound/pci/hda/hda_tegra.c | 7 +-
+ sound/pci/hda/patch_ca0132.c | 2 +-
+ sound/pci/hda/patch_realtek.c | 60 +-
+ sound/pci/ice1712/delta.c | 6 +-
+ sound/pci/ice1712/ews.c | 24 +-
+ sound/pci/intel8x0.c | 48 +-
+ sound/pci/intel8x0m.c | 38 +-
+ sound/pci/korg1212/korg1212.c | 24 +-
+ sound/pci/lx6464es/lx_core.c | 4 -
+ sound/pci/maestro3.c | 21 +-
+ sound/pci/mixart/mixart.c | 29 +-
+ sound/pci/mixart/mixart_hwdep.c | 17 +-
+ sound/pci/mixart/mixart_mixer.c | 33 +-
+ sound/pci/nm256/nm256.c | 27 +-
+ sound/pci/pcxhr/pcxhr.c | 22 +-
+ sound/pci/pcxhr/pcxhr_hwdep.c | 9 +-
+ sound/pci/riptide/riptide.c | 88 +-
+ sound/pci/rme32.c | 76 +-
+ sound/pci/rme96.c | 148 +-
+ sound/pci/rme9652/hdsp.c | 124 +-
+ sound/pci/rme9652/rme9652.c | 98 +-
+ sound/pci/sonicvibes.c | 67 +-
+ sound/pci/trident/trident.c | 41 +-
+ sound/pci/trident/trident.h | 1 -
+ sound/pci/trident/trident_main.c | 95 +-
+ sound/pci/trident/trident_memory.c | 51 +-
+ sound/pci/via82xx.c | 78 +-
+ sound/pci/via82xx_modem.c | 52 +-
+ sound/pci/vx222/vx222.c | 18 +-
+ sound/pci/vx222/vx222_ops.c | 12 +-
+ sound/pci/ymfpci/ymfpci.c | 71 +-
+ sound/pci/ymfpci/ymfpci_main.c | 72 +-
+ sound/pcmcia/pdaudiocf/pdaudiocf.c | 3 +-
+ sound/pcmcia/vx/vxp_mixer.c | 6 +-
+ sound/pcmcia/vx/vxp_ops.c | 6 +-
+ sound/pcmcia/vx/vxpocket.c | 3 +-
+ sound/ppc/beep.c | 5 +-
+ sound/ppc/daca.c | 24 +-
+ sound/ppc/keywest.c | 6 +-
+ sound/ppc/pmac.c | 6 +-
+ sound/ppc/powermac.c | 27 +-
+ sound/ppc/tumbler.c | 72 +-
+ sound/soc/soc-core.c | 2 +-
+ sound/sparc/amd7930.c | 14 +-
+ sound/sparc/cs4231.c | 10 +-
+ sound/sparc/dbri.c | 11 +-
+ sound/synth/emux/emux.c | 3 +-
+ sound/synth/emux/emux_effect.c | 13 +-
+ sound/synth/emux/emux_hwdep.c | 6 +-
+ sound/synth/emux/soundfont.c | 40 +-
+ sound/usb/card.h | 8 +-
+ sound/usb/clock.c | 305 +--
+ sound/usb/endpoint.c | 1 +
+ sound/usb/endpoint.h | 1 -
+ sound/usb/format.c | 2 +
+ sound/usb/mixer.c | 8 +-
+ sound/usb/mixer.h | 1 +
+ sound/usb/mixer_quirks.c | 6 +
+ sound/usb/mixer_scarlett_gen2.c | 3216 +++++++++++++++++++++------
+ sound/usb/pcm.c | 202 +-
+ sound/usb/pcm.h | 3 -
+ sound/usb/quirks-table.h | 70 +
+ sound/usb/usx2y/us122l.c | 63 +-
+ sound/usb/usx2y/us122l.h | 2 +-
+ sound/usb/usx2y/usX2Yhwdep.c | 135 +-
+ sound/usb/usx2y/usX2Yhwdep.h | 2 +-
+ sound/usb/usx2y/usb_stream.c | 82 +-
+ sound/usb/usx2y/usb_stream.h | 23 +-
+ sound/usb/usx2y/usbus428ctldefs.h | 104 +-
+ sound/usb/usx2y/usbusx2y.c | 389 ++--
+ sound/usb/usx2y/usbusx2y.h | 65 +-
+ sound/usb/usx2y/usbusx2yaudio.c | 684 +++---
+ sound/usb/usx2y/usx2yhwdeppcm.c | 627 +++---
+ sound/usb/usx2y/usx2yhwdeppcm.h | 4 +-
+ 279 files changed, 10247 insertions(+), 6031 deletions(-)
+ create mode 100644 sound/core/memalloc_local.h
+ create mode 100644 sound/firewire/motu/motu-protocol-v1.c
+Merging sound-asoc/for-next (c07adf6925ff Merge remote-tracking branch 'asoc/for-5.14' into asoc-next)
+$ git merge sound-asoc/for-next
+Removing sound/soc/tegra/trimslice.c
+Removing sound/soc/tegra/tegra_wm9712.c
+Removing sound/soc/tegra/tegra_wm8753.c
+Removing sound/soc/tegra/tegra_sgtl5000.c
+Removing sound/soc/tegra/tegra_rt5677.c
+Removing sound/soc/tegra/tegra_rt5640.c
+Removing sound/soc/tegra/tegra_max98090.c
+Removing sound/soc/tegra/tegra_asoc_utils.h
+Removing sound/soc/tegra/tegra_asoc_utils.c
+Removing sound/soc/tegra/tegra_alc5632.c
+Auto-merging sound/soc/soc-core.c
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/sound/wm8750.txt
+Removing Documentation/devicetree/bindings/sound/imx-audmux.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mfd/rk808.txt | 188 +
+ .../devicetree/bindings/sound/cs42l42.txt | 7 +
+ .../devicetree/bindings/sound/fsl,spdif.yaml | 1 +
+ .../devicetree/bindings/sound/fsl-sai.txt | 6 +-
+ .../devicetree/bindings/sound/imx-audio-card.yaml | 122 +
+ .../devicetree/bindings/sound/imx-audmux.txt | 28 -
+ .../devicetree/bindings/sound/imx-audmux.yaml | 119 +
+ .../devicetree/bindings/sound/nxp,tfa989x.yaml | 58 +
+ .../devicetree/bindings/sound/qcom,wcd934x.yaml | 30 +
+ .../bindings/sound/qcom,wcd938x-sdw.yaml | 70 +
+ .../devicetree/bindings/sound/qcom,wcd938x.yaml | 146 +
+ .../devicetree/bindings/sound/renesas,rsnd.yaml | 10 +-
+ .../devicetree/bindings/sound/tlv320aic32x4.txt | 1 +
+ Documentation/devicetree/bindings/sound/wm8750.txt | 18 -
+ .../devicetree/bindings/sound/wm8750.yaml | 42 +
+ .../sound/kernel-api/writing-an-alsa-driver.rst | 13 +-
+ MAINTAINERS | 7 +
+ drivers/mfd/rk808.c | 81 +
+ include/dt-bindings/sound/qcom,q6afe.h | 2 +
+ include/linux/mfd/rk808.h | 81 +
+ include/linux/mfd/wcd934x/registers.h | 57 +
+ include/sound/hdmi-codec.h | 12 +-
+ include/sound/pcm_iec958.h | 8 +
+ include/sound/soc-dai.h | 55 +
+ include/sound/soc-topology.h | 2 +-
+ include/sound/soc.h | 21 +-
+ sound/core/pcm_iec958.c | 174 +-
+ sound/soc/adi/axi-i2s.c | 3 +-
+ sound/soc/adi/axi-spdif.c | 3 +-
+ sound/soc/amd/renoir/acp3x-pdm-dma.c | 4 -
+ sound/soc/atmel/atmel-classd.c | 3 +-
+ sound/soc/atmel/atmel-i2s.c | 3 +-
+ sound/soc/atmel/atmel-pdmic.c | 3 +-
+ sound/soc/atmel/mchp-i2s-mcc.c | 3 +-
+ sound/soc/atmel/mikroe-proto.c | 9 +-
+ sound/soc/atmel/sam9x5_wm8731.c | 3 +-
+ sound/soc/bcm/cygnus-ssp.c | 7 +-
+ sound/soc/codecs/Kconfig | 41 +-
+ sound/soc/codecs/Makefile | 10 +
+ sound/soc/codecs/ak4613.c | 11 +
+ sound/soc/codecs/cirrus_legacy.h | 21 +
+ sound/soc/codecs/cs35l32.c | 34 +-
+ sound/soc/codecs/cs35l33.c | 15 +-
+ sound/soc/codecs/cs35l34.c | 39 +-
+ sound/soc/codecs/cs35l35.c | 37 +-
+ sound/soc/codecs/cs35l35.h | 3 +-
+ sound/soc/codecs/cs35l36.c | 18 +-
+ sound/soc/codecs/cs4265.c | 10 +-
+ sound/soc/codecs/cs42l42.c | 198 +-
+ sound/soc/codecs/cs42l42.h | 5 +-
+ sound/soc/codecs/cs42l52.c | 19 +-
+ sound/soc/codecs/cs42l56.c | 7 +-
+ sound/soc/codecs/cs42l73.c | 30 +-
+ sound/soc/codecs/cs43130.c | 55 +-
+ sound/soc/codecs/cs47l24.c | 2 +-
+ sound/soc/codecs/cs53l30.c | 22 +-
+ sound/soc/codecs/hdmi-codec.c | 238 +-
+ sound/soc/codecs/lpass-rx-macro.c | 2 +-
+ sound/soc/codecs/lpass-wsa-macro.c | 4 +
+ sound/soc/codecs/mt6359-accdet.c | 2 +-
+ sound/soc/codecs/mt6359.c | 2 +-
+ sound/soc/codecs/pcm3168a.c | 26 +
+ sound/soc/codecs/rk3328_codec.c | 28 +-
+ sound/soc/codecs/rk817_codec.c | 541 +++
+ sound/soc/codecs/rt1019.c | 5 +-
+ sound/soc/codecs/rt286.c | 1 -
+ sound/soc/codecs/rt5682-i2c.c | 12 +
+ sound/soc/codecs/rt711-sdw.h | 2 +
+ sound/soc/codecs/rt711.c | 30 +
+ sound/soc/codecs/rt711.h | 29 +-
+ sound/soc/codecs/sigmadsp.h | 1 -
+ sound/soc/codecs/tfa989x.c | 357 ++
+ sound/soc/codecs/tlv320aic26.c | 12 +-
+ sound/soc/codecs/tlv320aic32x4-i2c.c | 22 +-
+ sound/soc/codecs/tlv320aic32x4-spi.c | 23 +-
+ sound/soc/codecs/tlv320aic32x4.c | 139 +-
+ sound/soc/codecs/tlv320aic32x4.h | 10 +
+ sound/soc/codecs/wcd-clsh-v2.c | 348 +-
+ sound/soc/codecs/wcd-clsh-v2.h | 16 +
+ sound/soc/codecs/wcd-mbhc-v2.c | 1475 ++++++++
+ sound/soc/codecs/wcd-mbhc-v2.h | 340 ++
+ sound/soc/codecs/wcd934x.c | 884 ++++-
+ sound/soc/codecs/wcd938x-sdw.c | 320 ++
+ sound/soc/codecs/wcd938x.c | 3737 ++++++++++++++++++++
+ sound/soc/codecs/wcd938x.h | 718 ++++
+ sound/soc/codecs/wm2200.c | 1 -
+ sound/soc/codecs/wm5102.c | 2 +-
+ sound/soc/codecs/wm5110.c | 2 +-
+ sound/soc/codecs/wm8962.c | 7 +-
+ sound/soc/codecs/wm_adsp.c | 18 +-
+ sound/soc/codecs/wm_adsp.h | 2 +-
+ sound/soc/dwc/dwc-i2s.c | 3 +-
+ sound/soc/fsl/Kconfig | 13 +
+ sound/soc/fsl/Makefile | 2 +
+ sound/soc/fsl/fsl-asoc-card.c | 9 +-
+ sound/soc/fsl/fsl_asrc.c | 3 +-
+ sound/soc/fsl/fsl_aud2htx.c | 3 +-
+ sound/soc/fsl/fsl_easrc.c | 7 +-
+ sound/soc/fsl/fsl_esai.c | 3 +-
+ sound/soc/fsl/fsl_micfil.c | 3 +-
+ sound/soc/fsl/fsl_sai.c | 3 +-
+ sound/soc/fsl/fsl_spdif.c | 74 +-
+ sound/soc/fsl/fsl_spdif.h | 1 +
+ sound/soc/fsl/fsl_ssi.c | 3 +-
+ sound/soc/fsl/fsl_xcvr.c | 16 +-
+ sound/soc/fsl/imx-audio-rpmsg.c | 12 +-
+ sound/soc/fsl/imx-audmix.c | 4 +-
+ sound/soc/fsl/imx-card.c | 844 +++++
+ sound/soc/fsl/imx-es8328.c | 12 +-
+ sound/soc/fsl/imx-pcm-rpmsg.c | 6 +-
+ sound/soc/fsl/imx-pcm-rpmsg.h | 4 +-
+ sound/soc/fsl/imx-rpmsg.c | 1 -
+ sound/soc/generic/simple-card-utils.c | 16 +-
+ sound/soc/generic/simple-card.c | 1 +
+ sound/soc/hisilicon/hi6210-i2s.c | 17 +-
+ sound/soc/img/img-i2s-in.c | 5 +-
+ sound/soc/img/img-i2s-out.c | 3 +-
+ 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/intel/boards/Kconfig | 43 +-
+ sound/soc/intel/boards/Makefile | 30 +-
+ sound/soc/intel/boards/bdw-rt5677.c | 4 +-
+ sound/soc/intel/boards/bxt_da7219_max98357a.c | 11 +-
+ sound/soc/intel/boards/bxt_rt298.c | 4 +-
+ sound/soc/intel/boards/bytcht_cx2072x.c | 1 -
+ sound/soc/intel/boards/bytcht_da7213.c | 1 -
+ sound/soc/intel/boards/bytcht_es8316.c | 1 -
+ sound/soc/intel/boards/bytcht_nocodec.c | 1 -
+ sound/soc/intel/boards/bytcr_rt5640.c | 1 -
+ sound/soc/intel/boards/bytcr_rt5651.c | 1 -
+ sound/soc/intel/boards/bytcr_wm5102.c | 1 -
+ sound/soc/intel/boards/cht_bsw_rt5645.c | 1 -
+ sound/soc/intel/boards/cht_bsw_rt5672.c | 1 -
+ sound/soc/intel/boards/cml_rt1011_rt5682.c | 1 +
+ sound/soc/intel/boards/ehl_rt5660.c | 4 +-
+ sound/soc/intel/boards/glk_rt5682_max98357a.c | 5 +-
+ sound/soc/intel/boards/hda_dsp_common.c | 5 +
+ sound/soc/intel/boards/kbl_da7219_max98357a.c | 4 +-
+ sound/soc/intel/boards/kbl_da7219_max98927.c | 5 +-
+ sound/soc/intel/boards/kbl_rt5660.c | 2 +-
+ sound/soc/intel/boards/kbl_rt5663_max98927.c | 3 +-
+ .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +-
+ sound/soc/intel/boards/skl_hda_dsp_generic.c | 1 +
+ sound/soc/intel/boards/skl_nau88l25_max98357a.c | 3 +-
+ sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 3 +-
+ sound/soc/intel/boards/skl_rt286.c | 3 +-
+ sound/soc/intel/boards/sof_cs42l42.c | 508 +++
+ sound/soc/intel/boards/sof_da7219_max98373.c | 8 +-
+ sound/soc/intel/boards/sof_maxim_common.c | 84 +-
+ sound/soc/intel/boards/sof_maxim_common.h | 14 +-
+ sound/soc/intel/boards/sof_pcm512x.c | 2 +-
+ sound/soc/intel/boards/sof_rt5682.c | 132 +-
+ sound/soc/intel/boards/sof_sdw.c | 74 +-
+ sound/soc/intel/boards/sof_sdw_common.h | 9 +-
+ sound/soc/intel/boards/sof_sdw_hdmi.c | 37 +-
+ sound/soc/intel/boards/sof_sdw_max98373.c | 4 +-
+ sound/soc/intel/boards/sof_wm8804.c | 1 -
+ sound/soc/intel/common/soc-acpi-intel-adl-match.c | 95 +-
+ sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 2 +-
+ sound/soc/intel/common/soc-acpi-intel-cml-match.c | 22 +-
+ sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 2 +-
+ sound/soc/intel/common/soc-acpi-intel-glk-match.c | 14 +-
+ sound/soc/intel/common/soc-acpi-intel-icl-match.c | 12 +-
+ sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 6 +-
+ sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 2 +-
+ sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 38 +-
+ sound/soc/intel/skylake/skl-nhlt.c | 6 +-
+ sound/soc/jz4740/jz4740-i2s.c | 7 +-
+ sound/soc/jz4740/jz4740-i2s.h | 2 -
+ sound/soc/mediatek/common/mtk-btcvsd.c | 24 +-
+ sound/soc/mediatek/mt8192/mt8192-dai-adda.c | 2 -
+ sound/soc/meson/g12a-toacodec.c | 143 +-
+ sound/soc/meson/meson-card-utils.c | 6 +-
+ sound/soc/qcom/apq8016_sbc.c | 7 +-
+ sound/soc/qcom/lpass-cpu.c | 42 +-
+ sound/soc/qcom/lpass-platform.c | 12 +-
+ sound/soc/qcom/lpass-sc7180.c | 1 +
+ sound/soc/qcom/lpass.h | 2 +
+ sound/soc/qcom/qdsp6/q6afe-dai.c | 41 +
+ sound/soc/qcom/qdsp6/q6afe.c | 8 +
+ sound/soc/qcom/qdsp6/q6afe.h | 2 +-
+ sound/soc/qcom/qdsp6/q6asm-dai.c | 2 +-
+ sound/soc/qcom/qdsp6/q6routing.c | 11 +
+ sound/soc/qcom/sdm845.c | 8 +
+ sound/soc/rockchip/rockchip_i2s.c | 3 +-
+ sound/soc/rockchip/rockchip_pdm.c | 3 +-
+ sound/soc/rockchip/rockchip_spdif.c | 3 +-
+ sound/soc/samsung/i2s.c | 3 +-
+ sound/soc/samsung/pcm.c | 3 +-
+ sound/soc/samsung/s3c2412-i2s.c | 3 +-
+ sound/soc/samsung/s3c24xx-i2s.c | 3 +-
+ sound/soc/sh/fsi.c | 17 +-
+ sound/soc/sh/rcar/Makefile | 2 +-
+ sound/soc/sh/rcar/adg.c | 180 +-
+ sound/soc/sh/rcar/cmd.c | 14 +
+ sound/soc/sh/rcar/core.c | 154 +-
+ sound/soc/sh/rcar/ctu.c | 14 +
+ sound/soc/sh/rcar/debugfs.c | 96 +
+ sound/soc/sh/rcar/dma.c | 39 +-
+ sound/soc/sh/rcar/dvc.c | 16 +-
+ sound/soc/sh/rcar/gen.c | 9 +
+ sound/soc/sh/rcar/mix.c | 14 +
+ sound/soc/sh/rcar/rsnd.h | 75 +-
+ sound/soc/sh/rcar/src.c | 32 +-
+ sound/soc/sh/rcar/ssi.c | 160 +-
+ sound/soc/sh/rcar/ssiu.c | 147 +-
+ sound/soc/soc-core.c | 377 +-
+ sound/soc/soc-dai.c | 76 +-
+ sound/soc/soc-pcm.c | 2 +-
+ sound/soc/soc-topology.c | 466 ++-
+ sound/soc/soc-utils.c | 29 +
+ sound/soc/sof/compress.c | 2 +-
+ sound/soc/sof/compress.h | 2 +-
+ sound/soc/sof/imx/imx8.c | 1 +
+ sound/soc/sof/intel/Makefile | 5 +-
+ sound/soc/sof/intel/atom.c | 463 +++
+ sound/soc/sof/intel/atom.h | 74 +
+ sound/soc/sof/intel/byt.c | 768 +---
+ sound/soc/sof/intel/hda-loader.c | 5 -
+ sound/soc/sof/intel/hda.c | 27 +-
+ sound/soc/sof/intel/pci-tgl.c | 2 +
+ sound/soc/sof/intel/pci-tng.c | 171 +-
+ sound/soc/sof/loader.c | 2 +-
+ sound/soc/sof/ops.h | 10 +-
+ sound/soc/sof/sof-acpi-dev.c | 5 +-
+ sound/soc/sof/sof-of-dev.c | 5 +-
+ sound/soc/sof/sof-pci-dev.c | 7 +-
+ sound/soc/sof/topology.c | 17 +-
+ sound/soc/spear/spdif_out.c | 3 +-
+ sound/soc/sprd/sprd-mcdt.c | 3 +-
+ sound/soc/sti/sti_uniperif.c | 12 +-
+ sound/soc/stm/stm32_i2s.c | 3 +-
+ sound/soc/stm/stm32_sai_sub.c | 3 +-
+ sound/soc/stm/stm32_spdifrx.c | 3 +-
+ sound/soc/sunxi/sun4i-codec.c | 3 +-
+ sound/soc/sunxi/sun4i-i2s.c | 3 +-
+ sound/soc/sunxi/sun4i-spdif.c | 3 +-
+ sound/soc/tegra/Kconfig | 12 +
+ sound/soc/tegra/Makefile | 19 +-
+ sound/soc/tegra/tegra20_i2s.c | 3 +-
+ sound/soc/tegra/tegra20_spdif.c | 3 +-
+ sound/soc/tegra/tegra210_admaif.c | 4 +-
+ sound/soc/tegra/tegra30_ahub.c | 3 +-
+ sound/soc/tegra/tegra_alc5632.c | 259 --
+ sound/soc/tegra/tegra_asoc_machine.c | 854 +++++
+ sound/soc/tegra/tegra_asoc_machine.h | 49 +
+ sound/soc/tegra/tegra_asoc_utils.c | 225 --
+ sound/soc/tegra/tegra_asoc_utils.h | 38 -
+ sound/soc/tegra/tegra_max98090.c | 276 --
+ sound/soc/tegra/tegra_rt5640.c | 222 --
+ sound/soc/tegra/tegra_rt5677.c | 324 --
+ sound/soc/tegra/tegra_sgtl5000.c | 211 --
+ sound/soc/tegra/tegra_wm8753.c | 185 -
+ sound/soc/tegra/tegra_wm8903.c | 351 +-
+ sound/soc/tegra/tegra_wm9712.c | 166 -
+ sound/soc/tegra/trimslice.c | 172 -
+ sound/soc/ti/davinci-mcasp.c | 1 +
+ sound/soc/ti/omap-mcbsp.c | 2 +-
+ 259 files changed, 16291 insertions(+), 4574 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/imx-audio-card.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/imx-audmux.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/imx-audmux.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/qcom,wcd938x-sdw.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/qcom,wcd938x.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/wm8750.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/wm8750.yaml
+ create mode 100644 sound/soc/codecs/cirrus_legacy.h
+ create mode 100644 sound/soc/codecs/rk817_codec.c
+ create mode 100644 sound/soc/codecs/tfa989x.c
+ create mode 100644 sound/soc/codecs/wcd-mbhc-v2.c
+ create mode 100644 sound/soc/codecs/wcd-mbhc-v2.h
+ create mode 100644 sound/soc/codecs/wcd938x-sdw.c
+ create mode 100644 sound/soc/codecs/wcd938x.c
+ create mode 100644 sound/soc/codecs/wcd938x.h
+ create mode 100644 sound/soc/fsl/imx-card.c
+ create mode 100644 sound/soc/intel/boards/sof_cs42l42.c
+ create mode 100644 sound/soc/sh/rcar/debugfs.c
+ create mode 100644 sound/soc/sof/intel/atom.c
+ create mode 100644 sound/soc/sof/intel/atom.h
+ delete mode 100644 sound/soc/tegra/tegra_alc5632.c
+ create mode 100644 sound/soc/tegra/tegra_asoc_machine.c
+ create mode 100644 sound/soc/tegra/tegra_asoc_machine.h
+ delete mode 100644 sound/soc/tegra/tegra_asoc_utils.c
+ delete mode 100644 sound/soc/tegra/tegra_asoc_utils.h
+ delete mode 100644 sound/soc/tegra/tegra_max98090.c
+ delete mode 100644 sound/soc/tegra/tegra_rt5640.c
+ delete mode 100644 sound/soc/tegra/tegra_rt5677.c
+ delete mode 100644 sound/soc/tegra/tegra_sgtl5000.c
+ delete mode 100644 sound/soc/tegra/tegra_wm8753.c
+ delete mode 100644 sound/soc/tegra/tegra_wm9712.c
+ delete mode 100644 sound/soc/tegra/trimslice.c
+Merging modules/modules-next (2c0f0f363956 module: correctly exit module_kallsyms_on_each_symbol when fn() != 0)
+$ git merge modules/modules-next
+Auto-merging kernel/module.c
+Merge made by the 'recursive' strategy.
+ kernel/module.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+Merging input/next (cac7100d4c51 Input: hideep - fix the uninitialized use in hideep_nvm_unlock())
+$ git merge input/next
+Removing include/linux/input/cyttsp.h
+Auto-merging drivers/input/joystick/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml
+Removing Documentation/devicetree/bindings/input/touchscreen/sitronix-st1232.txt
+Removing Documentation/devicetree/bindings/input/touchscreen/resistive-adc-touch.txt
+Removing Documentation/devicetree/bindings/input/touchscreen/cyttsp.txt
+Removing Documentation/devicetree/bindings/input/fsl-mma8450.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/input/fsl-mma8450.txt | 12 --
+ .../bindings/input/qcom,pm8941-pwrkey.txt | 2 +
+ .../input/touchscreen/cypress,cy8ctma340.yaml | 148 ++++++++++++++++++
+ .../bindings/input/touchscreen/cyttsp.txt | 93 ------------
+ .../bindings/input/touchscreen/edt-ft5x06.yaml | 1 +
+ .../input/touchscreen/resistive-adc-touch.txt | 33 ----
+ .../input/touchscreen/resistive-adc-touch.yaml | 86 +++++++++++
+ .../input/touchscreen/sitronix,st1232.yaml | 50 ++++++
+ .../bindings/input/touchscreen/sitronix-st1232.txt | 28 ----
+ .../bindings/input/touchscreen/touchscreen.yaml | 6 +
+ .../devicetree/bindings/trivial-devices.yaml | 2 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ MAINTAINERS | 5 +-
+ drivers/input/evbug.c | 3 -
+ drivers/input/joystick/Kconfig | 9 ++
+ drivers/input/joystick/Makefile | 1 +
+ drivers/input/joystick/qwiic-joystick.c | 146 ++++++++++++++++++
+ drivers/input/keyboard/atkbd.c | 2 +-
+ drivers/input/keyboard/cros_ec_keyb.c | 2 +-
+ drivers/input/keyboard/hil_kbd.c | 1 +
+ drivers/input/misc/ims-pcu.c | 6 +-
+ drivers/input/misc/pm8941-pwrkey.c | 103 +++++++++----
+ drivers/input/mouse/trackpoint.c | 2 +-
+ drivers/input/serio/i8042.c | 4 +-
+ drivers/input/touchscreen/cy8ctmg110_ts.c | 167 +++++++--------------
+ drivers/input/touchscreen/cyttsp_core.c | 47 +++++-
+ drivers/input/touchscreen/cyttsp_core.h | 3 +-
+ drivers/input/touchscreen/cyttsp_i2c.c | 10 ++
+ drivers/input/touchscreen/cyttsp_spi.c | 10 ++
+ drivers/input/touchscreen/edt-ft5x06.c | 38 ++++-
+ drivers/input/touchscreen/hideep.c | 13 +-
+ drivers/input/touchscreen/resistive-adc-touch.c | 136 ++++++++++++++---
+ drivers/input/touchscreen/tsc200x-core.c | 2 +-
+ include/linux/input/cy8ctmg110_pdata.h | 1 -
+ include/linux/input/cyttsp.h | 29 ----
+ 35 files changed, 820 insertions(+), 383 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/input/fsl-mma8450.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/cypress,cy8ctma340.yaml
+ delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/cyttsp.txt
+ delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/resistive-adc-touch.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/resistive-adc-touch.yaml
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/sitronix,st1232.yaml
+ delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/sitronix-st1232.txt
+ create mode 100644 drivers/input/joystick/qwiic-joystick.c
+ delete mode 100644 include/linux/input/cyttsp.h
+Merging block/for-next (444ef33be31f Merge branch 'for-5.14/io_uring' into for-next)
+$ git merge block/for-next
+CONFLICT (modify/delete): include/linux/ide.h deleted in block/for-next and modified in HEAD. Version HEAD of include/linux/ide.h left in tree.
+Auto-merging include/linux/fs.h
+Auto-merging fs/namei.c
+Auto-merging fs/internal.h
+Auto-merging fs/btrfs/volumes.c
+Auto-merging drivers/scsi/sd.c
+Auto-merging drivers/s390/block/xpram.c
+Auto-merging drivers/s390/block/dcssblk.c
+CONFLICT (modify/delete): drivers/ide/via82cxxx.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/via82cxxx.c left in tree.
+Removing drivers/ide/umc8672.c
+Removing drivers/ide/tx4939ide.c
+Removing drivers/ide/tx4938ide.c
+Removing drivers/ide/trm290.c
+CONFLICT (modify/delete): drivers/ide/triflex.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/triflex.c left in tree.
+Removing drivers/ide/tc86c001.c
+CONFLICT (modify/delete): drivers/ide/slc90e66.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/slc90e66.c left in tree.
+CONFLICT (modify/delete): drivers/ide/sl82c105.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/sl82c105.c left in tree.
+CONFLICT (modify/delete): drivers/ide/sis5513.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/sis5513.c left in tree.
+CONFLICT (modify/delete): drivers/ide/siimage.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/siimage.c left in tree.
+CONFLICT (modify/delete): drivers/ide/setup-pci.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/setup-pci.c left in tree.
+CONFLICT (modify/delete): drivers/ide/serverworks.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/serverworks.c left in tree.
+CONFLICT (modify/delete): drivers/ide/sc1200.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/sc1200.c left in tree.
+Removing drivers/ide/rz1000.c
+Removing drivers/ide/rapide.c
+Removing drivers/ide/qd65xx.h
+Removing drivers/ide/qd65xx.c
+Removing drivers/ide/q40ide.c
+Removing drivers/ide/pmac.c
+CONFLICT (modify/delete): drivers/ide/piix.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/piix.c left in tree.
+CONFLICT (modify/delete): drivers/ide/pdc202xx_old.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/pdc202xx_old.c left in tree.
+CONFLICT (modify/delete): drivers/ide/pdc202xx_new.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/pdc202xx_new.c left in tree.
+Removing drivers/ide/palm_bk3710.c
+CONFLICT (modify/delete): drivers/ide/opti621.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/opti621.c left in tree.
+CONFLICT (modify/delete): drivers/ide/ns87415.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/ns87415.c left in tree.
+Removing drivers/ide/macide.c
+CONFLICT (modify/delete): drivers/ide/jmicron.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/jmicron.c left in tree.
+CONFLICT (modify/delete): drivers/ide/it821x.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/it821x.c left in tree.
+CONFLICT (modify/delete): drivers/ide/it8213.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/it8213.c left in tree.
+CONFLICT (modify/delete): drivers/ide/it8172.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/it8172.c left in tree.
+Removing drivers/ide/ide_platform.c
+Removing drivers/ide/ide.c
+Removing drivers/ide/ide-xfer-mode.c
+Removing drivers/ide/ide-timings.c
+Removing drivers/ide/ide-taskfile.c
+Removing drivers/ide/ide-tape.c
+Removing drivers/ide/ide-sysfs.c
+Removing drivers/ide/ide-scan-pci.c
+Removing drivers/ide/ide-proc.c
+Removing drivers/ide/ide-probe.c
+Removing drivers/ide/ide-pnp.c
+Removing drivers/ide/ide-pm.c
+Removing drivers/ide/ide-pio-blacklist.c
+CONFLICT (modify/delete): drivers/ide/ide-pci-generic.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/ide-pci-generic.c left in tree.
+Removing drivers/ide/ide-park.c
+Removing drivers/ide/ide-lib.c
+Removing drivers/ide/ide-legacy.c
+Removing drivers/ide/ide-iops.c
+Removing drivers/ide/ide-ioctls.c
+Removing drivers/ide/ide-io.c
+Removing drivers/ide/ide-io-std.c
+Removing drivers/ide/ide-generic.c
+Removing drivers/ide/ide-gd.h
+Removing drivers/ide/ide-gd.c
+Removing drivers/ide/ide-floppy_proc.c
+Removing drivers/ide/ide-floppy_ioctl.c
+Removing drivers/ide/ide-floppy.h
+Removing drivers/ide/ide-floppy.c
+Removing drivers/ide/ide-eh.c
+Removing drivers/ide/ide-dma.c
+Removing drivers/ide/ide-dma-sff.c
+Removing drivers/ide/ide-disk_proc.c
+Removing drivers/ide/ide-disk_ioctl.c
+Removing drivers/ide/ide-disk.h
+Removing drivers/ide/ide-disk.c
+Removing drivers/ide/ide-devsets.c
+Removing drivers/ide/ide-cs.c
+Removing drivers/ide/ide-cd_verbose.c
+Removing drivers/ide/ide-cd_ioctl.c
+Removing drivers/ide/ide-cd.h
+Removing drivers/ide/ide-cd.c
+Removing drivers/ide/ide-atapi.c
+CONFLICT (modify/delete): drivers/ide/ide-acpi.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/ide-acpi.c left in tree.
+Removing drivers/ide/ide-4drives.c
+Removing drivers/ide/icside.c
+Removing drivers/ide/ht6560b.c
+CONFLICT (modify/delete): drivers/ide/hpt366.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/hpt366.c left in tree.
+Removing drivers/ide/gayle.c
+Removing drivers/ide/falconide.c
+Removing drivers/ide/dtc2278.c
+CONFLICT (modify/delete): drivers/ide/delkin_cb.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/delkin_cb.c left in tree.
+CONFLICT (modify/delete): drivers/ide/cy82c693.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/cy82c693.c left in tree.
+CONFLICT (modify/delete): drivers/ide/cs5536.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/cs5536.c left in tree.
+CONFLICT (modify/delete): drivers/ide/cs5535.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/cs5535.c left in tree.
+CONFLICT (modify/delete): drivers/ide/cs5530.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/cs5530.c left in tree.
+CONFLICT (modify/delete): drivers/ide/cs5520.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/cs5520.c left in tree.
+CONFLICT (modify/delete): drivers/ide/cmd64x.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/cmd64x.c left in tree.
+Removing drivers/ide/cmd640.c
+Removing drivers/ide/buddha.c
+CONFLICT (modify/delete): drivers/ide/atiixp.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/atiixp.c left in tree.
+CONFLICT (modify/delete): drivers/ide/amd74xx.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/amd74xx.c left in tree.
+CONFLICT (modify/delete): drivers/ide/alim15x3.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/alim15x3.c left in tree.
+Removing drivers/ide/ali14xx.c
+CONFLICT (modify/delete): drivers/ide/aec62xx.c deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/aec62xx.c left in tree.
+Removing drivers/ide/Makefile
+CONFLICT (modify/delete): drivers/ide/Kconfig deleted in block/for-next and modified in HEAD. Version HEAD of drivers/ide/Kconfig left in tree.
+Auto-merging drivers/block/rnbd/rnbd-clt.c
+Auto-merging block/partitions/msdos.c
+Removing block/mq-deadline.c
+Auto-merging arch/um/drivers/ubd_kern.c
+Auto-merging arch/m68k/configs/q40_defconfig
+Auto-merging arch/m68k/configs/multi_defconfig
+Auto-merging arch/m68k/configs/mac_defconfig
+Auto-merging arch/m68k/configs/atari_defconfig
+Auto-merging arch/m68k/configs/amiga_defconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/filesystems/locking.rst
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/ide/Kconfig drivers/ide/aec62xx.c drivers/ide/alim15x3.c drivers/ide/amd74xx.c drivers/ide/atiixp.c drivers/ide/cmd64x.c drivers/ide/cs5520.c drivers/ide/cs5530.c drivers/ide/cs5535.c drivers/ide/cs5536.c drivers/ide/cy82c693.c drivers/ide/delkin_cb.c drivers/ide/hpt366.c drivers/ide/ide-acpi.c drivers/ide/ide-pci-generic.c drivers/ide/it8172.c drivers/ide/it8213.c drivers/ide/it821x.c drivers/ide/jmicron.c drivers/ide/ns87415.c drivers/ide/opti621.c drivers/ide/pdc202xx_new.c drivers/ide/pdc202xx_old.c drivers/ide/piix.c drivers/ide/sc1200.c drivers/ide/serverworks.c drivers/ide/setup-pci.c drivers/ide/siimage.c drivers/ide/sis5513.c drivers/ide/sl82c105.c drivers/ide/slc90e66.c drivers/ide/triflex.c drivers/ide/via82cxxx.c include/linux/ide.h
+rm 'drivers/ide/Kconfig'
+rm 'drivers/ide/aec62xx.c'
+rm 'drivers/ide/alim15x3.c'
+rm 'drivers/ide/amd74xx.c'
+rm 'drivers/ide/atiixp.c'
+rm 'drivers/ide/cmd64x.c'
+rm 'drivers/ide/cs5520.c'
+rm 'drivers/ide/cs5530.c'
+rm 'drivers/ide/cs5535.c'
+rm 'drivers/ide/cs5536.c'
+rm 'drivers/ide/cy82c693.c'
+rm 'drivers/ide/delkin_cb.c'
+rm 'drivers/ide/hpt366.c'
+rm 'drivers/ide/ide-acpi.c'
+rm 'drivers/ide/ide-pci-generic.c'
+rm 'drivers/ide/it8172.c'
+rm 'drivers/ide/it8213.c'
+rm 'drivers/ide/it821x.c'
+rm 'drivers/ide/jmicron.c'
+rm 'drivers/ide/ns87415.c'
+rm 'drivers/ide/opti621.c'
+rm 'drivers/ide/pdc202xx_new.c'
+rm 'drivers/ide/pdc202xx_old.c'
+rm 'drivers/ide/piix.c'
+rm 'drivers/ide/sc1200.c'
+rm 'drivers/ide/serverworks.c'
+rm 'drivers/ide/setup-pci.c'
+rm 'drivers/ide/siimage.c'
+rm 'drivers/ide/sis5513.c'
+rm 'drivers/ide/sl82c105.c'
+rm 'drivers/ide/slc90e66.c'
+rm 'drivers/ide/triflex.c'
+rm 'drivers/ide/via82cxxx.c'
+rm 'include/linux/ide.h'
+$ git commit --no-edit -v -a
+[master 363254ac0a11] Merge remote-tracking branch 'block/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../admin-guide/cgroup-v1/blkio-controller.rst | 155 +-
+ Documentation/admin-guide/cgroup-v2.rst | 55 +
+ Documentation/admin-guide/laptops/laptop-mode.rst | 11 -
+ Documentation/admin-guide/sysctl/vm.rst | 8 -
+ Documentation/block/bfq-iosched.rst | 38 +-
+ Documentation/filesystems/locking.rst | 2 +-
+ Documentation/userspace-api/ioctl/hdio.rst | 845 +-------
+ MAINTAINERS | 16 -
+ arch/alpha/configs/defconfig | 13 +-
+ arch/arm/configs/footbridge_defconfig | 1 -
+ arch/arm/configs/pxa_defconfig | 2 -
+ arch/m68k/atari/config.c | 12 +-
+ arch/m68k/configs/amiga_defconfig | 10 +-
+ arch/m68k/configs/atari_defconfig | 8 +-
+ arch/m68k/configs/mac_defconfig | 9 +-
+ arch/m68k/configs/multi_defconfig | 16 +-
+ arch/m68k/configs/q40_defconfig | 8 +-
+ arch/m68k/emu/nfblock.c | 20 +-
+ arch/m68k/mac/config.c | 24 +-
+ arch/m68k/q40/config.c | 37 +-
+ arch/um/drivers/ubd_kern.c | 150 +-
+ arch/xtensa/platforms/iss/simdisk.c | 29 +-
+ block/Kconfig | 19 +-
+ block/Kconfig.iosched | 6 +
+ block/Makefile | 3 +
+ block/bfq-iosched.c | 68 +-
+ block/blk-cgroup.c | 41 +-
+ block/blk-core.c | 22 +-
+ block/blk-flush.c | 3 +-
+ block/blk-ioprio.c | 262 +++
+ block/blk-ioprio.h | 19 +
+ block/blk-mq-debugfs.c | 15 +
+ block/blk-mq-sched.c | 94 +-
+ block/blk-mq-sched.h | 2 +
+ block/blk-mq-tag.c | 114 +-
+ block/blk-mq-tag.h | 15 +-
+ block/blk-mq.c | 203 +-
+ block/blk-mq.h | 3 +
+ block/blk-rq-qos.c | 4 +-
+ block/blk-rq-qos.h | 38 +-
+ block/blk-sysfs.c | 45 +-
+ block/blk-wbt.c | 12 +-
+ block/blk-wbt.h | 1 +
+ block/blk.h | 7 +-
+ block/elevator.c | 6 +-
+ block/genhd.c | 208 +-
+ block/ioctl.c | 2 +-
+ block/mq-deadline-cgroup.c | 126 ++
+ block/mq-deadline-cgroup.h | 114 ++
+ block/mq-deadline-main.c | 1173 +++++++++++
+ block/mq-deadline.c | 815 --------
+ block/partitions/core.c | 64 +-
+ block/partitions/msdos.c | 2 +-
+ drivers/Kconfig | 2 -
+ drivers/Makefile | 1 -
+ drivers/ata/Kconfig | 6 +-
+ drivers/ata/ahci.c | 4 +
+ drivers/ata/ahci.h | 7 +-
+ drivers/ata/ahci_sunxi.c | 2 +-
+ drivers/ata/pata_atiixp.c | 3 +-
+ drivers/ata/pata_cs5520.c | 3 +-
+ drivers/ata/pata_cs5530.c | 3 +-
+ drivers/ata/pata_cypress.c | 10 +-
+ drivers/ata/pata_ep93xx.c | 2 +-
+ drivers/ata/pata_falcon.c | 62 +-
+ drivers/ata/pata_macio.c | 5 +-
+ drivers/ata/pata_octeon_cf.c | 5 +-
+ drivers/ata/pata_rb532_cf.c | 6 +-
+ drivers/ata/pata_sc1200.c | 3 +-
+ drivers/ata/pata_serverworks.c | 3 +-
+ drivers/ata/sata_fsl.c | 2 +-
+ drivers/ata/sata_highbank.c | 6 +-
+ drivers/ata/sata_mv.c | 6 +-
+ drivers/ata/sata_nv.c | 12 +-
+ drivers/ata/sata_sil24.c | 5 +-
+ drivers/block/amiflop.c | 16 +-
+ drivers/block/aoe/aoeblk.c | 33 +-
+ drivers/block/aoe/aoechr.c | 4 +-
+ drivers/block/aoe/aoecmd.c | 2 -
+ drivers/block/aoe/aoedev.c | 3 +-
+ drivers/block/ataflop.c | 16 +-
+ drivers/block/brd.c | 94 +-
+ drivers/block/drbd/drbd_main.c | 23 +-
+ drivers/block/drbd/drbd_receiver.c | 22 +-
+ drivers/block/floppy.c | 22 +-
+ drivers/block/loop.c | 34 +-
+ drivers/block/mtip32xx/mtip32xx.c | 176 +-
+ drivers/block/n64cart.c | 8 +-
+ drivers/block/nbd.c | 113 +-
+ drivers/block/null_blk/main.c | 36 +-
+ drivers/block/paride/pcd.c | 19 +-
+ drivers/block/paride/pd.c | 30 +-
+ drivers/block/paride/pf.c | 18 +-
+ drivers/block/pktcdvd.c | 11 +-
+ drivers/block/ps3disk.c | 36 +-
+ drivers/block/ps3vram.c | 31 +-
+ drivers/block/rbd.c | 52 +-
+ drivers/block/rnbd/rnbd-clt.c | 35 +-
+ drivers/block/rsxx/dev.c | 39 +-
+ drivers/block/rsxx/dma.c | 6 +-
+ drivers/block/rsxx/rsxx_priv.h | 1 -
+ drivers/block/sunvdc.c | 50 +-
+ drivers/block/swim.c | 34 +-
+ drivers/block/swim3.c | 33 +-
+ drivers/block/sx8.c | 25 +-
+ drivers/block/virtio_blk.c | 26 +-
+ drivers/block/xen-blkfront.c | 104 +-
+ drivers/block/z2ram.c | 25 +-
+ drivers/block/zram/zram_drv.c | 37 +-
+ drivers/block/zram/zram_drv.h | 2 +-
+ drivers/cdrom/gdrom.c | 45 +-
+ drivers/ide/Kconfig | 849 --------
+ drivers/ide/Makefile | 111 --
+ drivers/ide/aec62xx.c | 330 ----
+ drivers/ide/ali14xx.c | 250 ---
+ drivers/ide/alim15x3.c | 601 ------
+ drivers/ide/amd74xx.c | 342 ----
+ drivers/ide/atiixp.c | 211 --
+ drivers/ide/buddha.c | 238 ---
+ drivers/ide/cmd640.c | 848 --------
+ drivers/ide/cmd64x.c | 451 -----
+ drivers/ide/cs5520.c | 167 --
+ drivers/ide/cs5530.c | 294 ---
+ drivers/ide/cs5535.c | 215 --
+ drivers/ide/cs5536.c | 293 ---
+ drivers/ide/cy82c693.c | 233 ---
+ drivers/ide/delkin_cb.c | 161 --
+ drivers/ide/dtc2278.c | 155 --
+ drivers/ide/falconide.c | 197 --
+ drivers/ide/gayle.c | 188 --
+ drivers/ide/hpt366.c | 1544 ---------------
+ drivers/ide/ht6560b.c | 383 ----
+ drivers/ide/icside.c | 692 -------
+ drivers/ide/ide-4drives.c | 65 -
+ drivers/ide/ide-acpi.c | 619 ------
+ drivers/ide/ide-atapi.c | 756 -------
+ drivers/ide/ide-cd.c | 1858 -----------------
+ drivers/ide/ide-cd.h | 123 --
+ drivers/ide/ide-cd_ioctl.c | 468 -----
+ drivers/ide/ide-cd_verbose.c | 362 ----
+ drivers/ide/ide-cs.c | 364 ----
+ drivers/ide/ide-devsets.c | 192 --
+ drivers/ide/ide-disk.c | 795 --------
+ drivers/ide/ide-disk.h | 30 -
+ drivers/ide/ide-disk_ioctl.c | 33 -
+ drivers/ide/ide-disk_proc.c | 125 --
+ drivers/ide/ide-dma-sff.c | 336 ----
+ drivers/ide/ide-dma.c | 551 ------
+ drivers/ide/ide-eh.c | 443 -----
+ drivers/ide/ide-floppy.c | 551 ------
+ drivers/ide/ide-floppy.h | 42 -
+ drivers/ide/ide-floppy_ioctl.c | 339 ----
+ drivers/ide/ide-floppy_proc.c | 34 -
+ drivers/ide/ide-gd.c | 432 ----
+ drivers/ide/ide-gd.h | 43 -
+ drivers/ide/ide-generic.c | 139 --
+ drivers/ide/ide-io-std.c | 262 ---
+ drivers/ide/ide-io.c | 904 ---------
+ drivers/ide/ide-ioctls.c | 306 ---
+ drivers/ide/ide-iops.c | 536 -----
+ drivers/ide/ide-legacy.c | 59 -
+ drivers/ide/ide-lib.c | 146 --
+ drivers/ide/ide-park.c | 155 --
+ drivers/ide/ide-pci-generic.c | 202 --
+ drivers/ide/ide-pio-blacklist.c | 96 -
+ drivers/ide/ide-pm.c | 261 ---
+ drivers/ide/ide-pnp.c | 92 -
+ drivers/ide/ide-probe.c | 1623 ---------------
+ drivers/ide/ide-proc.c | 633 ------
+ drivers/ide/ide-scan-pci.c | 113 --
+ drivers/ide/ide-sysfs.c | 143 --
+ drivers/ide/ide-tape.c | 2083 --------------------
+ drivers/ide/ide-taskfile.c | 668 -------
+ drivers/ide/ide-timings.c | 198 --
+ drivers/ide/ide-xfer-mode.c | 267 ---
+ drivers/ide/ide.c | 415 ----
+ drivers/ide/ide_platform.c | 133 --
+ drivers/ide/it8172.c | 164 --
+ drivers/ide/it8213.c | 216 --
+ drivers/ide/it821x.c | 714 -------
+ drivers/ide/jmicron.c | 175 --
+ drivers/ide/macide.c | 161 --
+ drivers/ide/ns87415.c | 349 ----
+ drivers/ide/opti621.c | 178 --
+ drivers/ide/palm_bk3710.c | 387 ----
+ drivers/ide/pdc202xx_new.c | 556 ------
+ drivers/ide/pdc202xx_old.c | 361 ----
+ drivers/ide/piix.c | 475 -----
+ drivers/ide/pmac.c | 1703 ----------------
+ drivers/ide/q40ide.c | 168 --
+ drivers/ide/qd65xx.c | 446 -----
+ drivers/ide/qd65xx.h | 145 --
+ drivers/ide/rapide.c | 106 -
+ drivers/ide/rz1000.c | 100 -
+ drivers/ide/sc1200.c | 340 ----
+ drivers/ide/serverworks.c | 455 -----
+ drivers/ide/setup-pci.c | 665 -------
+ drivers/ide/siimage.c | 843 --------
+ drivers/ide/sis5513.c | 636 ------
+ drivers/ide/sl82c105.c | 366 ----
+ drivers/ide/slc90e66.c | 181 --
+ drivers/ide/tc86c001.c | 270 ---
+ drivers/ide/triflex.c | 135 --
+ drivers/ide/trm290.c | 374 ----
+ drivers/ide/tx4938ide.c | 209 --
+ drivers/ide/tx4939ide.c | 628 ------
+ drivers/ide/umc8672.c | 184 --
+ drivers/ide/via82cxxx.c | 531 -----
+ drivers/lightnvm/core.c | 24 +-
+ drivers/md/Kconfig | 6 +-
+ drivers/md/bcache/super.c | 15 +-
+ drivers/md/dm-rq.c | 9 +-
+ drivers/md/dm.c | 16 +-
+ drivers/md/md-bitmap.c | 2 +-
+ drivers/md/md-faulty.c | 2 +-
+ drivers/md/md-linear.c | 2 +-
+ drivers/md/md-multipath.c | 2 +-
+ drivers/md/md.c | 141 +-
+ drivers/md/md.h | 19 +-
+ drivers/md/raid0.c | 3 +
+ drivers/md/raid1.c | 15 +-
+ drivers/md/raid1.h | 1 +
+ drivers/md/raid10.c | 6 +
+ drivers/md/raid10.h | 1 +
+ drivers/md/raid5.c | 63 +-
+ drivers/memstick/core/ms_block.c | 26 +-
+ drivers/memstick/core/mspro_block.c | 26 +-
+ drivers/mmc/core/block.c | 29 +-
+ drivers/mmc/core/queue.c | 23 +-
+ drivers/mmc/core/queue.h | 2 +-
+ drivers/mtd/mtd_blkdevs.c | 49 +-
+ drivers/mtd/ubi/block.c | 68 +-
+ drivers/nvdimm/blk.c | 27 +-
+ drivers/nvdimm/btt.c | 25 +-
+ drivers/nvdimm/btt.h | 2 -
+ drivers/nvdimm/pmem.c | 21 +-
+ drivers/nvme/host/core.c | 174 +-
+ drivers/nvme/host/fabrics.c | 44 +-
+ drivers/nvme/host/fabrics.h | 6 +-
+ drivers/nvme/host/ioctl.c | 35 +-
+ drivers/nvme/host/multipath.c | 67 +-
+ drivers/nvme/host/nvme.h | 12 +-
+ drivers/nvme/host/pci.c | 24 +-
+ drivers/nvme/host/rdma.c | 2 +-
+ drivers/nvme/host/tcp.c | 27 +-
+ drivers/nvme/host/zns.c | 27 +-
+ drivers/nvme/target/core.c | 2 +-
+ drivers/nvme/target/io-cmd-bdev.c | 3 +-
+ drivers/s390/block/dasd_genhd.c | 8 +-
+ drivers/s390/block/dcssblk.c | 26 +-
+ drivers/s390/block/scm_blk.c | 21 +-
+ drivers/s390/block/xpram.c | 26 +-
+ drivers/scsi/sd.c | 4 +-
+ fs/block_dev.c | 207 +-
+ fs/btrfs/volumes.c | 2 +-
+ fs/exec.c | 8 +-
+ fs/fs-writeback.c | 25 -
+ fs/internal.h | 8 +-
+ fs/io-wq.c | 103 +-
+ fs/io-wq.h | 3 +-
+ fs/io_uring.c | 1303 +++++++-----
+ fs/namei.c | 137 +-
+ fs/pstore/Kconfig | 1 +
+ fs/super.c | 8 +-
+ include/linux/ata.h | 2 +-
+ include/linux/bio.h | 12 +-
+ include/linux/blk-mq.h | 24 +-
+ include/linux/blk_types.h | 4 -
+ include/linux/blkdev.h | 5 +-
+ include/linux/elevator.h | 1 +
+ include/linux/fs.h | 1 +
+ include/linux/genhd.h | 29 +-
+ include/linux/ide.h | 1617 ---------------
+ include/linux/libata.h | 13 +-
+ include/linux/pci_ids.h | 2 +
+ include/linux/wait.h | 2 +-
+ include/linux/writeback.h | 1 -
+ include/trace/events/io_uring.h | 106 +-
+ include/uapi/linux/io_uring.h | 8 +
+ include/uapi/linux/nbd-netlink.h | 1 +
+ init/do_mounts.c | 10 +-
+ kernel/sched/wait.c | 9 +-
+ kernel/sysctl.c | 8 -
+ mm/page-writeback.c | 5 -
+ 284 files changed, 4968 insertions(+), 45193 deletions(-)
+ create mode 100644 block/blk-ioprio.c
+ create mode 100644 block/blk-ioprio.h
+ create mode 100644 block/mq-deadline-cgroup.c
+ create mode 100644 block/mq-deadline-cgroup.h
+ create mode 100644 block/mq-deadline-main.c
+ delete mode 100644 block/mq-deadline.c
+ delete mode 100644 drivers/ide/Kconfig
+ delete mode 100644 drivers/ide/Makefile
+ delete mode 100644 drivers/ide/aec62xx.c
+ delete mode 100644 drivers/ide/ali14xx.c
+ delete mode 100644 drivers/ide/alim15x3.c
+ delete mode 100644 drivers/ide/amd74xx.c
+ delete mode 100644 drivers/ide/atiixp.c
+ delete mode 100644 drivers/ide/buddha.c
+ delete mode 100644 drivers/ide/cmd640.c
+ delete mode 100644 drivers/ide/cmd64x.c
+ delete mode 100644 drivers/ide/cs5520.c
+ delete mode 100644 drivers/ide/cs5530.c
+ delete mode 100644 drivers/ide/cs5535.c
+ delete mode 100644 drivers/ide/cs5536.c
+ delete mode 100644 drivers/ide/cy82c693.c
+ delete mode 100644 drivers/ide/delkin_cb.c
+ delete mode 100644 drivers/ide/dtc2278.c
+ delete mode 100644 drivers/ide/falconide.c
+ delete mode 100644 drivers/ide/gayle.c
+ delete mode 100644 drivers/ide/hpt366.c
+ delete mode 100644 drivers/ide/ht6560b.c
+ delete mode 100644 drivers/ide/icside.c
+ delete mode 100644 drivers/ide/ide-4drives.c
+ delete mode 100644 drivers/ide/ide-acpi.c
+ delete mode 100644 drivers/ide/ide-atapi.c
+ delete mode 100644 drivers/ide/ide-cd.c
+ delete mode 100644 drivers/ide/ide-cd.h
+ delete mode 100644 drivers/ide/ide-cd_ioctl.c
+ delete mode 100644 drivers/ide/ide-cd_verbose.c
+ delete mode 100644 drivers/ide/ide-cs.c
+ delete mode 100644 drivers/ide/ide-devsets.c
+ delete mode 100644 drivers/ide/ide-disk.c
+ delete mode 100644 drivers/ide/ide-disk.h
+ delete mode 100644 drivers/ide/ide-disk_ioctl.c
+ delete mode 100644 drivers/ide/ide-disk_proc.c
+ delete mode 100644 drivers/ide/ide-dma-sff.c
+ delete mode 100644 drivers/ide/ide-dma.c
+ delete mode 100644 drivers/ide/ide-eh.c
+ delete mode 100644 drivers/ide/ide-floppy.c
+ delete mode 100644 drivers/ide/ide-floppy.h
+ delete mode 100644 drivers/ide/ide-floppy_ioctl.c
+ delete mode 100644 drivers/ide/ide-floppy_proc.c
+ delete mode 100644 drivers/ide/ide-gd.c
+ delete mode 100644 drivers/ide/ide-gd.h
+ delete mode 100644 drivers/ide/ide-generic.c
+ delete mode 100644 drivers/ide/ide-io-std.c
+ delete mode 100644 drivers/ide/ide-io.c
+ delete mode 100644 drivers/ide/ide-ioctls.c
+ delete mode 100644 drivers/ide/ide-iops.c
+ delete mode 100644 drivers/ide/ide-legacy.c
+ delete mode 100644 drivers/ide/ide-lib.c
+ delete mode 100644 drivers/ide/ide-park.c
+ delete mode 100644 drivers/ide/ide-pci-generic.c
+ delete mode 100644 drivers/ide/ide-pio-blacklist.c
+ delete mode 100644 drivers/ide/ide-pm.c
+ delete mode 100644 drivers/ide/ide-pnp.c
+ delete mode 100644 drivers/ide/ide-probe.c
+ delete mode 100644 drivers/ide/ide-proc.c
+ delete mode 100644 drivers/ide/ide-scan-pci.c
+ delete mode 100644 drivers/ide/ide-sysfs.c
+ delete mode 100644 drivers/ide/ide-tape.c
+ delete mode 100644 drivers/ide/ide-taskfile.c
+ delete mode 100644 drivers/ide/ide-timings.c
+ delete mode 100644 drivers/ide/ide-xfer-mode.c
+ delete mode 100644 drivers/ide/ide.c
+ delete mode 100644 drivers/ide/ide_platform.c
+ delete mode 100644 drivers/ide/it8172.c
+ delete mode 100644 drivers/ide/it8213.c
+ delete mode 100644 drivers/ide/it821x.c
+ delete mode 100644 drivers/ide/jmicron.c
+ delete mode 100644 drivers/ide/macide.c
+ delete mode 100644 drivers/ide/ns87415.c
+ delete mode 100644 drivers/ide/opti621.c
+ delete mode 100644 drivers/ide/palm_bk3710.c
+ delete mode 100644 drivers/ide/pdc202xx_new.c
+ delete mode 100644 drivers/ide/pdc202xx_old.c
+ delete mode 100644 drivers/ide/piix.c
+ delete mode 100644 drivers/ide/pmac.c
+ delete mode 100644 drivers/ide/q40ide.c
+ delete mode 100644 drivers/ide/qd65xx.c
+ delete mode 100644 drivers/ide/qd65xx.h
+ delete mode 100644 drivers/ide/rapide.c
+ delete mode 100644 drivers/ide/rz1000.c
+ delete mode 100644 drivers/ide/sc1200.c
+ delete mode 100644 drivers/ide/serverworks.c
+ delete mode 100644 drivers/ide/setup-pci.c
+ delete mode 100644 drivers/ide/siimage.c
+ delete mode 100644 drivers/ide/sis5513.c
+ delete mode 100644 drivers/ide/sl82c105.c
+ delete mode 100644 drivers/ide/slc90e66.c
+ delete mode 100644 drivers/ide/tc86c001.c
+ delete mode 100644 drivers/ide/triflex.c
+ delete mode 100644 drivers/ide/trm290.c
+ delete mode 100644 drivers/ide/tx4938ide.c
+ delete mode 100644 drivers/ide/tx4939ide.c
+ delete mode 100644 drivers/ide/umc8672.c
+ delete mode 100644 drivers/ide/via82cxxx.c
+ delete mode 100644 include/linux/ide.h
+Merging device-mapper/for-next (b8e0c7f90e6f dm btree remove: assign new_root only when removal succeeds)
+$ git merge device-mapper/for-next
+Auto-merging include/linux/blkdev.h
+Auto-merging include/linux/blk_types.h
+Auto-merging drivers/md/dm.c
+Merge made by the 'recursive' strategy.
+ block/blk-zoned.c | 119 +++-
+ drivers/md/Makefile | 4 +
+ drivers/md/dm-core.h | 65 ++
+ drivers/md/dm-crypt.c | 31 +-
+ drivers/md/dm-era-target.c | 24 +-
+ drivers/md/dm-flakey.c | 7 +-
+ drivers/md/dm-kcopyd.c | 41 +-
+ drivers/md/dm-linear.c | 7 +-
+ drivers/md/dm-ps-io-affinity.c | 1 -
+ drivers/md/dm-raid1.c | 2 +-
+ drivers/md/dm-table.c | 23 +-
+ drivers/md/dm-thin-metadata.c | 91 +--
+ drivers/md/dm-writecache.c | 87 ++-
+ drivers/md/dm-zone.c | 660 +++++++++++++++++++++
+ drivers/md/dm-zoned-metadata.c | 7 +
+ drivers/md/dm-zoned-reclaim.c | 2 +-
+ drivers/md/dm.c | 208 ++-----
+ drivers/md/dm.h | 30 +-
+ drivers/md/persistent-data/dm-array.c | 52 +-
+ drivers/md/persistent-data/dm-btree-internal.h | 13 +
+ drivers/md/persistent-data/dm-btree-remove.c | 7 +-
+ drivers/md/persistent-data/dm-btree-spine.c | 16 +-
+ drivers/md/persistent-data/dm-btree.c | 542 +++++++++++++++--
+ drivers/md/persistent-data/dm-btree.h | 10 +-
+ drivers/md/persistent-data/dm-space-map-common.c | 534 ++++++++++++++++-
+ drivers/md/persistent-data/dm-space-map-common.h | 34 +-
+ drivers/md/persistent-data/dm-space-map-disk.c | 83 +--
+ drivers/md/persistent-data/dm-space-map-metadata.c | 105 ++--
+ drivers/md/persistent-data/dm-space-map.h | 18 +-
+ .../md/persistent-data/dm-transaction-manager.c | 61 ++
+ .../md/persistent-data/dm-transaction-manager.h | 22 +-
+ include/linux/blk_types.h | 1 +
+ include/linux/blkdev.h | 12 +
+ include/linux/device-mapper.h | 9 +-
+ include/linux/dm-kcopyd.h | 1 +
+ 35 files changed, 2386 insertions(+), 543 deletions(-)
+ create mode 100644 drivers/md/dm-zone.c
+Merging pcmcia/pcmcia-next (e9d503fef7da pcmcia: rsrc_nonstatic: Fix call-back function as reference formatting)
+$ git merge pcmcia/pcmcia-next
+Already up to date.
+Merging mmc/next (98b5ce4c08ca mmc: sdhci-iproc: Add support for the legacy sdhci controller on the BCM7211)
+$ git merge mmc/next
+Auto-merging drivers/mmc/host/Kconfig
+Auto-merging drivers/mmc/core/block.c
+Auto-merging drivers/memstick/core/ms_block.c
+Removing Documentation/devicetree/bindings/mmc/renesas,mmcif.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mmc/brcm,iproc-sdhci.yaml | 1 +
+ .../devicetree/bindings/mmc/ingenic,mmc.yaml | 1 +
+ .../devicetree/bindings/mmc/mmc-controller.yaml | 25 +-
+ .../devicetree/bindings/mmc/renesas,mmcif.txt | 53 ---
+ .../devicetree/bindings/mmc/renesas,mmcif.yaml | 135 ++++++
+ .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 10 +-
+ .../devicetree/bindings/mmc/sdhci-am654.yaml | 1 -
+ drivers/memstick/core/ms_block.c | 37 +-
+ drivers/memstick/host/rtsx_usb_ms.c | 10 +-
+ drivers/mmc/core/block.c | 11 +-
+ drivers/mmc/core/core.c | 22 +-
+ drivers/mmc/core/core.h | 9 +
+ drivers/mmc/core/debugfs.c | 1 +
+ drivers/mmc/core/host.c | 3 +
+ drivers/mmc/core/mmc.c | 68 ++-
+ drivers/mmc/core/mmc_ops.c | 163 ++++---
+ drivers/mmc/core/mmc_ops.h | 12 +-
+ drivers/mmc/core/sd.c | 481 ++++++++++++++++++++-
+ drivers/mmc/core/sd_ops.c | 38 +-
+ drivers/mmc/core/sdio.c | 6 +-
+ drivers/mmc/host/Kconfig | 2 +-
+ drivers/mmc/host/cqhci-core.c | 21 +-
+ drivers/mmc/host/dw_mmc-pltfm.c | 1 -
+ drivers/mmc/host/jz4740_mmc.c | 6 +-
+ drivers/mmc/host/mmc_spi.c | 12 +-
+ drivers/mmc/host/mtk-sd.c | 25 +-
+ drivers/mmc/host/of_mmc_spi.c | 2 +-
+ drivers/mmc/host/renesas_sdhi_core.c | 2 +-
+ drivers/mmc/host/s3cmci.c | 7 +-
+ drivers/mmc/host/sdhci-acpi.c | 11 +
+ drivers/mmc/host/sdhci-esdhc-imx.c | 18 +-
+ drivers/mmc/host/sdhci-iproc.c | 30 ++
+ drivers/mmc/host/sdhci-of-aspeed.c | 50 ++-
+ drivers/mmc/host/sdhci-omap.c | 5 +-
+ drivers/mmc/host/sdhci-pci-gli.c | 4 +-
+ drivers/mmc/host/sdhci-sprd.c | 1 +
+ drivers/mmc/host/sdhci.c | 2 +-
+ drivers/mmc/host/sdhci.h | 2 +
+ drivers/mmc/host/sdhci_am654.c | 6 +-
+ drivers/mmc/host/usdhi6rol0.c | 1 +
+ drivers/mmc/host/via-sdmmc.c | 3 +
+ drivers/mmc/host/vub300.c | 2 +-
+ include/linux/mmc/card.h | 23 +
+ include/linux/mmc/host.h | 2 +-
+ include/linux/mmc/sd.h | 4 +
+ 45 files changed, 987 insertions(+), 342 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/mmc/renesas,mmcif.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/renesas,mmcif.yaml
+Merging mfd/for-mfd-next (495fb48dbd9b mfd: wm831x: Use DEFINE_RES_IRQ_NAMED() and DEFINE_RES_IRQ() to simplify code)
+$ git merge mfd/for-mfd-next
+Auto-merging sound/soc/codecs/Kconfig
+Removing include/linux/mfd/mt6360.h
+Auto-merging drivers/regulator/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../leds/backlight/richtek,rt4831-backlight.yaml | 62 ++
+ .../devicetree/bindings/mfd/google,cros-ec.yaml | 20 +
+ Documentation/devicetree/bindings/mfd/mt6397.txt | 1 +
+ .../devicetree/bindings/mfd/qcom,pm8008.yaml | 121 +++
+ .../devicetree/bindings/mfd/qcom,spmi-pmic.txt | 4 +
+ .../devicetree/bindings/mfd/richtek,rt4831.yaml | 90 ++
+ .../devicetree/bindings/mfd/st,stm32-timers.yaml | 2 -
+ .../bindings/mfd/stericsson,db8500-prcmu.yaml | 278 ++++++
+ .../bindings/regulator/mt6359-regulator.yaml | 385 ++++++++
+ MAINTAINERS | 10 -
+ drivers/gpio/gpio-lp87565.c | 6 +-
+ drivers/mfd/88pm800.c | 14 +-
+ drivers/mfd/88pm805.c | 29 +-
+ drivers/mfd/Kconfig | 29 +-
+ drivers/mfd/Makefile | 16 +-
+ drivers/mfd/arizona-core.c | 2 +
+ drivers/mfd/as3722.c | 14 +-
+ drivers/mfd/asic3.c | 12 +-
+ drivers/mfd/axp20x.c | 24 +-
+ drivers/mfd/cros_ec_dev.c | 20 +-
+ drivers/mfd/da9052-i2c.c | 10 +-
+ drivers/mfd/da9055-core.c | 38 +-
+ drivers/mfd/da9062-core.c | 13 +-
+ drivers/mfd/da9063-i2c.c | 2 +-
+ drivers/mfd/db8500-prcmu.c | 6 +-
+ drivers/mfd/hi655x-pmic.c | 2 +-
+ drivers/mfd/intel-lpss-pci.c | 13 +
+ drivers/mfd/ioc3.c | 1 +
+ drivers/mfd/lp87565.c | 27 +
+ drivers/mfd/max8907.c | 6 +-
+ drivers/mfd/max8997.c | 9 +-
+ drivers/mfd/max8998.c | 8 +-
+ drivers/mfd/mfd-core.c | 15 +-
+ drivers/mfd/motorola-cpcap.c | 4 +
+ drivers/mfd/mt6358-irq.c | 89 +-
+ drivers/mfd/mt6360-core.c | 552 +++++++----
+ drivers/mfd/mt6397-core.c | 44 +-
+ drivers/mfd/omap-usb-host.c | 2 +-
+ drivers/mfd/omap-usb-tll.c | 2 +-
+ drivers/mfd/qcom-pm8008.c | 260 +++++
+ drivers/mfd/rn5t618.c | 2 +-
+ drivers/mfd/rt4831.c | 115 +++
+ drivers/mfd/sec-core.c | 70 +-
+ drivers/mfd/sec-irq.c | 4 +-
+ drivers/mfd/si476x-cmd.c | 28 +-
+ drivers/mfd/si476x-i2c.c | 10 +-
+ drivers/mfd/stmpe-i2c.c | 2 +-
+ drivers/mfd/sun6i-prcm.c | 30 +-
+ drivers/mfd/syscon.c | 2 +-
+ drivers/mfd/t7l66xb.c | 12 +-
+ drivers/mfd/tps80031.c | 6 +-
+ drivers/mfd/twl-core.c | 2 +-
+ drivers/mfd/wcd934x.c | 50 +-
+ drivers/mfd/wm831x-core.c | 250 +----
+ drivers/regulator/Kconfig | 9 +
+ drivers/regulator/Makefile | 1 +
+ drivers/regulator/lp87565-regulator.c | 11 +
+ drivers/regulator/mt6359-regulator.c | 1036 ++++++++++++++++++++
+ drivers/rtc/rtc-mt6397.c | 2 +-
+ include/dt-bindings/leds/rt4831-backlight.h | 23 +
+ include/dt-bindings/mfd/qcom-pm8008.h | 19 +
+ include/linux/mfd/hi655x-pmic.h | 2 +-
+ include/linux/mfd/lp87565.h | 40 +-
+ include/linux/mfd/mt6358/core.h | 8 +-
+ include/linux/mfd/mt6358/registers.h | 2 +
+ include/linux/mfd/mt6359/core.h | 133 +++
+ include/linux/mfd/mt6359/registers.h | 529 ++++++++++
+ include/linux/mfd/mt6359p/registers.h | 249 +++++
+ include/linux/mfd/mt6360.h | 240 -----
+ include/linux/mfd/mt6397/core.h | 1 +
+ include/linux/mfd/mt6397/rtc.h | 1 +
+ include/linux/mfd/samsung/core.h | 33 -
+ include/linux/regulator/mt6359-regulator.h | 59 ++
+ sound/soc/codecs/Kconfig | 10 +-
+ 74 files changed, 4192 insertions(+), 1041 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/leds/backlight/richtek,rt4831-backlight.yaml
+ create mode 100644 Documentation/devicetree/bindings/mfd/qcom,pm8008.yaml
+ create mode 100644 Documentation/devicetree/bindings/mfd/richtek,rt4831.yaml
+ create mode 100644 Documentation/devicetree/bindings/mfd/stericsson,db8500-prcmu.yaml
+ create mode 100644 Documentation/devicetree/bindings/regulator/mt6359-regulator.yaml
+ create mode 100644 drivers/mfd/qcom-pm8008.c
+ create mode 100644 drivers/mfd/rt4831.c
+ create mode 100644 drivers/regulator/mt6359-regulator.c
+ create mode 100644 include/dt-bindings/leds/rt4831-backlight.h
+ create mode 100644 include/dt-bindings/mfd/qcom-pm8008.h
+ create mode 100644 include/linux/mfd/mt6359/core.h
+ create mode 100644 include/linux/mfd/mt6359/registers.h
+ create mode 100644 include/linux/mfd/mt6359p/registers.h
+ delete mode 100644 include/linux/mfd/mt6360.h
+ create mode 100644 include/linux/regulator/mt6359-regulator.h
+Merging backlight/for-backlight-next (6fc632d3e3e0 video: backlight: qcom-wled: Add PMI8994 compatible)
+$ git merge backlight/for-backlight-next
+Merge made by the 'recursive' strategy.
+ drivers/video/backlight/Kconfig | 8 ++
+ drivers/video/backlight/Makefile | 1 +
+ drivers/video/backlight/lm3630a_bl.c | 4 +-
+ drivers/video/backlight/qcom-wled.c | 1 +
+ drivers/video/backlight/rt4831-backlight.c | 203 +++++++++++++++++++++++++++++
+ 5 files changed, 216 insertions(+), 1 deletion(-)
+ create mode 100644 drivers/video/backlight/rt4831-backlight.c
+Merging battery/for-next (eab4e6d953c1 power: supply: cpcap-charger: get the battery inserted infomation from cpcap-battery)
+$ git merge battery/for-next
+Removing include/linux/power/ab8500.h
+Removing include/linux/pm2301_charger.h
+Removing include/linux/max17040_battery.h
+Removing drivers/power/supply/pm2301_charger.c
+Removing drivers/power/supply/bd70528-charger.c
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/power/supply/charger-manager.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/power/supply/charger-manager.txt | 91 --
+ .../bindings/power/supply/charger-manager.yaml | 215 ++++
+ .../bindings/power/supply/maxim,max17040.yaml | 2 +-
+ .../power/supply/richtek,rt5033-battery.yaml | 54 +
+ MAINTAINERS | 3 +-
+ drivers/power/reset/at91-sama5d2_shdwc.c | 4 +-
+ drivers/power/reset/gpio-poweroff.c | 1 +
+ drivers/power/supply/Kconfig | 12 +-
+ drivers/power/supply/Makefile | 3 +-
+ drivers/power/supply/ab8500-bm.h | 7 +-
+ drivers/power/supply/ab8500_btemp.c | 125 +-
+ drivers/power/supply/ab8500_charger.c | 380 +++---
+ drivers/power/supply/ab8500_fg.c | 144 +--
+ drivers/power/supply/abx500_chargalg.c | 117 +-
+ drivers/power/supply/axp20x_battery.c | 17 +-
+ drivers/power/supply/bd70528-charger.c | 710 -----------
+ drivers/power/supply/cpcap-battery.c | 19 +-
+ drivers/power/supply/cpcap-charger.c | 39 +-
+ drivers/power/supply/max17040_battery.c | 42 +-
+ drivers/power/supply/max17042_battery.c | 2 +-
+ drivers/power/supply/pm2301_charger.c | 1249 --------------------
+ drivers/power/supply/rn5t618_power.c | 235 ++++
+ drivers/power/supply/rt5033_battery.c | 7 +
+ drivers/power/supply/sbs-battery.c | 153 ++-
+ drivers/power/supply/sc2731_charger.c | 1 +
+ drivers/power/supply/sc27xx_fuel_gauge.c | 1 +
+ drivers/power/supply/smb347-charger.c | 1 -
+ include/linux/max17040_battery.h | 16 -
+ include/linux/pm2301_charger.h | 48 -
+ include/linux/power/ab8500.h | 16 -
+ 30 files changed, 1079 insertions(+), 2635 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/power/supply/charger-manager.txt
+ create mode 100644 Documentation/devicetree/bindings/power/supply/charger-manager.yaml
+ create mode 100644 Documentation/devicetree/bindings/power/supply/richtek,rt5033-battery.yaml
+ delete mode 100644 drivers/power/supply/bd70528-charger.c
+ delete mode 100644 drivers/power/supply/pm2301_charger.c
+ delete mode 100644 include/linux/max17040_battery.h
+ delete mode 100644 include/linux/pm2301_charger.h
+ delete mode 100644 include/linux/power/ab8500.h
+Merging regulator/for-next (7fb593cbd88c Merge remote-tracking branch 'regulator/for-5.14' into regulator-next)
+$ git merge regulator/for-next
+Auto-merging drivers/thermal/thermal_core.c
+Removing drivers/regulator/bd70528-regulator.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/regulator/max8893.yaml | 88 ++
+ .../bindings/regulator/qcom,rpmh-regulator.yaml | 17 +-
+ .../bindings/regulator/qcom,smd-rpm-regulator.yaml | 5 +
+ .../devicetree/bindings/regulator/regulator.yaml | 82 ++
+ .../regulator/richtek,rt6160-regulator.yaml | 61 ++
+ .../regulator/richtek,rt6245-regulator.yaml | 89 ++
+ .../bindings/regulator/rohm,bd9576-regulator.yaml | 6 +
+ Documentation/driver-api/thermal/sysfs-api.rst | 24 +-
+ MAINTAINERS | 4 +
+ drivers/regulator/Kconfig | 46 +-
+ drivers/regulator/Makefile | 7 +-
+ drivers/regulator/bd70528-regulator.c | 283 -----
+ drivers/regulator/bd71815-regulator.c | 60 +-
+ drivers/regulator/bd9576-regulator.c | 1084 +++++++++++++++++---
+ drivers/regulator/core.c | 293 ++++--
+ drivers/regulator/da9052-regulator.c | 3 +-
+ drivers/regulator/devres.c | 52 +
+ drivers/regulator/fan53555.c | 118 +--
+ drivers/regulator/fan53880.c | 7 +-
+ drivers/regulator/fixed.c | 3 +-
+ drivers/regulator/hi6421-regulator.c | 8 +-
+ drivers/regulator/hi6421v600-regulator.c | 59 +-
+ drivers/regulator/internal.h | 11 +
+ drivers/regulator/irq_helpers.c | 397 +++++++
+ drivers/regulator/lp8755.c | 55 +-
+ drivers/regulator/ltc3589.c | 73 +-
+ drivers/regulator/max77686-regulator.c | 42 +-
+ drivers/regulator/max77802-regulator.c | 70 +-
+ drivers/regulator/max8893.c | 183 ++++
+ drivers/regulator/max8973-regulator.c | 37 +-
+ drivers/regulator/mcp16502.c | 79 +-
+ drivers/regulator/mp5416.c | 44 +-
+ drivers/regulator/mp886x.c | 32 +-
+ drivers/regulator/mt6315-regulator.c | 21 +-
+ drivers/regulator/mt6358-regulator.c | 22 +-
+ drivers/regulator/mt6359-regulator.c | 193 ++--
+ drivers/regulator/of_regulator.c | 58 ++
+ drivers/regulator/pca9450-regulator.c | 51 +-
+ drivers/regulator/qcom-labibb-regulator.c | 10 +-
+ drivers/regulator/qcom-rpmh-regulator.c | 62 +-
+ drivers/regulator/qcom_smd-regulator.c | 85 +-
+ drivers/regulator/qcom_spmi-regulator.c | 6 +-
+ drivers/regulator/qcom_usb_vbus-regulator.c | 12 +
+ drivers/regulator/rk808-regulator.c | 116 +--
+ drivers/regulator/rt4831-regulator.c | 3 +
+ drivers/regulator/rt6160-regulator.c | 319 ++++++
+ drivers/regulator/rt6245-regulator.c | 254 +++++
+ drivers/regulator/stpmic1_regulator.c | 20 +-
+ drivers/regulator/sy7636a-regulator.c | 128 +++
+ drivers/regulator/uniphier-regulator.c | 1 +
+ drivers/regulator/userspace-consumer.c | 14 +-
+ drivers/thermal/thermal_core.c | 63 +-
+ include/linux/reboot.h | 1 +
+ include/linux/regulator/consumer.h | 14 +
+ include/linux/regulator/coupler.h | 5 -
+ include/linux/regulator/driver.h | 186 +++-
+ include/linux/regulator/machine.h | 26 +
+ kernel/reboot.c | 79 ++
+ 58 files changed, 3854 insertions(+), 1317 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/regulator/max8893.yaml
+ create mode 100644 Documentation/devicetree/bindings/regulator/richtek,rt6160-regulator.yaml
+ create mode 100644 Documentation/devicetree/bindings/regulator/richtek,rt6245-regulator.yaml
+ delete mode 100644 drivers/regulator/bd70528-regulator.c
+ create mode 100644 drivers/regulator/irq_helpers.c
+ create mode 100644 drivers/regulator/max8893.c
+ create mode 100644 drivers/regulator/rt6160-regulator.c
+ create mode 100644 drivers/regulator/rt6245-regulator.c
+ create mode 100644 drivers/regulator/sy7636a-regulator.c
+Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing)
+$ git merge security/next-testing
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check)
+$ git merge apparmor/apparmor-next
+Auto-merging security/apparmor/policy_unpack.c
+Auto-merging security/apparmor/policy.c
+Auto-merging security/apparmor/lsm.c
+Auto-merging security/apparmor/label.c
+Auto-merging security/apparmor/include/label.h
+Auto-merging security/apparmor/include/file.h
+Auto-merging security/apparmor/apparmorfs.c
+Merge made by the 'recursive' strategy.
+ security/apparmor/apparmorfs.c | 4 +--
+ security/apparmor/include/file.h | 2 +-
+ security/apparmor/include/label.h | 1 +
+ security/apparmor/include/policy.h | 6 ++--
+ security/apparmor/label.c | 4 +--
+ security/apparmor/lsm.c | 22 +++++++-------
+ security/apparmor/path.c | 2 +-
+ security/apparmor/policy.c | 59 ++++++++++++++++++++++++++++++++------
+ security/apparmor/policy_unpack.c | 2 +-
+ 9 files changed, 73 insertions(+), 29 deletions(-)
+Merging integrity/next-integrity (907a399de7b0 evm: Check xattr size discrepancy between kernel and user)
+$ git merge integrity/next-integrity
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/evm | 36 ++-
+ Documentation/security/IMA-templates.rst | 12 +-
+ include/linux/evm.h | 34 ++-
+ include/linux/integrity.h | 1 +
+ security/integrity/evm/evm.h | 1 +
+ security/integrity/evm/evm_crypto.c | 58 ++++-
+ security/integrity/evm/evm_main.c | 376 ++++++++++++++++++++++++---
+ security/integrity/evm/evm_secfs.c | 31 ++-
+ security/integrity/iint.c | 4 +-
+ security/integrity/ima/Kconfig | 7 +
+ security/integrity/ima/ima_appraise.c | 44 +++-
+ security/integrity/ima/ima_asymmetric_keys.c | 1 +
+ security/integrity/ima/ima_crypto.c | 4 +-
+ security/integrity/ima/ima_fs.c | 6 +-
+ security/integrity/ima/ima_init.c | 4 +
+ security/integrity/ima/ima_kexec.c | 1 +
+ security/integrity/ima/ima_main.c | 2 +-
+ security/integrity/ima/ima_queue.c | 5 +-
+ security/integrity/ima/ima_template.c | 30 ++-
+ security/integrity/ima/ima_template_lib.c | 211 ++++++++++++++-
+ security/integrity/ima/ima_template_lib.h | 16 ++
+ security/security.c | 4 +-
+ 22 files changed, 804 insertions(+), 84 deletions(-)
+Merging keys/keys-next (e377c31f788f integrity: Load mokx variables into the blacklist keyring)
+$ git merge keys/keys-next
+Auto-merging scripts/Makefile
+Auto-merging include/keys/system_keyring.h
+Auto-merging certs/system_keyring.c
+CONFLICT (content): Merge conflict in certs/system_keyring.c
+Auto-merging certs/Makefile
+Auto-merging certs/Kconfig
+Resolved 'certs/system_keyring.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master ff064db5554b] Merge remote-tracking branch 'keys/keys-next'
+$ git diff -M --stat --summary HEAD^..
+Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata)
+$ git merge safesetid/safesetid-next
+Merge made by the 'recursive' strategy.
+ security/safesetid/lsm.c | 2 +-
+ security/safesetid/lsm.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging selinux/next (d99cf13f1420 selinux: kill 'flags' argument in avc_has_perm_flags() and avc_audit())
+$ git merge selinux/next
+Auto-merging security/security.c
+Auto-merging net/xfrm/xfrm_policy.c
+Merge made by the 'recursive' strategy.
+ include/linux/lsm_audit.h | 8 ++---
+ include/linux/lsm_hook_defs.h | 3 +-
+ include/linux/security.h | 4 +--
+ net/xfrm/xfrm_policy.c | 6 ++--
+ security/security.c | 4 +--
+ security/selinux/avc.c | 61 ++++++++++-----------------------------
+ security/selinux/hooks.c | 22 ++++----------
+ security/selinux/include/avc.h | 13 +--------
+ security/selinux/include/xfrm.h | 2 +-
+ security/selinux/ss/avtab.c | 28 +++++++++---------
+ security/selinux/ss/avtab.h | 16 +++++-----
+ security/selinux/ss/conditional.c | 14 +++++----
+ security/selinux/ss/policydb.c | 1 -
+ security/selinux/ss/services.c | 27 +++++++++++++----
+ security/selinux/xfrm.c | 2 +-
+ 15 files changed, 90 insertions(+), 121 deletions(-)
+Merging smack/next (fe6bde732be8 Smack: fix doc warning)
+$ git merge smack/next
+Merge made by the 'recursive' strategy.
+ security/smack/smack_access.c | 10 ++++++----
+ security/smack/smackfs.c | 4 +++-
+ 2 files changed, 9 insertions(+), 5 deletions(-)
+Merging tomoyo/master (98eaa63e9627 tomoyo: fix doc warnings)
+$ git merge tomoyo/master
+Merge made by the 'recursive' strategy.
+ security/tomoyo/audit.c | 1 +
+ security/tomoyo/securityfs_if.c | 1 +
+ security/tomoyo/tomoyo.c | 12 +++++-------
+ security/tomoyo/util.c | 4 ++--
+ 4 files changed, 9 insertions(+), 9 deletions(-)
+Merging tpmdd/next (87e968848116 certs: Add support for using elliptic curve keys for signing modules)
+$ git merge tpmdd/next
+Merge made by the 'recursive' strategy.
+ certs/Kconfig | 26 ++++++++++++++++++++++++++
+ certs/Makefile | 21 +++++++++++++++++++++
+ crypto/asymmetric_keys/pkcs7_parser.c | 8 ++++++++
+ drivers/char/tpm/tpm1-cmd.c | 4 ++--
+ drivers/char/tpm/tpm2-cmd.c | 2 +-
+ drivers/char/tpm/tpm_crb.c | 2 +-
+ drivers/char/tpm/tpm_tis.c | 6 +-----
+ drivers/char/tpm/tpm_tis_core.c | 25 ++++++++++++++++++-------
+ drivers/char/tpm/tpm_tis_core.h | 3 ++-
+ drivers/char/tpm/tpm_tis_i2c_cr50.c | 4 ++--
+ drivers/char/tpm/tpm_tis_spi_main.c | 14 ++++++++++----
+ 11 files changed, 92 insertions(+), 23 deletions(-)
+Merging watchdog/master (cf813c67d961 watchdog: iTCO_wdt: use dev_err() instead of pr_err())
+$ git merge watchdog/master
+Removing drivers/watchdog/mv64x60_wdt.c
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/watchdog/sbsa-gwdt.txt
+Removing Documentation/devicetree/bindings/watchdog/atmel-sama5d4-wdt.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/watchdog/arm,sbsa-gwdt.yaml | 51 ++++
+ .../bindings/watchdog/atmel,sama5d4-wdt.yaml | 74 +++++
+ .../bindings/watchdog/atmel-sama5d4-wdt.txt | 34 ---
+ .../bindings/watchdog/mstar,msc313e-wdt.yaml | 40 +++
+ .../devicetree/bindings/watchdog/mtk-wdt.txt | 6 +
+ .../devicetree/bindings/watchdog/qcom-wdt.yaml | 1 +
+ .../devicetree/bindings/watchdog/sbsa-gwdt.txt | 31 --
+ .../devicetree/bindings/watchdog/snps,dw-wdt.yaml | 1 +
+ MAINTAINERS | 1 +
+ drivers/watchdog/Kconfig | 77 +++--
+ drivers/watchdog/Makefile | 3 +-
+ drivers/watchdog/aspeed_wdt.c | 6 +-
+ drivers/watchdog/bcm7038_wdt.c | 31 +-
+ drivers/watchdog/booke_wdt.c | 2 +-
+ drivers/watchdog/diag288_wdt.c | 4 -
+ drivers/watchdog/dw_wdt.c | 9 +-
+ drivers/watchdog/eurotechwdt.c | 2 +-
+ drivers/watchdog/hpwdt.c | 1 +
+ drivers/watchdog/iTCO_wdt.c | 16 +-
+ drivers/watchdog/imx2_wdt.c | 10 +
+ drivers/watchdog/imx_sc_wdt.c | 11 +-
+ drivers/watchdog/it87_wdt.c | 8 -
+ drivers/watchdog/jz4740_wdt.c | 4 +-
+ drivers/watchdog/keembay_wdt.c | 34 ++-
+ drivers/watchdog/lpc18xx_wdt.c | 2 +-
+ drivers/watchdog/mei_wdt.c | 8 +-
+ drivers/watchdog/meson_wdt.c | 8 +-
+ drivers/watchdog/msc313e_wdt.c | 166 +++++++++++
+ drivers/watchdog/mtk_wdt.c | 77 ++++-
+ drivers/watchdog/mtx-1_wdt.c | 2 -
+ drivers/watchdog/mv64x60_wdt.c | 324 ---------------------
+ drivers/watchdog/octeon-wdt-main.c | 12 +-
+ drivers/watchdog/of_xilinx_wdt.c | 38 +--
+ drivers/watchdog/orion_wdt.c | 2 +-
+ drivers/watchdog/pc87413_wdt.c | 2 +-
+ drivers/watchdog/qcom-wdt.c | 4 +-
+ drivers/watchdog/sama5d4_wdt.c | 10 +-
+ drivers/watchdog/sbc60xxwdt.c | 2 +-
+ drivers/watchdog/sbsa_gwdt.c | 54 +++-
+ drivers/watchdog/sc520_wdt.c | 2 +-
+ drivers/watchdog/sl28cpld_wdt.c | 2 +-
+ drivers/watchdog/sp805_wdt.c | 43 ++-
+ drivers/watchdog/w83877f_wdt.c | 2 +-
+ drivers/watchdog/watchdog_core.h | 48 +++
+ drivers/watchdog/watchdog_dev.c | 86 +++---
+ drivers/watchdog/watchdog_hrtimer_pretimeout.c | 44 +++
+ drivers/watchdog/watchdog_pretimeout.c | 9 +-
+ drivers/watchdog/wdat_wdt.c | 4 +-
+ drivers/watchdog/wdt.c | 4 +-
+ drivers/watchdog/wdt_pci.c | 2 +-
+ drivers/watchdog/ziirave_wdt.c | 21 +-
+ include/linux/mv643xx.h | 8 -
+ 52 files changed, 825 insertions(+), 618 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/watchdog/arm,sbsa-gwdt.yaml
+ create mode 100644 Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml
+ delete mode 100644 Documentation/devicetree/bindings/watchdog/atmel-sama5d4-wdt.txt
+ create mode 100644 Documentation/devicetree/bindings/watchdog/mstar,msc313e-wdt.yaml
+ delete mode 100644 Documentation/devicetree/bindings/watchdog/sbsa-gwdt.txt
+ create mode 100644 drivers/watchdog/msc313e_wdt.c
+ delete mode 100644 drivers/watchdog/mv64x60_wdt.c
+ create mode 100644 drivers/watchdog/watchdog_hrtimer_pretimeout.c
+Merging iommu/next (23f66fc785b5 Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next)
+$ git merge iommu/next
+Auto-merging drivers/iommu/dma-iommu.c
+Auto-merging drivers/iommu/arm/arm-smmu/arm-smmu.c
+Auto-merging drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
+Auto-merging drivers/acpi/arm64/iort.c
+Auto-merging arch/arm64/boot/dts/qcom/msm8996.dtsi
+Removing Documentation/devicetree/bindings/iommu/rockchip,iommu.txt
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 9 +-
+ Documentation/devicetree/bindings/iommu/iommu.txt | 18 +
+ .../devicetree/bindings/iommu/rockchip,iommu.txt | 38 --
+ .../devicetree/bindings/iommu/rockchip,iommu.yaml | 85 +++
+ arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +-
+ drivers/acpi/arm64/iort.c | 4 +-
+ drivers/iommu/amd/amd_iommu.h | 2 -
+ drivers/iommu/amd/init.c | 20 +-
+ drivers/iommu/amd/iommu.c | 31 +-
+ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 59 +-
+ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 223 ++++++-
+ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 48 +-
+ drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 43 +-
+ drivers/iommu/arm/arm-smmu/arm-smmu.c | 28 +-
+ drivers/iommu/arm/arm-smmu/qcom_iommu.c | 14 +-
+ drivers/iommu/dma-iommu.c | 6 +-
+ drivers/iommu/exynos-iommu.c | 1 -
+ drivers/iommu/intel/Kconfig | 6 +
+ drivers/iommu/intel/Makefile | 1 +
+ drivers/iommu/intel/debugfs.c | 111 ++++
+ drivers/iommu/intel/dmar.c | 54 +-
+ drivers/iommu/intel/iommu.c | 167 ++++--
+ drivers/iommu/intel/pasid.c | 2 +-
+ drivers/iommu/intel/perf.c | 166 ++++++
+ drivers/iommu/intel/perf.h | 73 +++
+ drivers/iommu/intel/svm.c | 643 ++++++++++-----------
+ drivers/iommu/iommu.c | 3 -
+ drivers/iommu/iova.c | 18 +-
+ drivers/iommu/ipmmu-vmsa.c | 1 -
+ drivers/iommu/msm_iommu.c | 1 -
+ drivers/iommu/mtk_iommu.c | 1 -
+ drivers/iommu/mtk_iommu_v1.c | 1 -
+ drivers/iommu/of_iommu.c | 68 ---
+ drivers/iommu/omap-iommu.c | 1 -
+ drivers/iommu/rockchip-iommu.c | 175 +++++-
+ drivers/iommu/virtio-iommu.c | 1 -
+ drivers/of/platform.c | 1 -
+ include/linux/intel-iommu.h | 44 +-
+ include/linux/of_iommu.h | 17 +-
+ include/trace/events/intel_iommu.h | 37 ++
+ 40 files changed, 1578 insertions(+), 645 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/iommu/rockchip,iommu.txt
+ create mode 100644 Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml
+ create mode 100644 drivers/iommu/intel/perf.c
+ create mode 100644 drivers/iommu/intel/perf.h
+Merging audit/next (0ecc617858fc audit: remove unnecessary 'ret' initialization)
+$ git merge audit/next
+Merge made by the 'recursive' strategy.
+ include/uapi/linux/audit.h | 4 +--
+ kernel/audit.h | 10 ++++----
+ kernel/audit_tree.c | 12 +++------
+ kernel/auditsc.c | 63 ++++++++++++++++++++++++++++++----------------
+ security/lsm_audit.c | 1 -
+ 5 files changed, 53 insertions(+), 37 deletions(-)
+Merging devicetree/for-next (972d6a7dcec3 dt-bindings: Drop redundant minItems/maxItems)
+$ git merge devicetree/for-next
+Auto-merging include/linux/pci.h
+Auto-merging drivers/of/of_private.h
+Auto-merging drivers/of/address.c
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/virtio/mmio.txt
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Removing Documentation/devicetree/bindings/timer/renesas,tpu.txt
+Removing Documentation/devicetree/bindings/timer/arm,twd.txt
+Auto-merging Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
+Removing Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
+Removing Documentation/devicetree/bindings/rtc/pcf8563.txt
+Removing Documentation/devicetree/bindings/rtc/pcf85363.txt
+Removing Documentation/devicetree/bindings/rng/mtk-rng.txt
+Removing Documentation/devicetree/bindings/reset/ti,sci-reset.txt
+Removing Documentation/devicetree/bindings/pwm/brcm,iproc-pwm.txt
+Auto-merging Documentation/devicetree/bindings/pwm/allwinner,sun4i-a10-pwm.yaml
+Removing Documentation/devicetree/bindings/property-units.txt
+Removing Documentation/devicetree/bindings/power/renesas,sysc-rmobile.txt
+Auto-merging Documentation/devicetree/bindings/phy/phy-cadence-torrent.yaml
+Removing Documentation/devicetree/bindings/pci/pci-keystone.txt
+Auto-merging Documentation/devicetree/bindings/net/stm32-dwmac.yaml
+CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/net/stm32-dwmac.yaml
+Auto-merging Documentation/devicetree/bindings/net/snps,dwmac.yaml
+Removing Documentation/devicetree/bindings/net/mdio-mux.txt
+Removing Documentation/devicetree/bindings/net/mdio-mux-multiplexer.txt
+Removing Documentation/devicetree/bindings/net/mdio-mux-mmioreg.txt
+Removing Documentation/devicetree/bindings/net/mdio-mux-gpio.txt
+Removing Documentation/devicetree/bindings/net/mdio-gpio.txt
+Removing Documentation/devicetree/bindings/mux/reg-mux.txt
+Removing Documentation/devicetree/bindings/mux/mux-controller.txt
+Removing Documentation/devicetree/bindings/mux/gpio-mux.txt
+CONFLICT (modify/delete): Documentation/devicetree/bindings/mtd/ti,am654-hbmc.txt deleted in HEAD and modified in devicetree/for-next. Version devicetree/for-next of Documentation/devicetree/bindings/mtd/ti,am654-hbmc.txt left in tree.
+Removing Documentation/devicetree/bindings/mtd/mtd-physmap.txt
+Removing Documentation/devicetree/bindings/mtd/intel,ixp4xx-flash.txt
+Removing Documentation/devicetree/bindings/mtd/cypress,hyperflash.txt
+Removing Documentation/devicetree/bindings/mtd/arm-versatile.txt
+Auto-merging Documentation/devicetree/bindings/mmc/sdhci-am654.yaml
+Removing Documentation/devicetree/bindings/memory-controllers/nvidia,tegra20-emc.txt
+Auto-merging Documentation/devicetree/bindings/media/renesas,drif.yaml
+CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/media/renesas,drif.yaml
+Removing Documentation/devicetree/bindings/mailbox/omap-mailbox.txt
+Removing Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.txt
+Auto-merging Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml
+Removing Documentation/devicetree/bindings/i2c/i2c-mux.txt
+Removing Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt
+Removing Documentation/devicetree/bindings/i2c/i2c-mux-gpmux.txt
+Auto-merging Documentation/devicetree/bindings/i2c/i2c-mux-gpio.txt
+Removing Documentation/devicetree/bindings/i2c/i2c-aspeed.txt
+Auto-merging Documentation/devicetree/bindings/display/bridge/cdns,mhdp8546.yaml
+CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/display/bridge/cdns,mhdp8546.yaml
+Removing Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt
+Removing Documentation/devicetree/bindings/clock/ti,sci-clk.txt
+Removing Documentation/devicetree/bindings/clock/renesas,r9a06g032-sysctrl.txt
+Removing Documentation/devicetree/bindings/clock/renesas,emev2-smu.txt
+Auto-merging Documentation/devicetree/bindings/clock/idt,versaclock5.yaml
+Removing Documentation/devicetree/bindings/arm/scu.txt
+Removing Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
+Removing Documentation/devicetree/bindings/arm/juno,scpi.txt
+Removing Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.txt
+Removing Documentation/devicetree/bindings/arm/arm,scpi.txt
+Removing Documentation/devicetree/bindings/arm/arm,scmi.txt
+Removing Documentation/devicetree/bindings/arm/amlogic,scpi.txt
+Resolved 'Documentation/devicetree/bindings/display/bridge/cdns,mhdp8546.yaml' using previous resolution.
+Resolved 'Documentation/devicetree/bindings/media/renesas,drif.yaml' using previous resolution.
+Resolved 'Documentation/devicetree/bindings/net/stm32-dwmac.yaml' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f Documentation/devicetree/bindings/mtd/ti,am654-hbmc.txt
+rm 'Documentation/devicetree/bindings/mtd/ti,am654-hbmc.txt'
+$ git commit --no-edit -v -a
+[master 9029a1d90c96] Merge remote-tracking branch 'devicetree/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/arm/amlogic,scpi.txt | 27 --
+ Documentation/devicetree/bindings/arm/arm,scmi.txt | 239 ---------------
+ Documentation/devicetree/bindings/arm/arm,scpi.txt | 219 -------------
+ Documentation/devicetree/bindings/arm/arm,scu.yaml | 46 +++
+ .../bindings/arm/firmware/linaro,optee-tz.txt | 31 --
+ .../bindings/arm/firmware/linaro,optee-tz.yaml | 58 ++++
+ .../devicetree/bindings/arm/intel,keembay.yaml | 2 +
+ .../devicetree/bindings/arm/juno,scpi.txt | 26 --
+ .../devicetree/bindings/arm/keystone/ti,sci.txt | 86 ------
+ .../devicetree/bindings/arm/keystone/ti,sci.yaml | 129 ++++++++
+ Documentation/devicetree/bindings/arm/scu.txt | 28 --
+ .../devicetree/bindings/arm/ux500/boards.txt | 4 +-
+ .../devicetree/bindings/ata/nvidia,tegra-ahci.yaml | 1 -
+ .../devicetree/bindings/ata/renesas,rcar-sata.yaml | 11 +
+ .../bindings/clock/allwinner,sun4i-a10-ccu.yaml | 2 -
+ .../devicetree/bindings/clock/idt,versaclock5.yaml | 7 +-
+ .../bindings/clock/qcom,gcc-apq8064.yaml | 1 -
+ .../devicetree/bindings/clock/qcom,gcc-sdx55.yaml | 2 -
+ .../devicetree/bindings/clock/qcom,gcc-sm8350.yaml | 2 -
+ .../bindings/clock/renesas,emev2-smu.txt | 98 ------
+ .../bindings/clock/renesas,emev2-smu.yaml | 140 +++++++++
+ .../bindings/clock/renesas,r9a06g032-sysctrl.txt | 46 ---
+ .../bindings/clock/renesas,r9a06g032-sysctrl.yaml | 62 ++++
+ .../bindings/clock/sprd,sc9863a-clk.yaml | 1 -
+ .../devicetree/bindings/clock/ti,sci-clk.txt | 36 ---
+ .../devicetree/bindings/clock/ti,sci-clk.yaml | 49 +++
+ .../bindings/crypto/allwinner,sun8i-ce.yaml | 2 -
+ .../devicetree/bindings/crypto/fsl-dcp.yaml | 1 -
+ .../allwinner,sun4i-a10-display-backend.yaml | 6 -
+ .../display/allwinner,sun6i-a31-mipi-dsi.yaml | 1 -
+ .../display/allwinner,sun8i-a83t-dw-hdmi.yaml | 4 -
+ .../display/allwinner,sun8i-a83t-hdmi-phy.yaml | 2 -
+ .../display/allwinner,sun8i-r40-tcon-top.yaml | 2 -
+ .../bindings/display/bridge/adi,adv7511.txt | 143 ---------
+ .../bindings/display/bridge/adi,adv7511.yaml | 240 +++++++++++++++
+ .../bindings/display/bridge/adi,adv7533.yaml | 184 +++++++++++
+ .../bindings/display/bridge/cdns,mhdp8546.yaml | 2 -
+ .../devicetree/bindings/display/panel/lvds.yaml | 46 +--
+ .../display/rockchip/rockchip,dw-hdmi.yaml | 2 -
+ .../devicetree/bindings/display/st,stm32-dsi.yaml | 2 -
+ .../devicetree/bindings/display/st,stm32-ltdc.yaml | 1 -
+ .../bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml | 4 -
+ .../devicetree/bindings/dma/renesas,rcar-dmac.yaml | 1 -
+ Documentation/devicetree/bindings/dma/ti-edma.txt | 4 +-
+ .../bindings/edac/amazon,al-mc-edac.yaml | 2 -
+ Documentation/devicetree/bindings/eeprom/at24.yaml | 1 -
+ .../devicetree/bindings/example-schema.yaml | 2 -
+ .../devicetree/bindings/firmware/arm,scmi.yaml | 341 +++++++++++++++++++++
+ .../devicetree/bindings/firmware/arm,scpi.yaml | 247 +++++++++++++++
+ .../devicetree/bindings/gpio/gpio-davinci.txt | 2 +-
+ .../devicetree/bindings/gpu/brcm,bcm-v3d.yaml | 1 -
+ .../devicetree/bindings/gpu/vivante,gc.yaml | 1 -
+ .../devicetree/bindings/i2c/aspeed,i2c.yaml | 74 +++++
+ .../devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml | 1 -
+ .../devicetree/bindings/i2c/i2c-aspeed.txt | 49 ---
+ .../devicetree/bindings/i2c/i2c-davinci.txt | 4 +-
+ .../devicetree/bindings/i2c/i2c-demux-pinctrl.txt | 2 +-
+ .../devicetree/bindings/i2c/i2c-mux-gpio.txt | 4 +-
+ .../devicetree/bindings/i2c/i2c-mux-gpmux.txt | 99 ------
+ .../devicetree/bindings/i2c/i2c-mux-gpmux.yaml | 124 ++++++++
+ .../devicetree/bindings/i2c/i2c-mux-ltc4306.txt | 4 +-
+ .../devicetree/bindings/i2c/i2c-mux-pca954x.txt | 74 -----
+ .../devicetree/bindings/i2c/i2c-mux-pca954x.yaml | 110 +++++++
+ .../devicetree/bindings/i2c/i2c-mux-pinctrl.txt | 4 +-
+ .../devicetree/bindings/i2c/i2c-mux-reg.txt | 4 +-
+ Documentation/devicetree/bindings/i2c/i2c-mux.txt | 73 -----
+ Documentation/devicetree/bindings/i2c/i2c-mux.yaml | 87 ++++++
+ .../bindings/i2c/marvell,mv64xxx-i2c.yaml | 2 -
+ .../bindings/i2c/mellanox,i2c-mlxbf.yaml | 1 -
+ .../bindings/iio/adc/amlogic,meson-saradc.yaml | 1 -
+ .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 2 -
+ .../bindings/iio/multiplexer/io-channel-mux.txt | 39 ---
+ .../bindings/iio/multiplexer/io-channel-mux.yaml | 70 +++++
+ .../interrupt-controller/fsl,irqsteer.yaml | 1 -
+ .../interrupt-controller/loongson,liointc.yaml | 1 -
+ .../interrupt-controller/ti,pruss-intc.yaml | 2 +-
+ .../devicetree/bindings/iommu/arm,smmu-v3.yaml | 1 -
+ .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 1 -
+ .../devicetree/bindings/mailbox/arm,mhu.yaml | 48 ++-
+ .../devicetree/bindings/mailbox/arm,mhuv2.yaml | 25 +-
+ .../devicetree/bindings/mailbox/omap-mailbox.txt | 184 -----------
+ .../devicetree/bindings/mailbox/st,stm32-ipcc.yaml | 2 -
+ .../bindings/mailbox/ti,omap-mailbox.yaml | 308 +++++++++++++++++++
+ .../devicetree/bindings/media/amlogic,gx-vdec.yaml | 1 -
+ .../devicetree/bindings/media/i2c/adv7604.yaml | 1 -
+ .../bindings/media/i2c/maxim,max9286.yaml | 23 +-
+ .../bindings/media/marvell,mmp2-ccic.yaml | 1 -
+ .../bindings/media/qcom,sc7180-venus.yaml | 1 -
+ .../bindings/media/qcom,sdm845-venus-v2.yaml | 1 -
+ .../bindings/media/qcom,sm8250-venus.yaml | 1 -
+ .../devicetree/bindings/media/renesas,drif.yaml | 1 -
+ .../memory-controllers/mediatek,smi-common.yaml | 6 +-
+ .../memory-controllers/mediatek,smi-larb.yaml | 1 -
+ .../memory-controllers/nvidia,tegra20-emc.txt | 130 --------
+ .../memory-controllers/nvidia,tegra20-emc.yaml | 230 ++++++++++++++
+ .../devicetree/bindings/mfd/motorola-cpcap.txt | 4 +-
+ .../bindings/mfd/ti,j721e-system-controller.yaml | 19 +-
+ .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 2 -
+ .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 1 -
+ Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 2 -
+ .../devicetree/bindings/mmc/renesas,sdhi.yaml | 2 -
+ .../devicetree/bindings/mmc/sdhci-am654.yaml | 1 -
+ .../devicetree/bindings/mmc/sdhci-pxa.yaml | 1 -
+ .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 4 +-
+ .../devicetree/bindings/mtd/arm-versatile.txt | 26 --
+ .../bindings/mtd/cortina,gemini-flash.txt | 2 +-
+ .../devicetree/bindings/mtd/cypress,hyperflash.txt | 13 -
+ .../devicetree/bindings/mtd/intel,ixp4xx-flash.txt | 22 --
+ .../devicetree/bindings/mtd/mtd-physmap.txt | 114 -------
+ .../devicetree/bindings/mtd/mtd-physmap.yaml | 208 +++++++++++++
+ .../devicetree/bindings/mux/adi,adg792a.txt | 2 +-
+ .../devicetree/bindings/mux/adi,adgs1408.txt | 2 +-
+ Documentation/devicetree/bindings/mux/gpio-mux.txt | 69 -----
+ .../devicetree/bindings/mux/gpio-mux.yaml | 92 ++++++
+ .../devicetree/bindings/mux/mux-consumer.yaml | 46 +++
+ .../devicetree/bindings/mux/mux-controller.txt | 157 ----------
+ .../devicetree/bindings/mux/mux-controller.yaml | 182 +++++++++++
+ Documentation/devicetree/bindings/mux/reg-mux.txt | 129 --------
+ Documentation/devicetree/bindings/mux/reg-mux.yaml | 143 +++++++++
+ .../bindings/net/amlogic,meson-dwmac.yaml | 2 -
+ .../devicetree/bindings/net/brcm,bcm4908-enet.yaml | 2 -
+ .../bindings/net/brcm,mdio-mux-iproc.txt | 2 +-
+ .../devicetree/bindings/net/can/bosch,m_can.yaml | 2 -
+ .../devicetree/bindings/net/can/c_can.txt | 4 +-
+ .../devicetree/bindings/net/dsa/brcm,sf2.yaml | 2 -
+ .../devicetree/bindings/net/mdio-gpio.txt | 27 --
+ .../devicetree/bindings/net/mdio-gpio.yaml | 57 ++++
+ .../devicetree/bindings/net/mdio-mux-gpio.txt | 119 -------
+ .../devicetree/bindings/net/mdio-mux-gpio.yaml | 135 ++++++++
+ .../devicetree/bindings/net/mdio-mux-mmioreg.txt | 75 -----
+ .../devicetree/bindings/net/mdio-mux-mmioreg.yaml | 78 +++++
+ .../bindings/net/mdio-mux-multiplexer.txt | 82 -----
+ .../bindings/net/mdio-mux-multiplexer.yaml | 82 +++++
+ Documentation/devicetree/bindings/net/mdio-mux.txt | 129 --------
+ .../devicetree/bindings/net/mdio-mux.yaml | 44 +++
+ .../devicetree/bindings/net/snps,dwmac.yaml | 2 -
+ .../devicetree/bindings/net/stm32-dwmac.yaml | 1 -
+ .../devicetree/bindings/pci/brcm,stb-pcie.yaml | 2 -
+ .../devicetree/bindings/pci/loongson.yaml | 1 -
+ .../bindings/pci/mediatek-pcie-gen3.yaml | 1 -
+ .../bindings/pci/microchip,pcie-host.yaml | 2 -
+ .../devicetree/bindings/pci/pci-keystone.txt | 115 -------
+ .../devicetree/bindings/pci/ti,am65-pci-ep.yaml | 74 +++++
+ .../devicetree/bindings/pci/ti,am65-pci-host.yaml | 96 ++++++
+ .../devicetree/bindings/perf/arm,cmn.yaml | 1 -
+ .../bindings/phy/brcm,bcm63xx-usbh-phy.yaml | 1 -
+ .../bindings/phy/brcm,brcmstb-usb-phy.yaml | 3 -
+ .../devicetree/bindings/phy/brcm,sata-phy.yaml | 1 -
+ .../devicetree/bindings/phy/mediatek,tphy.yaml | 2 -
+ .../bindings/phy/phy-cadence-sierra.yaml | 2 -
+ .../bindings/phy/phy-cadence-torrent.yaml | 4 -
+ .../bindings/phy/qcom,ipq806x-usb-phy-hs.yaml | 1 -
+ .../bindings/phy/qcom,ipq806x-usb-phy-ss.yaml | 1 -
+ .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 1 -
+ .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 2 -
+ .../devicetree/bindings/phy/renesas,usb2-phy.yaml | 2 -
+ .../devicetree/bindings/phy/renesas,usb3-phy.yaml | 1 -
+ .../bindings/pinctrl/actions,s500-pinctrl.yaml | 1 -
+ .../bindings/power/amlogic,meson-ee-pwrc.yaml | 1 -
+ .../bindings/power/renesas,sysc-rmobile.txt | 100 ------
+ .../bindings/power/renesas,sysc-rmobile.yaml | 121 ++++++++
+ .../devicetree/bindings/property-units.txt | 48 ---
+ .../bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 1 -
+ .../devicetree/bindings/pwm/brcm,iproc-pwm.txt | 21 --
+ .../devicetree/bindings/pwm/brcm,iproc-pwm.yaml | 45 +++
+ Documentation/devicetree/bindings/pwm/pwm.yaml | 9 +-
+ .../devicetree/bindings/pwm/renesas,pwm-rcar.yaml | 13 +
+ .../devicetree/bindings/pwm/renesas,tpu-pwm.yaml | 26 ++
+ .../bindings/remoteproc/st,stm32-rproc.yaml | 2 -
+ .../bindings/remoteproc/ti,keystone-rproc.txt | 4 +-
+ .../bindings/remoteproc/ti,omap-remoteproc.yaml | 3 +-
+ .../devicetree/bindings/reset/fsl,imx-src.yaml | 1 -
+ .../devicetree/bindings/reset/ti,sci-reset.txt | 62 ----
+ .../devicetree/bindings/reset/ti,sci-reset.yaml | 51 +++
+ .../devicetree/bindings/riscv/sifive-l2-cache.yaml | 1 -
+ Documentation/devicetree/bindings/rng/mtk-rng.txt | 22 --
+ Documentation/devicetree/bindings/rng/mtk-rng.yaml | 54 ++++
+ .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 1 -
+ .../devicetree/bindings/rtc/arm,pl031.yaml | 58 ++++
+ .../devicetree/bindings/rtc/imxdi-rtc.yaml | 1 -
+ .../devicetree/bindings/rtc/nxp,pcf8563.yaml | 58 ++++
+ Documentation/devicetree/bindings/rtc/pcf85363.txt | 17 -
+ Documentation/devicetree/bindings/rtc/pcf8563.txt | 29 --
+ .../devicetree/bindings/serial/fsl-lpuart.yaml | 2 -
+ .../devicetree/bindings/serial/samsung_uart.yaml | 1 -
+ .../devicetree/bindings/soc/qcom/qcom,geni-se.yaml | 1 -
+ .../devicetree/bindings/soc/ti/sci-pm-domain.txt | 65 ----
+ .../devicetree/bindings/soc/ti/sci-pm-domain.yaml | 59 ++++
+ .../devicetree/bindings/soc/ti/ti,pruss.yaml | 2 -
+ .../sound/nvidia,tegra-audio-graph-card.yaml | 1 -
+ .../bindings/sound/nvidia,tegra210-i2s.yaml | 2 -
+ .../devicetree/bindings/sound/st,stm32-sai.yaml | 3 -
+ .../bindings/spi/amlogic,meson-gx-spicc.yaml | 1 -
+ .../devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml | 2 -
+ .../devicetree/bindings/spi/spi-davinci.txt | 2 +-
+ Documentation/devicetree/bindings/spmi/spmi.yaml | 15 +-
+ Documentation/devicetree/bindings/sram/sram.yaml | 5 +
+ .../bindings/thermal/allwinner,sun8i-a83t-ths.yaml | 2 -
+ .../devicetree/bindings/thermal/qcom-tsens.yaml | 1 -
+ .../timer/allwinner,sun5i-a13-hstimer.yaml | 1 -
+ .../devicetree/bindings/timer/arm,arch_timer.yaml | 1 -
+ .../bindings/timer/arm,arch_timer_mmio.yaml | 2 -
+ .../devicetree/bindings/timer/arm,twd-timer.yaml | 56 ++++
+ .../devicetree/bindings/timer/arm,twd.txt | 53 ----
+ .../bindings/timer/intel,ixp4xx-timer.yaml | 1 -
+ .../devicetree/bindings/timer/renesas,tmu.yaml | 1 +
+ .../devicetree/bindings/timer/renesas,tpu.txt | 21 --
+ .../devicetree/bindings/timer/renesas,tpu.yaml | 56 ++++
+ .../devicetree/bindings/usb/cdns,usb3.yaml | 2 +-
+ .../devicetree/bindings/usb/maxim,max3420-udc.yaml | 2 -
+ .../devicetree/bindings/usb/nvidia,tegra-xudc.yaml | 4 -
+ .../devicetree/bindings/usb/renesas,usbhs.yaml | 3 -
+ .../devicetree/bindings/usb/ti,j721e-usb.yaml | 2 +-
+ .../devicetree/bindings/usb/ti,keystone-dwc3.yaml | 2 +-
+ .../devicetree/bindings/vendor-prefixes.yaml | 6 +-
+ Documentation/devicetree/bindings/virtio/mmio.txt | 47 ---
+ Documentation/devicetree/bindings/virtio/mmio.yaml | 60 ++++
+ .../devicetree/bindings/watchdog/arm,twd-wdt.yaml | 50 +++
+ .../bindings/watchdog/st,stm32-iwdg.yaml | 1 -
+ .../devicetree/bindings/writing-bindings.rst | 3 +-
+ MAINTAINERS | 10 +-
+ drivers/of/Kconfig | 4 +-
+ drivers/of/address.c | 128 +++-----
+ drivers/of/fdt.c | 14 +-
+ drivers/of/of_private.h | 4 +
+ drivers/of/of_reserved_mem.c | 10 +-
+ drivers/of/unittest.c | 6 +-
+ include/linux/of.h | 11 +-
+ include/linux/of_address.h | 54 ++--
+ include/linux/of_reserved_mem.h | 14 +-
+ include/linux/pci.h | 4 +
+ 231 files changed, 4724 insertions(+), 3619 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/arm/amlogic,scpi.txt
+ delete mode 100644 Documentation/devicetree/bindings/arm/arm,scmi.txt
+ delete mode 100644 Documentation/devicetree/bindings/arm/arm,scpi.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/arm,scu.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/juno,scpi.txt
+ delete mode 100644 Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/keystone/ti,sci.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/scu.txt
+ delete mode 100644 Documentation/devicetree/bindings/clock/renesas,emev2-smu.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/renesas,emev2-smu.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/renesas,r9a06g032-sysctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/renesas,r9a06g032-sysctrl.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/ti,sci-clk.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/ti,sci-clk.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/adi,adv7511.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/adi,adv7533.yaml
+ create mode 100644 Documentation/devicetree/bindings/firmware/arm,scmi.yaml
+ create mode 100644 Documentation/devicetree/bindings/firmware/arm,scpi.yaml
+ create mode 100644 Documentation/devicetree/bindings/i2c/aspeed,i2c.yaml
+ delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-aspeed.txt
+ delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux-gpmux.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux-gpmux.yaml
+ delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml
+ delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux.yaml
+ delete mode 100644 Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mailbox/omap-mailbox.txt
+ create mode 100644 Documentation/devicetree/bindings/mailbox/ti,omap-mailbox.yaml
+ delete mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra20-emc.txt
+ create mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra20-emc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mtd/arm-versatile.txt
+ delete mode 100644 Documentation/devicetree/bindings/mtd/cypress,hyperflash.txt
+ delete mode 100644 Documentation/devicetree/bindings/mtd/intel,ixp4xx-flash.txt
+ delete mode 100644 Documentation/devicetree/bindings/mtd/mtd-physmap.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/mtd-physmap.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mux/gpio-mux.txt
+ create mode 100644 Documentation/devicetree/bindings/mux/gpio-mux.yaml
+ create mode 100644 Documentation/devicetree/bindings/mux/mux-consumer.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mux/mux-controller.txt
+ create mode 100644 Documentation/devicetree/bindings/mux/mux-controller.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mux/reg-mux.txt
+ create mode 100644 Documentation/devicetree/bindings/mux/reg-mux.yaml
+ delete mode 100644 Documentation/devicetree/bindings/net/mdio-gpio.txt
+ create mode 100644 Documentation/devicetree/bindings/net/mdio-gpio.yaml
+ delete mode 100644 Documentation/devicetree/bindings/net/mdio-mux-gpio.txt
+ create mode 100644 Documentation/devicetree/bindings/net/mdio-mux-gpio.yaml
+ delete mode 100644 Documentation/devicetree/bindings/net/mdio-mux-mmioreg.txt
+ create mode 100644 Documentation/devicetree/bindings/net/mdio-mux-mmioreg.yaml
+ delete mode 100644 Documentation/devicetree/bindings/net/mdio-mux-multiplexer.txt
+ create mode 100644 Documentation/devicetree/bindings/net/mdio-mux-multiplexer.yaml
+ delete mode 100644 Documentation/devicetree/bindings/net/mdio-mux.txt
+ create mode 100644 Documentation/devicetree/bindings/net/mdio-mux.yaml
+ delete mode 100644 Documentation/devicetree/bindings/pci/pci-keystone.txt
+ create mode 100644 Documentation/devicetree/bindings/pci/ti,am65-pci-ep.yaml
+ create mode 100644 Documentation/devicetree/bindings/pci/ti,am65-pci-host.yaml
+ delete mode 100644 Documentation/devicetree/bindings/power/renesas,sysc-rmobile.txt
+ create mode 100644 Documentation/devicetree/bindings/power/renesas,sysc-rmobile.yaml
+ delete mode 100644 Documentation/devicetree/bindings/property-units.txt
+ delete mode 100644 Documentation/devicetree/bindings/pwm/brcm,iproc-pwm.txt
+ create mode 100644 Documentation/devicetree/bindings/pwm/brcm,iproc-pwm.yaml
+ delete mode 100644 Documentation/devicetree/bindings/reset/ti,sci-reset.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/ti,sci-reset.yaml
+ delete mode 100644 Documentation/devicetree/bindings/rng/mtk-rng.txt
+ create mode 100644 Documentation/devicetree/bindings/rng/mtk-rng.yaml
+ create mode 100644 Documentation/devicetree/bindings/rtc/arm,pl031.yaml
+ create mode 100644 Documentation/devicetree/bindings/rtc/nxp,pcf8563.yaml
+ delete mode 100644 Documentation/devicetree/bindings/rtc/pcf85363.txt
+ delete mode 100644 Documentation/devicetree/bindings/rtc/pcf8563.txt
+ delete mode 100644 Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
+ create mode 100644 Documentation/devicetree/bindings/soc/ti/sci-pm-domain.yaml
+ create mode 100644 Documentation/devicetree/bindings/timer/arm,twd-timer.yaml
+ delete mode 100644 Documentation/devicetree/bindings/timer/arm,twd.txt
+ delete mode 100644 Documentation/devicetree/bindings/timer/renesas,tpu.txt
+ create mode 100644 Documentation/devicetree/bindings/timer/renesas,tpu.yaml
+ delete mode 100644 Documentation/devicetree/bindings/virtio/mmio.txt
+ create mode 100644 Documentation/devicetree/bindings/virtio/mmio.yaml
+ create mode 100644 Documentation/devicetree/bindings/watchdog/arm,twd-wdt.yaml
+Merging mailbox/mailbox-for-next (6393989e2a31 mailbox: bcm-flexrm-mailbox: Remove redundant dev_err call in flexrm_mbox_probe())
+$ git merge mailbox/mailbox-for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mailbox/fsl,mu.yaml | 1 +
+ .../mailbox/microchip,polarfire-soc-mailbox.yaml | 47 ++++
+ .../microchip,polarfire-soc-sys-controller.yaml | 35 +++
+ MAINTAINERS | 9 +
+ drivers/mailbox/Kconfig | 12 +
+ drivers/mailbox/Makefile | 2 +
+ drivers/mailbox/arm_mhu.c | 4 +-
+ drivers/mailbox/bcm-flexrm-mailbox.c | 1 -
+ drivers/mailbox/bcm-pdc-mailbox.c | 1 -
+ drivers/mailbox/bcm2835-mailbox.c | 1 -
+ drivers/mailbox/hi3660-mailbox.c | 2 +-
+ drivers/mailbox/hi6220-mailbox.c | 2 +-
+ drivers/mailbox/imx-mailbox.c | 196 ++++++++++------
+ drivers/mailbox/mailbox-mpfs.c | 251 +++++++++++++++++++++
+ drivers/mailbox/mtk-cmdq-mailbox.c | 28 ++-
+ drivers/mailbox/qcom-ipcc.c | 6 +
+ include/linux/mailbox/mtk-cmdq-mailbox.h | 8 +-
+ include/soc/microchip/mpfs.h | 56 +++++
+ 18 files changed, 562 insertions(+), 100 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mailbox/microchip,polarfire-soc-mailbox.yaml
+ create mode 100644 Documentation/devicetree/bindings/soc/microchip/microchip,polarfire-soc-sys-controller.yaml
+ create mode 100644 drivers/mailbox/mailbox-mpfs.c
+ create mode 100644 include/soc/microchip/mpfs.h
+Merging spi/for-next (a9a38d725ce1 Merge remote-tracking branch 'spi/for-5.14' into spi-next)
+$ git merge spi/for-next
+Removing include/linux/platform_data/spi-ath79.h
+Auto-merging drivers/mtd/nand/spi/core.c
+Removing Documentation/devicetree/bindings/spi/spi-xilinx.txt
+Removing Documentation/devicetree/bindings/spi/spi-cadence.txt
+Removing Documentation/devicetree/bindings/spi/renesas,rzn1-spi.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/spi/renesas,rzn1-spi.txt | 11 -
+ .../devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 6 +
+ .../devicetree/bindings/spi/spi-cadence.txt | 30 --
+ .../devicetree/bindings/spi/spi-cadence.yaml | 66 ++++
+ .../devicetree/bindings/spi/spi-controller.yaml | 7 +-
+ .../devicetree/bindings/spi/spi-rockchip.yaml | 1 +
+ .../devicetree/bindings/spi/spi-xilinx.txt | 23 --
+ .../devicetree/bindings/spi/spi-xilinx.yaml | 57 +++
+ Documentation/spi/pxa2xx.rst | 58 +--
+ drivers/mtd/nand/spi/core.c | 45 ++-
+ drivers/spi/Kconfig | 1 +
+ drivers/spi/spi-altera-dfl.c | 4 +-
+ drivers/spi/spi-ath79.c | 9 +-
+ drivers/spi/spi-atmel.c | 139 ++------
+ drivers/spi/spi-bcm2835.c | 204 ++++++-----
+ drivers/spi/spi-bcm2835aux.c | 2 +-
+ drivers/spi/spi-dw-mmio.c | 2 +-
+ drivers/spi/spi-geni-qcom.c | 4 +-
+ drivers/spi/spi-hisi-kunpeng.c | 51 ++-
+ drivers/spi/spi-lm70llp.c | 2 +-
+ drivers/spi/spi-loopback-test.c | 2 +-
+ drivers/spi/spi-mem.c | 88 ++++-
+ drivers/spi/spi-meson-spicc.c | 8 +-
+ drivers/spi/spi-mpc512x-psc.c | 4 +-
+ drivers/spi/spi-mpc52xx-psc.c | 4 +-
+ drivers/spi/spi-mpc52xx.c | 2 +-
+ drivers/spi/spi-npcm-pspi.c | 2 +-
+ drivers/spi/spi-oc-tiny.c | 2 +-
+ drivers/spi/spi-omap-100k.c | 6 +-
+ drivers/spi/spi-omap-uwire.c | 4 +-
+ drivers/spi/spi-omap2-mcspi.c | 4 +-
+ drivers/spi/spi-pl022.c | 4 +-
+ drivers/spi/spi-ppc4xx.c | 10 +-
+ drivers/spi/spi-pxa2xx-dma.c | 41 +--
+ drivers/spi/spi-pxa2xx-pci.c | 11 +-
+ drivers/spi/spi-pxa2xx.c | 387 +++++++++------------
+ drivers/spi/spi-pxa2xx.h | 68 ++--
+ drivers/spi/spi-rockchip.c | 55 ++-
+ drivers/spi/spi-rspi.c | 6 +-
+ drivers/spi/spi-sh-msiof.c | 4 +-
+ drivers/spi/spi-stm32-qspi.c | 88 ++++-
+ drivers/spi/spi-tegra114.c | 3 +-
+ drivers/spi/spi-tegra210-quad.c | 2 +-
+ drivers/spi/spi-topcliff-pch.c | 4 +-
+ drivers/spi/spi-uniphier.c | 2 +-
+ drivers/spi/spi.c | 263 +++++++-------
+ drivers/spi/spidev.c | 2 +-
+ include/linux/mtd/spinand.h | 22 ++
+ include/linux/platform_data/spi-ath79.h | 16 -
+ include/linux/pxa2xx_ssp.h | 51 ++-
+ include/linux/spi/pxa2xx_spi.h | 21 +-
+ include/linux/spi/spi-mem.h | 16 +
+ include/linux/spi/spi.h | 7 +-
+ include/trace/events/spi.h | 57 +++
+ sound/soc/pxa/pxa-ssp.c | 16 -
+ 55 files changed, 1180 insertions(+), 824 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/spi/renesas,rzn1-spi.txt
+ delete mode 100644 Documentation/devicetree/bindings/spi/spi-cadence.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-cadence.yaml
+ delete mode 100644 Documentation/devicetree/bindings/spi/spi-xilinx.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-xilinx.yaml
+ delete mode 100644 include/linux/platform_data/spi-ath79.h
+Merging tip/auto-latest (f10bd30916ba Merge branch 'efi/core')
+$ git merge tip/auto-latest
+Auto-merging scripts/Makefile.build
+Auto-merging samples/kprobes/kprobe_example.c
+CONFLICT (content): Merge conflict in samples/kprobes/kprobe_example.c
+Auto-merging net/core/filter.c
+Auto-merging net/core/dev.c
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/kprobes.c
+Auto-merging include/linux/pci_ids.h
+Auto-merging include/linux/kprobes.h
+Removing include/linux/atomic-fallback.h
+Auto-merging drivers/net/ethernet/qualcomm/qca_spi.c
+Auto-merging drivers/md/dm.c
+Auto-merging drivers/clocksource/Kconfig
+Auto-merging block/blk-mq.c
+Removing arch/x86/entry/syscalls/syscalltbl.sh
+Removing arch/x86/entry/syscalls/syscallhdr.sh
+Auto-merging arch/x86/Makefile
+Auto-merging arch/s390/kernel/smp.c
+Auto-merging arch/riscv/kernel/probes/kprobes.c
+Auto-merging arch/powerpc/xmon/xmon.c
+Auto-merging arch/powerpc/kernel/smp.c
+Auto-merging arch/powerpc/kernel/process.c
+Auto-merging arch/powerpc/kernel/kprobes.c
+Removing arch/microblaze/include/asm/cmpxchg.h
+Removing arch/microblaze/include/asm/atomic.h
+Removing arch/h8300/include/asm/cmpxchg.h
+Removing arch/h8300/include/asm/atomic.h
+Auto-merging arch/arm64/kernel/smp.c
+Auto-merging arch/arm64/kernel/process.c
+Auto-merging arch/arm64/kernel/probes/kprobes.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/admin-guide/sysctl/kernel.rst
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Resolved 'samples/kprobes/kprobe_example.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 1692cc03feae] Merge remote-tracking branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/accounting/delay-accounting.rst | 12 +-
+ .../admin-guide/hw-vuln/core-scheduling.rst | 223 ++
+ Documentation/admin-guide/hw-vuln/index.rst | 1 +
+ Documentation/admin-guide/kernel-parameters.txt | 15 +-
+ Documentation/admin-guide/sysctl/kernel.rst | 7 +
+ Documentation/locking/lockdep-design.rst | 4 +-
+ Documentation/trace/kprobes.rst | 24 +-
+ Documentation/x86/buslock.rst | 126 +
+ Documentation/x86/elf_auxvec.rst | 53 +
+ Documentation/x86/index.rst | 2 +
+ Documentation/x86/x86_64/boot-options.rst | 31 +-
+ MAINTAINERS | 6 +
+ arch/alpha/include/asm/atomic.h | 88 +-
+ arch/alpha/include/asm/cmpxchg.h | 12 +-
+ arch/alpha/kernel/process.c | 2 +-
+ arch/alpha/kernel/smp.c | 1 -
+ arch/arc/include/asm/atomic.h | 60 +-
+ arch/arc/include/asm/cmpxchg.h | 10 +-
+ arch/arc/kernel/kprobes.c | 16 -
+ arch/arc/kernel/smp.c | 1 -
+ arch/arc/kernel/stacktrace.c | 2 +-
+ arch/arm/include/asm/atomic.h | 96 +-
+ arch/arm/include/asm/cmpxchg.h | 20 +-
+ arch/arm/include/asm/sync_bitops.h | 2 +-
+ arch/arm/kernel/process.c | 2 +-
+ arch/arm/kernel/smp.c | 1 -
+ arch/arm/mach-zynq/Kconfig | 2 +-
+ arch/arm/probes/kprobes/core.c | 23 -
+ arch/arm64/include/asm/atomic.h | 2 -
+ arch/arm64/include/asm/preempt.h | 2 +-
+ arch/arm64/kernel/probes/kprobes.c | 17 -
+ arch/arm64/kernel/process.c | 2 +-
+ arch/arm64/kernel/smp.c | 1 -
+ arch/arm64/kvm/Kconfig | 5 +-
+ arch/csky/include/asm/cmpxchg.h | 8 +-
+ arch/csky/kernel/asm-offsets.c | 1 -
+ arch/csky/kernel/probes/kprobes.c | 17 -
+ arch/csky/kernel/smp.c | 1 -
+ arch/csky/kernel/stacktrace.c | 2 +-
+ arch/h8300/include/asm/Kbuild | 1 +
+ arch/h8300/include/asm/atomic.h | 97 -
+ arch/h8300/include/asm/cmpxchg.h | 66 -
+ arch/h8300/kernel/asm-offsets.c | 1 -
+ arch/h8300/kernel/process.c | 2 +-
+ arch/hexagon/include/asm/atomic.h | 28 +-
+ arch/hexagon/include/asm/cmpxchg.h | 4 +-
+ arch/hexagon/kernel/process.c | 2 +-
+ arch/ia64/include/asm/atomic.h | 74 +-
+ arch/ia64/include/asm/cmpxchg.h | 16 +
+ arch/ia64/include/uapi/asm/cmpxchg.h | 10 +-
+ arch/ia64/kernel/kprobes.c | 16 -
+ arch/ia64/kernel/mca.c | 2 +-
+ arch/ia64/kernel/process.c | 4 +-
+ arch/ia64/kernel/ptrace.c | 8 +-
+ arch/ia64/kernel/smpboot.c | 1 -
+ arch/m68k/include/asm/atomic.h | 60 +-
+ arch/m68k/include/asm/cmpxchg.h | 10 +-
+ arch/m68k/include/asm/mmu_context.h | 2 +-
+ arch/m68k/kernel/process.c | 2 +-
+ arch/microblaze/include/asm/Kbuild | 1 +
+ arch/microblaze/include/asm/atomic.h | 28 -
+ arch/microblaze/include/asm/cmpxchg.h | 9 -
+ arch/microblaze/kernel/asm-offsets.c | 1 -
+ arch/mips/include/asm/atomic.h | 55 +-
+ arch/mips/include/asm/cmpxchg.h | 22 +-
+ arch/mips/kernel/asm-offsets.c | 1 -
+ arch/mips/kernel/cmpxchg.c | 4 +-
+ arch/mips/kernel/kprobes.c | 3 -
+ arch/mips/kernel/process.c | 2 +-
+ arch/mips/kernel/smp.c | 1 -
+ arch/nds32/kernel/process.c | 2 +-
+ arch/nios2/kernel/process.c | 2 +-
+ arch/openrisc/include/asm/atomic.h | 42 +-
+ arch/openrisc/include/asm/cmpxchg.h | 4 +-
+ arch/openrisc/kernel/asm-offsets.c | 1 -
+ arch/openrisc/kernel/smp.c | 2 -
+ arch/parisc/include/asm/atomic.h | 34 +-
+ arch/parisc/include/asm/cmpxchg.h | 14 +-
+ arch/parisc/kernel/asm-offsets.c | 1 -
+ arch/parisc/kernel/process.c | 4 +-
+ arch/parisc/kernel/smp.c | 1 -
+ arch/powerpc/include/asm/atomic.h | 140 +-
+ arch/powerpc/include/asm/cmpxchg.h | 30 +-
+ arch/powerpc/include/asm/qspinlock.h | 2 +-
+ arch/powerpc/kernel/kprobes.c | 17 -
+ arch/powerpc/kernel/process.c | 4 +-
+ arch/powerpc/kernel/smp.c | 1 -
+ arch/powerpc/xmon/xmon.c | 13 +-
+ arch/riscv/include/asm/atomic.h | 128 +-
+ arch/riscv/include/asm/cmpxchg.h | 34 +-
+ arch/riscv/kernel/probes/kprobes.c | 17 -
+ arch/riscv/kernel/smpboot.c | 1 -
+ arch/riscv/kernel/stacktrace.c | 2 +-
+ arch/s390/include/asm/atomic.h | 2 -
+ arch/s390/include/asm/preempt.h | 4 +-
+ arch/s390/kernel/kprobes.c | 17 -
+ arch/s390/kernel/process.c | 2 +-
+ arch/s390/kernel/smp.c | 1 -
+ arch/s390/mm/fault.c | 2 +-
+ arch/sh/include/asm/atomic-grb.h | 6 +-
+ arch/sh/include/asm/atomic-irq.h | 6 +-
+ arch/sh/include/asm/atomic-llsc.h | 6 +-
+ arch/sh/include/asm/atomic.h | 8 +-
+ arch/sh/include/asm/cmpxchg.h | 4 +-
+ arch/sh/kernel/kprobes.c | 17 -
+ arch/sh/kernel/process_32.c | 2 +-
+ arch/sh/kernel/smp.c | 2 -
+ arch/sparc/include/asm/atomic_32.h | 38 +-
+ arch/sparc/include/asm/atomic_64.h | 36 +-
+ arch/sparc/include/asm/cmpxchg_32.h | 12 +-
+ arch/sparc/include/asm/cmpxchg_64.h | 12 +-
+ arch/sparc/kernel/kprobes.c | 17 -
+ arch/sparc/kernel/process_32.c | 3 +-
+ arch/sparc/kernel/process_64.c | 3 +-
+ arch/sparc/kernel/smp_32.c | 1 -
+ arch/sparc/kernel/smp_64.c | 3 -
+ arch/sparc/lib/atomic32.c | 24 +-
+ arch/sparc/lib/atomic_64.S | 42 +-
+ arch/um/kernel/process.c | 2 +-
+ arch/um/kernel/skas/syscall.c | 2 +-
+ arch/x86/Kconfig | 29 -
+ arch/x86/Makefile | 5 +-
+ arch/x86/boot/.gitignore | 1 +
+ arch/x86/boot/Makefile | 44 +-
+ arch/x86/boot/genimage.sh | 303 ++-
+ arch/x86/boot/mtools.conf.in | 3 +
+ arch/x86/entry/Makefile | 10 -
+ arch/x86/entry/calling.h | 45 +-
+ arch/x86/entry/common.c | 87 +-
+ arch/x86/entry/entry_64.S | 5 +-
+ arch/x86/entry/syscall_32.c | 20 +-
+ arch/x86/entry/syscall_64.c | 17 +-
+ arch/x86/entry/syscall_x32.c | 35 +-
+ arch/x86/entry/syscalls/Makefile | 38 +-
+ arch/x86/entry/syscalls/syscallhdr.sh | 35 -
+ arch/x86/entry/syscalls/syscalltbl.sh | 46 -
+ arch/x86/events/core.c | 28 +-
+ arch/x86/events/intel/core.c | 8 +-
+ arch/x86/events/intel/uncore.c | 4 -
+ arch/x86/events/intel/uncore.h | 1 +
+ arch/x86/events/intel/uncore_snbep.c | 173 +-
+ arch/x86/events/perf_event.h | 1 +
+ arch/x86/events/rapl.c | 6 +-
+ arch/x86/hyperv/hv_init.c | 2 +-
+ arch/x86/include/asm/Kbuild | 1 +
+ arch/x86/include/asm/asm.h | 27 +-
+ arch/x86/include/asm/atomic.h | 2 -
+ arch/x86/include/asm/barrier.h | 7 +-
+ arch/x86/include/asm/cpufeatures.h | 3 +-
+ arch/x86/include/asm/crash.h | 6 -
+ arch/x86/include/asm/desc.h | 24 +-
+ arch/x86/include/asm/elf.h | 4 +
+ arch/x86/include/asm/fpu/signal.h | 2 +
+ arch/x86/include/asm/idtentry.h | 4 +-
+ arch/x86/include/asm/intel-family.h | 3 +-
+ arch/x86/include/asm/irq_vectors.h | 7 +-
+ arch/x86/include/asm/jump_label.h | 79 +-
+ arch/x86/include/asm/mce.h | 13 +-
+ arch/x86/include/asm/msr-index.h | 4 +
+ arch/x86/include/asm/nops.h | 24 +-
+ arch/x86/include/asm/perf_event.h | 1 +
+ arch/x86/include/asm/preempt.h | 2 +-
+ arch/x86/include/asm/processor.h | 1 +
+ arch/x86/include/asm/sgx.h | 2 +-
+ arch/x86/include/asm/sigframe.h | 2 +
+ arch/x86/include/asm/stackprotector.h | 2 +-
+ arch/x86/include/asm/syscall.h | 13 +-
+ arch/x86/include/asm/syscall_wrapper.h | 10 +-
+ arch/x86/include/asm/unistd.h | 8 +-
+ arch/x86/include/uapi/asm/auxvec.h | 4 +-
+ arch/x86/include/uapi/asm/hwcap2.h | 6 +-
+ arch/x86/kernel/acpi/cstate.c | 3 +-
+ arch/x86/kernel/alternative.c | 6 +-
+ arch/x86/kernel/amd_nb.c | 3 +
+ arch/x86/kernel/cpu/amd.c | 4 +
+ arch/x86/kernel/cpu/common.c | 43 +-
+ arch/x86/kernel/cpu/cpu.h | 2 +
+ arch/x86/kernel/cpu/hygon.c | 4 +
+ arch/x86/kernel/cpu/intel.c | 46 +-
+ arch/x86/kernel/cpu/mce/amd.c | 55 +-
+ arch/x86/kernel/cpu/mce/apei.c | 3 +-
+ arch/x86/kernel/cpu/sgx/encl.c | 2 +-
+ arch/x86/kernel/cpu/tsx.c | 37 +-
+ arch/x86/kernel/crash.c | 13 -
+ arch/x86/kernel/fpu/signal.c | 19 +
+ arch/x86/kernel/fpu/xstate.c | 6 +-
+ arch/x86/kernel/head_64.S | 6 +-
+ arch/x86/kernel/idt.c | 45 +-
+ arch/x86/kernel/jump_label.c | 81 +-
+ arch/x86/kernel/kprobes/core.c | 20 +-
+ arch/x86/kernel/machine_kexec_32.c | 15 +-
+ arch/x86/kernel/machine_kexec_64.c | 33 +-
+ arch/x86/kernel/process.c | 4 +-
+ arch/x86/kernel/ptrace.c | 2 +-
+ arch/x86/kernel/reboot.c | 2 +-
+ arch/x86/kernel/setup.c | 45 +-
+ arch/x86/kernel/sev.c | 17 +-
+ arch/x86/kernel/signal.c | 92 +-
+ arch/x86/kernel/smpboot.c | 4 +-
+ arch/x86/kernel/traps.c | 9 +-
+ arch/x86/kernel/umip.c | 10 +-
+ arch/x86/kvm/Kconfig | 5 +-
+ arch/x86/kvm/mmu/mmu.c | 2 +-
+ arch/x86/kvm/mmu/tdp_mmu.c | 2 +-
+ arch/x86/lib/insn-eval.c | 30 +-
+ arch/x86/mm/fault.c | 4 +-
+ arch/x86/mm/pkeys.c | 4 +
+ arch/x86/mm/tlb.c | 10 +-
+ arch/x86/platform/efi/efi.c | 2 +-
+ arch/x86/realmode/Makefile | 1 -
+ arch/x86/um/sys_call_table_32.c | 14 +-
+ arch/x86/um/sys_call_table_64.c | 15 +-
+ arch/xtensa/include/asm/atomic.h | 26 +-
+ arch/xtensa/include/asm/cmpxchg.h | 14 +-
+ arch/xtensa/kernel/process.c | 2 +-
+ arch/xtensa/kernel/smp.c | 1 -
+ block/blk-mq.c | 6 +-
+ drivers/clocksource/Kconfig | 14 +
+ drivers/clocksource/arm_arch_timer.c | 3 +-
+ drivers/clocksource/arm_global_timer.c | 122 +-
+ drivers/clocksource/ingenic-sysost.c | 10 +-
+ drivers/clocksource/samsung_pwm_timer.c | 41 +-
+ drivers/clocksource/timer-mediatek.c | 24 +
+ drivers/clocksource/timer-ti-dm.c | 9 +-
+ drivers/cpuidle/governors/menu.c | 6 +-
+ drivers/edac/mce_amd.c | 70 +
+ drivers/firmware/efi/apple-properties.c | 2 +-
+ drivers/firmware/efi/dev-path-parser.c | 49 +-
+ drivers/md/dm.c | 6 +-
+ drivers/net/ethernet/qualcomm/qca_spi.c | 6 +-
+ drivers/thermal/cpufreq_cooling.c | 2 +-
+ drivers/usb/gadget/udc/max3420_udc.c | 15 +-
+ drivers/usb/host/max3421-hcd.c | 3 +-
+ fs/binfmt_elf.c | 8 +-
+ fs/binfmt_elf_fdpic.c | 4 +-
+ fs/proc/loadavg.c | 2 +-
+ fs/proc/stat.c | 4 +-
+ fs/userfaultfd.c | 4 +-
+ include/asm-generic/atomic-instrumented.h | 498 +---
+ include/asm-generic/atomic.h | 118 +-
+ include/asm-generic/atomic64.h | 45 +-
+ include/asm-generic/cmpxchg-local.h | 4 +-
+ include/asm-generic/cmpxchg.h | 42 +-
+ include/asm-generic/preempt.h | 2 +-
+ include/clocksource/samsung_pwm.h | 3 +-
+ include/clocksource/timer-ti-dm.h | 1 +
+ include/linux/atomic-fallback.h | 2595 --------------------
+ include/linux/atomic.h | 4 -
+ include/linux/compiler.h | 22 +-
+ include/linux/delayacct.h | 22 +-
+ include/linux/energy_model.h | 16 +-
+ include/linux/instrumentation.h | 20 +-
+ include/linux/interrupt.h | 3 +
+ include/linux/irq.h | 2 +
+ include/linux/jump_label.h | 16 +-
+ include/linux/kprobes.h | 8 -
+ include/linux/kthread.h | 2 +
+ include/linux/lockdep_types.h | 2 +-
+ include/linux/pci_ids.h | 1 +
+ include/linux/sched.h | 52 +-
+ include/linux/sched/cpufreq.h | 2 +-
+ include/linux/sched/debug.h | 2 +-
+ include/linux/sched/signal.h | 21 +-
+ include/linux/sched/stat.h | 16 +-
+ include/linux/sched_clock.h | 2 +-
+ include/linux/seqlock.h | 6 +-
+ include/linux/tick.h | 26 +-
+ include/uapi/linux/auxvec.h | 3 +
+ include/uapi/linux/prctl.h | 8 +
+ init/init_task.c | 2 +-
+ init/main.c | 17 +-
+ kernel/Kconfig.preempt | 20 +
+ kernel/cgroup/cgroup-v1.c | 2 +-
+ kernel/cpu.c | 53 +-
+ kernel/debug/kdb/kdb_support.c | 18 +-
+ kernel/delayacct.c | 71 +-
+ kernel/events/core.c | 19 +-
+ kernel/events/hw_breakpoint.c | 2 +
+ kernel/events/uprobes.c | 1 +
+ kernel/fork.c | 12 +-
+ kernel/freezer.c | 2 +-
+ kernel/futex.c | 19 +-
+ kernel/hung_task.c | 2 +-
+ kernel/irq/chip.c | 2 +-
+ kernel/irq/handle.c | 2 +-
+ kernel/irq/manage.c | 5 +
+ kernel/irq/settings.h | 12 +
+ kernel/jump_label.c | 12 +-
+ kernel/kcsan/report.c | 2 +-
+ kernel/kprobes.c | 19 -
+ kernel/kthread.c | 34 +-
+ kernel/locking/lockdep.c | 2 +-
+ kernel/locking/mutex.c | 6 +-
+ kernel/locking/rtmutex.c | 4 +-
+ kernel/locking/rwsem.c | 2 +-
+ kernel/ptrace.c | 12 +-
+ kernel/rcu/rcutorture.c | 4 +-
+ kernel/rcu/tree_plugin.h | 2 +-
+ kernel/rcu/tree_stall.h | 12 +-
+ kernel/sched/Makefile | 1 +
+ kernel/sched/core.c | 1062 +++++++-
+ kernel/sched/core_sched.c | 229 ++
+ kernel/sched/cpuacct.c | 12 +-
+ kernel/sched/cpufreq_schedutil.c | 1 +
+ kernel/sched/deadline.c | 48 +-
+ kernel/sched/debug.c | 4 +-
+ kernel/sched/fair.c | 426 +++-
+ kernel/sched/idle.c | 13 +-
+ kernel/sched/isolation.c | 4 +-
+ kernel/sched/loadavg.c | 2 +-
+ kernel/sched/pelt.h | 2 +-
+ kernel/sched/rt.c | 31 +-
+ kernel/sched/sched.h | 436 +++-
+ kernel/sched/stats.h | 68 +-
+ kernel/sched/stop_task.c | 14 +-
+ kernel/sched/topology.c | 4 +-
+ kernel/signal.c | 2 +-
+ kernel/smpboot.c | 1 -
+ kernel/softirq.c | 5 +-
+ kernel/sys.c | 5 +
+ kernel/sysctl.c | 12 +
+ kernel/time/Kconfig | 11 +-
+ kernel/time/clockevents.c | 16 +-
+ kernel/time/posix-cpu-timers.c | 4 +-
+ kernel/time/tick-broadcast.c | 143 +-
+ kernel/time/tick-common.c | 2 +-
+ kernel/time/tick-internal.h | 5 +-
+ kernel/time/tick-sched.c | 129 +-
+ kernel/time/timer.c | 2 +-
+ kernel/time/timer_list.c | 10 +-
+ lib/Kconfig.debug | 1 -
+ lib/atomic64.c | 36 +-
+ lib/smp_processor_id.c | 6 +-
+ lib/syscall.c | 4 +-
+ mm/compaction.c | 2 +-
+ net/core/dev.c | 2 +-
+ net/core/filter.c | 2 +-
+ net/sunrpc/xprtmultipath.c | 2 +-
+ samples/kprobes/kprobe_example.c | 15 -
+ scripts/Makefile.build | 5 +-
+ scripts/atomic/check-atomics.sh | 1 -
+ scripts/atomic/gen-atomic-instrumented.sh | 51 +-
+ scripts/atomic/gen-atomics.sh | 1 -
+ tools/arch/x86/include/asm/asm.h | 193 ++
+ tools/arch/x86/include/asm/irq_vectors.h | 7 +-
+ tools/arch/x86/include/asm/nops.h | 24 +-
+ tools/include/uapi/linux/prctl.h | 8 +
+ tools/objtool/arch/x86/include/arch/special.h | 1 +
+ tools/objtool/check.c | 38 +-
+ tools/objtool/elf.c | 110 +-
+ tools/objtool/include/objtool/elf.h | 18 +-
+ tools/objtool/include/objtool/objtool.h | 3 +
+ tools/objtool/include/objtool/special.h | 1 +
+ tools/objtool/special.c | 14 +
+ tools/testing/selftests/futex/functional/Makefile | 3 +-
+ .../futex/functional/futex_wait_timeout.c | 126 +-
+ tools/testing/selftests/sched/.gitignore | 1 +
+ tools/testing/selftests/sched/Makefile | 14 +
+ tools/testing/selftests/sched/config | 1 +
+ tools/testing/selftests/sched/cs_prctl_test.c | 338 +++
+ tools/testing/selftests/sigaltstack/sas.c | 20 +-
+ tools/testing/selftests/x86/Makefile | 5 +-
+ .../testing/selftests/x86/corrupt_xstate_header.c | 114 +
+ tools/testing/selftests/x86/sigaltstack.c | 128 +
+ tools/testing/selftests/x86/syscall_numbering.c | 491 +++-
+ virt/kvm/kvm_main.c | 2 +-
+ 366 files changed, 6840 insertions(+), 6171 deletions(-)
+ create mode 100644 Documentation/admin-guide/hw-vuln/core-scheduling.rst
+ create mode 100644 Documentation/x86/buslock.rst
+ create mode 100644 Documentation/x86/elf_auxvec.rst
+ delete mode 100644 arch/h8300/include/asm/atomic.h
+ delete mode 100644 arch/h8300/include/asm/cmpxchg.h
+ create mode 100644 arch/ia64/include/asm/cmpxchg.h
+ delete mode 100644 arch/microblaze/include/asm/atomic.h
+ delete mode 100644 arch/microblaze/include/asm/cmpxchg.h
+ delete mode 100644 arch/x86/entry/syscalls/syscallhdr.sh
+ delete mode 100644 arch/x86/entry/syscalls/syscalltbl.sh
+ delete mode 100644 include/linux/atomic-fallback.h
+ create mode 100644 kernel/sched/core_sched.c
+ create mode 100644 tools/arch/x86/include/asm/asm.h
+ create mode 100644 tools/testing/selftests/sched/.gitignore
+ create mode 100644 tools/testing/selftests/sched/Makefile
+ create mode 100644 tools/testing/selftests/sched/config
+ create mode 100644 tools/testing/selftests/sched/cs_prctl_test.c
+ create mode 100644 tools/testing/selftests/x86/corrupt_xstate_header.c
+ create mode 100644 tools/testing/selftests/x86/sigaltstack.c
+Merging clockevents/timers/drivers/next (6f64c8159af9 clocksource/drivers/arm_global_timer: Remove duplicated argument in arm_global_timer)
+$ git merge clockevents/timers/drivers/next
+Auto-merging drivers/clocksource/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/clocksource/ingenic-sysost.c | 315 ++++++++++++++++++++++++++---------
+ 1 file changed, 236 insertions(+), 79 deletions(-)
+Merging edac/edac-for-next (0a9ece9ba154 EDAC/igen6: fix core dependency)
+$ git merge edac/edac-for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 5 +-
+ drivers/edac/Kconfig | 3 +-
+ drivers/edac/aspeed_edac.c | 4 +-
+ drivers/edac/i10nm_base.c | 174 ++++++++++++++++++--
+ drivers/edac/igen6_edac.c | 374 ++++++++++++++++++++++++++++++++++++++++---
+ drivers/edac/pnd2_edac.c | 3 +
+ drivers/edac/sb_edac.c | 3 +
+ drivers/edac/skx_base.c | 3 +
+ drivers/edac/skx_common.c | 82 ++++++++--
+ drivers/edac/skx_common.h | 34 +++-
+ drivers/edac/thunderx_edac.c | 4 +-
+ drivers/edac/ti_edac.c | 1 +
+ 12 files changed, 628 insertions(+), 62 deletions(-)
+Merging irqchip/irq/irqchip-next (c51e96dace68 Merge branch irq/irqchip-driver-updates into irq/irqchip-next)
+$ git merge irqchip/irq/irqchip-next
+Auto-merging drivers/watchdog/octeon-wdt-main.c
+Auto-merging arch/powerpc/sysdev/xics/xics-common.c
+Auto-merging arch/powerpc/platforms/ps3/Kconfig
+Auto-merging arch/powerpc/mm/book3s64/radix_pgtable.c
+Auto-merging arch/powerpc/kvm/book3s_xive_native.c
+Auto-merging arch/powerpc/kvm/book3s_xive.c
+Merge made by the 'recursive' strategy.
+ Documentation/core-api/irq/irq-domain.rst | 1 -
+ .../bindings/interrupt-controller/arm,gic-v3.yaml | 13 +++
+ .../interrupt-controller/renesas,irqc.yaml | 1 +
+ arch/arm/kernel/irq.c | 22 +++-
+ arch/mips/include/asm/irq.h | 1 -
+ arch/mips/lantiq/xway/dma.c | 1 +
+ arch/mips/pci/pci-rt3883.c | 1 +
+ arch/mips/pci/pci-xtalk-bridge.c | 1 +
+ arch/mips/sgi-ip27/ip27-irq.c | 1 +
+ arch/mips/sgi-ip30/ip30-irq.c | 1 +
+ arch/nios2/include/asm/irq.h | 1 -
+ arch/nios2/kernel/irq.c | 1 +
+ arch/powerpc/include/asm/irq.h | 5 +-
+ arch/powerpc/kernel/mce.c | 1 +
+ arch/powerpc/kvm/book3s_hv_uvmem.c | 1 +
+ arch/powerpc/kvm/book3s_xive.c | 1 +
+ arch/powerpc/kvm/book3s_xive_native.c | 1 +
+ arch/powerpc/mm/book3s64/radix_pgtable.c | 1 +
+ arch/powerpc/platforms/cell/Kconfig | 1 +
+ arch/powerpc/platforms/cell/pmu.c | 1 +
+ arch/powerpc/platforms/embedded6xx/flipper-pic.c | 1 +
+ arch/powerpc/platforms/powermac/Kconfig | 1 +
+ arch/powerpc/platforms/ps3/Kconfig | 1 +
+ arch/powerpc/platforms/ps3/interrupt.c | 5 +-
+ arch/powerpc/platforms/pseries/ibmebus.c | 1 +
+ arch/powerpc/sysdev/ehv_pic.c | 1 +
+ arch/powerpc/sysdev/fsl_mpic_err.c | 1 +
+ arch/powerpc/sysdev/i8259.c | 3 +-
+ arch/powerpc/sysdev/mpic.c | 2 +-
+ arch/powerpc/sysdev/tsi108_pci.c | 3 +-
+ arch/powerpc/sysdev/xics/icp-hv.c | 1 +
+ arch/powerpc/sysdev/xics/icp-opal.c | 1 +
+ arch/powerpc/sysdev/xics/xics-common.c | 2 +-
+ arch/powerpc/sysdev/xive/Kconfig | 1 +
+ drivers/irqchip/Kconfig | 2 +-
+ drivers/irqchip/exynos-combiner.c | 14 +--
+ drivers/irqchip/irq-al-fic.c | 7 +-
+ drivers/irqchip/irq-armada-370-xp.c | 19 ++--
+ drivers/irqchip/irq-aspeed-i2c-ic.c | 8 +-
+ drivers/irqchip/irq-aspeed-scu-ic.c | 6 +-
+ drivers/irqchip/irq-ath79-misc.c | 2 +-
+ drivers/irqchip/irq-bcm2835.c | 2 +-
+ drivers/irqchip/irq-bcm2836.c | 2 +-
+ drivers/irqchip/irq-bcm7038-l1.c | 6 +-
+ drivers/irqchip/irq-bcm7120-l2.c | 6 +-
+ drivers/irqchip/irq-brcmstb-l2.c | 2 +-
+ drivers/irqchip/irq-dw-apb-ictl.c | 3 +-
+ drivers/irqchip/irq-gic-pm.c | 4 +-
+ drivers/irqchip/irq-gic-v2m.c | 4 +-
+ drivers/irqchip/irq-gic-v3-its.c | 8 +-
+ drivers/irqchip/irq-gic.c | 13 +--
+ drivers/irqchip/irq-goldfish-pic.c | 5 +-
+ drivers/irqchip/irq-i8259.c | 4 +-
+ drivers/irqchip/irq-idt3243x.c | 6 +-
+ drivers/irqchip/irq-imgpdc.c | 19 ++--
+ drivers/irqchip/irq-imx-gpcv2.c | 4 +-
+ drivers/irqchip/irq-imx-intmux.c | 9 +-
+ drivers/irqchip/irq-imx-irqsteer.c | 9 +-
+ drivers/irqchip/irq-ingenic-tcu.c | 2 +-
+ drivers/irqchip/irq-ingenic.c | 3 +-
+ drivers/irqchip/irq-keystone.c | 14 ++-
+ drivers/irqchip/irq-loongson-htpic.c | 2 +-
+ drivers/irqchip/irq-loongson-htvec.c | 4 +-
+ drivers/irqchip/irq-loongson-liointc.c | 2 +-
+ drivers/irqchip/irq-lpc32xx.c | 2 +-
+ drivers/irqchip/irq-ls-scfg-msi.c | 6 +-
+ drivers/irqchip/irq-ls1x.c | 2 +-
+ drivers/irqchip/irq-mbigen.c | 12 +--
+ drivers/irqchip/irq-mips-gic.c | 21 ++--
+ drivers/irqchip/irq-mscc-ocelot.c | 2 +-
+ drivers/irqchip/irq-mvebu-pic.c | 7 +-
+ drivers/irqchip/irq-mvebu-sei.c | 13 +--
+ drivers/irqchip/irq-nvic.c | 4 +-
+ drivers/irqchip/irq-orion.c | 2 +-
+ drivers/irqchip/irq-partition-percpu.c | 9 +-
+ drivers/irqchip/irq-pruss-intc.c | 9 +-
+ drivers/irqchip/irq-realtek-rtl.c | 2 +-
+ drivers/irqchip/irq-renesas-irqc.c | 2 +-
+ drivers/irqchip/irq-sifive-plic.c | 8 +-
+ drivers/irqchip/irq-stm32-exti.c | 10 +-
+ drivers/irqchip/irq-sun4i.c | 8 +-
+ drivers/irqchip/irq-sunxi-nmi.c | 3 +-
+ drivers/irqchip/irq-tb10x.c | 2 +-
+ drivers/irqchip/irq-ti-sci-inta.c | 9 +-
+ drivers/irqchip/irq-ts4800.c | 3 +-
+ drivers/irqchip/irq-versatile-fpga.c | 2 +-
+ drivers/irqchip/irq-vic.c | 2 +-
+ drivers/irqchip/irq-xilinx-intc.c | 23 +---
+ drivers/irqchip/qcom-irq-combiner.c | 6 +-
+ drivers/irqchip/qcom-pdc.c | 8 +-
+ drivers/scsi/ibmvscsi/ibmvfc.c | 1 +
+ drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 1 +
+ drivers/staging/octeon-usb/octeon-hcd.c | 2 +
+ drivers/watchdog/octeon-wdt-main.c | 1 +
+ include/linux/irqdesc.h | 18 ++--
+ include/linux/irqdomain.h | 65 ++++++-----
+ kernel/irq/Kconfig | 5 +
+ kernel/irq/irqdesc.c | 73 +++++++------
+ kernel/irq/irqdomain.c | 120 ++++++++++++++-------
+ 99 files changed, 383 insertions(+), 352 deletions(-)
+$ git am -3 ../patches/0001-powerpc-fix-up-for-Drop-dependency-between-asm-irq.h.patch
+Applying: powerpc: fix up for "Drop dependency between asm/irq.h and linux/irqdomain.h"
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/powerpc/platforms/pseries/vas.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 23b98d8e3862] Merge remote-tracking branch 'irqchip/irq/irqchip-next'
+ Date: Thu Jun 24 14:20:07 2021 +1000
+Merging ftrace/for-next (3105497b8ae7 Merge branch 'trace/ftrace/urgent' into trace/for-next)
+$ git merge ftrace/for-next
+Auto-merging kernel/trace/trace.c
+Merge made by the 'recursive' strategy.
+ Documentation/trace/boottime-trace.rst | 6 ++++++
+ include/trace/events/sched.h | 2 --
+ include/trace/events/writeback.h | 3 ++-
+ kernel/trace/ring_buffer.c | 2 +-
+ kernel/trace/trace.c | 2 +-
+ kernel/trace/trace_boot.c | 27 +++++++++++++++++++++++++--
+ kernel/trace/trace_events_hist.c | 3 ++-
+ kernel/trace/trace_events_trigger.c | 3 ++-
+ tools/bootconfig/main.c | 4 +---
+ 9 files changed, 40 insertions(+), 12 deletions(-)
+Merging rcu/rcu/next (00b1a0341c16 torture: Protect kvm-remote.sh directory trees from /tmp reaping)
+$ git merge rcu/rcu/next
+Auto-merging mm/slub.c
+Auto-merging mm/slab_common.c
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/time/timer.c
+Auto-merging kernel/rcu/tree_stall.h
+CONFLICT (content): Merge conflict in kernel/rcu/tree_stall.h
+Auto-merging kernel/rcu/tree_plugin.h
+CONFLICT (content): Merge conflict in kernel/rcu/tree_plugin.h
+Auto-merging kernel/rcu/rcutorture.c
+Auto-merging kernel/locking/lockdep.c
+Auto-merging kernel/kcsan/report.c
+Removing kernel/kcsan/atomic.h
+Auto-merging init/main.c
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Resolved 'kernel/rcu/tree_plugin.h' using previous resolution.
+Resolved 'kernel/rcu/tree_stall.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 601d837f19c2] Merge remote-tracking branch 'rcu/rcu/next'
+$ git diff -M --stat --summary HEAD^..
+ .../Memory-Ordering/Tree-RCU-Memory-Ordering.rst | 35 +-
+ .../RCU/Design/Requirements/Requirements.rst | 8 +-
+ Documentation/RCU/checklist.rst | 24 +-
+ Documentation/RCU/rcu_dereference.rst | 6 +-
+ Documentation/RCU/stallwarn.rst | 10 +-
+ Documentation/admin-guide/kernel-parameters.rst | 5 +
+ Documentation/admin-guide/kernel-parameters.txt | 27 +
+ Documentation/dev-tools/kcsan.rst | 105 +-
+ .../litmus-tests/locking/DCL-broken.litmus | 55 +
+ .../litmus-tests/locking/DCL-fixed.litmus | 56 +
+ .../litmus-tests/locking/RM-broken.litmus | 42 +
+ Documentation/litmus-tests/locking/RM-fixed.litmus | 42 +
+ arch/x86/kernel/tsc.c | 4 +-
+ include/linux/clocksource.h | 8 +-
+ include/linux/rculist.h | 35 +-
+ include/linux/rcupdate.h | 86 +-
+ include/linux/rcutiny.h | 4 -
+ include/linux/rcutree.h | 1 -
+ include/linux/srcu.h | 6 +
+ include/linux/srcutiny.h | 8 +-
+ include/linux/srcutree.h | 2 -
+ include/linux/timer.h | 2 -
+ include/trace/events/rcu.h | 1 +
+ init/main.c | 2 +
+ kernel/kcsan/atomic.h | 23 -
+ kernel/kcsan/core.c | 128 +-
+ kernel/kcsan/kcsan.h | 39 +-
+ kernel/kcsan/kcsan_test.c | 32 +
+ kernel/kcsan/permissive.h | 94 ++
+ kernel/kcsan/report.c | 169 +--
+ kernel/locking/lockdep.c | 6 +-
+ kernel/locking/locktorture.c | 25 +-
+ kernel/rcu/Kconfig.debug | 2 +-
+ kernel/rcu/rcu.h | 14 +-
+ kernel/rcu/rcutorture.c | 322 +++--
+ kernel/rcu/refscale.c | 150 +-
+ kernel/rcu/srcutiny.c | 2 +-
+ kernel/rcu/srcutree.c | 28 +-
+ kernel/rcu/sync.c | 4 +-
+ kernel/rcu/tasks.h | 94 +-
+ kernel/rcu/tiny.c | 1 -
+ kernel/rcu/tree.c | 426 +++---
+ kernel/rcu/tree.h | 16 +-
+ kernel/rcu/tree_nocb.h | 1496 +++++++++++++++++++
+ kernel/rcu/tree_plugin.h | 1527 +-------------------
+ kernel/rcu/tree_stall.h | 128 +-
+ kernel/rcu/update.c | 8 +-
+ kernel/scftorture.c | 6 +-
+ kernel/time/Makefile | 1 +
+ kernel/time/clocksource-wdtest.c | 202 +++
+ kernel/time/clocksource.c | 226 ++-
+ kernel/time/jiffies.c | 15 +-
+ kernel/time/timer.c | 14 -
+ lib/Kconfig.debug | 12 +
+ lib/Kconfig.kcsan | 42 +-
+ lib/bitmap.c | 9 +
+ lib/test_bitmap.c | 7 +
+ mm/oom_kill.c | 2 +-
+ mm/slab.h | 1 +
+ mm/slab_common.c | 12 +-
+ mm/slub.c | 8 +
+ mm/util.c | 2 +-
+ .../memory-model/Documentation/access-marking.txt | 152 +-
+ tools/memory-model/Documentation/explanation.txt | 2 +-
+ tools/memory-model/Documentation/locking.txt | 320 ++++
+ tools/memory-model/litmus-tests/.gitignore | 2 +-
+ tools/memory-model/scripts/README | 16 +-
+ tools/memory-model/scripts/checkalllitmus.sh | 29 +-
+ tools/memory-model/scripts/checkghlitmus.sh | 11 +-
+ tools/memory-model/scripts/checklitmus.sh | 25 +-
+ tools/memory-model/scripts/checklitmushist.sh | 2 +-
+ tools/memory-model/scripts/checktheselitmus.sh | 43 +
+ tools/memory-model/scripts/cmplitmushist.sh | 49 +-
+ tools/memory-model/scripts/hwfnseg.sh | 20 +
+ tools/memory-model/scripts/initlitmushist.sh | 2 +-
+ tools/memory-model/scripts/judgelitmus.sh | 120 +-
+ tools/memory-model/scripts/newlitmushist.sh | 4 +-
+ tools/memory-model/scripts/parseargs.sh | 21 +-
+ tools/memory-model/scripts/runlitmus.sh | 80 +
+ tools/memory-model/scripts/runlitmushist.sh | 29 +-
+ tools/memory-model/scripts/simpletest.sh | 35 +
+ tools/rcu/rcu-cbs.py | 46 +
+ .../selftests/rcutorture/bin/kcsan-collapse.sh | 2 +-
+ .../testing/selftests/rcutorture/bin/kvm-again.sh | 33 +-
+ .../testing/selftests/rcutorture/bin/kvm-build.sh | 6 +-
+ .../selftests/rcutorture/bin/kvm-end-run-stats.sh | 40 +
+ .../selftests/rcutorture/bin/kvm-find-errors.sh | 2 +-
+ .../selftests/rcutorture/bin/kvm-recheck-lock.sh | 2 +-
+ .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 2 +-
+ .../selftests/rcutorture/bin/kvm-recheck-scf.sh | 2 +-
+ .../selftests/rcutorture/bin/kvm-remote-noreap.sh | 30 +
+ .../testing/selftests/rcutorture/bin/kvm-remote.sh | 261 ++++
+ tools/testing/selftests/rcutorture/bin/kvm.sh | 63 +-
+ tools/testing/selftests/rcutorture/bin/torture.sh | 39 +-
+ .../selftests/rcutorture/configs/rcu/BUSTED-BOOST | 17 +
+ .../rcutorture/configs/rcu/BUSTED-BOOST.boot | 8 +
+ .../selftests/rcutorture/configs/rcuscale/TREE | 2 +-
+ .../selftests/rcutorture/configs/rcuscale/TREE54 | 2 +-
+ .../rcutorture/configs/refscale/NOPREEMPT | 2 +-
+ .../selftests/rcutorture/configs/refscale/PREEMPT | 2 +-
+ .../rcutorture/formal/srcu-cbmc/src/locks.h | 2 +-
+ 101 files changed, 4876 insertions(+), 2516 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
+ delete mode 100644 kernel/kcsan/atomic.h
+ create mode 100644 kernel/kcsan/permissive.h
+ create mode 100644 kernel/rcu/tree_nocb.h
+ create mode 100644 kernel/time/clocksource-wdtest.c
+ create mode 100644 tools/memory-model/Documentation/locking.txt
+ create mode 100755 tools/memory-model/scripts/checktheselitmus.sh
+ create mode 100755 tools/memory-model/scripts/hwfnseg.sh
+ create mode 100755 tools/memory-model/scripts/runlitmus.sh
+ create mode 100755 tools/memory-model/scripts/simpletest.sh
+ create mode 100644 tools/rcu/rcu-cbs.py
+ create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-end-run-stats.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-remote-noreap.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-remote.sh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/BUSTED-BOOST
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/BUSTED-BOOST.boot
+$ git am -3 ../patches/0001-fix-for-code-movement-to-kernel-rcu-tree_nocb.h.patch
+Applying: fix for code movement to kernel/rcu/tree_nocb.h
+$ git reset HEAD^
+Unstaged changes after reset:
+M kernel/rcu/tree_nocb.h
+$ git add -A .
+$ git commit -v -a --amend
+[master 12cf22e61add] Merge remote-tracking branch 'rcu/rcu/next'
+ Date: Thu Jun 24 14:30:21 2021 +1000
+Merging kvm/next (c3ab0e28a437 Merge branch 'topic/ppc-kvm' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux into HEAD)
+$ git merge kvm/next
+Auto-merging virt/kvm/kvm_main.c
+Auto-merging arch/x86/kvm/mmu/tdp_mmu.c
+Auto-merging arch/x86/kvm/mmu/mmu.c
+Auto-merging arch/x86/kvm/Kconfig
+Auto-merging Documentation/virt/kvm/api.rst
+Merge made by the 'recursive' strategy.
+ Documentation/virt/kvm/api.rst | 78 +++
+ Documentation/virt/kvm/cpuid.rst | 7 +
+ Documentation/virt/kvm/hypercalls.rst | 21 +
+ Documentation/virt/kvm/locking.rst | 5 +
+ Documentation/virt/kvm/msr.rst | 13 +
+ arch/arm64/include/asm/kvm_host.h | 2 +-
+ arch/mips/include/asm/kvm_host.h | 2 +-
+ arch/powerpc/include/asm/kvm_host.h | 6 +-
+ arch/x86/include/asm/hyperv-tlfs.h | 19 +-
+ arch/x86/include/asm/kvm-x86-ops.h | 9 +-
+ arch/x86/include/asm/kvm_host.h | 85 ++-
+ arch/x86/include/asm/svm.h | 9 +-
+ arch/x86/include/uapi/asm/kvm.h | 13 +
+ arch/x86/include/uapi/asm/kvm_para.h | 13 +
+ arch/x86/include/uapi/asm/svm.h | 3 +
+ arch/x86/kernel/cpu/mshyperv.c | 10 +-
+ arch/x86/kvm/Kconfig | 1 +
+ arch/x86/kvm/Makefile | 9 +
+ arch/x86/kvm/debugfs.c | 11 +
+ arch/x86/kvm/emulate.c | 166 +----
+ arch/x86/kvm/fpu.h | 140 ++++
+ arch/x86/kvm/hyperv.c | 440 +++++++++---
+ arch/x86/kvm/hyperv.h | 1 +
+ arch/x86/kvm/kvm_cache_regs.h | 15 +
+ arch/x86/kvm/kvm_emulate.h | 10 +-
+ arch/x86/kvm/kvm_onhyperv.c | 93 +++
+ arch/x86/kvm/kvm_onhyperv.h | 32 +
+ arch/x86/kvm/lapic.c | 12 +-
+ arch/x86/kvm/lapic.h | 2 +-
+ arch/x86/kvm/mmu.h | 12 +-
+ arch/x86/kvm/mmu/mmu.c | 248 ++++---
+ arch/x86/kvm/mmu/mmu_internal.h | 12 +-
+ arch/x86/kvm/mmu/page_track.c | 2 +-
+ arch/x86/kvm/mmu/tdp_mmu.c | 43 +-
+ arch/x86/kvm/mmu/tdp_mmu.h | 25 +-
+ arch/x86/kvm/svm/avic.c | 14 +-
+ arch/x86/kvm/svm/nested.c | 81 ++-
+ arch/x86/kvm/svm/svm.c | 104 ++-
+ arch/x86/kvm/svm/svm.h | 24 +-
+ arch/x86/kvm/svm/svm_onhyperv.c | 41 ++
+ arch/x86/kvm/svm/svm_onhyperv.h | 130 ++++
+ arch/x86/kvm/trace.h | 2 +-
+ arch/x86/kvm/vmx/capabilities.h | 1 -
+ arch/x86/kvm/vmx/evmcs.c | 3 +
+ arch/x86/kvm/vmx/evmcs.h | 8 +
+ arch/x86/kvm/vmx/nested.c | 414 +++++++-----
+ arch/x86/kvm/vmx/nested.h | 11 +-
+ arch/x86/kvm/vmx/vmcs.h | 8 +
+ arch/x86/kvm/vmx/vmcs12.c | 1 +
+ arch/x86/kvm/vmx/vmcs12.h | 10 +-
+ arch/x86/kvm/vmx/vmx.c | 213 ++----
+ arch/x86/kvm/vmx/vmx.h | 20 +-
+ arch/x86/kvm/x86.c | 736 +++++++++++++++------
+ include/asm-generic/hyperv-tlfs.h | 1 +
+ include/linux/kvm_host.h | 18 +
+ include/linux/math64.h | 19 +
+ include/uapi/linux/kvm.h | 8 +-
+ include/uapi/linux/kvm_para.h | 1 +
+ tools/testing/selftests/kvm/.gitignore | 2 +
+ tools/testing/selftests/kvm/Makefile | 4 +-
+ tools/testing/selftests/kvm/include/x86_64/apic.h | 91 +++
+ .../selftests/kvm/include/{ => x86_64}/evmcs.h | 2 +-
+ .../testing/selftests/kvm/include/x86_64/hyperv.h | 185 ++++++
+ .../selftests/kvm/include/x86_64/processor.h | 49 +-
+ tools/testing/selftests/kvm/include/x86_64/vmx.h | 1 +
+ tools/testing/selftests/kvm/lib/x86_64/apic.c | 45 ++
+ tools/testing/selftests/kvm/x86_64/evmcs_test.c | 75 ++-
+ tools/testing/selftests/kvm/x86_64/hyperv_clock.c | 8 +-
+ .../testing/selftests/kvm/x86_64/hyperv_features.c | 649 ++++++++++++++++++
+ .../testing/selftests/kvm/x86_64/set_boot_cpu_id.c | 6 +-
+ tools/testing/selftests/kvm/x86_64/smm_test.c | 4 +-
+ .../kvm/x86_64/vmx_nested_tsc_scaling_test.c | 242 +++++++
+ .../testing/selftests/kvm/x86_64/xapic_ipi_test.c | 59 +-
+ virt/kvm/Kconfig | 3 +
+ virt/kvm/kvm_main.c | 116 +++-
+ 75 files changed, 3787 insertions(+), 1191 deletions(-)
+ create mode 100644 arch/x86/kvm/fpu.h
+ create mode 100644 arch/x86/kvm/kvm_onhyperv.c
+ create mode 100644 arch/x86/kvm/kvm_onhyperv.h
+ create mode 100644 arch/x86/kvm/svm/svm_onhyperv.c
+ create mode 100644 arch/x86/kvm/svm/svm_onhyperv.h
+ create mode 100644 tools/testing/selftests/kvm/include/x86_64/apic.h
+ rename tools/testing/selftests/kvm/include/{ => x86_64}/evmcs.h (99%)
+ create mode 100644 tools/testing/selftests/kvm/include/x86_64/hyperv.h
+ create mode 100644 tools/testing/selftests/kvm/lib/x86_64/apic.c
+ create mode 100644 tools/testing/selftests/kvm/x86_64/hyperv_features.c
+ create mode 100644 tools/testing/selftests/kvm/x86_64/vmx_nested_tsc_scaling_test.c
+Merging kvm-arm/next (9f03db667359 Merge branch kvm-arm64/mmu/mte into kvmarm-master/next)
+$ git merge kvm-arm/next
+Auto-merging tools/testing/selftests/kvm/x86_64/xapic_ipi_test.c
+Auto-merging tools/testing/selftests/kvm/x86_64/evmcs_test.c
+Auto-merging tools/testing/selftests/kvm/include/x86_64/processor.h
+Auto-merging tools/testing/selftests/kvm/include/kvm_util.h
+Removing tools/testing/selftests/kvm/aarch64/get-reg-list-sve.c
+Auto-merging tools/testing/selftests/kvm/Makefile
+CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/Makefile
+Auto-merging tools/testing/selftests/kvm/.gitignore
+Auto-merging include/uapi/linux/kvm.h
+CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
+Auto-merging drivers/irqchip/irq-gic.c
+Auto-merging drivers/irqchip/irq-gic-v3.c
+Auto-merging arch/arm64/kvm/arm.c
+Auto-merging arch/arm64/kernel/asm-offsets.c
+Auto-merging arch/arm64/include/asm/sysreg.h
+Auto-merging arch/arm64/include/asm/pgtable.h
+Auto-merging arch/arm64/include/asm/mte.h
+CONFLICT (content): Merge conflict in arch/arm64/include/asm/mte.h
+Auto-merging arch/arm64/include/asm/kvm_host.h
+Auto-merging MAINTAINERS
+Auto-merging Documentation/virt/kvm/api.rst
+CONFLICT (content): Merge conflict in Documentation/virt/kvm/api.rst
+Resolved 'Documentation/virt/kvm/api.rst' using previous resolution.
+Resolved 'arch/arm64/include/asm/mte.h' using previous resolution.
+Resolved 'include/uapi/linux/kvm.h' using previous resolution.
+Resolved 'tools/testing/selftests/kvm/Makefile' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master acdd7b838537] Merge remote-tracking branch 'kvm-arm/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/virt/kvm/api.rst | 61 +++
+ MAINTAINERS | 2 +
+ arch/arm64/include/asm/kvm_arm.h | 3 +-
+ arch/arm64/include/asm/kvm_emulate.h | 3 +
+ arch/arm64/include/asm/kvm_host.h | 14 +
+ arch/arm64/include/asm/kvm_mmu.h | 12 +-
+ arch/arm64/include/asm/kvm_mte.h | 66 ++++
+ arch/arm64/include/asm/kvm_pgtable.h | 42 +-
+ arch/arm64/include/asm/mte-def.h | 1 +
+ arch/arm64/include/asm/mte.h | 4 +-
+ arch/arm64/include/asm/pgtable.h | 22 +-
+ arch/arm64/include/asm/sysreg.h | 3 +-
+ arch/arm64/include/uapi/asm/kvm.h | 11 +
+ arch/arm64/kernel/asm-offsets.c | 2 +
+ arch/arm64/kernel/mte.c | 18 +-
+ arch/arm64/kvm/arch_timer.c | 162 ++++++--
+ arch/arm64/kvm/arm.c | 20 +
+ arch/arm64/kvm/guest.c | 82 ++++
+ arch/arm64/kvm/hyp/entry.S | 7 +
+ arch/arm64/kvm/hyp/exception.c | 3 +-
+ arch/arm64/kvm/hyp/hyp-entry.S | 6 +-
+ arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 21 +
+ arch/arm64/kvm/hyp/include/nvhe/gfp.h | 45 +--
+ arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 2 +-
+ arch/arm64/kvm/hyp/include/nvhe/memory.h | 7 +-
+ arch/arm64/kvm/hyp/include/nvhe/mm.h | 13 +-
+ arch/arm64/kvm/hyp/nvhe/mem_protect.c | 60 +--
+ arch/arm64/kvm/hyp/nvhe/page_alloc.c | 112 ++++--
+ arch/arm64/kvm/hyp/nvhe/setup.c | 30 +-
+ arch/arm64/kvm/hyp/pgtable.c | 48 ++-
+ arch/arm64/kvm/hyp/reserved_mem.c | 3 +-
+ arch/arm64/kvm/mmu.c | 196 ++++++---
+ arch/arm64/kvm/pmu-emul.c | 4 +
+ arch/arm64/kvm/reset.c | 4 +
+ arch/arm64/kvm/sys_regs.c | 32 +-
+ arch/arm64/kvm/vgic/vgic-init.c | 36 +-
+ arch/arm64/kvm/vgic/vgic-v2.c | 19 +-
+ arch/arm64/kvm/vgic/vgic-v3.c | 19 +-
+ arch/arm64/kvm/vgic/vgic.c | 14 +-
+ drivers/irqchip/irq-apple-aic.c | 9 +
+ drivers/irqchip/irq-gic-common.c | 13 -
+ drivers/irqchip/irq-gic-common.h | 2 -
+ drivers/irqchip/irq-gic-v3.c | 6 +-
+ drivers/irqchip/irq-gic.c | 6 +-
+ include/kvm/arm_vgic.h | 41 +-
+ include/linux/irqchip/arm-gic-common.h | 25 +-
+ include/linux/irqchip/arm-vgic-info.h | 45 +++
+ include/uapi/linux/kvm.h | 2 +
+ tools/testing/selftests/kvm/.gitignore | 2 +-
+ tools/testing/selftests/kvm/Makefile | 4 +-
+ .../selftests/kvm/aarch64/debug-exceptions.c | 250 ++++++++++++
+ .../selftests/kvm/aarch64/get-reg-list-sve.c | 3 -
+ tools/testing/selftests/kvm/aarch64/get-reg-list.c | 439 +++++++++++++++------
+ .../selftests/kvm/include/aarch64/processor.h | 83 +++-
+ tools/testing/selftests/kvm/include/kvm_util.h | 23 +-
+ .../selftests/kvm/include/x86_64/processor.h | 4 +-
+ tools/testing/selftests/kvm/lib/aarch64/handlers.S | 126 ++++++
+ .../testing/selftests/kvm/lib/aarch64/processor.c | 97 +++++
+ tools/testing/selftests/kvm/lib/x86_64/processor.c | 23 +-
+ tools/testing/selftests/kvm/x86_64/evmcs_test.c | 4 +-
+ tools/testing/selftests/kvm/x86_64/kvm_pv_test.c | 2 +-
+ .../testing/selftests/kvm/x86_64/sync_regs_test.c | 7 +-
+ tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c | 9 -
+ .../selftests/kvm/x86_64/userspace_msr_exit_test.c | 8 +-
+ .../testing/selftests/kvm/x86_64/xapic_ipi_test.c | 2 +-
+ 65 files changed, 1923 insertions(+), 521 deletions(-)
+ create mode 100644 arch/arm64/include/asm/kvm_mte.h
+ create mode 100644 include/linux/irqchip/arm-vgic-info.h
+ create mode 100644 tools/testing/selftests/kvm/aarch64/debug-exceptions.c
+ delete mode 100644 tools/testing/selftests/kvm/aarch64/get-reg-list-sve.c
+ create mode 100644 tools/testing/selftests/kvm/lib/aarch64/handlers.S
+Merging kvm-ppc/kvm-ppc-next (72476aaa4691 KVM: PPC: Book3S HV: Fix host radix SLB optimisation with hash guests)
+$ git merge kvm-ppc/kvm-ppc-next
+Already up to date.
+Merging kvms390/next (1f703d2cf204 KVM: s390: allow facility 192 (vector-packed-decimal-enhancement facility 2))
+$ git merge kvms390/next
+Auto-merging arch/s390/kvm/kvm-s390.c
+Merge made by the 'recursive' strategy.
+ arch/s390/kvm/kvm-s390.c | 22 +++++++++++++---------
+ arch/s390/tools/gen_facilities.c | 4 ++++
+ 2 files changed, 17 insertions(+), 9 deletions(-)
+Merging xen-tip/linux-next (107866a8eb0b xen-netback: take a reference to the RX task thread)
+$ git merge xen-tip/linux-next
+Already up to date.
+Merging percpu/for-next (5c28d6836dc7 Merge branch 'for-5.14' into for-next)
+$ git merge percpu/for-next
+Merge made by the 'recursive' strategy.
+ include/linux/memcontrol.h | 5 +
+ mm/memcontrol.c | 11 +-
+ mm/percpu-internal.h | 56 +------
+ mm/percpu-km.c | 10 +-
+ mm/percpu-stats.c | 44 ++----
+ mm/percpu-vm.c | 35 ++++-
+ mm/percpu.c | 368 +++++++++++++++++++++++++++++++++------------
+ 7 files changed, 343 insertions(+), 186 deletions(-)
+Merging workqueues/for-next (f2ccd0a922b3 workqueue: Add back __printf format validation)
+$ git merge workqueues/for-next
+Merge made by the 'recursive' strategy.
+ include/linux/workqueue.h | 1 +
+ kernel/workqueue.c | 5 +----
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+Merging drivers-x86/for-next (71d69e82f416 platform/x86: think-lmi: Return EINVAL when kbdlang gets set to a 0 length string)
+$ git merge drivers-x86/for-next
+Auto-merging include/linux/acpi.h
+Auto-merging drivers/platform/x86/thinkpad_acpi.c
+Removing drivers/platform/x86/hp-wireless.c
+Auto-merging drivers/platform/surface/surface_aggregator_registry.c
+CONFLICT (content): Merge conflict in drivers/platform/surface/surface_aggregator_registry.c
+Auto-merging drivers/platform/surface/aggregator/controller.c
+Removing drivers/mfd/tps68470.c
+Auto-merging drivers/mfd/Makefile
+Auto-merging drivers/mfd/Kconfig
+Auto-merging MAINTAINERS
+Resolved 'drivers/platform/surface/surface_aggregator_registry.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 8a645baa485a] Merge remote-tracking branch 'drivers-x86/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../ABI/testing/sysfs-class-firmware-attributes | 18 +-
+ .../ABI/testing/sysfs-platform-dell-privacy-wmi | 55 ++
+ .../driver-api/surface_aggregator/clients/cdev.rst | 127 ++-
+ Documentation/userspace-api/ioctl/ioctl-number.rst | 2 +-
+ MAINTAINERS | 25 +-
+ drivers/acpi/pmic/Kconfig | 2 +-
+ drivers/extcon/extcon-max14577.c | 16 +-
+ drivers/extcon/extcon-max77693.c | 17 +-
+ drivers/extcon/extcon-max8997.c | 45 +-
+ drivers/gpio/Kconfig | 2 +-
+ drivers/gpio/gpio-crystalcove.c | 10 +-
+ drivers/gpio/gpio-wcove.c | 39 +-
+ drivers/gpio/gpiolib-acpi.c | 51 ++
+ drivers/input/touchscreen/goodix.c | 52 --
+ drivers/mfd/Kconfig | 18 -
+ drivers/mfd/Makefile | 1 -
+ drivers/mfd/tps68470.c | 97 ---
+ drivers/platform/surface/aggregator/Kconfig | 2 +-
+ drivers/platform/surface/aggregator/Makefile | 2 +-
+ drivers/platform/surface/aggregator/bus.c | 2 +-
+ drivers/platform/surface/aggregator/bus.h | 2 +-
+ drivers/platform/surface/aggregator/controller.c | 332 ++++++--
+ 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 | 12 +-
+ .../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 | 12 +-
+ .../surface/aggregator/ssh_request_layer.h | 2 +-
+ drivers/platform/surface/aggregator/trace.h | 2 +-
+ drivers/platform/surface/surface_aggregator_cdev.c | 534 ++++++++++++-
+ .../platform/surface/surface_aggregator_registry.c | 47 +-
+ drivers/platform/x86/Kconfig | 49 +-
+ drivers/platform/x86/Makefile | 10 +-
+ drivers/platform/x86/asus-nb-wmi.c | 77 --
+ drivers/platform/x86/dell/Kconfig | 11 +-
+ drivers/platform/x86/dell/Makefile | 2 +
+ drivers/platform/x86/dell/dcdbas.c | 3 +-
+ drivers/platform/x86/dell/dell-laptop.c | 13 +-
+ .../x86/dell/{dell-wmi.c => dell-wmi-base.c} | 14 +-
+ drivers/platform/x86/dell/dell-wmi-privacy.c | 391 +++++++++
+ drivers/platform/x86/dell/dell-wmi-privacy.h | 36 +
+ .../x86/dell/dell-wmi-sysman/dell-wmi-sysman.h | 5 +-
+ .../x86/dell/dell-wmi-sysman/enum-attributes.c | 39 +-
+ .../x86/dell/dell-wmi-sysman/int-attributes.c | 16 +
+ .../x86/dell/dell-wmi-sysman/passobj-attributes.c | 6 +
+ .../x86/dell/dell-wmi-sysman/string-attributes.c | 16 +-
+ drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 21 +-
+ drivers/platform/x86/firmware_attributes_class.c | 52 ++
+ drivers/platform/x86/firmware_attributes_class.h | 11 +
+ drivers/platform/x86/hdaps.c | 2 +-
+ drivers/platform/x86/hp-wireless.c | 102 ---
+ drivers/platform/x86/ideapad-laptop.c | 12 +
+ drivers/platform/x86/intel/Kconfig | 22 +
+ drivers/platform/x86/intel/Makefile | 8 +
+ drivers/platform/x86/intel/int33fe/Kconfig | 24 +
+ drivers/platform/x86/intel/int33fe/Makefile | 5 +
+ .../{ => intel/int33fe}/intel_cht_int33fe_common.c | 0
+ .../{ => intel/int33fe}/intel_cht_int33fe_common.h | 0
+ .../{ => intel/int33fe}/intel_cht_int33fe_microb.c | 0
+ .../{ => intel/int33fe}/intel_cht_int33fe_typec.c | 4 +-
+ drivers/platform/x86/intel/int3472/Kconfig | 30 +
+ drivers/platform/x86/intel/int3472/Makefile | 5 +
+ .../int3472/intel_skl_int3472_clk_and_regulator.c | 207 +++++
+ .../x86/intel/int3472/intel_skl_int3472_common.c | 106 +++
+ .../x86/intel/int3472/intel_skl_int3472_common.h | 122 +++
+ .../x86/intel/int3472/intel_skl_int3472_discrete.c | 413 ++++++++++
+ .../x86/intel/int3472/intel_skl_int3472_tps68470.c | 137 ++++
+ drivers/platform/x86/intel_ips.c | 2 +-
+ drivers/platform/x86/intel_pmt_crashlog.c | 2 +-
+ .../x86/intel_speed_select_if/isst_if_common.c | 73 +-
+ drivers/platform/x86/samsung-laptop.c | 35 +-
+ drivers/platform/x86/tc1100-wmi.c | 2 +-
+ drivers/platform/x86/think-lmi.c | 888 +++++++++++++++++++++
+ drivers/platform/x86/think-lmi.h | 72 ++
+ drivers/platform/x86/thinkpad_acpi.c | 2 +-
+ drivers/platform/x86/toshiba_acpi.c | 1 +
+ drivers/platform/x86/toshiba_haps.c | 2 +-
+ drivers/platform/x86/touchscreen_dmi.c | 87 +-
+ drivers/platform/x86/uv_sysfs.c | 4 +-
+ drivers/platform/x86/wireless-hotkey.c | 103 +++
+ include/linux/acpi.h | 7 +
+ include/linux/devm-helpers.h | 25 +
+ include/linux/gpio/consumer.h | 2 +
+ include/linux/surface_aggregator/controller.h | 27 +-
+ include/linux/surface_aggregator/device.h | 2 +-
+ include/linux/surface_aggregator/serial_hub.h | 2 +-
+ include/uapi/linux/surface_aggregator/cdev.h | 73 +-
+ tools/power/x86/intel-speed-select/isst-config.c | 18 +-
+ tools/power/x86/intel-speed-select/isst-core.c | 15 +
+ tools/power/x86/intel-speed-select/isst-display.c | 2 +-
+ tools/power/x86/intel-speed-select/isst.h | 2 +
+ 94 files changed, 4267 insertions(+), 690 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-platform-dell-privacy-wmi
+ delete mode 100644 drivers/mfd/tps68470.c
+ rename drivers/platform/x86/dell/{dell-wmi.c => dell-wmi-base.c} (98%)
+ create mode 100644 drivers/platform/x86/dell/dell-wmi-privacy.c
+ create mode 100644 drivers/platform/x86/dell/dell-wmi-privacy.h
+ create mode 100644 drivers/platform/x86/firmware_attributes_class.c
+ create mode 100644 drivers/platform/x86/firmware_attributes_class.h
+ delete mode 100644 drivers/platform/x86/hp-wireless.c
+ create mode 100644 drivers/platform/x86/intel/Kconfig
+ create mode 100644 drivers/platform/x86/intel/Makefile
+ create mode 100644 drivers/platform/x86/intel/int33fe/Kconfig
+ create mode 100644 drivers/platform/x86/intel/int33fe/Makefile
+ rename drivers/platform/x86/{ => intel/int33fe}/intel_cht_int33fe_common.c (100%)
+ rename drivers/platform/x86/{ => intel/int33fe}/intel_cht_int33fe_common.h (100%)
+ rename drivers/platform/x86/{ => intel/int33fe}/intel_cht_int33fe_microb.c (100%)
+ rename drivers/platform/x86/{ => intel/int33fe}/intel_cht_int33fe_typec.c (99%)
+ create mode 100644 drivers/platform/x86/intel/int3472/Kconfig
+ create mode 100644 drivers/platform/x86/intel/int3472/Makefile
+ create mode 100644 drivers/platform/x86/intel/int3472/intel_skl_int3472_clk_and_regulator.c
+ create mode 100644 drivers/platform/x86/intel/int3472/intel_skl_int3472_common.c
+ create mode 100644 drivers/platform/x86/intel/int3472/intel_skl_int3472_common.h
+ create mode 100644 drivers/platform/x86/intel/int3472/intel_skl_int3472_discrete.c
+ create mode 100644 drivers/platform/x86/intel/int3472/intel_skl_int3472_tps68470.c
+ create mode 100644 drivers/platform/x86/think-lmi.c
+ create mode 100644 drivers/platform/x86/think-lmi.h
+ create mode 100644 drivers/platform/x86/wireless-hotkey.c
+Merging chrome-platform/for-next (6efb943b8616 Linux 5.13-rc1)
+$ git merge chrome-platform/for-next
+Already up to date.
+Merging hsi/for-next (6efb943b8616 Linux 5.13-rc1)
+$ git merge hsi/for-next
+Already up to date.
+Merging leds/for-next (7b97174cc93f leds: lgm: Fix up includes)
+$ git merge leds/for-next
+Merge made by the 'recursive' strategy.
+ drivers/leds/Kconfig | 2 +-
+ drivers/leds/blink/leds-lgm-sso.c | 53 ++++++++++++++++----------------------
+ drivers/leds/led-class.c | 6 +----
+ drivers/leds/leds-as3645a.c | 3 ++-
+ drivers/leds/leds-bcm6328.c | 2 +-
+ drivers/leds/leds-blinkm.c | 5 ++--
+ drivers/leds/leds-el15203000.c | 37 +++++++++++---------------
+ drivers/leds/leds-gpio-register.c | 1 +
+ drivers/leds/leds-is31fl32xx.c | 3 ++-
+ drivers/leds/leds-ktd2692.c | 27 ++++++++++++-------
+ drivers/leds/leds-lm3530.c | 2 +-
+ drivers/leds/leds-lm3532.c | 7 ++---
+ drivers/leds/leds-lm36274.c | 4 ++-
+ drivers/leds/leds-lm3692x.c | 26 +++++++++----------
+ drivers/leds/leds-lm3697.c | 12 +++++----
+ drivers/leds/leds-lp3944.c | 6 ++---
+ drivers/leds/leds-lp50xx.c | 2 +-
+ drivers/leds/leds-lp55xx-common.c | 2 +-
+ drivers/leds/leds-lp8860.c | 16 ++++++------
+ drivers/leds/leds-lt3593.c | 8 +++---
+ drivers/leds/leds-mlxcpld.c | 38 +++++++++++++--------------
+ drivers/leds/leds-mlxreg.c | 3 ++-
+ drivers/leds/leds-pwm.c | 16 +++++++-----
+ drivers/leds/leds-tlc591xx.c | 8 ++++--
+ drivers/leds/leds-turris-omnia.c | 1 +
+ drivers/leds/trigger/ledtrig-cpu.c | 2 +-
+ 26 files changed, 145 insertions(+), 147 deletions(-)
+Merging ipmi/for-next (5b32dd281ee0 ipmi: kcs_bmc_aspeed: Fix less than zero comparison of a unsigned int)
+$ git merge ipmi/for-next
+Removing Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/ipmi/aspeed,ast2400-kcs-bmc.yaml | 106 ++++
+ .../devicetree/bindings/ipmi/aspeed-kcs-bmc.txt | 33 --
+ drivers/char/ipmi/Kconfig | 27 +
+ drivers/char/ipmi/Makefile | 2 +
+ drivers/char/ipmi/ipmi_watchdog.c | 22 +-
+ drivers/char/ipmi/kcs_bmc.c | 505 ++++------------
+ drivers/char/ipmi/kcs_bmc.h | 92 +--
+ drivers/char/ipmi/kcs_bmc_aspeed.c | 633 +++++++++++++++------
+ drivers/char/ipmi/kcs_bmc_cdev_ipmi.c | 568 ++++++++++++++++++
+ drivers/char/ipmi/kcs_bmc_client.h | 45 ++
+ drivers/char/ipmi/kcs_bmc_device.h | 22 +
+ drivers/char/ipmi/kcs_bmc_npcm7xx.c | 92 ++-
+ drivers/char/ipmi/kcs_bmc_serio.c | 157 +++++
+ 13 files changed, 1598 insertions(+), 706 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/ipmi/aspeed,ast2400-kcs-bmc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt
+ create mode 100644 drivers/char/ipmi/kcs_bmc_cdev_ipmi.c
+ create mode 100644 drivers/char/ipmi/kcs_bmc_client.h
+ create mode 100644 drivers/char/ipmi/kcs_bmc_device.h
+ create mode 100644 drivers/char/ipmi/kcs_bmc_serio.c
+Merging driver-core/driver-core-next (09705dcb63d2 devres: Enable trace events)
+$ git merge driver-core/driver-core-next
+Auto-merging include/linux/device.h
+Auto-merging drivers/net/wireless/ti/wlcore/main.c
+Auto-merging drivers/media/platform/exynos4-is/fimc-is.c
+Auto-merging drivers/base/property.c
+Auto-merging drivers/base/core.c
+Merge made by the 'recursive' strategy.
+ Documentation/driver-api/auxiliary_bus.rst | 2 +-
+ Documentation/driver-api/driver-model/devres.rst | 1 -
+ Documentation/filesystems/debugfs.rst | 4 +-
+ drivers/base/Makefile | 3 +
+ drivers/base/attribute_container.c | 6 +-
+ drivers/base/component.c | 96 ++++++++++----------
+ drivers/base/core.c | 2 +-
+ drivers/base/cpu.c | 4 +-
+ drivers/base/devcoredump.c | 4 -
+ drivers/base/devres.c | 105 ++++++++++------------
+ drivers/base/firmware_loader/builtin/Makefile | 1 -
+ drivers/base/memory.c | 4 +-
+ drivers/base/node.c | 4 +-
+ drivers/base/platform.c | 22 +----
+ drivers/base/property.c | 16 ++--
+ drivers/base/trace.c | 10 +++
+ drivers/base/trace.h | 56 ++++++++++++
+ drivers/dma/imx-sdma.c | 2 +-
+ drivers/gpu/drm/i915/gvt/kvmgt.c | 11 ++-
+ drivers/media/platform/exynos4-is/fimc-is.c | 2 +-
+ drivers/mfd/iqs62x.c | 2 +-
+ drivers/misc/lattice-ecp3-config.c | 2 +-
+ drivers/misc/sram.c | 6 +-
+ drivers/net/wireless/broadcom/b43/debugfs.c | 34 ++-----
+ drivers/net/wireless/broadcom/b43/debugfs.h | 3 -
+ drivers/net/wireless/broadcom/b43legacy/debugfs.c | 29 ++----
+ drivers/net/wireless/broadcom/b43legacy/debugfs.h | 3 -
+ drivers/net/wireless/ti/wlcore/main.c | 2 +-
+ drivers/platform/x86/dell/dell_rbu.c | 2 +-
+ drivers/remoteproc/remoteproc_core.c | 2 +-
+ drivers/scsi/lpfc/lpfc_init.c | 2 +-
+ drivers/scsi/snic/snic_debugfs.c | 23 ++---
+ drivers/scsi/snic/snic_trc.h | 3 -
+ drivers/tty/serial/ucc_uart.c | 2 +-
+ fs/debugfs/file.c | 38 +++-----
+ fs/kernfs/dir.c | 86 +++++++++---------
+ include/linux/debugfs.h | 26 ++----
+ include/linux/device.h | 9 --
+ include/linux/export.h | 5 ++
+ include/linux/firmware.h | 4 +-
+ include/linux/platform_device.h | 3 -
+ lib/devres.c | 4 +-
+ lib/test_firmware.c | 10 +--
+ sound/soc/codecs/wm8958-dsp2.c | 6 +-
+ 44 files changed, 300 insertions(+), 361 deletions(-)
+ create mode 100644 drivers/base/trace.c
+ create mode 100644 drivers/base/trace.h
+Merging usb/usb-next (00a738b86ec0 Merge tag 'thunderbolt-for-v5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-next)
+$ git merge usb/usb-next
+Removing include/linux/usb/isp1760.h
+Auto-merging include/linux/device.h
+Auto-merging drivers/usb/host/xhci-tegra.c
+Auto-merging drivers/pci/probe.c
+Auto-merging drivers/base/core.c
+Auto-merging Documentation/devicetree/bindings/usb/cdns,usb3.yaml
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/configfs-usb-gadget-uac2 | 2 +
+ Documentation/ABI/testing/sysfs-bus-thunderbolt | 82 +-
+ Documentation/ABI/testing/sysfs-bus-usb | 11 -
+ Documentation/ABI/testing/sysfs-devices-removable | 18 +
+ Documentation/admin-guide/thunderbolt.rst | 29 +
+ .../bindings/phy/allwinner,sun8i-h3-usb-phy.yaml | 4 +-
+ .../bindings/usb/allwinner,sun4i-a10-musb.yaml | 3 +
+ .../devicetree/bindings/usb/cdns,usb3.yaml | 1 +
+ Documentation/devicetree/bindings/usb/dwc2.yaml | 1 +
+ .../devicetree/bindings/usb/nxp,isp1760.yaml | 69 ++
+ .../devicetree/bindings/usb/realtek,rts5411.yaml | 62 ++
+ Documentation/driver-api/usb/error-codes.rst | 3 +
+ Documentation/usb/gadget-testing.rst | 2 +
+ arch/arm/boot/dts/arm-realview-eb.dtsi | 2 +-
+ arch/arm/boot/dts/arm-realview-pb1176.dts | 2 +-
+ arch/arm/boot/dts/arm-realview-pb11mp.dts | 2 +-
+ arch/arm/boot/dts/arm-realview-pbx.dtsi | 2 +-
+ arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 2 +-
+ arch/arm/boot/dts/vexpress-v2m.dtsi | 2 +-
+ drivers/base/core.c | 28 +
+ drivers/pci/probe.c | 22 +
+ drivers/thunderbolt/Makefile | 2 +-
+ drivers/thunderbolt/acpi.c | 206 ++++
+ drivers/thunderbolt/dma_port.c | 94 +-
+ drivers/thunderbolt/domain.c | 9 +-
+ drivers/thunderbolt/eeprom.c | 19 +-
+ drivers/thunderbolt/icm.c | 20 +-
+ drivers/thunderbolt/lc.c | 6 +-
+ drivers/thunderbolt/nhi.c | 71 +-
+ drivers/thunderbolt/nhi.h | 2 +
+ drivers/thunderbolt/nvm.c | 95 ++
+ drivers/thunderbolt/path.c | 4 +-
+ drivers/thunderbolt/quirks.c | 30 +-
+ drivers/thunderbolt/retimer.c | 108 ++-
+ drivers/thunderbolt/sb_regs.h | 2 +
+ drivers/thunderbolt/switch.c | 274 +++++-
+ drivers/thunderbolt/tb.c | 71 +-
+ drivers/thunderbolt/tb.h | 116 ++-
+ drivers/thunderbolt/tb_regs.h | 4 +
+ drivers/thunderbolt/test.c | 559 ++++++++++-
+ drivers/thunderbolt/tunnel.c | 401 ++++++--
+ drivers/thunderbolt/tunnel.h | 2 +
+ drivers/thunderbolt/usb4.c | 438 +++++++--
+ drivers/thunderbolt/usb4_port.c | 280 ++++++
+ drivers/thunderbolt/xdomain.c | 10 +
+ drivers/usb/atm/cxacru.c | 2 +-
+ drivers/usb/cdns3/cdns3-ep0.c | 6 +-
+ drivers/usb/cdns3/cdns3-gadget.c | 40 +-
+ drivers/usb/cdns3/cdns3-imx.c | 2 +-
+ drivers/usb/cdns3/cdns3-plat.c | 2 +-
+ drivers/usb/cdns3/cdns3-ti.c | 2 +-
+ drivers/usb/cdns3/cdnsp-gadget.c | 7 +-
+ drivers/usb/cdns3/cdnsp-mem.c | 5 +-
+ drivers/usb/cdns3/core.c | 4 +-
+ drivers/usb/chipidea/ci.h | 2 -
+ drivers/usb/chipidea/core.c | 2 +-
+ drivers/usb/chipidea/debug.c | 34 +-
+ drivers/usb/chipidea/otg.c | 9 +-
+ drivers/usb/chipidea/udc.c | 2 +-
+ drivers/usb/common/ulpi.c | 2 +-
+ drivers/usb/common/usb-conn-gpio.c | 62 +-
+ drivers/usb/core/devio.c | 2 +-
+ drivers/usb/core/hcd.c | 130 +++
+ drivers/usb/core/hub.c | 34 +-
+ drivers/usb/core/message.c | 6 +
+ drivers/usb/core/quirks.c | 1 -
+ drivers/usb/core/sysfs.c | 24 -
+ drivers/usb/core/urb.c | 9 +
+ drivers/usb/dwc2/core.c | 30 +-
+ drivers/usb/dwc2/gadget.c | 14 +-
+ drivers/usb/dwc2/hcd_queue.c | 2 +-
+ drivers/usb/dwc2/params.c | 4 +-
+ drivers/usb/dwc2/pci.c | 2 +-
+ drivers/usb/dwc2/platform.c | 2 +-
+ drivers/usb/dwc3/core.c | 7 +-
+ drivers/usb/dwc3/core.h | 2 -
+ drivers/usb/dwc3/debugfs.c | 8 +-
+ drivers/usb/dwc3/drd.c | 1 -
+ drivers/usb/dwc3/dwc3-pci.c | 8 +-
+ drivers/usb/dwc3/gadget.c | 4 +-
+ drivers/usb/dwc3/trace.h | 2 -
+ drivers/usb/gadget/function/f_eem.c | 43 +-
+ drivers/usb/gadget/function/f_fs.c | 65 +-
+ drivers/usb/gadget/function/f_hid.c | 4 +-
+ drivers/usb/gadget/function/f_printer.c | 3 +-
+ drivers/usb/gadget/function/f_uac2.c | 144 ++-
+ drivers/usb/gadget/function/u_audio.c | 225 ++++-
+ drivers/usb/gadget/function/u_audio.h | 12 +
+ drivers/usb/gadget/function/u_hid.h | 4 +-
+ drivers/usb/gadget/function/u_midi.h | 4 +-
+ drivers/usb/gadget/function/u_uac2.h | 4 +
+ drivers/usb/gadget/function/uvc_configfs.c | 5 -
+ drivers/usb/gadget/legacy/hid.c | 4 +-
+ drivers/usb/gadget/udc/bcm63xx_udc.c | 7 +-
+ drivers/usb/gadget/udc/core.c | 49 +
+ drivers/usb/gadget/udc/dummy_hcd.c | 11 +-
+ drivers/usb/gadget/udc/fsl_qe_udc.c | 5 +
+ drivers/usb/gadget/udc/fsl_udc_core.c | 44 +-
+ drivers/usb/gadget/udc/fsl_usb2_udc.h | 19 -
+ drivers/usb/gadget/udc/gr_udc.c | 7 +-
+ drivers/usb/gadget/udc/gr_udc.h | 2 -
+ drivers/usb/gadget/udc/lpc32xx_udc.c | 5 +-
+ drivers/usb/gadget/udc/mv_u3d_core.c | 2 +-
+ drivers/usb/gadget/udc/mv_udc_core.c | 2 +-
+ drivers/usb/gadget/udc/net2272.c | 41 +-
+ drivers/usb/gadget/udc/net2272.h | 1 +
+ drivers/usb/gadget/udc/net2280.c | 51 +-
+ drivers/usb/gadget/udc/net2280.h | 1 +
+ drivers/usb/gadget/udc/pxa25x_udc.c | 4 +-
+ drivers/usb/gadget/udc/pxa25x_udc.h | 4 -
+ drivers/usb/gadget/udc/pxa27x_udc.c | 6 +-
+ drivers/usb/gadget/udc/pxa27x_udc.h | 4 -
+ drivers/usb/gadget/udc/s3c-hsudc.c | 5 +-
+ drivers/usb/gadget/udc/s3c2410_udc.c | 9 +-
+ drivers/usb/gadget/udc/s3c2410_udc.h | 1 -
+ drivers/usb/gadget/udc/tegra-xudc.c | 30 +-
+ drivers/usb/gadget/udc/trace.c | 2 +-
+ drivers/usb/gadget/udc/trace.h | 2 +-
+ drivers/usb/gadget/udc/udc-xilinx.c | 4 +-
+ drivers/usb/host/ehci-fsl.c | 8 +-
+ drivers/usb/host/ehci-hcd.c | 8 +-
+ drivers/usb/host/ehci-hub.c | 139 ---
+ drivers/usb/host/ehci-q.c | 2 +-
+ drivers/usb/host/fotg210-hcd.c | 5 +-
+ drivers/usb/host/fotg210.h | 3 -
+ drivers/usb/host/u132-hcd.c | 6 +-
+ drivers/usb/host/xhci-mem.c | 3 +
+ drivers/usb/host/xhci-mtk-sch.c | 42 +-
+ drivers/usb/host/xhci-mtk.c | 2 -
+ drivers/usb/host/xhci-mtk.h | 8 +-
+ drivers/usb/host/xhci-pci-renesas.c | 18 +-
+ drivers/usb/host/xhci-ring.c | 7 +-
+ drivers/usb/host/xhci-tegra.c | 16 +-
+ drivers/usb/host/xhci.c | 10 +-
+ drivers/usb/host/xhci.h | 11 +-
+ drivers/usb/isp1760/Kconfig | 5 +-
+ drivers/usb/isp1760/isp1760-core.c | 513 +++++++++-
+ drivers/usb/isp1760/isp1760-core.h | 44 +-
+ drivers/usb/isp1760/isp1760-hcd.c | 1020 ++++++++++++++------
+ drivers/usb/isp1760/isp1760-hcd.h | 57 +-
+ drivers/usb/isp1760/isp1760-if.c | 41 +-
+ drivers/usb/isp1760/isp1760-regs.h | 435 +++++----
+ drivers/usb/isp1760/isp1760-udc.c | 251 +++--
+ drivers/usb/isp1760/isp1760-udc.h | 13 +-
+ drivers/usb/mtu3/mtu3.h | 30 +-
+ drivers/usb/mtu3/mtu3_core.c | 20 +-
+ drivers/usb/mtu3/mtu3_debugfs.c | 1 +
+ drivers/usb/mtu3/mtu3_dr.c | 169 +---
+ drivers/usb/mtu3/mtu3_gadget.c | 2 +-
+ drivers/usb/mtu3/mtu3_host.c | 6 +-
+ drivers/usb/mtu3/mtu3_plat.c | 95 +-
+ drivers/usb/musb/musb_core.c | 71 +-
+ drivers/usb/musb/musb_gadget.c | 2 +-
+ drivers/usb/musb/musb_host.c | 18 +-
+ drivers/usb/musb/musb_host.h | 4 -
+ drivers/usb/musb/musb_trace.h | 17 +
+ drivers/usb/musb/omap2430.c | 32 +
+ drivers/usb/phy/phy-isp1301-omap.c | 2 +-
+ drivers/usb/phy/phy-isp1301.c | 25 +-
+ drivers/usb/phy/phy-tegra-usb.c | 15 +-
+ drivers/usb/phy/phy.c | 55 +-
+ drivers/usb/roles/class.c | 9 +
+ drivers/usb/typec/class.c | 4 +-
+ drivers/usb/typec/mux.c | 39 +-
+ drivers/usb/typec/mux.h | 6 +
+ drivers/usb/typec/mux/intel_pmc_mux.c | 28 +-
+ drivers/usb/typec/tcpm/tcpci.c | 46 +-
+ drivers/usb/typec/tcpm/tcpm.c | 86 +-
+ drivers/usb/typec/tcpm/wcove.c | 2 +-
+ drivers/usb/typec/ucsi/ucsi.c | 4 +-
+ include/linux/device.h | 37 +
+ include/linux/usb.h | 9 +-
+ include/linux/usb/composite.h | 2 +-
+ include/linux/usb/gadget.h | 3 +-
+ include/linux/usb/hcd.h | 17 +-
+ include/linux/usb/isp1760.h | 19 -
+ include/linux/usb/otg-fsm.h | 6 +-
+ include/linux/usb/otg.h | 2 +-
+ include/linux/usb/quirks.h | 2 +-
+ include/linux/usb/role.h | 6 +
+ include/linux/usb/serial.h | 2 +-
+ include/linux/usb/tcpm.h | 4 +
+ include/linux/usb/typec_dp.h | 2 +-
+ 183 files changed, 5911 insertions(+), 2137 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-devices-removable
+ create mode 100644 Documentation/devicetree/bindings/usb/nxp,isp1760.yaml
+ create mode 100644 Documentation/devicetree/bindings/usb/realtek,rts5411.yaml
+ create mode 100644 drivers/thunderbolt/usb4_port.c
+ delete mode 100644 include/linux/usb/isp1760.h
+Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6)
+$ git merge usb-gadget/next
+Already up to date.
+Merging usb-serial/usb-next (8051334e901f USB: serial: cp210x: add support for GPIOs on CP2108)
+$ git merge usb-serial/usb-next
+Auto-merging include/linux/usb/serial.h
+Auto-merging drivers/usb/serial/ti_usb_3410_5052.c
+Auto-merging drivers/usb/serial/quatech2.c
+Auto-merging drivers/usb/serial/cp210x.c
+CONFLICT (content): Merge conflict in drivers/usb/serial/cp210x.c
+Resolved 'drivers/usb/serial/cp210x.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 6a964d171b98] Merge remote-tracking branch 'usb-serial/usb-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/usb/serial/cp210x.c | 189 ++++++++++++++++++++++++++++++----
+ drivers/usb/serial/cyberjack.c | 4 +-
+ drivers/usb/serial/cypress_m8.c | 16 +--
+ drivers/usb/serial/digi_acceleport.c | 46 ++++-----
+ drivers/usb/serial/garmin_gps.c | 2 +-
+ drivers/usb/serial/generic.c | 12 +--
+ drivers/usb/serial/io_edgeport.c | 39 ++-----
+ drivers/usb/serial/io_ti.c | 12 +--
+ drivers/usb/serial/ir-usb.c | 6 +-
+ drivers/usb/serial/keyspan.c | 4 +-
+ drivers/usb/serial/kobil_sct.c | 4 +-
+ drivers/usb/serial/metro-usb.c | 12 +--
+ drivers/usb/serial/mos7720.c | 29 ++----
+ drivers/usb/serial/mos7840.c | 17 ++-
+ drivers/usb/serial/opticon.c | 6 +-
+ drivers/usb/serial/oti6858.c | 12 +--
+ drivers/usb/serial/quatech2.c | 6 +-
+ drivers/usb/serial/sierra.c | 8 +-
+ drivers/usb/serial/ti_usb_3410_5052.c | 16 +--
+ drivers/usb/serial/usb-wwan.h | 4 +-
+ drivers/usb/serial/usb_wwan.c | 12 +--
+ include/linux/usb/serial.h | 8 +-
+ 22 files changed, 286 insertions(+), 178 deletions(-)
+Merging usb-chipidea-next/for-usb-next (956df1bb0ab8 usb: chipidea: host: fix port index underflow and UBSAN complains)
+$ git merge usb-chipidea-next/for-usb-next
+Auto-merging drivers/usb/cdns3/cdnsp-gadget.c
+Merge made by the 'recursive' strategy.
+ drivers/usb/chipidea/host.c | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+Merging tty/tty-next (b61c8bf4694b tty: serial: Add UART driver for Cortina-Access platform)
+$ git merge tty/tty-next
+Auto-merging net/bluetooth/rfcomm/tty.c
+Removing include/uapi/linux/n_r3964.h
+Removing include/linux/n_r3964.h
+Auto-merging drivers/usb/serial/cypress_m8.c
+Auto-merging drivers/tty/serial/sh-sci.c
+Removing drivers/tty/n_r3964.c
+Removing drivers/tty/mxser.h
+Auto-merging drivers/tty/hvc/hvc_iucv.c
+Auto-merging drivers/tty/Kconfig
+Auto-merging drivers/s390/char/sclp_vt220.c
+Auto-merging drivers/s390/char/sclp_tty.c
+Auto-merging drivers/s390/char/sclp_rw.h
+Auto-merging drivers/s390/char/sclp_rw.c
+Auto-merging drivers/net/usb/hso.c
+Auto-merging drivers/net/hamradio/mkiss.c
+Auto-merging drivers/net/hamradio/6pack.c
+Auto-merging drivers/net/caif/caif_serial.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/serial/samsung_uart.yaml
+Removing Documentation/devicetree/bindings/serial/omap_serial.txt
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 5 +
+ Documentation/devicetree/bindings/serial/8250.yaml | 2 +-
+ .../devicetree/bindings/serial/8250_omap.yaml | 118 ++
+ .../bindings/serial/amlogic,meson-uart.yaml | 5 +
+ .../bindings/serial/brcm,bcm7271-uart.yaml | 2 +-
+ .../devicetree/bindings/serial/fsl-imx-uart.yaml | 12 +
+ .../devicetree/bindings/serial/ingenic,uart.yaml | 2 +-
+ .../devicetree/bindings/serial/omap_serial.txt | 40 -
+ .../devicetree/bindings/serial/pl011.yaml | 13 +-
+ .../bindings/serial/qca,ar9330-uart.yaml | 4 +-
+ .../bindings/serial/renesas,em-uart.yaml | 2 +-
+ .../devicetree/bindings/serial/renesas,scif.yaml | 4 +
+ .../devicetree/bindings/serial/samsung_uart.yaml | 2 +-
+ .../devicetree/bindings/serial/serial.yaml | 2 +
+ .../devicetree/bindings/serial/sifive-serial.yaml | 4 +-
+ .../bindings/serial/snps-dw-apb-uart.yaml | 4 +-
+ .../devicetree/bindings/serial/st,stm32-uart.yaml | 3 +-
+ Documentation/driver-api/serial/moxa-smartio.rst | 496 +----
+ Documentation/networking/caif/caif.rst | 4 +-
+ MAINTAINERS | 14 +-
+ arch/alpha/kernel/srmcons.c | 9 +-
+ arch/arm/boot/dts/imx53-ppd.dts | 2 +
+ arch/m68k/emu/nfcon.c | 2 +-
+ arch/mips/mti-malta/malta-platform.c | 3 +-
+ arch/parisc/kernel/pdc_cons.c | 8 +-
+ arch/powerpc/configs/ppc6xx_defconfig | 1 -
+ arch/um/drivers/line.c | 15 +-
+ arch/um/drivers/line.h | 5 +-
+ arch/um/drivers/ssl.c | 1 -
+ arch/um/drivers/stdio_console.c | 1 -
+ arch/xtensa/platforms/iss/console.c | 9 +-
+ drivers/accessibility/speakup/spk_ttyio.c | 9 +-
+ drivers/bluetooth/hci_ldisc.c | 12 +-
+ drivers/char/Kconfig | 13 -
+ drivers/char/pcmcia/synclink_cs.c | 24 +-
+ drivers/char/ttyprintk.c | 52 +-
+ drivers/input/serio/serport.c | 8 +-
+ drivers/ipack/devices/ipoctal.c | 4 +-
+ drivers/isdn/capi/capi.c | 40 +-
+ drivers/misc/bcm-vk/bcm_vk_tty.c | 2 +-
+ drivers/misc/ti-st/st_core.c | 30 +-
+ drivers/mmc/core/sdio_uart.c | 6 +-
+ drivers/net/caif/caif_serial.c | 13 +-
+ drivers/net/can/slcan.c | 10 +-
+ drivers/net/hamradio/6pack.c | 14 +-
+ drivers/net/hamradio/mkiss.c | 13 +-
+ drivers/net/ppp/ppp_async.c | 12 +-
+ drivers/net/ppp/ppp_synctty.c | 12 +-
+ drivers/net/slip/slip.c | 9 +-
+ drivers/net/usb/hso.c | 8 +-
+ drivers/pps/clients/pps-ldisc.c | 11 +-
+ drivers/s390/char/con3215.c | 4 +-
+ drivers/s390/char/sclp_rw.c | 4 +-
+ drivers/s390/char/sclp_rw.h | 2 +-
+ drivers/s390/char/sclp_tty.c | 9 +-
+ drivers/s390/char/sclp_vt220.c | 9 +-
+ drivers/s390/char/tty3270.c | 22 +-
+ drivers/staging/fwserial/fwserial.c | 14 +-
+ drivers/staging/gdm724x/gdm_tty.c | 2 +-
+ drivers/staging/greybus/uart.c | 22 +-
+ drivers/tty/Kconfig | 2 +-
+ drivers/tty/Makefile | 1 -
+ drivers/tty/amiserial.c | 12 +-
+ drivers/tty/ehv_bytechan.c | 4 +-
+ drivers/tty/goldfish.c | 4 +-
+ drivers/tty/hvc/hvc_console.c | 8 +-
+ drivers/tty/hvc/hvc_iucv.c | 2 -
+ drivers/tty/hvc/hvcs.c | 4 +-
+ drivers/tty/hvc/hvsi.c | 6 +-
+ drivers/tty/ipwireless/tty.c | 6 +-
+ drivers/tty/mips_ejtag_fdc.c | 8 +-
+ drivers/tty/moxa.c | 22 +-
+ drivers/tty/mxser.c | 1958 ++++++--------------
+ drivers/tty/mxser.h | 151 --
+ drivers/tty/n_gsm.c | 34 +-
+ drivers/tty/n_hdlc.c | 18 +-
+ drivers/tty/n_null.c | 7 +-
+ drivers/tty/n_r3964.c | 1283 -------------
+ drivers/tty/n_tty.c | 201 +-
+ drivers/tty/nozomi.c | 26 +-
+ drivers/tty/pty.c | 89 +-
+ drivers/tty/serdev/core.c | 2 +-
+ drivers/tty/serial/8250/8250_aspeed_vuart.c | 54 +-
+ drivers/tty/serial/8250/8250_core.c | 27 +-
+ drivers/tty/serial/8250/8250_exar.c | 20 +-
+ drivers/tty/serial/8250/8250_of.c | 4 +
+ drivers/tty/serial/8250/8250_omap.c | 2 +-
+ drivers/tty/serial/8250/8250_pci.c | 172 +-
+ drivers/tty/serial/8250/8250_port.c | 57 +-
+ drivers/tty/serial/8250/serial_cs.c | 13 +-
+ drivers/tty/serial/Kconfig | 20 +
+ drivers/tty/serial/Makefile | 1 +
+ drivers/tty/serial/amba-pl011.c | 2 +-
+ drivers/tty/serial/arc_uart.c | 2 +-
+ drivers/tty/serial/atmel_serial.c | 2 +-
+ drivers/tty/serial/cpm_uart/cpm_uart_core.c | 19 +-
+ drivers/tty/serial/dz.c | 4 +-
+ drivers/tty/serial/fsl_lpuart.c | 135 +-
+ drivers/tty/serial/icom.c | 2 +-
+ drivers/tty/serial/imx.c | 27 +-
+ drivers/tty/serial/ip22zilog.c | 2 +-
+ drivers/tty/serial/kgdb_nmi.c | 4 +-
+ drivers/tty/serial/liteuart.c | 21 +
+ drivers/tty/serial/max310x.c | 40 +-
+ drivers/tty/serial/meson_uart.c | 8 +-
+ drivers/tty/serial/mux.c | 2 +-
+ drivers/tty/serial/mxs-auart.c | 26 +-
+ drivers/tty/serial/omap-serial.c | 10 +-
+ drivers/tty/serial/pmac_zilog.c | 2 +-
+ drivers/tty/serial/qcom_geni_serial.c | 18 +-
+ drivers/tty/serial/samsung_tty.c | 3 +-
+ drivers/tty/serial/sb1250-duart.c | 2 +-
+ drivers/tty/serial/sc16is7xx.c | 26 +-
+ drivers/tty/serial/serial_core.c | 58 +-
+ drivers/tty/serial/serial_cortina-access.c | 798 ++++++++
+ drivers/tty/serial/serial_txx9.c | 2 +-
+ drivers/tty/serial/sh-sci.c | 41 +-
+ drivers/tty/serial/sh-sci.h | 1 +
+ drivers/tty/serial/st-asc.c | 4 +-
+ drivers/tty/serial/stm32-usart.c | 197 +-
+ drivers/tty/serial/sunsab.c | 2 +-
+ drivers/tty/serial/sunsu.c | 2 +-
+ drivers/tty/serial/sunzilog.c | 2 +-
+ drivers/tty/serial/tegra-tcu.c | 26 +-
+ drivers/tty/serial/uartlite.c | 27 +-
+ drivers/tty/serial/vr41xx_siu.c | 2 +-
+ drivers/tty/serial/xilinx_uartps.c | 10 +-
+ drivers/tty/synclink_gt.c | 27 +-
+ drivers/tty/tty_baudrate.c | 13 +-
+ drivers/tty/tty_buffer.c | 28 +-
+ drivers/tty/tty_io.c | 198 +-
+ drivers/tty/tty_ioctl.c | 96 +-
+ drivers/tty/tty_jobctrl.c | 88 +-
+ drivers/tty/tty_ldisc.c | 29 +-
+ drivers/tty/tty_port.c | 18 +-
+ drivers/tty/ttynull.c | 2 +-
+ drivers/tty/vcc.c | 24 +-
+ drivers/tty/vt/keyboard.c | 2 +-
+ drivers/tty/vt/selection.c | 20 +-
+ drivers/tty/vt/vt.c | 18 +-
+ drivers/usb/class/cdc-acm.c | 21 +-
+ drivers/usb/gadget/function/u_serial.c | 12 +-
+ drivers/usb/host/xhci-dbgtty.c | 8 +-
+ drivers/usb/serial/belkin_sa.c | 20 +-
+ drivers/usb/serial/cypress_m8.c | 21 +-
+ drivers/usb/serial/pl2303.c | 15 +-
+ drivers/usb/serial/usb-serial.c | 4 +-
+ drivers/usb/serial/whiteheat.c | 9 +-
+ include/linux/n_r3964.h | 175 --
+ include/linux/serial_8250.h | 2 +-
+ include/linux/serial_core.h | 5 +-
+ include/linux/tty.h | 78 +-
+ include/linux/tty_driver.h | 12 +-
+ include/linux/tty_flip.h | 2 +-
+ include/linux/tty_ldisc.h | 6 +-
+ include/linux/vt_kern.h | 1 -
+ include/uapi/linux/n_r3964.h | 99 -
+ net/bluetooth/rfcomm/tty.c | 4 +-
+ net/nfc/nci/uart.c | 7 +-
+ sound/soc/codecs/cx20442.c | 4 +-
+ sound/soc/ti/ams-delta.c | 11 +-
+ 161 files changed, 2886 insertions(+), 5124 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/serial/8250_omap.yaml
+ delete mode 100644 Documentation/devicetree/bindings/serial/omap_serial.txt
+ delete mode 100644 drivers/tty/mxser.h
+ delete mode 100644 drivers/tty/n_r3964.c
+ create mode 100644 drivers/tty/serial/serial_cortina-access.c
+ delete mode 100644 include/linux/n_r3964.h
+ delete mode 100644 include/uapi/linux/n_r3964.h
+Merging char-misc/char-misc-next (f274e2962677 Merge tag 'icc-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc into char-misc-next)
+$ git merge char-misc/char-misc-next
+Auto-merging sound/soc/intel/boards/sof_sdw.c
+Removing include/uapi/linux/raw.h
+Auto-merging include/linux/soundwire/sdw.h
+CONFLICT (content): Merge conflict in include/linux/soundwire/sdw.h
+Auto-merging include/linux/nvmem-provider.h
+Auto-merging include/linux/fs.h
+Auto-merging fs/block_dev.c
+Auto-merging drivers/watchdog/mei_wdt.c
+Auto-merging drivers/video/fbdev/Kconfig
+Auto-merging drivers/tty/vcc.c
+Auto-merging drivers/soundwire/bus.c
+Auto-merging drivers/nvmem/core.c
+Auto-merging drivers/ipack/devices/ipoctal.c
+Removing drivers/char/raw.c
+Auto-merging drivers/char/Kconfig
+Auto-merging drivers/block/sunvdc.c
+Auto-merging drivers/accessibility/braille/braille_console.c
+Auto-merging Documentation/ABI/testing/debugfs-driver-habanalabs
+Resolved 'include/linux/soundwire/sdw.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master b289cb37b346] Merge remote-tracking branch 'char-misc/char-misc-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/stable/sysfs-driver-w1_ds2438 | 13 +
+ .../ABI/testing/debugfs-driver-habanalabs | 8 +
+ Documentation/ABI/testing/sysfs-class-spi-eeprom | 19 +
+ Documentation/devicetree/bindings/eeprom/at25.yaml | 31 +-
+ .../devicetree/bindings/fpga/fpga-region.txt | 22 +-
+ .../bindings/interconnect/qcom,rpmh.yaml | 12 +
+ .../devicetree/bindings/misc/eeprom-93xx46.txt | 3 +
+ Documentation/fpga/dfl.rst | 4 +-
+ Documentation/userspace-api/accelerators/ocxl.rst | 2 +-
+ Documentation/w1/slaves/w1_ds2438.rst | 19 +-
+ arch/sparc/include/asm/vio.h | 2 +-
+ arch/sparc/kernel/ds.c | 6 -
+ arch/sparc/kernel/vio.c | 4 +-
+ drivers/accessibility/braille/braille_console.c | 3 +
+ drivers/accessibility/speakup/i18n.c | 7 +
+ drivers/accessibility/speakup/i18n.h | 9 +-
+ drivers/accessibility/speakup/main.c | 4 -
+ drivers/block/sunvdc.c | 3 +-
+ drivers/bus/fsl-mc/dprc-driver.c | 8 +-
+ drivers/bus/fsl-mc/dprc.c | 4 +-
+ drivers/bus/fsl-mc/fsl-mc-allocator.c | 10 +-
+ drivers/bus/fsl-mc/fsl-mc-bus.c | 19 +-
+ drivers/bus/fsl-mc/fsl-mc-msi.c | 2 +-
+ drivers/bus/fsl-mc/mc-io.c | 6 +-
+ drivers/bus/fsl-mc/mc-sys.c | 19 +-
+ drivers/char/Kconfig | 21 -
+ drivers/char/Makefile | 3 +-
+ drivers/char/hpet.c | 4 +-
+ drivers/char/hw_random/pseries-rng.c | 2 +-
+ drivers/char/mem.c | 1 -
+ drivers/char/pcmcia/cm4000_cs.c | 7 +-
+ drivers/char/pcmcia/cm4040_cs.c | 3 +-
+ drivers/char/pcmcia/scr24x_cs.c | 1 -
+ drivers/char/raw.c | 362 ----
+ drivers/char/xillybus/Kconfig | 22 +-
+ drivers/char/xillybus/Makefile | 2 +
+ drivers/char/xillybus/xillybus.h | 10 +-
+ drivers/char/xillybus/xillybus_class.c | 262 +++
+ drivers/char/xillybus/xillybus_class.h | 30 +
+ drivers/char/xillybus/xillybus_core.c | 180 +-
+ drivers/char/xillybus/xillybus_of.c | 1 -
+ drivers/char/xillybus/xillybus_pcie.c | 1 -
+ drivers/char/xillybus/xillyusb.c | 2259 ++++++++++++++++++++
+ drivers/comedi/drivers/comedi_8254.c | 3 +-
+ drivers/comedi/drivers/comedi_isadma.c | 2 +-
+ drivers/comedi/drivers/ni_routes.c | 7 +-
+ drivers/comedi/drivers/ni_routes.h | 1 -
+ .../comedi/drivers/ni_routing/ni_device_routes.c | 1 -
+ .../comedi/drivers/ni_routing/ni_device_routes.h | 1 -
+ .../drivers/ni_routing/ni_device_routes/all.h | 1 -
+ .../ni_routing/ni_device_routes/pci-6070e.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pci-6220.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pci-6221.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pci-6229.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pci-6251.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pci-6254.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pci-6259.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pci-6534.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pci-6602.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pci-6713.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pci-6723.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pci-6733.c | 1 -
+ .../ni_routing/ni_device_routes/pxi-6030e.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pxi-6224.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pxi-6225.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pxi-6251.c | 1 -
+ .../drivers/ni_routing/ni_device_routes/pxi-6733.c | 1 -
+ .../ni_routing/ni_device_routes/pxie-6251.c | 1 -
+ .../ni_routing/ni_device_routes/pxie-6535.c | 1 -
+ .../ni_routing/ni_device_routes/pxie-6738.c | 1 -
+ .../comedi/drivers/ni_routing/ni_route_values.c | 1 -
+ .../comedi/drivers/ni_routing/ni_route_values.h | 1 -
+ .../drivers/ni_routing/ni_route_values/all.h | 1 -
+ .../drivers/ni_routing/ni_route_values/ni_660x.c | 1 -
+ .../ni_routing/ni_route_values/ni_eseries.c | 1 -
+ .../ni_routing/ni_route_values/ni_mseries.c | 1 -
+ .../drivers/ni_routing/tools/convert_c_to_py.c | 1 -
+ .../drivers/ni_routing/tools/convert_csv_to_c.py | 7 -
+ .../drivers/ni_routing/tools/convert_py_to_csv.py | 1 -
+ .../drivers/ni_routing/tools/csv_collection.py | 1 -
+ .../drivers/ni_routing/tools/make_blank_csv.py | 1 -
+ .../comedi/drivers/ni_routing/tools/ni_names.py | 1 -
+ drivers/comedi/drivers/ni_tio.c | 12 +-
+ drivers/comedi/drivers/tests/comedi_example_test.c | 1 -
+ drivers/comedi/drivers/tests/ni_routes_test.c | 1 -
+ drivers/comedi/drivers/tests/unittest.h | 1 -
+ drivers/eisa/eisa-bus.c | 23 +-
+ drivers/firewire/nosy.c | 43 +-
+ drivers/firmware/stratix10-svc.c | 22 +-
+ drivers/fpga/Kconfig | 4 +-
+ drivers/fpga/altera-pr-ip-core.c | 10 -
+ drivers/fpga/fpga-bridge.c | 40 +-
+ drivers/fpga/fpga-mgr.c | 42 +-
+ drivers/fpga/fpga-region.c | 30 +-
+ drivers/fpga/of-fpga-region.c | 8 +-
+ drivers/fpga/stratix10-soc.c | 3 +-
+ drivers/fsi/fsi-core.c | 4 +-
+ drivers/fsi/fsi-master-aspeed.c | 33 +-
+ drivers/fsi/fsi-master-ast-cf.c | 2 +-
+ drivers/fsi/fsi-master-gpio.c | 1 +
+ drivers/fsi/fsi-occ.c | 12 +-
+ drivers/fsi/fsi-sbefifo.c | 10 +-
+ drivers/fsi/fsi-scom.c | 105 +-
+ drivers/hwmon/occ/common.c | 7 +-
+ drivers/hwtracing/coresight/coresight-core.c | 11 +-
+ drivers/hwtracing/coresight/coresight-etm4x-core.c | 5 -
+ drivers/hwtracing/coresight/coresight-tmc-etf.c | 2 +-
+ drivers/interconnect/qcom/Kconfig | 9 +
+ drivers/interconnect/qcom/Makefile | 2 +
+ drivers/interconnect/qcom/sc7280.c | 1938 +++++++++++++++++
+ drivers/interconnect/qcom/sc7280.h | 154 ++
+ drivers/ipack/carriers/tpci200.c | 9 +-
+ drivers/ipack/carriers/tpci200.h | 4 +-
+ drivers/ipack/devices/ipoctal.c | 4 +-
+ drivers/ipack/devices/ipoctal.h | 6 +-
+ drivers/misc/bcm-vk/bcm_vk_msg.c | 6 +-
+ drivers/misc/bcm-vk/bcm_vk_msg.h | 2 +-
+ drivers/misc/cardreader/alcor_pci.c | 8 +-
+ drivers/misc/cxl/file.c | 5 +-
+ drivers/misc/eeprom/Kconfig | 5 +-
+ drivers/misc/eeprom/at25.c | 158 +-
+ drivers/misc/eeprom/ee1004.c | 223 +-
+ drivers/misc/eeprom/eeprom_93xx46.c | 90 +-
+ drivers/misc/eeprom/idt_89hpesx.c | 41 +-
+ .../misc/habanalabs/common/command_submission.c | 81 +-
+ drivers/misc/habanalabs/common/context.c | 9 -
+ drivers/misc/habanalabs/common/debugfs.c | 5 +
+ drivers/misc/habanalabs/common/device.c | 82 +-
+ drivers/misc/habanalabs/common/firmware_if.c | 1806 ++++++++++++++--
+ drivers/misc/habanalabs/common/habanalabs.h | 280 ++-
+ drivers/misc/habanalabs/common/habanalabs_drv.c | 24 +-
+ drivers/misc/habanalabs/common/habanalabs_ioctl.c | 23 +-
+ drivers/misc/habanalabs/common/hw_queue.c | 42 +-
+ drivers/misc/habanalabs/common/irq.c | 24 +-
+ drivers/misc/habanalabs/common/memory.c | 22 +-
+ drivers/misc/habanalabs/common/mmu/mmu.c | 14 +-
+ drivers/misc/habanalabs/common/pci/pci.c | 34 +-
+ drivers/misc/habanalabs/common/sysfs.c | 2 +-
+ drivers/misc/habanalabs/gaudi/gaudi.c | 1013 +++++----
+ drivers/misc/habanalabs/gaudi/gaudiP.h | 1 +
+ drivers/misc/habanalabs/gaudi/gaudi_coresight.c | 6 +-
+ drivers/misc/habanalabs/gaudi/gaudi_security.c | 15 +-
+ drivers/misc/habanalabs/goya/goya.c | 251 ++-
+ drivers/misc/habanalabs/goya/goyaP.h | 2 +-
+ drivers/misc/habanalabs/goya/goya_coresight.c | 2 +-
+ drivers/misc/habanalabs/include/common/cpucp_if.h | 45 +-
+ .../misc/habanalabs/include/common/hl_boot_if.h | 184 +-
+ .../habanalabs/include/gaudi/gaudi_async_events.h | 14 +-
+ .../include/gaudi/gaudi_async_ids_map_extended.h | 31 +-
+ .../misc/habanalabs/include/gaudi/gaudi_fw_if.h | 46 +
+ .../misc/habanalabs/include/gaudi/gaudi_masks.h | 15 +-
+ .../misc/habanalabs/include/gaudi/gaudi_reg_map.h | 10 +
+ drivers/misc/hpilo.c | 10 +-
+ drivers/misc/hpilo.h | 3 +
+ drivers/misc/ibmasm/module.c | 5 +-
+ drivers/misc/mei/bus-fixup.c | 2 +-
+ drivers/misc/mei/client.c | 22 +-
+ drivers/misc/mei/hbm.c | 2 +-
+ drivers/misc/mei/hdcp/Kconfig | 1 -
+ drivers/misc/mei/hw-me.c | 4 +-
+ drivers/misc/mei/hw.h | 28 +-
+ drivers/misc/mei/interrupt.c | 23 +-
+ drivers/misc/mei/main.c | 4 +-
+ drivers/misc/mei/pci-txe.c | 2 +-
+ drivers/misc/pvpanic/pvpanic-mmio.c | 17 +-
+ drivers/misc/pvpanic/pvpanic-pci.c | 22 +-
+ drivers/misc/pvpanic/pvpanic.c | 33 +-
+ drivers/misc/pvpanic/pvpanic.h | 3 +-
+ drivers/misc/uacce/uacce.c | 11 +-
+ drivers/misc/xilinx_sdfec.c | 3 -
+ drivers/net/ethernet/sun/ldmvsw.c | 4 +-
+ drivers/net/ethernet/sun/sunvnet.c | 3 +-
+ drivers/nvmem/core.c | 23 +-
+ drivers/nvmem/qfprom.c | 9 +-
+ drivers/nvmem/sprd-efuse.c | 2 +-
+ drivers/nvmem/sunxi_sid.c | 1 +
+ drivers/parport/probe.c | 11 +-
+ drivers/soundwire/Kconfig | 1 +
+ drivers/soundwire/bus.c | 163 +-
+ drivers/soundwire/cadence_master.c | 21 +-
+ drivers/soundwire/cadence_master.h | 3 -
+ drivers/soundwire/dmi-quirks.c | 2 +-
+ drivers/soundwire/generic_bandwidth_allocation.c | 14 +-
+ drivers/soundwire/intel.c | 56 +-
+ drivers/soundwire/intel.h | 14 +-
+ drivers/soundwire/intel_init.c | 232 +-
+ drivers/soundwire/slave.c | 4 +-
+ drivers/soundwire/stream.c | 13 +-
+ drivers/tty/vcc.c | 4 +-
+ drivers/uio/Kconfig | 2 +-
+ drivers/uio/uio_aec.c | 2 +-
+ drivers/uio/uio_pci_generic.c | 32 +
+ drivers/video/fbdev/Kconfig | 1 -
+ drivers/visorbus/visorchipset.c | 6 +-
+ drivers/w1/masters/ds2482.c | 94 +-
+ drivers/w1/slaves/w1_ds2438.c | 122 +-
+ drivers/w1/slaves/w1_therm.c | 5 +-
+ fs/block_dev.c | 6 +-
+ include/dt-bindings/interconnect/qcom,sc7280.h | 165 ++
+ include/linux/eeprom_93xx46.h | 3 +
+ include/linux/fpga/altera-pr-ip-core.h | 1 -
+ include/linux/fpga/fpga-bridge.h | 2 +-
+ include/linux/fpga/fpga-mgr.h | 2 +-
+ include/linux/fs.h | 3 -
+ include/linux/mcb.h | 2 +-
+ include/linux/nvmem-provider.h | 1 +
+ include/linux/soundwire/sdw.h | 5 +-
+ include/linux/soundwire/sdw_intel.h | 6 +-
+ include/linux/sysfs.h | 6 +
+ include/uapi/linux/raw.h | 17 -
+ include/uapi/misc/habanalabs.h | 13 +
+ lib/dynamic_debug.c | 6 +-
+ sound/soc/intel/boards/sof_sdw.c | 4 +-
+ 213 files changed, 9407 insertions(+), 2517 deletions(-)
+ create mode 100644 Documentation/ABI/stable/sysfs-driver-w1_ds2438
+ create mode 100644 Documentation/ABI/testing/sysfs-class-spi-eeprom
+ delete mode 100644 drivers/char/raw.c
+ create mode 100644 drivers/char/xillybus/xillybus_class.c
+ create mode 100644 drivers/char/xillybus/xillybus_class.h
+ create mode 100644 drivers/char/xillybus/xillyusb.c
+ create mode 100644 drivers/interconnect/qcom/sc7280.c
+ create mode 100644 drivers/interconnect/qcom/sc7280.h
+ create mode 100644 include/dt-bindings/interconnect/qcom,sc7280.h
+ delete mode 100644 include/uapi/linux/raw.h
+Merging extcon/extcon-next (d97c0ff5a124 extcon: sm5502: Add support for SM5504)
+$ git merge extcon/extcon-next
+Auto-merging drivers/extcon/extcon-max8997.c
+Removing Documentation/devicetree/bindings/extcon/extcon-sm5502.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/extcon/extcon-sm5502.txt | 21 --
+ .../bindings/extcon/siliconmitus,sm5502-muic.yaml | 52 +++++
+ drivers/extcon/Kconfig | 2 +-
+ drivers/extcon/extcon-intel-mrfld.c | 9 +
+ drivers/extcon/extcon-max8997.c | 1 +
+ drivers/extcon/extcon-sm5502.c | 212 ++++++++++++++++-----
+ drivers/extcon/extcon-sm5502.h | 82 +++++++-
+ 7 files changed, 310 insertions(+), 69 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/extcon/extcon-sm5502.txt
+ create mode 100644 Documentation/devicetree/bindings/extcon/siliconmitus,sm5502-muic.yaml
+Merging phy-next/next (15692a80d949 phy: Revert "phy: ralink: Kconfig: convert mt7621-pci-phy into 'bool'")
+$ git merge phy-next/next
+Auto-merging drivers/phy/ralink/phy-mt7621-pci.c
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt
+Removing Documentation/devicetree/bindings/phy/rcar-gen3-phy-pcie.txt
+Auto-merging Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml
+Auto-merging Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/pci/qcom,pcie.txt | 24 ++
+ .../bindings/phy/mediatek,mt7621-pci-phy.yaml | 5 +
+ .../bindings/phy/phy-rockchip-inno-usb2.yaml | 1 +
+ .../devicetree/bindings/phy/phy-stm32-usbphyc.yaml | 11 +
+ .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 27 ++
+ .../devicetree/bindings/phy/rcar-gen3-phy-pcie.txt | 24 --
+ .../bindings/phy/renesas,rcar-gen3-pcie-phy.yaml | 53 +++
+ .../bindings/phy/rockchip-inno-csi-dphy.yaml | 79 ++++
+ .../devicetree/bindings/phy/rockchip-usb-phy.txt | 52 ---
+ .../devicetree/bindings/phy/rockchip-usb-phy.yaml | 81 ++++
+ .../devicetree/bindings/phy/ti,tcan104x-can.yaml | 56 +++
+ MAINTAINERS | 4 +-
+ drivers/phy/Kconfig | 9 +
+ drivers/phy/Makefile | 1 +
+ drivers/phy/broadcom/phy-bcm-ns-usb3.c | 4 +-
+ drivers/phy/marvell/phy-mmp3-hsic.c | 4 +-
+ drivers/phy/mediatek/phy-mtk-hdmi.c | 4 +-
+ drivers/phy/mediatek/phy-mtk-mipi-dsi.c | 4 +-
+ drivers/phy/phy-can-transceiver.c | 146 +++++++
+ drivers/phy/phy-core-mipi-dphy.c | 2 +-
+ drivers/phy/phy-core.c | 16 +-
+ drivers/phy/phy-xgene.c | 3 +-
+ drivers/phy/qualcomm/phy-qcom-qmp.c | 315 +++++++++++++-
+ drivers/phy/qualcomm/phy-qcom-qmp.h | 189 ++++++++-
+ drivers/phy/ralink/Kconfig | 2 +-
+ drivers/phy/ralink/phy-mt7621-pci.c | 37 +-
+ drivers/phy/rockchip/Kconfig | 9 +
+ drivers/phy/rockchip/Makefile | 1 +
+ drivers/phy/rockchip/phy-rockchip-inno-csidphy.c | 459 +++++++++++++++++++++
+ drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 4 +-
+ drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 44 ++
+ drivers/phy/socionext/phy-uniphier-pcie.c | 11 +-
+ drivers/phy/st/phy-stm32-usbphyc.c | 31 ++
+ drivers/phy/ti/phy-dm816x-usb.c | 17 +-
+ drivers/phy/ti/phy-twl4030-usb.c | 6 +-
+ include/linux/phy/phy.h | 2 +-
+ 36 files changed, 1601 insertions(+), 136 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/phy/rcar-gen3-phy-pcie.txt
+ create mode 100644 Documentation/devicetree/bindings/phy/renesas,rcar-gen3-pcie-phy.yaml
+ create mode 100644 Documentation/devicetree/bindings/phy/rockchip-inno-csi-dphy.yaml
+ delete mode 100644 Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt
+ create mode 100644 Documentation/devicetree/bindings/phy/rockchip-usb-phy.yaml
+ create mode 100644 Documentation/devicetree/bindings/phy/ti,tcan104x-can.yaml
+ create mode 100644 drivers/phy/phy-can-transceiver.c
+ create mode 100644 drivers/phy/rockchip/phy-rockchip-inno-csidphy.c
+Merging soundwire/next (3d3e88e33633 soundwire: stream: Fix test for DP prepare complete)
+$ git merge soundwire/next
+Already up to date.
+Merging thunderbolt/next (b18f901382fd thunderbolt: Fix DROM handling for USB4 DROM)
+$ git merge thunderbolt/next
+Already up to date.
+Merging vfio/next (c7396f2eac2b vfio/iommu_type1: rename vfio_group struck to vfio_iommu_group)
+$ git merge vfio/next
+Auto-merging include/linux/device.h
+Auto-merging drivers/gpu/drm/i915/Kconfig
+Auto-merging arch/s390/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/driver-api/vfio-mediated-device.rst | 35 ++--
+ Documentation/s390/vfio-ap.rst | 1 -
+ arch/s390/Kconfig | 2 +-
+ drivers/base/base.h | 1 -
+ drivers/base/bus.c | 8 +-
+ drivers/base/dd.c | 192 ++++++++++++----------
+ drivers/gpu/drm/i915/Kconfig | 2 +-
+ drivers/vfio/fsl-mc/vfio_fsl_mc.c | 16 +-
+ drivers/vfio/mdev/Kconfig | 7 -
+ drivers/vfio/mdev/Makefile | 3 +-
+ drivers/vfio/mdev/mdev_core.c | 46 ++++--
+ drivers/vfio/mdev/mdev_driver.c | 10 ++
+ drivers/vfio/mdev/mdev_private.h | 2 +
+ drivers/vfio/mdev/vfio_mdev.c | 37 +----
+ drivers/vfio/pci/vfio_pci.c | 7 -
+ drivers/vfio/platform/vfio_amba.c | 1 -
+ drivers/vfio/platform/vfio_platform.c | 1 -
+ drivers/vfio/platform/vfio_platform_common.c | 6 -
+ drivers/vfio/platform/vfio_platform_private.h | 1 -
+ drivers/vfio/vfio.c | 10 ++
+ drivers/vfio/vfio_iommu_type1.c | 34 ++--
+ include/linux/device.h | 2 +
+ include/linux/mdev.h | 2 +
+ samples/Kconfig | 6 +-
+ samples/vfio-mdev/mbochs.c | 163 ++++++++++--------
+ samples/vfio-mdev/mdpy.c | 159 ++++++++++--------
+ samples/vfio-mdev/mtty.c | 185 ++++++++++-----------
+ 27 files changed, 473 insertions(+), 466 deletions(-)
+Merging staging/staging-next (6cbb3aa0f9d5 staging: rtl8723bs: rtw_efuse: Fix coding style)
+$ git merge staging/staging-next
+Auto-merging include/linux/i2c.h
+Auto-merging drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+Removing drivers/staging/rtl8723bs/include/drv_conf.h
+Removing drivers/staging/rtl8723bs/include/autoconf.h
+Removing drivers/staging/rtl8723bs/hal/odm_debug.h
+Removing drivers/staging/rtl8723bs/hal/odm_debug.c
+Removing drivers/staging/rtl8723bs/hal/odm_PathDiv.h
+Removing drivers/staging/rtl8723bs/hal/odm_PathDiv.c
+Removing drivers/staging/rtl8723bs/core/rtw_eeprom.c
+Removing drivers/staging/rtl8188eu/include/odm_debug.h
+Removing drivers/staging/rtl8188eu/core/rtw_debug.c
+Auto-merging drivers/staging/mt7621-dts/mt7621.dtsi
+Removing drivers/staging/kpc2000/kpc_dma/uapi.h
+Removing drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.h
+Removing drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c
+Removing drivers/staging/kpc2000/kpc_dma/fileops.c
+Removing drivers/staging/kpc2000/kpc_dma/dma.c
+Removing drivers/staging/kpc2000/kpc_dma/Makefile
+Removing drivers/staging/kpc2000/kpc2000_spi.c
+Removing drivers/staging/kpc2000/kpc2000_i2c.c
+Removing drivers/staging/kpc2000/kpc2000/uapi.h
+Removing drivers/staging/kpc2000/kpc2000/pcie.h
+Removing drivers/staging/kpc2000/kpc2000/dma_common_defs.h
+Removing drivers/staging/kpc2000/kpc2000/core.c
+Removing drivers/staging/kpc2000/kpc2000/cell_probe.c
+Removing drivers/staging/kpc2000/kpc2000/Makefile
+Removing drivers/staging/kpc2000/kpc.h
+Removing drivers/staging/kpc2000/TODO
+Removing drivers/staging/kpc2000/Makefile
+Removing drivers/staging/kpc2000/Kconfig
+Removing drivers/staging/iio/cdc/ad7746.h
+Auto-merging drivers/staging/fwserial/fwserial.c
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml
+Removing Documentation/devicetree/bindings/iio/dac/ti-dac082s085.txt
+Removing Documentation/devicetree/bindings/iio/dac/ad5755.txt
+Removing Documentation/ABI/testing/sysfs-bus-iio-icm42600
+Auto-merging Documentation/ABI/testing/sysfs-bus-iio
+Removing Documentation/ABI/testing/sysfs-bus-counter-ftm-quaddec
+Removing Documentation/ABI/testing/sysfs-bus-counter-104-quad-8
+Resolved 'MAINTAINERS' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 81828b800544] Merge remote-tracking branch 'staging/staging-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/obsolete/sysfs-bus-iio | 182 +++
+ Documentation/ABI/testing/sysfs-bus-counter | 85 +-
+ .../ABI/testing/sysfs-bus-counter-104-quad-8 | 61 -
+ .../ABI/testing/sysfs-bus-counter-ftm-quaddec | 16 -
+ Documentation/ABI/testing/sysfs-bus-iio | 125 +-
+ .../ABI/testing/sysfs-bus-iio-frequency-adf4371 | 33 -
+ .../ABI/testing/sysfs-bus-iio-health-afe440x | 10 +-
+ Documentation/ABI/testing/sysfs-bus-iio-icm42600 | 20 -
+ .../ABI/testing/sysfs-bus-iio-light-lm3533-als | 11 +-
+ .../bindings/iio/accel/adi,adis16201.yaml | 55 +
+ .../bindings/iio/accel/bosch,bma180.yaml | 3 +-
+ .../bindings/iio/accel/bosch,bma220.yaml | 50 +
+ .../bindings/iio/accel/bosch,bma255.yaml | 9 +-
+ .../devicetree/bindings/iio/accel/fsl,mma7455.yaml | 82 +
+ .../bindings/iio/accel/kionix,kxcjk1013.yaml | 1 +
+ .../bindings/iio/accel/murata,sca3300.yaml | 44 +
+ .../bindings/iio/accel/nxp,fxls8962af.yaml | 80 +
+ Documentation/devicetree/bindings/iio/adc/adc.yaml | 12 +
+ .../devicetree/bindings/iio/adc/adi,ad7298.yaml | 48 +
+ .../devicetree/bindings/iio/adc/adi,ad7476.yaml | 174 +++
+ .../devicetree/bindings/iio/adc/ti,tsc2046.yaml | 115 ++
+ .../bindings/iio/afe/current-sense-shunt.yaml | 4 +
+ .../devicetree/bindings/iio/cdc/adi,ad7746.yaml | 77 +
+ .../bindings/iio/chemical/sensirion,sps30.yaml | 7 +-
+ .../devicetree/bindings/iio/dac/ad5755.txt | 124 --
+ .../devicetree/bindings/iio/dac/adi,ad5755.yaml | 169 ++
+ .../devicetree/bindings/iio/dac/ti,dac082s085.yaml | 72 +
+ .../devicetree/bindings/iio/dac/ti-dac082s085.txt | 34 -
+ .../bindings/iio/light/amstaos,tsl2591.yaml | 50 +
+ .../devicetree/bindings/iio/st,st-sensors.yaml | 262 +++-
+ .../bindings/iio/temperature/ti,tmp117.yaml | 41 +
+ .../devicetree/bindings/trivial-devices.yaml | 10 +
+ Documentation/driver-api/generic-counter.rst | 2 +-
+ MAINTAINERS | 26 +-
+ arch/mips/include/asm/mach-ralink/spaces.h | 10 +
+ drivers/comedi/drivers/jr3_pci.c | 15 -
+ drivers/counter/104-quad-8.c | 13 +-
+ drivers/counter/Kconfig | 10 +
+ drivers/counter/Makefile | 1 +
+ drivers/counter/ftm-quaddec.c | 2 +-
+ drivers/counter/intel-qep.c | 544 +++++++
+ drivers/counter/interrupt-cnt.c | 8 +-
+ drivers/counter/microchip-tcb-capture.c | 4 +-
+ drivers/counter/stm32-lptimer-cnt.c | 4 +-
+ drivers/counter/stm32-timer-cnt.c | 4 +-
+ drivers/iio/accel/Kconfig | 51 +-
+ drivers/iio/accel/Makefile | 4 +
+ drivers/iio/accel/adis16201.c | 3 -
+ drivers/iio/accel/adis16209.c | 3 -
+ drivers/iio/accel/adxl372.c | 4 +-
+ drivers/iio/accel/bma180.c | 112 +-
+ drivers/iio/accel/bma220_spi.c | 10 +-
+ drivers/iio/accel/bma400_core.c | 2 +-
+ drivers/iio/accel/bmc150-accel-core.c | 234 +--
+ drivers/iio/accel/bmc150-accel-i2c.c | 245 ++-
+ drivers/iio/accel/bmc150-accel-spi.c | 31 +-
+ drivers/iio/accel/bmc150-accel.h | 72 +-
+ drivers/iio/accel/bmi088-accel-core.c | 27 +-
+ drivers/iio/accel/fxls8962af-core.c | 968 ++++++++++++
+ drivers/iio/accel/fxls8962af-i2c.c | 57 +
+ drivers/iio/accel/fxls8962af-spi.c | 57 +
+ drivers/iio/accel/fxls8962af.h | 22 +
+ drivers/iio/accel/hid-sensor-accel-3d.c | 19 +-
+ drivers/iio/accel/kxcjk-1013.c | 253 ++-
+ drivers/iio/accel/kxsd9.c | 2 +-
+ drivers/iio/accel/mma8452.c | 7 +-
+ drivers/iio/accel/mma9551.c | 1 -
+ drivers/iio/accel/mma9551_core.c | 4 +-
+ drivers/iio/accel/mma9553.c | 1 -
+ drivers/iio/accel/mxc4005.c | 12 +-
+ drivers/iio/accel/sca3300.c | 472 ++++++
+ drivers/iio/accel/st_accel.h | 12 -
+ drivers/iio/accel/st_accel_core.c | 230 ++-
+ drivers/iio/accel/st_accel_i2c.c | 17 +-
+ drivers/iio/accel/st_accel_spi.c | 17 +-
+ drivers/iio/accel/stk8312.c | 27 +-
+ drivers/iio/accel/stk8ba50.c | 19 +-
+ drivers/iio/adc/Kconfig | 12 +
+ drivers/iio/adc/Makefile | 1 +
+ drivers/iio/adc/ad7124.c | 48 +-
+ drivers/iio/adc/ad7192.c | 93 +-
+ drivers/iio/adc/ad7298.c | 8 +
+ drivers/iio/adc/ad7476.c | 120 +-
+ drivers/iio/adc/ad7606.c | 3 +-
+ drivers/iio/adc/ad7766.c | 10 +-
+ drivers/iio/adc/ad7768-1.c | 4 +-
+ drivers/iio/adc/ad7780.c | 38 +-
+ drivers/iio/adc/ad7791.c | 44 +-
+ drivers/iio/adc/ad7793.c | 53 +-
+ drivers/iio/adc/ad7887.c | 1 -
+ drivers/iio/adc/ad9467.c | 2 -
+ drivers/iio/adc/ad_sigma_delta.c | 82 +-
+ drivers/iio/adc/adi-axi-adc.c | 24 +-
+ drivers/iio/adc/at91-sama5d2_adc.c | 5 +-
+ drivers/iio/adc/at91_adc.c | 4 +-
+ drivers/iio/adc/dln2-adc.c | 3 +-
+ drivers/iio/adc/ep93xx_adc.c | 4 +-
+ drivers/iio/adc/exynos_adc.c | 2 +-
+ drivers/iio/adc/hi8435.c | 1 -
+ drivers/iio/adc/hx711.c | 4 +-
+ drivers/iio/adc/ina2xx-adc.c | 3 +-
+ drivers/iio/adc/max1027.c | 2 -
+ drivers/iio/adc/max11100.c | 34 +-
+ drivers/iio/adc/max1118.c | 68 +-
+ drivers/iio/adc/max1241.c | 2 -
+ drivers/iio/adc/mp2629_adc.c | 1 -
+ drivers/iio/adc/mt6360-adc.c | 1 -
+ drivers/iio/adc/mxs-lradc-adc.c | 5 +-
+ drivers/iio/adc/rcar-gyroadc.c | 15 +-
+ drivers/iio/adc/sc27xx_adc.c | 1 +
+ drivers/iio/adc/stm32-adc.c | 28 +-
+ drivers/iio/adc/stm32-dfsdm-core.c | 6 +-
+ drivers/iio/adc/ti-adc081c.c | 43 +-
+ drivers/iio/adc/ti-adc0832.c | 39 +-
+ drivers/iio/adc/ti-adc084s021.c | 3 -
+ drivers/iio/adc/ti-adc108s102.c | 45 +-
+ drivers/iio/adc/ti-adc161s626.c | 51 +-
+ drivers/iio/adc/ti-ads1015.c | 17 +-
+ drivers/iio/adc/ti-ads124s08.c | 2 -
+ drivers/iio/adc/ti-ads131e08.c | 3 +-
+ drivers/iio/adc/ti-ads8688.c | 3 +-
+ drivers/iio/adc/ti-tsc2046.c | 712 +++++++++
+ drivers/iio/adc/vf610_adc.c | 10 +-
+ drivers/iio/adc/xilinx-xadc-core.c | 2 +-
+ drivers/iio/afe/iio-rescale.c | 41 +-
+ drivers/iio/buffer/industrialio-buffer-dmaengine.c | 22 +-
+ drivers/iio/buffer/industrialio-hw-consumer.c | 25 +-
+ drivers/iio/buffer/industrialio-triggered-buffer.c | 23 +-
+ drivers/iio/chemical/Kconfig | 27 +-
+ drivers/iio/chemical/Makefile | 2 +
+ drivers/iio/chemical/atlas-sensor.c | 19 +-
+ drivers/iio/chemical/bme680_i2c.c | 8 -
+ drivers/iio/chemical/bme680_spi.c | 8 -
+ drivers/iio/chemical/ccs811.c | 2 +-
+ drivers/iio/chemical/scd30_core.c | 3 +-
+ drivers/iio/chemical/sgp30.c | 2 +-
+ drivers/iio/chemical/sps30.c | 275 +---
+ drivers/iio/chemical/sps30.h | 35 +
+ drivers/iio/chemical/sps30_i2c.c | 258 +++
+ drivers/iio/chemical/sps30_serial.c | 431 ++++++
+ .../iio/common/hid-sensors/hid-sensor-attributes.c | 32 +-
+ .../iio/common/hid-sensors/hid-sensor-trigger.c | 24 +-
+ .../iio/common/hid-sensors/hid-sensor-trigger.h | 3 +
+ drivers/iio/common/scmi_sensors/Makefile | 2 +-
+ drivers/iio/common/scmi_sensors/scmi_iio.c | 1 -
+ drivers/iio/dac/ad5766.c | 2 -
+ drivers/iio/dac/stm32-dac.c | 3 +-
+ drivers/iio/dummy/Kconfig | 1 +
+ drivers/iio/frequency/adf4350.c | 6 +-
+ drivers/iio/gyro/adis16136.c | 20 +-
+ drivers/iio/gyro/adis16260.c | 9 +-
+ drivers/iio/gyro/adxrs290.c | 2 +-
+ drivers/iio/gyro/bmg160_core.c | 17 +-
+ drivers/iio/gyro/fxas21002c_core.c | 13 +-
+ drivers/iio/gyro/hid-sensor-gyro-3d.c | 6 +-
+ drivers/iio/gyro/itg3200_buffer.c | 2 +-
+ drivers/iio/gyro/itg3200_core.c | 3 +-
+ drivers/iio/gyro/mpu3050-core.c | 4 +-
+ drivers/iio/gyro/st_gyro.h | 12 -
+ drivers/iio/gyro/st_gyro_core.c | 53 +-
+ drivers/iio/gyro/st_gyro_i2c.c | 17 +-
+ drivers/iio/gyro/st_gyro_spi.c | 17 +-
+ drivers/iio/health/afe4403.c | 2 +-
+ drivers/iio/health/afe4404.c | 2 +-
+ drivers/iio/humidity/am2315.c | 25 +-
+ drivers/iio/humidity/hdc2010.c | 1 -
+ drivers/iio/humidity/hid-sensor-humidity.c | 2 +
+ drivers/iio/imu/Kconfig | 1 +
+ drivers/iio/imu/Makefile | 1 +
+ drivers/iio/imu/adis.c | 4 -
+ drivers/iio/imu/adis16400.c | 27 +-
+ drivers/iio/imu/adis16460.c | 3 -
+ drivers/iio/imu/adis16475.c | 11 +-
+ drivers/iio/imu/adis16480.c | 166 +-
+ drivers/iio/imu/adis_buffer.c | 27 +-
+ drivers/iio/imu/adis_trigger.c | 3 +-
+ drivers/iio/imu/bmi160/bmi160_core.c | 6 +-
+ drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 2 +-
+ drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 27 +-
+ drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 8 +-
+ drivers/iio/imu/kmx61.c | 7 +-
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 8 +-
+ drivers/iio/imu/st_lsm9ds0/Kconfig | 28 +
+ drivers/iio/imu/st_lsm9ds0/Makefile | 5 +
+ drivers/iio/imu/st_lsm9ds0/st_lsm9ds0.h | 23 +
+ drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c | 163 ++
+ drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c | 84 +
+ drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 83 +
+ drivers/iio/industrialio-buffer.c | 13 +-
+ drivers/iio/industrialio-core.c | 126 +-
+ drivers/iio/industrialio-trigger.c | 37 +-
+ drivers/iio/industrialio-triggered-event.c | 2 +-
+ drivers/iio/inkern.c | 107 +-
+ drivers/iio/light/Kconfig | 11 +
+ drivers/iio/light/Makefile | 1 +
+ drivers/iio/light/acpi-als.c | 3 +-
+ drivers/iio/light/hid-sensor-als.c | 6 +-
+ drivers/iio/light/hid-sensor-prox.c | 6 +-
+ drivers/iio/light/isl29028.c | 5 +-
+ drivers/iio/light/isl29125.c | 10 +-
+ drivers/iio/light/ltr501.c | 25 +-
+ drivers/iio/light/pa12203001.c | 4 +-
+ drivers/iio/light/rpr0521.c | 9 +-
+ drivers/iio/light/si1133.c | 18 +-
+ drivers/iio/light/si1145.c | 12 +-
+ drivers/iio/light/tcs3414.c | 10 +-
+ drivers/iio/light/tcs3472.c | 16 +-
+ drivers/iio/light/tsl2583.c | 13 +-
+ drivers/iio/light/tsl2591.c | 1225 +++++++++++++++
+ drivers/iio/light/us5182d.c | 4 +-
+ drivers/iio/light/vcnl4000.c | 9 +-
+ drivers/iio/light/vcnl4035.c | 9 +-
+ drivers/iio/light/veml6030.c | 2 +-
+ drivers/iio/magnetometer/ak8974.c | 3 +-
+ drivers/iio/magnetometer/ak8975.c | 2 +-
+ drivers/iio/magnetometer/bmc150_magn.c | 26 +-
+ drivers/iio/magnetometer/hid-sensor-magn-3d.c | 7 +-
+ drivers/iio/magnetometer/hmc5843.h | 8 +-
+ drivers/iio/magnetometer/hmc5843_core.c | 7 +-
+ drivers/iio/magnetometer/rm3100-core.c | 5 +-
+ drivers/iio/magnetometer/st_magn.h | 4 -
+ drivers/iio/magnetometer/st_magn_core.c | 181 ++-
+ drivers/iio/magnetometer/st_magn_i2c.c | 14 +-
+ drivers/iio/magnetometer/st_magn_spi.c | 14 +-
+ drivers/iio/magnetometer/yamaha-yas530.c | 2 +-
+ drivers/iio/orientation/hid-sensor-incl-3d.c | 6 +-
+ drivers/iio/orientation/hid-sensor-rotation.c | 5 +-
+ .../iio/position/hid-sensor-custom-intel-hinge.c | 4 +-
+ drivers/iio/potentiostat/lmp91000.c | 7 +-
+ drivers/iio/pressure/hid-sensor-press.c | 6 +-
+ drivers/iio/pressure/icp10100.c | 5 +-
+ drivers/iio/pressure/st_pressure.h | 4 -
+ drivers/iio/pressure/st_pressure_core.c | 15 +-
+ drivers/iio/pressure/st_pressure_i2c.c | 17 +-
+ drivers/iio/pressure/st_pressure_spi.c | 17 +-
+ drivers/iio/pressure/zpa2326.c | 3 +-
+ drivers/iio/proximity/as3935.c | 13 +-
+ drivers/iio/proximity/isl29501.c | 2 +-
+ drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 14 +-
+ drivers/iio/proximity/srf04.c | 8 +-
+ drivers/iio/proximity/srf08.c | 14 +-
+ drivers/iio/proximity/sx9310.c | 2 +-
+ drivers/iio/proximity/sx9500.c | 2 +-
+ drivers/iio/temperature/Kconfig | 10 +
+ drivers/iio/temperature/Makefile | 1 +
+ drivers/iio/temperature/hid-sensor-temperature.c | 2 +
+ drivers/iio/temperature/mlx90614.c | 25 +-
+ drivers/iio/temperature/tmp117.c | 185 +++
+ drivers/iio/trigger/stm32-timer-trigger.c | 2 +-
+ drivers/rtc/rtc-hid-sensor-time.c | 1 +
+ drivers/staging/Kconfig | 2 -
+ drivers/staging/Makefile | 1 -
+ drivers/staging/android/ashmem.c | 3 +
+ drivers/staging/axis-fifo/axis-fifo.c | 18 +-
+ drivers/staging/emxx_udc/emxx_udc.c | 11 +-
+ drivers/staging/fbtft/TODO | 5 -
+ drivers/staging/fbtft/fb_agm1264k-fl.c | 30 +-
+ drivers/staging/fbtft/fb_bd663474.c | 4 -
+ drivers/staging/fbtft/fb_hx8347d.c | 29 +-
+ drivers/staging/fbtft/fb_ili9163.c | 4 -
+ drivers/staging/fbtft/fb_ili9320.c | 4 +-
+ drivers/staging/fbtft/fb_ili9325.c | 4 -
+ drivers/staging/fbtft/fb_ili9340.c | 1 -
+ drivers/staging/fbtft/fb_s6d1121.c | 4 -
+ drivers/staging/fbtft/fb_sh1106.c | 1 -
+ drivers/staging/fbtft/fb_ssd1289.c | 4 -
+ drivers/staging/fbtft/fb_ssd1325.c | 2 -
+ drivers/staging/fbtft/fb_ssd1331.c | 6 +-
+ drivers/staging/fbtft/fb_ssd1351.c | 1 -
+ drivers/staging/fbtft/fb_upd161704.c | 4 -
+ drivers/staging/fbtft/fb_watterott.c | 1 -
+ drivers/staging/fbtft/fbtft-bus.c | 3 +-
+ drivers/staging/fbtft/fbtft-core.c | 25 +-
+ drivers/staging/fbtft/fbtft-io.c | 12 +-
+ drivers/staging/fieldbus/anybuss/anybuss-client.h | 2 +-
+ drivers/staging/fieldbus/anybuss/hms-profinet.c | 3 +-
+ drivers/staging/fieldbus/anybuss/host.c | 8 +-
+ drivers/staging/fwserial/fwserial.c | 46 +-
+ drivers/staging/gdm724x/gdm_lte.c | 21 +-
+ drivers/staging/greybus/audio_topology.c | 4 +-
+ drivers/staging/greybus/gbphy.c | 4 +-
+ drivers/staging/greybus/spilib.c | 1 +
+ drivers/staging/gs_fpgaboot/README | 2 +-
+ drivers/staging/iio/accel/adis16203.c | 6 -
+ drivers/staging/iio/accel/adis16240.c | 6 -
+ drivers/staging/iio/addac/adt7316.c | 12 +-
+ drivers/staging/iio/cdc/ad7746.c | 114 +-
+ drivers/staging/iio/cdc/ad7746.h | 28 -
+ drivers/staging/iio/frequency/ad9834.c | 5 +-
+ drivers/staging/kpc2000/Kconfig | 59 -
+ drivers/staging/kpc2000/Makefile | 6 -
+ drivers/staging/kpc2000/TODO | 2 -
+ drivers/staging/kpc2000/kpc.h | 23 -
+ drivers/staging/kpc2000/kpc2000/Makefile | 4 -
+ drivers/staging/kpc2000/kpc2000/cell_probe.c | 548 -------
+ drivers/staging/kpc2000/kpc2000/core.c | 565 -------
+ drivers/staging/kpc2000/kpc2000/dma_common_defs.h | 23 -
+ drivers/staging/kpc2000/kpc2000/pcie.h | 90 --
+ drivers/staging/kpc2000/kpc2000/uapi.h | 22 -
+ drivers/staging/kpc2000/kpc2000_i2c.c | 731 ---------
+ drivers/staging/kpc2000/kpc2000_spi.c | 517 -------
+ drivers/staging/kpc2000/kpc_dma/Makefile | 6 -
+ drivers/staging/kpc2000/kpc_dma/dma.c | 270 ----
+ drivers/staging/kpc2000/kpc_dma/fileops.c | 363 -----
+ drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c | 249 ---
+ drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.h | 222 ---
+ drivers/staging/kpc2000/kpc_dma/uapi.h | 11 -
+ drivers/staging/ks7010/ks_hostif.c | 14 +-
+ drivers/staging/ks7010/ks_hostif.h | 24 +-
+ drivers/staging/most/dim2/dim2.c | 23 +-
+ drivers/staging/most/dim2/hal.c | 10 +-
+ drivers/staging/most/i2c/i2c.c | 12 +-
+ drivers/staging/most/net/net.c | 6 +-
+ drivers/staging/mt7621-dts/gbpc1.dts | 6 -
+ drivers/staging/mt7621-dts/mt7621.dtsi | 75 +-
+ drivers/staging/mt7621-pci/pci-mt7621.c | 328 ++--
+ drivers/staging/nvec/nvec.c | 7 +-
+ drivers/staging/octeon/ethernet-tx.c | 1 -
+ drivers/staging/qlge/qlge_ethtool.c | 2 +-
+ drivers/staging/qlge/qlge_main.c | 10 +-
+ drivers/staging/rtl8188eu/Makefile | 1 -
+ drivers/staging/rtl8188eu/core/rtw_ap.c | 144 +-
+ drivers/staging/rtl8188eu/core/rtw_cmd.c | 153 +-
+ drivers/staging/rtl8188eu/core/rtw_debug.c | 187 ---
+ drivers/staging/rtl8188eu/core/rtw_efuse.c | 26 +-
+ drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 40 +-
+ drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 18 +-
+ drivers/staging/rtl8188eu/core/rtw_led.c | 36 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme.c | 103 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 407 +----
+ drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 40 +-
+ drivers/staging/rtl8188eu/core/rtw_recv.c | 74 +-
+ drivers/staging/rtl8188eu/core/rtw_security.c | 12 +-
+ drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 38 +-
+ drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 84 +-
+ drivers/staging/rtl8188eu/core/rtw_xmit.c | 107 +-
+ .../staging/rtl8188eu/hal/hal8188e_rate_adaptive.c | 123 +-
+ drivers/staging/rtl8188eu/hal/hal_intf.c | 3 -
+ drivers/staging/rtl8188eu/hal/odm.c | 158 +-
+ drivers/staging/rtl8188eu/hal/odm_rtl8188e.c | 6 -
+ drivers/staging/rtl8188eu/hal/phy.c | 53 +-
+ drivers/staging/rtl8188eu/hal/pwrseqcmd.c | 4 +-
+ drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 57 +-
+ drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 2 -
+ drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 46 +-
+ drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 2 +-
+ drivers/staging/rtl8188eu/hal/rtl8188e_xmit.c | 32 -
+ drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 4 +-
+ drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 8 -
+ drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 19 +-
+ drivers/staging/rtl8188eu/hal/usb_halinit.c | 60 +-
+ drivers/staging/rtl8188eu/include/hal_intf.h | 1 -
+ drivers/staging/rtl8188eu/include/odm.h | 2 -
+ drivers/staging/rtl8188eu/include/odm_debug.h | 96 --
+ drivers/staging/rtl8188eu/include/odm_precomp.h | 4 -
+ drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 19 -
+ drivers/staging/rtl8188eu/include/rtl8188e_xmit.h | 3 -
+ drivers/staging/rtl8188eu/include/rtw_android.h | 1 -
+ drivers/staging/rtl8188eu/include/rtw_cmd.h | 5 +-
+ drivers/staging/rtl8188eu/include/rtw_debug.h | 49 -
+ drivers/staging/rtl8188eu/include/rtw_led.h | 2 +-
+ drivers/staging/rtl8188eu/include/rtw_mlme.h | 2 -
+ drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 1 -
+ drivers/staging/rtl8188eu/include/rtw_recv.h | 3 +-
+ drivers/staging/rtl8188eu/include/wifi.h | 36 -
+ drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 299 +---
+ drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 4 -
+ drivers/staging/rtl8188eu/os_dep/mon.c | 6 +-
+ drivers/staging/rtl8188eu/os_dep/os_intfs.c | 56 +-
+ drivers/staging/rtl8188eu/os_dep/rtw_android.c | 17 +-
+ drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 -
+ drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 130 +-
+ drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 16 +-
+ drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 5 -
+ drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 12 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 4 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 2 +-
+ drivers/staging/rtl8192e/rtl819x_HTProc.c | 10 +-
+ drivers/staging/rtl8192e/rtllib.h | 2 -
+ drivers/staging/rtl8192e/rtllib_rx.c | 3 +-
+ drivers/staging/rtl8192e/rtllib_softmac.c | 1 -
+ drivers/staging/rtl8192e/rtllib_tx.c | 2 +-
+ drivers/staging/rtl8192e/rtllib_wx.c | 4 -
+ drivers/staging/rtl8192u/ieee80211/ieee80211.h | 2 -
+ .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 25 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 2 +-
+ drivers/staging/rtl8192u/r8192U_core.c | 15 +-
+ drivers/staging/rtl8192u/r8192U_dm.c | 6 +-
+ drivers/staging/rtl8192u/r8192U_hw.h | 19 +-
+ drivers/staging/rtl8192u/r819xU_cmdpkt.c | 41 -
+ drivers/staging/rtl8192u/r819xU_phy.c | 48 +-
+ drivers/staging/rtl8712/hal_init.c | 3 +
+ drivers/staging/rtl8712/os_intfs.c | 4 -
+ drivers/staging/rtl8712/rtl8712_cmd.c | 2 +-
+ drivers/staging/rtl8712/rtl8712_recv.c | 5 +-
+ drivers/staging/rtl8712/rtl8712_xmit.c | 6 +-
+ drivers/staging/rtl8712/rtl871x_debug.h | 23 -
+ drivers/staging/rtl8712/rtl871x_mlme.c | 6 +-
+ drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 31 +-
+ drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 127 --
+ drivers/staging/rtl8712/rtl871x_recv.c | 2 +-
+ drivers/staging/rtl8712/rtl871x_security.c | 12 +-
+ drivers/staging/rtl8712/rtl871x_sta_mgt.c | 1 -
+ drivers/staging/rtl8712/rtl871x_xmit.c | 1 -
+ drivers/staging/rtl8712/usb_intf.c | 33 +-
+ drivers/staging/rtl8712/xmit_linux.c | 1 -
+ drivers/staging/rtl8723bs/Makefile | 2 -
+ drivers/staging/rtl8723bs/core/rtw_ap.c | 230 ++-
+ drivers/staging/rtl8723bs/core/rtw_cmd.c | 41 +-
+ drivers/staging/rtl8723bs/core/rtw_debug.c | 74 +-
+ drivers/staging/rtl8723bs/core/rtw_eeprom.c | 210 ---
+ drivers/staging/rtl8723bs/core/rtw_efuse.c | 14 +-
+ drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 6 +-
+ drivers/staging/rtl8723bs/core/rtw_io.c | 35 +-
+ drivers/staging/rtl8723bs/core/rtw_mlme.c | 93 +-
+ drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 112 +-
+ drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 -
+ drivers/staging/rtl8723bs/core/rtw_recv.c | 26 +-
+ drivers/staging/rtl8723bs/core/rtw_security.c | 672 +-------
+ drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 43 +-
+ drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 165 +-
+ drivers/staging/rtl8723bs/core/rtw_xmit.c | 63 +-
+ drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 955 ++----------
+ drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 514 +-----
+ drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 67 -
+ drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c | 62 -
+ drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c | 49 -
+ drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 63 -
+ drivers/staging/rtl8723bs/hal/HalPhyRf.c | 340 +---
+ drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 202 +--
+ drivers/staging/rtl8723bs/hal/hal_btcoex.c | 171 --
+ drivers/staging/rtl8723bs/hal/hal_com.c | 20 -
+ drivers/staging/rtl8723bs/hal/hal_intf.c | 3 -
+ drivers/staging/rtl8723bs/hal/odm.c | 53 +-
+ drivers/staging/rtl8723bs/hal/odm.h | 4 -
+ drivers/staging/rtl8723bs/hal/odm_CfoTracking.c | 107 --
+ drivers/staging/rtl8723bs/hal/odm_DIG.c | 320 ----
+ drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c | 18 -
+ drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 38 -
+ drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c | 36 +-
+ drivers/staging/rtl8723bs/hal/odm_PathDiv.c | 34 -
+ drivers/staging/rtl8723bs/hal/odm_PathDiv.h | 21 -
+ drivers/staging/rtl8723bs/hal/odm_RTL8723B.c | 1 -
+ drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c | 66 -
+ drivers/staging/rtl8723bs/hal/odm_debug.c | 44 -
+ drivers/staging/rtl8723bs/hal/odm_debug.h | 165 --
+ drivers/staging/rtl8723bs/hal/odm_precomp.h | 2 -
+ drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 21 +-
+ drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 24 +-
+ drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 26 +-
+ drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 2 +-
+ drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 9 +-
+ drivers/staging/rtl8723bs/hal/sdio_halinit.c | 30 +-
+ drivers/staging/rtl8723bs/hal/sdio_ops.c | 16 +-
+ drivers/staging/rtl8723bs/include/autoconf.h | 50 -
+ drivers/staging/rtl8723bs/include/drv_conf.h | 19 -
+ drivers/staging/rtl8723bs/include/drv_types.h | 2 -
+ drivers/staging/rtl8723bs/include/hal_btcoex.h | 4 +-
+ drivers/staging/rtl8723bs/include/hal_phy.h | 14 -
+ drivers/staging/rtl8723bs/include/osdep_intf.h | 2 +-
+ drivers/staging/rtl8723bs/include/rtl8723b_spec.h | 2 -
+ drivers/staging/rtl8723bs/include/rtw_ap.h | 2 +-
+ drivers/staging/rtl8723bs/include/rtw_debug.h | 170 +-
+ drivers/staging/rtl8723bs/include/rtw_io.h | 44 +-
+ drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 32 -
+ drivers/staging/rtl8723bs/include/rtw_mp.h | 1 -
+ drivers/staging/rtl8723bs/include/rtw_security.h | 104 +-
+ drivers/staging/rtl8723bs/include/rtw_xmit.h | 2 +-
+ drivers/staging/rtl8723bs/include/sdio_ops_linux.h | 2 -
+ drivers/staging/rtl8723bs/include/wifi.h | 2 +-
+ drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 28 +-
+ drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 55 +-
+ drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 4 -
+ drivers/staging/rtl8723bs/os_dep/os_intfs.c | 23 +-
+ drivers/staging/rtl8723bs/os_dep/osdep_service.c | 4 -
+ drivers/staging/rtl8723bs/os_dep/recv_linux.c | 2 -
+ drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 6 +-
+ drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c | 28 -
+ drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 10 +-
+ drivers/staging/rts5208/ms.c | 1 -
+ drivers/staging/sm750fb/sm750_accel.c | 4 +-
+ drivers/staging/unisys/visorhba/visorhba_main.c | 101 +-
+ drivers/staging/unisys/visorinput/visorinput.c | 1 -
+ drivers/staging/vc04_services/Makefile | 2 +-
+ .../include/linux/raspberrypi/vchiq.h | 2 +-
+ .../interface/vchiq_arm/vchiq_2835_arm.c | 27 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 307 ++--
+ .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 2 +-
+ .../interface/vchiq_arm/vchiq_connected.c | 2 +-
+ .../interface/vchiq_arm/vchiq_connected.h | 8 -
+ .../vc04_services/interface/vchiq_arm/vchiq_core.c | 1636 +++++++++++---------
+ .../vc04_services/interface/vchiq_arm/vchiq_core.h | 93 +-
+ .../interface/vchiq_arm/vchiq_debugfs.c | 6 +-
+ .../staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 2 +-
+ drivers/staging/vt6655/upc.h | 2 +-
+ drivers/staging/wlan-ng/cfg80211.c | 30 +-
+ drivers/staging/wlan-ng/p80211ioctl.h | 2 +-
+ drivers/staging/wlan-ng/p80211netdev.c | 6 +-
+ include/linux/i2c.h | 8 +-
+ include/linux/iio/adc/ad_sigma_delta.h | 4 +-
+ include/linux/iio/common/cros_ec_sensors_core.h | 2 +-
+ include/linux/iio/common/st_sensors.h | 36 +-
+ include/linux/iio/iio-opaque.h | 22 +-
+ include/linux/iio/iio.h | 32 +-
+ include/linux/iio/imu/adis.h | 2 +
+ include/linux/platform_data/st_sensors_pdata.h | 3 +-
+ 506 files changed, 12050 insertions(+), 15947 deletions(-)
+ create mode 100644 Documentation/ABI/obsolete/sysfs-bus-iio
+ delete mode 100644 Documentation/ABI/testing/sysfs-bus-counter-104-quad-8
+ delete mode 100644 Documentation/ABI/testing/sysfs-bus-counter-ftm-quaddec
+ delete mode 100644 Documentation/ABI/testing/sysfs-bus-iio-icm42600
+ create mode 100644 Documentation/devicetree/bindings/iio/accel/adi,adis16201.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/accel/bosch,bma220.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/accel/fsl,mma7455.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/accel/murata,sca3300.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/accel/nxp,fxls8962af.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7298.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7476.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,tsc2046.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/cdc/adi,ad7746.yaml
+ delete mode 100644 Documentation/devicetree/bindings/iio/dac/ad5755.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5755.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/dac/ti,dac082s085.yaml
+ delete mode 100644 Documentation/devicetree/bindings/iio/dac/ti-dac082s085.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/light/amstaos,tsl2591.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/temperature/ti,tmp117.yaml
+ create mode 100644 arch/mips/include/asm/mach-ralink/spaces.h
+ create mode 100644 drivers/counter/intel-qep.c
+ create mode 100644 drivers/iio/accel/fxls8962af-core.c
+ create mode 100644 drivers/iio/accel/fxls8962af-i2c.c
+ create mode 100644 drivers/iio/accel/fxls8962af-spi.c
+ create mode 100644 drivers/iio/accel/fxls8962af.h
+ create mode 100644 drivers/iio/accel/sca3300.c
+ create mode 100644 drivers/iio/adc/ti-tsc2046.c
+ create mode 100644 drivers/iio/chemical/sps30.h
+ create mode 100644 drivers/iio/chemical/sps30_i2c.c
+ create mode 100644 drivers/iio/chemical/sps30_serial.c
+ create mode 100644 drivers/iio/imu/st_lsm9ds0/Kconfig
+ create mode 100644 drivers/iio/imu/st_lsm9ds0/Makefile
+ create mode 100644 drivers/iio/imu/st_lsm9ds0/st_lsm9ds0.h
+ create mode 100644 drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c
+ create mode 100644 drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c
+ create mode 100644 drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c
+ create mode 100644 drivers/iio/light/tsl2591.c
+ create mode 100644 drivers/iio/temperature/tmp117.c
+ delete mode 100644 drivers/staging/iio/cdc/ad7746.h
+ delete mode 100644 drivers/staging/kpc2000/Kconfig
+ delete mode 100644 drivers/staging/kpc2000/Makefile
+ delete mode 100644 drivers/staging/kpc2000/TODO
+ delete mode 100644 drivers/staging/kpc2000/kpc.h
+ delete mode 100644 drivers/staging/kpc2000/kpc2000/Makefile
+ delete mode 100644 drivers/staging/kpc2000/kpc2000/cell_probe.c
+ delete mode 100644 drivers/staging/kpc2000/kpc2000/core.c
+ delete mode 100644 drivers/staging/kpc2000/kpc2000/dma_common_defs.h
+ delete mode 100644 drivers/staging/kpc2000/kpc2000/pcie.h
+ delete mode 100644 drivers/staging/kpc2000/kpc2000/uapi.h
+ delete mode 100644 drivers/staging/kpc2000/kpc2000_i2c.c
+ delete mode 100644 drivers/staging/kpc2000/kpc2000_spi.c
+ delete mode 100644 drivers/staging/kpc2000/kpc_dma/Makefile
+ delete mode 100644 drivers/staging/kpc2000/kpc_dma/dma.c
+ delete mode 100644 drivers/staging/kpc2000/kpc_dma/fileops.c
+ delete mode 100644 drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c
+ delete mode 100644 drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.h
+ delete mode 100644 drivers/staging/kpc2000/kpc_dma/uapi.h
+ delete mode 100644 drivers/staging/rtl8188eu/core/rtw_debug.c
+ delete mode 100644 drivers/staging/rtl8188eu/include/odm_debug.h
+ delete mode 100644 drivers/staging/rtl8723bs/core/rtw_eeprom.c
+ delete mode 100644 drivers/staging/rtl8723bs/hal/odm_PathDiv.c
+ delete mode 100644 drivers/staging/rtl8723bs/hal/odm_PathDiv.h
+ delete mode 100644 drivers/staging/rtl8723bs/hal/odm_debug.c
+ delete mode 100644 drivers/staging/rtl8723bs/hal/odm_debug.h
+ delete mode 100644 drivers/staging/rtl8723bs/include/autoconf.h
+ delete mode 100644 drivers/staging/rtl8723bs/include/drv_conf.h
+Merging iio/togreg (6cbb3aa0f9d5 staging: rtl8723bs: rtw_efuse: Fix coding style)
+$ git merge iio/togreg
+Already up to date.
+Merging mux/for-next (3516bd729358 Merge tag 's390-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
+$ git merge mux/for-next
+Already up to date.
+Merging icc/icc-next (46bdcac533cc interconnect: qcom: Add SC7280 interconnect provider driver)
+$ git merge icc/icc-next
+Already up to date.
+Merging dmaengine/next (656758425f98 dmaengine: altera-msgdma: add OF support)
+$ git merge dmaengine/next
+Auto-merging drivers/dma/xilinx/xilinx_dpdma.c
+Removing drivers/dma/sh/shdma-of.c
+Auto-merging drivers/dma/idxd/init.c
+Auto-merging drivers/dma/idxd/cdev.c
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/dma/renesas,shdma.txt
+Removing Documentation/devicetree/bindings/dma/arm-pl08x.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/dma/altr,msgdma.yaml | 61 +++++++++
+ .../devicetree/bindings/dma/arm-pl08x.txt | 59 ---------
+ .../devicetree/bindings/dma/arm-pl08x.yaml | 136 +++++++++++++++++++++
+ .../devicetree/bindings/dma/qcom,gpi.yaml | 1 +
+ .../devicetree/bindings/dma/renesas,shdma.txt | 84 -------------
+ MAINTAINERS | 8 ++
+ drivers/dma/altera-msgdma.c | 20 +++
+ drivers/dma/fsl-qdma.c | 6 +-
+ drivers/dma/hsu/hsu.c | 3 +
+ drivers/dma/idxd/cdev.c | 2 -
+ drivers/dma/idxd/init.c | 3 +-
+ drivers/dma/qcom/gpi.c | 1 +
+ drivers/dma/sf-pdma/sf-pdma.c | 5 +-
+ drivers/dma/sh/Makefile | 2 +-
+ drivers/dma/sh/shdma-of.c | 76 ------------
+ drivers/dma/sun4i-dma.c | 5 +-
+ drivers/dma/ti/omap-dma.c | 3 +-
+ drivers/dma/xilinx/xilinx_dpdma.c | 40 +++---
+ include/linux/dmaengine.h | 11 +-
+ 19 files changed, 276 insertions(+), 250 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dma/altr,msgdma.yaml
+ delete mode 100644 Documentation/devicetree/bindings/dma/arm-pl08x.txt
+ create mode 100644 Documentation/devicetree/bindings/dma/arm-pl08x.yaml
+ delete mode 100644 Documentation/devicetree/bindings/dma/renesas,shdma.txt
+ delete mode 100644 drivers/dma/sh/shdma-of.c
+Merging cgroup/for-next (cfeaa699186e Merge branch 'for-5.13-fixes' into for-next)
+$ git merge cgroup/for-next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging Documentation/admin-guide/cgroup-v2.rst
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/cgroup-v2.rst | 15 ++
+ Documentation/admin-guide/kernel-parameters.txt | 9 +-
+ include/linux/cgroup-defs.h | 4 +
+ include/linux/cgroup.h | 25 +-
+ kernel/cgroup/cgroup.c | 180 ++++++++++++--
+ kernel/cgroup/rstat.c | 2 +-
+ kernel/sched/psi.c | 30 +--
+ tools/testing/selftests/cgroup/.gitignore | 3 +-
+ tools/testing/selftests/cgroup/Makefile | 2 +
+ tools/testing/selftests/cgroup/cgroup_util.c | 51 ++++
+ tools/testing/selftests/cgroup/cgroup_util.h | 2 +
+ tools/testing/selftests/cgroup/test_freezer.c | 57 -----
+ tools/testing/selftests/cgroup/test_kill.c | 297 ++++++++++++++++++++++++
+ 13 files changed, 569 insertions(+), 108 deletions(-)
+ create mode 100644 tools/testing/selftests/cgroup/test_kill.c
+Merging scsi/for-next (5c1d996e5af6 Merge branch 'misc' into for-next)
+$ git merge scsi/for-next
+Auto-merging kernel/cgroup/cgroup.c
+Auto-merging include/linux/cgroup.h
+Auto-merging drivers/scsi/ufs/ufs-hisi.c
+Auto-merging drivers/scsi/sd.c
+Auto-merging drivers/scsi/lpfc/lpfc_init.c
+Auto-merging drivers/scsi/ibmvscsi/ibmvfc.c
+Auto-merging drivers/nvme/host/fc.c
+Auto-merging drivers/infiniband/ulp/srp/ib_srp.c
+Auto-merging block/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/ABI/testing/sysfs-driver-ufs
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-driver-ufs | 126 +
+ Documentation/scsi/scsi_mid_low_api.rst | 7 +-
+ MAINTAINERS | 9 +
+ block/Kconfig | 9 +
+ block/bsg-lib.c | 2 +-
+ block/bsg.c | 4 +-
+ block/scsi_ioctl.c | 13 +-
+ drivers/ata/libata-scsi.c | 30 +-
+ drivers/infiniband/ulp/iser/iscsi_iser.c | 2 +
+ drivers/infiniband/ulp/srp/ib_srp.c | 2 +-
+ drivers/message/fusion/mptbase.c | 2 -
+ drivers/message/fusion/mptsas.c | 119 +-
+ drivers/nvme/host/fc.c | 72 +-
+ drivers/s390/scsi/zfcp_scsi.c | 5 +-
+ drivers/scsi/3w-9xxx.c | 74 +-
+ drivers/scsi/3w-9xxx.h | 121 +-
+ drivers/scsi/3w-xxxx.c | 6 +-
+ drivers/scsi/53c700.c | 6 +-
+ drivers/scsi/FlashPoint.c | 197 +-
+ drivers/scsi/Kconfig | 18 +-
+ drivers/scsi/Makefile | 2 +
+ drivers/scsi/NCR5380.c | 10 +-
+ drivers/scsi/aacraid/aachba.c | 10 +-
+ drivers/scsi/aacraid/aacraid.h | 2 +-
+ drivers/scsi/advansys.c | 4 -
+ drivers/scsi/aha152x.c | 33 +-
+ drivers/scsi/aha1740.c | 7 +-
+ drivers/scsi/aic7xxx/aic79xx_osm.c | 19 +-
+ drivers/scsi/aic7xxx/aic7xxx_osm.c | 1 -
+ drivers/scsi/aic94xx/aic94xx_task.c | 2 +-
+ drivers/scsi/arcmsr/arcmsr.h | 2 +-
+ drivers/scsi/arcmsr/arcmsr_hba.c | 43 +-
+ drivers/scsi/arm/acornscsi.c | 46 +-
+ drivers/scsi/arm/fas216.c | 17 +-
+ drivers/scsi/be2iscsi/be_iscsi.c | 25 +-
+ drivers/scsi/be2iscsi/be_main.c | 7 +-
+ drivers/scsi/bfa/bfa_defs_svc.h | 2 +-
+ drivers/scsi/bfa/bfa_svc.c | 8 +-
+ drivers/scsi/bnx2i/bnx2i_iscsi.c | 32 +-
+ drivers/scsi/ch.c | 5 +-
+ drivers/scsi/constants.c | 17 +-
+ drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 1 +
+ drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 1 +
+ drivers/scsi/cxgbi/libcxgbi.c | 17 +-
+ drivers/scsi/cxlflash/superpipe.c | 3 +-
+ drivers/scsi/dc395x.c | 80 +-
+ drivers/scsi/device_handler/scsi_dh_alua.c | 81 +-
+ drivers/scsi/elx/Kconfig | 9 +
+ drivers/scsi/elx/Makefile | 18 +
+ drivers/scsi/elx/efct/efct_driver.c | 786 ++++
+ drivers/scsi/elx/efct/efct_driver.h | 109 +
+ drivers/scsi/elx/efct/efct_hw.c | 3581 ++++++++++++++++
+ drivers/scsi/elx/efct/efct_hw.h | 764 ++++
+ drivers/scsi/elx/efct/efct_hw_queues.c | 677 ++++
+ drivers/scsi/elx/efct/efct_io.c | 191 +
+ drivers/scsi/elx/efct/efct_io.h | 174 +
+ drivers/scsi/elx/efct/efct_lio.c | 1698 ++++++++
+ drivers/scsi/elx/efct/efct_lio.h | 189 +
+ drivers/scsi/elx/efct/efct_scsi.c | 1159 ++++++
+ drivers/scsi/elx/efct/efct_scsi.h | 203 +
+ drivers/scsi/elx/efct/efct_unsol.c | 492 +++
+ drivers/scsi/elx/efct/efct_unsol.h | 17 +
+ drivers/scsi/elx/efct/efct_xport.c | 1111 +++++
+ drivers/scsi/elx/efct/efct_xport.h | 186 +
+ drivers/scsi/elx/include/efc_common.h | 37 +
+ drivers/scsi/elx/libefc/efc.h | 52 +
+ drivers/scsi/elx/libefc/efc_cmds.c | 777 ++++
+ drivers/scsi/elx/libefc/efc_cmds.h | 35 +
+ drivers/scsi/elx/libefc/efc_device.c | 1603 ++++++++
+ drivers/scsi/elx/libefc/efc_device.h | 72 +
+ drivers/scsi/elx/libefc/efc_domain.c | 1088 +++++
+ drivers/scsi/elx/libefc/efc_domain.h | 54 +
+ drivers/scsi/elx/libefc/efc_els.c | 1098 +++++
+ drivers/scsi/elx/libefc/efc_els.h | 107 +
+ drivers/scsi/elx/libefc/efc_fabric.c | 1564 +++++++
+ drivers/scsi/elx/libefc/efc_fabric.h | 116 +
+ drivers/scsi/elx/libefc/efc_node.c | 1102 +++++
+ drivers/scsi/elx/libefc/efc_node.h | 191 +
+ drivers/scsi/elx/libefc/efc_nport.c | 777 ++++
+ drivers/scsi/elx/libefc/efc_nport.h | 50 +
+ drivers/scsi/elx/libefc/efc_sm.c | 54 +
+ drivers/scsi/elx/libefc/efc_sm.h | 197 +
+ drivers/scsi/elx/libefc/efclib.c | 81 +
+ drivers/scsi/elx/libefc/efclib.h | 620 +++
+ drivers/scsi/elx/libefc_sli/sli4.c | 5162 ++++++++++++++++++++++++
+ drivers/scsi/elx/libefc_sli/sli4.h | 4132 +++++++++++++++++++
+ drivers/scsi/esas2r/atioctl.h | 2 +-
+ drivers/scsi/esas2r/esas2r_main.c | 2 +-
+ drivers/scsi/esp_scsi.c | 4 +-
+ drivers/scsi/fcoe/fcoe.c | 6 +-
+ drivers/scsi/fdomain.c | 22 +-
+ drivers/scsi/hisi_sas/hisi_sas.h | 7 +-
+ drivers/scsi/hisi_sas/hisi_sas_main.c | 99 +-
+ drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 20 +-
+ drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 10 +-
+ drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 10 +-
+ drivers/scsi/hosts.c | 13 +-
+ drivers/scsi/hptiop.c | 2 +-
+ drivers/scsi/ibmvscsi/ibmvfc.c | 60 +-
+ drivers/scsi/ibmvscsi/ibmvfc.h | 3 +-
+ drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +-
+ drivers/scsi/imm.c | 15 +-
+ drivers/scsi/ips.c | 10 +-
+ drivers/scsi/isci/request.c | 10 +-
+ drivers/scsi/isci/task.c | 6 +-
+ drivers/scsi/iscsi_tcp.c | 7 +
+ drivers/scsi/libfc/fc_encode.h | 256 +-
+ drivers/scsi/libfc/fc_lport.c | 88 +-
+ drivers/scsi/libiscsi.c | 234 +-
+ drivers/scsi/libsas/sas_ata.c | 7 +-
+ drivers/scsi/libsas/sas_expander.c | 2 +-
+ drivers/scsi/libsas/sas_task.c | 4 +-
+ drivers/scsi/lpfc/lpfc.h | 124 +
+ drivers/scsi/lpfc/lpfc_attr.c | 59 +
+ drivers/scsi/lpfc/lpfc_crtn.h | 12 +
+ drivers/scsi/lpfc/lpfc_ct.c | 298 +-
+ drivers/scsi/lpfc/lpfc_debugfs.c | 11 +-
+ drivers/scsi/lpfc/lpfc_disc.h | 2 +
+ drivers/scsi/lpfc/lpfc_els.c | 665 ++-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 229 +-
+ drivers/scsi/lpfc/lpfc_hw.h | 124 +-
+ drivers/scsi/lpfc/lpfc_hw4.h | 12 +
+ drivers/scsi/lpfc/lpfc_init.c | 109 +-
+ drivers/scsi/lpfc/lpfc_mbox.c | 9 +-
+ drivers/scsi/lpfc/lpfc_nportdisc.c | 40 +-
+ drivers/scsi/lpfc/lpfc_nvme.c | 14 +-
+ drivers/scsi/lpfc/lpfc_scsi.c | 416 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 66 +-
+ drivers/scsi/lpfc/lpfc_sli.h | 11 +-
+ drivers/scsi/lpfc/lpfc_version.h | 2 +-
+ drivers/scsi/megaraid.c | 20 +-
+ drivers/scsi/megaraid/megaraid_mbox.c | 27 +-
+ drivers/scsi/megaraid/megaraid_sas.h | 16 +-
+ drivers/scsi/megaraid/megaraid_sas_base.c | 102 +-
+ drivers/scsi/megaraid/megaraid_sas_fp.c | 6 +-
+ drivers/scsi/megaraid/megaraid_sas_fusion.c | 21 +-
+ drivers/scsi/mesh.c | 9 +-
+ drivers/scsi/mpi3mr/Kconfig | 7 +
+ drivers/scsi/mpi3mr/Makefile | 4 +
+ drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h | 1880 +++++++++
+ drivers/scsi/mpi3mr/mpi/mpi30_image.h | 216 +
+ drivers/scsi/mpi3mr/mpi/mpi30_init.h | 159 +
+ drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 1004 +++++
+ drivers/scsi/mpi3mr/mpi/mpi30_sas.h | 33 +
+ drivers/scsi/mpi3mr/mpi/mpi30_transport.h | 463 +++
+ drivers/scsi/mpi3mr/mpi3mr.h | 901 +++++
+ drivers/scsi/mpi3mr/mpi3mr_debug.h | 60 +
+ drivers/scsi/mpi3mr/mpi3mr_fw.c | 3958 ++++++++++++++++++
+ drivers/scsi/mpi3mr/mpi3mr_os.c | 4045 +++++++++++++++++++
+ drivers/scsi/mpt3sas/mpt3sas_base.c | 349 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.h | 8 +
+ drivers/scsi/mpt3sas/mpt3sas_config.c | 18 +-
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 193 +-
+ drivers/scsi/mvsas/mv_sas.c | 10 +-
+ drivers/scsi/mvumi.c | 10 +-
+ drivers/scsi/myrb.c | 64 +-
+ drivers/scsi/myrs.c | 9 +-
+ drivers/scsi/nsp32.c | 419 +-
+ drivers/scsi/pcmcia/nsp_cs.c | 2 +-
+ drivers/scsi/pm8001/pm8001_hwi.c | 16 +-
+ drivers/scsi/pm8001/pm8001_sas.c | 10 +-
+ drivers/scsi/pm8001/pm80xx_hwi.c | 14 +-
+ drivers/scsi/pmcraid.h | 4 +-
+ drivers/scsi/ppa.c | 14 +-
+ drivers/scsi/ps3rom.c | 7 +-
+ drivers/scsi/qedf/qedf_dbg.c | 3 +-
+ drivers/scsi/qedf/qedf_io.c | 5 -
+ drivers/scsi/qedf/qedf_main.c | 9 +-
+ drivers/scsi/qedi/qedi.h | 1 +
+ drivers/scsi/qedi/qedi_fw.c | 291 +-
+ drivers/scsi/qedi/qedi_gbl.h | 4 +-
+ drivers/scsi/qedi/qedi_iscsi.c | 105 +-
+ drivers/scsi/qedi/qedi_iscsi.h | 5 +-
+ drivers/scsi/qedi/qedi_main.c | 9 +-
+ drivers/scsi/qla2xxx/qla_gbl.h | 4 -
+ drivers/scsi/qla2xxx/qla_init.c | 2 -
+ drivers/scsi/qla2xxx/qla_isr.c | 15 +-
+ drivers/scsi/qla2xxx/qla_nvme.c | 2 +-
+ drivers/scsi/qla2xxx/qla_target.c | 3 +-
+ drivers/scsi/qla4xxx/ql4_83xx.c | 3 +-
+ drivers/scsi/qla4xxx/ql4_os.c | 4 +-
+ drivers/scsi/qlogicfas408.c | 138 +-
+ drivers/scsi/scsi.c | 11 +-
+ drivers/scsi/scsi_debug.c | 20 +-
+ drivers/scsi/scsi_error.c | 70 +-
+ drivers/scsi/scsi_ioctl.c | 7 +-
+ drivers/scsi/scsi_lib.c | 119 +-
+ drivers/scsi/scsi_logging.c | 10 +-
+ drivers/scsi/scsi_scan.c | 6 +-
+ drivers/scsi/scsi_transport_fc.c | 2 +-
+ drivers/scsi/scsi_transport_iscsi.c | 499 ++-
+ drivers/scsi/scsi_transport_sas.c | 9 +-
+ drivers/scsi/scsi_transport_spi.c | 2 +-
+ drivers/scsi/sd.c | 63 +-
+ drivers/scsi/sd_zbc.c | 3 +-
+ drivers/scsi/sg.c | 9 +-
+ drivers/scsi/smartpqi/smartpqi_init.c | 3 +-
+ drivers/scsi/snic/snic_ctl.c | 5 +-
+ drivers/scsi/sr.c | 4 +-
+ drivers/scsi/sr_ioctl.c | 6 +-
+ drivers/scsi/st.c | 8 +-
+ drivers/scsi/stex.c | 9 +-
+ drivers/scsi/storvsc_drv.c | 119 +-
+ drivers/scsi/sym53c8xx_2/sym_glue.c | 6 +-
+ drivers/scsi/ufs/Kconfig | 1 +
+ drivers/scsi/ufs/cdns-pltfrm.c | 2 +
+ drivers/scsi/ufs/tc-dwc-g210-pci.c | 2 +
+ drivers/scsi/ufs/ufs-debugfs.c | 6 +-
+ drivers/scsi/ufs/ufs-debugfs.h | 2 +-
+ drivers/scsi/ufs/ufs-exynos.c | 31 +-
+ drivers/scsi/ufs/ufs-exynos.h | 26 -
+ drivers/scsi/ufs/ufs-hisi.c | 4 +-
+ drivers/scsi/ufs/ufs-mediatek.c | 45 +-
+ drivers/scsi/ufs/ufs-qcom.c | 2 +
+ drivers/scsi/ufs/ufs-sysfs.c | 269 +-
+ drivers/scsi/ufs/ufs_bsg.c | 6 +-
+ drivers/scsi/ufs/ufshcd-pci.c | 36 +-
+ drivers/scsi/ufs/ufshcd.c | 1163 ++++--
+ drivers/scsi/ufs/ufshcd.h | 82 +-
+ drivers/scsi/ufs/ufshci.h | 1 +
+ drivers/scsi/virtio_scsi.c | 5 +-
+ drivers/scsi/vmw_pvscsi.c | 6 -
+ drivers/scsi/wd33c93.c | 43 +-
+ drivers/scsi/xen-scsifront.c | 8 +-
+ drivers/target/iscsi/cxgbit/cxgbit_ddp.c | 19 +-
+ drivers/target/iscsi/cxgbit/cxgbit_target.c | 21 +-
+ drivers/target/iscsi/iscsi_target_erl1.c | 2 -
+ drivers/target/iscsi/iscsi_target_nego.c | 11 +-
+ drivers/target/iscsi/iscsi_target_parameters.c | 4 +-
+ drivers/target/loopback/tcm_loop.c | 1 -
+ drivers/target/sbp/sbp_target.c | 1 -
+ drivers/target/target_core_alua.c | 6 +-
+ drivers/target/target_core_configfs.c | 50 +
+ drivers/target/target_core_device.c | 5 +
+ drivers/target/target_core_iblock.c | 2 +-
+ drivers/target/target_core_pr.c | 8 +-
+ drivers/target/target_core_pr.h | 2 +-
+ drivers/target/target_core_pscsi.c | 2 +-
+ drivers/target/target_core_sbc.c | 10 +-
+ drivers/target/target_core_spc.c | 97 +-
+ drivers/target/target_core_user.c | 10 +-
+ drivers/target/target_core_xcopy.c | 19 +-
+ drivers/usb/storage/cypress_atacb.c | 4 +-
+ drivers/xen/xen-scsiback.c | 17 +-
+ include/linux/blk-cgroup.h | 63 +
+ include/linux/cgroup.h | 6 +
+ include/scsi/fc/fc_ms.h | 59 +-
+ include/scsi/iscsi_proto.h | 2 +-
+ include/scsi/libfc.h | 6 +-
+ include/scsi/libiscsi.h | 20 +-
+ include/scsi/libsas.h | 12 +-
+ include/scsi/scsi.h | 159 +-
+ include/scsi/scsi_bsg_iscsi.h | 2 +-
+ include/scsi/scsi_cmnd.h | 38 +-
+ include/scsi/scsi_host.h | 2 +-
+ include/scsi/scsi_proto.h | 58 +-
+ include/scsi/scsi_status.h | 74 +
+ include/scsi/scsi_transport_fc.h | 25 +-
+ include/scsi/scsi_transport_iscsi.h | 14 +-
+ include/scsi/sg.h | 35 +-
+ include/target/target_core_base.h | 1 +
+ include/trace/events/scsi.h | 48 +-
+ include/trace/events/ufs.h | 20 +
+ kernel/cgroup/cgroup.c | 26 +
+ 264 files changed, 50071 insertions(+), 3039 deletions(-)
+ create mode 100644 drivers/scsi/elx/Kconfig
+ create mode 100644 drivers/scsi/elx/Makefile
+ create mode 100644 drivers/scsi/elx/efct/efct_driver.c
+ create mode 100644 drivers/scsi/elx/efct/efct_driver.h
+ create mode 100644 drivers/scsi/elx/efct/efct_hw.c
+ create mode 100644 drivers/scsi/elx/efct/efct_hw.h
+ create mode 100644 drivers/scsi/elx/efct/efct_hw_queues.c
+ create mode 100644 drivers/scsi/elx/efct/efct_io.c
+ create mode 100644 drivers/scsi/elx/efct/efct_io.h
+ create mode 100644 drivers/scsi/elx/efct/efct_lio.c
+ create mode 100644 drivers/scsi/elx/efct/efct_lio.h
+ create mode 100644 drivers/scsi/elx/efct/efct_scsi.c
+ create mode 100644 drivers/scsi/elx/efct/efct_scsi.h
+ create mode 100644 drivers/scsi/elx/efct/efct_unsol.c
+ create mode 100644 drivers/scsi/elx/efct/efct_unsol.h
+ create mode 100644 drivers/scsi/elx/efct/efct_xport.c
+ create mode 100644 drivers/scsi/elx/efct/efct_xport.h
+ create mode 100644 drivers/scsi/elx/include/efc_common.h
+ create mode 100644 drivers/scsi/elx/libefc/efc.h
+ create mode 100644 drivers/scsi/elx/libefc/efc_cmds.c
+ create mode 100644 drivers/scsi/elx/libefc/efc_cmds.h
+ create mode 100644 drivers/scsi/elx/libefc/efc_device.c
+ create mode 100644 drivers/scsi/elx/libefc/efc_device.h
+ create mode 100644 drivers/scsi/elx/libefc/efc_domain.c
+ create mode 100644 drivers/scsi/elx/libefc/efc_domain.h
+ create mode 100644 drivers/scsi/elx/libefc/efc_els.c
+ create mode 100644 drivers/scsi/elx/libefc/efc_els.h
+ create mode 100644 drivers/scsi/elx/libefc/efc_fabric.c
+ create mode 100644 drivers/scsi/elx/libefc/efc_fabric.h
+ create mode 100644 drivers/scsi/elx/libefc/efc_node.c
+ create mode 100644 drivers/scsi/elx/libefc/efc_node.h
+ create mode 100644 drivers/scsi/elx/libefc/efc_nport.c
+ create mode 100644 drivers/scsi/elx/libefc/efc_nport.h
+ create mode 100644 drivers/scsi/elx/libefc/efc_sm.c
+ create mode 100644 drivers/scsi/elx/libefc/efc_sm.h
+ create mode 100644 drivers/scsi/elx/libefc/efclib.c
+ create mode 100644 drivers/scsi/elx/libefc/efclib.h
+ create mode 100644 drivers/scsi/elx/libefc_sli/sli4.c
+ create mode 100644 drivers/scsi/elx/libefc_sli/sli4.h
+ create mode 100644 drivers/scsi/mpi3mr/Kconfig
+ create mode 100644 drivers/scsi/mpi3mr/Makefile
+ create mode 100644 drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h
+ create mode 100644 drivers/scsi/mpi3mr/mpi/mpi30_image.h
+ create mode 100644 drivers/scsi/mpi3mr/mpi/mpi30_init.h
+ create mode 100644 drivers/scsi/mpi3mr/mpi/mpi30_ioc.h
+ create mode 100644 drivers/scsi/mpi3mr/mpi/mpi30_sas.h
+ create mode 100644 drivers/scsi/mpi3mr/mpi/mpi30_transport.h
+ create mode 100644 drivers/scsi/mpi3mr/mpi3mr.h
+ create mode 100644 drivers/scsi/mpi3mr/mpi3mr_debug.h
+ create mode 100644 drivers/scsi/mpi3mr/mpi3mr_fw.c
+ create mode 100644 drivers/scsi/mpi3mr/mpi3mr_os.c
+ create mode 100644 include/scsi/scsi_status.h
+Merging scsi-mkp/for-next (2506f5dcb828 scsi: mvsas: Use DEVICE_ATTR_RO()/RW() macro)
+$ git merge scsi-mkp/for-next
+Auto-merging drivers/scsi/ufs/ufshcd.c
+Auto-merging drivers/scsi/pm8001/pm8001_init.c
+Auto-merging drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+Auto-merging drivers/scsi/bnx2fc/bnx2fc_io.c
+Merge made by the 'recursive' strategy.
+ drivers/message/fusion/mptfc.c | 35 +++++------
+ drivers/scsi/aic7xxx/aic7xxx_core.c | 2 +-
+ drivers/scsi/aic94xx/aic94xx_init.c | 1 +
+ drivers/scsi/be2iscsi/be_main.c | 103 +++++++++++++--------------------
+ drivers/scsi/bnx2fc/bnx2fc_io.c | 2 +-
+ drivers/scsi/elx/efct/efct_lio.c | 8 +--
+ drivers/scsi/elx/libefc_sli/sli4.c | 2 -
+ drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 1 +
+ drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 1 +
+ drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 1 +
+ drivers/scsi/isci/init.c | 1 +
+ drivers/scsi/libsas/sas_scsi_host.c | 9 +++
+ drivers/scsi/megaraid/megaraid_mbox.c | 18 +++---
+ drivers/scsi/mvsas/mv_init.c | 27 ++++-----
+ drivers/scsi/pm8001/pm8001_init.c | 1 +
+ drivers/scsi/qedf/qedf_attr.c | 14 ++---
+ drivers/scsi/qedi/qedi_sysfs.c | 14 ++---
+ drivers/scsi/qla2xxx/qla_def.h | 4 ++
+ drivers/scsi/qla2xxx/qla_gbl.h | 1 +
+ drivers/scsi/qla2xxx/qla_init.c | 6 +-
+ drivers/scsi/qla2xxx/qla_iocb.c | 4 ++
+ drivers/scsi/qla2xxx/qla_isr.c | 4 ++
+ drivers/scsi/qla2xxx/qla_mbx.c | 27 +++++++++
+ drivers/scsi/qla2xxx/qla_nvme.c | 4 ++
+ drivers/scsi/qla2xxx/qla_os.c | 68 ++++++++++++++++++++++
+ drivers/scsi/scsi_lib.c | 12 ----
+ drivers/scsi/scsi_priv.h | 1 -
+ drivers/scsi/scsi_scan.c | 12 ++--
+ drivers/scsi/ufs/ufshcd.c | 4 ++
+ drivers/scsi/virtio_scsi.c | 3 +-
+ 30 files changed, 239 insertions(+), 151 deletions(-)
+Merging vhost/linux-next (7ff6e99e021c virtio_net: disable cb aggressively)
+$ git merge vhost/linux-next
+Auto-merging drivers/net/virtio_net.c
+Merge made by the 'recursive' strategy.
+ drivers/net/virtio_net.c | 35 +++++++++++++++++++++++++++++------
+ drivers/virtio/virtio_ring.c | 26 +++++++++++++++++++++++++-
+ 2 files changed, 54 insertions(+), 7 deletions(-)
+Merging rpmsg/for-next (f3dbc1aa6b49 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
+$ git merge rpmsg/for-next
+Auto-merging drivers/remoteproc/remoteproc_core.c
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/remoteproc/qcom,adsp.txt
+Merge made by the 'recursive' strategy.
+ .../hwlock/allwinner,sun6i-a31-hwspinlock.yaml | 48 ++
+ .../bindings/remoteproc/fsl,imx-rproc.yaml | 12 +-
+ .../devicetree/bindings/remoteproc/qcom,adsp.txt | 228 ---------
+ .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 536 +++++++++++++++++++++
+ .../bindings/remoteproc/ti,pru-rproc.yaml | 5 +
+ MAINTAINERS | 6 +
+ drivers/hwspinlock/Kconfig | 9 +
+ drivers/hwspinlock/Makefile | 1 +
+ drivers/hwspinlock/sun6i_hwspinlock.c | 210 ++++++++
+ drivers/remoteproc/Kconfig | 1 +
+ drivers/remoteproc/imx_rproc.c | 209 ++++++--
+ drivers/remoteproc/pru_rproc.c | 3 +
+ drivers/remoteproc/qcom_q6v5.c | 2 +-
+ drivers/remoteproc/qcom_wcnss.c | 5 +-
+ drivers/remoteproc/remoteproc_cdev.c | 2 +-
+ drivers/remoteproc/remoteproc_core.c | 72 ++-
+ drivers/remoteproc/remoteproc_elf_loader.c | 12 +-
+ drivers/remoteproc/remoteproc_virtio.c | 6 +-
+ drivers/remoteproc/stm32_rproc.c | 16 +-
+ drivers/remoteproc/ti_k3_r5_remoteproc.c | 151 ++++--
+ drivers/soc/qcom/smem_state.c | 36 ++
+ include/linux/remoteproc.h | 50 +-
+ include/linux/soc/qcom/smem_state.h | 8 +
+ 23 files changed, 1269 insertions(+), 359 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/hwlock/allwinner,sun6i-a31-hwspinlock.yaml
+ delete mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,adsp.txt
+ create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml
+ create mode 100644 drivers/hwspinlock/sun6i_hwspinlock.c
+Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file)
+$ git merge gpio/for-next
+Already up to date.
+Merging gpio-brgl/gpio/for-next (45ca16072b70 dt-bindings: gpio: zynq: convert bindings to YAML)
+$ git merge gpio-brgl/gpio/for-next
+Auto-merging lib/bitmap.c
+Auto-merging drivers/gpio/gpio-xilinx.c
+Auto-merging drivers/gpio/gpio-tegra186.c
+Auto-merging drivers/gpio/Kconfig
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/gpio/rockchip,rk3328-grf-gpio.txt
+Removing Documentation/devicetree/bindings/gpio/gpio-zynq.txt
+Removing Documentation/devicetree/bindings/gpio/gpio-omap.txt
+CONFLICT (modify/delete): Documentation/devicetree/bindings/gpio/gpio-davinci.txt deleted in gpio-brgl/gpio/for-next and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/gpio/gpio-davinci.txt left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f Documentation/devicetree/bindings/gpio/gpio-davinci.txt
+rm 'Documentation/devicetree/bindings/gpio/gpio-davinci.txt'
+$ git commit --no-edit -v -a
+[master fa63648bbc70] Merge remote-tracking branch 'gpio-brgl/gpio/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/gpio/gpio-davinci.txt | 167 ---------
+ .../devicetree/bindings/gpio/gpio-davinci.yaml | 185 ++++++++++
+ .../devicetree/bindings/gpio/gpio-omap.txt | 45 ---
+ .../devicetree/bindings/gpio/gpio-zynq.txt | 36 --
+ .../devicetree/bindings/gpio/gpio-zynq.yaml | 59 ++++
+ .../devicetree/bindings/gpio/idt,32434-gpio.yaml | 67 ++++
+ .../bindings/gpio/rockchip,rk3328-grf-gpio.txt | 32 --
+ .../bindings/gpio/rockchip,rk3328-grf-gpio.yaml | 50 +++
+ .../devicetree/bindings/gpio/ti,omap-gpio.yaml | 108 ++++++
+ MAINTAINERS | 4 +-
+ drivers/gpio/Kconfig | 12 +
+ drivers/gpio/Makefile | 1 +
+ drivers/gpio/gpio-104-idio-16.c | 23 +-
+ drivers/gpio/gpio-adp5520.c | 18 +-
+ drivers/gpio/gpio-altera-a10sr.c | 11 +-
+ drivers/gpio/gpio-ath79.c | 9 +-
+ drivers/gpio/gpio-bd9571mwv.c | 11 +-
+ drivers/gpio/gpio-da9052.c | 11 +-
+ drivers/gpio/gpio-da9055.c | 11 +-
+ drivers/gpio/gpio-dwapb.c | 23 +-
+ drivers/gpio/gpio-idt3243x.c | 206 +++++++++++
+ drivers/gpio/gpio-logicvc.c | 4 +-
+ drivers/gpio/gpio-mockup.c | 9 +-
+ drivers/gpio/gpio-pca953x.c | 1 +
+ drivers/gpio/gpio-regmap.c | 32 +-
+ drivers/gpio/gpio-spear-spics.c | 12 +-
+ drivers/gpio/gpio-sprd.c | 10 +-
+ drivers/gpio/gpio-sta2x11.c | 10 +-
+ drivers/gpio/gpio-stmpe.c | 32 +-
+ drivers/gpio/gpio-tc3589x.c | 11 +-
+ drivers/gpio/gpio-tegra186.c | 14 +-
+ drivers/gpio/gpio-tps65218.c | 13 +-
+ drivers/gpio/gpio-tps6586x.c | 13 +-
+ drivers/gpio/gpio-tps65910.c | 12 +-
+ drivers/gpio/gpio-tps65912.c | 12 +-
+ drivers/gpio/gpio-tps68470.c | 12 +-
+ drivers/gpio/gpio-visconti.c | 10 +-
+ drivers/gpio/gpio-wm831x.c | 12 +-
+ drivers/gpio/gpio-wm8350.c | 12 +-
+ drivers/gpio/gpio-wm8994.c | 13 +-
+ drivers/gpio/gpio-xgene.c | 11 +-
+ drivers/gpio/gpio-xilinx.c | 391 +++++++++++----------
+ drivers/gpio/gpio-zynq.c | 32 +-
+ drivers/gpio/gpiolib-sysfs.c | 34 +-
+ drivers/gpio/gpiolib.c | 59 ++--
+ include/linux/gpio/regmap.h | 6 +-
+ lib/bitmap.c | 5 +-
+ 47 files changed, 1039 insertions(+), 832 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-davinci.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-davinci.yaml
+ delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-omap.txt
+ delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-zynq.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-zynq.yaml
+ create mode 100644 Documentation/devicetree/bindings/gpio/idt,32434-gpio.yaml
+ delete mode 100644 Documentation/devicetree/bindings/gpio/rockchip,rk3328-grf-gpio.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/rockchip,rk3328-grf-gpio.yaml
+ create mode 100644 Documentation/devicetree/bindings/gpio/ti,omap-gpio.yaml
+ create mode 100644 drivers/gpio/gpio-idt3243x.c
+Merging gpio-intel/for-next (043d7f09bf61 gpiolib: acpi: Add acpi_gpio_get_io_resource())
+$ git merge gpio-intel/for-next
+Already up to date.
+Merging pinctrl/for-next (18a332087fa9 Merge branch 'devel' into for-next)
+$ git merge pinctrl/for-next
+Auto-merging include/linux/pinctrl/pinconf-generic.h
+CONFLICT (content): Merge conflict in include/linux/pinctrl/pinconf-generic.h
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/pinctrl/brcm,bcm4708-pinmux.txt
+Resolved 'include/linux/pinctrl/pinconf-generic.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 762b0ddbb692] Merge remote-tracking branch 'pinctrl/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/pinctrl/apple,pinctrl.yaml | 106 ++
+ .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 10 +-
+ .../bindings/pinctrl/brcm,bcm4708-pinmux.txt | 55 -
+ .../bindings/pinctrl/brcm,ns-pinmux.yaml | 94 ++
+ .../bindings/pinctrl/pinctrl-mcp23s08.txt | 2 +
+ .../devicetree/bindings/pinctrl/pinctrl-mt65xx.txt | 1 +
+ .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 2 +
+ .../devicetree/bindings/pinctrl/qcom,pmic-mpp.txt | 1 +
+ .../bindings/pinctrl/qcom,sm6125-pinctrl.yaml | 132 ++
+ Documentation/driver-api/pin-control.rst | 2 +-
+ MAINTAINERS | 2 +
+ arch/mips/include/asm/mach-ralink/mt7620.h | 53 +-
+ arch/mips/include/asm/mach-ralink/rt288x.h | 9 -
+ arch/mips/include/asm/mach-ralink/rt305x.h | 24 -
+ arch/mips/include/asm/mach-ralink/rt3883.h | 34 -
+ arch/mips/ralink/mt7620.c | 320 -----
+ arch/mips/ralink/mt7621.c | 88 --
+ arch/mips/ralink/prom.c | 1 -
+ arch/mips/ralink/rt288x.c | 21 -
+ arch/mips/ralink/rt305x.c | 77 -
+ arch/mips/ralink/rt3883.c | 45 -
+ drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 24 +-
+ drivers/pinctrl/aspeed/pinmux-aspeed.h | 9 +
+ drivers/pinctrl/bcm/pinctrl-bcm2835.c | 8 +-
+ drivers/pinctrl/bcm/pinctrl-bcm6318.c | 4 +-
+ drivers/pinctrl/bcm/pinctrl-bcm63268.c | 4 +-
+ drivers/pinctrl/bcm/pinctrl-bcm6328.c | 4 +-
+ drivers/pinctrl/bcm/pinctrl-bcm6358.c | 4 +-
+ drivers/pinctrl/bcm/pinctrl-bcm6362.c | 4 +-
+ drivers/pinctrl/bcm/pinctrl-bcm6368.c | 4 +-
+ drivers/pinctrl/bcm/pinctrl-bcm63xx.h | 4 +-
+ drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 4 +-
+ drivers/pinctrl/intel/pinctrl-tigerlake.c | 1 +
+ drivers/pinctrl/mediatek/Kconfig | 7 +
+ drivers/pinctrl/mediatek/Makefile | 1 +
+ drivers/pinctrl/mediatek/pinctrl-mt2701.c | 3 +
+ drivers/pinctrl/mediatek/pinctrl-mt2712.c | 3 +
+ drivers/pinctrl/mediatek/pinctrl-mt6397.c | 3 +
+ drivers/pinctrl/mediatek/pinctrl-mt8127.c | 3 +
+ drivers/pinctrl/mediatek/pinctrl-mt8135.c | 3 +
+ drivers/pinctrl/mediatek/pinctrl-mt8167.c | 3 +
+ drivers/pinctrl/mediatek/pinctrl-mt8173.c | 3 +
+ drivers/pinctrl/mediatek/pinctrl-mt8365.c | 502 +++++++
+ drivers/pinctrl/mediatek/pinctrl-mt8516.c | 3 +
+ drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 21 +-
+ drivers/pinctrl/mediatek/pinctrl-mtk-common.h | 3 +
+ drivers/pinctrl/mediatek/pinctrl-mtk-mt8365.h | 1511 ++++++++++++++++++++
+ drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 4 +-
+ drivers/pinctrl/pinctrl-amd.c | 33 +-
+ drivers/pinctrl/pinctrl-at91.c | 14 +-
+ drivers/pinctrl/pinctrl-equilibrium.c | 1 +
+ drivers/pinctrl/pinctrl-mcp23s08.c | 13 +-
+ drivers/pinctrl/pinctrl-mcp23s08.h | 1 +
+ drivers/pinctrl/pinctrl-microchip-sgpio.c | 4 +-
+ drivers/pinctrl/pinctrl-ocelot.c | 4 +-
+ drivers/pinctrl/pinctrl-single.c | 5 +-
+ drivers/pinctrl/qcom/Kconfig | 9 +
+ drivers/pinctrl/qcom/Makefile | 1 +
+ drivers/pinctrl/qcom/pinctrl-sm6125.c | 1277 +++++++++++++++++
+ drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 1 +
+ drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 1 +
+ drivers/pinctrl/ralink/Kconfig | 25 +
+ drivers/pinctrl/ralink/Makefile | 6 +
+ drivers/pinctrl/ralink/pinctrl-mt7620.c | 390 +++++
+ drivers/pinctrl/ralink/pinctrl-mt7621.c | 116 ++
+ drivers/pinctrl/ralink/pinctrl-rt2880.c | 30 +-
+ drivers/pinctrl/ralink/pinctrl-rt288x.c | 60 +
+ drivers/pinctrl/ralink/pinctrl-rt305x.c | 136 ++
+ drivers/pinctrl/ralink/pinctrl-rt3883.c | 107 ++
+ .../pinctrl/ralink}/pinmux.h | 3 +-
+ drivers/pinctrl/renesas/pfc-r8a77470.c | 346 ++++-
+ drivers/pinctrl/renesas/pfc-r8a7778.c | 3 -
+ drivers/pinctrl/renesas/pfc-r8a7790.c | 301 +++-
+ drivers/pinctrl/renesas/pfc-r8a7792.c | 533 ++++++-
+ drivers/pinctrl/renesas/pfc-r8a7794.c | 360 ++++-
+ drivers/pinctrl/renesas/pfc-r8a77951.c | 4 +-
+ drivers/pinctrl/renesas/pfc-r8a7796.c | 10 +-
+ drivers/pinctrl/renesas/pfc-r8a77965.c | 79 +-
+ drivers/pinctrl/renesas/pfc-r8a77970.c | 175 ++-
+ drivers/pinctrl/renesas/pfc-r8a77980.c | 209 ++-
+ drivers/pinctrl/renesas/pfc-r8a77990.c | 16 +-
+ drivers/pinctrl/stm32/pinctrl-stm32.c | 9 +-
+ include/dt-bindings/pinctrl/apple.h | 13 +
+ include/dt-bindings/pinctrl/mt8365-pinfunc.h | 858 +++++++++++
+ include/linux/pinctrl/pinconf-generic.h | 20 +-
+ 85 files changed, 7445 insertions(+), 954 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
+ delete mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm4708-pinmux.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,ns-pinmux.yaml
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm6125-pinctrl.yaml
+ create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt8365.c
+ create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt8365.h
+ create mode 100644 drivers/pinctrl/qcom/pinctrl-sm6125.c
+ create mode 100644 drivers/pinctrl/ralink/pinctrl-mt7620.c
+ create mode 100644 drivers/pinctrl/ralink/pinctrl-mt7621.c
+ create mode 100644 drivers/pinctrl/ralink/pinctrl-rt288x.c
+ create mode 100644 drivers/pinctrl/ralink/pinctrl-rt305x.c
+ create mode 100644 drivers/pinctrl/ralink/pinctrl-rt3883.c
+ rename {arch/mips/include/asm/mach-ralink => drivers/pinctrl/ralink}/pinmux.h (91%)
+ create mode 100644 include/dt-bindings/pinctrl/apple.h
+ create mode 100644 include/dt-bindings/pinctrl/mt8365-pinfunc.h
+Merging pinctrl-intel/for-next (258435a1c818 pinctrl: tigerlake: Add Alder Lake-M ACPI ID)
+$ git merge pinctrl-intel/for-next
+Already up to date.
+Merging pinctrl-renesas/renesas-pinctrl (c3975a73ca94 pinctrl: renesas: r8a77980: Add bias pinconf support)
+$ git merge pinctrl-renesas/renesas-pinctrl
+Already up to date.
+Merging pinctrl-samsung/for-next (6efb943b8616 Linux 5.13-rc1)
+$ git merge pinctrl-samsung/for-next
+Already up to date.
+Merging pwm/for-next (d233504af7db dt-bindings: pwm: pwm-tiehrpwm: Add compatible string for AM64 SoC)
+$ git merge pwm/for-next
+Removing Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/pwm/pwm-tiehrpwm.txt | 50 ------
+ .../devicetree/bindings/pwm/pwm-tiehrpwm.yaml | 65 +++++++
+ Documentation/driver-api/pwm.rst | 4 +
+ drivers/pwm/core.c | 50 ++----
+ drivers/pwm/pwm-atmel-hlcdc.c | 2 -
+ drivers/pwm/pwm-atmel-tcb.c | 2 -
+ drivers/pwm/pwm-atmel.c | 2 -
+ drivers/pwm/pwm-bcm-iproc.c | 2 -
+ drivers/pwm/pwm-bcm-kona.c | 2 -
+ drivers/pwm/pwm-bcm2835.c | 2 -
+ drivers/pwm/pwm-berlin.c | 2 -
+ drivers/pwm/pwm-fsl-ftm.c | 2 -
+ drivers/pwm/pwm-hibvt.c | 2 -
+ drivers/pwm/pwm-imx-tpm.c | 2 -
+ drivers/pwm/pwm-imx27.c | 3 -
+ drivers/pwm/pwm-jz4740.c | 2 -
+ drivers/pwm/pwm-lpc18xx-sct.c | 2 -
+ drivers/pwm/pwm-meson.c | 2 -
+ drivers/pwm/pwm-mxs.c | 2 -
+ drivers/pwm/pwm-omap-dmtimer.c | 2 -
+ drivers/pwm/pwm-pca9685.c | 198 +++++++++++++++++----
+ drivers/pwm/pwm-renesas-tpu.c | 2 -
+ drivers/pwm/pwm-rockchip.c | 5 -
+ drivers/pwm/pwm-samsung.c | 3 -
+ drivers/pwm/pwm-sifive.c | 2 -
+ drivers/pwm/pwm-spear.c | 40 ++++-
+ drivers/pwm/pwm-stm32-lp.c | 2 -
+ drivers/pwm/pwm-stm32.c | 2 -
+ drivers/pwm/pwm-sun4i.c | 2 -
+ drivers/pwm/pwm-tiecap.c | 2 -
+ drivers/pwm/pwm-tiehrpwm.c | 2 -
+ drivers/pwm/pwm-visconti.c | 17 +-
+ drivers/pwm/pwm-vt8500.c | 2 -
+ include/linux/pwm.h | 7 +
+ 34 files changed, 292 insertions(+), 196 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt
+ create mode 100644 Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.yaml
+Merging userns/for-next (5e6b8a50a7ce cred: add missing return error code when set_cred_ucounts() failed)
+$ git merge userns/for-next
+Auto-merging tools/testing/selftests/Makefile
+Auto-merging mm/shmem.c
+Auto-merging mm/mmap.c
+Auto-merging mm/mlock.c
+Auto-merging kernel/user_namespace.c
+Auto-merging kernel/ucount.c
+CONFLICT (content): Merge conflict in kernel/ucount.c
+Auto-merging kernel/sys.c
+Auto-merging kernel/signal.c
+CONFLICT (content): Merge conflict in kernel/signal.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/exit.c
+Auto-merging kernel/cred.c
+Auto-merging ipc/mqueue.c
+Auto-merging include/linux/user_namespace.h
+CONFLICT (content): Merge conflict in include/linux/user_namespace.h
+Auto-merging include/linux/sched/user.h
+CONFLICT (content): Merge conflict in include/linux/sched/user.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/hugetlb.h
+Auto-merging include/linux/cred.h
+Auto-merging fs/proc/array.c
+Auto-merging fs/hugetlbfs/inode.c
+Auto-merging fs/exec.c
+Resolved 'include/linux/sched/user.h' using previous resolution.
+Resolved 'include/linux/user_namespace.h' using previous resolution.
+Resolved 'kernel/signal.c' using previous resolution.
+Resolved 'kernel/ucount.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master e31a39e210f8] Merge remote-tracking branch 'userns/for-next'
+$ git diff -M --stat --summary HEAD^..
+ fs/exec.c | 6 +-
+ fs/hugetlbfs/inode.c | 16 +-
+ fs/proc/array.c | 2 +-
+ include/linux/cred.h | 4 +
+ include/linux/hugetlb.h | 4 +-
+ include/linux/mm.h | 4 +-
+ include/linux/sched/user.h | 7 -
+ include/linux/shmem_fs.h | 2 +-
+ include/linux/signal_types.h | 4 +-
+ include/linux/user_namespace.h | 31 +++-
+ ipc/mqueue.c | 40 ++---
+ ipc/shm.c | 26 ++--
+ kernel/cred.c | 51 ++++++-
+ kernel/exit.c | 2 +-
+ kernel/fork.c | 18 ++-
+ kernel/signal.c | 25 ++--
+ kernel/sys.c | 14 +-
+ kernel/ucount.c | 116 +++++++++++----
+ kernel/user.c | 3 -
+ kernel/user_namespace.c | 9 +-
+ mm/memfd.c | 4 +-
+ mm/mlock.c | 22 ++-
+ mm/mmap.c | 4 +-
+ mm/shmem.c | 10 +-
+ tools/testing/selftests/Makefile | 1 +
+ tools/testing/selftests/rlimits/.gitignore | 2 +
+ tools/testing/selftests/rlimits/Makefile | 6 +
+ tools/testing/selftests/rlimits/config | 1 +
+ .../testing/selftests/rlimits/rlimits-per-userns.c | 161 +++++++++++++++++++++
+ 29 files changed, 468 insertions(+), 127 deletions(-)
+ create mode 100644 tools/testing/selftests/rlimits/.gitignore
+ create mode 100644 tools/testing/selftests/rlimits/Makefile
+ create mode 100644 tools/testing/selftests/rlimits/config
+ create mode 100644 tools/testing/selftests/rlimits/rlimits-per-userns.c
+Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email)
+$ git merge ktest/for-next
+Already up to date.
+Merging kselftest/next (4896df9d53ae selftests/sgx: remove checks for file execute permissions)
+$ git merge kselftest/next
+Auto-merging tools/testing/selftests/net/tls.c
+Merge made by the 'recursive' strategy.
+ .../selftests/ftrace/test.d/event/event-no-pid.tc | 7 +
+ tools/testing/selftests/lib.mk | 1 +
+ tools/testing/selftests/net/tls.c | 3 +-
+ tools/testing/selftests/resctrl/README | 2 +-
+ tools/testing/selftests/resctrl/resctrl_tests.c | 4 +-
+ tools/testing/selftests/sgx/call.S | 6 +-
+ tools/testing/selftests/sgx/defines.h | 10 +
+ tools/testing/selftests/sgx/load.c | 19 +-
+ tools/testing/selftests/sgx/main.c | 239 +++++++++++++--------
+ tools/testing/selftests/sgx/main.h | 4 +-
+ tools/testing/selftests/sgx/test_encl.c | 19 +-
+ tools/testing/selftests/sgx/test_encl.lds | 3 +-
+ .../testing/selftests/splice/short_splice_read.sh | 119 ++++++++--
+ tools/testing/selftests/timers/rtcpie.c | 10 +-
+ 14 files changed, 308 insertions(+), 138 deletions(-)
+Merging livepatching/for-next (c150bbbb1731 Merge branch 'for-5.13/signal' into for-next)
+$ git merge livepatching/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging coresight/next (1efbcec2ef8c coresight: cti: Reduce scope for the variable “cs_fwnode” in cti_plat_create_connection())
+$ git merge coresight/next
+Merge made by the 'recursive' strategy.
+Merging rtc/rtc-next (94af1e732abe rtc: pcf8563: Fix the datasheet URL)
+$ git merge rtc/rtc-next
+Removing Documentation/devicetree/bindings/rtc/ti,bq32k.txt
+Removing Documentation/devicetree/bindings/rtc/faraday,ftrtc010.txt
+Removing Documentation/devicetree/bindings/rtc/epson,rx8900.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/rtc/epson,rx8900.txt | 22 --
+ .../devicetree/bindings/rtc/epson,rx8900.yaml | 49 ++++
+ .../devicetree/bindings/rtc/faraday,ftrtc010.txt | 28 --
+ .../devicetree/bindings/rtc/faraday,ftrtc010.yaml | 59 ++++
+ .../devicetree/bindings/rtc/rtc-m41t80.txt | 9 +
+ .../devicetree/bindings/rtc/ti,bq32000.yaml | 49 ++++
+ Documentation/devicetree/bindings/rtc/ti,bq32k.txt | 18 --
+ drivers/rtc/Kconfig | 6 +-
+ drivers/rtc/proc.c | 4 +-
+ drivers/rtc/rtc-bd70528.c | 316 +--------------------
+ drivers/rtc/rtc-efi.c | 1 -
+ drivers/rtc/rtc-imxdi.c | 4 +
+ drivers/rtc/rtc-m41t80.c | 32 ++-
+ drivers/rtc/rtc-max77686.c | 4 +-
+ drivers/rtc/rtc-mxc_v2.c | 1 +
+ drivers/rtc/rtc-pcf2127.c | 2 +-
+ drivers/rtc/rtc-pcf85063.c | 4 +-
+ drivers/rtc/rtc-pcf8563.c | 2 +-
+ drivers/rtc/rtc-stm32.c | 6 +-
+ drivers/rtc/rtc-v3020.c | 2 +-
+ drivers/rtc/sysfs.c | 2 +-
+ 21 files changed, 219 insertions(+), 401 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/rtc/epson,rx8900.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/epson,rx8900.yaml
+ delete mode 100644 Documentation/devicetree/bindings/rtc/faraday,ftrtc010.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml
+ create mode 100644 Documentation/devicetree/bindings/rtc/ti,bq32000.yaml
+ delete mode 100644 Documentation/devicetree/bindings/rtc/ti,bq32k.txt
+Merging nvdimm/libnvdimm-for-next (30c10d32152d Merge branch 'for-5.12/cxl' into libnvdimm-for-next)
+$ git merge nvdimm/libnvdimm-for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging at24/at24/for-next (6efb943b8616 Linux 5.13-rc1)
+$ git merge at24/at24/for-next
+Already up to date.
+Merging ntb/ntb-next (28293b6c68cd ntb: ntb_pingpong: remove redundant initialization of variables msg_data and spad_data)
+$ git merge ntb/ntb-next
+Merge made by the 'recursive' strategy.
+ drivers/ntb/test/ntb_msi_test.c | 4 +++-
+ drivers/ntb/test/ntb_perf.c | 1 +
+ drivers/ntb/test/ntb_pingpong.c | 2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+Merging seccomp/for-next/seccomp (fe092fc9f14b selftests/seccomp: Flush benchmark output)
+$ git merge seccomp/for-next/seccomp
+Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c
+Auto-merging kernel/seccomp.c
+CONFLICT (content): Merge conflict in kernel/seccomp.c
+Resolved 'kernel/seccomp.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 69733ec86855] Merge remote-tracking branch 'seccomp/for-next/seccomp'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/userspace-api/seccomp_filter.rst | 12 +++++
+ include/uapi/linux/seccomp.h | 1 +
+ kernel/seccomp.c | 51 +++++++++++++++++++---
+ .../testing/selftests/seccomp/seccomp_benchmark.c | 2 +
+ tools/testing/selftests/seccomp/seccomp_bpf.c | 51 ++++++++++++++++++++--
+ 5 files changed, 107 insertions(+), 10 deletions(-)
+Merging kspp/for-next/kspp (a0dc429c3e36 Merge branch 'for-next/clang/features' into for-next/kspp)
+$ git merge kspp/for-next/kspp
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/compiler.h
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/arm64/include/asm/memory.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 12 ++++++++++++
+ arch/arm64/include/asm/compiler.h | 16 ++++++++++++++++
+ arch/arm64/include/asm/memory.h | 16 ----------------
+ arch/x86/Kconfig | 4 ++--
+ include/linux/compiler.h | 10 ++++++++++
+ include/linux/mm.h | 10 ----------
+ 6 files changed, 40 insertions(+), 28 deletions(-)
+Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
+$ git merge cisco/for-next
+Already up to date.
+Merging gnss/gnss-next (994adcbd3714 gnss: drop stray semicolons)
+$ git merge gnss/gnss-next
+Merge made by the 'recursive' strategy.
+ drivers/gnss/mtk.c | 2 +-
+ drivers/gnss/serial.c | 2 +-
+ drivers/gnss/sirf.c | 2 +-
+ drivers/gnss/ubx.c | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+Merging fsi/next (9ab1428dfe2c fsi/sbefifo: Fix reset timeout)
+$ git merge fsi/next
+Already up to date.
+Merging slimbus/for-next (0320ed0a8236 drivers: slimbus: Fix word resposible -> responsible in slimbus.h)
+$ git merge slimbus/for-next
+Auto-merging drivers/of/platform.c
+Auto-merging drivers/nvmem/Makefile
+CONFLICT (content): Merge conflict in drivers/nvmem/Makefile
+Auto-merging drivers/nvmem/Kconfig
+CONFLICT (content): Merge conflict in drivers/nvmem/Kconfig
+Resolved 'drivers/nvmem/Kconfig' using previous resolution.
+Resolved 'drivers/nvmem/Makefile' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 3a3c8d4c7a95] Merge remote-tracking branch 'slimbus/for-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/slimbus/slimbus.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging nvmem/for-next (76a2b9a8ab44 nvmem: qfprom: Improve the comment about regulator setting)
+$ git merge nvmem/for-next
+Auto-merging drivers/nvmem/sprd-efuse.c
+Auto-merging drivers/nvmem/core.c
+Merge made by the 'recursive' strategy.
+ drivers/nvmem/qcom-spmi-sdam.c | 1 +
+ drivers/nvmem/sc27xx-efuse.c | 1 +
+ drivers/nvmem/sprd-efuse.c | 1 +
+ 3 files changed, 3 insertions(+)
+Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from idr_find_test_1)
+$ git merge xarray/main
+Already up to date.
+Merging hyperv/hyperv-next (7d815f4afa87 PCI: hv: Add check for hyperv_initialized in init_hv_pci_drv())
+$ git merge hyperv/hyperv-next
+Auto-merging drivers/scsi/storvsc_drv.c
+Auto-merging drivers/pci/controller/pci-hyperv.c
+Auto-merging drivers/net/hyperv/rndis_filter.c
+Auto-merging drivers/net/hyperv/hyperv_net.h
+Auto-merging drivers/Makefile
+Auto-merging arch/x86/kernel/cpu/mshyperv.c
+Auto-merging arch/x86/hyperv/hv_init.c
+CONFLICT (content): Merge conflict in arch/x86/hyperv/hv_init.c
+Resolved 'arch/x86/hyperv/hv_init.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master e89c47633d0b] Merge remote-tracking branch 'hyperv/hyperv-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/x86/hyperv/hv_init.c | 47 ----------------
+ arch/x86/kernel/cpu/mshyperv.c | 2 +-
+ drivers/Makefile | 2 +-
+ drivers/hv/Makefile | 3 ++
+ drivers/hv/channel.c | 23 ++++----
+ drivers/hv/connection.c | 4 +-
+ drivers/hv/hv_balloon.c | 1 -
+ drivers/hv/hv_common.c | 66 +++++++++++++++++++++++
+ drivers/hv/hv_fcopy.c | 1 +
+ drivers/hv/hv_kvp.c | 1 +
+ drivers/hv/hv_util.c | 4 +-
+ drivers/hv/hyperv_vmbus.h | 2 +-
+ drivers/hv/ring_buffer.c | 95 ++++++++++++++++++++++++++------
+ drivers/net/hyperv/hyperv_net.h | 7 +++
+ drivers/net/hyperv/netvsc.c | 10 ++--
+ drivers/net/hyperv/rndis_filter.c | 4 ++
+ drivers/pci/controller/pci-hyperv.c | 3 ++
+ drivers/scsi/storvsc_drv.c | 104 +++++++++++++++++++++++++-----------
+ include/linux/hyperv.h | 61 +++++++++++++++++----
+ net/vmw_vsock/hyperv_transport.c | 4 +-
+ 20 files changed, 317 insertions(+), 127 deletions(-)
+ create mode 100644 drivers/hv/hv_common.c
+$ git am -3 ../patches/0001-x86-move-of-part-of-Fix-leftover-comment-typos.patch
+Applying: x86: move of part of "Fix leftover comment typos"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/hv/hv_common.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 11a25dae08d9] Merge remote-tracking branch 'hyperv/hyperv-next'
+ Date: Thu Jun 24 18:16:11 2021 +1000
+Merging auxdisplay/auxdisplay (c784e46c8445 auxdisplay: Add I2C gpio expander example)
+$ git merge auxdisplay/auxdisplay
+Merge made by the 'recursive' strategy.
+ .../bindings/auxdisplay/hit,hd44780.yaml | 31 +++++++++++++++++++++-
+ 1 file changed, 30 insertions(+), 1 deletion(-)
+Merging kgdb/kgdb/for-next (c8daba4640ac kgdb: Fix fall-through warning for Clang)
+$ git merge kgdb/kgdb/for-next
+Auto-merging kernel/debug/kdb/kdb_main.c
+Merge made by the 'recursive' strategy.
+ include/linux/kgdb.h | 8 ++++----
+ kernel/debug/debug_core.c | 3 ++-
+ kernel/debug/kdb/kdb_main.c | 8 ++++----
+ kernel/debug/kdb/kdb_private.h | 2 +-
+ 4 files changed, 11 insertions(+), 10 deletions(-)
+Merging hmm/hmm (fe07bfda2fb9 Linux 5.12-rc1)
+$ git merge hmm/hmm
+Already up to date.
+Merging fpga/for-next (92c5ddbc93ab fpga: fpga-bridge: removed repeated word)
+$ git merge fpga/for-next
+Auto-merging include/linux/fpga/fpga-mgr.h
+Auto-merging drivers/fpga/fpga-bridge.c
+Auto-merging Documentation/fpga/dfl.rst
+Merge made by the 'recursive' strategy.
+ Documentation/driver-api/fpga/fpga-bridge.rst | 10 +++++-----
+ Documentation/driver-api/fpga/fpga-mgr.rst | 12 ++++++------
+ Documentation/driver-api/fpga/fpga-programming.rst | 8 ++++----
+ Documentation/driver-api/fpga/fpga-region.rst | 20 ++++++++++----------
+ Documentation/fpga/dfl.rst | 4 ++--
+ drivers/fpga/altera-cvp.c | 2 +-
+ drivers/fpga/dfl-fme-pr.c | 2 +-
+ drivers/fpga/dfl-n3000-nios.c | 2 +-
+ drivers/fpga/dfl.h | 2 +-
+ drivers/fpga/fpga-bridge.c | 8 ++++----
+ drivers/fpga/zynq-fpga.c | 6 +++---
+ include/linux/fpga/fpga-mgr.h | 2 +-
+ 12 files changed, 39 insertions(+), 39 deletions(-)
+Merging kunit/test (d07f6ca923ea Linux 5.13-rc2)
+$ git merge kunit/test
+Already up to date.
+Merging cfi/cfi/next (6efb943b8616 Linux 5.13-rc1)
+$ git merge cfi/cfi/next
+Already up to date.
+Merging kunit-next/kunit (d07f6ca923ea Linux 5.13-rc2)
+$ git merge kunit-next/kunit
+Already up to date.
+Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
+$ git merge trivial/for-next
+Already up to date.
+Merging mhi/mhi-next (c0da39de3274 bus: mhi: pci_generic: Add Cinterion MV31-W PCIe to MHI)
+$ git merge mhi/mhi-next
+Auto-merging drivers/net/mhi/net.c
+Auto-merging drivers/bus/mhi/pci_generic.c
+Merge made by the 'recursive' strategy.
+ drivers/bus/mhi/core/init.c | 3 +-
+ drivers/bus/mhi/core/internal.h | 2 +-
+ drivers/bus/mhi/core/main.c | 35 +++++++++++++++------
+ drivers/bus/mhi/core/pm.c | 19 ++++--------
+ drivers/bus/mhi/pci_generic.c | 67 +++++++++++++++++++++++++++++++++++-----
+ drivers/net/mhi/net.c | 2 +-
+ drivers/net/wwan/mhi_wwan_ctrl.c | 2 +-
+ include/linux/mhi.h | 14 +++++++--
+ net/qrtr/mhi.c | 2 +-
+ 9 files changed, 107 insertions(+), 39 deletions(-)
+Merging memblock/for-next (990e6d0e1de8 arm: extend pfn_valid to take into accound freed memory map alignment)
+$ git merge memblock/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/mm/init.c | 13 ++++++++++++-
+ mm/memblock.c | 23 ++++++++++++-----------
+ 2 files changed, 24 insertions(+), 12 deletions(-)
+Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy)
+$ git merge init/init-user-pointers
+Already up to date.
+Merging counters/counters (e71ba9452f0b Linux 5.11-rc2)
+$ git merge counters/counters
+Already up to date.
+Merging rust/rust-next (fef0214731cc rust: allow printing in the kernel crate)
+$ git merge rust/rust-next
+Auto-merging tools/lib/perf/include/perf/event.h
+Auto-merging scripts/kconfig/confdata.c
+Auto-merging scripts/Makefile.lib
+Auto-merging scripts/Makefile.build
+Auto-merging samples/Makefile
+Auto-merging samples/Kconfig
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/printk/printk.c
+CONFLICT (content): Merge conflict in kernel/printk/printk.c
+Auto-merging kernel/kallsyms.c
+Auto-merging init/Kconfig
+Auto-merging include/uapi/linux/android/binder.h
+CONFLICT (content): Merge conflict in include/uapi/linux/android/binder.h
+Auto-merging Makefile
+CONFLICT (content): Merge conflict in Makefile
+Auto-merging MAINTAINERS
+Auto-merging Documentation/process/changes.rst
+Auto-merging Documentation/index.rst
+Auto-merging .gitignore
+Resolved 'Makefile' using previous resolution.
+Resolved 'include/uapi/linux/android/binder.h' using previous resolution.
+Resolved 'kernel/printk/printk.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 7011bb2d121d] Merge remote-tracking branch 'rust/rust-next'
+$ git diff -M --stat --summary HEAD^..
+ .gitignore | 5 +
+ .rustfmt.toml | 12 +
+ Documentation/doc-guide/kernel-doc.rst | 3 +
+ Documentation/index.rst | 1 +
+ Documentation/kbuild/kbuild.rst | 4 +
+ Documentation/process/changes.rst | 9 +
+ Documentation/rust/arch-support.rst | 32 ++
+ Documentation/rust/coding.rst | 92 ++++
+ Documentation/rust/docs.rst | 109 ++++
+ Documentation/rust/index.rst | 20 +
+ Documentation/rust/quick-start.rst | 220 ++++++++
+ Documentation/rust/rust-project.json | 35 ++
+ MAINTAINERS | 14 +
+ Makefile | 147 ++++-
+ arch/arm/rust/target.json | 28 +
+ arch/arm64/rust/target.json | 40 ++
+ arch/powerpc/rust/target.json | 30 ++
+ arch/x86/rust/target.json | 42 ++
+ drivers/android/Kconfig | 7 +
+ drivers/android/Makefile | 2 +
+ drivers/android/allocation.rs | 252 +++++++++
+ drivers/android/context.rs | 80 +++
+ drivers/android/defs.rs | 92 ++++
+ drivers/android/node.rs | 479 +++++++++++++++++
+ drivers/android/process.rs | 950 +++++++++++++++++++++++++++++++++
+ drivers/android/range_alloc.rs | 191 +++++++
+ drivers/android/rust_binder.rs | 128 +++++
+ drivers/android/thread.rs | 821 ++++++++++++++++++++++++++++
+ drivers/android/transaction.rs | 206 +++++++
+ include/linux/kallsyms.h | 2 +-
+ include/linux/spinlock.h | 17 +-
+ include/uapi/linux/android/binder.h | 28 +-
+ init/Kconfig | 27 +
+ kernel/kallsyms.c | 7 +
+ kernel/livepatch/core.c | 4 +-
+ kernel/printk/printk.c | 1 +
+ lib/Kconfig.debug | 106 ++++
+ rust/.gitignore | 5 +
+ rust/Makefile | 152 ++++++
+ rust/compiler_builtins.rs | 156 ++++++
+ rust/exports.c | 16 +
+ rust/helpers.c | 94 ++++
+ rust/kernel/allocator.rs | 68 +++
+ rust/kernel/bindings.rs | 22 +
+ rust/kernel/bindings_helper.h | 18 +
+ rust/kernel/buffer.rs | 39 ++
+ rust/kernel/c_types.rs | 133 +++++
+ rust/kernel/chrdev.rs | 162 ++++++
+ rust/kernel/error.rs | 106 ++++
+ rust/kernel/file_operations.rs | 674 +++++++++++++++++++++++
+ rust/kernel/lib.rs | 204 +++++++
+ rust/kernel/linked_list.rs | 245 +++++++++
+ rust/kernel/miscdev.rs | 109 ++++
+ rust/kernel/module_param.rs | 497 +++++++++++++++++
+ rust/kernel/pages.rs | 173 ++++++
+ rust/kernel/prelude.rs | 22 +
+ rust/kernel/print.rs | 463 ++++++++++++++++
+ rust/kernel/random.rs | 50 ++
+ rust/kernel/raw_list.rs | 361 +++++++++++++
+ rust/kernel/static_assert.rs | 38 ++
+ rust/kernel/sync/arc.rs | 184 +++++++
+ rust/kernel/sync/condvar.rs | 136 +++++
+ rust/kernel/sync/guard.rs | 82 +++
+ rust/kernel/sync/locked_by.rs | 112 ++++
+ rust/kernel/sync/mod.rs | 85 +++
+ rust/kernel/sync/mutex.rs | 101 ++++
+ rust/kernel/sync/spinlock.rs | 108 ++++
+ rust/kernel/sysctl.rs | 185 +++++++
+ rust/kernel/types.rs | 73 +++
+ rust/kernel/user_ptr.rs | 282 ++++++++++
+ rust/module.rs | 764 ++++++++++++++++++++++++++
+ samples/Kconfig | 2 +
+ samples/Makefile | 1 +
+ samples/rust/Kconfig | 113 ++++
+ samples/rust/Makefile | 12 +
+ samples/rust/rust_chrdev.rs | 55 ++
+ samples/rust/rust_minimal.rs | 40 ++
+ samples/rust/rust_miscdev.rs | 145 +++++
+ samples/rust/rust_module_parameters.rs | 72 +++
+ samples/rust/rust_print.rs | 58 ++
+ samples/rust/rust_random.rs | 60 +++
+ samples/rust/rust_semaphore.rs | 176 ++++++
+ samples/rust/rust_semaphore_c.c | 212 ++++++++
+ samples/rust/rust_stack_probing.rs | 42 ++
+ samples/rust/rust_sync.rs | 84 +++
+ scripts/Makefile.build | 19 +
+ scripts/Makefile.lib | 12 +
+ scripts/dummy-tools/elfedit | 1 +
+ scripts/kallsyms.c | 33 +-
+ scripts/kconfig/confdata.c | 67 ++-
+ scripts/rust-version.sh | 31 ++
+ tools/include/linux/kallsyms.h | 2 +-
+ tools/include/linux/lockdep.h | 2 +-
+ tools/lib/perf/include/perf/event.h | 2 +-
+ tools/lib/symbol/kallsyms.h | 2 +-
+ 95 files changed, 11357 insertions(+), 48 deletions(-)
+ create mode 100644 .rustfmt.toml
+ create mode 100644 Documentation/rust/arch-support.rst
+ create mode 100644 Documentation/rust/coding.rst
+ create mode 100644 Documentation/rust/docs.rst
+ create mode 100644 Documentation/rust/index.rst
+ create mode 100644 Documentation/rust/quick-start.rst
+ create mode 100644 Documentation/rust/rust-project.json
+ create mode 100644 arch/arm/rust/target.json
+ create mode 100644 arch/arm64/rust/target.json
+ create mode 100644 arch/powerpc/rust/target.json
+ create mode 100644 arch/x86/rust/target.json
+ 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 rust/.gitignore
+ create mode 100644 rust/Makefile
+ create mode 100644 rust/compiler_builtins.rs
+ create mode 100644 rust/exports.c
+ create mode 100644 rust/helpers.c
+ create mode 100644 rust/kernel/allocator.rs
+ create mode 100644 rust/kernel/bindings.rs
+ create mode 100644 rust/kernel/bindings_helper.h
+ create mode 100644 rust/kernel/buffer.rs
+ create mode 100644 rust/kernel/c_types.rs
+ create mode 100644 rust/kernel/chrdev.rs
+ create mode 100644 rust/kernel/error.rs
+ create mode 100644 rust/kernel/file_operations.rs
+ create mode 100644 rust/kernel/lib.rs
+ create mode 100644 rust/kernel/linked_list.rs
+ create mode 100644 rust/kernel/miscdev.rs
+ create mode 100644 rust/kernel/module_param.rs
+ create mode 100644 rust/kernel/pages.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/static_assert.rs
+ create mode 100644 rust/kernel/sync/arc.rs
+ create mode 100644 rust/kernel/sync/condvar.rs
+ create mode 100644 rust/kernel/sync/guard.rs
+ create mode 100644 rust/kernel/sync/locked_by.rs
+ create mode 100644 rust/kernel/sync/mod.rs
+ create mode 100644 rust/kernel/sync/mutex.rs
+ create mode 100644 rust/kernel/sync/spinlock.rs
+ create mode 100644 rust/kernel/sysctl.rs
+ create mode 100644 rust/kernel/types.rs
+ create mode 100644 rust/kernel/user_ptr.rs
+ create mode 100644 rust/module.rs
+ create mode 100644 samples/rust/Kconfig
+ create mode 100644 samples/rust/Makefile
+ create mode 100644 samples/rust/rust_chrdev.rs
+ create mode 100644 samples/rust/rust_minimal.rs
+ create mode 100644 samples/rust/rust_miscdev.rs
+ create mode 100644 samples/rust/rust_module_parameters.rs
+ create mode 100644 samples/rust/rust_print.rs
+ create mode 100644 samples/rust/rust_random.rs
+ create mode 100644 samples/rust/rust_semaphore.rs
+ create mode 100644 samples/rust/rust_semaphore_c.c
+ create mode 100644 samples/rust/rust_stack_probing.rs
+ create mode 100644 samples/rust/rust_sync.rs
+ create mode 120000 scripts/dummy-tools/elfedit
+ create mode 100755 scripts/rust-version.sh
+Merging cxl/next (21083f51521f cxl/pmem: Register 'pmem' / cxl_nvdimm devices)
+$ git merge cxl/next
+Removing drivers/cxl/bus.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-bus-cxl | 103 +++
+ Documentation/driver-api/cxl/memory-devices.rst | 20 +-
+ drivers/cxl/Kconfig | 43 +-
+ drivers/cxl/Makefile | 12 +-
+ drivers/cxl/acpi.c | 222 +++++
+ drivers/cxl/bus.c | 29 -
+ drivers/cxl/core.c | 1067 +++++++++++++++++++++++
+ drivers/cxl/cxl.h | 332 +++++--
+ drivers/cxl/mem.h | 81 ++
+ drivers/cxl/{mem.c => pci.c} | 439 ++++++----
+ drivers/cxl/pmem.c | 230 +++++
+ drivers/nvdimm/bus.c | 64 +-
+ drivers/nvdimm/dimm_devs.c | 18 +
+ include/linux/libnvdimm.h | 1 +
+ include/uapi/linux/cxl_mem.h | 12 +
+ 15 files changed, 2383 insertions(+), 290 deletions(-)
+ create mode 100644 drivers/cxl/acpi.c
+ delete mode 100644 drivers/cxl/bus.c
+ create mode 100644 drivers/cxl/core.c
+ create mode 100644 drivers/cxl/mem.h
+ rename drivers/cxl/{mem.c => pci.c} (86%)
+ create mode 100644 drivers/cxl/pmem.c
+Merging tpmdd-jejb/tpmdd-for-next (69977d1aeeca Merge branch 'tpmdd-fixes' into tpmdd-for-next)
+$ git merge tpmdd-jejb/tpmdd-for-next
+Auto-merging security/keys/trusted-keys/trusted_tpm2.c
+Merge made by the 'recursive' strategy.
+$ git am -3 ../patches/0001-Revert-Merge-branch-marvell-mdio-ACPI.patch
+Applying: Revert "Merge branch 'marvell-mdio-ACPI'"
+Merging akpm-current/current (6234befd55b9 linux-next-pre)
+$ git merge --no-ff akpm-current/current
+Auto-merging virt/kvm/kvm_main.c
+Auto-merging scripts/link-vmlinux.sh
+Auto-merging net/ipv4/tcp.c
+Auto-merging mm/util.c
+Auto-merging mm/truncate.c
+Auto-merging mm/slub.c
+Auto-merging mm/slab_common.c
+Auto-merging mm/slab.h
+Auto-merging mm/shmem.c
+Auto-merging mm/rmap.c
+Auto-merging mm/page_alloc.c
+Auto-merging mm/page-writeback.c
+Auto-merging mm/oom_kill.c
+Auto-merging mm/mmap.c
+Auto-merging mm/mlock.c
+Auto-merging mm/memory-failure.c
+Auto-merging mm/memcontrol.c
+CONFLICT (content): Merge conflict in mm/memcontrol.c
+Auto-merging mm/memblock.c
+Auto-merging mm/madvise.c
+Auto-merging mm/kasan/common.c
+Auto-merging mm/filemap.c
+Auto-merging mm/compaction.c
+Auto-merging lib/vsprintf.c
+Auto-merging lib/kunit/test.c
+Auto-merging lib/kstrtox.c
+Auto-merging lib/dump_stack.c
+CONFLICT (content): Merge conflict in lib/dump_stack.c
+Auto-merging lib/Makefile
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/trace/trace.c
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/signal.c
+Auto-merging kernel/sched/sched.h
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/rcu/tree.c
+Auto-merging kernel/kthread.c
+Auto-merging kernel/kprobes.c
+Auto-merging kernel/hung_task.c
+Auto-merging kernel/futex.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/exit.c
+Auto-merging kernel/events/uprobes.c
+Auto-merging kernel/events/core.c
+Auto-merging kernel/cpu.c
+Auto-merging kernel/cgroup/cgroup.c
+Auto-merging ipc/shm.c
+Auto-merging init/main.c
+Removing include/linux/zbud.h
+Auto-merging include/linux/writeback.h
+Auto-merging include/linux/shmem_fs.h
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/printk.h
+Auto-merging include/linux/page-flags.h
+Auto-merging include/linux/mm_types.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/memcontrol.h
+Auto-merging include/linux/kthread.h
+Auto-merging include/linux/kprobes.h
+Auto-merging include/linux/kernel.h
+Auto-merging include/linux/kasan.h
+Auto-merging include/linux/hugetlb.h
+Auto-merging include/linux/highmem.h
+Auto-merging include/linux/gfp.h
+Auto-merging include/linux/fs.h
+Auto-merging fs/zonefs/super.c
+Auto-merging fs/userfaultfd.c
+Auto-merging fs/open.c
+Auto-merging fs/nilfs2/sysfs.c
+Auto-merging fs/nfsd/nfs4state.c
+Auto-merging fs/jfs/inode.c
+Auto-merging fs/iomap/buffered-io.c
+Auto-merging fs/internal.h
+Auto-merging fs/inode.c
+Auto-merging fs/fuse/dax.c
+Auto-merging fs/fs-writeback.c
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/ext2/inode.c
+Auto-merging fs/exec.c
+Auto-merging fs/block_dev.c
+Auto-merging fs/binfmt_elf_fdpic.c
+Auto-merging fs/binfmt_elf.c
+Auto-merging fs/Kconfig
+Auto-merging drivers/vfio/vfio_iommu_type1.c
+Auto-merging drivers/s390/char/sclp_vt220.c
+Auto-merging drivers/s390/char/sclp_con.c
+Auto-merging drivers/s390/char/sclp.c
+Auto-merging drivers/s390/char/con3215.c
+Auto-merging drivers/remoteproc/remoteproc_core.c
+Auto-merging drivers/net/ipa/ipa_smp2p.c
+Auto-merging drivers/misc/pvpanic/pvpanic.c
+Auto-merging drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
+Auto-merging drivers/clk/analogbits/wrpll-cln28hpc.c
+Auto-merging drivers/block/zram/zram_drv.h
+CONFLICT (content): Merge conflict in drivers/block/zram/zram_drv.h
+Auto-merging drivers/block/loop.c
+Auto-merging drivers/base/node.c
+Auto-merging arch/x86/kernel/setup.c
+Auto-merging arch/x86/kernel/kprobes/core.c
+Auto-merging arch/x86/kernel/cpu/mshyperv.c
+Auto-merging arch/x86/include/asm/desc.h
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/um/kernel/um_arch.c
+Auto-merging arch/um/drivers/mconsole_kern.c
+Auto-merging arch/sparc/kernel/smp_64.c
+Auto-merging arch/s390/kernel/kprobes.c
+Auto-merging arch/s390/kernel/ipl.c
+Auto-merging arch/s390/include/asm/pgtable.h
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/riscv/include/asm/pgtable.h
+Auto-merging arch/riscv/Kconfig
+CONFLICT (content): Merge conflict in arch/riscv/Kconfig
+Auto-merging arch/powerpc/platforms/Kconfig.cputype
+Auto-merging arch/powerpc/mm/mem.c
+Auto-merging arch/powerpc/mm/book3s64/radix_tlb.c
+Auto-merging arch/powerpc/mm/Makefile
+Auto-merging arch/powerpc/kvm/book3s_hv_uvmem.c
+Auto-merging arch/powerpc/kvm/book3s_hv.c
+Auto-merging arch/powerpc/kernel/smp.c
+CONFLICT (content): Merge conflict in arch/powerpc/kernel/smp.c
+Auto-merging arch/powerpc/include/asm/pgtable.h
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/mips/include/asm/pgalloc.h
+Auto-merging arch/mips/Kconfig
+Removing arch/m68k/include/asm/mmzone.h
+Auto-merging arch/m68k/Kconfig
+Auto-merging arch/h8300/kernel/setup.c
+Auto-merging arch/arm64/mm/mmu.c
+Auto-merging arch/arm64/mm/init.c
+Auto-merging arch/arm64/kvm/mmu.c
+Auto-merging arch/arm64/kernel/setup.c
+Auto-merging arch/arm64/include/asm/pgtable.h
+Auto-merging arch/arm64/include/asm/page.h
+Auto-merging arch/arm64/include/asm/memory.h
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm/Kconfig
+Removing arch/arc/include/asm/mmzone.h
+Removing arch/alpha/mm/numa.c
+Removing arch/alpha/include/asm/mmzone.h
+Auto-merging MAINTAINERS
+Auto-merging Documentation/admin-guide/sysctl/vm.rst
+Auto-merging Documentation/admin-guide/sysctl/kernel.rst
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging .mailmap
+Resolved 'arch/powerpc/kernel/smp.c' using previous resolution.
+Resolved 'arch/riscv/Kconfig' using previous resolution.
+Resolved 'drivers/block/zram/zram_drv.h' using previous resolution.
+Resolved 'lib/dump_stack.c' using previous resolution.
+Resolved 'mm/memcontrol.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 830a92fbdba4] Merge branch 'akpm-current/current'
+$ git diff -M --stat --summary HEAD^..
+ .mailmap | 2 +
+ Documentation/admin-guide/kernel-parameters.txt | 27 +
+ Documentation/admin-guide/lockup-watchdogs.rst | 4 +-
+ Documentation/admin-guide/mm/hugetlbpage.rst | 11 +
+ Documentation/admin-guide/mm/memory-hotplug.rst | 729 ++++++++------
+ Documentation/admin-guide/mm/pagemap.rst | 2 +
+ Documentation/admin-guide/mm/userfaultfd.rst | 3 +-
+ Documentation/admin-guide/sysctl/kernel.rst | 10 +-
+ Documentation/admin-guide/sysctl/vm.rst | 42 +-
+ Documentation/core-api/kernel-api.rst | 7 +-
+ Documentation/dev-tools/kasan.rst | 9 +-
+ Documentation/filesystems/proc.rst | 48 +-
+ Documentation/vm/hmm.rst | 19 +-
+ Documentation/vm/memory-model.rst | 45 +-
+ Documentation/vm/unevictable-lru.rst | 33 +-
+ MAINTAINERS | 14 +-
+ arch/Kconfig | 28 +
+ arch/alpha/Kconfig | 27 +-
+ arch/alpha/include/asm/machvec.h | 6 -
+ arch/alpha/include/asm/mmzone.h | 100 --
+ arch/alpha/include/asm/pgalloc.h | 1 -
+ arch/alpha/include/asm/pgtable.h | 5 -
+ arch/alpha/include/asm/topology.h | 39 -
+ arch/alpha/include/uapi/asm/mman.h | 3 +
+ arch/alpha/kernel/core_marvel.c | 53 +-
+ arch/alpha/kernel/core_wildfire.c | 29 +-
+ arch/alpha/kernel/pci_iommu.c | 29 -
+ arch/alpha/kernel/proto.h | 8 -
+ arch/alpha/kernel/setup.c | 18 +-
+ arch/alpha/kernel/sys_marvel.c | 5 -
+ arch/alpha/kernel/sys_wildfire.c | 5 -
+ arch/alpha/mm/Makefile | 2 -
+ arch/alpha/mm/init.c | 3 -
+ arch/alpha/mm/numa.c | 223 -----
+ arch/arc/Kconfig | 13 -
+ arch/arc/include/asm/mmzone.h | 40 -
+ arch/arc/include/asm/pgalloc.h | 2 -
+ arch/arc/include/asm/pgtable.h | 8 +-
+ arch/arc/kernel/troubleshoot.c | 8 +-
+ arch/arc/mm/init.c | 21 +-
+ arch/arm/Kconfig | 3 -
+ arch/arm/include/asm/pgalloc.h | 1 -
+ arch/arm/include/asm/tlbflush.h | 13 +-
+ arch/arm/mach-rpc/ecard.c | 2 +-
+ arch/arm/mm/tlb-v6.S | 2 +-
+ arch/arm/mm/tlb-v7.S | 2 +-
+ arch/arm64/Kconfig | 15 +-
+ arch/arm64/include/asm/hugetlb.h | 3 +-
+ arch/arm64/include/asm/memory.h | 2 +-
+ arch/arm64/include/asm/page.h | 2 +-
+ arch/arm64/include/asm/pgalloc.h | 1 -
+ arch/arm64/include/asm/pgtable.h | 2 -
+ arch/arm64/kernel/setup.c | 1 +
+ arch/arm64/kvm/mmu.c | 4 +-
+ arch/arm64/mm/hugetlbpage.c | 5 +-
+ arch/arm64/mm/init.c | 31 +-
+ arch/arm64/mm/ioremap.c | 4 +-
+ arch/arm64/mm/mmu.c | 22 +-
+ arch/csky/include/asm/pgalloc.h | 2 -
+ arch/csky/include/asm/pgtable.h | 1 -
+ arch/h8300/kernel/setup.c | 2 -
+ arch/hexagon/include/asm/pgtable.h | 4 -
+ arch/ia64/Kconfig | 9 +-
+ arch/ia64/include/asm/pal.h | 3 +-
+ arch/ia64/include/asm/pgalloc.h | 1 -
+ arch/ia64/include/asm/pgtable.h | 1 -
+ arch/ia64/include/asm/spinlock.h | 2 +-
+ arch/ia64/include/asm/uv/uv_hub.h | 2 +-
+ arch/ia64/kernel/efi_stub.S | 2 +-
+ arch/ia64/kernel/mca_drv.c | 2 +-
+ arch/ia64/kernel/topology.c | 5 +-
+ arch/ia64/mm/numa.c | 5 +-
+ arch/m68k/Kconfig | 5 +-
+ arch/m68k/Kconfig.cpu | 10 -
+ arch/m68k/include/asm/mcf_pgalloc.h | 2 -
+ arch/m68k/include/asm/mcf_pgtable.h | 2 +
+ arch/m68k/include/asm/mmzone.h | 10 -
+ arch/m68k/include/asm/motorola_pgalloc.h | 1 -
+ arch/m68k/include/asm/motorola_pgtable.h | 2 +
+ arch/m68k/include/asm/page.h | 2 +-
+ arch/m68k/include/asm/page_mm.h | 35 -
+ arch/m68k/include/asm/pgtable_mm.h | 1 -
+ arch/m68k/include/asm/sun3_pgalloc.h | 1 -
+ arch/m68k/include/asm/tlbflush.h | 2 +-
+ arch/m68k/kernel/sys_m68k.c | 4 +-
+ arch/m68k/mm/init.c | 20 -
+ arch/microblaze/Kconfig | 4 +-
+ arch/microblaze/include/asm/pgalloc.h | 2 -
+ arch/microblaze/include/asm/pgtable.h | 2 -
+ arch/mips/Kconfig | 9 +-
+ arch/mips/include/asm/mmzone.h | 8 +-
+ arch/mips/include/asm/page.h | 2 +-
+ arch/mips/include/asm/pgalloc.h | 1 -
+ arch/mips/include/asm/pgtable-32.h | 1 -
+ arch/mips/include/asm/pgtable-64.h | 1 -
+ arch/mips/include/uapi/asm/mman.h | 3 +
+ arch/mips/kernel/relocate.c | 1 +
+ arch/mips/kernel/traps.c | 4 +-
+ arch/mips/mm/init.c | 7 +-
+ arch/mips/sgi-ip22/ip22-reset.c | 1 +
+ arch/mips/sgi-ip32/ip32-reset.c | 1 +
+ arch/nds32/include/asm/memory.h | 6 -
+ arch/nds32/include/asm/pgalloc.h | 5 -
+ arch/nios2/include/asm/pgalloc.h | 1 -
+ arch/nios2/include/asm/pgtable.h | 2 -
+ arch/openrisc/include/asm/pgalloc.h | 2 -
+ arch/openrisc/include/asm/pgtable.h | 1 -
+ arch/openrisc/include/asm/tlbflush.h | 2 +-
+ arch/parisc/include/asm/pgalloc.h | 1 -
+ arch/parisc/include/asm/pgtable.h | 2 -
+ arch/parisc/include/uapi/asm/mman.h | 3 +
+ arch/parisc/kernel/pdc_chassis.c | 1 +
+ arch/powerpc/Kconfig | 9 +-
+ arch/powerpc/include/asm/book3s/pgtable.h | 1 -
+ arch/powerpc/include/asm/mmzone.h | 4 +-
+ arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h | 5 +-
+ arch/powerpc/include/asm/nohash/32/mmu-8xx.h | 43 +
+ arch/powerpc/include/asm/nohash/32/pgtable.h | 1 -
+ arch/powerpc/include/asm/nohash/64/pgtable.h | 2 -
+ arch/powerpc/include/asm/pgalloc.h | 5 -
+ arch/powerpc/include/asm/pgtable.h | 6 +
+ arch/powerpc/kernel/setup-common.c | 1 +
+ arch/powerpc/kernel/setup_64.c | 2 +-
+ arch/powerpc/kernel/smp.c | 4 +-
+ arch/powerpc/kexec/core.c | 4 +-
+ arch/powerpc/kvm/book3s_hv.c | 4 +-
+ arch/powerpc/kvm/book3s_hv_uvmem.c | 2 +-
+ arch/powerpc/mm/Makefile | 2 +-
+ arch/powerpc/mm/book3s64/radix_tlb.c | 4 +-
+ arch/powerpc/mm/mem.c | 4 +-
+ arch/powerpc/platforms/Kconfig.cputype | 1 +
+ arch/riscv/Kconfig | 7 +-
+ arch/riscv/include/asm/pgalloc.h | 2 -
+ arch/riscv/include/asm/pgtable.h | 2 -
+ arch/s390/Kconfig | 8 +-
+ arch/s390/include/asm/pgalloc.h | 3 -
+ arch/s390/include/asm/pgtable.h | 5 +-
+ arch/s390/kernel/ipl.c | 1 +
+ arch/s390/kernel/kprobes.c | 5 -
+ arch/s390/kvm/pv.c | 7 +-
+ arch/s390/mm/pgtable.c | 2 +-
+ arch/sh/include/asm/mmzone.h | 4 +-
+ arch/sh/include/asm/pgalloc.h | 1 -
+ arch/sh/include/asm/pgtable.h | 2 -
+ arch/sh/kernel/topology.c | 2 +-
+ arch/sh/mm/Kconfig | 2 +-
+ arch/sh/mm/init.c | 2 +-
+ arch/sparc/Kconfig | 7 +-
+ arch/sparc/include/asm/mmzone.h | 4 +-
+ arch/sparc/include/asm/pgalloc_32.h | 1 -
+ arch/sparc/include/asm/pgalloc_64.h | 1 -
+ arch/sparc/include/asm/pgtable_32.h | 3 +-
+ arch/sparc/include/asm/pgtable_64.h | 8 +-
+ arch/sparc/kernel/smp_64.c | 2 +-
+ arch/sparc/kernel/sstate.c | 1 +
+ arch/sparc/mm/hugetlbpage.c | 6 +-
+ arch/sparc/mm/init_64.c | 13 +-
+ arch/um/drivers/mconsole_kern.c | 1 +
+ arch/um/include/asm/pgalloc.h | 1 -
+ arch/um/include/asm/pgtable-2level.h | 1 -
+ arch/um/include/asm/pgtable-3level.h | 1 -
+ arch/um/kernel/um_arch.c | 1 +
+ arch/x86/Kconfig | 19 +-
+ arch/x86/ia32/ia32_aout.c | 4 +-
+ arch/x86/include/asm/desc.h | 1 +
+ arch/x86/include/asm/pgalloc.h | 2 -
+ arch/x86/include/asm/pgtable_types.h | 2 -
+ arch/x86/kernel/cpu/mce/core.c | 13 +-
+ arch/x86/kernel/cpu/mshyperv.c | 1 +
+ arch/x86/kernel/cpu/sgx/encl.h | 4 +-
+ arch/x86/kernel/kprobes/core.c | 6 -
+ arch/x86/kernel/setup.c | 1 +
+ arch/x86/kernel/setup_percpu.c | 6 +-
+ arch/x86/mm/init_32.c | 4 +-
+ arch/x86/mm/init_64.c | 5 +-
+ arch/x86/mm/pgtable.c | 34 +-
+ arch/x86/purgatory/purgatory.c | 2 +
+ arch/x86/xen/enlighten.c | 1 +
+ arch/xtensa/include/asm/page.h | 4 -
+ arch/xtensa/include/asm/pgalloc.h | 2 -
+ arch/xtensa/include/asm/pgtable.h | 1 -
+ arch/xtensa/include/asm/tlbflush.h | 4 +-
+ arch/xtensa/include/uapi/asm/mman.h | 3 +
+ arch/xtensa/platforms/iss/setup.c | 1 +
+ drivers/base/node.c | 18 +-
+ drivers/block/loop.c | 250 ++++-
+ drivers/block/loop.h | 15 +-
+ drivers/block/zram/zram_drv.h | 2 +-
+ drivers/bus/brcmstb_gisb.c | 1 +
+ drivers/char/ipmi/ipmi_msghandler.c | 1 +
+ drivers/clk/analogbits/wrpll-cln28hpc.c | 4 +
+ drivers/dax/device.c | 2 +-
+ drivers/edac/altera_edac.c | 1 +
+ drivers/firmware/google/gsmi.c | 1 +
+ drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 2 +-
+ drivers/gpu/drm/nouveau/include/nvif/if000c.h | 1 +
+ drivers/gpu/drm/nouveau/nouveau_svm.c | 156 ++-
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h | 1 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c | 6 +
+ drivers/hv/vmbus_drv.c | 1 +
+ drivers/hwtracing/coresight/coresight-cpu-debug.c | 1 +
+ drivers/leds/trigger/ledtrig-activity.c | 1 +
+ drivers/leds/trigger/ledtrig-heartbeat.c | 1 +
+ drivers/leds/trigger/ledtrig-panic.c | 1 +
+ drivers/media/common/videobuf2/frame_vector.c | 2 +-
+ drivers/misc/bcm-vk/bcm_vk_dev.c | 1 +
+ drivers/misc/ibmasm/heartbeat.c | 1 +
+ drivers/misc/pvpanic/pvpanic.c | 1 +
+ drivers/misc/sgi-gru/grufault.c | 4 +-
+ drivers/net/ipa/ipa_smp2p.c | 1 +
+ drivers/parisc/power.c | 1 +
+ drivers/power/reset/ltc2952-poweroff.c | 1 +
+ drivers/remoteproc/remoteproc_core.c | 1 +
+ drivers/s390/char/con3215.c | 1 +
+ drivers/s390/char/con3270.c | 1 +
+ drivers/s390/char/sclp.c | 1 +
+ drivers/s390/char/sclp_con.c | 1 +
+ drivers/s390/char/sclp_vt220.c | 1 +
+ drivers/s390/char/zcore.c | 1 +
+ drivers/soc/bcm/brcmstb/pm/pm-arm.c | 1 +
+ drivers/staging/olpc_dcon/olpc_dcon.c | 1 +
+ drivers/vfio/vfio_iommu_type1.c | 2 +-
+ drivers/video/fbdev/hyperv_fb.c | 1 +
+ drivers/virtio/virtio_balloon.c | 17 +
+ drivers/virtio/virtio_mem.c | 2 +
+ fs/Kconfig | 15 +
+ fs/adfs/inode.c | 1 +
+ fs/affs/file.c | 2 +
+ fs/bfs/file.c | 1 +
+ fs/binfmt_aout.c | 4 +-
+ fs/binfmt_elf.c | 2 +-
+ fs/binfmt_elf_fdpic.c | 11 +-
+ fs/binfmt_flat.c | 2 +-
+ fs/block_dev.c | 1 +
+ fs/buffer.c | 81 +-
+ fs/configfs/inode.c | 8 +-
+ fs/dax.c | 3 +-
+ fs/drop_caches.c | 3 +-
+ fs/exec.c | 7 +-
+ fs/exfat/inode.c | 1 +
+ fs/ext2/inode.c | 4 +-
+ fs/ext4/inode.c | 2 +-
+ fs/fat/inode.c | 1 +
+ fs/fs-writeback.c | 332 ++++--
+ fs/fuse/dax.c | 3 +-
+ fs/gfs2/aops.c | 2 +-
+ fs/gfs2/meta_io.c | 2 +
+ fs/hfs/inode.c | 2 +
+ fs/hfsplus/catalog.c | 16 +-
+ fs/hfsplus/dir.c | 4 +-
+ fs/hfsplus/hfsplus_raw.h | 12 +-
+ fs/hfsplus/inode.c | 2 +
+ fs/hfsplus/xattr.c | 19 +-
+ fs/hpfs/file.c | 1 +
+ fs/inode.c | 48 +-
+ fs/internal.h | 1 -
+ fs/iomap/buffered-io.c | 27 +-
+ fs/jfs/inode.c | 1 +
+ fs/kernfs/inode.c | 8 +-
+ fs/libfs.c | 44 +-
+ fs/minix/inode.c | 1 +
+ fs/nfsd/nfs4state.c | 2 +-
+ fs/nilfs2/mdt.c | 1 +
+ fs/nilfs2/sysfs.c | 1 +
+ fs/ocfs2/aops.c | 4 +-
+ fs/ocfs2/cluster/heartbeat.c | 7 +-
+ fs/ocfs2/cluster/nodemanager.c | 2 +-
+ fs/ocfs2/dlm/dlmmaster.c | 2 +-
+ fs/ocfs2/filecheck.c | 6 +-
+ fs/ocfs2/namei.c | 17 +-
+ fs/ocfs2/stackglue.c | 8 +-
+ fs/omfs/file.c | 1 +
+ fs/open.c | 13 +-
+ fs/proc/base.c | 6 +-
+ fs/proc/fd.c | 20 +-
+ fs/proc/kcore.c | 134 ++-
+ fs/proc/page.c | 40 +-
+ fs/proc/task_mmu.c | 36 +-
+ fs/ramfs/inode.c | 9 +-
+ fs/seq_file.c | 43 +-
+ fs/squashfs/block.c | 5 +-
+ fs/squashfs/squashfs_fs_sb.h | 1 +
+ fs/squashfs/super.c | 86 ++
+ fs/sysv/itree.c | 1 +
+ fs/udf/file.c | 1 +
+ fs/udf/inode.c | 1 +
+ fs/ufs/inode.c | 1 +
+ fs/userfaultfd.c | 15 +-
+ fs/xfs/xfs_aops.c | 4 +-
+ fs/zonefs/super.c | 4 +-
+ include/asm-generic/bug.h | 3 +-
+ include/asm-generic/memory_model.h | 37 +-
+ include/asm-generic/topology.h | 2 +-
+ include/kunit/test.h | 5 +-
+ include/linux/ascii85.h | 3 +-
+ include/linux/backing-dev-defs.h | 20 +-
+ include/linux/bootmem_info.h | 66 ++
+ include/linux/compat.h | 2 -
+ include/linux/compiler-clang.h | 17 +
+ include/linux/compiler-gcc.h | 6 +
+ include/linux/compiler_types.h | 2 +-
+ include/linux/cpuhotplug.h | 2 +-
+ include/linux/fs.h | 7 +-
+ include/linux/gfp.h | 13 +-
+ include/linux/highmem.h | 28 +-
+ include/linux/huge_mm.h | 70 +-
+ include/linux/hugetlb.h | 58 +-
+ include/linux/hugetlb_cgroup.h | 19 +-
+ include/linux/iomap.h | 1 -
+ include/linux/kasan.h | 1 -
+ include/linux/kcore.h | 3 -
+ include/linux/kernel.h | 229 +----
+ include/linux/kprobes.h | 1 -
+ include/linux/kstrtox.h | 155 +++
+ include/linux/kthread.h | 2 +-
+ include/linux/memblock.h | 10 +-
+ include/linux/memcontrol.h | 54 +-
+ include/linux/memory_hotplug.h | 27 -
+ include/linux/mempolicy.h | 9 +-
+ include/linux/memremap.h | 8 +-
+ include/linux/migrate.h | 27 +-
+ include/linux/mm.h | 66 +-
+ include/linux/mm_types.h | 14 +-
+ include/linux/mm_types_task.h | 5 +
+ include/linux/mman.h | 2 +
+ include/linux/mmdebug.h | 3 +-
+ include/linux/mmu_notifier.h | 26 +-
+ include/linux/mmzone.h | 117 ++-
+ include/linux/mpi.h | 4 +-
+ include/linux/page-flags.h | 32 +-
+ include/linux/page_owner.h | 6 +-
+ include/linux/page_ref.h | 4 +-
+ include/linux/page_reporting.h | 3 +
+ include/linux/pageblock-flags.h | 2 +-
+ include/linux/pagemap.h | 67 +-
+ include/linux/panic.h | 98 ++
+ include/linux/panic_notifier.h | 12 +
+ include/linux/pgtable.h | 44 +-
+ include/linux/printk.h | 5 +
+ include/linux/rmap.h | 13 +-
+ include/linux/sched.h | 8 +
+ include/linux/sched/coredump.h | 8 +
+ include/linux/sched/mm.h | 21 +
+ include/linux/seq_file.h | 10 +-
+ include/linux/shmem_fs.h | 19 +-
+ include/linux/signal.h | 2 -
+ include/linux/slab.h | 59 +-
+ include/linux/string.h | 7 -
+ include/linux/string_helpers.h | 31 +-
+ include/linux/sunrpc/cache.h | 1 +
+ include/linux/swap.h | 38 +-
+ include/linux/swapops.h | 130 ++-
+ include/linux/thread_info.h | 1 +
+ include/linux/userfaultfd_k.h | 5 +
+ include/linux/vmalloc.h | 16 +
+ include/linux/vmstat.h | 65 +-
+ include/linux/writeback.h | 1 +
+ include/linux/zbud.h | 23 -
+ include/trace/events/cma.h | 4 +-
+ include/trace/events/filemap.h | 2 +-
+ include/trace/events/kmem.h | 12 +-
+ include/trace/events/page_pool.h | 4 +-
+ include/trace/events/pagemap.h | 4 +-
+ include/trace/events/vmscan.h | 43 +-
+ include/uapi/asm-generic/mman-common.h | 3 +
+ include/uapi/linux/mempolicy.h | 1 -
+ include/uapi/linux/userfaultfd.h | 11 +-
+ init/main.c | 67 +-
+ ipc/msg.c | 6 +-
+ ipc/sem.c | 22 +-
+ ipc/shm.c | 6 +-
+ ipc/util.c | 44 +-
+ ipc/util.h | 3 +
+ kernel/cpu.c | 2 +-
+ kernel/crash_core.c | 4 +-
+ kernel/events/core.c | 2 -
+ kernel/events/uprobes.c | 4 +-
+ kernel/exit.c | 2 +-
+ kernel/fork.c | 52 +-
+ kernel/futex.c | 3 +-
+ kernel/hung_task.c | 45 +
+ kernel/kexec_core.c | 1 +
+ kernel/kprobes.c | 2 +-
+ kernel/kthread.c | 117 ++-
+ kernel/panic.c | 1 +
+ kernel/rcu/tree.c | 2 +
+ kernel/sched/core.c | 35 +-
+ kernel/sched/sched.h | 4 +-
+ kernel/signal.c | 14 +-
+ kernel/sysctl.c | 20 +-
+ kernel/trace/trace.c | 1 +
+ kernel/watchdog.c | 12 +-
+ lib/Kconfig.debug | 33 +
+ lib/Makefile | 1 +
+ lib/decompress_bunzip2.c | 6 +-
+ lib/decompress_unlz4.c | 8 +
+ lib/decompress_unlzo.c | 3 +-
+ lib/decompress_unxz.c | 2 +-
+ lib/decompress_unzstd.c | 4 +-
+ lib/dump_stack.c | 16 +-
+ lib/kstrtox.c | 5 +-
+ lib/kunit/test.c | 18 +-
+ lib/lz4/lz4_decompress.c | 2 +-
+ lib/math/Makefile | 1 +
+ lib/math/rational-test.c | 56 ++
+ lib/math/rational.c | 16 +-
+ lib/mpi/longlong.h | 4 +-
+ lib/mpi/mpicoder.c | 6 +-
+ lib/mpi/mpiutil.c | 2 +-
+ lib/parser.c | 1 +
+ lib/slub_kunit.c | 152 +++
+ lib/string.c | 2 +-
+ lib/string_helpers.c | 102 +-
+ lib/test-string_helpers.c | 157 ++-
+ lib/test_hmm.c | 132 ++-
+ lib/test_hmm_uapi.h | 2 +
+ lib/test_kasan.c | 11 +-
+ lib/test_string.c | 5 +
+ lib/vsprintf.c | 3 +-
+ lib/xz/xz_dec_bcj.c | 2 +-
+ lib/xz/xz_dec_lzma2.c | 8 +-
+ lib/zlib_inflate/inffast.c | 2 +-
+ lib/zstd/huf.h | 2 +-
+ mm/Kconfig | 54 +-
+ mm/Makefile | 2 +
+ mm/backing-dev.c | 66 +-
+ mm/bootmem_info.c | 127 +++
+ mm/compaction.c | 16 +-
+ mm/debug.c | 25 +-
+ mm/debug_vm_pgtable.c | 170 ++--
+ mm/dmapool.c | 5 +-
+ mm/filemap.c | 25 +-
+ mm/gup.c | 131 ++-
+ mm/hmm.c | 12 +-
+ mm/huge_memory.c | 265 +++--
+ mm/hugetlb.c | 368 +++++--
+ mm/hugetlb_vmemmap.c | 298 ++++++
+ mm/hugetlb_vmemmap.h | 45 +
+ mm/internal.h | 38 +-
+ mm/kasan/common.c | 3 +
+ mm/kasan/report.c | 6 +-
+ mm/kfence/core.c | 4 +-
+ mm/kfence/kfence_test.c | 5 +-
+ mm/khugepaged.c | 20 +-
+ mm/kmemleak.c | 18 +-
+ mm/ksm.c | 6 +-
+ mm/madvise.c | 66 ++
+ mm/mapping_dirty_helpers.c | 2 +-
+ mm/memblock.c | 36 +-
+ mm/memcontrol.c | 367 +++++--
+ mm/memory-failure.c | 457 ++++++---
+ mm/memory.c | 259 +++--
+ mm/memory_hotplug.c | 165 +--
+ mm/mempolicy.c | 307 +++---
+ mm/memremap.c | 20 +
+ mm/migrate.c | 272 ++---
+ mm/mlock.c | 12 +-
+ mm/mmap.c | 54 +-
+ mm/mmap_lock.c | 88 +-
+ mm/mprotect.c | 70 +-
+ mm/mremap.c | 5 +-
+ mm/nommu.c | 7 +-
+ mm/oom_kill.c | 2 +-
+ mm/page-writeback.c | 89 +-
+ mm/page_alloc.c | 723 +++++++++-----
+ mm/page_ext.c | 2 +-
+ mm/page_owner.c | 2 +-
+ mm/page_reporting.c | 17 +-
+ mm/page_reporting.h | 5 +-
+ mm/page_vma_mapped.c | 172 ++--
+ mm/rmap.c | 628 +++++++++---
+ mm/shmem.c | 141 +--
+ mm/slab.h | 24 +-
+ mm/slab_common.c | 60 +-
+ mm/slub.c | 418 +++++---
+ mm/sparse-vmemmap.c | 354 +++++++
+ mm/sparse.c | 3 +-
+ mm/swap.c | 6 +-
+ mm/swap_slots.c | 2 -
+ mm/swap_state.c | 20 +-
+ mm/swapfile.c | 179 ++--
+ mm/truncate.c | 47 +-
+ mm/userfaultfd.c | 225 +++--
+ mm/util.c | 40 +
+ mm/vmalloc.c | 199 ++--
+ mm/vmscan.c | 79 +-
+ mm/vmstat.c | 246 ++---
+ mm/workingset.c | 12 +-
+ mm/z3fold.c | 39 +-
+ mm/zbud.c | 235 ++---
+ mm/zsmalloc.c | 2 +-
+ mm/zswap.c | 26 +-
+ net/ipv4/tcp.c | 4 +-
+ scripts/checkpatch.pl | 16 +-
+ scripts/kconfig/streamline_config.pl | 80 +-
+ scripts/link-vmlinux.sh | 4 +
+ scripts/spelling.txt | 16 +
+ tools/testing/selftests/vm/.gitignore | 3 +
+ tools/testing/selftests/vm/Makefile | 5 +-
+ tools/testing/selftests/vm/gup_test.c | 96 +-
+ tools/testing/selftests/vm/hmm-tests.c | 158 +++
+ tools/testing/selftests/vm/khugepaged.c | 4 -
+ tools/testing/selftests/vm/madv_populate.c | 342 +++++++
+ tools/testing/selftests/vm/pkey-x86.h | 1 +
+ tools/testing/selftests/vm/protection_keys.c | 85 +-
+ tools/testing/selftests/vm/run_vmtests.sh | 16 +
+ tools/testing/selftests/vm/userfaultfd.c | 1054 ++++++++++----------
+ tools/vm/page_owner_sort.c | 4 +
+ virt/kvm/kvm_main.c | 2 +-
+ 509 files changed, 10759 insertions(+), 6189 deletions(-)
+ delete mode 100644 arch/alpha/include/asm/mmzone.h
+ delete mode 100644 arch/alpha/mm/numa.c
+ delete mode 100644 arch/arc/include/asm/mmzone.h
+ delete mode 100644 arch/m68k/include/asm/mmzone.h
+ create mode 100644 include/linux/bootmem_info.h
+ create mode 100644 include/linux/kstrtox.h
+ create mode 100644 include/linux/panic.h
+ create mode 100644 include/linux/panic_notifier.h
+ delete mode 100644 include/linux/zbud.h
+ create mode 100644 lib/math/rational-test.c
+ create mode 100644 lib/slub_kunit.c
+ create mode 100644 mm/bootmem_info.c
+ create mode 100644 mm/hugetlb_vmemmap.c
+ create mode 100644 mm/hugetlb_vmemmap.h
+ create mode 100644 tools/testing/selftests/vm/madv_populate.c
+$ git am -3 ../patches/0001-Revert-virtio_balloon-specify-page-reporting-order-i.patch
+Applying: Revert "virtio_balloon: specify page reporting order if needed"
+$ git am -3 ../patches/0002-Revert-mm-page_reporting-allow-driver-to-specify-rep.patch
+Applying: Revert "mm/page_reporting: allow driver to specify reporting order"
+$ git am -3 ../patches/0003-Revert-mm-page_reporting-export-reporting-order-as-m.patch
+Applying: Revert "mm-page_reporting-export-reporting-order-as-module-parameter-fix"
+$ git am -3 ../patches/0004-Revert-mm-page_reporting-export-reporting-order-as-m.patch
+Applying: Revert "mm/page_reporting: export reporting order as module parameter"
+$ git clone -s -l -n -q . ../rebase-tmp
+$ cd ../rebase-tmp
+$ git checkout -b akpm remotes/origin/akpm/master
+Switched to a new branch 'akpm'
+$ git rebase --onto master remotes/origin/akpm/master-base
+Rebasing (1/66) Rebasing (2/66) Rebasing (3/66) Rebasing (4/66) Rebasing (5/66) Rebasing (6/66) Rebasing (7/66) Rebasing (8/66) Rebasing (9/66) Rebasing (10/66) Rebasing (11/66) Rebasing (12/66) Rebasing (13/66) Rebasing (14/66) Rebasing (15/66) Rebasing (16/66) Rebasing (17/66) Rebasing (18/66) Rebasing (19/66) Rebasing (20/66) Rebasing (21/66) Rebasing (22/66) Rebasing (23/66) Rebasing (24/66) Rebasing (25/66) Rebasing (26/66) Rebasing (27/66) Rebasing (28/66) Rebasing (29/66) Rebasing (30/66) Rebasing (31/66) Rebasing (32/66) Rebasing (33/66) Rebasing (34/66) Rebasing (35/66) Rebasing (36/66) Rebasing (37/66) Rebasing (38/66) Rebasing (39/66) Rebasing (40/66) Rebasing (41/66) Rebasing (42/66) Rebasing (43/66) Rebasing (44/66) Rebasing (45/66) Rebasing (46/66) Rebasing (47/66) Rebasing (48/66) Rebasing (49/66) Rebasing (50/66) Rebasing (51/66) Rebasing (52/66) Rebasing (53/66) Rebasing (54/66) Rebasing (55/66) Rebasing (56/66) Rebasing (57/66) Rebasing (58/66) Rebasing (59/66) Rebasing (60/66) Rebasing (61/66) Rebasing (62/66) Rebasing (63/66) Rebasing (64/66) Rebasing (65/66) Rebasing (66/66) Successfully rebased and updated refs/heads/akpm.
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + 37cba754db15...879e26014f75 akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (879e26014f75 powerpc/mm: enable HAVE_MOVE_PMD support)
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ Documentation/core-api/printk-formats.rst | 11 +
+ arch/alpha/include/asm/pgtable.h | 8 +-
+ arch/arc/mm/init.c | 5 +-
+ arch/arm/include/asm/pgtable-3level.h | 2 +-
+ arch/arm/kernel/setup.c | 5 +-
+ arch/arm64/include/asm/Kbuild | 1 -
+ arch/arm64/include/asm/cacheflush.h | 6 -
+ arch/arm64/include/asm/kfence.h | 2 +-
+ arch/arm64/include/asm/pgtable.h | 8 +-
+ arch/arm64/include/asm/set_memory.h | 17 ++
+ arch/arm64/include/uapi/asm/unistd.h | 1 +
+ arch/arm64/kernel/machine_kexec.c | 1 +
+ arch/arm64/kernel/setup.c | 5 +-
+ arch/arm64/kernel/stacktrace.c | 2 +-
+ arch/arm64/mm/mmu.c | 7 +-
+ arch/arm64/mm/pageattr.c | 13 +-
+ arch/csky/kernel/setup.c | 5 +-
+ arch/h8300/kernel/setup.c | 5 +-
+ arch/hexagon/Kconfig | 1 +
+ arch/hexagon/kernel/vmlinux.lds.S | 9 +-
+ arch/ia64/include/asm/pgtable.h | 4 +-
+ arch/m68k/include/asm/motorola_pgtable.h | 2 +-
+ arch/m68k/kernel/setup_mm.c | 5 +-
+ arch/m68k/kernel/setup_no.c | 5 +-
+ arch/mips/include/asm/pgtable-64.h | 8 +-
+ arch/nds32/kernel/setup.c | 5 +-
+ arch/nios2/kernel/setup.c | 5 +-
+ arch/openrisc/kernel/setup.c | 5 +-
+ arch/parisc/include/asm/pgtable.h | 4 +-
+ arch/powerpc/include/asm/book3s/64/pgtable.h | 11 +-
+ .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 2 +
+ arch/powerpc/include/asm/nohash/64/pgtable-4k.h | 6 +-
+ arch/powerpc/include/asm/nohash/64/pgtable.h | 6 +-
+ arch/powerpc/include/asm/tlb.h | 6 +
+ arch/powerpc/kernel/setup-common.c | 5 +-
+ arch/powerpc/mm/book3s64/radix_hugetlbpage.c | 8 +-
+ arch/powerpc/mm/book3s64/radix_pgtable.c | 6 +-
+ arch/powerpc/mm/book3s64/radix_tlb.c | 44 +--
+ arch/powerpc/mm/pgtable_64.c | 4 +-
+ arch/powerpc/platforms/Kconfig.cputype | 2 +
+ arch/riscv/Kconfig | 4 +-
+ arch/riscv/include/asm/pgtable-64.h | 4 +-
+ arch/riscv/include/asm/unistd.h | 1 +
+ arch/riscv/kernel/setup.c | 5 +-
+ arch/s390/kernel/setup.c | 5 +-
+ arch/sh/include/asm/pgtable-3level.h | 4 +-
+ arch/sh/kernel/setup.c | 5 +-
+ arch/sparc/include/asm/pgtable_32.h | 6 +-
+ arch/sparc/include/asm/pgtable_64.h | 10 +-
+ arch/um/include/asm/pgtable-3level.h | 2 +-
+ arch/x86/entry/syscalls/syscall_32.tbl | 1 +
+ arch/x86/entry/syscalls/syscall_64.tbl | 1 +
+ arch/x86/include/asm/pgtable.h | 8 +-
+ arch/x86/kernel/dumpstack.c | 2 +-
+ arch/x86/kernel/setup.c | 5 +-
+ arch/x86/mm/init_64.c | 4 +-
+ arch/x86/mm/pat/set_memory.c | 4 +-
+ arch/x86/mm/pgtable.c | 2 +-
+ include/asm-generic/pgtable-nop4d.h | 2 +-
+ include/asm-generic/pgtable-nopmd.h | 2 +-
+ include/asm-generic/pgtable-nopud.h | 2 +-
+ include/linux/bootconfig.h | 4 +-
+ include/linux/buildid.h | 8 +
+ include/linux/compaction.h | 4 +-
+ include/linux/cpumask.h | 2 +-
+ include/linux/crash_core.h | 12 +-
+ include/linux/debugobjects.h | 2 +-
+ include/linux/hmm.h | 2 +-
+ include/linux/hugetlb.h | 6 +-
+ include/linux/kallsyms.h | 20 +-
+ include/linux/list_lru.h | 4 +-
+ include/linux/lru_cache.h | 8 +-
+ include/linux/mm.h | 3 +
+ include/linux/mmu_notifier.h | 8 +-
+ include/linux/module.h | 9 +-
+ include/linux/nodemask.h | 6 +-
+ include/linux/percpu-defs.h | 2 +-
+ include/linux/percpu-refcount.h | 2 +-
+ include/linux/pgtable.h | 4 +-
+ include/linux/scatterlist.h | 2 +-
+ include/linux/secretmem.h | 54 ++++
+ include/linux/set_memory.h | 12 +
+ include/linux/shrinker.h | 2 +-
+ include/linux/syscalls.h | 1 +
+ include/linux/vmalloc.h | 4 +-
+ include/uapi/asm-generic/unistd.h | 7 +-
+ include/uapi/linux/magic.h | 1 +
+ init/Kconfig | 1 +
+ init/main.c | 2 +
+ kernel/crash_core.c | 50 +---
+ kernel/kallsyms.c | 104 ++++++--
+ kernel/module.c | 42 ++-
+ kernel/power/hibernate.c | 5 +-
+ kernel/sys_ni.c | 2 +
+ lib/Kconfig.debug | 17 +-
+ lib/asn1_encoder.c | 2 +-
+ lib/buildid.c | 74 ++++--
+ lib/devres.c | 2 +-
+ lib/dump_stack.c | 13 +-
+ lib/dynamic_debug.c | 2 +-
+ lib/fonts/font_pearl_8x8.c | 2 +-
+ lib/kfifo.c | 2 +-
+ lib/list_sort.c | 2 +-
+ lib/nlattr.c | 4 +-
+ lib/oid_registry.c | 2 +-
+ lib/pldmfw/pldmfw.c | 2 +-
+ lib/reed_solomon/test_rslib.c | 2 +-
+ lib/refcount.c | 2 +-
+ lib/rhashtable.c | 2 +-
+ lib/sbitmap.c | 2 +-
+ lib/scatterlist.c | 4 +-
+ lib/seq_buf.c | 2 +-
+ lib/sort.c | 2 +-
+ lib/stackdepot.c | 2 +-
+ lib/test_bitops.c | 2 +-
+ lib/test_bpf.c | 2 +-
+ lib/test_kasan.c | 2 +-
+ lib/test_kmod.c | 6 +-
+ lib/test_scanf.c | 2 +-
+ lib/vsprintf.c | 10 +-
+ mm/Kconfig | 4 +
+ mm/Makefile | 1 +
+ mm/gup.c | 12 +
+ mm/init-mm.c | 9 +
+ mm/internal.h | 3 +
+ mm/mlock.c | 3 +-
+ mm/mmap.c | 5 +-
+ mm/mremap.c | 108 ++++++--
+ mm/secretmem.c | 254 ++++++++++++++++++
+ mm/slub.c | 79 +++---
+ scripts/checksyscalls.sh | 4 +
+ scripts/decode_stacktrace.sh | 89 +++++--
+ tools/testing/selftests/vm/.gitignore | 1 +
+ tools/testing/selftests/vm/Makefile | 3 +-
+ tools/testing/selftests/vm/memfd_secret.c | 296 +++++++++++++++++++++
+ tools/testing/selftests/vm/mremap_test.c | 118 ++++----
+ tools/testing/selftests/vm/run_vmtests.sh | 17 ++
+ 137 files changed, 1465 insertions(+), 438 deletions(-)
+ create mode 100644 arch/arm64/include/asm/set_memory.h
+ create mode 100644 include/linux/secretmem.h
+ create mode 100644 mm/secretmem.c
+ create mode 100644 tools/testing/selftests/vm/memfd_secret.c
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 000000000000..6759f727a3b5
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20210624