From b1d84fc09a961e0a8be3d3dc6ca1b7cddc3ced87 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 26 May 2022 17:22:53 +1000
Subject: [PATCH] Add linux-next specific files for 20220526
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
Next/SHA1s | 351 +
Next/Trees | 353 +
Next/merge.log | 16595 ++++++++++++++++++++++++++++++++++++++++++++
localversion-next | 1 +
4 files changed, 17300 insertions(+)
create mode 100644 Next/SHA1s
create mode 100644 Next/Trees
create mode 100644 Next/merge.log
create mode 100644 localversion-next
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 0000000000000..005bdf290d977
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,351 @@
+Name SHA1
+---- ----
+origin 7e062cda7d90543ac8c7700fc7c5527d0c0f22ad
+fixes d06c942efea40e1701ade200477a7449008d9f24
+mm-hotfixes 404a14ec8f657d7e75649c3df728034eded6af9e
+kbuild-current 3123109284176b1532874591f7c81f3837bbdc17
+arc-current c6ed4d84a2c49de7d6f490144cca7b4a4831fb6e
+arm-current 3cfb3019979666bdf33a1010147363cf05e0f17b
+arm64-fixes 1d0cb4c8864addc362bae98e8ffa5500c87e1227
+arm-soc-fixes 609a097f5f0687539490625523ec3075b7d404b8
+drivers-memory-fixes 73039c6c7f36f90391626222438f5f32742e959e
+tee-fixes 98268f2a2a9f1dddf20984f79fdc7b655d0e35fe
+m68k-current 30b5e6ef4a32ea4985b99200e06d6660a69f9246
+powerpc-fixes ee8348496c77e3737d0a6cda307a521f2cff954f
+s390-fixes a06afe8383080c630a7a528b8382fc6bb4925b61
+sparc 05a59d79793d482f628a31753c671f2e92178a21
+fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57
+net 7e062cda7d90543ac8c7700fc7c5527d0c0f22ad
+bpf 7e062cda7d90543ac8c7700fc7c5527d0c0f22ad
+ipsec 015c44d7bff3f44d569716117becd570c179ca32
+netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65
+ipvs 05ae2fba821c4d122ab4ba3e52144e21586c4010
+wireless a36e07dfe6ee71e209383ea9288cd8d1617e14f9
+rdma-fixes c5eb0a61238dd6faf37f58c9ce61c9980aaffd7a
+sound-current 0125de38122f0f66bf61336158d12a1aabfe6425
+sound-asoc-fixes 69203f3f937d4bb920b717e46260f73c801bf8c1
+regmap-fixes 3123109284176b1532874591f7c81f3837bbdc17
+regulator-fixes b11b3d21a94d66bc05d1142e0b210bfa316c62be
+spi-fixes 0cf8d32600cf5660ee45d421f1b6e3a129ca58b6
+pci-current 4246970a3bcb450e52c043127792d4f0ad39678f
+driver-core.current 42226c989789d8da4af1de0c31070c96726d990c
+tty.current 42226c989789d8da4af1de0c31070c96726d990c
+usb.current 42226c989789d8da4af1de0c31070c96726d990c
+usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120
+usb-serial-fixes 42226c989789d8da4af1de0c31070c96726d990c
+phy 2c8045d48dee703ad8eab2be7d6547765a89c069
+staging.current ce522ba9ef7e2d9fb22a39eb3371c0c64e2a433e
+iio-fixes b5e1cf77d1a0a17e53610f52f83df5e3cc654225
+counter-fixes ce522ba9ef7e2d9fb22a39eb3371c0c64e2a433e
+char-misc.current 42226c989789d8da4af1de0c31070c96726d990c
+soundwire-fixes 3123109284176b1532874591f7c81f3837bbdc17
+thunderbolt-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f
+input-current b26ff9137183309c18cdfe931e1cafcf3c1a980d
+crypto-current 16287397ec5c08aa58db6acf7dbc55470d78087d
+vfio-fixes 1ef3342a934e235aca72b4bcc0d6854d80a65077
+kselftest-fixes e8f0c89659323f3ddf60dcedcd56fe3ac36a37bf
+modules-fixes 7390b94a3c2d93272d6da4945b81a9cf78055b7b
+dmaengine-fixes 7495a5bbf89f68c8880757c112fd0994f5dba309
+backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15
+mtd-fixes ba7542eb2dd5dfc75c457198b88986642e602065
+mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6
+v4l-dvb-fixes d4cb77112c7b654d9e95c45b1871b18fe1a62f31
+reset-fixes 03cb66463b5547b289099a95ac4ea591cca88ca9
+mips-fixes f0a6c68f69981214cb7858738dd2bc81475111f7
+at91-fixes 0c640d9544d0109da3889d71ae77301e556db977
+omap-fixes 46ff3df87215ff42c0cd2c4bdb7d74540384a69c
+kvm-fixes 9f46c187e2e680ecd9de7983e4d081c3391acc76
+kvms390-fixes 4aa5ac75bf79cbbc46369163eb2e3addbff0d434
+hwmon-fixes 42226c989789d8da4af1de0c31070c96726d990c
+nvdimm-fixes d28820419ca332f856cdf8bef0cafed79c29ed05
+cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28
+btrfs-fixes 48de4dc2689457ada7e875b2924fe5731e99b0df
+vfs-fixes fb4554c2232e44d595920f4d5c66cf8f7d13f9bc
+dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c
+i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8
+drivers-x86-fixes 44acfc22c7d055d9c4f8f0974ee28422405b971a
+samsung-krzk-fixes 436ce66003d5020ca02cd096761d3214e9a91d82
+pinctrl-samsung-fixes ac875df4d854ab13d9c4af682a1837a1214fecec
+devicetree-fixes 5dc4630426511f641b7ac44fc550b8e21eafb237
+scsi-fixes d5d92b64408443e113b9742f8f1c35278910dd4d
+drm-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f
+amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01
+drm-intel-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f
+mmc-fixes e949dee3625e1b0ef2e40d9aa09c2995281b12f6
+rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d
+gnss-fixes 3123109284176b1532874591f7c81f3837bbdc17
+hyperv-fixes eaa03d34535872d29004cb5cf77dc9dec1ba9a25
+soc-fsl-fixes a222fd8541394b36b13c89d1698d9530afd59a9c
+risc-v-fixes c932edeaf6d6e6cc25088e61c3fcf585c30497c0
+pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d
+fpga-fixes 3123109284176b1532874591f7c81f3837bbdc17
+spdx 53c83d6d8e399fad3d3d25df0ea0d54eb0f94f88
+gpio-brgl-fixes 3ecb10175b1f776f076553c24e2689e42953fef5
+gpio-intel-fixes 0c2cae09a765b1c1d842eb9328982976ec735926
+pinctrl-intel-fixes 7b923e67a4a76b8e0d7f5eb7688e4546fd9954bc
+erofs-fixes 8b1ac84dcf2cf0fc86f29e92e5c63c4862de6e55
+integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf
+kunit-fixes 02c7efa43627163e489a8db87882445a0ff381f7
+ubifs-fixes c3c07fc25f37c157fde041b3a0c3dfcb1590cbce
+memblock-fixes c94afc46cae7ad41b2ad6a99368147879f4b0e56
+cel-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f
+irqchip-fixes 544808f7e21cb9ccdb8f3aa7de594c05b1419061
+renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609
+perf-current eaea45fc0e7b6ae439526b4a41d91230c8517336
+efi-fixes 9feaf8b387ee0ece9c1d7add308776b502a35d0c
+zstd-fixes 88a309465b3f05a100c3b81966982c0f9f5d23a6
+drm-misc-fixes 6e516faf04317db2c46cbec4e3b78b4653a5b109
+kbuild 58d493ffabada69c6e16e710923043e504c6a4ed
+clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0
+perf 5d2b6bc3a6a27ad265d2ec0d53dd7ef33bd314fc
+compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69
+dma-mapping 4a37f3dd9a83186cb88d44808ab35b78375082c9
+asm-generic b2441b3bdce6c02cb96278d98c620d7ba1d41b7b
+arc 6aa98f6217861889523e38b0141c8c71b2ef8a83
+arm b6f21d14f1ac1261579b691673a0c823275cbaf8
+arm64 0616ea3f1b93a99264d84f3d002ae117f6526b62
+arm-perf c5781212985a76ae610d18429388f9ec6ee3f77b
+arm-soc 2b7d17d4b7c1ff40f58b0d32be40fc0bb6c582fb
+actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6
+amlogic 1dac6e1d8385a34c4a721551be9c64bf7b7cdcec
+aspeed 8dc7aa0a7246ad0f718d91d09b4d48460508627b
+at91 3519476d99a47c3545077078292719a7514ce3f7
+drivers-memory 1e2b798e96646fa7cc0867735433a8da3b2b4bb0
+imx-mxs 6ed2affe8f7ffc8ada277b56feb538e76f1c3cb1
+keystone cb293d3b430e35dbc1e8425869f27624355ff10a
+mediatek 8434c5a06e3c407851c223448df7042fa367773a
+mvebu 58ec0844bd13e3ee6d462024db9b30652cf8ca58
+omap b5418fc0478c01d629653abb6e401e262c674da5
+qcom 5faa5cd718a40b22d49717c4909a65ce6e5d0816
+raspberrypi c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca
+renesas 7ae962c56cead900694de323c7b4f1b39568e2b6
+reset 2ca065dc9468fa1c60ada1e8cb9c1aa866367ec7
+rockchip 1378fa35abe3de0606be4055e58bc0727bcd1e32
+samsung-krzk 88fb0c4d0aff5f8a7a11696d57b3c6b3fbc7f7c9
+scmi 4b0986a3613c92f4ec1bdc7f60ec66fea135991f
+stm32 747a29b9a5a52a14833b2477cb621f57d36511ed
+sunxi 073220ee354dcd79f954836ffb4a71c72e707f08
+tee db30e53bf897670e11fdfa199a3ca7079db20fd2
+tegra 864067632632083f0a4e252906f4bbc560ed61c3
+ti 4cc89036bc4f6d08a47240d33521644f27ee2f97
+xilinx 63623390c0d66363e0046f18bb178d6d9c50ec88
+clk 71cc785d295527587faa8e3d825ef7c0e1cb2d12
+clk-imx cf7f3f4fa9e57b8e9f594823e77e6cbb0ce2b254
+clk-renesas 23426d1be3c20907b4f3d72bf95234d4ee254393
+clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862
+csky 64d83f06774668081258bd7f3241267239bb9ab2
+loongarch cdfe896c18ca08e9d2633caa7f7692a7ee154ff2
+m68k 30b5e6ef4a32ea4985b99200e06d6660a69f9246
+m68knommu 6b8be804ff376f6657ccdf6b29974e7c793d88c4
+microblaze 78b5f52ab6f6074a6fe2f27122e2165f32d6a143
+mips 795d82ed389b0592aefa49c4b1c498351da65a63
+nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae
+openrisc 83da38d82b2f7ac207646e55be94e8bd642e2c39
+parisc-hd c1770918492414e8dc103d996f3f3860ee0bfd6c
+powerpc a5d28039ecb288f4788ae98c8291e092961e8742
+soc-fsl 1ce93cb102e7fcf5d1849044d23ce92b5a71040a
+risc-v 19bc59bbeddf07360ef8bceb420f95712977a32f
+s390 1905a336ba03ca6bb2eca8cc4a1f0c9c78812e7d
+sh 8518e694203d0bfd202ea4a80356785b6992322e
+sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5
+uml 82017457957a550d7d00dde419435dd74a890887
+xtensa dc60001e1a305ad8bba1ddaf09484e0e150aba60
+pidfd e1bbcd277a53e08d619ffeec56c5c9287f2bf42f
+fscrypt 218d921b581eadf312c8ef0e09113b111f104eeb
+fscache 713423282ae1a07ae581403b91aee3e4543eb629
+afs 26291c54e111ff6ba87a164d85d4a4e134b7315c
+btrfs 0a05fafe9def0d9f0fbef3dfc8094925af9e3185
+ceph c4a9c116dbbbb39ab8d8cfca6809a2a661b99765
+cifs b1f26cfaee3d8c1ab419b837e5bd9027d1824afe
+configfs 84ec758fb2daa236026506868c8796b0500c047d
+ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f
+erofs ba73eadd23d1c2dc5c8dc0c0ae2eeca2b9b709a7
+exfat 64ba4b15e5c045f8b746c6da5fc9be9a6b00b61d
+ext3 5c905e1a0180d37ee4e46a17d914b79afc7f3482
+ext4 5f41fdaea63ddf96d921ab36b2af4a90ccdb5744
+f2fs 908ea6541661d72c6852650f91adebba88b0de0b
+fsverity e6af1bb07704b53bad7771db1b05ee17abad11cb
+fuse 6b49bc9d8a5fe64369680f821b8788ec08d4470c
+gfs2 c360abbb9db298d0548b31e1a86a48ebb157d7cd
+jfs e471e5942c006532a013eefde239ce1e783ac2d9
+ksmbd 376b9133826865568167b4091ef92a68c4622b87
+nfs 42226c989789d8da4af1de0c31070c96726d990c
+nfs-anna 9c4a5c75a62e83963083efd4eea5d5bd1583193c
+nfsd d2c87a674b96f465ae0e7dda81f8ab407806c1b7
+ntfs3 52e00ea6b26e45fb8159e3b57cdde8d3f9bdd8e9
+orangefs 40a74870b2d1d3d44e13b3b73c6571dd34f5614d
+overlayfs bc70682a497c4f3c968c552e465d1d9948b1ff4c
+ubifs 705757274599e2e064dd3054aabc74e8af31a095
+v9fs 22e424feb6658c5d6789e45121830357809c59cb
+xfs ab6a8d3f1a2a85dea5b300fd63b7033cb1040a95
+zonefs 31a644b3c2ae6d0c47e84614ded3ce9bef1adb7a
+iomap e9c3a8e820ed0eeb2be05072f29f80d1b79f053b
+djw-vfs 49df34221804cfd6384135b28b03c9461a31d024
+file-locks 80d8e4d3f3133d2ce8ac83db6806b7bf62e3a1e1
+vfs e9921ffd594f7784abf1b765135dbd18cb3261ee
+printk a110b11164a53aa1cb2769ec418e6ab9c95a045e
+pci 32f479d05a445b52cb7fcbe6e06f579fb852be71
+pstore 8126b1c73108bc691f5643df19071a59a69d0bc6
+hid b01c83388f54dc9a4946cbbf00ea86664d9d1cf7
+i2c 44e66c3bda45ca298a98f7f015c5e50d75040bf8
+i3c 227fab1ee7ca70c9b4b0915898e81327aeb70414
+dmi f97a2103f1a75ca70f23deadb4d96a16c4d85e7d
+hwmon-staging 8877ecb0fc8d7662218a8e7ebb0650f320467935
+jc_docs b86f46d5ce3e7497930be931a9a9e57480f0baff
+v4l-dvb 340ce50f75a6bdfe6d1850ca49ef37a8e2765dd1
+v4l-dvb-next 340ce50f75a6bdfe6d1850ca49ef37a8e2765dd1
+pm 15e13f9dc84a0151e6a20e16b48ea79bf1664656
+cpufreq-arm 39b360102f3ac6b12cafac9db25762071eb0418c
+cpupower 3123109284176b1532874591f7c81f3837bbdc17
+devfreq 2e691421a2c9e0462175fe98171afa632861b199
+opp 22079af7df5a5dfef1c4d160abfd43035211759e
+thermal 72b3fc61c75227c77b1ef14073fba70a50668940
+ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3
+dlm 8e51ec6146fdec82f7308f89113497631013f16a
+rdma b90c7e97c48bb1a94cd49cc32a4d2a62a06cbf1c
+net-next 7e062cda7d90543ac8c7700fc7c5527d0c0f22ad
+bpf-next 7e062cda7d90543ac8c7700fc7c5527d0c0f22ad
+ipsec-next 0f9008e5c5103e32e788d260558d170c2fc9c2be
+mlx5-next 846e437387e74c44ddc9f3eeec472fd37ca3cdb9
+netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3
+ipvs-next 0c7b27616fbd64b3b86c59ad5441f82a1a0c4176
+bluetooth 677fb7525331375ba2f90f4bc94a80b9b6e697a3
+wireless-next 805cb5aadc2a88c453cfe620b28e12ff2fac27a6
+mtd 2c51d0d88020b4d3c9bbe7d9df2796b2c2ce05b8
+nand 6a2277a0ebe71b45e1d5508a2d7aecd28c98e3d3
+spi-nor c47452194641b5d27c20e557c84a46c85fd7ce37
+crypto e4e62bbc6aba49a5edb3156ec65f6698ff37d228
+drm c4955d9cd2fc56c43e78c908dad4e2cac7cc9073
+drm-misc 5ee8c8f930ba7d20717c4fc2d9f1ce0e757d1155
+amdgpu 62ba2ab31f67aa62f0c4c3674e84cfd95f825038
+drm-intel 0ea917819d12fed41ea4662cc26ffa0060a5c354
+drm-tegra b53c24f69199b88671293de503f1f999a762f4f9
+drm-msm 24df12013853ac59c52cc726e9cbe51e38d09eda
+imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29
+etnaviv 2829a9fcb738f742baad9d15de4c6eac84bcfd08
+fbdev 9f56390f8c49a1e2f38f049673dcbb407a742302
+regmap 5c422f0b970d287efa864b8390a02face404db5d
+sound 0125de38122f0f66bf61336158d12a1aabfe6425
+sound-asoc 69203f3f937d4bb920b717e46260f73c801bf8c1
+modules 7390b94a3c2d93272d6da4945b81a9cf78055b7b
+input fabcf4d8696839a8da8a3f90d1fd30ae923ddde7
+block 44d8538d7e7dbee7246acda3b706c8134d15b9cb
+device-mapper ca522482e3eafd005b8d4e8b1331c911505a58d5
+libata 71abb4df29815d17f3dff98dce553fc1732d9738
+pcmcia 3928cf08334ed895a31458cbebd8d4ec6d84c080
+mmc ded2c4c345001a129293db4bc1fa9ae236ceb0d9
+mfd f93afd8e7567fa9dcf0089ff4ce5a713bfb5dae7
+backlight 023a8830a62846e1cecc8da07e00c801dd0d7598
+battery d96a89407e5f682d1cb22569d91784506c784863
+regulator a5b8e4a5ceec0ab6453176bc7f5eceafa78bf8a9
+security 047843bdb3160e8fb225f3752616ac7257033fe4
+apparmor c2489617b3b9a546789ca00940b205d61c518c81
+integrity 048ae41bb0806cde340f4e5d5030398037ab0be8
+keys 2d743660786ec51f5c1fefd5782bbdee7b227db0
+safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5
+selinux 1af0e4a0233fea7e8226cb977d379dc20f9bbe11
+smack ba6b652bd8633bc90390e1a02ae0c743ea00c429
+tomoyo e449c388913ccd36641f7cc0c335029a7cc161f4
+tpmdd 7f3113e3b9f7207f0bd57b5fdae1a1b9c8215e08
+watchdog 5d24df3d690809952528e7a19a43d84bc5b99d44
+iommu b0dacee202efbf1a5d9f5cdfd82049e8b5b085d2
+audit 3123109284176b1532874591f7c81f3837bbdc17
+devicetree d036d915b61f23b9e80d93f8a606eebf3bfab73f
+mailbox 79f9fbe303520d2c32b70f04f2bb02cc2baaa4c3
+spi 9c63b846e6df43e5b3d31263f7db545f32deeda3
+tip d092c10c647e4966619ffbab3cfc0c3e2e2a8a0b
+clockevents ff714ee7191b55c26540550cebd4c28589e06de1
+edac 92705c9f99563adb33a7e9ea72ed3d17971fc2bc
+irqchip 492449ae4f0ad96948c3e029ca00736a7f1b3d77
+ftrace c87857e214862a125208a4b1a510839d0c5a1bd4
+rcu 409db57c8d453f267f1ffab3d4367440a832eff4
+kvm 85165781c5d900d97052be1d2723f6929d56768d
+kvm-arm 5c0ad551e9aa6188f2bda0977c1cb6768a2b74ef
+kvms390 c71159648c3cf0f7127ddc0bdf3eb4d7885210df
+xen-tip 5b3353949e89d48b4faf54a9cc241ee5d70df615
+percpu 4e1f82dce05b644d6886d5b3656446d8ec50db20
+workqueues 10a5a651e3afc9b0b381f47e8930972e4e918397
+drivers-x86 badb81a58b9e66ca8c15405476f5134e45b57dee
+chrome-platform abd4fd43f2af03e2e852e6b1b98faeee9e3eae55
+hsi 43c14f8d18a7ab26e8f0e960bfd8f4d0a9c57c4d
+leds e98a860f65428a3cae7ed7b3e8ebcf6320d7fc5e
+ipmi a508e33956b538e034ed5df619a73ec7c15bda72
+driver-core b232b02bf3c205b13a26dcec08e53baddd8e59ed
+usb 97fa5887cf283bb75ffff5f6b2c0e71794c02400
+thunderbolt c7c99a09ef0e2615d13e13b19c74428ca43b7dcf
+usb-gadget e49d033bddf5b565044e2abe4241353959bc9120
+usb-serial 33b7af2f459df453feb0d44628d820c47fefe7a8
+tty 25e02ba60f0fbe65ba07553b5b2b8867726273c4
+char-misc 90de6805267f8c79cd2b1a36805071e257c39b5c
+coresight 1adff542d67a2ed1120955cb219bfff8a9c53f59
+fpga ae23f746d7442909a19bd43397b567145d6e5db3
+icc 3be0ec65fd17b9677d0a4c8913ee359bd941da5d
+iio c321674386d8d5597831cbf980f566df8c98d4c1
+phy-next d413a34932f98cc5bf0ffdd332884a8b63a1a7f9
+soundwire 74da272400b46f2e898f115d1b1cd60828766919
+extcon 5dcc2afe716d69f5112ce035cb14f007461ff189
+gnss 3123109284176b1532874591f7c81f3837bbdc17
+vfio 421cfe6596f6cb316991c02bf30a93bd81092853
+staging 6a31a95135da0bb2c5349e49e37d76e9909ab7ea
+mux 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1
+dmaengine d1a28597808268b87f156138aad3104aa255e62b
+cgroup 8a4f243bd5cfd2885c52eaf0075732d4ee77d78d
+scsi c4068bc397c5e3c78dae42466a9261f84875f53b
+scsi-mkp f9f0a46141e2e39bedb4779c88380d1b5f018c14
+vhost 73211bf1bc3ac0a3c544225e270401c1fe5d395d
+rpmsg 01a1a0c8d456b11f2f6b9b822414481beaa44d6f
+gpio 7ac554888233468a9fd7c4f28721396952dd9959
+gpio-brgl 5a7cb9f3978d1fe8cfba798b4c9c054ce226e8fd
+gpio-intel edc5601db66411a8c9c6b08b3aacf7e154a34c6d
+gpio-sim 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1
+pinctrl 83969805cc716a7dc6b296c3fb1bc7e5cd7ca321
+pinctrl-intel 7b923e67a4a76b8e0d7f5eb7688e4546fd9954bc
+pinctrl-renesas fc883ed5a43e5f94894216896d74190ecf1356ff
+pinctrl-samsung ac875df4d854ab13d9c4af682a1837a1214fecec
+pwm 3d593b6e80ad2c911b5645af28d83eabb96e7c1b
+userns a58ea318d8b94c46a045ac3bc5abca28ee7c7d32
+ktest 170f4869e66275f498ae4736106fb54c0fdcd036
+kselftest 15477b31db104bc795dd1acccb3e9b89465fff01
+livepatching 0e11f2076e7fa3efa3e0a694bc4d30ef185f0f7d
+rtc 3f3489248927a53fcfec571ff603163f6b676a46
+nvdimm f42e8e5088b9e791c8f7ac661f68e29a4996a4e3
+at24 3123109284176b1532874591f7c81f3837bbdc17
+ntb e9d0fa5e2482d08f079861a03c9f40a47dacfcb0
+seccomp 5e91d2a4146946ea0abc984ca957f12b70632901
+cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b
+fsi f2af60bb7ce2fa5397f401cbf65725d9c87329a4
+slimbus 54bf672111eef18819fa6e562f68b2d6c449b05d
+nvmem 0f07cbb92a28894a58fb70fc49e37de8e855eda8
+xarray 63b1898fffcd8bd81905b95104ecc52b45a97e21
+hyperv b4927bd272623694314f37823302f9d67aa5964c
+auxdisplay 13de23494f387315c6cfab6fe78fbed7d1b25586
+kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46
+hmm 3123109284176b1532874591f7c81f3837bbdc17
+kunit 3123109284176b1532874591f7c81f3837bbdc17
+cfi 3123109284176b1532874591f7c81f3837bbdc17
+kunit-next e7eaffce47b7db72b077630dbe836f0c4132496d
+trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b
+mhi 13b9b814da2de5006795ddcff2bbaea46017429d
+memblock 000605cd1b14f0970465a44bfe89da93cca66348
+init 38b082236e77d403fed23ac2d30d570598744ec3
+counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62
+cxl 34e37b4c432cd0f1842b352fde4b8878b4166888
+folio-iomap 4d7bd0eb72e5831ddb1288786a96448b48440825
+zstd 88a309465b3f05a100c3b81966982c0f9f5d23a6
+efi 3f68e69520d3d52d66a6ad872a75b7d8f2ea7665
+unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1
+slab 6b2d727295817abef9351a88392f031720af88f3
+random fdaf9a5840acaab18694a19e0eb0aa51162eeeed
+landlock fdaf9a5840acaab18694a19e0eb0aa51162eeeed
+rust 9a5fe747d99e1d562dde1f39259bbe2d098262ae
+sysctl 494dcdf46e5cdee926c9f441d37e3ea1db57d1da
+folio 516edb456f121e819d2130571004ed82f9566c4d
+execve 70578ff3367dd4ad8f212a9b5c05cffadabf39a8
+bitmap db7b4edf37fe9872bec4d1537d67c4c9f95810b6
+hte af583852d2efcbc76ce68ac8d65126d4b0c65067
+kspp d37aa2efc89b387cda93bf15317883519683d435
+kspp-gustavo 0cf2b91d74b7ec0e971dcd00de875e2d04b56350
+mm-stable f403f22f8ccb12860b2b62fec3173c6ccd45938b
+mm-nonmm-stable 3159d79b56c15068aeb7e4630cd5f6dacd20fda4
+mm 3fc24b0fa2b60fdb66b8592a86d1b1a4e02feb35
+akpm 9a465c091e5d5d24db28f5ef6f4a911393eafca8
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 0000000000000..b621220e44777
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,353 @@
+Trees included into this release:
+
+Name Type URL
+---- ---- ---
+origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master
+fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes
+mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable
+kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes
+arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr
+arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes
+arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes
+arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes
+drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes
+tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes
+m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus
+powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes
+s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes
+sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master
+fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable
+net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master
+bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master
+ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master
+netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master
+ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master
+wireless git git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#main
+rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc
+sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus
+sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus
+regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus
+regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus
+spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus
+pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus
+driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus
+tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus
+usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus
+usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes
+usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus
+phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes
+staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus
+iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg
+counter-fixes git https://gitlab.com/vilhelmgray/counter.git#fixes-togreg
+char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus
+soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes
+thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes
+input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus
+crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master
+vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus
+kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes
+modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-linus
+dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes
+backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes
+mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes
+mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes
+v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes
+reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes
+mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes
+at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes
+omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes
+kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master
+kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master
+hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon
+nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes
+cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes
+btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes
+vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes
+dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus
+i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/fixes
+drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes
+samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes
+pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes
+devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus
+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/fpga/linux-fpga.git#fixes
+spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus
+gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current
+gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes
+pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes
+erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes
+integrity-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#fixes
+kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes
+ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes
+memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes
+cel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-rc
+irqchip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-fixes
+renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes
+perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/urgent
+efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent
+zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus
+drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes
+kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next
+clang-format git https://github.com/ojeda/linux.git#clang-format
+perf git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/core
+compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes
+dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next
+asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master
+arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next
+arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next
+arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core
+arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf
+arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next
+actions git git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git#for-next
+amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next
+aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next
+at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next
+drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next
+imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next
+keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next
+mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next
+mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next
+omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next
+qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next
+raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next
+renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next
+reset git https://git.pengutronix.de/git/pza/linux#reset/next
+rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next
+samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next
+scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next
+stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next
+sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next
+tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next
+tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next
+ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next
+xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next
+clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next
+clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next
+clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk
+clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next
+csky git git://github.com/c-sky/csky-linux.git#linux-next
+loongarch git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next
+m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next
+m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next
+microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next
+mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next
+nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next
+openrisc git git://github.com/openrisc/linux.git#for-next
+parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next
+powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next
+soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next
+risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next
+s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next
+sh git git://git.libc.org/linux-sh#for-next
+sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master
+uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next
+xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next
+pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next
+fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master
+fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next
+afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next
+btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next
+ceph git git://github.com/ceph/ceph-client.git#master
+cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next
+configfs git git://git.infradead.org/users/hch/configfs.git#for-next
+ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next
+erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev
+exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev
+ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next
+ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev
+f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev
+fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity
+fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next
+gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next
+jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next
+ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next
+nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next
+nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next
+nfsd git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-next
+ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master
+orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next
+overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next
+ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next
+v9fs git git://github.com/martinetd/linux#9p-next
+xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next
+zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next
+iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next
+djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next
+file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next
+vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next
+printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next
+pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next
+pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore
+hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next
+i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next
+i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next
+dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next
+hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next
+jc_docs git git://git.lwn.net/linux.git#docs-next
+v4l-dvb git git://linuxtv.org/media_tree.git#master
+v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master
+pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next
+cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next
+cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower
+devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next
+opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next
+thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next
+ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next
+dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next
+rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next
+net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master
+bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next
+ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master
+mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next
+netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master
+ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master
+bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master
+wireless-next git git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#main
+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
+fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next
+regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next
+sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next
+sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next
+modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next
+input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next
+block git git://git.kernel.dk/linux-block.git#for-next
+device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next
+libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#for-next
+pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next
+mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next
+mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next
+backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next
+battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next
+regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next
+security git git://git.kernel.org/pub/scm/linux/kernel/git/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#master
+clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next
+edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next
+irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next
+ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next
+rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next
+kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next
+kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next
+kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next
+xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next
+percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next
+workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next
+drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next
+chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next
+hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next
+leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next
+ipmi git git://github.com/cminyard/linux-ipmi.git#for-next
+driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next
+usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next
+thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next
+usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next
+usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next
+tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next
+char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next
+coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next
+fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next
+icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next
+iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg
+phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next
+soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next
+extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next
+gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next
+vfio git git://github.com/awilliam/linux-vfio.git#next
+staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next
+mux git https://gitlab.com/peda-linux/mux.git#for-next
+dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next
+cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next
+scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next
+scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next
+vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next
+rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next
+gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next
+gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next
+gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next
+gpio-sim git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/gpio-sim
+pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next
+pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next
+pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl
+pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next
+pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next
+userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next
+ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next
+kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next
+livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next
+rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next
+nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next
+at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next
+ntb git https://github.com/jonmason/ntb.git#ntb-next
+seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp
+cisco git https://github.com/daniel-walker/cisco-linux.git#for-next
+fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next
+slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next
+nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next
+xarray git git://git.infradead.org/users/willy/xarray.git#main
+hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next
+auxdisplay git https://github.com/ojeda/linux.git#auxdisplay
+kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next
+hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm
+kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test
+cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next
+kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit
+trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next
+mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next
+memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next
+init git git://git.infradead.org/users/hch/misc.git#init-user-pointers
+counters git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#counters
+cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next
+folio-iomap git git://git.infradead.org/users/willy/linux.git#folio-iomap
+zstd git https://github.com/terrelln/linux.git#zstd-next
+efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next
+unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next
+slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#for-next
+random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master
+landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next
+rust git https://github.com/Rust-for-Linux/linux.git#rust-next
+sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#sysctl-next
+folio git git://git.infradead.org/users/willy/pagecache.git#for-next
+execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve
+bitmap git https://github.com/norov/linux.git#bitmap-for-next
+hte git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#hte/for-next
+kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp
+kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp
+mm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable
+mm-nonmm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable
+mm git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-everything
+akpm mmotm https://www.ozlabs.org/~akpm/mmotm/
diff --git a/Next/merge.log b/Next/merge.log
new file mode 100644
index 0000000000000..72c26e8a68e7d
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,16595 @@
+$ date -R
+Thu, 26 May 2022 08:37:35 +1000
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+Updating files: 65% (7756/11887)
Updating files: 66% (7846/11887)
Updating files: 67% (7965/11887)
Updating files: 68% (8084/11887)
Updating files: 69% (8203/11887)
Updating files: 70% (8321/11887)
Updating files: 71% (8440/11887)
Updating files: 72% (8559/11887)
Updating files: 73% (8678/11887)
Updating files: 74% (8797/11887)
Updating files: 75% (8916/11887)
Updating files: 76% (9035/11887)
Updating files: 77% (9153/11887)
Updating files: 78% (9272/11887)
Updating files: 79% (9391/11887)
Updating files: 80% (9510/11887)
Updating files: 81% (9629/11887)
Updating files: 82% (9748/11887)
Updating files: 83% (9867/11887)
Updating files: 84% (9986/11887)
Updating files: 85% (10104/11887)
Updating files: 86% (10223/11887)
Updating files: 87% (10342/11887)
Updating files: 88% (10461/11887)
Updating files: 89% (10580/11887)
Updating files: 90% (10699/11887)
Updating files: 91% (10818/11887)
Updating files: 92% (10937/11887)
Updating files: 93% (11055/11887)
Updating files: 94% (11174/11887)
Updating files: 95% (11293/11887)
Updating files: 96% (11412/11887)
Updating files: 97% (11531/11887)
Updating files: 98% (11650/11887)
Updating files: 99% (11769/11887)
Updating files: 100% (11887/11887)
Updating files: 100% (11887/11887), done.
+HEAD is now at 0350785b0a09 Merge tag 'integrity-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity
+Merging origin/master (7e062cda7d90 Merge tag 'net-next-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master
+Updating 0350785b0a09..7e062cda7d90
+Fast-forward (no commit created; -m option ignored)
+ Documentation/ABI/testing/sysfs-class-regulator | 81 +
+ Documentation/admin-guide/cgroup-v2.rst | 2 +-
+ Documentation/admin-guide/devices.txt | 2 +-
+ Documentation/admin-guide/kernel-parameters.rst | 11 +-
+ Documentation/admin-guide/kernel-parameters.txt | 348 +-
+ Documentation/admin-guide/media/vimc.dot | 14 +-
+ Documentation/admin-guide/sysctl/kernel.rst | 7 +
+ Documentation/admin-guide/sysctl/net.rst | 17 +
+ Documentation/bpf/instruction-set.rst | 4 +-
+ Documentation/bpf/libbpf/index.rst | 3 +-
+ Documentation/cdrom/ide-cd.rst | 538 -
+ Documentation/cdrom/index.rst | 1 -
+ Documentation/core-api/index.rst | 2 +
+ Documentation/core-api/printk-index.rst | 137 +
+ Documentation/{ => core-api}/watch_queue.rst | 0
+ Documentation/dev-tools/ktap.rst | 18 +-
+ Documentation/dev-tools/kunit/api/index.rst | 5 +
+ Documentation/dev-tools/kunit/api/resource.rst | 13 +
+ Documentation/dev-tools/kunit/architecture.rst | 2 +-
+ Documentation/dev-tools/kunit/running_tips.rst | 3 +-
+ Documentation/dev-tools/kunit/usage.rst | 19 +-
+ Documentation/dev-tools/testing-overview.rst | 63 +
+ .../arm/mediatek/mediatek,mt7622-pcie-mirror.yaml | 42 +
+ .../bindings/arm/mediatek/mediatek,mt7622-wed.yaml | 50 +
+ .../devicetree/bindings/devfreq/rk3399_dmc.txt | 212 -
+ .../devicetree/bindings/hwmon/adt7475.yaml | 22 +
+ Documentation/devicetree/bindings/hwmon/lm75.yaml | 1 +
+ .../bindings/hwmon/microchip,lan966x.yaml | 53 +
+ .../devicetree/bindings/hwmon/national,lm90.yaml | 20 +
+ .../devicetree/bindings/hwmon/nuvoton,nct6775.yaml | 57 +
+ .../devicetree/bindings/hwmon/ti,tmp401.yaml | 105 +
+ .../bindings/media/i2c/dongwoon,dw9807-vcm.txt | 9 -
+ .../bindings/media/i2c/dongwoon,dw9807-vcm.yaml | 41 +
+ .../devicetree/bindings/media/i2c/sony,imx412.yaml | 9 +
+ .../bindings/media/mediatek,vcodec-encoder.yaml | 3 +
+ .../media/mediatek,vcodec-subdev-decoder.yaml | 4 +-
+ .../devicetree/bindings/media/microchip,xisc.yaml | 2 +-
+ .../devicetree/bindings/media/rockchip,vdec.yaml | 4 +-
+ .../devicetree/bindings/media/rockchip-vpu.yaml | 1 +
+ .../bindings/media/video-interfaces.yaml | 1 +
+ .../memory-controllers/rockchip,rk3399-dmc.yaml | 384 +
+ .../bindings/mmc/brcm,sdhci-brcmstb.yaml | 20 +-
+ .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 31 +-
+ .../bindings/mmc/marvell,dove-sdhci.yaml | 44 +
+ .../bindings/mmc/marvell,orion-sdio.yaml | 44 +
+ .../bindings/mmc/marvell,xenon-sdhci.txt | 173 -
+ .../bindings/mmc/marvell,xenon-sdhci.yaml | 275 +
+ .../devicetree/bindings/mmc/mmc-controller.yaml | 5 +-
+ Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 15 +-
+ .../devicetree/bindings/mmc/orion-sdio.txt | 16 -
+ .../devicetree/bindings/mmc/sdhci-am654.yaml | 7 +
+ .../devicetree/bindings/mmc/sdhci-dove.txt | 14 -
+ .../devicetree/bindings/mmc/sdhci-msm.txt | 123 -
+ .../devicetree/bindings/mmc/sdhci-msm.yaml | 194 +
+ .../bindings/mmc/snps,dwcmshc-sdhci.yaml | 1 +
+ .../devicetree/bindings/mtd/aspeed-smc.txt | 51 -
+ Documentation/devicetree/bindings/mtd/elm.txt | 16 -
+ .../devicetree/bindings/mtd/jedec,spi-nor.yaml | 8 -
+ .../bindings/mtd/partitions/fixed-partitions.yaml | 55 +-
+ .../devicetree/bindings/mtd/renesas-nandc.yaml | 5 +
+ Documentation/devicetree/bindings/mtd/ti,elm.yaml | 72 +
+ .../devicetree/bindings/net/adi,adin.yaml | 15 +
+ .../bindings/net/aspeed,ast2600-mdio.yaml | 6 +
+ .../devicetree/bindings/net/can/ctu,ctucanfd.yaml | 66 +
+ .../bindings/net/can/microchip,mcp251xfd.yaml | 19 +-
+ .../bindings/net/can/renesas,rcar-canfd.yaml | 5 +-
+ .../devicetree/bindings/net/cdns,macb.yaml | 8 -
+ .../devicetree/bindings/net/ethernet-phy.yaml | 9 +
+ .../bindings/net/marvell,orion-mdio.yaml | 60 +
+ .../devicetree/bindings/net/marvell-orion-mdio.txt | 54 -
+ .../devicetree/bindings/net/mediatek,net.yaml | 434 +
+ .../devicetree/bindings/net/mediatek-net.txt | 98 -
+ Documentation/devicetree/bindings/net/micrel.txt | 9 +
+ .../bindings/net/microchip,lan966x-switch.yaml | 8 +-
+ .../devicetree/bindings/net/mscc,miim.yaml | 61 +
+ .../devicetree/bindings/net/mscc-miim.txt | 26 -
+ .../devicetree/bindings/net/renesas,etheravb.yaml | 82 +-
+ .../bindings/net/sunplus,sp7021-emac.yaml | 141 +
+ .../bindings/net/toshiba,visconti-dwmac.yaml | 3 +-
+ .../bindings/net/wireless/qcom,ath11k.yaml | 361 +-
+ .../{staging => }/net/wireless/silabs,wfx.yaml | 2 +-
+ .../bindings/regulator/mt6315-regulator.yaml | 2 +-
+ .../bindings/regulator/mt6358-regulator.txt | 22 +-
+ .../bindings/regulator/nxp,pca9450-regulator.yaml | 11 +
+ .../bindings/regulator/qcom,rpmh-regulator.yaml | 262 +-
+ .../regulator/richtek,rt4801-regulator.yaml | 21 +-
+ .../regulator/richtek,rt5759-regulator.yaml | 90 +
+ .../regulator/siliconmitus,sm5703-regulator.yaml | 49 +
+ .../regulator/socionext,uniphier-regulator.yaml | 57 +-
+ .../devicetree/bindings/reserved-memory/phram.yaml | 47 +
+ .../bindings/spi/aspeed,ast2600-fmc.yaml | 82 +
+ .../devicetree/bindings/spi/ingenic,spi.yaml | 3 +
+ .../bindings/spi/mediatek,spi-mt65xx.yaml | 4 +
+ .../bindings/spi/mediatek,spi-mtk-snfi.yaml | 88 +
+ .../bindings/spi/qcom,spi-qcom-qspi.yaml | 1 +
+ .../devicetree/bindings/spi/renesas,rspi.yaml | 2 +
+ .../devicetree/bindings/thermal/qcom-lmh.yaml | 1 +
+ .../bindings/thermal/qcom-spmi-adc-tm5.yaml | 110 +-
+ .../devicetree/bindings/thermal/qcom-tsens.yaml | 5 +-
+ .../devicetree/bindings/thermal/rzg2l-thermal.yaml | 2 +
+ .../bindings/thermal/ti,j72xx-thermal.yaml | 63 +
+ .../devicetree/bindings/trivial-devices.yaml | 4 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 4 +
+ Documentation/doc-guide/contributing.rst | 5 +-
+ Documentation/doc-guide/kernel-doc.rst | 2 +
+ Documentation/doc-guide/sphinx.rst | 5 +-
+ Documentation/driver-api/driver-model/devres.rst | 2 +-
+ Documentation/driver-api/media/cec-core.rst | 13 +-
+ Documentation/driver-api/media/mc-core.rst | 13 +-
+ Documentation/driver-api/media/v4l2-subdev.rst | 69 +
+ Documentation/driver-api/thermal/intel_dptf.rst | 2 +-
+ Documentation/fault-injection/fault-injection.rst | 14 +-
+ Documentation/filesystems/caching/cachefiles.rst | 178 +
+ Documentation/filesystems/caching/netfs-api.rst | 4 +-
+ Documentation/filesystems/fscrypt.rst | 2 +-
+ Documentation/filesystems/fsverity.rst | 2 +-
+ Documentation/filesystems/idmappings.rst | 5 +
+ Documentation/filesystems/locking.rst | 36 +-
+ Documentation/filesystems/netfs_library.rst | 9 +-
+ Documentation/filesystems/porting.rst | 2 +-
+ Documentation/filesystems/vfs.rst | 86 +-
+ Documentation/firmware-guide/acpi/enumeration.rst | 3 +-
+ Documentation/hwmon/aquacomputer_d5next.rst | 7 +-
+ Documentation/hwmon/asus_ec_sensors.rst | 25 +-
+ Documentation/hwmon/dell-smm-hwmon.rst | 9 +
+ Documentation/hwmon/hwmon-kernel-api.rst | 18 +-
+ Documentation/hwmon/index.rst | 2 +
+ Documentation/hwmon/lan966x.rst | 40 +
+ Documentation/hwmon/max16601.rst | 8 +
+ Documentation/hwmon/xdpe152c4.rst | 118 +
+ Documentation/ide/ChangeLog.ide-cd.1994-2004 | 268 -
+ Documentation/ide/ChangeLog.ide-floppy.1996-2002 | 63 -
+ Documentation/ide/ChangeLog.ide-tape.1995-2002 | 257 -
+ Documentation/ide/changelogs.rst | 17 -
+ Documentation/ide/ide-tape.rst | 68 -
+ Documentation/ide/ide.rst | 265 -
+ Documentation/ide/index.rst | 21 -
+ Documentation/ide/warm-plug-howto.rst | 18 -
+ Documentation/index.rst | 2 -
+ Documentation/input/devices/atarikbd.rst | 4 +-
+ Documentation/input/devices/ntrig.rst | 2 +-
+ Documentation/kernel-hacking/hacking.rst | 36 +-
+ Documentation/kernel-hacking/locking.rst | 5 +-
+ .../networking/device_drivers/appletalk/index.rst | 1 -
+ .../networking/device_drivers/appletalk/ltpc.rst | 144 -
+ .../device_drivers/can/ctu/ctucanfd-driver.rst | 639 +
+ .../device_drivers/can/ctu/fsm_txt_buffer_user.svg | 151 +
+ .../networking/device_drivers/can/index.rst | 1 +
+ .../device_drivers/ethernet/dec/de4x5.rst | 189 -
+ .../networking/device_drivers/ethernet/index.rst | 2 +-
+ .../device_drivers/ethernet/marvell/octeon_ep.rst | 35 +
+ Documentation/networking/device_drivers/index.rst | 1 -
+ .../networking/device_drivers/wan/index.rst | 18 -
+ .../networking/device_drivers/wan/z8530book.rst | 256 -
+ .../networking/device_drivers/wwan/index.rst | 1 +
+ .../networking/device_drivers/wwan/t7xx.rst | 120 +
+ .../networking/devlink/devlink-linecard.rst | 122 +
+ Documentation/networking/devlink/index.rst | 1 +
+ Documentation/networking/dsa/dsa.rst | 17 +
+ Documentation/networking/ethtool-netlink.rst | 8 +
+ Documentation/networking/index.rst | 5 +-
+ Documentation/networking/ip-sysctl.rst | 27 +
+ Documentation/networking/mptcp-sysctl.rst | 18 +
+ Documentation/networking/nf_conntrack-sysctl.rst | 5 +-
+ Documentation/networking/skbuff.rst | 37 +
+ Documentation/power/energy-model.rst | 24 +-
+ Documentation/process/3.Early-stage.rst | 9 +-
+ Documentation/process/changes.rst | 8 +-
+ Documentation/process/submitting-patches.rst | 14 +-
+ Documentation/scheduler/sched-stats.rst | 8 +-
+ Documentation/sphinx/kerneldoc-preamble.sty | 14 +-
+ Documentation/tools/rtla/common_appendix.rst | 3 +-
+ Documentation/translations/ja_JP/SubmittingPatches | 36 +-
+ Documentation/translations/ja_JP/howto.rst | 44 +-
+ Documentation/translations/ja_JP/index.rst | 2 +-
+ .../zh_CN/admin-guide/mm/damon/reclaim.rst | 4 +-
+ .../zh_CN/admin-guide/mm/damon/usage.rst | 291 +-
+ .../zh_CN/dev-tools/gdb-kernel-debugging.rst | 167 +
+ .../translations/zh_CN/dev-tools/index.rst | 2 +-
+ .../translations/zh_CN/devicetree/usage-model.rst | 8 +-
+ Documentation/translations/zh_CN/index.rst | 2 +-
+ Documentation/translations/zh_CN/locking/index.rst | 42 +
+ .../translations/zh_CN/locking/spinlocks.rst | 149 +
+ Documentation/translations/zh_CN/process/howto.rst | 2 +-
+ .../translations/zh_CN/scheduler/index.rst | 2 +
+ .../translations/zh_CN/scheduler/sched-debug.rst | 51 +
+ .../translations/zh_CN/scheduler/schedutil.rst | 165 +
+ .../translations/zh_CN/vm/damon/design.rst | 7 +-
+ Documentation/translations/zh_CN/vm/frontswap.rst | 196 +
+ Documentation/translations/zh_CN/vm/hmm.rst | 361 +
+ .../translations/zh_CN/vm/hugetlbfs_reserv.rst | 436 +
+ Documentation/translations/zh_CN/vm/hwpoison.rst | 166 +
+ Documentation/translations/zh_CN/vm/index.rst | 29 +-
+ .../translations/zh_CN/vm/memory-model.rst | 135 +
+ .../translations/zh_CN/vm/mmu_notifier.rst | 97 +
+ Documentation/translations/zh_CN/vm/numa.rst | 101 +
+ .../zh_CN/vm/overcommit-accounting.rst | 86 +
+ Documentation/translations/zh_CN/vm/page_frags.rst | 38 +
+ Documentation/translations/zh_CN/vm/page_owner.rst | 116 +
+ .../translations/zh_CN/vm/page_table_check.rst | 56 +
+ .../translations/zh_CN/vm/remap_file_pages.rst | 32 +
+ .../zh_CN/vm/split_page_table_lock.rst | 96 +
+ Documentation/translations/zh_CN/vm/z3fold.rst | 31 +
+ Documentation/translations/zh_CN/vm/zsmalloc.rst | 78 +
+ .../userspace-api/media/drivers/uvcvideo.rst | 2 +-
+ .../media/mediactl/media-controller-model.rst | 6 +
+ .../userspace-api/media/mediactl/media-types.rst | 17 +-
+ .../userspace-api/media/v4l/dev-decoder.rst | 9 +-
+ .../media/v4l/ext-ctrls-codec-stateless.rst | 10 +-
+ .../userspace-api/media/v4l/ext-ctrls-codec.rst | 22 +
+ .../userspace-api/media/v4l/pixfmt-reserved.rst | 19 +
+ .../userspace-api/media/v4l/pixfmt-yuv-luma.rst | 14 +-
+ .../userspace-api/media/v4l/vidioc-streamon.rst | 3 +-
+ Documentation/vm/arch_pgtable_helpers.rst | 10 +-
+ Documentation/vm/bootmem.rst | 5 +
+ Documentation/vm/index.rst | 40 +-
+ Documentation/vm/oom.rst | 5 +
+ Documentation/vm/page_allocation.rst | 5 +
+ Documentation/vm/page_cache.rst | 5 +
+ Documentation/vm/page_reclaim.rst | 5 +
+ Documentation/vm/page_tables.rst | 5 +
+ Documentation/vm/physical_memory.rst | 5 +
+ Documentation/vm/process_addrs.rst | 5 +
+ Documentation/vm/shmfs.rst | 5 +
+ Documentation/vm/slab.rst | 5 +
+ Documentation/vm/slub.rst | 64 +
+ Documentation/vm/swap.rst | 5 +
+ Documentation/vm/vmalloc.rst | 5 +
+ Documentation/w1/slaves/w1_therm.rst | 9 +-
+ Documentation/x86/exception-tables.rst | 23 +-
+ Documentation/x86/index.rst | 2 +-
+ Documentation/x86/intel-iommu.rst | 115 -
+ Documentation/x86/iommu.rst | 151 +
+ MAINTAINERS | 136 +-
+ arch/alpha/include/uapi/asm/socket.h | 2 +
+ arch/arm/boot/dts/aspeed-g6.dtsi | 4 +
+ arch/arm/boot/dts/imx6qdl-sr-som.dtsi | 10 +
+ .../boot/dts/marvell/armada-3720-turris-mox.dts | 12 +-
+ arch/arm64/boot/dts/mediatek/mt7622.dtsi | 32 +-
+ arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 74 +
+ arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 39 +
+ arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 70 +
+ arch/arm64/include/asm/insn.h | 9 +
+ arch/arm64/kernel/smp.c | 1 +
+ arch/arm64/lib/insn.c | 67 +-
+ arch/arm64/net/bpf_jit.h | 17 +
+ arch/arm64/net/bpf_jit_comp.c | 255 +-
+ arch/mips/configs/gpr_defconfig | 5 -
+ arch/mips/configs/mtx1_defconfig | 6 -
+ arch/mips/include/uapi/asm/socket.h | 2 +
+ arch/parisc/include/uapi/asm/socket.h | 2 +
+ arch/powerpc/configs/chrp32_defconfig | 1 -
+ arch/powerpc/configs/ppc6xx_defconfig | 1 -
+ arch/riscv/net/bpf_jit.h | 67 +
+ arch/riscv/net/bpf_jit_comp64.c | 110 +-
+ arch/s390/net/bpf_jit_comp.c | 2 +-
+ arch/sh/boards/board-sh7757lcr.c | 2 +-
+ arch/sh/boards/mach-ecovec24/setup.c | 2 +-
+ arch/sh/boot/romimage/mmcif-sh7724.c | 2 +-
+ arch/sparc/include/uapi/asm/socket.h | 1 +
+ arch/um/drivers/vector_kern.c | 3 +-
+ arch/x86/include/asm/msr-index.h | 1 +
+ arch/x86/include/asm/text-patching.h | 1 +
+ arch/x86/kernel/acpi/boot.c | 9 +-
+ arch/x86/kernel/alternative.c | 67 +-
+ arch/x86/kernel/cpu/mce/apei.c | 8 +-
+ arch/x86/net/bpf_jit_comp.c | 79 +-
+ block/bdev.c | 7 +
+ block/fops.c | 12 +-
+ drivers/acpi/acpica/acapps.h | 4 +-
+ drivers/acpi/acpica/accommon.h | 2 +-
+ drivers/acpi/acpica/acconvert.h | 2 +-
+ drivers/acpi/acpica/acdebug.h | 2 +-
+ drivers/acpi/acpica/acdispat.h | 2 +-
+ drivers/acpi/acpica/acevents.h | 2 +-
+ drivers/acpi/acpica/acglobal.h | 2 +-
+ drivers/acpi/acpica/achware.h | 2 +-
+ drivers/acpi/acpica/acinterp.h | 2 +-
+ drivers/acpi/acpica/aclocal.h | 2 +-
+ drivers/acpi/acpica/acmacros.h | 2 +-
+ drivers/acpi/acpica/acnamesp.h | 2 +-
+ drivers/acpi/acpica/acobject.h | 2 +-
+ drivers/acpi/acpica/acopcode.h | 2 +-
+ drivers/acpi/acpica/acparser.h | 2 +-
+ drivers/acpi/acpica/acpredef.h | 2 +-
+ drivers/acpi/acpica/acresrc.h | 2 +-
+ drivers/acpi/acpica/acstruct.h | 2 +-
+ drivers/acpi/acpica/actables.h | 2 +-
+ drivers/acpi/acpica/acutils.h | 2 +-
+ drivers/acpi/acpica/amlcode.h | 2 +-
+ drivers/acpi/acpica/amlresrc.h | 2 +-
+ drivers/acpi/acpica/dbhistry.c | 2 +-
+ drivers/acpi/acpica/dsargs.c | 2 +-
+ drivers/acpi/acpica/dscontrol.c | 2 +-
+ drivers/acpi/acpica/dsdebug.c | 2 +-
+ drivers/acpi/acpica/dsfield.c | 2 +-
+ drivers/acpi/acpica/dsinit.c | 2 +-
+ drivers/acpi/acpica/dsmethod.c | 2 +-
+ drivers/acpi/acpica/dsobject.c | 2 +-
+ drivers/acpi/acpica/dsopcode.c | 2 +-
+ drivers/acpi/acpica/dspkginit.c | 2 +-
+ drivers/acpi/acpica/dswexec.c | 4 +-
+ drivers/acpi/acpica/dswload.c | 2 +-
+ drivers/acpi/acpica/dswload2.c | 2 +-
+ drivers/acpi/acpica/dswscope.c | 2 +-
+ drivers/acpi/acpica/dswstate.c | 2 +-
+ drivers/acpi/acpica/evevent.c | 2 +-
+ drivers/acpi/acpica/evglock.c | 2 +-
+ drivers/acpi/acpica/evgpe.c | 2 +-
+ drivers/acpi/acpica/evgpeblk.c | 2 +-
+ drivers/acpi/acpica/evgpeinit.c | 2 +-
+ drivers/acpi/acpica/evgpeutil.c | 2 +-
+ drivers/acpi/acpica/evhandler.c | 2 +-
+ drivers/acpi/acpica/evmisc.c | 2 +-
+ drivers/acpi/acpica/evregion.c | 2 +-
+ drivers/acpi/acpica/evrgnini.c | 2 +-
+ drivers/acpi/acpica/evxface.c | 2 +-
+ drivers/acpi/acpica/evxfevnt.c | 2 +-
+ drivers/acpi/acpica/evxfgpe.c | 2 +-
+ drivers/acpi/acpica/evxfregn.c | 2 +-
+ drivers/acpi/acpica/exconcat.c | 2 +-
+ drivers/acpi/acpica/exconfig.c | 61 +-
+ drivers/acpi/acpica/exconvrt.c | 2 +-
+ drivers/acpi/acpica/excreate.c | 2 +-
+ drivers/acpi/acpica/exdebug.c | 2 +-
+ drivers/acpi/acpica/exdump.c | 2 +-
+ drivers/acpi/acpica/exfield.c | 2 +-
+ drivers/acpi/acpica/exfldio.c | 4 +-
+ drivers/acpi/acpica/exmisc.c | 2 +-
+ drivers/acpi/acpica/exmutex.c | 2 +-
+ drivers/acpi/acpica/exnames.c | 2 +-
+ drivers/acpi/acpica/exoparg1.c | 23 +-
+ drivers/acpi/acpica/exoparg2.c | 2 +-
+ drivers/acpi/acpica/exoparg3.c | 2 +-
+ drivers/acpi/acpica/exoparg6.c | 2 +-
+ drivers/acpi/acpica/exprep.c | 2 +-
+ drivers/acpi/acpica/exregion.c | 2 +-
+ drivers/acpi/acpica/exresnte.c | 2 +-
+ drivers/acpi/acpica/exresolv.c | 2 +-
+ drivers/acpi/acpica/exresop.c | 2 +-
+ drivers/acpi/acpica/exserial.c | 2 +-
+ drivers/acpi/acpica/exstore.c | 2 +-
+ drivers/acpi/acpica/exstoren.c | 2 +-
+ drivers/acpi/acpica/exstorob.c | 2 +-
+ drivers/acpi/acpica/exsystem.c | 29 +-
+ drivers/acpi/acpica/extrace.c | 2 +-
+ drivers/acpi/acpica/exutils.c | 2 +-
+ drivers/acpi/acpica/hwacpi.c | 2 +-
+ drivers/acpi/acpica/hwesleep.c | 2 +-
+ drivers/acpi/acpica/hwgpe.c | 2 +-
+ drivers/acpi/acpica/hwregs.c | 2 +-
+ drivers/acpi/acpica/hwsleep.c | 2 +-
+ drivers/acpi/acpica/hwtimer.c | 2 +-
+ drivers/acpi/acpica/hwvalid.c | 2 +-
+ drivers/acpi/acpica/hwxface.c | 2 +-
+ drivers/acpi/acpica/hwxfsleep.c | 2 +-
+ drivers/acpi/acpica/nsarguments.c | 2 +-
+ drivers/acpi/acpica/nsconvert.c | 2 +-
+ drivers/acpi/acpica/nsdump.c | 2 +-
+ drivers/acpi/acpica/nsdumpdv.c | 2 +-
+ drivers/acpi/acpica/nsinit.c | 2 +-
+ drivers/acpi/acpica/nsload.c | 2 +-
+ drivers/acpi/acpica/nsparse.c | 2 +-
+ drivers/acpi/acpica/nspredef.c | 2 +-
+ drivers/acpi/acpica/nsprepkg.c | 2 +-
+ drivers/acpi/acpica/nsrepair.c | 2 +-
+ drivers/acpi/acpica/nsrepair2.c | 2 +-
+ drivers/acpi/acpica/nsutils.c | 2 +-
+ drivers/acpi/acpica/nswalk.c | 2 +-
+ drivers/acpi/acpica/nsxfname.c | 2 +-
+ drivers/acpi/acpica/psargs.c | 2 +-
+ drivers/acpi/acpica/psloop.c | 2 +-
+ drivers/acpi/acpica/psobject.c | 2 +-
+ drivers/acpi/acpica/psopcode.c | 6 +-
+ drivers/acpi/acpica/psopinfo.c | 2 +-
+ drivers/acpi/acpica/psparse.c | 2 +-
+ drivers/acpi/acpica/psscope.c | 2 +-
+ drivers/acpi/acpica/pstree.c | 2 +-
+ drivers/acpi/acpica/psutils.c | 2 +-
+ drivers/acpi/acpica/pswalk.c | 2 +-
+ drivers/acpi/acpica/psxface.c | 2 +-
+ drivers/acpi/acpica/tbdata.c | 2 +-
+ drivers/acpi/acpica/tbfadt.c | 2 +-
+ drivers/acpi/acpica/tbfind.c | 2 +-
+ drivers/acpi/acpica/tbinstal.c | 2 +-
+ drivers/acpi/acpica/tbprint.c | 2 +-
+ drivers/acpi/acpica/tbutils.c | 2 +-
+ drivers/acpi/acpica/tbxface.c | 2 +-
+ drivers/acpi/acpica/tbxfload.c | 2 +-
+ drivers/acpi/acpica/tbxfroot.c | 2 +-
+ drivers/acpi/acpica/utaddress.c | 2 +-
+ drivers/acpi/acpica/utalloc.c | 2 +-
+ drivers/acpi/acpica/utascii.c | 2 +-
+ drivers/acpi/acpica/utbuffer.c | 2 +-
+ drivers/acpi/acpica/utcache.c | 2 +-
+ drivers/acpi/acpica/utcopy.c | 2 +-
+ drivers/acpi/acpica/utdebug.c | 2 +-
+ drivers/acpi/acpica/utdecode.c | 2 +-
+ drivers/acpi/acpica/uteval.c | 2 +-
+ drivers/acpi/acpica/utglobal.c | 2 +-
+ drivers/acpi/acpica/uthex.c | 2 +-
+ drivers/acpi/acpica/utids.c | 2 +-
+ drivers/acpi/acpica/utinit.c | 2 +-
+ drivers/acpi/acpica/utlock.c | 2 +-
+ drivers/acpi/acpica/utobject.c | 2 +-
+ drivers/acpi/acpica/utosi.c | 3 +-
+ drivers/acpi/acpica/utpredef.c | 2 +-
+ drivers/acpi/acpica/utprint.c | 2 +-
+ drivers/acpi/acpica/uttrack.c | 2 +-
+ drivers/acpi/acpica/utuuid.c | 2 +-
+ drivers/acpi/acpica/utxface.c | 2 +-
+ drivers/acpi/acpica/utxfinit.c | 2 +-
+ drivers/acpi/apei/einj.c | 3 +
+ drivers/acpi/apei/erst-dbg.c | 3 +-
+ drivers/acpi/apei/erst.c | 77 +-
+ drivers/acpi/arm64/agdi.c | 1 +
+ drivers/acpi/bgrt.c | 2 +-
+ drivers/acpi/bus.c | 60 +-
+ drivers/acpi/cppc_acpi.c | 44 +-
+ drivers/acpi/device_pm.c | 83 +-
+ drivers/acpi/dptf/dptf_power.c | 9 +-
+ drivers/acpi/pci_root.c | 2 +
+ drivers/acpi/property.c | 54 +-
+ drivers/acpi/sleep.c | 12 +
+ drivers/acpi/spcr.c | 1 +
+ drivers/acpi/sysfs.c | 25 +-
+ drivers/acpi/utils.c | 2 +-
+ drivers/atm/Kconfig | 79 -
+ drivers/atm/Makefile | 4 -
+ drivers/atm/ambassador.c | 2400 ---
+ drivers/atm/ambassador.h | 648 -
+ drivers/atm/firestream.c | 2057 --
+ drivers/atm/firestream.h | 502 -
+ drivers/atm/horizon.c | 2853 ---
+ drivers/atm/horizon.h | 492 -
+ drivers/atm/nicstarmac.c | 5 -
+ drivers/atm/uPD98401.h | 293 -
+ drivers/atm/uPD98402.c | 266 -
+ drivers/atm/uPD98402.h | 107 -
+ drivers/atm/zatm.c | 1652 --
+ drivers/atm/zatm.h | 104 -
+ drivers/base/power/common.c | 8 +-
+ drivers/base/power/domain.c | 278 +-
+ drivers/base/power/domain_governor.c | 65 +-
+ drivers/base/power/runtime.c | 53 +-
+ drivers/base/power/wakeup.c | 1 +
+ drivers/base/property.c | 217 +-
+ drivers/base/regmap/internal.h | 4 +
+ drivers/base/regmap/regcache.c | 4 +-
+ drivers/base/regmap/regmap-i3c.c | 2 +-
+ drivers/base/regmap/regmap-sccb.c | 2 +-
+ drivers/base/regmap/regmap-sdw-mbq.c | 2 +-
+ drivers/base/regmap/regmap-sdw.c | 2 +-
+ drivers/base/regmap/regmap-slimbus.c | 2 +-
+ drivers/base/regmap/regmap-w1.c | 6 +-
+ drivers/base/regmap/regmap.c | 78 +-
+ drivers/bcma/driver_gpio.c | 7 +-
+ drivers/bluetooth/btbcm.c | 53 +-
+ drivers/bluetooth/btintel.c | 2 +-
+ drivers/bluetooth/btmtksdio.c | 26 +-
+ drivers/bluetooth/btrtl.c | 13 +
+ drivers/bluetooth/btusb.c | 23 +-
+ drivers/bluetooth/hci_qca.c | 4 +-
+ drivers/char/ipmi/ipmb_dev_int.c | 5 +-
+ drivers/char/ipmi/ipmi_ipmb.c | 6 +-
+ drivers/char/ipmi/ipmi_msghandler.c | 111 +-
+ drivers/char/ipmi/ipmi_poweroff.c | 8 +-
+ drivers/char/ipmi/ipmi_si_intf.c | 17 +-
+ drivers/char/ipmi/ipmi_ssif.c | 33 +-
+ drivers/char/ipmi/ipmi_watchdog.c | 28 +-
+ drivers/cpufreq/cppc_cpufreq.c | 211 +
+ drivers/cpufreq/cpufreq.c | 112 +-
+ drivers/cpufreq/cpufreq_governor.c | 20 +-
+ drivers/cpufreq/cpufreq_governor.h | 1 +
+ drivers/cpufreq/intel_pstate.c | 2 +
+ drivers/cpufreq/mediatek-cpufreq-hw.c | 4 +-
+ drivers/cpufreq/pasemi-cpufreq.c | 1 -
+ drivers/cpufreq/pmac32-cpufreq.c | 2 +-
+ drivers/cpufreq/pmac64-cpufreq.c | 2 +-
+ drivers/cpufreq/ppc_cbe_cpufreq.c | 1 -
+ drivers/cpufreq/ppc_cbe_cpufreq_pmi.c | 2 +-
+ drivers/cpufreq/scmi-cpufreq.c | 4 +-
+ drivers/cpuidle/cpuidle-psci-domain.c | 4 +-
+ drivers/cpuidle/cpuidle-psci.c | 46 +
+ drivers/cpuidle/cpuidle-riscv-sbi.c | 4 +-
+ drivers/devfreq/devfreq.c | 20 +-
+ drivers/devfreq/governor.h | 27 +
+ drivers/devfreq/governor_passive.c | 403 +-
+ drivers/devfreq/rk3399_dmc.c | 312 +-
+ drivers/firmware/broadcom/tee_bnxt_fw.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 23 +-
+ drivers/hid/Kconfig | 8 +
+ drivers/hid/Makefile | 1 +
+ drivers/hid/amd-sfh-hid/amd_sfh_client.c | 45 +-
+ drivers/hid/amd-sfh-hid/amd_sfh_hid.c | 9 +-
+ drivers/hid/amd-sfh-hid/amd_sfh_hid.h | 1 -
+ drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 17 +-
+ drivers/hid/amd-sfh-hid/amd_sfh_pcie.h | 5 +
+ .../hid_descriptor/amd_sfh_hid_report_desc.h | 6 +-
+ drivers/hid/hid-apple.c | 22 +-
+ drivers/hid/hid-bigbenff.c | 6 +
+ drivers/hid/hid-core.c | 4 +
+ drivers/hid/hid-elan.c | 2 -
+ drivers/hid/hid-ids.h | 7 +
+ drivers/hid/hid-kye.c | 12 +-
+ drivers/hid/hid-led.c | 2 +-
+ drivers/hid/hid-lenovo.c | 174 +-
+ drivers/hid/hid-megaworld.c | 125 +
+ drivers/hid/hid-multitouch.c | 9 +
+ drivers/hid/hid-uclogic-core.c | 113 +-
+ drivers/hid/hid-uclogic-params.c | 288 +-
+ drivers/hid/hid-uclogic-params.h | 105 +-
+ drivers/hid/hid-uclogic-rdesc.c | 181 +-
+ drivers/hid/hid-uclogic-rdesc.h | 34 +-
+ drivers/hid/hid-viewsonic.c | 2 +-
+ drivers/hid/intel-ish-hid/ipc/hw-ish.h | 2 +
+ drivers/hid/intel-ish-hid/ipc/pci-ish.c | 2 +
+ drivers/hid/wacom_sys.c | 2 +-
+ drivers/hid/wacom_wac.c | 43 +-
+ drivers/hid/wacom_wac.h | 5 +
+ drivers/hwmon/Kconfig | 55 +-
+ drivers/hwmon/Makefile | 4 +
+ drivers/hwmon/acpi_power_meter.c | 17 +-
+ drivers/hwmon/adt7475.c | 119 +-
+ drivers/hwmon/aquacomputer_d5next.c | 466 +-
+ drivers/hwmon/as370-hwmon.c | 12 +-
+ drivers/hwmon/asus-ec-sensors.c | 414 +-
+ drivers/hwmon/bt1-pvt.c | 50 +-
+ drivers/hwmon/dell-smm-hwmon.c | 147 +-
+ drivers/hwmon/hwmon.c | 100 +-
+ drivers/hwmon/ibmaem.c | 10 +-
+ drivers/hwmon/intel-m10-bmc-hwmon.c | 11 +-
+ drivers/hwmon/jc42.c | 8 +
+ drivers/hwmon/lan966x-hwmon.c | 418 +
+ drivers/hwmon/lm75.c | 14 +
+ drivers/hwmon/lm83.c | 2 -
+ drivers/hwmon/lm90.c | 4 +
+ drivers/hwmon/ltc2992.c | 86 +-
+ drivers/hwmon/mr75203.c | 12 +-
+ drivers/hwmon/{nct6775.c => nct6775-core.c} | 2445 +--
+ drivers/hwmon/nct6775-i2c.c | 195 +
+ drivers/hwmon/nct6775-platform.c | 1229 ++
+ drivers/hwmon/nct6775.h | 252 +
+ drivers/hwmon/occ/common.c | 100 +-
+ drivers/hwmon/occ/common.h | 5 +-
+ drivers/hwmon/occ/p8_i2c.c | 2 +-
+ drivers/hwmon/occ/p9_sbe.c | 2 +-
+ drivers/hwmon/occ/sysfs.c | 137 +-
+ drivers/hwmon/peci/cputemp.c | 38 +-
+ drivers/hwmon/peci/dimmtemp.c | 33 +-
+ drivers/hwmon/pmbus/Kconfig | 13 +-
+ drivers/hwmon/pmbus/Makefile | 1 +
+ drivers/hwmon/pmbus/ltc2978.c | 12 +
+ drivers/hwmon/pmbus/max16601.c | 13 +-
+ drivers/hwmon/pmbus/pmbus.h | 2 +
+ drivers/hwmon/pmbus/pmbus_core.c | 233 +-
+ drivers/hwmon/pmbus/xdpe152c4.c | 75 +
+ drivers/hwmon/pwm-fan.c | 12 +-
+ drivers/hwmon/sl28cpld-hwmon.c | 14 +-
+ drivers/hwmon/tmp401.c | 46 +-
+ drivers/idle/intel_idle.c | 133 +
+ drivers/iio/adc/qcom-vadc-common.c | 11 +
+ drivers/iio/chemical/scd30.h | 5 +-
+ drivers/iio/chemical/scd30_core.c | 10 +-
+ drivers/iio/chemical/scd30_i2c.c | 3 +-
+ drivers/iio/chemical/scd30_serial.c | 3 +-
+ drivers/infiniband/core/device.c | 2 -
+ .../infiniband/core/uverbs_std_types_flow_action.c | 383 +-
+ drivers/infiniband/hw/mlx5/fs.c | 223 +-
+ drivers/infiniband/hw/mlx5/gsi.c | 2 +-
+ drivers/infiniband/hw/mlx5/main.c | 32 +-
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 1 +
+ drivers/infiniband/hw/mlx5/qp.c | 2 +-
+ drivers/isdn/mISDN/socket.c | 2 +-
+ drivers/media/cec/core/cec-adap.c | 294 +-
+ drivers/media/cec/core/cec-api.c | 24 +-
+ drivers/media/cec/core/cec-core.c | 18 +-
+ drivers/media/cec/core/cec-pin-priv.h | 11 +
+ drivers/media/cec/core/cec-pin.c | 72 +-
+ drivers/media/cec/core/cec-priv.h | 10 +
+ drivers/media/cec/platform/seco/seco-cec.c | 22 +-
+ drivers/media/common/saa7146/saa7146_video.c | 1 -
+ drivers/media/common/videobuf2/videobuf2-dma-sg.c | 3 +-
+ drivers/media/common/videobuf2/videobuf2-v4l2.c | 26 +-
+ drivers/media/i2c/Kconfig | 1 +
+ drivers/media/i2c/adv7180.c | 46 +
+ drivers/media/i2c/ccs/ccs-core.c | 43 +-
+ drivers/media/i2c/dw9714.c | 2 +-
+ drivers/media/i2c/dw9768.c | 6 -
+ drivers/media/i2c/dw9807-vcm.c | 2 +
+ drivers/media/i2c/imx412.c | 39 +-
+ drivers/media/i2c/max9286.c | 19 +-
+ drivers/media/i2c/ov5645.c | 8 +-
+ drivers/media/i2c/ov5648.c | 4 +-
+ drivers/media/i2c/ov5695.c | 2 +-
+ drivers/media/i2c/ov7251.c | 750 +-
+ drivers/media/i2c/ov7640.c | 33 +-
+ drivers/media/i2c/ov7670.c | 1 -
+ drivers/media/i2c/ov8856.c | 23 +-
+ drivers/media/i2c/rdacm20.c | 10 +-
+ drivers/media/i2c/rdacm21.c | 2 +-
+ drivers/media/i2c/s5k6a3.c | 4 +-
+ drivers/media/i2c/video-i2c.c | 61 +-
+ drivers/media/mc/mc-device.c | 21 +-
+ drivers/media/mc/mc-entity.c | 80 +-
+ drivers/media/pci/bt8xx/bttv-driver.c | 2 -
+ drivers/media/pci/cx18/cx18-ioctl.c | 2 -
+ drivers/media/pci/cx23885/cx23885-core.c | 6 +-
+ drivers/media/pci/cx25821/cx25821-alsa.c | 4 +-
+ drivers/media/pci/cx25821/cx25821-core.c | 2 +-
+ drivers/media/pci/cx88/cx88-blackbird.c | 1 -
+ drivers/media/pci/cx88/cx88-video.c | 1 -
+ drivers/media/pci/dt3155/dt3155.c | 3 -
+ drivers/media/pci/intel/ipu3/cio2-bridge.c | 2 +
+ drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 11 +-
+ drivers/media/pci/ivtv/ivtv-ioctl.c | 1 -
+ drivers/media/pci/meye/meye.c | 1 -
+ drivers/media/pci/saa7134/saa7134-video.c | 4 +-
+ drivers/media/pci/saa7164/saa7164-encoder.c | 1 -
+ drivers/media/pci/saa7164/saa7164-vbi.c | 1 -
+ drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 3 -
+ drivers/media/pci/solo6x10/solo6x10-v4l2.c | 4 -
+ drivers/media/pci/sta2x11/sta2x11_vip.c | 4 -
+ drivers/media/pci/tw5864/tw5864-video.c | 1 -
+ drivers/media/pci/tw68/tw68-video.c | 3 -
+ drivers/media/pci/tw686x/tw686x-video.c | 2 -
+ drivers/media/platform/allegro-dvt/allegro-core.c | 5 -
+ drivers/media/platform/amphion/vdec.c | 84 +-
+ drivers/media/platform/amphion/venc.c | 59 +-
+ drivers/media/platform/amphion/vpu_dbg.c | 12 -
+ drivers/media/platform/amphion/vpu_defs.h | 2 +-
+ drivers/media/platform/amphion/vpu_malone.c | 4 +-
+ drivers/media/platform/amphion/vpu_msgs.c | 8 +
+ drivers/media/platform/amphion/vpu_v4l2.c | 68 +-
+ drivers/media/platform/amphion/vpu_v4l2.h | 3 +
+ drivers/media/platform/aspeed/aspeed-video.c | 4 +-
+ drivers/media/platform/atmel/atmel-isc-base.c | 34 +-
+ drivers/media/platform/atmel/atmel-isc.h | 8 +-
+ drivers/media/platform/atmel/atmel-sama5d2-isc.c | 58 +-
+ drivers/media/platform/atmel/atmel-sama7g5-isc.c | 61 +-
+ drivers/media/platform/atmel/microchip-csi2dc.c | 5 +
+ drivers/media/platform/cadence/cdns-csi2tx.c | 5 +-
+ drivers/media/platform/chips-media/coda-bit.c | 4 +-
+ drivers/media/platform/chips-media/coda-common.c | 155 +-
+ drivers/media/platform/chips-media/coda-jpeg.c | 24 +-
+ drivers/media/platform/chips-media/coda.h | 7 +
+ drivers/media/platform/marvell/cafe-driver.c | 1 -
+ .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 2 -
+ drivers/media/platform/mediatek/vcodec/Kconfig | 1 +
+ drivers/media/platform/mediatek/vcodec/Makefile | 4 +
+ .../platform/mediatek/vcodec/mtk_vcodec_dec.c | 75 +-
+ .../platform/mediatek/vcodec/mtk_vcodec_dec.h | 1 +
+ .../platform/mediatek/vcodec/mtk_vcodec_dec_drv.c | 15 +-
+ .../platform/mediatek/vcodec/mtk_vcodec_dec_pm.c | 166 +-
+ .../platform/mediatek/vcodec/mtk_vcodec_dec_pm.h | 6 +-
+ .../mediatek/vcodec/mtk_vcodec_dec_stateful.c | 19 +-
+ .../mediatek/vcodec/mtk_vcodec_dec_stateless.c | 276 +-
+ .../platform/mediatek/vcodec/mtk_vcodec_drv.h | 41 +-
+ .../platform/mediatek/vcodec/mtk_vcodec_enc_drv.c | 5 -
+ .../media/platform/mediatek/vcodec/mtk_vcodec_fw.c | 6 +
+ .../media/platform/mediatek/vcodec/mtk_vcodec_fw.h | 1 +
+ .../mediatek/vcodec/vdec/vdec_h264_req_common.c | 323 +
+ .../mediatek/vcodec/vdec/vdec_h264_req_common.h | 277 +
+ .../mediatek/vcodec/vdec/vdec_h264_req_if.c | 447 +-
+ .../mediatek/vcodec/vdec/vdec_h264_req_multi_if.c | 808 +
+ .../mediatek/vcodec/vdec/vdec_vp8_req_if.c | 437 +
+ .../mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c | 2030 ++
+ .../media/platform/mediatek/vcodec/vdec_drv_if.c | 37 +-
+ .../media/platform/mediatek/vcodec/vdec_drv_if.h | 3 +
+ .../media/platform/mediatek/vcodec/vdec_ipi_msg.h | 36 +
+ .../platform/mediatek/vcodec/vdec_msg_queue.c | 2 +
+ .../platform/mediatek/vcodec/vdec_msg_queue.h | 2 +
+ .../media/platform/mediatek/vcodec/vdec_vpu_if.c | 53 +-
+ .../media/platform/mediatek/vcodec/vdec_vpu_if.h | 15 +
+ .../media/platform/mediatek/vcodec/venc_vpu_if.c | 2 +-
+ drivers/media/platform/nvidia/tegra-vde/h264.c | 19 +-
+ drivers/media/platform/nxp/Kconfig | 2 -
+ drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h | 4 +-
+ drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 315 +-
+ drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h | 6 +-
+ drivers/media/platform/nxp/imx-mipi-csis.c | 669 +-
+ drivers/media/platform/qcom/camss/camss-video.c | 4 -
+ drivers/media/platform/qcom/venus/core.h | 1 +
+ drivers/media/platform/qcom/venus/helpers.c | 85 +-
+ drivers/media/platform/qcom/venus/helpers.h | 1 +
+ drivers/media/platform/qcom/venus/hfi.c | 3 +
+ .../media/platform/qcom/venus/hfi_platform_v4.c | 4 +-
+ .../media/platform/qcom/venus/hfi_platform_v6.c | 4 +-
+ drivers/media/platform/qcom/venus/hfi_venus.c | 4 +-
+ drivers/media/platform/qcom/venus/vdec.c | 37 +-
+ drivers/media/platform/qcom/venus/venc.c | 6 +-
+ drivers/media/platform/qcom/venus/venc_ctrls.c | 8 +
+ .../media/platform/renesas/rcar-vin/rcar-core.c | 3 -
+ drivers/media/platform/renesas/rcar-vin/rcar-dma.c | 25 +
+ .../media/platform/renesas/rcar-vin/rcar-v4l2.c | 13 +-
+ drivers/media/platform/renesas/rcar_jpu.c | 2 -
+ drivers/media/platform/renesas/renesas-ceu.c | 8 +-
+ drivers/media/platform/renesas/vsp1/vsp1_drv.c | 2 -
+ drivers/media/platform/renesas/vsp1/vsp1_entity.c | 10 +-
+ drivers/media/platform/renesas/vsp1/vsp1_histo.c | 2 -
+ drivers/media/platform/renesas/vsp1/vsp1_rpf.c | 6 +-
+ drivers/media/platform/renesas/vsp1/vsp1_video.c | 16 +-
+ drivers/media/platform/rockchip/rga/rga.c | 6 +-
+ .../media/platform/rockchip/rkisp1/rkisp1-isp.c | 34 +-
+ .../media/platform/rockchip/rkisp1/rkisp1-regs.h | 11 -
+ .../media/platform/samsung/exynos-gsc/gsc-m2m.c | 5 -
+ drivers/media/platform/samsung/exynos4-is/common.c | 2 -
+ .../media/platform/samsung/exynos4-is/fimc-is.c | 6 +-
+ .../platform/samsung/exynos4-is/fimc-isp-video.h | 2 +-
+ .../media/platform/samsung/exynos4-is/fimc-lite.c | 4 -
+ .../media/platform/samsung/s5p-jpeg/jpeg-core.c | 2 -
+ .../media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.c | 1 -
+ .../media/platform/samsung/s5p-mfc/s5p_mfc_dec.c | 2 -
+ .../media/platform/samsung/s5p-mfc/s5p_mfc_enc.c | 2 -
+ drivers/media/platform/st/sti/bdisp/bdisp-v4l2.c | 3 +-
+ .../platform/st/sti/c8sectpfe/c8sectpfe-common.h | 1 -
+ drivers/media/platform/st/sti/delta/delta-v4l2.c | 6 +-
+ drivers/media/platform/st/stm32/stm32-dcmi.c | 2 -
+ drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 2 -
+ .../media/platform/sunxi/sun4i-csi/sun4i_v4l2.c | 4 -
+ drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 2 -
+ drivers/media/platform/ti/cal/cal-camerarx.c | 27 +
+ drivers/media/platform/ti/cal/cal-video.c | 4 -
+ drivers/media/platform/ti/cal/cal.c | 51 +-
+ drivers/media/platform/ti/cal/cal.h | 2 +
+ drivers/media/platform/ti/davinci/dm355_ccdc.c | 3 +-
+ drivers/media/platform/ti/davinci/dm644x_ccdc.c | 3 +-
+ drivers/media/platform/ti/davinci/isif.c | 3 +-
+ drivers/media/platform/ti/davinci/vpbe_display.c | 2 -
+ drivers/media/platform/ti/davinci/vpif_capture.c | 2 -
+ drivers/media/platform/ti/davinci/vpif_display.c | 5 +-
+ drivers/media/platform/ti/omap3isp/ispcsiphy.c | 3 +-
+ drivers/media/platform/video-mux.c | 4 +-
+ drivers/media/radio/Kconfig | 4 +-
+ drivers/media/radio/radio-maxiradio.c | 2 -
+ drivers/media/rc/bpf-lirc.c | 8 +-
+ drivers/media/rc/gpio-ir-tx.c | 7 +-
+ drivers/media/rc/imon.c | 109 +-
+ drivers/media/rc/meson-ir-tx.c | 4 +-
+ drivers/media/usb/dvb-usb/a800.c | 18 +-
+ drivers/media/usb/dvb-usb/af9005.c | 19 +-
+ drivers/media/usb/dvb-usb/az6027.c | 45 +-
+ drivers/media/usb/dvb-usb/cinergyT2-core.c | 10 +-
+ drivers/media/usb/dvb-usb/cxusb.c | 88 +-
+ drivers/media/usb/dvb-usb/dib0700_devices.c | 428 +-
+ drivers/media/usb/dvb-usb/dibusb-mb.c | 165 +-
+ drivers/media/usb/dvb-usb/dibusb-mc.c | 88 +-
+ drivers/media/usb/dvb-usb/digitv.c | 13 +-
+ drivers/media/usb/dvb-usb/dtt200u.c | 56 +-
+ drivers/media/usb/dvb-usb/dtv5100.c | 11 +-
+ drivers/media/usb/dvb-usb/dw2102.c | 84 +-
+ drivers/media/usb/dvb-usb/gp8psk.c | 36 +-
+ drivers/media/usb/dvb-usb/m920x.c | 51 +-
+ drivers/media/usb/dvb-usb/nova-t-usb2.c | 18 +-
+ drivers/media/usb/dvb-usb/opera1.c | 15 +-
+ drivers/media/usb/dvb-usb/pctv452e.c | 22 +-
+ drivers/media/usb/dvb-usb/technisat-usb2.c | 11 +-
+ drivers/media/usb/dvb-usb/ttusb2.c | 36 +-
+ drivers/media/usb/dvb-usb/umt-010.c | 18 +-
+ drivers/media/usb/dvb-usb/vp702x.c | 23 +-
+ drivers/media/usb/dvb-usb/vp7045.c | 28 +-
+ drivers/media/usb/gspca/spca561.c | 2 +-
+ drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 7 +-
+ drivers/media/usb/stkwebcam/stk-webcam.c | 11 +-
+ drivers/media/usb/stkwebcam/stk-webcam.h | 2 +
+ drivers/media/usb/uvc/uvc_ctrl.c | 10 +
+ drivers/media/usb/uvc/uvc_driver.c | 11 +-
+ drivers/media/usb/uvc/uvc_v4l2.c | 28 +-
+ drivers/media/usb/uvc/uvc_video.c | 16 +-
+ drivers/media/usb/uvc/uvcvideo.h | 4 +
+ drivers/media/v4l2-core/tuner-core.c | 4 +-
+ drivers/media/v4l2-core/v4l2-async.c | 33 +-
+ drivers/media/v4l2-core/v4l2-ctrls-core.c | 5 +-
+ drivers/media/v4l2-core/v4l2-ctrls-defs.c | 9 +
+ drivers/media/v4l2-core/v4l2-fwnode.c | 4 +
+ drivers/media/v4l2-core/v4l2-h264.c | 275 +-
+ drivers/media/v4l2-core/v4l2-ioctl.c | 7 +
+ drivers/media/v4l2-core/v4l2-mem2mem.c | 9 +-
+ drivers/media/v4l2-core/v4l2-subdev.c | 219 +-
+ drivers/mmc/core/block.c | 52 +-
+ drivers/mmc/core/core.c | 7 +-
+ drivers/mmc/core/mmc.c | 11 +-
+ drivers/mmc/core/queue.c | 2 +
+ drivers/mmc/core/sd.c | 7 +
+ drivers/mmc/host/atmel-mci.c | 9 +-
+ drivers/mmc/host/bcm2835.c | 2 +-
+ drivers/mmc/host/dw_mmc.c | 2 +-
+ drivers/mmc/host/jz4740_mmc.c | 20 +
+ drivers/mmc/host/meson-gx-mmc.c | 21 +-
+ drivers/mmc/host/meson-mx-sdhc-mmc.c | 2 +-
+ drivers/mmc/host/mmci.c | 6 +-
+ drivers/mmc/host/mmci_stm32_sdmmc.c | 88 +-
+ drivers/mmc/host/mtk-sd.c | 2 +-
+ drivers/mmc/host/of_mmc_spi.c | 4 +
+ drivers/mmc/host/omap.c | 23 +-
+ drivers/mmc/host/renesas_sdhi.h | 2 +
+ drivers/mmc/host/renesas_sdhi_core.c | 2 -
+ drivers/mmc/host/renesas_sdhi_internal_dmac.c | 76 +-
+ drivers/mmc/host/sdhci-brcmstb.c | 67 +-
+ drivers/mmc/host/sdhci-msm.c | 25 +
+ drivers/mmc/host/sdhci-of-arasan.c | 3 +
+ drivers/mmc/host/sdhci-omap.c | 9 +-
+ drivers/mmc/host/sdhci-pci-gli.c | 10 +
+ drivers/mmc/host/sdhci.c | 2 +-
+ drivers/mmc/host/sdhci_am654.c | 23 +-
+ drivers/mmc/host/sh_mmcif.c | 2 +-
+ drivers/mmc/host/sunxi-mmc.c | 2 +-
+ drivers/mmc/host/uniphier-sd.c | 2 +-
+ drivers/mtd/chips/cfi_cmdset_0002.c | 112 +-
+ drivers/mtd/devices/phram.c | 108 +-
+ drivers/mtd/devices/st_spi_fsm.c | 2 +
+ drivers/mtd/maps/Kconfig | 9 -
+ drivers/mtd/maps/Makefile | 1 -
+ drivers/mtd/maps/ixp4xx.c | 262 -
+ drivers/mtd/mtdblock.c | 8 +-
+ drivers/mtd/mtdcore.c | 11 +-
+ drivers/mtd/mtdoops.c | 61 +-
+ drivers/mtd/mtdpart.c | 9 +
+ drivers/mtd/nand/Kconfig | 8 +
+ drivers/mtd/nand/Makefile | 1 +
+ drivers/mtd/nand/{raw/mtk_ecc.c => ecc-mtk.c} | 8 +-
+ drivers/mtd/nand/raw/Kconfig | 1 +
+ drivers/mtd/nand/raw/Makefile | 2 +-
+ drivers/mtd/nand/raw/cadence-nand-controller.c | 5 +-
+ drivers/mtd/nand/raw/cs553x_nand.c | 7 +-
+ drivers/mtd/nand/raw/davinci_nand.c | 2 +-
+ drivers/mtd/nand/raw/denali_pci.c | 15 +-
+ drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 296 +-
+ drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h | 12 +-
+ drivers/mtd/nand/raw/intel-nand-controller.c | 2 +-
+ drivers/mtd/nand/raw/mpc5121_nfc.c | 3 +-
+ drivers/mtd/nand/raw/mtk_nand.c | 2 +-
+ drivers/mtd/nand/raw/nand_base.c | 9 +-
+ drivers/mtd/nand/raw/nand_ids.c | 6 +
+ drivers/mtd/nand/raw/nand_toshiba.c | 6 +-
+ drivers/mtd/nand/raw/omap_elm.c | 1 +
+ drivers/mtd/nand/raw/renesas-nand-controller.c | 51 +-
+ drivers/mtd/nand/raw/rockchip-nand-controller.c | 6 +-
+ drivers/mtd/nand/raw/tmio_nand.c | 3 +
+ drivers/mtd/nand/spi/Makefile | 2 +-
+ drivers/mtd/nand/spi/core.c | 1 +
+ drivers/mtd/nand/spi/gigadevice.c | 158 +-
+ drivers/mtd/nand/spi/xtx.c | 129 +
+ drivers/mtd/parsers/bcm47xxpart.c | 2 +-
+ drivers/mtd/spi-nor/Makefile | 1 +
+ drivers/mtd/spi-nor/controllers/Kconfig | 10 -
+ drivers/mtd/spi-nor/controllers/Makefile | 1 -
+ drivers/mtd/spi-nor/controllers/aspeed-smc.c | 921 -
+ drivers/mtd/spi-nor/core.c | 286 +-
+ drivers/mtd/spi-nor/core.h | 123 +-
+ drivers/mtd/spi-nor/debugfs.c | 249 +
+ drivers/mtd/spi-nor/eon.c | 3 +-
+ drivers/mtd/spi-nor/micron-st.c | 139 +-
+ drivers/mtd/spi-nor/spansion.c | 159 +-
+ drivers/mtd/spi-nor/winbond.c | 45 +-
+ drivers/mtd/spi-nor/xilinx.c | 12 +-
+ drivers/net/Space.c | 3 -
+ drivers/net/amt.c | 11 +-
+ drivers/net/appletalk/Kconfig | 11 -
+ drivers/net/appletalk/Makefile | 1 -
+ drivers/net/appletalk/ltpc.c | 1277 --
+ drivers/net/appletalk/ltpc.h | 74 -
+ drivers/net/bonding/bond_main.c | 29 +-
+ drivers/net/caif/caif_virtio.c | 3 +-
+ drivers/net/can/Kconfig | 18 +-
+ drivers/net/can/Makefile | 1 +
+ drivers/net/can/at91_can.c | 12 +-
+ drivers/net/can/c_can/c_can_main.c | 19 +-
+ drivers/net/can/ctucanfd/Kconfig | 34 +
+ drivers/net/can/ctucanfd/Makefile | 10 +
+ drivers/net/can/ctucanfd/ctucanfd.h | 82 +
+ drivers/net/can/ctucanfd/ctucanfd_base.c | 1452 ++
+ drivers/net/can/ctucanfd/ctucanfd_kframe.h | 77 +
+ drivers/net/can/ctucanfd/ctucanfd_kregs.h | 325 +
+ drivers/net/can/ctucanfd/ctucanfd_pci.c | 294 +
+ drivers/net/can/ctucanfd/ctucanfd_platform.c | 131 +
+ drivers/net/can/dev/Makefile | 2 -
+ drivers/net/can/dev/bittiming.c | 2 +-
+ drivers/net/can/dev/dev.c | 5 -
+ drivers/net/can/dev/rx-offload.c | 11 +-
+ drivers/net/can/flexcan/flexcan-core.c | 23 +-
+ drivers/net/can/grcan.c | 2 +-
+ drivers/net/can/ifi_canfd/ifi_canfd.c | 9 -
+ drivers/net/can/janz-ican3.c | 2 +-
+ drivers/net/can/led.c | 140 -
+ drivers/net/can/m_can/m_can.c | 22 +-
+ drivers/net/can/m_can/m_can.h | 1 -
+ drivers/net/can/mscan/mpc5xxx_can.c | 2 +
+ drivers/net/can/mscan/mscan.c | 2 +-
+ drivers/net/can/pch_can.c | 2 +-
+ drivers/net/can/rcar/rcar_can.c | 12 +-
+ drivers/net/can/rcar/rcar_canfd.c | 11 +-
+ drivers/net/can/sja1000/Kconfig | 2 +-
+ drivers/net/can/sja1000/sja1000.c | 11 -
+ drivers/net/can/sja1000/tscan1.c | 7 +-
+ drivers/net/can/slcan.c | 4 +-
+ drivers/net/can/spi/hi311x.c | 8 -
+ drivers/net/can/spi/mcp251x.c | 10 -
+ drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 25 +-
+ drivers/net/can/spi/mcp251xfd/mcp251xfd-rx.c | 2 +-
+ drivers/net/can/spi/mcp251xfd/mcp251xfd.h | 14 +-
+ drivers/net/can/sun4i_can.c | 7 -
+ drivers/net/can/ti_hecc.c | 12 +-
+ drivers/net/can/usb/kvaser_usb/Makefile | 5 +
+ drivers/net/can/usb/mcba_usb.c | 8 -
+ drivers/net/can/usb/peak_usb/pcan_usb.c | 2 +-
+ drivers/net/can/usb/usb_8dev.c | 11 -
+ drivers/net/can/xilinx_can.c | 16 +-
+ drivers/net/dsa/Kconfig | 3 +-
+ drivers/net/dsa/lantiq_gswip.c | 9 +-
+ drivers/net/dsa/microchip/ksz8795.c | 287 +-
+ drivers/net/dsa/microchip/ksz8795_reg.h | 3 -
+ drivers/net/dsa/microchip/ksz8795_spi.c | 35 +-
+ drivers/net/dsa/microchip/ksz8863_smi.c | 10 +-
+ drivers/net/dsa/microchip/ksz9477.c | 331 +-
+ drivers/net/dsa/microchip/ksz9477_i2c.c | 30 +-
+ drivers/net/dsa/microchip/ksz9477_reg.h | 4 -
+ drivers/net/dsa/microchip/ksz9477_spi.c | 30 +-
+ drivers/net/dsa/microchip/ksz_common.c | 621 +-
+ drivers/net/dsa/microchip/ksz_common.h | 89 +-
+ drivers/net/dsa/mt7530.c | 332 +-
+ drivers/net/dsa/mt7530.h | 26 +-
+ drivers/net/dsa/mv88e6xxx/chip.c | 78 +-
+ drivers/net/dsa/ocelot/felix.c | 695 +-
+ drivers/net/dsa/ocelot/felix.h | 18 +-
+ drivers/net/dsa/ocelot/felix_vsc9959.c | 7 +-
+ drivers/net/dsa/ocelot/seville_vsc9953.c | 6 +-
+ drivers/net/dsa/qca8k.c | 145 +-
+ drivers/net/dsa/qca8k.h | 12 +-
+ drivers/net/dsa/realtek/rtl8365mb.c | 2 +-
+ drivers/net/dsa/realtek/rtl8366rb.c | 37 +-
+ drivers/net/dsa/sja1105/sja1105_main.c | 5 +-
+ drivers/net/eql.c | 3 +-
+ drivers/net/ethernet/3com/typhoon.c | 2 +-
+ drivers/net/ethernet/Kconfig | 1 +
+ drivers/net/ethernet/Makefile | 1 +
+ drivers/net/ethernet/adaptec/starfire.c | 2 +-
+ drivers/net/ethernet/alacritech/slic.h | 2 -
+ drivers/net/ethernet/alacritech/slicoss.c | 2 +-
+ drivers/net/ethernet/amazon/ena/ena_netdev.c | 4 +-
+ drivers/net/ethernet/amd/Kconfig | 10 -
+ drivers/net/ethernet/amd/Makefile | 1 -
+ drivers/net/ethernet/amd/amd8111e.c | 2 +-
+ drivers/net/ethernet/amd/ni65.c | 1251 --
+ drivers/net/ethernet/amd/ni65.h | 121 -
+ drivers/net/ethernet/amd/pcnet32.c | 3 +-
+ drivers/net/ethernet/amd/xgbe/xgbe.h | 3 +-
+ drivers/net/ethernet/apple/bmac.c | 1 -
+ drivers/net/ethernet/apple/mace.c | 1 -
+ drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 3 +-
+ .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 9 +
+ drivers/net/ethernet/aquantia/atlantic/aq_main.c | 87 +
+ drivers/net/ethernet/aquantia/atlantic/aq_main.h | 2 +
+ drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 136 +
+ drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 5 +
+ drivers/net/ethernet/aquantia/atlantic/aq_ptp.c | 2 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 409 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_ring.h | 21 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 25 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_vec.h | 6 +
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 6 +-
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 10 +-
+ drivers/net/ethernet/arc/emac_main.c | 3 +-
+ drivers/net/ethernet/atheros/ag71xx.c | 3 +-
+ drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 2 +-
+ drivers/net/ethernet/broadcom/Makefile | 5 +
+ drivers/net/ethernet/broadcom/bcm4908_enet.c | 2 +-
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c | 4 +-
+ drivers/net/ethernet/broadcom/bcmsysport.c | 2 +-
+ drivers/net/ethernet/broadcom/bgmac.c | 2 +-
+ drivers/net/ethernet/broadcom/bgmac.h | 2 -
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 10 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 313 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 18 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 2 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 86 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h | 2 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 415 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 80 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h | 2 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 12 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | 12 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 191 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h | 16 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.c | 3 +-
+ drivers/net/ethernet/broadcom/sb1250-mac.c | 9 +-
+ drivers/net/ethernet/brocade/bna/bnad.c | 3 +-
+ drivers/net/ethernet/cadence/macb.h | 6 +-
+ drivers/net/ethernet/cadence/macb_main.c | 353 +-
+ drivers/net/ethernet/cadence/macb_ptp.c | 4 +-
+ drivers/net/ethernet/calxeda/xgmac.c | 2 +-
+ drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +-
+ drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 +-
+ drivers/net/ethernet/cavium/thunder/nicvf_main.c | 3 -
+ .../chelsio/inline_crypto/ch_ktls/chcr_ktls.c | 2 +-
+ .../ethernet/chelsio/inline_crypto/chtls/chtls.h | 2 +-
+ .../chelsio/inline_crypto/chtls/chtls_io.c | 22 +-
+ drivers/net/ethernet/cirrus/cs89x0.c | 2 +-
+ drivers/net/ethernet/cortina/gemini.c | 4 +-
+ drivers/net/ethernet/dec/tulip/Kconfig | 15 -
+ drivers/net/ethernet/dec/tulip/Makefile | 1 -
+ drivers/net/ethernet/dec/tulip/de4x5.c | 5591 ------
+ drivers/net/ethernet/dec/tulip/de4x5.h | 1017 -
+ drivers/net/ethernet/dec/tulip/eeprom.c | 7 +-
+ drivers/net/ethernet/dec/tulip/tulip_core.c | 66 +-
+ drivers/net/ethernet/dec/tulip/winbond-840.c | 2 -
+ drivers/net/ethernet/emulex/benet/be.h | 3 +-
+ drivers/net/ethernet/emulex/benet/be_main.c | 4 +-
+ drivers/net/ethernet/engleder/tsnep_hw.h | 9 +-
+ drivers/net/ethernet/engleder/tsnep_main.c | 36 +-
+ drivers/net/ethernet/engleder/tsnep_ptp.c | 28 +
+ drivers/net/ethernet/ezchip/nps_enet.c | 4 +-
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 12 +-
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 3 -
+ drivers/net/ethernet/freescale/enetc/enetc.c | 13 +-
+ drivers/net/ethernet/freescale/enetc/enetc.h | 2 +
+ .../net/ethernet/freescale/enetc/enetc_ethtool.c | 2 +
+ drivers/net/ethernet/freescale/enetc/enetc_hw.h | 1 +
+ drivers/net/ethernet/freescale/enetc/enetc_pf.c | 30 +-
+ drivers/net/ethernet/freescale/enetc/enetc_qos.c | 6 +
+ drivers/net/ethernet/freescale/fec_main.c | 20 +-
+ drivers/net/ethernet/freescale/fec_mpc52xx.c | 2 +
+ drivers/net/ethernet/freescale/fec_mpc52xx_phy.c | 1 +
+ .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 3 +-
+ drivers/net/ethernet/freescale/gianfar.c | 6 +-
+ drivers/net/ethernet/freescale/gianfar.h | 3 -
+ .../net/ethernet/fungible/funeth/funeth_devlink.c | 8 +-
+ drivers/net/ethernet/fungible/funeth/funeth_main.c | 3 +-
+ drivers/net/ethernet/hisilicon/hisi_femac.c | 3 +-
+ drivers/net/ethernet/hisilicon/hns/hns_enet.c | 4 +-
+ drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 73 +-
+ drivers/net/ethernet/hisilicon/hns3/hnae3.h | 4 +
+ .../hisilicon/hns3/hns3_common/hclge_comm_cmd.c | 2 +
+ .../hisilicon/hns3/hns3_common/hclge_comm_cmd.h | 1 +
+ .../hisilicon/hns3/hns3_common/hclge_comm_rss.h | 2 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 5 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 144 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.h | 6 +
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 2 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 30 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 6 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 195 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_trace.h | 2 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 62 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 2 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c | 88 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_trace.h | 2 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c | 2 +
+ drivers/net/ethernet/huawei/hinic/hinic_hw_wq.c | 2 +-
+ drivers/net/ethernet/huawei/hinic/hinic_rx.c | 3 +-
+ drivers/net/ethernet/huawei/hinic/hinic_tx.c | 3 +-
+ drivers/net/ethernet/ibm/ehea/ehea.h | 1 +
+ drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +
+ drivers/net/ethernet/ibm/emac/mal.c | 4 +-
+ drivers/net/ethernet/ibm/ibmveth.c | 2 +-
+ drivers/net/ethernet/ibm/ibmvnic.c | 311 +-
+ drivers/net/ethernet/ibm/ibmvnic.h | 54 +-
+ drivers/net/ethernet/intel/e100.c | 2 +-
+ drivers/net/ethernet/intel/i40e/i40e.h | 1 +
+ drivers/net/ethernet/intel/i40e/i40e_common.c | 1 +
+ drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 5 +-
+ drivers/net/ethernet/intel/i40e/i40e_devids.h | 1 +
+ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 +
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 25 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.c | 49 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 +
+ drivers/net/ethernet/intel/i40e/i40e_txrx_common.h | 1 +
+ drivers/net/ethernet/intel/i40e/i40e_xsk.c | 39 +-
+ drivers/net/ethernet/intel/ice/Makefile | 5 +
+ drivers/net/ethernet/intel/ice/ice.h | 15 +
+ drivers/net/ethernet/intel/ice/ice_devlink.c | 27 +-
+ drivers/net/ethernet/intel/ice/ice_ethtool.c | 77 +-
+ drivers/net/ethernet/intel/ice/ice_gnss.c | 3 +-
+ drivers/net/ethernet/intel/ice/ice_idc.c | 15 -
+ drivers/net/ethernet/intel/ice/ice_main.c | 22 +-
+ drivers/net/ethernet/intel/ice/ice_repr.c | 8 +-
+ drivers/net/ethernet/intel/ice/ice_sriov.c | 32 +-
+ drivers/net/ethernet/intel/ice/ice_switch.c | 494 +-
+ drivers/net/ethernet/intel/ice/ice_switch.h | 12 +-
+ drivers/net/ethernet/intel/ice/ice_tc_lib.c | 1 -
+ drivers/net/ethernet/intel/ice/ice_txrx.c | 29 +-
+ drivers/net/ethernet/intel/ice/ice_txrx.h | 1 +
+ drivers/net/ethernet/intel/ice/ice_vf_lib.c | 43 +-
+ drivers/net/ethernet/intel/ice/ice_vf_lib.h | 4 +-
+ drivers/net/ethernet/intel/ice/ice_virtchnl.c | 27 +-
+ drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c | 9 +-
+ drivers/net/ethernet/intel/ice/ice_xsk.c | 53 +-
+ drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 +-
+ drivers/net/ethernet/intel/igc/igc.h | 1 -
+ drivers/net/ethernet/intel/igc/igc_base.c | 2 -
+ drivers/net/ethernet/intel/igc/igc_hw.h | 7 -
+ drivers/net/ethernet/intel/igc/igc_main.c | 50 -
+ drivers/net/ethernet/intel/igc/igc_phy.c | 16 +-
+ drivers/net/ethernet/intel/igc/igc_phy.h | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 9 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.h | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 107 +-
+ .../net/ethernet/intel/ixgbe/ixgbe_txrx_common.h | 1 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 53 +-
+ drivers/net/ethernet/intel/ixgbevf/ipsec.c | 6 +-
+ drivers/net/ethernet/intel/ixgbevf/ipsec.h | 2 +-
+ drivers/net/ethernet/jme.c | 2 +-
+ drivers/net/ethernet/jme.h | 2 -
+ drivers/net/ethernet/lantiq_etop.c | 8 +-
+ drivers/net/ethernet/lantiq_xrx200.c | 4 +-
+ drivers/net/ethernet/marvell/Kconfig | 2 +
+ drivers/net/ethernet/marvell/Makefile | 1 +
+ drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +-
+ drivers/net/ethernet/marvell/mvneta.c | 22 +-
+ drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 4 +-
+ drivers/net/ethernet/marvell/octeon_ep/Kconfig | 20 +
+ drivers/net/ethernet/marvell/octeon_ep/Makefile | 9 +
+ .../net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c | 737 +
+ .../net/ethernet/marvell/octeon_ep/octep_config.h | 204 +
+ .../ethernet/marvell/octeon_ep/octep_ctrl_mbox.c | 245 +
+ .../ethernet/marvell/octeon_ep/octep_ctrl_mbox.h | 170 +
+ .../ethernet/marvell/octeon_ep/octep_ctrl_net.c | 194 +
+ .../ethernet/marvell/octeon_ep/octep_ctrl_net.h | 299 +
+ .../net/ethernet/marvell/octeon_ep/octep_ethtool.c | 463 +
+ .../net/ethernet/marvell/octeon_ep/octep_main.c | 1181 ++
+ .../net/ethernet/marvell/octeon_ep/octep_main.h | 357 +
+ .../marvell/octeon_ep/octep_regs_cn9k_pf.h | 367 +
+ drivers/net/ethernet/marvell/octeon_ep/octep_rx.c | 507 +
+ drivers/net/ethernet/marvell/octeon_ep/octep_rx.h | 199 +
+ drivers/net/ethernet/marvell/octeon_ep/octep_tx.c | 334 +
+ drivers/net/ethernet/marvell/octeon_ep/octep_tx.h | 284 +
+ drivers/net/ethernet/marvell/octeontx2/Kconfig | 1 +
+ .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 4 +-
+ .../ethernet/marvell/octeontx2/nic/otx2_common.c | 5 -
+ .../ethernet/marvell/octeontx2/nic/otx2_common.h | 10 +
+ .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 45 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 29 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 23 +
+ .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 1 +
+ .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 +-
+ .../net/ethernet/marvell/prestera/prestera_acl.c | 42 +-
+ .../net/ethernet/marvell/prestera/prestera_acl.h | 12 +
+ .../ethernet/marvell/prestera/prestera_flower.c | 28 +
+ .../net/ethernet/marvell/prestera/prestera_hw.c | 81 +
+ .../net/ethernet/marvell/prestera/prestera_hw.h | 13 +
+ .../ethernet/marvell/prestera/prestera_router.c | 11 +-
+ .../net/ethernet/marvell/prestera/prestera_rxtx.c | 2 +-
+ drivers/net/ethernet/marvell/pxa168_eth.c | 3 +-
+ drivers/net/ethernet/marvell/skge.c | 3 +-
+ drivers/net/ethernet/marvell/sky2.c | 3 +-
+ drivers/net/ethernet/mediatek/Kconfig | 4 +
+ drivers/net/ethernet/mediatek/Makefile | 10 +
+ drivers/net/ethernet/mediatek/mtk_eth_soc.c | 1062 +-
+ drivers/net/ethernet/mediatek/mtk_eth_soc.h | 360 +-
+ drivers/net/ethernet/mediatek/mtk_ppe.c | 369 +-
+ drivers/net/ethernet/mediatek/mtk_ppe.h | 89 +-
+ drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c | 1 -
+ drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 191 +-
+ drivers/net/ethernet/mediatek/mtk_sgmii.c | 176 +-
+ drivers/net/ethernet/mediatek/mtk_star_emac.c | 3 +-
+ drivers/net/ethernet/mediatek/mtk_wed.c | 880 +
+ drivers/net/ethernet/mediatek/mtk_wed.h | 135 +
+ drivers/net/ethernet/mediatek/mtk_wed_debugfs.c | 175 +
+ drivers/net/ethernet/mediatek/mtk_wed_ops.c | 8 +
+ drivers/net/ethernet/mediatek/mtk_wed_regs.h | 251 +
+ drivers/net/ethernet/mellanox/mlx4/en_cq.c | 3 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 3 +
+ drivers/net/ethernet/mellanox/mlx4/en_tx.c | 47 +-
+ drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 58 +-
+ drivers/net/ethernet/mellanox/mlx5/core/Makefile | 16 +-
+ .../net/ethernet/mellanox/mlx5/core/accel/accel.h | 36 -
+ .../net/ethernet/mellanox/mlx5/core/accel/ipsec.c | 179 -
+ .../net/ethernet/mellanox/mlx5/core/accel/ipsec.h | 96 -
+ .../mellanox/mlx5/core/accel/ipsec_offload.c | 385 -
+ .../mellanox/mlx5/core/accel/ipsec_offload.h | 38 -
+ .../net/ethernet/mellanox/mlx5/core/accel/tls.c | 125 -
+ .../net/ethernet/mellanox/mlx5/core/accel/tls.h | 156 -
+ drivers/net/ethernet/mellanox/mlx5/core/alloc.c | 6 -
+ drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 7 +-
+ drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 2 +
+ drivers/net/ethernet/mellanox/mlx5/core/dev.c | 49 +-
+ drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 24 +-
+ .../mellanox/mlx5/core/diag/fs_tracepoint.c | 3 +
+ drivers/net/ethernet/mellanox/mlx5/core/en.h | 6 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/dcbnl.h | 2 -
+ drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 1 -
+ .../net/ethernet/mellanox/mlx5/core/en/params.c | 22 +-
+ .../ethernet/mellanox/mlx5/core/en/tc/act/mirred.c | 14 +
+ .../ethernet/mellanox/mlx5/core/en/tc/ct_fs_smfs.c | 2 +-
+ .../net/ethernet/mellanox/mlx5/core/en/tc/sample.c | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 53 +-
+ .../net/ethernet/mellanox/mlx5/core/en/xsk/rx.c | 6 -
+ .../net/ethernet/mellanox/mlx5/core/en/xsk/rx.h | 1 -
+ .../net/ethernet/mellanox/mlx5/core/en/xsk/tx.c | 2 +-
+ .../mellanox/mlx5/core/en_accel/en_accel.h | 11 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c | 2 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 204 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 110 +-
+ .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 365 +-
+ .../mellanox/mlx5/core/en_accel/ipsec_fs.h | 11 +-
+ .../mellanox/mlx5/core/en_accel/ipsec_offload.c | 205 +
+ .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 249 +-
+ .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 3 -
+ .../mellanox/mlx5/core/en_accel/ipsec_stats.c | 65 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/ktls.c | 71 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/ktls.h | 86 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c | 2 +-
+ .../core/en_accel/{tls_stats.c => ktls_stats.c} | 51 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 20 +-
+ .../mellanox/mlx5/core/en_accel/ktls_txrx.h | 28 +-
+ .../mellanox/mlx5/core/en_accel/ktls_utils.h | 1 -
+ .../net/ethernet/mellanox/mlx5/core/en_accel/tls.c | 247 -
+ .../net/ethernet/mellanox/mlx5/core/en_accel/tls.h | 132 -
+ .../mellanox/mlx5/core/en_accel/tls_rxtx.c | 390 -
+ .../mellanox/mlx5/core/en_accel/tls_rxtx.h | 91 -
+ .../net/ethernet/mellanox/mlx5/core/en_common.c | 5 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 9 -
+ drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 35 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 36 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 79 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 9 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 1 -
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 28 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 7 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 105 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 28 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 8 -
+ .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 3 +
+ .../net/ethernet/mellanox/mlx5/core/fpga/core.h | 3 -
+ .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.c | 1582 --
+ .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.h | 62 -
+ drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c | 622 -
+ drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.h | 74 -
+ drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 20 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 61 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/fw.c | 3 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 2 +-
+ .../ethernet/mellanox/mlx5/core/ipoib/ethtool.c | 14 +-
+ .../net/ethernet/mellanox/mlx5/core/lag/debugfs.c | 174 +
+ drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 681 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h | 55 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c | 4 +-
+ .../net/ethernet/mellanox/mlx5/core/lag/mpesw.c | 101 +
+ .../net/ethernet/mellanox/mlx5/core/lag/mpesw.h | 26 +
+ .../net/ethernet/mellanox/mlx5/core/lag/port_sel.c | 129 +-
+ .../net/ethernet/mellanox/mlx5/core/lag/port_sel.h | 15 +-
+ .../net/ethernet/mellanox/mlx5/core/lib/devcom.c | 16 +-
+ .../net/ethernet/mellanox/mlx5/core/lib/devcom.h | 2 +
+ drivers/net/ethernet/mellanox/mlx5/core/lib/tout.c | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/lib/tout.h | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 67 +-
+ .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 3 +-
+ drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 8 +-
+ .../ethernet/mellanox/mlx5/core/steering/dr_cmd.c | 21 +-
+ drivers/net/ethernet/mellanox/mlx5/core/vport.c | 52 +-
+ .../net/ethernet/mellanox/mlxbf_gige/mlxbf_gige.h | 3 -
+ .../mellanox/mlxbf_gige/mlxbf_gige_ethtool.c | 8 +-
+ .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_intr.c | 9 -
+ .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 2 +-
+ .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c | 6 +-
+ drivers/net/ethernet/mellanox/mlxsw/Makefile | 3 +-
+ drivers/net/ethernet/mellanox/mlxsw/core.c | 58 +-
+ drivers/net/ethernet/mellanox/mlxsw/core.h | 79 +-
+ drivers/net/ethernet/mellanox/mlxsw/core_env.c | 681 +-
+ drivers/net/ethernet/mellanox/mlxsw/core_env.h | 47 +-
+ drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c | 311 +-
+ .../net/ethernet/mellanox/mlxsw/core_linecards.c | 1142 ++
+ drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 250 +-
+ drivers/net/ethernet/mellanox/mlxsw/minimal.c | 39 +-
+ drivers/net/ethernet/mellanox/mlxsw/reg.h | 465 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 348 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 27 +-
+ .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 5 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 26 +
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c | 13 -
+ .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 35 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 201 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 2 +
+ .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 31 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_trap.c | 2 +-
+ drivers/net/ethernet/mellanox/mlxsw/trap.h | 6 +
+ drivers/net/ethernet/microchip/lan743x_main.c | 6 +-
+ drivers/net/ethernet/microchip/lan966x/Makefile | 2 +-
+ .../net/ethernet/microchip/lan966x/lan966x_fdma.c | 842 +
+ .../net/ethernet/microchip/lan966x/lan966x_main.c | 84 +-
+ .../net/ethernet/microchip/lan966x/lan966x_main.h | 121 +
+ .../net/ethernet/microchip/lan966x/lan966x_port.c | 3 +
+ .../net/ethernet/microchip/lan966x/lan966x_ptp.c | 276 +-
+ .../net/ethernet/microchip/lan966x/lan966x_regs.h | 146 +
+ .../net/ethernet/microchip/sparx5/sparx5_fdma.c | 3 +-
+ .../net/ethernet/microchip/sparx5/sparx5_port.c | 2 +-
+ .../ethernet/microchip/sparx5/sparx5_switchdev.c | 12 +
+ drivers/net/ethernet/microsoft/mana/mana_en.c | 4 +-
+ drivers/net/ethernet/moxa/moxart_ether.c | 2 +-
+ drivers/net/ethernet/mscc/ocelot.c | 244 +-
+ drivers/net/ethernet/mscc/ocelot.h | 1 -
+ drivers/net/ethernet/mscc/ocelot_fdma.c | 4 +-
+ drivers/net/ethernet/mscc/ocelot_flower.c | 16 +
+ drivers/net/ethernet/mscc/ocelot_net.c | 79 +-
+ drivers/net/ethernet/mscc/ocelot_police.c | 26 +-
+ drivers/net/ethernet/mscc/ocelot_police.h | 2 +-
+ drivers/net/ethernet/mscc/ocelot_vcap.c | 42 +-
+ drivers/net/ethernet/mscc/ocelot_vsc7514.c | 2 +-
+ drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 6 +-
+ drivers/net/ethernet/natsemi/natsemi.c | 2 -
+ drivers/net/ethernet/neterion/vxge/vxge-main.c | 13 +-
+ drivers/net/ethernet/neterion/vxge/vxge-main.h | 2 -
+ drivers/net/ethernet/netronome/nfp/crypto/tls.c | 2 +-
+ drivers/net/ethernet/netronome/nfp/flower/action.c | 3 +-
+ .../net/ethernet/netronome/nfp/flower/conntrack.c | 268 +-
+ .../net/ethernet/netronome/nfp/flower/lag_conf.c | 2 +-
+ drivers/net/ethernet/netronome/nfp/flower/main.h | 110 +-
+ drivers/net/ethernet/netronome/nfp/flower/match.c | 51 +-
+ .../net/ethernet/netronome/nfp/flower/metadata.c | 19 +-
+ .../net/ethernet/netronome/nfp/flower/offload.c | 86 +-
+ .../ethernet/netronome/nfp/flower/tunnel_conf.c | 515 +-
+ drivers/net/ethernet/netronome/nfp/nfp_main.c | 38 +-
+ .../net/ethernet/netronome/nfp/nfp_net_common.c | 13 +-
+ drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 5 +-
+ drivers/net/ethernet/netronome/nfp/nfp_net_sriov.c | 91 +-
+ drivers/net/ethernet/netronome/nfp/nfp_net_sriov.h | 12 +
+ .../net/ethernet/netronome/nfp/nfp_netvf_main.c | 12 +-
+ .../ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c | 18 +-
+ .../net/ethernet/netronome/nfp/nfpcore/nfp_cpp.h | 26 +-
+ .../net/ethernet/netronome/nfp/nfpcore/nfp_dev.h | 8 +
+ drivers/net/ethernet/nvidia/forcedeth.c | 6 +-
+ drivers/net/ethernet/nxp/lpc_eth.c | 2 +-
+ .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 12 +-
+ drivers/net/ethernet/qlogic/qed/Makefile | 3 +-
+ drivers/net/ethernet/qlogic/qed/qed_dbg_hsi.h | 2 +-
+ drivers/net/ethernet/qlogic/qed/qed_main.c | 1 -
+ .../ethernet/qlogic/qed/qed_nvmetcp_ip_services.c | 238 -
+ drivers/net/ethernet/qlogic/qed/qed_vf.h | 2 +-
+ drivers/net/ethernet/qlogic/qede/qede_main.c | 1 -
+ drivers/net/ethernet/qlogic/qede/qede_ptp.c | 10 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 9 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 3 +-
+ drivers/net/ethernet/realtek/8139cp.c | 2 +-
+ drivers/net/ethernet/realtek/atp.h | 4 -
+ drivers/net/ethernet/realtek/r8169_main.c | 8 +-
+ drivers/net/ethernet/renesas/ravb.h | 6 +
+ drivers/net/ethernet/renesas/ravb_main.c | 109 +-
+ drivers/net/ethernet/renesas/ravb_ptp.c | 6 +-
+ drivers/net/ethernet/rocker/rocker_main.c | 3 +-
+ drivers/net/ethernet/sfc/Kconfig | 15 +-
+ drivers/net/ethernet/sfc/Makefile | 5 +-
+ drivers/net/ethernet/sfc/ef10.c | 2 +-
+ drivers/net/ethernet/sfc/ef100.c | 27 +-
+ drivers/net/ethernet/sfc/ef100_nic.c | 18 +-
+ drivers/net/ethernet/sfc/ef100_sriov.c | 56 +
+ drivers/net/ethernet/sfc/ef100_sriov.h | 14 +
+ drivers/net/ethernet/sfc/efx.c | 19 +-
+ drivers/net/ethernet/sfc/efx.h | 1 -
+ drivers/net/ethernet/sfc/efx_channels.c | 59 +-
+ drivers/net/ethernet/sfc/efx_channels.h | 3 -
+ drivers/net/ethernet/sfc/efx_common.c | 4 +-
+ drivers/net/ethernet/sfc/falcon/efx.c | 10 +-
+ drivers/net/ethernet/sfc/falcon/rx.c | 4 +-
+ drivers/net/ethernet/sfc/falcon/tx.c | 3 +-
+ drivers/net/ethernet/sfc/mcdi_pcol.h | 4 +-
+ drivers/net/ethernet/sfc/net_driver.h | 5 -
+ drivers/net/ethernet/sfc/nic.h | 4 -
+ drivers/net/ethernet/sfc/siena/Kconfig | 46 +
+ drivers/net/ethernet/sfc/siena/Makefile | 11 +
+ drivers/net/ethernet/sfc/siena/bitfield.h | 614 +
+ drivers/net/ethernet/sfc/siena/efx.c | 1325 ++
+ drivers/net/ethernet/sfc/siena/efx.h | 218 +
+ drivers/net/ethernet/sfc/siena/efx_channels.c | 1370 ++
+ drivers/net/ethernet/sfc/siena/efx_channels.h | 45 +
+ drivers/net/ethernet/sfc/siena/efx_common.c | 1408 ++
+ drivers/net/ethernet/sfc/siena/efx_common.h | 118 +
+ drivers/net/ethernet/sfc/siena/enum.h | 176 +
+ drivers/net/ethernet/sfc/siena/ethtool.c | 282 +
+ drivers/net/ethernet/sfc/siena/ethtool_common.c | 1340 ++
+ drivers/net/ethernet/sfc/siena/ethtool_common.h | 60 +
+ drivers/net/ethernet/sfc/{ => siena}/farch.c | 77 +-
+ drivers/net/ethernet/sfc/siena/farch_regs.h | 2929 +++
+ drivers/net/ethernet/sfc/siena/filter.h | 309 +
+ drivers/net/ethernet/sfc/siena/io.h | 310 +
+ drivers/net/ethernet/sfc/siena/mcdi.c | 2260 +++
+ drivers/net/ethernet/sfc/siena/mcdi.h | 386 +
+ drivers/net/ethernet/sfc/siena/mcdi_mon.c | 531 +
+ drivers/net/ethernet/sfc/siena/mcdi_pcol.h | 17204 ++++++++++++++++
+ drivers/net/ethernet/sfc/siena/mcdi_port.c | 110 +
+ drivers/net/ethernet/sfc/siena/mcdi_port.h | 17 +
+ drivers/net/ethernet/sfc/siena/mcdi_port_common.c | 1282 ++
+ drivers/net/ethernet/sfc/siena/mcdi_port_common.h | 58 +
+ drivers/net/ethernet/sfc/siena/mtd.c | 124 +
+ drivers/net/ethernet/sfc/siena/net_driver.h | 1715 ++
+ drivers/net/ethernet/sfc/siena/nic.c | 530 +
+ drivers/net/ethernet/sfc/siena/nic.h | 206 +
+ drivers/net/ethernet/sfc/siena/nic_common.h | 251 +
+ drivers/net/ethernet/sfc/siena/ptp.c | 2201 +++
+ drivers/net/ethernet/sfc/siena/ptp.h | 45 +
+ drivers/net/ethernet/sfc/siena/rx.c | 400 +
+ drivers/net/ethernet/sfc/siena/rx_common.c | 1094 ++
+ drivers/net/ethernet/sfc/siena/rx_common.h | 110 +
+ drivers/net/ethernet/sfc/siena/selftest.c | 807 +
+ drivers/net/ethernet/sfc/siena/selftest.h | 52 +
+ drivers/net/ethernet/sfc/{ => siena}/siena.c | 168 +-
+ drivers/net/ethernet/sfc/{ => siena}/siena_sriov.c | 35 +-
+ drivers/net/ethernet/sfc/{ => siena}/siena_sriov.h | 9 +-
+ drivers/net/ethernet/sfc/siena/sriov.h | 83 +
+ drivers/net/ethernet/sfc/siena/tx.c | 392 +
+ drivers/net/ethernet/sfc/siena/tx.h | 40 +
+ drivers/net/ethernet/sfc/siena/tx_common.c | 448 +
+ drivers/net/ethernet/sfc/siena/tx_common.h | 39 +
+ drivers/net/ethernet/sfc/siena/vfdi.h | 252 +
+ drivers/net/ethernet/sfc/siena/workarounds.h | 28 +
+ drivers/net/ethernet/sfc/tx.c | 3 +-
+ drivers/net/ethernet/sfc/tx_common.c | 3 +-
+ drivers/net/ethernet/smsc/smc911x.c | 6 +-
+ drivers/net/ethernet/smsc/smsc911x.c | 3 +-
+ drivers/net/ethernet/smsc/smsc9420.c | 2 +-
+ drivers/net/ethernet/smsc/smsc9420.h | 1 -
+ drivers/net/ethernet/socionext/sni_ave.c | 3 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 6 -
+ .../net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 6 -
+ drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 6 -
+ drivers/net/ethernet/stmicro/stmmac/hwif.h | 4 -
+ drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 6 -
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 27 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 24 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 13 +-
+ drivers/net/ethernet/sun/cassini.c | 4 +-
+ drivers/net/ethernet/sun/sungem.c | 1 -
+ drivers/net/ethernet/sunplus/Kconfig | 32 +
+ drivers/net/ethernet/sunplus/Makefile | 6 +
+ drivers/net/ethernet/sunplus/spl2sw_define.h | 270 +
+ drivers/net/ethernet/sunplus/spl2sw_desc.c | 228 +
+ drivers/net/ethernet/sunplus/spl2sw_desc.h | 19 +
+ drivers/net/ethernet/sunplus/spl2sw_driver.c | 565 +
+ drivers/net/ethernet/sunplus/spl2sw_int.c | 273 +
+ drivers/net/ethernet/sunplus/spl2sw_int.h | 13 +
+ drivers/net/ethernet/sunplus/spl2sw_mac.c | 274 +
+ drivers/net/ethernet/sunplus/spl2sw_mac.h | 18 +
+ drivers/net/ethernet/sunplus/spl2sw_mdio.c | 131 +
+ drivers/net/ethernet/sunplus/spl2sw_mdio.h | 12 +
+ drivers/net/ethernet/sunplus/spl2sw_phy.c | 92 +
+ drivers/net/ethernet/sunplus/spl2sw_phy.h | 12 +
+ drivers/net/ethernet/sunplus/spl2sw_register.h | 86 +
+ drivers/net/ethernet/synopsys/dwc-xlgmac.h | 3 +-
+ drivers/net/ethernet/ti/Kconfig | 1 +
+ drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 6 +-
+ drivers/net/ethernet/ti/am65-cpsw-nuss.c | 37 +-
+ drivers/net/ethernet/ti/am65-cpsw-qos.c | 193 +-
+ drivers/net/ethernet/ti/am65-cpsw-qos.h | 8 +
+ drivers/net/ethernet/ti/cpsw.c | 45 +-
+ drivers/net/ethernet/ti/cpsw_ale.c | 66 +
+ drivers/net/ethernet/ti/cpsw_ale.h | 2 +
+ drivers/net/ethernet/ti/cpsw_new.c | 46 +-
+ drivers/net/ethernet/ti/cpsw_priv.c | 235 +-
+ drivers/net/ethernet/ti/cpsw_priv.h | 10 +-
+ drivers/net/ethernet/ti/davinci_emac.c | 12 +-
+ drivers/net/ethernet/ti/davinci_mdio.c | 18 +-
+ drivers/net/ethernet/ti/netcp_core.c | 5 +-
+ drivers/net/ethernet/toshiba/spider_net.c | 3 +-
+ drivers/net/ethernet/toshiba/spider_net.h | 1 -
+ drivers/net/ethernet/toshiba/tc35815.c | 2 +-
+ drivers/net/ethernet/via/via-velocity.c | 3 +-
+ drivers/net/ethernet/via/via-velocity.h | 1 -
+ drivers/net/ethernet/wiznet/w5100.c | 2 +-
+ drivers/net/ethernet/wiznet/w5300.c | 2 +-
+ drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +-
+ drivers/net/ethernet/xilinx/xilinx_axienet.h | 54 +-
+ drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 168 +-
+ drivers/net/ethernet/xilinx/xilinx_emaclite.c | 55 +-
+ drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +-
+ drivers/net/ethernet/xscale/ptp_ixp46x.c | 2 +-
+ drivers/net/fddi/skfp/smt.c | 2 +-
+ drivers/net/geneve.c | 10 +-
+ drivers/net/hamradio/Kconfig | 34 -
+ drivers/net/hamradio/Makefile | 1 -
+ drivers/net/hamradio/dmascc.c | 1450 --
+ drivers/net/hyperv/hyperv_net.h | 69 +-
+ drivers/net/hyperv/netvsc.c | 16 +-
+ drivers/net/hyperv/netvsc_bpf.c | 101 +-
+ drivers/net/hyperv/netvsc_drv.c | 155 +-
+ drivers/net/hyperv/rndis_filter.c | 4 +-
+ drivers/net/ieee802154/Kconfig | 7 -
+ drivers/net/ieee802154/at86rf230.c | 163 +-
+ drivers/net/ieee802154/atusb.c | 37 +-
+ drivers/net/ieee802154/ca8210.c | 181 +-
+ drivers/net/ieee802154/mcr20a.c | 5 -
+ drivers/net/ipa/gsi.c | 20 +-
+ drivers/net/ipa/gsi.h | 1 -
+ drivers/net/ipa/gsi_reg.h | 2 +-
+ drivers/net/ipa/gsi_trans.c | 38 +-
+ drivers/net/ipa/gsi_trans.h | 24 +-
+ drivers/net/ipa/ipa.h | 2 +
+ drivers/net/ipa/ipa_cmd.c | 78 +-
+ drivers/net/ipa/ipa_cmd.h | 11 -
+ drivers/net/ipa/ipa_data-v3.1.c | 2 +
+ drivers/net/ipa/ipa_data-v3.5.1.c | 2 +
+ drivers/net/ipa/ipa_data-v4.11.c | 2 +
+ drivers/net/ipa/ipa_data-v4.2.c | 2 +
+ drivers/net/ipa/ipa_data-v4.5.c | 2 +
+ drivers/net/ipa/ipa_data-v4.9.c | 2 +
+ drivers/net/ipa/ipa_data.h | 70 +-
+ drivers/net/ipa/ipa_endpoint.c | 214 +-
+ drivers/net/ipa/ipa_endpoint.h | 85 +-
+ drivers/net/ipa/ipa_interrupt.c | 6 +-
+ drivers/net/ipa/ipa_modem.c | 13 +-
+ drivers/net/ipvlan/ipvlan_main.c | 6 +-
+ drivers/net/loopback.c | 2 +
+ drivers/net/macvlan.c | 9 +-
+ drivers/net/mdio/mdio-aspeed.c | 138 +-
+ drivers/net/mdio/mdio-mscc-miim.c | 81 +-
+ drivers/net/netdevsim/fib.c | 9 +-
+ drivers/net/netdevsim/ipsec.c | 2 +-
+ drivers/net/pcs/pcs-xpcs.c | 6 +-
+ drivers/net/phy/Kconfig | 13 +
+ drivers/net/phy/Makefile | 2 +
+ drivers/net/phy/adin.c | 40 +
+ drivers/net/phy/adin1100.c | 292 +
+ drivers/net/phy/bcm87xx.c | 36 +-
+ drivers/net/phy/dp83822.c | 9 +-
+ drivers/net/phy/dp83td510.c | 209 +
+ drivers/net/phy/marvell.c | 53 +-
+ drivers/net/phy/micrel.c | 269 +-
+ drivers/net/phy/microchip.c | 10 +-
+ drivers/net/phy/microchip_t1.c | 50 +
+ drivers/net/phy/phy-c45.c | 297 +-
+ drivers/net/phy/phy-core.c | 3 +-
+ drivers/net/phy/phy.c | 18 +-
+ drivers/net/phy/phy_device.c | 10 +-
+ drivers/net/phy/phylink.c | 64 +-
+ drivers/net/phy/smsc.c | 59 +-
+ drivers/net/ppp/pppoe.c | 3 +-
+ drivers/net/sungem_phy.c | 6 +-
+ drivers/net/tun.c | 3 +-
+ drivers/net/usb/aqc111.c | 2 +-
+ drivers/net/usb/asix_devices.c | 6 +-
+ drivers/net/usb/ax88179_178a.c | 2 +-
+ drivers/net/usb/cdc_ether.c | 3 +-
+ drivers/net/usb/cdc_ncm.c | 8 +-
+ drivers/net/usb/lan78xx.c | 6 +-
+ drivers/net/usb/qmi_wwan.c | 3 +-
+ drivers/net/usb/r8152.c | 41 +-
+ drivers/net/usb/rndis_host.c | 47 +-
+ drivers/net/usb/smsc95xx.c | 152 +-
+ drivers/net/usb/sr9800.h | 2 +-
+ drivers/net/usb/usbnet.c | 6 +-
+ drivers/net/veth.c | 6 +-
+ drivers/net/virtio_net.c | 9 +-
+ drivers/net/vxlan/vxlan_core.c | 43 +-
+ drivers/net/wan/Kconfig | 72 -
+ drivers/net/wan/Makefile | 5 -
+ drivers/net/wan/cosa.c | 2052 --
+ drivers/net/wan/cosa.h | 104 -
+ drivers/net/wan/fsl_ucc_hdlc.c | 2 +-
+ drivers/net/wan/hd64572.c | 3 +-
+ drivers/net/wan/hostess_sv11.c | 336 -
+ drivers/net/wan/ixp4xx_hss.c | 2 +-
+ drivers/net/wan/lapbether.c | 2 +-
+ drivers/net/wan/lmc/Makefile | 18 -
+ drivers/net/wan/lmc/lmc.h | 33 -
+ drivers/net/wan/lmc/lmc_debug.c | 65 -
+ drivers/net/wan/lmc/lmc_debug.h | 52 -
+ drivers/net/wan/lmc/lmc_ioctl.h | 255 -
+ drivers/net/wan/lmc/lmc_main.c | 2009 --
+ drivers/net/wan/lmc/lmc_media.c | 1206 --
+ drivers/net/wan/lmc/lmc_proto.c | 106 -
+ drivers/net/wan/lmc/lmc_proto.h | 18 -
+ drivers/net/wan/lmc/lmc_var.h | 468 -
+ drivers/net/wan/sealevel.c | 352 -
+ drivers/net/wan/z85230.c | 1641 --
+ drivers/net/wan/z85230.h | 407 -
+ drivers/net/wireless/Kconfig | 2 +
+ drivers/net/wireless/Makefile | 4 +-
+ drivers/net/wireless/ath/ar5523/ar5523.c | 7 +-
+ drivers/net/wireless/ath/ath10k/ahb.c | 9 +-
+ drivers/net/wireless/ath/ath10k/core.c | 38 +-
+ drivers/net/wireless/ath/ath10k/core.h | 3 -
+ drivers/net/wireless/ath/ath10k/hw.h | 2 +
+ drivers/net/wireless/ath/ath10k/mac.c | 106 +-
+ drivers/net/wireless/ath/ath10k/pci.c | 2 +-
+ drivers/net/wireless/ath/ath10k/sdio.c | 2 +-
+ drivers/net/wireless/ath/ath10k/snoc.c | 2 +-
+ drivers/net/wireless/ath/ath10k/usb.c | 27 +
+ drivers/net/wireless/ath/ath11k/Makefile | 3 +-
+ drivers/net/wireless/ath/ath11k/ahb.c | 331 +-
+ drivers/net/wireless/ath/ath11k/ahb.h | 9 +
+ drivers/net/wireless/ath/ath11k/ce.c | 4 +-
+ drivers/net/wireless/ath/ath11k/core.c | 579 +-
+ drivers/net/wireless/ath/ath11k/core.h | 155 +-
+ drivers/net/wireless/ath/ath11k/debugfs.c | 4 +
+ drivers/net/wireless/ath/ath11k/dp_tx.c | 8 +-
+ drivers/net/wireless/ath/ath11k/hal.c | 15 +-
+ drivers/net/wireless/ath/ath11k/hal.h | 17 +-
+ drivers/net/wireless/ath/ath11k/htc.c | 6 +
+ drivers/net/wireless/ath/ath11k/hw.c | 209 +-
+ drivers/net/wireless/ath/ath11k/hw.h | 45 +-
+ drivers/net/wireless/ath/ath11k/mac.c | 722 +-
+ drivers/net/wireless/ath/ath11k/mac.h | 5 +
+ drivers/net/wireless/ath/ath11k/mhi.c | 285 +-
+ drivers/net/wireless/ath/ath11k/mhi.h | 17 +-
+ drivers/net/wireless/ath/ath11k/pci.c | 984 +-
+ drivers/net/wireless/ath/ath11k/pci.h | 28 +-
+ drivers/net/wireless/ath/ath11k/pcic.c | 748 +
+ drivers/net/wireless/ath/ath11k/pcic.h | 46 +
+ drivers/net/wireless/ath/ath11k/peer.c | 373 +-
+ drivers/net/wireless/ath/ath11k/peer.h | 10 +-
+ drivers/net/wireless/ath/ath11k/qmi.c | 286 +-
+ drivers/net/wireless/ath/ath11k/qmi.h | 28 +-
+ drivers/net/wireless/ath/ath11k/reg.c | 4 +
+ drivers/net/wireless/ath/ath11k/spectral.c | 17 +-
+ drivers/net/wireless/ath/ath11k/wmi.c | 856 +-
+ drivers/net/wireless/ath/ath11k/wmi.h | 448 +-
+ drivers/net/wireless/ath/ath11k/wow.c | 797 +
+ drivers/net/wireless/ath/ath11k/wow.h | 45 +
+ drivers/net/wireless/ath/ath6kl/Makefile | 5 +
+ drivers/net/wireless/ath/ath6kl/htc_mbox.c | 2 +-
+ drivers/net/wireless/ath/ath9k/Makefile | 5 +
+ drivers/net/wireless/ath/ath9k/ahb.c | 10 +-
+ drivers/net/wireless/ath/ath9k/ar9002_mac.c | 9 +-
+ drivers/net/wireless/ath/ath9k/ar9003_calib.c | 2 +-
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 85 +-
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 2 +
+ drivers/net/wireless/ath/ath9k/ar9003_mac.c | 9 +-
+ drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 10 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.c | 25 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 +-
+ drivers/net/wireless/ath/ath9k/debug_sta.c | 4 +-
+ drivers/net/wireless/ath/ath9k/hif_usb.c | 5 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 20 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 8 +
+ drivers/net/wireless/ath/ath9k/mac.h | 6 +-
+ drivers/net/wireless/ath/ath9k/main.c | 2 +-
+ drivers/net/wireless/ath/ath9k/reg.h | 10 +-
+ drivers/net/wireless/ath/ath9k/xmit.c | 8 +-
+ drivers/net/wireless/ath/carl9170/Makefile | 5 +
+ drivers/net/wireless/ath/carl9170/main.c | 8 +-
+ drivers/net/wireless/ath/carl9170/tx.c | 8 +-
+ drivers/net/wireless/ath/wcn36xx/hal.h | 7 +-
+ drivers/net/wireless/ath/wcn36xx/main.c | 160 +-
+ drivers/net/wireless/ath/wcn36xx/smd.c | 98 +-
+ drivers/net/wireless/ath/wcn36xx/smd.h | 2 +
+ drivers/net/wireless/ath/wcn36xx/txrx.c | 29 +
+ drivers/net/wireless/ath/wcn36xx/txrx.h | 1 +
+ drivers/net/wireless/ath/wil6210/cfg80211.c | 5 +-
+ drivers/net/wireless/ath/wil6210/debugfs.c | 14 -
+ drivers/net/wireless/ath/wil6210/netdev.c | 14 +-
+ drivers/net/wireless/ath/wil6210/pm.c | 5 +-
+ drivers/net/wireless/ath/wil6210/wil6210.h | 1 -
+ drivers/net/wireless/broadcom/b43/phy_n.c | 2 +-
+ drivers/net/wireless/broadcom/b43legacy/phy.c | 2 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 39 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c | 3 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/common.c | 23 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/common.h | 1 +
+ .../wireless/broadcom/brcm80211/brcmfmac/core.c | 4 +-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 3 +
+ .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 2 +-
+ drivers/net/wireless/intel/ipw2x00/ipw2100.c | 64 +-
+ drivers/net/wireless/intel/ipw2x00/ipw2200.c | 119 +-
+ drivers/net/wireless/intel/ipw2x00/libipw_tx.c | 2 +-
+ drivers/net/wireless/intel/iwlegacy/3945-rs.c | 6 +-
+ drivers/net/wireless/intel/iwlegacy/4965-rs.c | 22 +-
+ drivers/net/wireless/intel/iwlegacy/common.c | 6 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 22 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/rxon.c | 2 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/sta.c | 4 +-
+ drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 3 +
+ .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 4 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 4 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/filter.h | 2 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 4 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/sta.h | 2 +-
+ drivers/net/wireless/intel/iwlwifi/fw/api/tdls.h | 2 +-
+ drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 2 +-
+ drivers/net/wireless/intel/iwlwifi/fw/file.h | 10 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 2 +
+ drivers/net/wireless/intel/iwlwifi/mei/main.c | 3 +
+ drivers/net/wireless/intel/iwlwifi/mei/sap.h | 2 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 24 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 15 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 32 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 55 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 1 -
+ drivers/net/wireless/intel/iwlwifi/mvm/power.c | 3 +
+ drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 38 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 35 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 44 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sf.c | 8 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 33 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 6 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 48 +-
+ drivers/net/wireless/intersil/orinoco/airport.c | 1 +
+ drivers/net/wireless/mac80211_hwsim.c | 4 +-
+ drivers/net/wireless/marvell/mwifiex/11h.c | 2 +
+ drivers/net/wireless/marvell/mwifiex/sdio.c | 23 +-
+ drivers/net/wireless/marvell/mwifiex/sdio.h | 6 +
+ drivers/net/wireless/marvell/mwl8k.c | 48 +-
+ drivers/net/wireless/mediatek/mt76/agg-rx.c | 8 +-
+ drivers/net/wireless/mediatek/mt76/dma.c | 215 +-
+ drivers/net/wireless/mediatek/mt76/mac80211.c | 14 +-
+ drivers/net/wireless/mediatek/mt76/mcu.c | 8 +-
+ drivers/net/wireless/mediatek/mt76/mmio.c | 9 +-
+ drivers/net/wireless/mediatek/mt76/mt76.h | 50 +-
+ drivers/net/wireless/mediatek/mt76/mt7603/beacon.c | 8 +-
+ drivers/net/wireless/mediatek/mt76/mt7603/dma.c | 12 +-
+ drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 16 +-
+ drivers/net/wireless/mediatek/mt76/mt7603/main.c | 8 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/dma.c | 10 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/main.c | 8 +-
+ drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 2 +-
+ .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 90 +-
+ .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 1 -
+ drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 4 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 8 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 10 +-
+ .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 205 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/dma.c | 61 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c | 2 +
+ drivers/net/wireless/mediatek/mt76/mt7915/init.c | 129 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 251 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/mac.h | 2 +
+ drivers/net/wireless/mediatek/mt76/mt7915/main.c | 72 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 288 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 39 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/mmio.c | 39 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 26 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/pci.c | 99 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/regs.h | 61 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/soc.c | 41 +-
+ drivers/net/wireless/mediatek/mt76/mt7921/dma.c | 6 +-
+ drivers/net/wireless/mediatek/mt76/mt7921/init.c | 15 +-
+ drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 43 +-
+ drivers/net/wireless/mediatek/mt76/mt7921/main.c | 155 +-
+ drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 122 +-
+ drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 15 +-
+ drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 10 +-
+ drivers/net/wireless/mediatek/mt76/mt7921/regs.h | 5 +
+ drivers/net/wireless/mediatek/mt76/mt7921/usb.c | 62 +-
+ .../net/wireless/mediatek/mt76/mt7921/usb_mac.c | 7 +-
+ drivers/net/wireless/mediatek/mt76/tx.c | 53 +-
+ drivers/net/wireless/mediatek/mt7601u/mac.c | 2 +-
+ drivers/net/wireless/mediatek/mt7601u/tx.c | 4 +-
+ drivers/net/wireless/microchip/wilc1000/hif.h | 2 +-
+ drivers/net/wireless/microchip/wilc1000/mon.c | 4 +-
+ drivers/net/wireless/microchip/wilc1000/netdev.c | 3 +-
+ drivers/net/wireless/microchip/wilc1000/sdio.c | 2 +-
+ drivers/net/wireless/microchip/wilc1000/wlan.c | 7 +-
+ drivers/net/wireless/purelifi/Kconfig | 17 +
+ drivers/net/wireless/purelifi/Makefile | 2 +
+ drivers/net/wireless/purelifi/plfxlc/Kconfig | 14 +
+ drivers/net/wireless/purelifi/plfxlc/Makefile | 3 +
+ drivers/net/wireless/purelifi/plfxlc/chip.c | 98 +
+ drivers/net/wireless/purelifi/plfxlc/chip.h | 70 +
+ drivers/net/wireless/purelifi/plfxlc/firmware.c | 276 +
+ drivers/net/wireless/purelifi/plfxlc/intf.h | 52 +
+ drivers/net/wireless/purelifi/plfxlc/mac.c | 754 +
+ drivers/net/wireless/purelifi/plfxlc/mac.h | 184 +
+ drivers/net/wireless/purelifi/plfxlc/usb.c | 891 +
+ drivers/net/wireless/purelifi/plfxlc/usb.h | 198 +
+ .../wireless/quantenna/qtnfmac/pcie/pearl_pcie.c | 4 +-
+ .../wireless/quantenna/qtnfmac/pcie/topaz_pcie.c | 4 +-
+ drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 8 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 2 +-
+ drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 8 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 146 +-
+ drivers/net/wireless/realtek/rtlwifi/base.c | 44 +-
+ .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 16 +-
+ drivers/net/wireless/realtek/rtlwifi/core.c | 40 +-
+ drivers/net/wireless/realtek/rtlwifi/pci.c | 15 +-
+ drivers/net/wireless/realtek/rtlwifi/rc.c | 20 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 6 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 30 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.c | 2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 5 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 4 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 12 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/hw.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/trx.c | 2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 26 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 12 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/trx.c | 8 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 30 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.c | 6 +-
+ drivers/net/wireless/realtek/rtlwifi/usb.c | 2 +-
+ drivers/net/wireless/realtek/rtw88/bf.c | 2 +-
+ drivers/net/wireless/realtek/rtw88/fw.c | 31 +-
+ drivers/net/wireless/realtek/rtw88/fw.h | 4 +-
+ drivers/net/wireless/realtek/rtw88/mac.c | 2 +-
+ drivers/net/wireless/realtek/rtw88/mac80211.c | 44 +-
+ drivers/net/wireless/realtek/rtw88/main.c | 73 +-
+ drivers/net/wireless/realtek/rtw88/main.h | 8 +-
+ drivers/net/wireless/realtek/rtw88/pci.c | 19 +-
+ drivers/net/wireless/realtek/rtw88/phy.c | 2 +-
+ drivers/net/wireless/realtek/rtw88/reg.h | 2 +
+ drivers/net/wireless/realtek/rtw88/rtw8723d.c | 1 +
+ drivers/net/wireless/realtek/rtw88/rtw8821c.c | 5 +
+ .../net/wireless/realtek/rtw88/rtw8821c_table.c | 2 +-
+ drivers/net/wireless/realtek/rtw88/rtw8821ce.c | 4 +
+ drivers/net/wireless/realtek/rtw88/rtw8822b.c | 1 +
+ drivers/net/wireless/realtek/rtw88/rtw8822c.c | 1 +
+ drivers/net/wireless/realtek/rtw88/rx.c | 3 +-
+ drivers/net/wireless/realtek/rtw88/tx.c | 31 +-
+ drivers/net/wireless/realtek/rtw88/tx.h | 4 +
+ drivers/net/wireless/realtek/rtw89/Kconfig | 18 +-
+ drivers/net/wireless/realtek/rtw89/Makefile | 9 +
+ drivers/net/wireless/realtek/rtw89/cam.c | 57 +-
+ drivers/net/wireless/realtek/rtw89/cam.h | 4 +
+ drivers/net/wireless/realtek/rtw89/coex.c | 24 +-
+ drivers/net/wireless/realtek/rtw89/core.c | 193 +-
+ drivers/net/wireless/realtek/rtw89/core.h | 295 +-
+ drivers/net/wireless/realtek/rtw89/debug.c | 75 +-
+ drivers/net/wireless/realtek/rtw89/debug.h | 1 +
+ drivers/net/wireless/realtek/rtw89/fw.c | 301 +-
+ drivers/net/wireless/realtek/rtw89/fw.h | 388 +-
+ drivers/net/wireless/realtek/rtw89/mac.c | 736 +-
+ drivers/net/wireless/realtek/rtw89/mac.h | 82 +-
+ drivers/net/wireless/realtek/rtw89/mac80211.c | 16 +-
+ drivers/net/wireless/realtek/rtw89/pci.c | 954 +-
+ drivers/net/wireless/realtek/rtw89/pci.h | 389 +
+ drivers/net/wireless/realtek/rtw89/phy.c | 481 +-
+ drivers/net/wireless/realtek/rtw89/phy.h | 76 +-
+ drivers/net/wireless/realtek/rtw89/ps.c | 34 +-
+ drivers/net/wireless/realtek/rtw89/reg.h | 1907 +-
+ drivers/net/wireless/realtek/rtw89/regd.c | 513 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852a.c | 81 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c | 16 +-
+ .../net/wireless/realtek/rtw89/rtw8852a_table.c | 605 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852ae.c | 40 +
+ drivers/net/wireless/realtek/rtw89/rtw8852c.c | 2561 ++-
+ drivers/net/wireless/realtek/rtw89/rtw8852c.h | 20 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c | 4041 ++++
+ drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.h | 28 +
+ .../wireless/realtek/rtw89/rtw8852c_rfk_table.c | 781 +
+ .../wireless/realtek/rtw89/rtw8852c_rfk_table.h | 67 +
+ .../net/wireless/realtek/rtw89/rtw8852c_table.c | 19470 +++++++++++++++++++
+ .../net/wireless/realtek/rtw89/rtw8852c_table.h | 36 +
+ drivers/net/wireless/realtek/rtw89/rtw8852ce.c | 48 +
+ drivers/net/wireless/realtek/rtw89/ser.c | 250 +-
+ drivers/net/wireless/realtek/rtw89/txrx.h | 107 +
+ drivers/net/wireless/realtek/rtw89/util.h | 30 +
+ drivers/net/wireless/rsi/rsi_91x_mac80211.c | 12 +-
+ drivers/net/wireless/rsi/rsi_91x_mgmt.c | 8 +-
+ drivers/net/wireless/silabs/Kconfig | 18 +
+ drivers/net/wireless/silabs/Makefile | 3 +
+ .../{staging => net/wireless/silabs}/wfx/Kconfig | 0
+ .../{staging => net/wireless/silabs}/wfx/Makefile | 0
+ drivers/{staging => net/wireless/silabs}/wfx/bh.c | 6 +-
+ drivers/{staging => net/wireless/silabs}/wfx/bh.h | 0
+ drivers/{staging => net/wireless/silabs}/wfx/bus.h | 0
+ .../wireless/silabs}/wfx/bus_sdio.c | 0
+ .../{staging => net/wireless/silabs}/wfx/bus_spi.c | 0
+ .../{staging => net/wireless/silabs}/wfx/data_rx.c | 5 +-
+ .../{staging => net/wireless/silabs}/wfx/data_rx.h | 0
+ .../{staging => net/wireless/silabs}/wfx/data_tx.c | 3 +-
+ .../{staging => net/wireless/silabs}/wfx/data_tx.h | 0
+ .../{staging => net/wireless/silabs}/wfx/debug.c | 0
+ .../{staging => net/wireless/silabs}/wfx/debug.h | 0
+ .../{staging => net/wireless/silabs}/wfx/fwio.c | 0
+ .../{staging => net/wireless/silabs}/wfx/fwio.h | 0
+ .../wireless/silabs}/wfx/hif_api_cmd.h | 0
+ .../wireless/silabs}/wfx/hif_api_general.h | 0
+ .../wireless/silabs}/wfx/hif_api_mib.h | 0
+ .../{staging => net/wireless/silabs}/wfx/hif_rx.c | 0
+ .../{staging => net/wireless/silabs}/wfx/hif_rx.h | 0
+ .../{staging => net/wireless/silabs}/wfx/hif_tx.c | 2 +-
+ .../{staging => net/wireless/silabs}/wfx/hif_tx.h | 0
+ .../wireless/silabs}/wfx/hif_tx_mib.c | 0
+ .../wireless/silabs}/wfx/hif_tx_mib.h | 0
+ .../{staging => net/wireless/silabs}/wfx/hwio.c | 0
+ .../{staging => net/wireless/silabs}/wfx/hwio.h | 0
+ drivers/{staging => net/wireless/silabs}/wfx/key.c | 4 +-
+ drivers/{staging => net/wireless/silabs}/wfx/key.h | 0
+ .../{staging => net/wireless/silabs}/wfx/main.c | 6 +
+ .../{staging => net/wireless/silabs}/wfx/main.h | 0
+ .../{staging => net/wireless/silabs}/wfx/queue.c | 3 +-
+ .../{staging => net/wireless/silabs}/wfx/queue.h | 0
+ .../{staging => net/wireless/silabs}/wfx/scan.c | 11 +-
+ .../{staging => net/wireless/silabs}/wfx/scan.h | 0
+ drivers/{staging => net/wireless/silabs}/wfx/sta.c | 84 +-
+ drivers/{staging => net/wireless/silabs}/wfx/sta.h | 0
+ .../{staging => net/wireless/silabs}/wfx/traces.h | 0
+ drivers/{staging => net/wireless/silabs}/wfx/wfx.h | 7 +-
+ drivers/net/wireless/st/cw1200/sta.c | 4 +-
+ drivers/net/wireless/ti/wl1251/event.c | 22 +-
+ drivers/net/wireless/ti/wl1251/io.c | 20 +-
+ drivers/net/wireless/ti/wl1251/tx.c | 15 +-
+ drivers/net/wireless/ti/wl18xx/debugfs.c | 18 +-
+ drivers/net/wireless/ti/wlcore/cmd.c | 14 +-
+ drivers/net/wireless/ti/wlcore/debugfs.c | 52 +-
+ drivers/net/wireless/ti/wlcore/main.c | 241 +-
+ drivers/net/wireless/ti/wlcore/scan.c | 6 +-
+ drivers/net/wireless/ti/wlcore/sdio.c | 3 +-
+ drivers/net/wireless/ti/wlcore/sysfs.c | 6 +-
+ drivers/net/wireless/ti/wlcore/testmode.c | 12 +-
+ drivers/net/wireless/ti/wlcore/tx.c | 6 +-
+ drivers/net/wireless/ti/wlcore/vendor_cmd.c | 18 +-
+ drivers/net/wwan/Kconfig | 14 +
+ drivers/net/wwan/Makefile | 1 +
+ drivers/net/wwan/iosm/iosm_ipc_coredump.h | 5 +-
+ drivers/net/wwan/iosm/iosm_ipc_protocol_ops.c | 10 -
+ drivers/net/wwan/t7xx/Makefile | 20 +
+ drivers/net/wwan/t7xx/t7xx_cldma.c | 281 +
+ drivers/net/wwan/t7xx/t7xx_cldma.h | 180 +
+ drivers/net/wwan/t7xx/t7xx_dpmaif.c | 1281 ++
+ drivers/net/wwan/t7xx/t7xx_dpmaif.h | 179 +
+ drivers/net/wwan/t7xx/t7xx_hif_cldma.c | 1339 ++
+ drivers/net/wwan/t7xx/t7xx_hif_cldma.h | 127 +
+ drivers/net/wwan/t7xx/t7xx_hif_dpmaif.c | 574 +
+ drivers/net/wwan/t7xx/t7xx_hif_dpmaif.h | 206 +
+ drivers/net/wwan/t7xx/t7xx_hif_dpmaif_rx.c | 1243 ++
+ drivers/net/wwan/t7xx/t7xx_hif_dpmaif_rx.h | 116 +
+ drivers/net/wwan/t7xx/t7xx_hif_dpmaif_tx.c | 683 +
+ drivers/net/wwan/t7xx/t7xx_hif_dpmaif_tx.h | 78 +
+ drivers/net/wwan/t7xx/t7xx_mhccif.c | 122 +
+ drivers/net/wwan/t7xx/t7xx_mhccif.h | 37 +
+ drivers/net/wwan/t7xx/t7xx_modem_ops.c | 727 +
+ drivers/net/wwan/t7xx/t7xx_modem_ops.h | 88 +
+ drivers/net/wwan/t7xx/t7xx_netdev.c | 423 +
+ drivers/net/wwan/t7xx/t7xx_netdev.h | 55 +
+ drivers/net/wwan/t7xx/t7xx_pci.c | 761 +
+ drivers/net/wwan/t7xx/t7xx_pci.h | 120 +
+ drivers/net/wwan/t7xx/t7xx_pcie_mac.c | 262 +
+ drivers/net/wwan/t7xx/t7xx_pcie_mac.h | 31 +
+ drivers/net/wwan/t7xx/t7xx_port.h | 135 +
+ drivers/net/wwan/t7xx/t7xx_port_ctrl_msg.c | 273 +
+ drivers/net/wwan/t7xx/t7xx_port_proxy.c | 509 +
+ drivers/net/wwan/t7xx/t7xx_port_proxy.h | 98 +
+ drivers/net/wwan/t7xx/t7xx_port_wwan.c | 176 +
+ drivers/net/wwan/t7xx/t7xx_reg.h | 350 +
+ drivers/net/wwan/t7xx/t7xx_state_monitor.c | 550 +
+ drivers/net/wwan/t7xx/t7xx_state_monitor.h | 135 +
+ drivers/net/wwan/wwan_hwsim.c | 22 +-
+ drivers/net/xen-netback/interface.c | 3 +-
+ drivers/nfc/st21nfca/se.c | 17 +-
+ drivers/nfc/st21nfca/st21nfca.h | 1 +
+ drivers/of/platform.c | 1 +
+ drivers/of/property.c | 34 +
+ drivers/opp/of.c | 6 +-
+ drivers/pci/pci-acpi.c | 3 +
+ drivers/powercap/dtpm_cpu.c | 2 +-
+ drivers/powercap/intel_rapl_common.c | 4 +-
+ drivers/powercap/intel_rapl_msr.c | 1 +
+ drivers/ptp/ptp_clock.c | 31 +-
+ drivers/ptp/ptp_clockmatrix.c | 321 +-
+ drivers/ptp/ptp_clockmatrix.h | 7 +-
+ drivers/ptp/ptp_ocp.c | 559 +-
+ drivers/ptp/ptp_private.h | 11 +
+ drivers/ptp/ptp_sysfs.c | 11 +-
+ drivers/ptp/ptp_vclock.c | 82 +-
+ drivers/regulator/Kconfig | 17 +
+ drivers/regulator/Makefile | 2 +
+ drivers/regulator/core.c | 93 +-
+ drivers/regulator/da9121-regulator.c | 2 +
+ drivers/regulator/fixed.c | 5 +-
+ drivers/regulator/mt6358-regulator.c | 213 +-
+ drivers/regulator/pca9450-regulator.c | 27 +-
+ drivers/regulator/pfuze100-regulator.c | 2 +
+ drivers/regulator/qcom_smd-regulator.c | 35 +-
+ drivers/regulator/rpi-panel-attiny-regulator.c | 1 -
+ drivers/regulator/rt4801-regulator.c | 49 +-
+ drivers/regulator/rt5759-regulator.c | 369 +
+ drivers/regulator/scmi-regulator.c | 2 +-
+ drivers/regulator/sm5703-regulator.c | 167 +
+ drivers/regulator/stm32-vrefbuf.c | 30 +-
+ drivers/s390/net/qeth_core.h | 2 -
+ drivers/s390/net/qeth_core_main.c | 3 +-
+ drivers/s390/net/qeth_l2_main.c | 4 +-
+ drivers/s390/net/qeth_l3_main.c | 4 +-
+ drivers/scsi/fcoe/fcoe.c | 2 +-
+ drivers/scsi/scsicam.c | 11 +-
+ drivers/soc/rockchip/pm_domains.c | 118 +
+ drivers/spi/Kconfig | 26 +-
+ drivers/spi/Makefile | 2 +
+ drivers/spi/atmel-quadspi.c | 6 -
+ drivers/spi/spi-aspeed-smc.c | 1210 ++
+ drivers/spi/spi-au1550.c | 4 +-
+ drivers/spi/spi-cadence-quadspi.c | 159 +-
+ drivers/spi/spi-cadence.c | 11 +-
+ drivers/spi/spi-clps711x.c | 5 +-
+ drivers/spi/spi-fsl-qspi.c | 4 +
+ drivers/spi/spi-img-spfi.c | 2 +-
+ drivers/spi/spi-imx.c | 356 +-
+ drivers/spi/spi-ingenic.c | 47 +-
+ drivers/spi/spi-intel.c | 51 +-
+ drivers/spi/spi-mem.c | 13 +-
+ drivers/spi/spi-mpc52xx-psc.c | 1 +
+ drivers/spi/spi-mpc52xx.c | 3 +
+ drivers/spi/spi-mt65xx.c | 702 +-
+ drivers/spi/spi-mtk-snfi.c | 1472 ++
+ drivers/spi/spi-mxs.c | 3 +-
+ drivers/spi/spi-omap2-mcspi.c | 19 +-
+ drivers/spi/spi-rockchip.c | 8 +
+ drivers/spi/spi-rspi.c | 15 +-
+ drivers/spi/spi-sprd.c | 3 +-
+ drivers/spi/spi-stm32-qspi.c | 41 +-
+ drivers/spi/spi-stm32.c | 3 +-
+ drivers/spi/spi-sunplus-sp7021.c | 6 -
+ drivers/spi/spi-tegra114.c | 9 +-
+ drivers/spi/spi-tegra20-sflash.c | 6 +-
+ drivers/spi/spi-tegra20-slink.c | 6 +-
+ drivers/spi/spi-ti-qspi.c | 8 +-
+ drivers/spi/spi.c | 25 +-
+ drivers/spi/spidev.c | 104 +-
+ drivers/ssb/pci.c | 1 -
+ drivers/staging/Kconfig | 1 -
+ drivers/staging/Makefile | 1 -
+ .../media/atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c | 4 +-
+ drivers/staging/media/av7110/av7110_av.c | 46 +-
+ drivers/staging/media/hantro/TODO | 8 +-
+ drivers/staging/media/hantro/hantro.h | 2 +
+ drivers/staging/media/hantro/hantro_drv.c | 18 +-
+ drivers/staging/media/hantro/hantro_g1_h264_dec.c | 38 +-
+ drivers/staging/media/hantro/hantro_g2_hevc_dec.c | 36 +-
+ drivers/staging/media/hantro/hantro_g2_regs.h | 6 +
+ drivers/staging/media/hantro/hantro_h264.c | 134 +-
+ drivers/staging/media/hantro/hantro_hevc.c | 46 +-
+ drivers/staging/media/hantro/hantro_hw.h | 21 +-
+ drivers/staging/media/hantro/hantro_postproc.c | 53 +-
+ drivers/staging/media/hantro/hantro_v4l2.c | 107 +-
+ .../media/hantro/rockchip_vpu2_hw_h264_dec.c | 98 +-
+ drivers/staging/media/hantro/rockchip_vpu_hw.c | 14 +
+ drivers/staging/media/ipu3/ipu3-css-fw.c | 4 +-
+ drivers/staging/media/ipu3/ipu3-css-fw.h | 4 +-
+ drivers/staging/media/ipu3/ipu3-css-params.c | 20 +
+ drivers/staging/media/ipu3/ipu3-v4l2.c | 1 +
+ drivers/staging/media/ipu3/ipu3.c | 25 +-
+ drivers/staging/media/rkvdec/TODO | 4 +-
+ drivers/staging/media/rkvdec/rkvdec-h264.c | 157 +-
+ drivers/staging/media/rkvdec/rkvdec.c | 35 +-
+ drivers/staging/media/rkvdec/rkvdec.h | 2 +
+ drivers/staging/media/tegra-video/vi.c | 10 +-
+ drivers/staging/wfx/TODO | 6 -
+ drivers/thermal/Makefile | 2 +-
+ drivers/thermal/broadcom/bcm2711_thermal.c | 5 +-
+ drivers/thermal/broadcom/sr-thermal.c | 3 +
+ drivers/thermal/cpufreq_cooling.c | 2 +-
+ drivers/thermal/devfreq_cooling.c | 33 +-
+ drivers/thermal/hisi_thermal.c | 6 +-
+ drivers/thermal/imx_sc_thermal.c | 6 +-
+ .../intel/int340x_thermal/int3400_thermal.c | 24 +-
+ drivers/thermal/intel/intel_hfi.c | 2 -
+ drivers/thermal/intel/intel_pch_thermal.c | 43 +-
+ drivers/thermal/k3_bandgap.c | 5 +
+ drivers/thermal/k3_j72xx_bandgap.c | 566 +
+ drivers/thermal/qcom/lmh.c | 1 +
+ drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 486 +-
+ drivers/thermal/qcom/tsens.c | 3 +
+ drivers/thermal/rcar_thermal.c | 17 +-
+ drivers/thermal/rzg2l_thermal.c | 10 +-
+ drivers/thermal/thermal_core.c | 1 +
+ drivers/thermal/thermal_hwmon.c | 6 +-
+ drivers/thermal/thermal_of.c | 14 +-
+ drivers/thunderbolt/test.c | 134 +-
+ drivers/tty/sysrq.c | 2 +
+ fs/9p/vfs_addr.c | 23 +-
+ fs/adfs/inode.c | 10 +-
+ fs/affs/file.c | 21 +-
+ fs/affs/symlink.c | 5 +-
+ fs/afs/dir.c | 7 +-
+ fs/afs/file.c | 28 +-
+ fs/afs/internal.h | 4 +-
+ fs/afs/misc.c | 5 +-
+ fs/afs/rotate.c | 4 +
+ fs/afs/rxrpc.c | 8 +-
+ fs/afs/write.c | 5 +-
+ fs/befs/linuxvfs.c | 17 +-
+ fs/bfs/file.c | 11 +-
+ fs/btrfs/acl.c | 39 +-
+ fs/btrfs/async-thread.c | 122 +-
+ fs/btrfs/async-thread.h | 7 +-
+ fs/btrfs/block-group.c | 205 +-
+ fs/btrfs/block-group.h | 7 +-
+ fs/btrfs/btrfs_inode.h | 25 -
+ fs/btrfs/check-integrity.c | 172 +-
+ fs/btrfs/check-integrity.h | 6 +-
+ fs/btrfs/compression.c | 60 +-
+ fs/btrfs/compression.h | 4 +-
+ fs/btrfs/ctree.c | 102 +-
+ fs/btrfs/ctree.h | 165 +-
+ fs/btrfs/delalloc-space.c | 9 +-
+ fs/btrfs/delayed-inode.c | 84 +-
+ fs/btrfs/delayed-ref.c | 4 +-
+ fs/btrfs/delayed-ref.h | 1 -
+ fs/btrfs/dev-replace.c | 52 +-
+ fs/btrfs/dir-item.c | 31 +-
+ fs/btrfs/disk-io.c | 322 +-
+ fs/btrfs/disk-io.h | 10 +-
+ fs/btrfs/extent-tree.c | 61 +-
+ fs/btrfs/extent_io.c | 634 +-
+ fs/btrfs/extent_io.h | 47 +-
+ fs/btrfs/file.c | 295 +-
+ fs/btrfs/free-space-cache.c | 11 +-
+ fs/btrfs/free-space-tree.c | 2 +-
+ fs/btrfs/inode.c | 1896 +-
+ fs/btrfs/ioctl.c | 270 +-
+ fs/btrfs/props.c | 40 +-
+ fs/btrfs/props.h | 4 -
+ fs/btrfs/qgroup.c | 7 +-
+ fs/btrfs/qgroup.h | 12 +-
+ fs/btrfs/raid56.c | 809 +-
+ fs/btrfs/raid56.h | 9 +-
+ fs/btrfs/reflink.c | 23 +-
+ fs/btrfs/relocation.c | 32 +-
+ fs/btrfs/root-tree.c | 3 +-
+ fs/btrfs/scrub.c | 1889 +-
+ fs/btrfs/send.c | 402 +-
+ fs/btrfs/space-info.c | 11 +-
+ fs/btrfs/space-info.h | 8 +
+ fs/btrfs/subpage.c | 55 +-
+ fs/btrfs/subpage.h | 2 +
+ fs/btrfs/super.c | 9 +-
+ fs/btrfs/sysfs.c | 43 +-
+ fs/btrfs/tests/btrfs-tests.c | 24 +-
+ fs/btrfs/transaction.c | 116 +-
+ fs/btrfs/tree-checker.c | 55 +
+ fs/btrfs/tree-checker.h | 1 +
+ fs/btrfs/tree-log.c | 11 +-
+ fs/btrfs/volumes.c | 127 +-
+ fs/btrfs/volumes.h | 42 +-
+ fs/btrfs/xattr.c | 40 +-
+ fs/btrfs/zoned.c | 217 +-
+ fs/btrfs/zoned.h | 23 +-
+ fs/btrfs/zstd.c | 14 +-
+ fs/buffer.c | 214 +-
+ fs/cachefiles/Kconfig | 12 +
+ fs/cachefiles/Makefile | 1 +
+ fs/cachefiles/daemon.c | 117 +-
+ fs/cachefiles/interface.c | 2 +
+ fs/cachefiles/internal.h | 78 +
+ fs/cachefiles/io.c | 76 +-
+ fs/cachefiles/namei.c | 16 +-
+ fs/cachefiles/ondemand.c | 503 +
+ fs/ceph/addr.c | 32 +-
+ fs/cifs/file.c | 31 +-
+ fs/coda/symlink.c | 7 +-
+ fs/cramfs/README | 8 +-
+ fs/cramfs/inode.c | 7 +-
+ fs/dlm/dir.c | 2 +-
+ fs/dlm/dlm_internal.h | 66 +-
+ fs/dlm/lock.c | 654 +-
+ fs/dlm/lockspace.c | 12 +
+ fs/dlm/lockspace.h | 1 +
+ fs/dlm/lowcomms.c | 12 +-
+ fs/dlm/member.c | 11 +-
+ fs/dlm/midcomms.c | 61 +-
+ fs/dlm/plock.c | 178 +-
+ fs/dlm/rcom.c | 120 +-
+ fs/dlm/recover.c | 49 +-
+ fs/dlm/requestqueue.c | 20 +-
+ fs/dlm/user.c | 16 +-
+ fs/dlm/util.c | 92 +-
+ fs/dlm/util.h | 8 +-
+ fs/ecryptfs/mmap.c | 15 +-
+ fs/efs/inode.c | 8 +-
+ fs/efs/symlink.c | 5 +-
+ fs/erofs/Kconfig | 10 +
+ fs/erofs/Makefile | 1 +
+ fs/erofs/data.c | 34 +-
+ fs/erofs/decompressor.c | 7 +-
+ fs/erofs/erofs_fs.h | 50 +-
+ fs/erofs/fscache.c | 519 +
+ fs/erofs/inode.c | 11 +-
+ fs/erofs/internal.h | 76 +-
+ fs/erofs/namei.c | 5 +-
+ fs/erofs/super.c | 237 +-
+ fs/erofs/sysfs.c | 4 +-
+ fs/erofs/zdata.c | 7 +-
+ fs/exfat/balloc.c | 8 +-
+ fs/exfat/exfat_fs.h | 7 +
+ fs/exfat/fatent.c | 47 +-
+ fs/exfat/inode.c | 10 +-
+ fs/exfat/misc.c | 10 +-
+ fs/exfat/namei.c | 27 +-
+ fs/exfat/super.c | 9 +-
+ fs/ext2/inode.c | 19 +-
+ fs/ext4/Makefile | 1 +
+ fs/ext4/crypto.c | 246 +
+ fs/ext4/dir.c | 6 +-
+ fs/ext4/ext4.h | 86 +-
+ fs/ext4/extents.c | 20 +-
+ fs/ext4/fast_commit.c | 13 +-
+ fs/ext4/file.c | 4 +-
+ fs/ext4/inline.c | 59 +-
+ fs/ext4/inode.c | 85 +-
+ fs/ext4/ioctl.c | 59 +-
+ fs/ext4/mballoc.c | 25 +-
+ fs/ext4/mmp.c | 2 +-
+ fs/ext4/move_extent.c | 17 +-
+ fs/ext4/namei.c | 214 +-
+ fs/ext4/readpage.c | 4 +-
+ fs/ext4/super.c | 217 +-
+ fs/ext4/symlink.c | 51 +-
+ fs/ext4/verity.c | 9 +-
+ fs/f2fs/checkpoint.c | 2 +-
+ fs/f2fs/compress.c | 2 +-
+ fs/f2fs/data.c | 42 +-
+ fs/f2fs/f2fs.h | 11 +-
+ fs/f2fs/file.c | 4 +-
+ fs/f2fs/node.c | 2 +-
+ fs/f2fs/super.c | 2 +-
+ fs/f2fs/verity.c | 9 +-
+ fs/fat/inode.c | 10 +-
+ fs/freevxfs/vxfs_immed.c | 15 +-
+ fs/freevxfs/vxfs_subr.c | 17 +-
+ fs/fuse/dir.c | 10 +-
+ fs/fuse/file.c | 12 +-
+ fs/gfs2/aops.c | 81 +-
+ fs/gfs2/file.c | 8 +-
+ fs/gfs2/glock.c | 35 +-
+ fs/gfs2/glock.h | 12 +-
+ fs/gfs2/inode.h | 2 +-
+ fs/gfs2/main.c | 10 +-
+ fs/gfs2/meta_io.c | 4 +-
+ fs/gfs2/meta_io.h | 8 +-
+ fs/gfs2/quota.c | 62 +-
+ fs/gfs2/recovery.c | 22 +-
+ fs/gfs2/rgrp.c | 4 +-
+ fs/hfs/extent.c | 6 +-
+ fs/hfs/hfs_fs.h | 2 +
+ fs/hfs/inode.c | 38 +-
+ fs/hfsplus/extents.c | 8 +-
+ fs/hfsplus/hfsplus_fs.h | 2 +
+ fs/hfsplus/inode.c | 38 +-
+ fs/hostfs/hostfs_kern.c | 9 +-
+ fs/hpfs/file.c | 10 +-
+ fs/hpfs/namei.c | 5 +-
+ fs/hugetlbfs/inode.c | 2 +-
+ fs/iomap/buffered-io.c | 44 +-
+ fs/iomap/direct-io.c | 25 +-
+ fs/iomap/trace.h | 2 +-
+ fs/isofs/compress.c | 5 +-
+ fs/isofs/inode.c | 6 +-
+ fs/isofs/rock.c | 7 +-
+ fs/jbd2/commit.c | 14 +-
+ fs/jbd2/transaction.c | 14 +-
+ fs/jffs2/file.c | 23 +-
+ fs/jffs2/fs.c | 2 +-
+ fs/jffs2/gc.c | 2 +-
+ fs/jffs2/os-linux.h | 2 +-
+ fs/jfs/inode.c | 11 +-
+ fs/jfs/jfs_metapage.c | 21 +-
+ fs/libfs.c | 18 +-
+ fs/minix/inode.c | 11 +-
+ fs/mpage.c | 20 +-
+ fs/namei.c | 28 +-
+ fs/namespace.c | 5 +-
+ fs/netfs/buffered_read.c | 25 +-
+ fs/nfs/dir.c | 9 +-
+ fs/nfs/file.c | 51 +-
+ fs/nfs/fscache.h | 14 +-
+ fs/nfs/read.c | 3 +-
+ fs/nfs/symlink.c | 16 +-
+ fs/nilfs2/inode.c | 27 +-
+ fs/nilfs2/recovery.c | 2 +-
+ fs/ntfs/aops.c | 40 +-
+ fs/ntfs/aops.h | 6 +-
+ fs/ntfs/attrib.c | 2 +-
+ fs/ntfs/compress.c | 4 +-
+ fs/ntfs/file.c | 4 +-
+ fs/ntfs/inode.c | 4 +-
+ fs/ntfs/mft.h | 2 +-
+ fs/ntfs3/file.c | 7 +-
+ fs/ntfs3/inode.c | 27 +-
+ fs/ntfs3/ntfs_fs.h | 5 +
+ fs/ocfs2/alloc.c | 2 +-
+ fs/ocfs2/aops.c | 23 +-
+ fs/ocfs2/file.c | 2 +-
+ fs/ocfs2/refcounttree.c | 6 +-
+ fs/ocfs2/symlink.c | 5 +-
+ fs/omfs/file.c | 11 +-
+ fs/orangefs/inode.c | 52 +-
+ fs/proc/proc_sysctl.c | 4 +-
+ fs/qnx4/inode.c | 7 +-
+ fs/qnx6/inode.c | 6 +-
+ fs/reiserfs/file.c | 2 +-
+ fs/reiserfs/inode.c | 36 +-
+ fs/reiserfs/journal.c | 14 +-
+ fs/romfs/super.c | 9 +-
+ fs/seq_file.c | 32 +
+ fs/squashfs/file.c | 5 +-
+ fs/squashfs/super.c | 2 +-
+ fs/squashfs/symlink.c | 5 +-
+ fs/sysv/itree.c | 10 +-
+ fs/ubifs/file.c | 41 +-
+ fs/ubifs/super.c | 2 +-
+ fs/udf/file.c | 14 +-
+ fs/udf/inode.c | 10 +-
+ fs/udf/symlink.c | 5 +-
+ fs/ufs/inode.c | 13 +-
+ fs/vboxsf/file.c | 5 +-
+ fs/verity/enable.c | 29 +-
+ fs/xfs/xfs_aops.c | 14 +-
+ fs/xfs/xfs_file.c | 6 +-
+ fs/zonefs/super.c | 16 +-
+ include/acpi/acbuffer.h | 2 +-
+ include/acpi/acconfig.h | 2 +-
+ include/acpi/acexcep.h | 2 +-
+ include/acpi/acnames.h | 2 +-
+ include/acpi/acoutput.h | 2 +-
+ include/acpi/acpi.h | 2 +-
+ include/acpi/acpi_bus.h | 3 +
+ include/acpi/acpiosxf.h | 2 +-
+ include/acpi/acpixf.h | 4 +-
+ include/acpi/acrestyp.h | 2 +-
+ include/acpi/actbl.h | 2 +-
+ include/acpi/actbl1.h | 18 +-
+ include/acpi/actbl2.h | 175 +-
+ include/acpi/actbl3.h | 2 +-
+ include/acpi/actypes.h | 19 +-
+ include/acpi/acuuid.h | 2 +-
+ include/acpi/apei.h | 2 +
+ include/acpi/cppc_acpi.h | 5 +
+ include/acpi/platform/acenv.h | 2 +-
+ include/acpi/platform/acenvex.h | 2 +-
+ include/acpi/platform/acgcc.h | 2 +-
+ include/acpi/platform/acgccex.h | 2 +-
+ include/acpi/platform/acintel.h | 2 +-
+ include/acpi/platform/aclinux.h | 2 +-
+ include/acpi/platform/aclinuxex.h | 2 +-
+ include/kunit/resource.h | 406 +
+ include/kunit/test.h | 418 +-
+ include/linux/acpi.h | 2 +
+ include/linux/amba/mmci.h | 6 -
+ include/linux/blkdev.h | 1 +
+ include/linux/bpf-cgroup.h | 8 +-
+ include/linux/bpf.h | 351 +-
+ include/linux/bpf_local_storage.h | 4 +-
+ include/linux/bpf_types.h | 1 +
+ include/linux/bpf_verifier.h | 23 +-
+ include/linux/btf.h | 23 +
+ include/linux/btf_ids.h | 3 +-
+ include/linux/buffer_head.h | 14 +-
+ include/linux/can/dev.h | 10 -
+ include/linux/can/led.h | 51 -
+ include/linux/can/rx-offload.h | 4 +-
+ include/linux/console.h | 19 +
+ include/linux/devfreq.h | 17 +-
+ include/linux/energy_model.h | 35 +-
+ include/linux/ethtool.h | 4 +
+ include/linux/fortify-string.h | 16 +
+ include/linux/fs.h | 37 +-
+ include/linux/fscache.h | 1 +
+ include/linux/ftrace.h | 6 +
+ include/linux/fwnode.h | 15 +-
+ include/linux/hwmon.h | 6 +
+ include/linux/icmpv6.h | 11 +-
+ include/linux/ieee802154.h | 81 +-
+ include/linux/iio/adc/qcom-vadc-common.h | 2 +
+ include/linux/iomap.h | 20 +-
+ include/linux/ipmi.h | 5 +
+ include/linux/ipmi_smi.h | 6 +
+ include/linux/ipv6.h | 6 +-
+ include/linux/jbd2.h | 2 +-
+ include/linux/kallsyms.h | 7 +-
+ include/linux/list.h | 36 +
+ include/linux/mdio.h | 70 +
+ include/linux/mfd/idt8a340_reg.h | 12 +-
+ include/linux/mlx5/accel.h | 156 -
+ include/linux/mlx5/driver.h | 17 +-
+ include/linux/mlx5/fs.h | 12 +
+ include/linux/mlx5/mlx5_ifc.h | 23 +-
+ include/linux/mlx5/mlx5_ifc_fpga.h | 211 -
+ include/linux/mlx5/port.h | 2 +-
+ include/linux/mmc/core.h | 2 +-
+ include/linux/mmc/host.h | 2 +-
+ include/linux/mpage.h | 2 +-
+ include/linux/mtd/cfi.h | 1 +
+ .../mtk_ecc.h => include/linux/mtd/nand-ecc-mtk.h | 0
+ include/linux/mtd/spi-nor.h | 4 +-
+ include/linux/mtd/spinand.h | 1 +
+ include/linux/netdevice.h | 378 +-
+ include/linux/netfs.h | 5 +-
+ include/linux/nfs_fs.h | 2 +-
+ include/linux/page-flags.h | 2 +-
+ include/linux/pagemap.h | 78 +-
+ include/linux/phy.h | 8 +-
+ include/linux/phylink.h | 6 -
+ include/linux/{mmc => platform_data}/sh_mmcif.h | 2 -
+ include/linux/pm.h | 14 +-
+ include/linux/pm_domain.h | 24 +-
+ include/linux/pm_runtime.h | 10 +-
+ include/linux/polynomial.h | 35 +
+ include/linux/printk.h | 82 +-
+ include/linux/property.h | 12 +-
+ include/linux/ptp_classify.h | 3 +
+ include/linux/ptp_clock_kernel.h | 42 +-
+ include/linux/qed/qed_fcoe_if.h | 4 +-
+ include/linux/qed/qed_iscsi_if.h | 4 +-
+ include/linux/qed/qed_nvmetcp_if.h | 2 +-
+ include/linux/qed/qed_nvmetcp_ip_services_if.h | 29 -
+ include/linux/regmap.h | 12 +
+ include/linux/regulator/mt6358-regulator.h | 45 +
+ include/linux/regulator/pca9450.h | 7 +
+ include/linux/remoteproc/mtk_scp.h | 2 +
+ include/linux/rtnetlink.h | 1 +
+ include/linux/seq_file.h | 4 +
+ include/linux/skbuff.h | 419 +-
+ include/linux/slab.h | 15 +-
+ include/linux/slub_def.h | 1 -
+ include/linux/soc/mediatek/mtk_wed.h | 131 +
+ include/linux/spi/spi.h | 2 +
+ include/linux/stackdepot.h | 26 +-
+ include/linux/string.h | 4 +
+ include/linux/suspend.h | 44 +-
+ include/linux/sysctl.h | 9 +-
+ include/linux/thermal.h | 3 +
+ include/linux/usb/rndis_host.h | 1 +
+ include/linux/usb/usbnet.h | 1 +
+ include/media/cec.h | 14 +
+ include/media/dvb-usb-ids.h | 632 +-
+ include/media/i2c/mt9t112.h | 2 +-
+ include/media/i2c/wm8775.h | 2 +-
+ include/media/media-device.h | 51 +-
+ include/media/media-entity.h | 21 +-
+ include/media/mipi-csi2.h | 1 +
+ include/media/v4l2-fwnode.h | 2 +
+ include/media/v4l2-h264.h | 31 +-
+ include/media/v4l2-mediabus.h | 2 +
+ include/media/v4l2-subdev.h | 279 +-
+ include/media/videobuf2-v4l2.h | 23 +-
+ include/net/act_api.h | 3 +-
+ include/net/bluetooth/hci.h | 10 +
+ include/net/bluetooth/hci_core.h | 8 +-
+ include/net/cfg80211.h | 16 +-
+ include/net/cfg802154.h | 8 +-
+ include/net/devlink.h | 48 +
+ include/net/dsa.h | 25 +-
+ include/net/flow_dissector.h | 9 +
+ include/net/if_inet6.h | 8 +
+ include/net/inet6_hashtables.h | 28 +-
+ include/net/inet_connection_sock.h | 5 +-
+ include/net/inet_hashtables.h | 145 +-
+ include/net/inet_sock.h | 5 +-
+ include/net/ip.h | 2 +-
+ include/net/ip_fib.h | 4 +-
+ include/net/ipv6.h | 44 +
+ include/net/mac80211.h | 126 +-
+ include/net/mac802154.h | 19 +
+ include/net/mptcp.h | 11 +-
+ include/net/net_debug.h | 157 +
+ include/net/netfilter/nf_conntrack.h | 23 +-
+ include/net/netfilter/nf_conntrack_core.h | 2 +-
+ include/net/netfilter/nf_conntrack_count.h | 1 +
+ include/net/netfilter/nf_conntrack_ecache.h | 53 +-
+ include/net/netfilter/nf_conntrack_extend.h | 31 +-
+ include/net/netfilter/nf_conntrack_labels.h | 10 +-
+ include/net/netfilter/nf_conntrack_timeout.h | 8 -
+ include/net/netfilter/nf_reject.h | 21 +-
+ include/net/netns/conntrack.h | 8 +-
+ include/net/page_pool.h | 21 +
+ include/net/ping.h | 4 +-
+ include/net/pkt_cls.h | 6 +-
+ include/net/route.h | 36 +-
+ include/net/rtnetlink.h | 16 +-
+ include/net/sctp/sctp.h | 2 +-
+ include/net/sock.h | 64 +-
+ include/net/strparser.h | 4 +
+ include/net/tc_act/tc_gact.h | 15 +
+ include/net/tc_act/tc_skbedit.h | 13 +
+ include/net/tcp.h | 45 +-
+ include/net/tls.h | 16 +-
+ include/net/udp.h | 8 +-
+ include/net/xfrm.h | 20 +-
+ include/rdma/ib_verbs.h | 8 -
+ include/soc/mscc/ocelot.h | 42 +-
+ include/soc/mscc/ocelot_vcap.h | 2 +-
+ include/soc/rockchip/pm_domains.h | 25 +
+ include/trace/events/btrfs.h | 30 +-
+ include/trace/events/cachefiles.h | 176 +
+ include/trace/events/ext4.h | 21 +-
+ include/trace/events/f2fs.h | 12 +-
+ include/trace/events/mptcp.h | 6 +-
+ include/trace/events/rxrpc.h | 265 +-
+ include/trace/events/skb.h | 21 +-
+ include/trace/events/tcp.h | 47 +-
+ include/uapi/asm-generic/socket.h | 2 +
+ include/uapi/linux/atm_zatm.h | 47 -
+ include/uapi/linux/bpf.h | 125 +
+ include/uapi/linux/btf.h | 4 +-
+ include/uapi/linux/btrfs_tree.h | 13 -
+ include/uapi/linux/cachefiles.h | 68 +
+ include/uapi/linux/can/isotp.h | 25 +-
+ include/uapi/linux/cec.h | 20 +
+ include/uapi/linux/devlink.h | 23 +
+ include/uapi/linux/ethtool.h | 1 +
+ include/uapi/linux/ethtool_netlink.h | 1 +
+ include/uapi/linux/if_link.h | 7 +
+ include/uapi/linux/input.h | 1 +
+ include/uapi/linux/ipv6.h | 1 +
+ include/uapi/linux/lirc.h | 7 +
+ include/uapi/linux/mdio.h | 75 +
+ include/uapi/linux/media.h | 4 +-
+ include/uapi/linux/mptcp.h | 8 +
+ include/uapi/linux/neighbour.h | 2 +
+ include/uapi/linux/netlink.h | 1 +
+ include/uapi/linux/nl80211.h | 2 +
+ include/uapi/linux/pkt_cls.h | 2 +
+ include/uapi/linux/spi/spi.h | 3 +-
+ include/uapi/linux/tc_act/tc_skbedit.h | 2 +
+ include/uapi/linux/tipc_config.h | 28 +-
+ include/uapi/linux/tls.h | 2 +
+ include/uapi/linux/types.h | 3 +
+ include/uapi/linux/v4l2-controls.h | 5 +
+ include/uapi/linux/videodev2.h | 5 +-
+ init/Kconfig | 1 +
+ kernel/bpf/Makefile | 2 +-
+ kernel/bpf/arraymap.c | 61 +-
+ kernel/bpf/bloom_filter.c | 6 +-
+ kernel/bpf/bpf_inode_storage.c | 10 +-
+ kernel/bpf/bpf_iter.c | 32 +-
+ kernel/bpf/bpf_local_storage.c | 29 +-
+ kernel/bpf/bpf_lsm.c | 17 +
+ kernel/bpf/bpf_struct_ops.c | 81 +-
+ kernel/bpf/bpf_task_storage.c | 9 +-
+ kernel/bpf/btf.c | 640 +-
+ kernel/bpf/cgroup.c | 106 +-
+ kernel/bpf/core.c | 29 +-
+ kernel/bpf/cpumap.c | 6 +-
+ kernel/bpf/devmap.c | 10 +-
+ kernel/bpf/hashtab.c | 133 +-
+ kernel/bpf/helpers.c | 223 +-
+ kernel/bpf/link_iter.c | 107 +
+ kernel/bpf/local_storage.c | 7 +-
+ kernel/bpf/lpm_trie.c | 6 +-
+ kernel/bpf/map_in_map.c | 5 +-
+ kernel/bpf/queue_stack_maps.c | 10 +-
+ kernel/bpf/reuseport_array.c | 6 +-
+ kernel/bpf/ringbuf.c | 88 +-
+ kernel/bpf/stackmap.c | 7 +-
+ kernel/bpf/syscall.c | 500 +-
+ kernel/bpf/task_iter.c | 1 -
+ kernel/bpf/trampoline.c | 118 +-
+ kernel/bpf/verifier.c | 819 +-
+ kernel/cgroup/cgroup-internal.h | 1 -
+ kernel/cgroup/cgroup.c | 4 +-
+ kernel/events/uprobes.c | 7 +-
+ kernel/hung_task.c | 11 +-
+ kernel/kallsyms.c | 3 +-
+ kernel/kcsan/kcsan_test.c | 31 +-
+ kernel/panic.c | 4 +
+ kernel/power/Makefile | 6 +-
+ kernel/power/energy_model.c | 65 +-
+ kernel/power/main.c | 29 -
+ kernel/power/process.c | 3 -
+ kernel/power/snapshot.c | 12 +-
+ kernel/printk/printk.c | 1205 +-
+ kernel/rcu/tree_stall.h | 2 +
+ kernel/reboot.c | 14 +-
+ kernel/sysctl.c | 79 -
+ kernel/trace/bpf_trace.c | 144 +-
+ kernel/trace/fprobe.c | 32 +-
+ kernel/trace/ftrace.c | 62 +
+ kernel/watchdog.c | 4 +
+ kernel/watchdog_hld.c | 4 +
+ kernel/workqueue.c | 2 +-
+ lib/Kconfig | 3 +
+ lib/Kconfig.debug | 16 +-
+ lib/Makefile | 2 +
+ lib/dump_stack.c | 4 +-
+ lib/kunit/Makefile | 1 +
+ lib/kunit/debugfs.c | 2 +-
+ lib/kunit/executor.c | 32 +-
+ lib/kunit/executor_test.c | 4 +-
+ lib/kunit/kunit-example-test.c | 16 +
+ lib/kunit/kunit-test.c | 37 +-
+ lib/kunit/resource.c | 79 +
+ lib/kunit/test.c | 145 +-
+ lib/list-test.c | 397 +-
+ lib/nmi_backtrace.c | 4 +-
+ lib/polynomial.c | 108 +
+ lib/slub_kunit.c | 10 +-
+ lib/stackdepot.c | 67 +-
+ lib/test_bpf.c | 315 +-
+ lib/test_kasan.c | 2 +-
+ lib/test_sysctl.c | 32 +
+ mm/filemap.c | 99 +-
+ mm/folio-compat.c | 4 +-
+ mm/kfence/.kunitconfig | 6 +
+ mm/kfence/kfence_test.c | 31 +-
+ mm/memory.c | 4 +-
+ mm/migrate.c | 2 +-
+ mm/page-writeback.c | 10 +-
+ mm/page_io.c | 2 +-
+ mm/page_owner.c | 9 +-
+ mm/readahead.c | 37 +-
+ mm/secretmem.c | 8 +-
+ mm/shmem.c | 4 +-
+ mm/slab.c | 29 +-
+ mm/slab.h | 5 +-
+ mm/slab_common.c | 23 +-
+ mm/slub.c | 174 +-
+ mm/swapfile.c | 2 +-
+ mm/vmscan.c | 12 +-
+ net/8021q/vlan.c | 3 +-
+ net/8021q/vlan_dev.c | 3 +-
+ net/Kconfig.debug | 7 +
+ net/appletalk/ddp.c | 3 +-
+ net/atm/common.c | 4 +-
+ net/ax25/af_ax25.c | 3 +-
+ net/ax25/ax25_dev.c | 22 +-
+ net/batman-adv/bridge_loop_avoidance.c | 4 +-
+ net/batman-adv/hard-interface.c | 2 +
+ net/batman-adv/main.h | 2 +-
+ net/batman-adv/translation-table.c | 12 +-
+ net/bluetooth/af_bluetooth.c | 7 +-
+ net/bluetooth/eir.c | 31 +
+ net/bluetooth/eir.h | 4 +
+ net/bluetooth/hci_conn.c | 7 +-
+ net/bluetooth/hci_core.c | 2 -
+ net/bluetooth/hci_event.c | 35 +-
+ net/bluetooth/hci_request.c | 4 +-
+ net/bluetooth/hci_sock.c | 3 +-
+ net/bluetooth/hci_sync.c | 90 +-
+ net/bluetooth/mgmt.c | 18 +
+ net/bluetooth/mgmt_util.c | 2 +-
+ net/bluetooth/sco.c | 23 +-
+ net/bpf/bpf_dummy_struct_ops.c | 24 +-
+ net/bpf/test_run.c | 86 +-
+ net/bridge/br_device.c | 1 +
+ net/bridge/br_fdb.c | 160 +-
+ net/bridge/br_if.c | 12 +-
+ net/bridge/br_mdb.c | 12 +-
+ net/bridge/br_netlink.c | 9 +-
+ net/bridge/br_private.h | 21 +-
+ net/bridge/br_switchdev.c | 3 +-
+ net/bridge/br_sysfs_br.c | 6 +-
+ net/caif/caif_socket.c | 2 +-
+ net/can/bcm.c | 7 +-
+ net/can/isotp.c | 130 +-
+ net/can/j1939/socket.c | 4 +-
+ net/can/raw.c | 20 +-
+ net/core/bpf_sk_storage.c | 11 +-
+ net/core/datagram.c | 7 +-
+ net/core/datagram.h | 15 -
+ net/core/dev.c | 232 +-
+ net/core/dev.h | 112 +
+ net/core/dev_addr_lists.c | 2 +
+ net/core/dev_ioctl.c | 2 +
+ net/core/devlink.c | 653 +-
+ net/core/drop_monitor.c | 2 +-
+ net/core/filter.c | 37 +-
+ net/core/flow_dissector.c | 20 +
+ net/core/gro.c | 8 +
+ net/core/link_watch.c | 1 +
+ net/core/neighbour.c | 2 +-
+ net/core/net-procfs.c | 2 +
+ net/core/net-sysfs.c | 22 +-
+ net/core/page_pool.c | 83 +-
+ net/core/rtnetlink.c | 449 +-
+ net/core/skbuff.c | 67 +-
+ net/core/skmsg.c | 22 +-
+ net/core/sock.c | 126 +-
+ net/core/sock_map.c | 10 +-
+ net/core/sysctl_net_core.c | 29 +-
+ net/dccp/dccp.h | 4 +-
+ net/dccp/ipv4.c | 7 +-
+ net/dccp/ipv6.c | 6 +-
+ net/dccp/proto.c | 40 +-
+ net/decnet/dn_route.c | 2 +-
+ net/dsa/dsa.c | 49 -
+ net/dsa/dsa2.c | 25 +-
+ net/dsa/dsa_priv.h | 29 +-
+ net/dsa/port.c | 136 +-
+ net/dsa/slave.c | 67 +-
+ net/dsa/switch.c | 198 +-
+ net/dsa/tag_8021q.c | 10 +-
+ net/ethernet/eth.c | 2 +-
+ net/ethtool/common.c | 3 +
+ net/ethtool/netlink.h | 2 +-
+ net/ethtool/rings.c | 54 +-
+ net/ieee802154/socket.c | 12 +-
+ net/ipv4/Kconfig | 1 -
+ net/ipv4/af_inet.c | 11 +-
+ net/ipv4/arp.c | 7 +-
+ net/ipv4/datagram.c | 7 +-
+ net/ipv4/devinet.c | 2 +-
+ net/ipv4/esp4.c | 6 -
+ net/ipv4/fib_frontend.c | 4 +-
+ net/ipv4/fib_rules.c | 2 +-
+ net/ipv4/fib_semantics.c | 4 +-
+ net/ipv4/fib_trie.c | 12 +-
+ net/ipv4/fou.c | 1 -
+ net/ipv4/icmp.c | 77 +-
+ net/ipv4/igmp.c | 4 +-
+ net/ipv4/inet_connection_sock.c | 245 +-
+ net/ipv4/inet_diag.c | 5 +-
+ net/ipv4/inet_fragment.c | 2 +-
+ net/ipv4/inet_hashtables.c | 329 +-
+ net/ipv4/ip_forward.c | 13 +-
+ net/ipv4/ip_gre.c | 50 +-
+ net/ipv4/ip_input.c | 1 +
+ net/ipv4/ipmr.c | 2 +-
+ net/ipv4/netfilter.c | 3 +-
+ net/ipv4/netfilter/nf_reject_ipv4.c | 10 +-
+ net/ipv4/netfilter/nft_fib_ipv4.c | 4 +
+ net/ipv4/ping.c | 40 +-
+ net/ipv4/raw.c | 6 +-
+ net/ipv4/route.c | 51 +-
+ net/ipv4/sysctl_net_ipv4.c | 16 +-
+ net/ipv4/tcp.c | 67 +-
+ net/ipv4/tcp_bbr.c | 22 +-
+ net/ipv4/tcp_bic.c | 14 +-
+ net/ipv4/tcp_bpf.c | 15 +-
+ net/ipv4/tcp_cdg.c | 30 +-
+ net/ipv4/tcp_cong.c | 30 +-
+ net/ipv4/tcp_cubic.c | 26 +-
+ net/ipv4/tcp_dctcp.c | 11 +-
+ net/ipv4/tcp_highspeed.c | 18 +-
+ net/ipv4/tcp_htcp.c | 10 +-
+ net/ipv4/tcp_hybla.c | 18 +-
+ net/ipv4/tcp_illinois.c | 12 +-
+ net/ipv4/tcp_input.c | 177 +-
+ net/ipv4/tcp_ipv4.c | 30 +-
+ net/ipv4/tcp_lp.c | 6 +-
+ net/ipv4/tcp_metrics.c | 12 +-
+ net/ipv4/tcp_nv.c | 24 +-
+ net/ipv4/tcp_output.c | 46 +-
+ net/ipv4/tcp_rate.c | 2 +-
+ net/ipv4/tcp_recovery.c | 15 +-
+ net/ipv4/tcp_scalable.c | 4 +-
+ net/ipv4/tcp_vegas.c | 21 +-
+ net/ipv4/tcp_veno.c | 24 +-
+ net/ipv4/tcp_westwood.c | 3 +-
+ net/ipv4/tcp_yeah.c | 30 +-
+ net/ipv4/udp.c | 16 +-
+ net/ipv4/udp_bpf.c | 17 +-
+ net/ipv4/udp_impl.h | 4 +-
+ net/ipv6/addrconf.c | 51 +-
+ net/ipv6/af_inet6.c | 7 +-
+ net/ipv6/datagram.c | 10 +-
+ net/ipv6/esp6.c | 6 -
+ net/ipv6/exthdrs.c | 44 +-
+ net/ipv6/icmp.c | 31 +-
+ net/ipv6/inet6_hashtables.c | 11 +-
+ net/ipv6/ip6_gre.c | 34 +-
+ net/ipv6/ip6_input.c | 41 +-
+ net/ipv6/ip6_offload.c | 56 +-
+ net/ipv6/ip6_output.c | 56 +-
+ net/ipv6/ip6_tunnel.c | 2 -
+ net/ipv6/ndisc.c | 20 +-
+ net/ipv6/netfilter.c | 3 +-
+ net/ipv6/netfilter/nf_reject_ipv6.c | 4 +-
+ net/ipv6/netfilter/nft_fib_ipv6.c | 4 +
+ net/ipv6/raw.c | 6 +-
+ net/ipv6/route.c | 6 +-
+ net/ipv6/sysctl_net_ipv6.c | 6 +-
+ net/ipv6/tcp_ipv6.c | 6 +-
+ net/ipv6/udp.c | 23 +-
+ net/ipv6/udp_impl.h | 4 +-
+ net/iucv/af_iucv.c | 3 +-
+ net/key/af_key.c | 4 +-
+ net/l2tp/l2tp_ip.c | 8 +-
+ net/l2tp/l2tp_ip6.c | 12 +-
+ net/l2tp/l2tp_ppp.c | 3 +-
+ net/mac80211/agg-rx.c | 12 +-
+ net/mac80211/agg-tx.c | 6 +-
+ net/mac80211/airtime.c | 4 +-
+ net/mac80211/cfg.c | 81 +-
+ net/mac80211/chan.c | 8 +-
+ net/mac80211/debugfs.c | 1 +
+ net/mac80211/debugfs_netdev.c | 2 +-
+ net/mac80211/debugfs_sta.c | 12 +-
+ net/mac80211/eht.c | 6 +-
+ net/mac80211/ethtool.c | 4 +-
+ net/mac80211/he.c | 8 +-
+ net/mac80211/ht.c | 8 +-
+ net/mac80211/ibss.c | 26 +-
+ net/mac80211/ieee80211_i.h | 12 +-
+ net/mac80211/key.c | 9 +-
+ net/mac80211/main.c | 4 +-
+ net/mac80211/mesh_hwmp.c | 2 +-
+ net/mac80211/mesh_plink.c | 24 +-
+ net/mac80211/mlme.c | 135 +-
+ net/mac80211/ocb.c | 2 +-
+ net/mac80211/offchannel.c | 2 +-
+ net/mac80211/rate.c | 8 +-
+ net/mac80211/rc80211_minstrel_ht.c | 177 +-
+ net/mac80211/rc80211_minstrel_ht.h | 2 +-
+ net/mac80211/rx.c | 131 +-
+ net/mac80211/s1g.c | 4 +-
+ net/mac80211/scan.c | 20 +
+ net/mac80211/sta_info.c | 110 +-
+ net/mac80211/sta_info.h | 155 +-
+ net/mac80211/status.c | 130 +-
+ net/mac80211/tdls.c | 26 +-
+ net/mac80211/trace.h | 4 +-
+ net/mac80211/tx.c | 28 +-
+ net/mac80211/util.c | 40 -
+ net/mac80211/vht.c | 78 +-
+ net/mac80211/wpa.c | 103 +-
+ net/mac802154/cfg.c | 1 +
+ net/mac802154/ieee802154_i.h | 2 +
+ net/mac802154/main.c | 54 +-
+ net/mac802154/util.c | 22 +-
+ net/mctp/af_mctp.c | 4 +-
+ net/mctp/test/route-test.c | 12 +-
+ net/mpls/af_mpls.c | 3 +-
+ net/mptcp/Makefile | 4 +-
+ net/mptcp/bpf.c | 21 +
+ net/mptcp/ctrl.c | 21 +
+ net/mptcp/mib.c | 5 +
+ net/mptcp/mib.h | 7 +
+ net/mptcp/mptcp_diag.c | 105 +-
+ net/mptcp/options.c | 69 +-
+ net/mptcp/pm.c | 108 +-
+ net/mptcp/pm_netlink.c | 266 +-
+ net/mptcp/pm_userspace.c | 429 +
+ net/mptcp/protocol.c | 123 +-
+ net/mptcp/protocol.h | 101 +-
+ net/mptcp/sockopt.c | 21 +-
+ net/mptcp/subflow.c | 72 +-
+ net/netfilter/ipvs/ip_vs_ctl.c | 4 +-
+ net/netfilter/nf_conncount.c | 11 +
+ net/netfilter/nf_conntrack_bpf.c | 22 +-
+ net/netfilter/nf_conntrack_core.c | 304 +-
+ net/netfilter/nf_conntrack_ecache.c | 178 +-
+ net/netfilter/nf_conntrack_extend.c | 32 +-
+ net/netfilter/nf_conntrack_helper.c | 5 -
+ net/netfilter/nf_conntrack_netlink.c | 152 +-
+ net/netfilter/nf_conntrack_proto.c | 10 +-
+ net/netfilter/nf_conntrack_proto_tcp.c | 52 +-
+ net/netfilter/nf_conntrack_standalone.c | 2 +-
+ net/netfilter/nf_conntrack_timeout.c | 7 +-
+ net/netfilter/nf_log_syslog.c | 136 +-
+ net/netfilter/nf_nat_masquerade.c | 5 +-
+ net/netfilter/nf_tables_api.c | 6 +-
+ net/netfilter/nfnetlink.c | 40 +-
+ net/netfilter/nfnetlink_cttimeout.c | 61 +-
+ net/netfilter/nft_bitwise.c | 13 +-
+ net/netfilter/nft_fib.c | 4 +
+ net/netfilter/nft_flow_offload.c | 8 +
+ net/netlink/af_netlink.c | 3 +-
+ net/netrom/af_netrom.c | 3 +-
+ net/nfc/core.c | 1 +
+ net/nfc/llcp_sock.c | 3 +-
+ net/nfc/rawsock.c | 3 +-
+ net/packet/af_packet.c | 22 +-
+ net/phonet/datagram.c | 4 +-
+ net/phonet/pep.c | 7 +-
+ net/qrtr/af_qrtr.c | 3 +-
+ net/rose/af_rose.c | 3 +-
+ net/rose/rose_route.c | 25 +-
+ net/rxrpc/af_rxrpc.c | 2 +-
+ net/rxrpc/ar-internal.h | 38 +-
+ net/rxrpc/call_accept.c | 10 +-
+ net/rxrpc/call_event.c | 7 +-
+ net/rxrpc/call_object.c | 62 +-
+ net/rxrpc/conn_client.c | 30 +-
+ net/rxrpc/conn_object.c | 51 +-
+ net/rxrpc/conn_service.c | 8 +-
+ net/rxrpc/input.c | 62 +-
+ net/rxrpc/local_object.c | 68 +-
+ net/rxrpc/net_ns.c | 7 +-
+ net/rxrpc/output.c | 20 +-
+ net/rxrpc/peer_object.c | 40 +-
+ net/rxrpc/proc.c | 85 +-
+ net/rxrpc/recvmsg.c | 8 +-
+ net/rxrpc/sendmsg.c | 6 +
+ net/rxrpc/skbuff.c | 1 -
+ net/rxrpc/sysctl.c | 4 +-
+ net/sched/act_api.c | 4 +-
+ net/sched/act_csum.c | 3 +-
+ net/sched/act_ct.c | 3 +-
+ net/sched/act_gact.c | 13 +-
+ net/sched/act_gate.c | 3 +-
+ net/sched/act_mirred.c | 4 +-
+ net/sched/act_mpls.c | 10 +-
+ net/sched/act_pedit.c | 4 +-
+ net/sched/act_police.c | 20 +-
+ net/sched/act_sample.c | 3 +-
+ net/sched/act_skbedit.c | 65 +-
+ net/sched/act_tunnel_key.c | 4 +-
+ net/sched/act_vlan.c | 4 +-
+ net/sched/cls_api.c | 22 +-
+ net/sched/cls_flower.c | 104 +-
+ net/sched/cls_matchall.c | 19 +-
+ net/sched/em_meta.c | 7 +-
+ net/sched/sch_generic.c | 12 +-
+ net/sctp/input.c | 4 +-
+ net/sctp/ipv6.c | 4 +-
+ net/sctp/output.c | 3 +-
+ net/sctp/socket.c | 18 +-
+ net/sctp/stream_sched.c | 9 +-
+ net/sctp/ulpevent.c | 2 +-
+ net/smc/af_smc.c | 52 +-
+ net/smc/smc_ib.c | 1 +
+ net/smc/smc_tx.c | 17 +-
+ net/smc/smc_wr.c | 5 +-
+ net/socket.c | 75 +-
+ net/sunrpc/svcsock.c | 2 +-
+ net/sunrpc/xprtsock.c | 2 +-
+ net/tls/tls_device.c | 59 +-
+ net/tls/tls_main.c | 55 +
+ net/tls/tls_sw.c | 491 +-
+ net/unix/af_unix.c | 11 +-
+ net/unix/unix_bpf.c | 5 +-
+ net/vmw_vsock/virtio_transport.c | 197 +-
+ net/vmw_vsock/vmci_transport.c | 5 +-
+ net/wireless/chan.c | 93 +-
+ net/wireless/core.h | 14 +-
+ net/wireless/ibss.c | 4 +-
+ net/wireless/nl80211.c | 417 +-
+ net/wireless/reg.c | 4 +
+ net/x25/af_x25.c | 3 +-
+ net/x25/x25_proc.c | 3 +-
+ net/xdp/xsk.c | 4 +-
+ net/xdp/xsk_queue.h | 4 +-
+ net/xdp/xskmap.c | 6 +-
+ net/xfrm/espintcp.c | 4 +-
+ net/xfrm/xfrm_device.c | 15 +-
+ net/xfrm/xfrm_state.c | 4 +-
+ net/xfrm/xfrm_user.c | 5 +-
+ samples/bpf/Makefile | 19 +-
+ samples/bpf/cpustat_user.c | 1 -
+ samples/bpf/hbm.c | 5 +-
+ samples/bpf/ibumad_user.c | 1 -
+ samples/bpf/map_perf_test_user.c | 1 -
+ samples/bpf/offwaketime_user.c | 1 -
+ samples/bpf/sockex2_user.c | 1 -
+ samples/bpf/sockex3_user.c | 1 -
+ samples/bpf/spintest_user.c | 1 -
+ samples/bpf/syscall_tp_user.c | 4 +-
+ samples/bpf/task_fd_query_user.c | 1 -
+ samples/bpf/test_lru_dist.c | 1 -
+ samples/bpf/test_map_in_map_user.c | 1 -
+ samples/bpf/test_overhead_user.c | 1 -
+ samples/bpf/tracex2_user.c | 1 -
+ samples/bpf/tracex3_user.c | 1 -
+ samples/bpf/tracex4_user.c | 1 -
+ samples/bpf/tracex5_user.c | 1 -
+ samples/bpf/tracex6_user.c | 1 -
+ samples/bpf/xdp1_user.c | 3 +-
+ samples/bpf/xdp_adjust_tail_user.c | 1 -
+ samples/bpf/xdp_monitor_user.c | 1 -
+ samples/bpf/xdp_redirect_cpu_user.c | 1 -
+ samples/bpf/xdp_redirect_map_multi_user.c | 1 -
+ samples/bpf/xdp_redirect_user.c | 1 -
+ samples/bpf/xdp_router_ipv4.bpf.c | 180 +
+ samples/bpf/xdp_router_ipv4_kern.c | 186 -
+ samples/bpf/xdp_router_ipv4_user.c | 456 +-
+ samples/bpf/xdp_rxq_info_user.c | 23 +-
+ samples/bpf/xdp_sample_pkts_user.c | 1 -
+ samples/bpf/xdp_sample_user.c | 1 -
+ samples/bpf/xdp_tx_iptunnel_user.c | 1 -
+ samples/bpf/xdpsock_user.c | 9 +-
+ samples/bpf/xsk_fwd.c | 7 +-
+ scripts/bpf_doc.py | 4 +
+ security/apparmor/policy_unpack_test.c | 6 +-
+ tools/Makefile | 36 +-
+ tools/bpf/bpftool/btf.c | 62 +-
+ tools/bpf/bpftool/common.c | 8 -
+ tools/bpf/bpftool/feature.c | 26 +-
+ tools/bpf/bpftool/gen.c | 5 +-
+ tools/bpf/bpftool/link.c | 4 +
+ tools/bpf/bpftool/main.c | 6 +-
+ tools/bpf/bpftool/main.h | 2 -
+ tools/bpf/bpftool/map.c | 2 -
+ tools/bpf/bpftool/perf.c | 112 +-
+ tools/bpf/bpftool/pids.c | 1 -
+ tools/bpf/bpftool/prog.c | 4 +-
+ tools/bpf/bpftool/struct_ops.c | 2 -
+ tools/bpf/bpftool/tracelog.c | 2 +-
+ tools/bpf/runqslower/runqslower.c | 18 +-
+ tools/include/uapi/asm-generic/socket.h | 2 +
+ tools/include/uapi/asm/bpf_perf_event.h | 2 +
+ tools/include/uapi/linux/bpf.h | 125 +
+ tools/include/uapi/linux/btf.h | 4 +-
+ tools/include/uapi/linux/if_link.h | 2 +
+ tools/lib/bpf/Build | 3 +-
+ tools/lib/bpf/Makefile | 4 +-
+ tools/lib/bpf/bpf.c | 136 +-
+ tools/lib/bpf/bpf.h | 46 +-
+ tools/lib/bpf/bpf_core_read.h | 37 +-
+ tools/lib/bpf/bpf_helpers.h | 26 +
+ tools/lib/bpf/bpf_tracing.h | 23 +
+ tools/lib/bpf/btf.c | 15 +-
+ tools/lib/bpf/libbpf.c | 1273 +-
+ tools/lib/bpf/libbpf.h | 279 +-
+ tools/lib/bpf/libbpf.map | 17 +-
+ tools/lib/bpf/libbpf_internal.h | 37 +
+ tools/lib/bpf/libbpf_version.h | 4 +-
+ tools/lib/bpf/relo_core.c | 104 +-
+ tools/lib/bpf/relo_core.h | 6 +
+ tools/lib/bpf/usdt.bpf.h | 259 +
+ tools/lib/bpf/usdt.c | 1518 ++
+ tools/lib/thermal/.gitignore | 2 +
+ tools/lib/thermal/Build | 5 +
+ tools/lib/thermal/Makefile | 165 +
+ tools/lib/thermal/commands.c | 349 +
+ tools/lib/thermal/events.c | 164 +
+ tools/lib/thermal/include/thermal.h | 142 +
+ tools/lib/thermal/libthermal.map | 25 +
+ tools/lib/thermal/libthermal.pc.template | 12 +
+ tools/lib/thermal/sampling.c | 75 +
+ tools/lib/thermal/thermal.c | 135 +
+ tools/lib/thermal/thermal_nl.c | 215 +
+ tools/lib/thermal/thermal_nl.h | 46 +
+ tools/power/acpi/common/cmfsize.c | 2 +-
+ tools/power/acpi/common/getopt.c | 2 +-
+ .../acpi/os_specific/service_layers/oslinuxtbl.c | 2 +-
+ .../acpi/os_specific/service_layers/osunixdir.c | 2 +-
+ .../acpi/os_specific/service_layers/osunixmap.c | 2 +-
+ .../acpi/os_specific/service_layers/osunixxf.c | 2 +-
+ tools/power/acpi/tools/acpidump/acpidump.h | 2 +-
+ tools/power/acpi/tools/acpidump/apdump.c | 2 +-
+ tools/power/acpi/tools/acpidump/apfiles.c | 2 +-
+ tools/power/acpi/tools/acpidump/apmain.c | 2 +-
+ tools/power/x86/turbostat/Makefile | 2 +-
+ tools/power/x86/turbostat/turbostat.8 | 2 +-
+ tools/power/x86/turbostat/turbostat.c | 594 +-
+ tools/testing/kunit/configs/all_tests_uml.config | 37 +
+ tools/testing/kunit/kunit.py | 63 +-
+ tools/testing/kunit/kunit_config.py | 21 +-
+ tools/testing/kunit/kunit_json.py | 66 +-
+ tools/testing/kunit/kunit_kernel.py | 81 +-
+ tools/testing/kunit/kunit_parser.py | 154 +-
+ tools/testing/kunit/kunit_tool_test.py | 44 +-
+ tools/testing/kunit/qemu_config.py | 17 +-
+ tools/testing/kunit/qemu_configs/alpha.py | 2 +-
+ tools/testing/kunit/qemu_configs/arm.py | 2 +-
+ tools/testing/kunit/qemu_configs/arm64.py | 2 +-
+ tools/testing/kunit/qemu_configs/i386.py | 4 +-
+ tools/testing/kunit/qemu_configs/powerpc.py | 2 +-
+ tools/testing/kunit/qemu_configs/riscv.py | 7 +-
+ tools/testing/kunit/qemu_configs/s390.py | 4 +-
+ tools/testing/kunit/qemu_configs/sparc.py | 2 +-
+ tools/testing/kunit/qemu_configs/x86_64.py | 2 +-
+ tools/testing/kunit/run_checks.py | 2 +-
+ .../kunit/test_data/test_is_test_passed-crash.log | 70 -
+ .../test_is_test_passed-no_tests_no_plan.log | 2 +-
+ tools/testing/selftests/Makefile | 2 +
+ tools/testing/selftests/bpf/Makefile | 39 +-
+ tools/testing/selftests/bpf/bench.c | 1 -
+ tools/testing/selftests/bpf/bpf_rlimit.h | 28 -
+ tools/testing/selftests/bpf/bpf_tcp_helpers.h | 13 +
+ tools/testing/selftests/bpf/config | 4 +
+ tools/testing/selftests/bpf/flow_dissector_load.c | 6 +-
+ tools/testing/selftests/bpf/get_cgroup_id_user.c | 4 +-
+ .../selftests/bpf/map_tests/map_in_map_batch_ops.c | 252 +
+ tools/testing/selftests/bpf/network_helpers.c | 40 +-
+ tools/testing/selftests/bpf/network_helpers.h | 2 +
+ .../testing/selftests/bpf/prog_tests/arg_parsing.c | 107 +
+ .../selftests/bpf/prog_tests/attach_probe.c | 95 +-
+ .../testing/selftests/bpf/prog_tests/bpf_cookie.c | 89 +
+ tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 265 +-
+ .../selftests/bpf/prog_tests/bpf_mod_race.c | 4 +-
+ .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 6 +-
+ tools/testing/selftests/bpf/prog_tests/btf.c | 100 +-
+ .../selftests/bpf/prog_tests/core_autosize.c | 2 +-
+ .../testing/selftests/bpf/prog_tests/core_reloc.c | 13 +-
+ .../testing/selftests/bpf/prog_tests/core_retro.c | 17 +-
+ tools/testing/selftests/bpf/prog_tests/dynptr.c | 137 +
+ .../selftests/bpf/prog_tests/fexit_stress.c | 4 +-
+ tools/testing/selftests/bpf/prog_tests/for_each.c | 42 +-
+ .../selftests/bpf/prog_tests/helper_restricted.c | 10 +-
+ .../selftests/bpf/prog_tests/kprobe_multi_test.c | 159 +-
+ tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 17 +-
+ .../selftests/bpf/prog_tests/linked_funcs.c | 6 +
+ tools/testing/selftests/bpf/prog_tests/log_fixup.c | 149 +
+ .../selftests/bpf/prog_tests/lookup_and_delete.c | 15 +-
+ tools/testing/selftests/bpf/prog_tests/map_kptr.c | 148 +
+ .../bpf/prog_tests/map_lookup_percpu_elem.c | 58 +
+ tools/testing/selftests/bpf/prog_tests/mptcp.c | 174 +
+ tools/testing/selftests/bpf/prog_tests/netcnt.c | 2 +-
+ .../bpf/prog_tests/prog_tests_framework.c | 56 +
+ .../selftests/bpf/prog_tests/reference_tracking.c | 23 +-
+ .../selftests/bpf/prog_tests/ringbuf_multi.c | 12 -
+ .../selftests/bpf/prog_tests/skb_load_bytes.c | 45 +
+ tools/testing/selftests/bpf/prog_tests/snprintf.c | 4 +-
+ .../selftests/bpf/prog_tests/stacktrace_build_id.c | 8 +-
+ .../bpf/prog_tests/stacktrace_build_id_nmi.c | 11 +-
+ .../testing/selftests/bpf/prog_tests/tc_redirect.c | 1 -
+ .../selftests/bpf/prog_tests/test_global_funcs.c | 1 +
+ .../selftests/bpf/prog_tests/test_strncmp.c | 25 +-
+ .../testing/selftests/bpf/prog_tests/test_tunnel.c | 423 +
+ tools/testing/selftests/bpf/prog_tests/timer_mim.c | 2 +-
+ .../selftests/bpf/prog_tests/trampoline_count.c | 134 +-
+ .../selftests/bpf/prog_tests/unpriv_bpf_disabled.c | 312 +
+ .../selftests/bpf/prog_tests/uprobe_autoattach.c | 50 +
+ tools/testing/selftests/bpf/prog_tests/usdt.c | 419 +
+ tools/testing/selftests/bpf/progs/bpf_iter.h | 7 +
+ .../selftests/bpf/progs/bpf_iter_bpf_link.c | 21 +
+ .../bpf/progs/btf__core_reloc_size___diff_offs.c | 3 +
+ .../bpf/progs/btf_dump_test_case_syntax.c | 2 +-
+ .../testing/selftests/bpf/progs/core_reloc_types.h | 18 +
+ tools/testing/selftests/bpf/progs/dynptr_fail.c | 588 +
+ tools/testing/selftests/bpf/progs/dynptr_success.c | 164 +
+ tools/testing/selftests/bpf/progs/exhandler_kern.c | 13 +-
+ .../bpf/progs/for_each_map_elem_write_key.c | 27 +
+ tools/testing/selftests/bpf/progs/kprobe_multi.c | 14 +
+ .../selftests/bpf/progs/kprobe_multi_empty.c | 12 +
+ tools/testing/selftests/bpf/progs/linked_funcs1.c | 15 +-
+ tools/testing/selftests/bpf/progs/linked_funcs2.c | 15 +-
+ tools/testing/selftests/bpf/progs/loop5.c | 1 -
+ tools/testing/selftests/bpf/progs/map_kptr.c | 292 +
+ tools/testing/selftests/bpf/progs/map_kptr_fail.c | 418 +
+ tools/testing/selftests/bpf/progs/mptcp_sock.c | 88 +
+ .../selftests/bpf/progs/perf_event_stackmap.c | 4 +-
+ tools/testing/selftests/bpf/progs/profiler.inc.h | 5 +-
+ tools/testing/selftests/bpf/progs/profiler1.c | 1 -
+ tools/testing/selftests/bpf/progs/pyperf.h | 6 +-
+ tools/testing/selftests/bpf/progs/pyperf600.c | 11 +-
+ tools/testing/selftests/bpf/progs/skb_load_bytes.c | 19 +
+ tools/testing/selftests/bpf/progs/strncmp_test.c | 8 +-
+ .../selftests/bpf/progs/test_attach_probe.c | 64 +-
+ .../testing/selftests/bpf/progs/test_bpf_cookie.c | 56 +-
+ .../bpf/progs/test_core_reloc_existence.c | 11 +-
+ .../selftests/bpf/progs/test_core_reloc_size.c | 31 +-
+ .../selftests/bpf/progs/test_global_func17.c | 16 +
+ .../selftests/bpf/progs/test_helper_restricted.c | 16 +-
+ .../bpf/progs/test_ksyms_btf_write_check.c | 18 +-
+ .../selftests/bpf/progs/test_l4lb_noinline.c | 2 +-
+ tools/testing/selftests/bpf/progs/test_log_fixup.c | 64 +
+ .../bpf/progs/test_map_lookup_percpu_elem.c | 76 +
+ .../selftests/bpf/progs/test_module_attach.c | 2 +-
+ .../testing/selftests/bpf/progs/test_pkt_access.c | 2 -
+ .../selftests/bpf/progs/test_ringbuf_multi.c | 2 +
+ tools/testing/selftests/bpf/progs/test_sk_assign.c | 4 +-
+ .../selftests/bpf/progs/test_sk_lookup_kern.c | 18 +-
+ tools/testing/selftests/bpf/progs/test_subprogs.c | 8 +
+ .../selftests/bpf/progs/test_task_pt_regs.c | 2 +-
+ .../selftests/bpf/progs/test_trampoline_count.c | 16 +-
+ .../testing/selftests/bpf/progs/test_tunnel_kern.c | 371 +-
+ .../selftests/bpf/progs/test_unpriv_bpf_disabled.c | 83 +
+ .../selftests/bpf/progs/test_uprobe_autoattach.c | 73 +
+ .../selftests/bpf/progs/test_urandom_usdt.c | 70 +
+ tools/testing/selftests/bpf/progs/test_usdt.c | 96 +
+ .../selftests/bpf/progs/test_usdt_multispec.c | 32 +
+ .../selftests/bpf/progs/test_xdp_noinline.c | 12 +-
+ tools/testing/selftests/bpf/progs/trigger_bench.c | 2 +-
+ tools/testing/selftests/bpf/sdt-config.h | 6 +
+ tools/testing/selftests/bpf/sdt.h | 513 +
+ .../selftests/bpf/test_bpftool_synctypes.py | 2 +-
+ tools/testing/selftests/bpf/test_cgroup_storage.c | 7 +-
+ tools/testing/selftests/bpf/test_dev_cgroup.c | 4 +-
+ tools/testing/selftests/bpf/test_lpm_map.c | 43 +-
+ tools/testing/selftests/bpf/test_lru_map.c | 70 +-
+ tools/testing/selftests/bpf/test_offload.py | 2 +-
+ tools/testing/selftests/bpf/test_progs.c | 1006 +-
+ tools/testing/selftests/bpf/test_progs.h | 89 +-
+ .../selftests/bpf/test_skb_cgroup_id_user.c | 4 +-
+ tools/testing/selftests/bpf/test_sock.c | 6 +-
+ tools/testing/selftests/bpf/test_sock_addr.c | 4 +-
+ tools/testing/selftests/bpf/test_sockmap.c | 5 +-
+ tools/testing/selftests/bpf/test_sysctl.c | 6 +-
+ tools/testing/selftests/bpf/test_tag.c | 4 +-
+ .../selftests/bpf/test_tcp_check_syncookie_user.c | 4 +-
+ tools/testing/selftests/bpf/test_tcpnotify_user.c | 1 -
+ tools/testing/selftests/bpf/test_tunnel.sh | 124 +-
+ tools/testing/selftests/bpf/test_verifier.c | 55 +-
+ tools/testing/selftests/bpf/test_verifier_log.c | 5 +-
+ tools/testing/selftests/bpf/test_xsk.sh | 53 +-
+ tools/testing/selftests/bpf/testing_helpers.c | 91 +-
+ tools/testing/selftests/bpf/testing_helpers.h | 8 +
+ tools/testing/selftests/bpf/trace_helpers.c | 9 +-
+ tools/testing/selftests/bpf/urandom_read.c | 63 +-
+ tools/testing/selftests/bpf/urandom_read_aux.c | 9 +
+ tools/testing/selftests/bpf/urandom_read_lib1.c | 13 +
+ tools/testing/selftests/bpf/urandom_read_lib2.c | 8 +
+ tools/testing/selftests/bpf/verifier/calls.c | 20 +
+ tools/testing/selftests/bpf/verifier/map_kptr.c | 469 +
+ .../testing/selftests/bpf/verifier/ref_tracking.c | 2 +-
+ tools/testing/selftests/bpf/verifier/sock.c | 6 +-
+ tools/testing/selftests/bpf/xdp_redirect_multi.c | 1 -
+ tools/testing/selftests/bpf/xdping.c | 8 +-
+ tools/testing/selftests/bpf/xdpxceiver.c | 553 +-
+ tools/testing/selftests/bpf/xdpxceiver.h | 42 +-
+ tools/testing/selftests/bpf/xsk_prereqs.sh | 47 +-
+ tools/testing/selftests/cgroup/.gitignore | 1 +
+ tools/testing/selftests/cgroup/Makefile | 2 +
+ tools/testing/selftests/cgroup/cgroup_util.c | 12 +
+ tools/testing/selftests/cgroup/cgroup_util.h | 4 +
+ tools/testing/selftests/cgroup/config | 8 +
+ tools/testing/selftests/cgroup/test_cpu.c | 726 +
+ tools/testing/selftests/cgroup/test_stress.sh | 2 +-
+ .../drivers/net/dsa/bridge_locked_port.sh | 1 +
+ .../selftests/drivers/net/dsa/bridge_mdb.sh | 1 +
+ .../selftests/drivers/net/dsa/bridge_mld.sh | 1 +
+ .../selftests/drivers/net/dsa/bridge_vlan_aware.sh | 1 +
+ .../selftests/drivers/net/dsa/bridge_vlan_mcast.sh | 1 +
+ .../drivers/net/dsa/bridge_vlan_unaware.sh | 1 +
+ .../selftests/drivers/net/dsa/forwarding.config | 2 +
+ tools/testing/selftests/drivers/net/dsa/lib.sh | 1 +
+ .../selftests/drivers/net/dsa/local_termination.sh | 1 +
+ .../selftests/drivers/net/dsa/no_forwarding.sh | 1 +
+ .../drivers/net/mlxsw/devlink_linecard.sh | 280 +
+ .../selftests/drivers/net/mlxsw/qos_burst.sh | 480 +
+ .../selftests/drivers/net/mlxsw/qos_headroom.sh | 4 +-
+ .../testing/selftests/drivers/net/mlxsw/qos_pfc.sh | 4 +-
+ .../selftests/drivers/net/mlxsw/sch_red_ets.sh | 5 +-
+ .../selftests/drivers/net/mlxsw/sch_red_root.sh | 5 +-
+ .../selftests/drivers/net/netdevsim/hw_stats_l3.sh | 4 +-
+ .../selftests/drivers/net/ocelot/basic_qos.sh | 253 +
+ tools/testing/selftests/drivers/net/ocelot/psfp.sh | 327 +
+ .../drivers/net/ocelot/tc_flower_chains.sh | 202 +-
+ .../selftests/filesystems/binderfs/binderfs_test.c | 3 +-
+ .../ftrace/test.d/kprobe/kprobe_args_string.tc | 3 +
+ .../ftrace/test.d/kprobe/kprobe_args_syntax.tc | 4 +
+ tools/testing/selftests/ir/ir_loopback.sh | 2 +-
+ tools/testing/selftests/kselftest.h | 15 +
+ tools/testing/selftests/mqueue/mq_perf_tests.c | 4 +-
+ tools/testing/selftests/net/.gitignore | 2 +
+ tools/testing/selftests/net/Makefile | 5 +
+ tools/testing/selftests/net/bind_bhash_test.c | 119 +
+ tools/testing/selftests/net/fib_nexthops.sh | 53 +-
+ tools/testing/selftests/net/fib_rule_tests.sh | 12 +-
+ tools/testing/selftests/net/forwarding/Makefile | 2 +
+ .../testing/selftests/net/forwarding/bridge_mdb.sh | 103 +
+ .../selftests/net/forwarding/hw_stats_l3.sh | 16 +-
+ .../selftests/net/forwarding/hw_stats_l3_gre.sh | 109 +
+ tools/testing/selftests/net/forwarding/lib.sh | 144 +-
+ .../selftests/net/forwarding/local_termination.sh | 299 +
+ .../selftests/net/forwarding/no_forwarding.sh | 261 +
+ tools/testing/selftests/net/forwarding/router.sh | 18 +
+ .../selftests/net/forwarding/router_vid_1.sh | 27 +-
+ .../testing/selftests/net/forwarding/tc_actions.sh | 2 +-
+ tools/testing/selftests/net/forwarding/tsn_lib.sh | 235 +
+ tools/testing/selftests/net/mptcp/config | 8 +
+ tools/testing/selftests/net/mptcp/diag.sh | 38 +
+ tools/testing/selftests/net/mptcp/mptcp_join.sh | 243 +-
+ tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 645 +-
+ tools/testing/selftests/net/mptcp/userspace_pm.sh | 779 +
+ .../selftests/net/ndisc_unsolicited_na_test.sh | 255 +
+ .../selftests/net/stress_reuseport_listen.c | 105 +
+ .../selftests/net/stress_reuseport_listen.sh | 25 +
+ .../testing/selftests/net/vrf_strict_mode_test.sh | 48 +-
+ tools/testing/selftests/netfilter/nft_fib.sh | 50 +
+ tools/testing/selftests/resctrl/Makefile | 19 +-
+ tools/testing/selftests/resctrl/README | 39 +-
+ tools/testing/selftests/resctrl/cat_test.c | 2 +-
+ tools/testing/selftests/resctrl/fill_buf.c | 4 +-
+ tools/testing/selftests/resctrl/resctrl.h | 5 +-
+ tools/testing/selftests/resctrl/resctrl_tests.c | 49 +-
+ tools/testing/selftests/resctrl/resctrl_val.c | 1 +
+ tools/testing/selftests/resctrl/resctrlfs.c | 2 +-
+ tools/testing/selftests/resctrl/settings | 3 +
+ tools/testing/selftests/sysctl/sysctl.sh | 23 +
+ tools/testing/selftests/vm/pkey-x86.h | 21 +-
+ tools/testing/selftests/x86/amx.c | 24 +-
+ .../testing/selftests/x86/corrupt_xstate_header.c | 16 +-
+ tools/thermal/lib/Build | 3 +
+ tools/thermal/lib/Makefile | 158 +
+ tools/thermal/lib/libthermal_tools.pc.template | 12 +
+ tools/thermal/lib/log.c | 77 +
+ tools/thermal/lib/log.h | 31 +
+ tools/thermal/lib/mainloop.c | 120 +
+ tools/thermal/lib/mainloop.h | 15 +
+ tools/thermal/lib/thermal-tools.h | 10 +
+ tools/thermal/lib/uptimeofday.c | 40 +
+ tools/thermal/lib/uptimeofday.h | 12 +
+ tools/thermal/thermal-engine/Build | 1 +
+ tools/thermal/thermal-engine/Makefile | 28 +
+ tools/thermal/thermal-engine/thermal-engine.c | 341 +
+ tools/thermal/thermometer/Build | 1 +
+ tools/thermal/thermometer/Makefile | 26 +
+ tools/thermal/thermometer/thermometer.8 | 92 +
+ tools/thermal/thermometer/thermometer.c | 572 +
+ tools/thermal/thermometer/thermometer.conf | 5 +
+ 3259 files changed, 210537 insertions(+), 80946 deletions(-)
+ delete mode 100644 Documentation/cdrom/ide-cd.rst
+ create mode 100644 Documentation/core-api/printk-index.rst
+ rename Documentation/{ => core-api}/watch_queue.rst (100%)
+ create mode 100644 Documentation/dev-tools/kunit/api/resource.rst
+ create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mt7622-pcie-mirror.yaml
+ create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mt7622-wed.yaml
+ delete mode 100644 Documentation/devicetree/bindings/devfreq/rk3399_dmc.txt
+ create mode 100644 Documentation/devicetree/bindings/hwmon/microchip,lan966x.yaml
+ create mode 100644 Documentation/devicetree/bindings/hwmon/nuvoton,nct6775.yaml
+ create mode 100644 Documentation/devicetree/bindings/hwmon/ti,tmp401.yaml
+ delete mode 100644 Documentation/devicetree/bindings/media/i2c/dongwoon,dw9807-vcm.txt
+ create mode 100644 Documentation/devicetree/bindings/media/i2c/dongwoon,dw9807-vcm.yaml
+ create mode 100644 Documentation/devicetree/bindings/memory-controllers/rockchip,rk3399-dmc.yaml
+ create mode 100644 Documentation/devicetree/bindings/mmc/marvell,dove-sdhci.yaml
+ create mode 100644 Documentation/devicetree/bindings/mmc/marvell,orion-sdio.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt
+ delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-dove.txt
+ delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-msm.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-msm.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mtd/aspeed-smc.txt
+ delete mode 100644 Documentation/devicetree/bindings/mtd/elm.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/ti,elm.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/can/ctu,ctucanfd.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/marvell,orion-mdio.yaml
+ delete mode 100644 Documentation/devicetree/bindings/net/marvell-orion-mdio.txt
+ create mode 100644 Documentation/devicetree/bindings/net/mediatek,net.yaml
+ delete mode 100644 Documentation/devicetree/bindings/net/mediatek-net.txt
+ create mode 100644 Documentation/devicetree/bindings/net/mscc,miim.yaml
+ delete mode 100644 Documentation/devicetree/bindings/net/mscc-miim.txt
+ create mode 100644 Documentation/devicetree/bindings/net/sunplus,sp7021-emac.yaml
+ rename Documentation/devicetree/bindings/{staging => }/net/wireless/silabs,wfx.yaml (98%)
+ create mode 100644 Documentation/devicetree/bindings/regulator/richtek,rt5759-regulator.yaml
+ create mode 100644 Documentation/devicetree/bindings/regulator/siliconmitus,sm5703-regulator.yaml
+ create mode 100644 Documentation/devicetree/bindings/reserved-memory/phram.yaml
+ create mode 100644 Documentation/devicetree/bindings/spi/aspeed,ast2600-fmc.yaml
+ create mode 100644 Documentation/devicetree/bindings/spi/mediatek,spi-mtk-snfi.yaml
+ create mode 100644 Documentation/devicetree/bindings/thermal/ti,j72xx-thermal.yaml
+ create mode 100644 Documentation/hwmon/lan966x.rst
+ create mode 100644 Documentation/hwmon/xdpe152c4.rst
+ delete mode 100644 Documentation/ide/ChangeLog.ide-cd.1994-2004
+ delete mode 100644 Documentation/ide/ChangeLog.ide-floppy.1996-2002
+ delete mode 100644 Documentation/ide/ChangeLog.ide-tape.1995-2002
+ delete mode 100644 Documentation/ide/changelogs.rst
+ delete mode 100644 Documentation/ide/ide-tape.rst
+ delete mode 100644 Documentation/ide/ide.rst
+ delete mode 100644 Documentation/ide/index.rst
+ delete mode 100644 Documentation/ide/warm-plug-howto.rst
+ delete mode 100644 Documentation/networking/device_drivers/appletalk/ltpc.rst
+ create mode 100644 Documentation/networking/device_drivers/can/ctu/ctucanfd-driver.rst
+ create mode 100644 Documentation/networking/device_drivers/can/ctu/fsm_txt_buffer_user.svg
+ delete mode 100644 Documentation/networking/device_drivers/ethernet/dec/de4x5.rst
+ create mode 100644 Documentation/networking/device_drivers/ethernet/marvell/octeon_ep.rst
+ delete mode 100644 Documentation/networking/device_drivers/wan/index.rst
+ delete mode 100644 Documentation/networking/device_drivers/wan/z8530book.rst
+ create mode 100644 Documentation/networking/device_drivers/wwan/t7xx.rst
+ create mode 100644 Documentation/networking/devlink/devlink-linecard.rst
+ create mode 100644 Documentation/networking/skbuff.rst
+ create mode 100644 Documentation/translations/zh_CN/dev-tools/gdb-kernel-debugging.rst
+ create mode 100644 Documentation/translations/zh_CN/locking/index.rst
+ create mode 100644 Documentation/translations/zh_CN/locking/spinlocks.rst
+ create mode 100644 Documentation/translations/zh_CN/scheduler/sched-debug.rst
+ create mode 100644 Documentation/translations/zh_CN/scheduler/schedutil.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/frontswap.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/hmm.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/hugetlbfs_reserv.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/hwpoison.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/memory-model.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/mmu_notifier.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/numa.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/overcommit-accounting.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/page_frags.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/page_owner.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/page_table_check.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/remap_file_pages.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/split_page_table_lock.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/z3fold.rst
+ create mode 100644 Documentation/translations/zh_CN/vm/zsmalloc.rst
+ create mode 100644 Documentation/vm/bootmem.rst
+ create mode 100644 Documentation/vm/oom.rst
+ create mode 100644 Documentation/vm/page_allocation.rst
+ create mode 100644 Documentation/vm/page_cache.rst
+ create mode 100644 Documentation/vm/page_reclaim.rst
+ create mode 100644 Documentation/vm/page_tables.rst
+ create mode 100644 Documentation/vm/physical_memory.rst
+ create mode 100644 Documentation/vm/process_addrs.rst
+ create mode 100644 Documentation/vm/shmfs.rst
+ create mode 100644 Documentation/vm/slab.rst
+ create mode 100644 Documentation/vm/swap.rst
+ create mode 100644 Documentation/vm/vmalloc.rst
+ delete mode 100644 Documentation/x86/intel-iommu.rst
+ create mode 100644 Documentation/x86/iommu.rst
+ delete mode 100644 drivers/atm/ambassador.c
+ delete mode 100644 drivers/atm/ambassador.h
+ delete mode 100644 drivers/atm/firestream.c
+ delete mode 100644 drivers/atm/firestream.h
+ delete mode 100644 drivers/atm/horizon.c
+ delete mode 100644 drivers/atm/horizon.h
+ delete mode 100644 drivers/atm/uPD98401.h
+ delete mode 100644 drivers/atm/uPD98402.c
+ delete mode 100644 drivers/atm/uPD98402.h
+ delete mode 100644 drivers/atm/zatm.c
+ delete mode 100644 drivers/atm/zatm.h
+ create mode 100644 drivers/hid/hid-megaworld.c
+ create mode 100644 drivers/hwmon/lan966x-hwmon.c
+ rename drivers/hwmon/{nct6775.c => nct6775-core.c} (66%)
+ create mode 100644 drivers/hwmon/nct6775-i2c.c
+ create mode 100644 drivers/hwmon/nct6775-platform.c
+ create mode 100644 drivers/hwmon/nct6775.h
+ create mode 100644 drivers/hwmon/pmbus/xdpe152c4.c
+ create mode 100644 drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_common.c
+ create mode 100644 drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_common.h
+ create mode 100644 drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_multi_if.c
+ create mode 100644 drivers/media/platform/mediatek/vcodec/vdec/vdec_vp8_req_if.c
+ create mode 100644 drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c
+ delete mode 100644 drivers/mtd/maps/ixp4xx.c
+ rename drivers/mtd/nand/{raw/mtk_ecc.c => ecc-mtk.c} (98%)
+ create mode 100644 drivers/mtd/nand/spi/xtx.c
+ delete mode 100644 drivers/mtd/spi-nor/controllers/aspeed-smc.c
+ create mode 100644 drivers/mtd/spi-nor/debugfs.c
+ delete mode 100644 drivers/net/appletalk/ltpc.c
+ delete mode 100644 drivers/net/appletalk/ltpc.h
+ create mode 100644 drivers/net/can/ctucanfd/Kconfig
+ create mode 100644 drivers/net/can/ctucanfd/Makefile
+ create mode 100644 drivers/net/can/ctucanfd/ctucanfd.h
+ create mode 100644 drivers/net/can/ctucanfd/ctucanfd_base.c
+ create mode 100644 drivers/net/can/ctucanfd/ctucanfd_kframe.h
+ create mode 100644 drivers/net/can/ctucanfd/ctucanfd_kregs.h
+ create mode 100644 drivers/net/can/ctucanfd/ctucanfd_pci.c
+ create mode 100644 drivers/net/can/ctucanfd/ctucanfd_platform.c
+ delete mode 100644 drivers/net/can/led.c
+ delete mode 100644 drivers/net/ethernet/amd/ni65.c
+ delete mode 100644 drivers/net/ethernet/amd/ni65.h
+ delete mode 100644 drivers/net/ethernet/dec/tulip/de4x5.c
+ delete mode 100644 drivers/net/ethernet/dec/tulip/de4x5.h
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep/Kconfig
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep/Makefile
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_config.h
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.c
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.h
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_ethtool.c
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_main.c
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_main.h
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_rx.c
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_rx.h
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_tx.c
+ create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_tx.h
+ create mode 100644 drivers/net/ethernet/mediatek/mtk_wed.c
+ create mode 100644 drivers/net/ethernet/mediatek/mtk_wed.h
+ create mode 100644 drivers/net/ethernet/mediatek/mtk_wed_debugfs.c
+ create mode 100644 drivers/net/ethernet/mediatek/mtk_wed_ops.c
+ create mode 100644 drivers/net/ethernet/mediatek/mtk_wed_regs.h
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/accel.h
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/ipsec.c
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/ipsec.h
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/ipsec_offload.c
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/ipsec_offload.h
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/tls.c
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/tls.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c
+ rename drivers/net/ethernet/mellanox/mlx5/core/en_accel/{tls_stats.c => ktls_stats.c} (63%)
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.c
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.h
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.c
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.h
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.c
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.h
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c
+ delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lag/debugfs.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/core_linecards.c
+ create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c
+ delete mode 100644 drivers/net/ethernet/qlogic/qed/qed_nvmetcp_ip_services.c
+ create mode 100644 drivers/net/ethernet/sfc/ef100_sriov.c
+ create mode 100644 drivers/net/ethernet/sfc/ef100_sriov.h
+ create mode 100644 drivers/net/ethernet/sfc/siena/Kconfig
+ create mode 100644 drivers/net/ethernet/sfc/siena/Makefile
+ create mode 100644 drivers/net/ethernet/sfc/siena/bitfield.h
+ create mode 100644 drivers/net/ethernet/sfc/siena/efx.c
+ create mode 100644 drivers/net/ethernet/sfc/siena/efx.h
+ create mode 100644 drivers/net/ethernet/sfc/siena/efx_channels.c
+ create mode 100644 drivers/net/ethernet/sfc/siena/efx_channels.h
+ create mode 100644 drivers/net/ethernet/sfc/siena/efx_common.c
+ create mode 100644 drivers/net/ethernet/sfc/siena/efx_common.h
+ create mode 100644 drivers/net/ethernet/sfc/siena/enum.h
+ create mode 100644 drivers/net/ethernet/sfc/siena/ethtool.c
+ create mode 100644 drivers/net/ethernet/sfc/siena/ethtool_common.c
+ create mode 100644 drivers/net/ethernet/sfc/siena/ethtool_common.h
+ rename drivers/net/ethernet/sfc/{ => siena}/farch.c (97%)
+ create mode 100644 drivers/net/ethernet/sfc/siena/farch_regs.h
+ create mode 100644 drivers/net/ethernet/sfc/siena/filter.h
+ create mode 100644 drivers/net/ethernet/sfc/siena/io.h
+ create mode 100644 drivers/net/ethernet/sfc/siena/mcdi.c
+ create mode 100644 drivers/net/ethernet/sfc/siena/mcdi.h
+ create mode 100644 drivers/net/ethernet/sfc/siena/mcdi_mon.c
+ create mode 100644 drivers/net/ethernet/sfc/siena/mcdi_pcol.h
+ create mode 100644 drivers/net/ethernet/sfc/siena/mcdi_port.c
+ create mode 100644 drivers/net/ethernet/sfc/siena/mcdi_port.h
+ create mode 100644 drivers/net/ethernet/sfc/siena/mcdi_port_common.c
+ create mode 100644 drivers/net/ethernet/sfc/siena/mcdi_port_common.h
+ create mode 100644 drivers/net/ethernet/sfc/siena/mtd.c
+ create mode 100644 drivers/net/ethernet/sfc/siena/net_driver.h
+ create mode 100644 drivers/net/ethernet/sfc/siena/nic.c
+ create mode 100644 drivers/net/ethernet/sfc/siena/nic.h
+ create mode 100644 drivers/net/ethernet/sfc/siena/nic_common.h
+ create mode 100644 drivers/net/ethernet/sfc/siena/ptp.c
+ create mode 100644 drivers/net/ethernet/sfc/siena/ptp.h
+ create mode 100644 drivers/net/ethernet/sfc/siena/rx.c
+ create mode 100644 drivers/net/ethernet/sfc/siena/rx_common.c
+ create mode 100644 drivers/net/ethernet/sfc/siena/rx_common.h
+ create mode 100644 drivers/net/ethernet/sfc/siena/selftest.c
+ create mode 100644 drivers/net/ethernet/sfc/siena/selftest.h
+ rename drivers/net/ethernet/sfc/{ => siena}/siena.c (89%)
+ rename drivers/net/ethernet/sfc/{ => siena}/siena_sriov.c (98%)
+ rename drivers/net/ethernet/sfc/{ => siena}/siena_sriov.h (94%)
+ create mode 100644 drivers/net/ethernet/sfc/siena/sriov.h
+ create mode 100644 drivers/net/ethernet/sfc/siena/tx.c
+ create mode 100644 drivers/net/ethernet/sfc/siena/tx.h
+ create mode 100644 drivers/net/ethernet/sfc/siena/tx_common.c
+ create mode 100644 drivers/net/ethernet/sfc/siena/tx_common.h
+ create mode 100644 drivers/net/ethernet/sfc/siena/vfdi.h
+ create mode 100644 drivers/net/ethernet/sfc/siena/workarounds.h
+ create mode 100644 drivers/net/ethernet/sunplus/Kconfig
+ create mode 100644 drivers/net/ethernet/sunplus/Makefile
+ create mode 100644 drivers/net/ethernet/sunplus/spl2sw_define.h
+ create mode 100644 drivers/net/ethernet/sunplus/spl2sw_desc.c
+ create mode 100644 drivers/net/ethernet/sunplus/spl2sw_desc.h
+ create mode 100644 drivers/net/ethernet/sunplus/spl2sw_driver.c
+ create mode 100644 drivers/net/ethernet/sunplus/spl2sw_int.c
+ create mode 100644 drivers/net/ethernet/sunplus/spl2sw_int.h
+ create mode 100644 drivers/net/ethernet/sunplus/spl2sw_mac.c
+ create mode 100644 drivers/net/ethernet/sunplus/spl2sw_mac.h
+ create mode 100644 drivers/net/ethernet/sunplus/spl2sw_mdio.c
+ create mode 100644 drivers/net/ethernet/sunplus/spl2sw_mdio.h
+ create mode 100644 drivers/net/ethernet/sunplus/spl2sw_phy.c
+ create mode 100644 drivers/net/ethernet/sunplus/spl2sw_phy.h
+ create mode 100644 drivers/net/ethernet/sunplus/spl2sw_register.h
+ delete mode 100644 drivers/net/hamradio/dmascc.c
+ create mode 100644 drivers/net/phy/adin1100.c
+ create mode 100644 drivers/net/phy/dp83td510.c
+ delete mode 100644 drivers/net/wan/cosa.c
+ delete mode 100644 drivers/net/wan/cosa.h
+ delete mode 100644 drivers/net/wan/hostess_sv11.c
+ delete mode 100644 drivers/net/wan/lmc/Makefile
+ delete mode 100644 drivers/net/wan/lmc/lmc.h
+ delete mode 100644 drivers/net/wan/lmc/lmc_debug.c
+ delete mode 100644 drivers/net/wan/lmc/lmc_debug.h
+ delete mode 100644 drivers/net/wan/lmc/lmc_ioctl.h
+ delete mode 100644 drivers/net/wan/lmc/lmc_main.c
+ delete mode 100644 drivers/net/wan/lmc/lmc_media.c
+ delete mode 100644 drivers/net/wan/lmc/lmc_proto.c
+ delete mode 100644 drivers/net/wan/lmc/lmc_proto.h
+ delete mode 100644 drivers/net/wan/lmc/lmc_var.h
+ delete mode 100644 drivers/net/wan/sealevel.c
+ delete mode 100644 drivers/net/wan/z85230.c
+ delete mode 100644 drivers/net/wan/z85230.h
+ create mode 100644 drivers/net/wireless/ath/ath11k/pcic.c
+ create mode 100644 drivers/net/wireless/ath/ath11k/pcic.h
+ create mode 100644 drivers/net/wireless/purelifi/Kconfig
+ create mode 100644 drivers/net/wireless/purelifi/Makefile
+ create mode 100644 drivers/net/wireless/purelifi/plfxlc/Kconfig
+ create mode 100644 drivers/net/wireless/purelifi/plfxlc/Makefile
+ create mode 100644 drivers/net/wireless/purelifi/plfxlc/chip.c
+ create mode 100644 drivers/net/wireless/purelifi/plfxlc/chip.h
+ create mode 100644 drivers/net/wireless/purelifi/plfxlc/firmware.c
+ create mode 100644 drivers/net/wireless/purelifi/plfxlc/intf.h
+ create mode 100644 drivers/net/wireless/purelifi/plfxlc/mac.c
+ create mode 100644 drivers/net/wireless/purelifi/plfxlc/mac.h
+ create mode 100644 drivers/net/wireless/purelifi/plfxlc/usb.c
+ create mode 100644 drivers/net/wireless/purelifi/plfxlc/usb.h
+ create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c
+ create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.h
+ create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852c_rfk_table.c
+ create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852c_rfk_table.h
+ create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852c_table.c
+ create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852c_table.h
+ create mode 100644 drivers/net/wireless/silabs/Kconfig
+ create mode 100644 drivers/net/wireless/silabs/Makefile
+ rename drivers/{staging => net/wireless/silabs}/wfx/Kconfig (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/Makefile (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/bh.c (98%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/bh.h (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/bus.h (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/bus_sdio.c (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/bus_spi.c (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/data_rx.c (93%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/data_rx.h (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/data_tx.c (99%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/data_tx.h (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/debug.c (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/debug.h (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/fwio.c (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/fwio.h (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/hif_api_cmd.h (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/hif_api_general.h (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/hif_api_mib.h (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/hif_rx.c (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/hif_rx.h (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/hif_tx.c (99%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/hif_tx.h (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/hif_tx_mib.c (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/hif_tx_mib.h (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/hwio.c (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/hwio.h (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/key.c (99%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/key.h (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/main.c (98%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/main.h (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/queue.c (98%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/queue.h (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/scan.c (92%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/scan.h (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/sta.c (90%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/sta.h (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/traces.h (100%)
+ rename drivers/{staging => net/wireless/silabs}/wfx/wfx.h (95%)
+ create mode 100644 drivers/net/wwan/t7xx/Makefile
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_cldma.c
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_cldma.h
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_dpmaif.c
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_dpmaif.h
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_hif_cldma.c
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_hif_cldma.h
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_hif_dpmaif.c
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_hif_dpmaif.h
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_hif_dpmaif_rx.c
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_hif_dpmaif_rx.h
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_hif_dpmaif_tx.c
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_hif_dpmaif_tx.h
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_mhccif.c
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_mhccif.h
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_modem_ops.c
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_modem_ops.h
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_netdev.c
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_netdev.h
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_pci.c
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_pci.h
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_pcie_mac.c
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_pcie_mac.h
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_port.h
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_port_ctrl_msg.c
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_port_proxy.c
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_port_proxy.h
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_port_wwan.c
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_reg.h
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_state_monitor.c
+ create mode 100644 drivers/net/wwan/t7xx/t7xx_state_monitor.h
+ create mode 100644 drivers/regulator/rt5759-regulator.c
+ create mode 100644 drivers/regulator/sm5703-regulator.c
+ create mode 100644 drivers/spi/spi-aspeed-smc.c
+ create mode 100644 drivers/spi/spi-mtk-snfi.c
+ delete mode 100644 drivers/staging/wfx/TODO
+ create mode 100644 drivers/thermal/k3_j72xx_bandgap.c
+ create mode 100644 fs/cachefiles/ondemand.c
+ create mode 100644 fs/erofs/fscache.c
+ create mode 100644 fs/ext4/crypto.c
+ create mode 100644 include/kunit/resource.h
+ delete mode 100644 include/linux/can/led.h
+ delete mode 100644 include/linux/mlx5/accel.h
+ rename drivers/mtd/nand/raw/mtk_ecc.h => include/linux/mtd/nand-ecc-mtk.h (100%)
+ rename include/linux/{mmc => platform_data}/sh_mmcif.h (99%)
+ create mode 100644 include/linux/polynomial.h
+ delete mode 100644 include/linux/qed/qed_nvmetcp_ip_services_if.h
+ create mode 100644 include/linux/soc/mediatek/mtk_wed.h
+ create mode 100644 include/net/net_debug.h
+ create mode 100644 include/soc/rockchip/pm_domains.h
+ delete mode 100644 include/uapi/linux/atm_zatm.h
+ create mode 100644 include/uapi/linux/cachefiles.h
+ create mode 100644 kernel/bpf/link_iter.c
+ create mode 100644 lib/kunit/resource.c
+ create mode 100644 lib/polynomial.c
+ create mode 100644 mm/kfence/.kunitconfig
+ delete mode 100644 net/core/datagram.h
+ create mode 100644 net/core/dev.h
+ create mode 100644 net/mptcp/bpf.c
+ create mode 100644 net/mptcp/pm_userspace.c
+ create mode 100644 samples/bpf/xdp_router_ipv4.bpf.c
+ delete mode 100644 samples/bpf/xdp_router_ipv4_kern.c
+ create mode 100644 tools/lib/bpf/usdt.bpf.h
+ create mode 100644 tools/lib/bpf/usdt.c
+ create mode 100644 tools/lib/thermal/.gitignore
+ create mode 100644 tools/lib/thermal/Build
+ create mode 100644 tools/lib/thermal/Makefile
+ create mode 100644 tools/lib/thermal/commands.c
+ create mode 100644 tools/lib/thermal/events.c
+ create mode 100644 tools/lib/thermal/include/thermal.h
+ create mode 100644 tools/lib/thermal/libthermal.map
+ create mode 100644 tools/lib/thermal/libthermal.pc.template
+ create mode 100644 tools/lib/thermal/sampling.c
+ create mode 100644 tools/lib/thermal/thermal.c
+ create mode 100644 tools/lib/thermal/thermal_nl.c
+ create mode 100644 tools/lib/thermal/thermal_nl.h
+ create mode 100644 tools/testing/kunit/configs/all_tests_uml.config
+ delete mode 100644 tools/testing/kunit/test_data/test_is_test_passed-crash.log
+ delete mode 100644 tools/testing/selftests/bpf/bpf_rlimit.h
+ create mode 100644 tools/testing/selftests/bpf/map_tests/map_in_map_batch_ops.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/arg_parsing.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/dynptr.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/log_fixup.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/map_kptr.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/map_lookup_percpu_elem.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/mptcp.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/prog_tests_framework.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/skb_load_bytes.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/test_tunnel.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/unpriv_bpf_disabled.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/uprobe_autoattach.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/usdt.c
+ create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_bpf_link.c
+ create mode 100644 tools/testing/selftests/bpf/progs/btf__core_reloc_size___diff_offs.c
+ create mode 100644 tools/testing/selftests/bpf/progs/dynptr_fail.c
+ create mode 100644 tools/testing/selftests/bpf/progs/dynptr_success.c
+ create mode 100644 tools/testing/selftests/bpf/progs/for_each_map_elem_write_key.c
+ create mode 100644 tools/testing/selftests/bpf/progs/kprobe_multi_empty.c
+ create mode 100644 tools/testing/selftests/bpf/progs/map_kptr.c
+ create mode 100644 tools/testing/selftests/bpf/progs/map_kptr_fail.c
+ create mode 100644 tools/testing/selftests/bpf/progs/mptcp_sock.c
+ create mode 100644 tools/testing/selftests/bpf/progs/skb_load_bytes.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_global_func17.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_log_fixup.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_map_lookup_percpu_elem.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_unpriv_bpf_disabled.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_uprobe_autoattach.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_urandom_usdt.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_usdt.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_usdt_multispec.c
+ create mode 100644 tools/testing/selftests/bpf/sdt-config.h
+ create mode 100644 tools/testing/selftests/bpf/sdt.h
+ create mode 100644 tools/testing/selftests/bpf/urandom_read_aux.c
+ create mode 100644 tools/testing/selftests/bpf/urandom_read_lib1.c
+ create mode 100644 tools/testing/selftests/bpf/urandom_read_lib2.c
+ create mode 100644 tools/testing/selftests/bpf/verifier/map_kptr.c
+ create mode 100644 tools/testing/selftests/cgroup/config
+ create mode 100644 tools/testing/selftests/cgroup/test_cpu.c
+ create mode 120000 tools/testing/selftests/drivers/net/dsa/bridge_locked_port.sh
+ create mode 120000 tools/testing/selftests/drivers/net/dsa/bridge_mdb.sh
+ create mode 120000 tools/testing/selftests/drivers/net/dsa/bridge_mld.sh
+ create mode 120000 tools/testing/selftests/drivers/net/dsa/bridge_vlan_aware.sh
+ create mode 120000 tools/testing/selftests/drivers/net/dsa/bridge_vlan_mcast.sh
+ create mode 120000 tools/testing/selftests/drivers/net/dsa/bridge_vlan_unaware.sh
+ create mode 100644 tools/testing/selftests/drivers/net/dsa/forwarding.config
+ create mode 120000 tools/testing/selftests/drivers/net/dsa/lib.sh
+ create mode 120000 tools/testing/selftests/drivers/net/dsa/local_termination.sh
+ create mode 120000 tools/testing/selftests/drivers/net/dsa/no_forwarding.sh
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/devlink_linecard.sh
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/qos_burst.sh
+ create mode 100755 tools/testing/selftests/drivers/net/ocelot/basic_qos.sh
+ create mode 100755 tools/testing/selftests/drivers/net/ocelot/psfp.sh
+ create mode 100644 tools/testing/selftests/net/bind_bhash_test.c
+ create mode 100755 tools/testing/selftests/net/forwarding/bridge_mdb.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/hw_stats_l3_gre.sh
+ mode change 100644 => 100755 tools/testing/selftests/net/forwarding/lib.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/local_termination.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/no_forwarding.sh
+ create mode 100644 tools/testing/selftests/net/forwarding/tsn_lib.sh
+ create mode 100755 tools/testing/selftests/net/mptcp/userspace_pm.sh
+ create mode 100755 tools/testing/selftests/net/ndisc_unsolicited_na_test.sh
+ create mode 100644 tools/testing/selftests/net/stress_reuseport_listen.c
+ create mode 100755 tools/testing/selftests/net/stress_reuseport_listen.sh
+ create mode 100644 tools/testing/selftests/resctrl/settings
+ create mode 100644 tools/thermal/lib/Build
+ create mode 100644 tools/thermal/lib/Makefile
+ create mode 100644 tools/thermal/lib/libthermal_tools.pc.template
+ create mode 100644 tools/thermal/lib/log.c
+ create mode 100644 tools/thermal/lib/log.h
+ create mode 100644 tools/thermal/lib/mainloop.c
+ create mode 100644 tools/thermal/lib/mainloop.h
+ create mode 100644 tools/thermal/lib/thermal-tools.h
+ create mode 100644 tools/thermal/lib/uptimeofday.c
+ create mode 100644 tools/thermal/lib/uptimeofday.h
+ create mode 100644 tools/thermal/thermal-engine/Build
+ create mode 100644 tools/thermal/thermal-engine/Makefile
+ create mode 100644 tools/thermal/thermal-engine/thermal-engine.c
+ create mode 100644 tools/thermal/thermometer/Build
+ create mode 100644 tools/thermal/thermometer/Makefile
+ create mode 100644 tools/thermal/thermometer/thermometer.8
+ create mode 100644 tools/thermal/thermometer/thermometer.c
+ create mode 100644 tools/thermal/thermometer/thermometer.conf
+Merging fixes/fixes (d06c942efea4 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes
+Already up to date.
+Merging mm-hotfixes/mm-hotfixes-unstable (404a14ec8f65 hugetlb: fix huge_pmd_unshare address update)
+$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable
+Merge made by the 'ort' strategy.
+ mm/cma.c | 4 +++-
+ mm/hugetlb.c | 9 ++++++++-
+ mm/zsmalloc.c | 37 +++++++++++++++++++++++++++++++++----
+ 3 files changed, 44 insertions(+), 6 deletions(-)
+Merging kbuild-current/fixes (312310928417 Linux 5.18-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes
+Already up to date.
+Merging arc-current/for-curr (c6ed4d84a2c4 ARC: remove redundant READ_ONCE() in cmpxchg loop)
+$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr
+Already up to date.
+Merging arm-current/fixes (3cfb30199796 ARM: 9197/1: spectre-bhb: fix loop8 sequence for Thumb2)
+$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes
+Already up to date.
+Merging arm64-fixes/for-next/fixes (1d0cb4c8864a arm64: mte: Ensure the cleared tags are visible before setting the PTE)
+$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes
+Already up to date.
+Merging arm-soc-fixes/arm/fixes (609a097f5f06 Merge tag 'v5.18-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes)
+$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes
+Already up to date.
+Merging drivers-memory-fixes/fixes (73039c6c7f36 memory: renesas-rpc-if: Fix HF/OSPI data transfer in Manual Mode)
+$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes
+Merge made by the 'ort' strategy.
+Merging tee-fixes/fixes (98268f2a2a9f Merge branch 'optee_ffa_probe_fix_for_v5.18' into fixes)
+$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes
+Merge made by the 'ort' strategy.
+Merging m68k-current/for-linus (30b5e6ef4a32 m68k: atari: Make Atari ROM port I/O write macros return void)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus
+Already up to date.
+Merging powerpc-fixes/fixes (ee8348496c77 KVM: PPC: Book3S PR: Enable MSR_DR for switch_mmu_context())
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes
+Already up to date.
+Merging s390-fixes/fixes (a06afe838308 KVM: s390: vsie/gmap: reduce gmap_rmap overhead)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes
+Already up to date.
+Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master
+Already up to date.
+Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX)
+$ git merge -m Merge branch 'for-stable' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt-current/for-stable
+Already up to date.
+Merging net/master (7e062cda7d90 Merge tag 'net-next-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master
+Already up to date.
+Merging bpf/master (7e062cda7d90 Merge tag 'net-next-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master
+Already up to date.
+Merging ipsec/master (015c44d7bff3 net: af_key: check encryption module availability consistency)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master
+Already up to date.
+Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master
+Already up to date.
+Merging ipvs/master (05ae2fba821c netfilter: nft_socket: make cgroup match work in input too)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master
+Already up to date.
+Merging wireless/main (a36e07dfe6ee rfkill: uapi: fix RFKILL_IOCTL_MAX_SIZE ioctl request definition)
+$ git merge -m Merge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/main
+Already up to date.
+Merging rdma-fixes/for-rc (c5eb0a61238d Linux 5.18-rc6)
+$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc
+Already up to date.
+Merging sound-current/for-linus (0125de38122f ALSA: usb-audio: Cancel pending work at closing a MIDI substream)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus
+Auto-merging MAINTAINERS
+Auto-merging drivers/dma/imx-sdma.c
+Auto-merging drivers/spi/spi-imx.c
+Auto-merging drivers/tty/serial/imx.c
+Merge made by the 'ort' strategy.
+ .../bindings/dsp/mediatek,mt8195-dsp.yaml | 105 ++
+ .../devicetree/bindings/sound/adi,max98396.yaml | 79 +
+ .../devicetree/bindings/sound/cirrus,cs35l41.yaml | 44 +-
+ .../devicetree/bindings/sound/cirrus,cs35l45.yaml | 75 +
+ .../devicetree/bindings/sound/fsl,micfil.txt | 1 +
+ .../devicetree/bindings/sound/maxim,max98390.yaml | 5 +
+ .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 32 +
+ .../sound/mt8195-mt6359-rt1011-rt5682.yaml | 51 -
+ ...t6359-rt1019-rt5682.yaml => mt8195-mt6359.yaml} | 9 +-
+ .../bindings/sound/nvidia,tegra186-asrc.yaml | 81 +
+ .../bindings/sound/nvidia,tegra210-ahub.yaml | 4 +
+ .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 17 +-
+ .../bindings/sound/qcom,lpass-rx-macro.yaml | 17 +-
+ .../bindings/sound/qcom,lpass-tx-macro.yaml | 17 +-
+ .../bindings/sound/qcom,lpass-va-macro.yaml | 11 +-
+ .../devicetree/bindings/sound/qcom,wcd938x.yaml | 3 +
+ .../devicetree/bindings/sound/realtek,rt1015p.yaml | 3 +
+ Documentation/devicetree/bindings/sound/rt5682.txt | 2 +
+ .../devicetree/bindings/sound/serial-midi.yaml | 51 +
+ .../bindings/sound/{tas2764.yaml => tas27xx.yaml} | 17 +-
+ .../devicetree/bindings/sound/wlf,wm8731.yaml | 97 ++
+ .../devicetree/bindings/sound/wlf,wm8940.yaml | 57 +
+ Documentation/devicetree/bindings/sound/wm8731.txt | 27 -
+ Documentation/sound/alsa-configuration.rst | 4 +-
+ MAINTAINERS | 2 +
+ arch/arm/configs/multi_v5_defconfig | 3 +-
+ drivers/dma/imx-dma.c | 2 +-
+ drivers/dma/imx-sdma.c | 76 +-
+ drivers/firewire/core-card.c | 39 +
+ drivers/firewire/core-cdev.c | 6 +-
+ drivers/firewire/core-transaction.c | 18 +
+ drivers/firmware/Kconfig | 9 +
+ drivers/firmware/Makefile | 1 +
+ drivers/firmware/mtk-adsp-ipc.c | 157 ++
+ drivers/mmc/host/mxcmmc.c | 2 +-
+ drivers/spi/spi-fsl-lpspi.c | 2 +-
+ drivers/spi/spi-imx.c | 2 +-
+ drivers/staging/greybus/audio_codec.c | 12 +-
+ drivers/tty/serial/imx.c | 2 +-
+ drivers/video/fbdev/mx3fb.c | 2 +-
+ include/dt-bindings/sound/cs35l45.h | 20 +
+ .../{platform_data/dma-imx.h => dma/imx-dma.h} | 26 +-
+ include/linux/firewire.h | 3 +
+ include/linux/firmware/cirrus/cs_dsp.h | 28 +-
+ include/linux/firmware/mediatek/mtk-adsp-ipc.h | 65 +
+ include/sound/cs35l41.h | 137 +-
+ include/sound/cs42l42.h | 810 ++++++++++
+ include/sound/hda_codec.h | 3 +
+ include/sound/intel-dsp-config.h | 3 +-
+ include/sound/intel-nhlt.h | 6 +-
+ include/sound/jack.h | 1 +
+ include/sound/soc-acpi.h | 2 +
+ include/sound/soc-card.h | 7 +-
+ include/sound/soc-component.h | 9 +
+ include/sound/soc-dpcm.h | 2 +
+ include/sound/soc.h | 27 +-
+ include/sound/sof.h | 23 +-
+ include/sound/sof/ext_manifest4.h | 119 ++
+ include/sound/sof/ipc4/header.h | 460 ++++++
+ include/sound/sof/stream.h | 3 +-
+ include/uapi/sound/intel/avs/tokens.h | 126 ++
+ include/uapi/sound/sof/abi.h | 4 +-
+ sound/core/jack.c | 34 +-
+ sound/core/pcm_memory.c | 3 +-
+ sound/core/seq/seq_ports.c | 2 +-
+ sound/drivers/Kconfig | 18 +
+ sound/drivers/Makefile | 2 +
+ sound/drivers/serial-generic.c | 374 +++++
+ sound/pci/cs5535audio/cs5535audio_pcm.c | 2 +-
+ sound/pci/ctxfi/ctatc.c | 2 +
+ sound/pci/ctxfi/cthardware.h | 3 +-
+ sound/pci/ctxfi/cthw20k1.c | 2 +-
+ sound/pci/echoaudio/midi.c | 1 -
+ sound/pci/emu10k1/emu10k1_main.c | 5 +-
+ sound/pci/hda/Kconfig | 2 +
+ sound/pci/hda/cs35l41_hda.c | 438 +++---
+ sound/pci/hda/cs35l41_hda.h | 31 +-
+ sound/pci/hda/cs35l41_hda_spi.c | 2 +-
+ sound/pci/hda/hda_codec.c | 11 +-
+ sound/pci/hda/hda_component.h | 2 -
+ sound/pci/hda/hda_tegra.c | 2 +
+ sound/pci/hda/patch_conexant.c | 1 +
+ sound/pci/hda/patch_cs8409-tables.c | 346 +++--
+ sound/pci/hda/patch_cs8409.c | 361 +++--
+ sound/pci/hda/patch_cs8409.h | 14 +-
+ sound/pci/hda/patch_realtek.c | 64 +-
+ sound/pci/lola/lola_pcm.c | 3 +-
+ sound/pci/rme9652/hdsp.c | 2 +-
+ sound/soc/Kconfig | 9 +-
+ sound/soc/Makefile | 5 +
+ sound/soc/amd/acp-da7219-max98357a.c | 4 +-
+ sound/soc/amd/acp-rt5645.c | 2 +-
+ sound/soc/amd/acp/Kconfig | 6 +-
+ sound/soc/amd/acp/acp-legacy-mach.c | 22 +-
+ sound/soc/amd/acp/acp-mach-common.c | 29 +-
+ sound/soc/amd/acp/acp-mach.h | 9 +-
+ sound/soc/amd/acp/acp-sof-mach.c | 22 +-
+ sound/soc/amd/acp3x-rt5682-max9836.c | 2 +-
+ sound/soc/amd/vangogh/acp5x-mach.c | 10 +-
+ sound/soc/amd/yc/acp6x-mach.c | 42 +-
+ sound/soc/amd/yc/pci-acp6x.c | 9 +-
+ sound/soc/atmel/Kconfig | 4 +-
+ sound/soc/atmel/atmel-classd.c | 1 -
+ sound/soc/atmel/atmel-pdmic.c | 1 -
+ sound/soc/atmel/sam9g20_wm8731.c | 16 +-
+ sound/soc/au1x/Kconfig | 2 +-
+ sound/soc/codecs/Kconfig | 67 +-
+ sound/soc/codecs/Makefile | 16 +
+ sound/soc/codecs/ad193x-i2c.c | 6 +-
+ sound/soc/codecs/adau1372-i2c.c | 4 +-
+ sound/soc/codecs/adau1372.c | 1 +
+ sound/soc/codecs/adau1373.c | 5 +-
+ sound/soc/codecs/adau1701.c | 5 +-
+ sound/soc/codecs/adau1761-i2c.c | 8 +-
+ sound/soc/codecs/adau1761.c | 86 +-
+ sound/soc/codecs/adau1781-i2c.c | 8 +-
+ sound/soc/codecs/adau17x1.c | 20 +-
+ sound/soc/codecs/adau17x1.h | 1 +
+ sound/soc/codecs/adau1977-i2c.c | 8 +-
+ sound/soc/codecs/adau7118-i2c.c | 5 +-
+ sound/soc/codecs/adav803.c | 5 +-
+ sound/soc/codecs/ak4118.c | 5 +-
+ sound/soc/codecs/ak4535.c | 5 +-
+ sound/soc/codecs/ak4613.c | 377 ++++-
+ sound/soc/codecs/ak4641.c | 5 +-
+ sound/soc/codecs/ak4642.c | 8 +-
+ sound/soc/codecs/ak4671.c | 5 +-
+ sound/soc/codecs/alc5623.c | 24 +-
+ sound/soc/codecs/alc5632.c | 20 +-
+ sound/soc/codecs/cros_ec_codec.c | 7 +-
+ sound/soc/codecs/cs35l32.c | 5 +-
+ sound/soc/codecs/cs35l33.c | 5 +-
+ sound/soc/codecs/cs35l34.c | 5 +-
+ sound/soc/codecs/cs35l35.c | 5 +-
+ sound/soc/codecs/cs35l36.c | 7 +-
+ sound/soc/codecs/cs35l41-i2c.c | 9 +-
+ sound/soc/codecs/cs35l41-lib.c | 319 +++-
+ sound/soc/codecs/cs35l41-spi.c | 4 +-
+ sound/soc/codecs/cs35l41.c | 285 ++--
+ sound/soc/codecs/cs35l41.h | 23 +-
+ sound/soc/codecs/cs35l45-i2c.c | 74 +
+ sound/soc/codecs/cs35l45-spi.c | 74 +
+ sound/soc/codecs/cs35l45-tables.c | 202 +++
+ sound/soc/codecs/cs35l45.c | 690 +++++++++
+ sound/soc/codecs/cs35l45.h | 217 +++
+ sound/soc/codecs/cs4234.c | 5 +-
+ sound/soc/codecs/cs4265.c | 5 +-
+ sound/soc/codecs/cs4270.c | 20 +-
+ sound/soc/codecs/cs4271-i2c.c | 5 +-
+ sound/soc/codecs/cs42l42.c | 5 +-
+ sound/soc/codecs/cs42l42.h | 826 +---------
+ sound/soc/codecs/cs42l51-i2c.c | 5 +-
+ sound/soc/codecs/cs42l51.c | 7 +-
+ sound/soc/codecs/cs42l52.c | 5 +-
+ sound/soc/codecs/cs42l56.c | 7 +-
+ sound/soc/codecs/cs42l73.c | 5 +-
+ sound/soc/codecs/cs42xx8-i2c.c | 5 +-
+ sound/soc/codecs/cs43130.c | 23 +-
+ sound/soc/codecs/cs43130.h | 151 +-
+ sound/soc/codecs/cs4341.c | 5 +-
+ sound/soc/codecs/cs4349.c | 14 +-
+ sound/soc/codecs/cs53l30.c | 5 +-
+ sound/soc/codecs/cx2072x.c | 6 +-
+ sound/soc/codecs/da7210.c | 5 +-
+ sound/soc/codecs/da7213.c | 5 +-
+ sound/soc/codecs/da7218.c | 19 +-
+ sound/soc/codecs/da7219.c | 5 +-
+ sound/soc/codecs/da732x.c | 5 +-
+ sound/soc/codecs/da9055.c | 5 +-
+ sound/soc/codecs/dmic.c | 5 +-
+ sound/soc/codecs/es8316.c | 5 +-
+ sound/soc/codecs/es8328-i2c.c | 5 +-
+ sound/soc/codecs/hdac_hda.c | 15 +-
+ sound/soc/codecs/hdmi-codec.c | 15 +-
+ sound/soc/codecs/isabelle.c | 5 +-
+ sound/soc/codecs/lm4857.c | 5 +-
+ sound/soc/codecs/lm49453.c | 5 +-
+ sound/soc/codecs/lochnagar-sc.c | 5 +-
+ sound/soc/codecs/lpass-macro-common.c | 35 +-
+ sound/soc/codecs/max9768.c | 5 +-
+ sound/soc/codecs/max98088.c | 21 +-
+ sound/soc/codecs/max98090.c | 33 +-
+ sound/soc/codecs/max98095.c | 19 +-
+ sound/soc/codecs/max98371.c | 5 +-
+ sound/soc/codecs/max98373-i2c.c | 5 +-
+ sound/soc/codecs/max98390.c | 17 +-
+ sound/soc/codecs/max98396.c | 1637 ++++++++++++++++++++
+ sound/soc/codecs/max98396.h | 305 ++++
+ sound/soc/codecs/max9850.c | 5 +-
+ sound/soc/codecs/max98504.c | 6 +-
+ sound/soc/codecs/max98520.c | 4 +-
+ sound/soc/codecs/max9867.c | 5 +-
+ sound/soc/codecs/max9877.c | 5 +-
+ sound/soc/codecs/max98925.c | 5 +-
+ sound/soc/codecs/max98926.c | 5 +-
+ sound/soc/codecs/max98927.c | 5 +-
+ sound/soc/codecs/ml26124.c | 5 +-
+ sound/soc/codecs/mt6351.c | 10 +-
+ sound/soc/codecs/mt6358.c | 10 +-
+ sound/soc/codecs/mt6359.c | 10 +-
+ sound/soc/codecs/mt6660.c | 6 +-
+ sound/soc/codecs/nau8540.c | 5 +-
+ sound/soc/codecs/nau8810.c | 5 +-
+ sound/soc/codecs/nau8821.c | 5 +-
+ sound/soc/codecs/nau8822.c | 5 +-
+ sound/soc/codecs/nau8824.c | 5 +-
+ sound/soc/codecs/nau8825.c | 5 +-
+ sound/soc/codecs/pcm1681.c | 5 +-
+ sound/soc/codecs/pcm1789-i2c.c | 9 +-
+ sound/soc/codecs/pcm1789.c | 4 +-
+ sound/soc/codecs/pcm1789.h | 2 +-
+ sound/soc/codecs/pcm179x-i2c.c | 5 +-
+ sound/soc/codecs/pcm186x-i2c.c | 24 +-
+ sound/soc/codecs/pcm186x.c | 7 +-
+ sound/soc/codecs/pcm3060-i2c.c | 5 +-
+ sound/soc/codecs/pcm3060.c | 1 +
+ sound/soc/codecs/pcm3168a-i2c.c | 5 +-
+ sound/soc/codecs/pcm512x-i2c.c | 5 +-
+ sound/soc/codecs/rk3328_codec.c | 2 +-
+ sound/soc/codecs/rt1011.c | 5 +-
+ sound/soc/codecs/rt1015.c | 5 +-
+ sound/soc/codecs/rt1016.c | 5 +-
+ sound/soc/codecs/rt1019.c | 8 +-
+ sound/soc/codecs/rt1305.c | 5 +-
+ sound/soc/codecs/rt1308-sdw.c | 1 +
+ sound/soc/codecs/rt1308-sdw.h | 1 +
+ sound/soc/codecs/rt1308.c | 5 +-
+ sound/soc/codecs/rt1316-sdw.c | 1 +
+ sound/soc/codecs/rt274.c | 5 +-
+ sound/soc/codecs/rt286.c | 5 +-
+ sound/soc/codecs/rt298.c | 5 +-
+ sound/soc/codecs/rt5514.c | 7 +-
+ sound/soc/codecs/rt5616.c | 5 +-
+ sound/soc/codecs/rt5631.c | 5 +-
+ sound/soc/codecs/rt5640.c | 5 +-
+ sound/soc/codecs/rt5645.c | 16 +-
+ sound/soc/codecs/rt5651.c | 5 +-
+ sound/soc/codecs/rt5659.c | 5 +-
+ sound/soc/codecs/rt5660.c | 5 +-
+ sound/soc/codecs/rt5663.c | 5 +-
+ sound/soc/codecs/rt5665.c | 5 +-
+ sound/soc/codecs/rt5668.c | 5 +-
+ sound/soc/codecs/rt5670.c | 5 +-
+ sound/soc/codecs/rt5682-i2c.c | 5 +-
+ sound/soc/codecs/rt5682s.c | 32 +-
+ sound/soc/codecs/rt5682s.h | 6 +-
+ sound/soc/codecs/rt700.c | 1 +
+ sound/soc/codecs/rt711-sdca.c | 1 +
+ sound/soc/codecs/rt711.c | 1 +
+ sound/soc/codecs/rt715-sdca-sdw.c | 2 -
+ sound/soc/codecs/rt715-sdca.c | 1 +
+ sound/soc/codecs/rt715.c | 1 +
+ sound/soc/codecs/rt9120.c | 114 +-
+ sound/soc/codecs/sdw-mockup.c | 1 +
+ sound/soc/codecs/sgtl5000.c | 5 +-
+ sound/soc/codecs/ssm2518.c | 5 +-
+ sound/soc/codecs/ssm2602-i2c.c | 8 +-
+ sound/soc/codecs/ssm4567.c | 5 +-
+ sound/soc/codecs/sta32x.c | 14 +-
+ sound/soc/codecs/sta350.c | 14 +-
+ sound/soc/codecs/sta529.c | 5 +-
+ sound/soc/codecs/tas2552.c | 5 +-
+ sound/soc/codecs/tas2562.c | 25 +-
+ sound/soc/codecs/tas2764.c | 5 +-
+ sound/soc/codecs/tas2770.c | 5 +-
+ sound/soc/codecs/tas5086.c | 5 +-
+ sound/soc/codecs/tas571x.c | 17 +-
+ sound/soc/codecs/tas5720.c | 21 +-
+ sound/soc/codecs/tas6424.c | 17 +-
+ sound/soc/codecs/tda7419.c | 5 +-
+ sound/soc/codecs/tlv320adc3xxx.c | 32 +-
+ sound/soc/codecs/tlv320adcx140.c | 16 +-
+ sound/soc/codecs/tlv320aic23-i2c.c | 5 +-
+ sound/soc/codecs/tlv320aic31xx.c | 32 +-
+ sound/soc/codecs/tlv320aic32x4-i2c.c | 11 +-
+ sound/soc/codecs/tlv320aic3x-i2c.c | 25 +-
+ sound/soc/codecs/tlv320dac33.c | 5 +-
+ sound/soc/codecs/tpa6130a2.c | 21 +-
+ sound/soc/codecs/ts3a227e.c | 5 +-
+ sound/soc/codecs/tscs42xx.c | 5 +-
+ sound/soc/codecs/tscs454.c | 17 +-
+ sound/soc/codecs/uda1380.c | 5 +-
+ sound/soc/codecs/wcd9335.c | 1 +
+ sound/soc/codecs/wcd934x.c | 1 +
+ sound/soc/codecs/wcd938x.c | 1 +
+ sound/soc/codecs/wm1250-ev1.c | 5 +-
+ sound/soc/codecs/wm2000.c | 12 +-
+ sound/soc/codecs/wm2200.c | 5 +-
+ sound/soc/codecs/wm5100.c | 5 +-
+ sound/soc/codecs/wm8510.c | 5 +-
+ sound/soc/codecs/wm8523.c | 5 +-
+ sound/soc/codecs/wm8580.c | 5 +-
+ sound/soc/codecs/wm8711.c | 5 +-
+ sound/soc/codecs/wm8728.c | 5 +-
+ sound/soc/codecs/wm8731-i2c.c | 68 +
+ sound/soc/codecs/wm8731-spi.c | 59 +
+ sound/soc/codecs/wm8731.c | 267 +---
+ sound/soc/codecs/wm8731.h | 27 +
+ sound/soc/codecs/wm8737.c | 5 +-
+ sound/soc/codecs/wm8741.c | 5 +-
+ sound/soc/codecs/wm8750.c | 5 +-
+ sound/soc/codecs/wm8753.c | 5 +-
+ sound/soc/codecs/wm8776.c | 5 +-
+ sound/soc/codecs/wm8804-i2c.c | 5 +-
+ sound/soc/codecs/wm8900.c | 5 +-
+ sound/soc/codecs/wm8903.c | 7 +-
+ sound/soc/codecs/wm8904.c | 9 +-
+ sound/soc/codecs/wm8940.c | 12 +-
+ sound/soc/codecs/wm8955.c | 5 +-
+ sound/soc/codecs/wm8960.c | 20 +-
+ sound/soc/codecs/wm8961.c | 5 +-
+ sound/soc/codecs/wm8962.c | 11 +-
+ sound/soc/codecs/wm8971.c | 5 +-
+ sound/soc/codecs/wm8974.c | 5 +-
+ sound/soc/codecs/wm8978.c | 5 +-
+ sound/soc/codecs/wm8983.c | 5 +-
+ sound/soc/codecs/wm8985.c | 8 +-
+ sound/soc/codecs/wm8988.c | 5 +-
+ sound/soc/codecs/wm8990.c | 5 +-
+ sound/soc/codecs/wm8991.c | 5 +-
+ sound/soc/codecs/wm8993.c | 5 +-
+ sound/soc/codecs/wm8995.c | 5 +-
+ sound/soc/codecs/wm8996.c | 5 +-
+ sound/soc/codecs/wm9081.c | 5 +-
+ sound/soc/codecs/wm9090.c | 6 +-
+ sound/soc/codecs/wm_adsp.c | 10 +-
+ sound/soc/codecs/wsa881x.c | 1 +
+ sound/soc/fsl/fsl_asrc.c | 8 +-
+ sound/soc/fsl/fsl_asrc_dma.c | 2 +-
+ sound/soc/fsl/fsl_easrc.h | 2 +-
+ sound/soc/fsl/fsl_esai.c | 6 +-
+ sound/soc/fsl/fsl_micfil.c | 382 ++---
+ sound/soc/fsl/fsl_micfil.h | 269 +---
+ sound/soc/fsl/fsl_sai.c | 43 +-
+ sound/soc/fsl/fsl_sai.h | 1 +
+ sound/soc/fsl/fsl_ssi.c | 34 +-
+ sound/soc/fsl/imx-es8328.c | 2 +-
+ sound/soc/fsl/imx-hdmi.c | 9 +-
+ sound/soc/fsl/imx-pcm.h | 2 +-
+ sound/soc/fsl/imx-sgtl5000.c | 14 +-
+ sound/soc/fsl/imx-ssi.h | 2 +-
+ sound/soc/generic/audio-graph-card2.c | 7 +-
+ sound/soc/generic/simple-card-utils.c | 5 +-
+ sound/soc/img/img-i2s-in.c | 6 +-
+ sound/soc/img/img-parallel-out.c | 6 +-
+ sound/soc/img/img-spdif-in.c | 6 +-
+ sound/soc/img/img-spdif-out.c | 6 +-
+ sound/soc/intel/Kconfig | 9 +-
+ sound/soc/intel/atom/sst/sst.c | 1 -
+ sound/soc/intel/atom/sst/sst_drv_interface.c | 15 +-
+ sound/soc/intel/avs/Makefile | 8 +-
+ sound/soc/intel/avs/apl.c | 250 +++
+ sound/soc/intel/avs/avs.h | 102 ++
+ sound/soc/intel/avs/board_selection.c | 501 ++++++
+ sound/soc/intel/avs/core.c | 631 ++++++++
+ sound/soc/intel/avs/dsp.c | 27 +-
+ sound/soc/intel/avs/ipc.c | 253 ++-
+ sound/soc/intel/avs/loader.c | 84 +
+ sound/soc/intel/avs/messages.c | 35 +-
+ sound/soc/intel/avs/messages.h | 51 +
+ sound/soc/intel/avs/path.c | 1005 ++++++++++++
+ sound/soc/intel/avs/path.h | 72 +
+ sound/soc/intel/avs/pcm.c | 1182 ++++++++++++++
+ sound/soc/intel/avs/registers.h | 8 +
+ sound/soc/intel/avs/skl.c | 125 ++
+ sound/soc/intel/avs/topology.c | 1598 +++++++++++++++++++
+ sound/soc/intel/avs/topology.h | 194 +++
+ sound/soc/intel/avs/trace.c | 33 +
+ sound/soc/intel/avs/trace.h | 154 ++
+ sound/soc/intel/avs/utils.c | 23 +
+ sound/soc/intel/boards/bdw-rt5650.c | 6 +-
+ sound/soc/intel/boards/bdw-rt5677.c | 4 +-
+ sound/soc/intel/boards/broadwell.c | 2 +-
+ sound/soc/intel/boards/bxt_da7219_max98357a.c | 5 +-
+ sound/soc/intel/boards/bxt_rt298.c | 5 +-
+ sound/soc/intel/boards/bytcht_cx2072x.c | 10 +-
+ sound/soc/intel/boards/bytcht_es8316.c | 8 +-
+ sound/soc/intel/boards/bytcr_rt5640.c | 36 +-
+ sound/soc/intel/boards/bytcr_rt5651.c | 7 +-
+ sound/soc/intel/boards/bytcr_wm5102.c | 6 +-
+ sound/soc/intel/boards/cht_bsw_max98090_ti.c | 28 +-
+ sound/soc/intel/boards/cht_bsw_nau8824.c | 4 +-
+ sound/soc/intel/boards/cht_bsw_rt5645.c | 6 +-
+ sound/soc/intel/boards/cht_bsw_rt5672.c | 12 +-
+ sound/soc/intel/boards/cml_rt1011_rt5682.c | 5 +-
+ sound/soc/intel/boards/glk_rt5682_max98357a.c | 5 +-
+ sound/soc/intel/boards/kbl_da7219_max98357a.c | 5 +-
+ sound/soc/intel/boards/kbl_da7219_max98927.c | 5 +-
+ sound/soc/intel/boards/kbl_rt5660.c | 15 +-
+ sound/soc/intel/boards/kbl_rt5663_max98927.c | 7 +-
+ .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 7 +-
+ sound/soc/intel/boards/skl_hda_dsp_common.c | 8 +-
+ sound/soc/intel/boards/skl_nau88l25_max98357a.c | 6 +-
+ sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 6 +-
+ sound/soc/intel/boards/skl_rt286.c | 5 +-
+ sound/soc/intel/boards/sof_cs42l42.c | 5 +-
+ sound/soc/intel/boards/sof_da7219_max98373.c | 2 +-
+ sound/soc/intel/boards/sof_es8336.c | 8 +-
+ sound/soc/intel/boards/sof_nau8825.c | 2 +-
+ sound/soc/intel/boards/sof_realtek_common.c | 39 +
+ sound/soc/intel/boards/sof_realtek_common.h | 5 +
+ sound/soc/intel/boards/sof_rt5682.c | 18 +-
+ sound/soc/intel/boards/sof_sdw_rt5682.c | 14 +-
+ sound/soc/intel/boards/sof_sdw_rt700.c | 14 +-
+ sound/soc/intel/boards/sof_sdw_rt711.c | 14 +-
+ sound/soc/intel/boards/sof_sdw_rt711_sdca.c | 14 +-
+ sound/soc/intel/boards/sof_ssp_amp.c | 25 +-
+ sound/soc/intel/catpt/messages.h | 4 +-
+ sound/soc/intel/common/soc-acpi-intel-adl-match.c | 7 +
+ sound/soc/mediatek/Kconfig | 27 +-
+ sound/soc/mediatek/mt2701/mt2701-wm8960.c | 9 +-
+ sound/soc/mediatek/mt8173/mt8173-max98090.c | 13 +-
+ sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 2 +-
+ sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 2 +-
+ sound/soc/mediatek/mt8173/mt8173-rt5650.c | 4 +-
+ sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 5 +-
+ .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 5 +-
+ .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 203 ++-
+ sound/soc/mediatek/mt8195/Makefile | 3 +-
+ sound/soc/mediatek/mt8195/mt8195-dai-pcm.c | 8 +-
+ .../mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c | 1198 --------------
+ ...8195-mt6359-rt1019-rt5682.c => mt8195-mt6359.c} | 871 +++++++----
+ sound/soc/mxs/mxs-saif.c | 1 +
+ sound/soc/pxa/Kconfig | 4 +-
+ sound/soc/pxa/hx4700.c | 6 +-
+ sound/soc/pxa/palm27x.c | 7 +-
+ sound/soc/pxa/ttc-dkb.c | 14 +-
+ sound/soc/pxa/z2.c | 7 +-
+ sound/soc/qcom/Kconfig | 2 +
+ sound/soc/qcom/apq8016_sbc.c | 2 +-
+ sound/soc/qcom/lpass-platform.c | 2 +-
+ sound/soc/qcom/sc7180.c | 4 +-
+ sound/soc/qcom/sc7280.c | 99 +-
+ sound/soc/qcom/sdm845.c | 2 +-
+ sound/soc/qcom/sm8250.c | 2 +-
+ sound/soc/rockchip/rk3288_hdmi_analog.c | 8 +-
+ sound/soc/rockchip/rk3399_gru_sound.c | 16 +-
+ sound/soc/rockchip/rockchip_max98090.c | 16 +-
+ sound/soc/rockchip/rockchip_rt5645.c | 2 +-
+ sound/soc/samsung/aries_wm8994.c | 6 +-
+ sound/soc/samsung/bells.c | 4 +-
+ sound/soc/samsung/h1940_uda1380.c | 3 +-
+ sound/soc/samsung/littlemill.c | 6 +-
+ sound/soc/samsung/lowland.c | 13 +-
+ sound/soc/samsung/midas_wm1811.c | 2 +-
+ sound/soc/samsung/rx1950_uda1380.c | 3 +-
+ sound/soc/samsung/smartq_wm8987.c | 8 +-
+ sound/soc/samsung/spdif.c | 3 +-
+ sound/soc/samsung/speyside.c | 14 +-
+ sound/soc/samsung/tobermory.c | 12 +-
+ sound/soc/sh/Kconfig | 2 +-
+ sound/soc/sh/rcar/core.c | 17 +-
+ sound/soc/sh/rcar/dma.c | 9 +-
+ sound/soc/sh/rcar/rsnd.h | 2 +-
+ sound/soc/sh/rcar/src.c | 7 +-
+ sound/soc/sh/rcar/ssi.c | 14 +-
+ sound/soc/sh/rcar/ssiu.c | 11 +-
+ sound/soc/sh/rz-ssi.c | 24 +-
+ sound/soc/soc-card.c | 56 +-
+ sound/soc/soc-component.c | 16 +-
+ sound/soc/soc-core.c | 98 +-
+ sound/soc/soc-dapm.c | 2 -
+ sound/soc/soc-generic-dmaengine-pcm.c | 57 +-
+ sound/soc/soc-jack.c | 2 +-
+ sound/soc/soc-pcm.c | 38 +-
+ sound/soc/soc-topology.c | 455 +++---
+ sound/soc/soc-utils-test.c | 186 +++
+ sound/soc/soc-utils.c | 45 +
+ sound/soc/sof/Makefile | 4 +-
+ sound/soc/sof/amd/acp-trace.c | 4 +-
+ sound/soc/sof/amd/acp.c | 66 +-
+ sound/soc/sof/amd/acp.h | 10 +-
+ sound/soc/sof/amd/pci-rn.c | 15 +-
+ sound/soc/sof/amd/renoir.c | 6 +-
+ sound/soc/sof/compress.c | 8 +-
+ sound/soc/sof/control.c | 36 +-
+ sound/soc/sof/core.c | 28 +-
+ sound/soc/sof/debug.c | 9 +-
+ sound/soc/sof/imx/imx8.c | 40 +-
+ sound/soc/sof/imx/imx8m.c | 20 +-
+ sound/soc/sof/intel/Kconfig | 2 +-
+ sound/soc/sof/intel/Makefile | 2 +-
+ sound/soc/sof/intel/apl.c | 143 +-
+ sound/soc/sof/intel/bdw.c | 21 +-
+ sound/soc/sof/intel/byt.c | 56 +-
+ sound/soc/sof/intel/cnl.c | 212 ++-
+ sound/soc/sof/intel/hda-common-ops.c | 106 ++
+ sound/soc/sof/intel/hda-dai.c | 434 ++++--
+ sound/soc/sof/intel/hda-dsp.c | 52 +-
+ sound/soc/sof/intel/hda-ipc.c | 82 +
+ sound/soc/sof/intel/hda-loader.c | 123 +-
+ sound/soc/sof/intel/hda-trace.c | 4 +-
+ sound/soc/sof/intel/hda.c | 40 +-
+ sound/soc/sof/intel/hda.h | 50 +-
+ sound/soc/sof/intel/icl.c | 121 +-
+ sound/soc/sof/intel/pci-apl.c | 36 +-
+ sound/soc/sof/intel/pci-cnl.c | 54 +-
+ sound/soc/sof/intel/pci-icl.c | 36 +-
+ sound/soc/sof/intel/pci-tgl.c | 97 +-
+ sound/soc/sof/intel/pci-tng.c | 27 +-
+ sound/soc/sof/intel/shim.h | 16 +-
+ sound/soc/sof/intel/tgl.c | 160 +-
+ sound/soc/sof/ipc.c | 969 +-----------
+ sound/soc/sof/ipc3-control.c | 155 +-
+ sound/soc/sof/ipc3-dtrace.c | 649 ++++++++
+ sound/soc/sof/ipc3-loader.c | 415 +++++
+ sound/soc/sof/ipc3-ops.h | 21 -
+ sound/soc/sof/ipc3-pcm.c | 10 +-
+ sound/soc/sof/ipc3-priv.h | 65 +
+ sound/soc/sof/ipc3-topology.c | 79 +-
+ sound/soc/sof/ipc3.c | 1040 ++++++++++++-
+ sound/soc/sof/ipc4-loader.c | 210 +++
+ sound/soc/sof/ipc4-priv.h | 44 +
+ sound/soc/sof/ipc4.c | 606 ++++++++
+ sound/soc/sof/loader.c | 698 +--------
+ sound/soc/sof/mediatek/Kconfig | 11 +
+ sound/soc/sof/mediatek/Makefile | 2 +
+ sound/soc/sof/mediatek/adsp_helper.h | 20 +-
+ sound/soc/sof/mediatek/mt8186/Makefile | 4 +
+ sound/soc/sof/mediatek/mt8186/mt8186-clk.c | 101 ++
+ sound/soc/sof/mediatek/mt8186/mt8186-clk.h | 24 +
+ sound/soc/sof/mediatek/mt8186/mt8186-loader.c | 58 +
+ sound/soc/sof/mediatek/mt8186/mt8186.c | 554 +++++++
+ sound/soc/sof/mediatek/mt8186/mt8186.h | 80 +
+ sound/soc/sof/mediatek/mt8195/mt8195.c | 192 ++-
+ sound/soc/sof/mediatek/mtk-adsp-common.c | 84 +
+ sound/soc/sof/mediatek/mtk-adsp-common.h | 10 +
+ sound/soc/sof/ops.c | 2 +-
+ sound/soc/sof/ops.h | 34 +-
+ sound/soc/sof/pcm.c | 30 +-
+ sound/soc/sof/pm.c | 22 +-
+ sound/soc/sof/sof-acpi-dev.c | 6 +-
+ sound/soc/sof/sof-audio.c | 398 +++--
+ sound/soc/sof/sof-audio.h | 80 +-
+ sound/soc/sof/sof-client-ipc-flood-test.c | 3 +-
+ sound/soc/sof/sof-client-ipc-msg-injector.c | 191 ++-
+ sound/soc/sof/sof-client-probes.c | 14 +-
+ sound/soc/sof/sof-client.c | 66 +-
+ sound/soc/sof/sof-client.h | 2 +
+ sound/soc/sof/sof-of-dev.c | 12 +-
+ sound/soc/sof/sof-of-dev.h | 1 +
+ sound/soc/sof/sof-pci-dev.c | 96 +-
+ sound/soc/sof/sof-priv.h | 130 +-
+ sound/soc/sof/topology.c | 79 +-
+ sound/soc/sof/trace.c | 596 +------
+ sound/soc/tegra/Kconfig | 12 +
+ sound/soc/tegra/Makefile | 2 +
+ sound/soc/tegra/tegra186_asrc.c | 1046 +++++++++++++
+ sound/soc/tegra/tegra186_asrc.h | 112 ++
+ sound/soc/tegra/tegra210_ahub.c | 82 +-
+ sound/soc/tegra/tegra_asoc_machine.c | 30 +-
+ sound/soc/tegra/tegra_wm8903.c | 10 +-
+ sound/soc/ti/ams-delta.c | 4 +-
+ sound/soc/ti/davinci-mcasp.c | 2 +
+ sound/soc/ti/j721e-evm.c | 44 +-
+ sound/soc/ti/omap-abe-twl6040.c | 8 +-
+ sound/soc/ti/omap-twl4030.c | 8 +-
+ sound/soc/ti/osk5912.c | 4 +-
+ sound/soc/ti/rx51.c | 2 +-
+ sound/soc/uniphier/aio-compress.c | 7 +-
+ sound/soc/ux500/mop500_ab8500.c | 9 +-
+ sound/usb/card.c | 1 +
+ sound/usb/card.h | 3 +-
+ sound/usb/clock.c | 7 +
+ sound/usb/endpoint.c | 90 +-
+ sound/usb/implicit.c | 10 +-
+ sound/usb/midi.c | 3 +
+ sound/usb/mixer_maps.c | 30 +
+ sound/usb/pcm.c | 17 +-
+ sound/usb/quirks-table.h | 3 +
+ sound/usb/quirks.c | 6 +
+ sound/usb/usbaudio.h | 7 +
+ tools/testing/selftests/alsa/mixer-test.c | 41 +-
+ 573 files changed, 25865 insertions(+), 9278 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dsp/mediatek,mt8195-dsp.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/adi,max98396.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/cirrus,cs35l45.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml
+ rename Documentation/devicetree/bindings/sound/{mt8195-mt6359-rt1019-rt5682.yaml => mt8195-mt6359.yaml} (84%)
+ create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra186-asrc.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/serial-midi.yaml
+ rename Documentation/devicetree/bindings/sound/{tas2764.yaml => tas27xx.yaml} (73%)
+ create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8731.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8940.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/wm8731.txt
+ create mode 100644 drivers/firmware/mtk-adsp-ipc.c
+ create mode 100644 include/dt-bindings/sound/cs35l45.h
+ rename include/linux/{platform_data/dma-imx.h => dma/imx-dma.h} (67%)
+ create mode 100644 include/linux/firmware/mediatek/mtk-adsp-ipc.h
+ create mode 100644 include/sound/cs42l42.h
+ create mode 100644 include/sound/sof/ext_manifest4.h
+ create mode 100644 include/sound/sof/ipc4/header.h
+ create mode 100644 include/uapi/sound/intel/avs/tokens.h
+ create mode 100644 sound/drivers/serial-generic.c
+ create mode 100644 sound/soc/codecs/cs35l45-i2c.c
+ create mode 100644 sound/soc/codecs/cs35l45-spi.c
+ create mode 100644 sound/soc/codecs/cs35l45-tables.c
+ create mode 100644 sound/soc/codecs/cs35l45.c
+ create mode 100644 sound/soc/codecs/cs35l45.h
+ create mode 100644 sound/soc/codecs/max98396.c
+ create mode 100644 sound/soc/codecs/max98396.h
+ create mode 100644 sound/soc/codecs/wm8731-i2c.c
+ create mode 100644 sound/soc/codecs/wm8731-spi.c
+ create mode 100644 sound/soc/intel/avs/apl.c
+ create mode 100644 sound/soc/intel/avs/board_selection.c
+ create mode 100644 sound/soc/intel/avs/path.c
+ create mode 100644 sound/soc/intel/avs/path.h
+ create mode 100644 sound/soc/intel/avs/pcm.c
+ create mode 100644 sound/soc/intel/avs/skl.c
+ create mode 100644 sound/soc/intel/avs/topology.c
+ create mode 100644 sound/soc/intel/avs/topology.h
+ create mode 100644 sound/soc/intel/avs/trace.c
+ create mode 100644 sound/soc/intel/avs/trace.h
+ delete mode 100644 sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c
+ rename sound/soc/mediatek/mt8195/{mt8195-mt6359-rt1019-rt5682.c => mt8195-mt6359.c} (78%)
+ create mode 100644 sound/soc/soc-utils-test.c
+ create mode 100644 sound/soc/sof/intel/hda-common-ops.c
+ create mode 100644 sound/soc/sof/ipc3-dtrace.c
+ create mode 100644 sound/soc/sof/ipc3-loader.c
+ delete mode 100644 sound/soc/sof/ipc3-ops.h
+ create mode 100644 sound/soc/sof/ipc3-priv.h
+ create mode 100644 sound/soc/sof/ipc4-loader.c
+ create mode 100644 sound/soc/sof/ipc4-priv.h
+ create mode 100644 sound/soc/sof/ipc4.c
+ create mode 100644 sound/soc/sof/mediatek/mt8186/Makefile
+ create mode 100644 sound/soc/sof/mediatek/mt8186/mt8186-clk.c
+ create mode 100644 sound/soc/sof/mediatek/mt8186/mt8186-clk.h
+ create mode 100644 sound/soc/sof/mediatek/mt8186/mt8186-loader.c
+ create mode 100644 sound/soc/sof/mediatek/mt8186/mt8186.c
+ create mode 100644 sound/soc/sof/mediatek/mt8186/mt8186.h
+ create mode 100644 sound/soc/sof/mediatek/mtk-adsp-common.c
+ create mode 100644 sound/soc/sof/mediatek/mtk-adsp-common.h
+ create mode 100644 sound/soc/tegra/tegra186_asrc.c
+ create mode 100644 sound/soc/tegra/tegra186_asrc.h
+Merging sound-asoc-fixes/for-linus (69203f3f937d Merge remote-tracking branch 'asoc/for-5.18' into asoc-linus)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus
+Merge made by the 'ort' strategy.
+ sound/soc/amd/acp/acp-pci.c | 1 +
+ sound/soc/codecs/tlv320adc3xxx.c | 3 +++
+ sound/soc/fsl/fsl_micfil.c | 19 +++++++++++++++++++
+ sound/soc/fsl/fsl_sai.h | 4 ++--
+ sound/soc/soc-ops.c | 8 +++++++-
+ sound/soc/soc-pcm.c | 2 --
+ 6 files changed, 32 insertions(+), 5 deletions(-)
+Merging regmap-fixes/for-linus (312310928417 Linux 5.18-rc1)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus
+Already up to date.
+Merging regulator-fixes/for-linus (b11b3d21a94d regulator: qcom_smd: Fix up PM8950 regulator configuration)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus
+Already up to date.
+Merging spi-fixes/for-linus (0cf8d32600cf spi: stm32-qspi: Always check SR_TCF flags in stm32_qspi_wait_cmd())
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus
+Already up to date.
+Merging pci-current/for-linus (4246970a3bcb Revert "PCI: brcmstb: Split brcm_pcie_setup() into two funcs")
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus
+Merge made by the 'ort' strategy.
+ drivers/pci/controller/pcie-brcmstb.c | 257 ++++------------------------------
+ 1 file changed, 30 insertions(+), 227 deletions(-)
+Merging driver-core.current/driver-core-linus (42226c989789 Linux 5.18-rc7)
+$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus
+Already up to date.
+Merging tty.current/tty-linus (42226c989789 Linux 5.18-rc7)
+$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus
+Already up to date.
+Merging usb.current/usb-linus (42226c989789 Linux 5.18-rc7)
+$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus
+Already up to date.
+Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes
+Already up to date.
+Merging usb-serial-fixes/usb-linus (42226c989789 Linux 5.18-rc7)
+$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus
+Already up to date.
+Merging phy/fixes (2c8045d48dee phy: amlogic: fix error path in phy_g12a_usb3_pcie_probe())
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes
+Already up to date.
+Merging staging.current/staging-linus (ce522ba9ef7e Linux 5.18-rc2)
+$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus
+Already up to date.
+Merging iio-fixes/fixes-togreg (b5e1cf77d1a0 iio: adc: aspeed: Fix refcount leak in aspeed_adc_set_trim_data)
+$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg
+Merge made by the 'ort' strategy.
+ drivers/iio/accel/mma8452.c | 12 +++++++-----
+ drivers/iio/adc/aspeed_adc.c | 1 +
+ drivers/iio/adc/axp288_adc.c | 8 ++++++++
+ drivers/iio/adc/rzg2l_adc.c | 8 ++++++--
+ drivers/iio/adc/stm32-adc-core.c | 9 +++++++--
+ drivers/iio/adc/stm32-adc.c | 10 ----------
+ drivers/iio/adc/ti-ads131e08.c | 10 +++++++---
+ drivers/iio/adc/xilinx-ams.c | 2 +-
+ drivers/iio/frequency/admv1014.c | 6 ++++--
+ drivers/iio/gyro/mpu3050-core.c | 1 +
+ drivers/iio/magnetometer/yamaha-yas530.c | 2 +-
+ drivers/iio/trigger/iio-trig-sysfs.c | 1 +
+ 12 files changed, 44 insertions(+), 26 deletions(-)
+Merging counter-fixes/fixes-togreg (ce522ba9ef7e Linux 5.18-rc2)
+$ git merge -m Merge branch 'fixes-togreg' of https://gitlab.com/vilhelmgray/counter.git counter-fixes/fixes-togreg
+Already up to date.
+Merging char-misc.current/char-misc-linus (42226c989789 Linux 5.18-rc7)
+$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus
+Already up to date.
+Merging soundwire-fixes/fixes (312310928417 Linux 5.18-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes
+Already up to date.
+Merging thunderbolt-fixes/fixes (4b0986a3613c Linux 5.18)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes
+Already up to date.
+Merging input-current/for-linus (b26ff9137183 Input: ili210x - use one common reset implementation)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus
+Already up to date.
+Merging crypto-current/master (16287397ec5c crypto: qcom-rng - fix infinite loop on requests not multiple of WORD_SZ)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master
+Already up to date.
+Merging vfio-fixes/for-linus (1ef3342a934e vfio/pci: Fix vf_token mechanism when device-specific VF drivers are used)
+$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus
+Already up to date.
+Merging kselftest-fixes/fixes (e8f0c8965932 selftest/vm: add skip support to mremap_test)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes
+Merge made by the 'ort' strategy.
+Merging modules-fixes/modules-linus (7390b94a3c2d module: merge check_exported_symbol() into find_exported_symbol_in_section())
+$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus
+Auto-merging MAINTAINERS
+Auto-merging arch/Kconfig
+Auto-merging init/Kconfig
+Auto-merging kernel/Makefile
+Auto-merging kernel/debug/kdb/kdb_main.c
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 4 +-
+ arch/Kconfig | 6 +
+ arch/powerpc/Kconfig | 1 +
+ include/linux/kdb.h | 1 +
+ include/linux/module.h | 32 +-
+ init/Kconfig | 11 +
+ kernel/Makefile | 5 +-
+ kernel/debug/kdb/kdb_io.c | 1 -
+ kernel/debug/kdb/kdb_keyboard.c | 1 -
+ kernel/debug/kdb/kdb_main.c | 49 -
+ kernel/debug/kdb/kdb_private.h | 4 -
+ kernel/debug/kdb/kdb_support.c | 1 -
+ kernel/module-internal.h | 50 -
+ kernel/module/Makefile | 21 +
+ kernel/module/debug_kmemleak.c | 30 +
+ .../{module_decompress.c => module/decompress.c} | 5 +-
+ kernel/module/internal.h | 302 +++
+ kernel/module/kallsyms.c | 512 +++++
+ kernel/module/kdb.c | 62 +
+ kernel/module/livepatch.c | 74 +
+ kernel/{module.c => module/main.c} | 2081 ++------------------
+ kernel/module/procfs.c | 146 ++
+ kernel/module/signing.c | 122 ++
+ kernel/module/strict_rwx.c | 143 ++
+ kernel/module/sysfs.c | 436 ++++
+ kernel/module/tracking.c | 61 +
+ kernel/module/tree_lookup.c | 117 ++
+ kernel/module/version.c | 109 +
+ kernel/module_signing.c | 45 -
+ 29 files changed, 2382 insertions(+), 2050 deletions(-)
+ delete mode 100644 kernel/module-internal.h
+ create mode 100644 kernel/module/Makefile
+ create mode 100644 kernel/module/debug_kmemleak.c
+ rename kernel/{module_decompress.c => module/decompress.c} (99%)
+ create mode 100644 kernel/module/internal.h
+ create mode 100644 kernel/module/kallsyms.c
+ create mode 100644 kernel/module/kdb.c
+ create mode 100644 kernel/module/livepatch.c
+ rename kernel/{module.c => module/main.c} (61%)
+ create mode 100644 kernel/module/procfs.c
+ create mode 100644 kernel/module/signing.c
+ create mode 100644 kernel/module/strict_rwx.c
+ create mode 100644 kernel/module/sysfs.c
+ create mode 100644 kernel/module/tracking.c
+ create mode 100644 kernel/module/tree_lookup.c
+ create mode 100644 kernel/module/version.c
+ delete mode 100644 kernel/module_signing.c
+Merging dmaengine-fixes/fixes (7495a5bbf89f dt-bindings: dmaengine: qcom: gpi: Add minItems for interrupts)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes
+Already up to date.
+Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2)
+$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes
+Already up to date.
+Merging mtd-fixes/mtd/fixes (ba7542eb2dd5 mtd: rawnand: qcom: fix memory corruption that causes panic)
+$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes
+Already up to date.
+Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources")
+$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes
+Already up to date.
+Merging v4l-dvb-fixes/fixes (d4cb77112c7b media: isl7998x: select V4L2_FWNODE to fix build error)
+$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes
+Auto-merging drivers/media/i2c/Kconfig
+Merge made by the 'ort' strategy.
+ drivers/media/i2c/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+Merging reset-fixes/reset/fixes (03cb66463b55 dt-bindings: reset: Add parent "resets" property as optional)
+$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes
+Already up to date.
+Merging mips-fixes/mips-fixes (f0a6c68f6998 MIPS: Fix CP0 counter erratum detection for R4k CPUs)
+$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes
+Already up to date.
+Merging at91-fixes/at91-fixes (0c640d9544d0 ARM: dts: at91: fix pinctrl phandles)
+$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes
+Already up to date.
+Merging omap-fixes/fixes (46ff3df87215 ARM: dts: logicpd-som-lv: Fix wrong pinmuxing on OMAP35)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes
+Already up to date.
+Merging kvm-fixes/master (9f46c187e2e6 KVM: x86/mmu: fix NULL pointer dereference on guest INVPCID)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master
+Already up to date.
+Merging kvms390-fixes/master (4aa5ac75bf79 KVM: s390: Fix lockdep issue in vm memop)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master
+Auto-merging arch/s390/kvm/kvm-s390.c
+Merge made by the 'ort' strategy.
+Merging hwmon-fixes/hwmon (42226c989789 Linux 5.18-rc7)
+$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon
+Already up to date.
+Merging nvdimm-fixes/libnvdimm-fixes (d28820419ca3 cxl/pci: Drop shadowed variable)
+$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes
+Already up to date.
+Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes
+Already up to date.
+Merging btrfs-fixes/next-fixes (48de4dc26894 Merge branch 'misc-5.18' into next-fixes)
+$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes
+Auto-merging fs/btrfs/disk-io.c
+Auto-merging fs/btrfs/inode.c
+Merge made by the 'ort' strategy.
+Merging vfs-fixes/fixes (fb4554c2232e Fix double fget() in vhost_net_set_backend())
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes
+Already up to date.
+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 -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus
+Already up to date.
+Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1)
+$ git merge -m Merge branch 'i3c/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c-fixes/i3c/fixes
+Already up to date.
+Merging drivers-x86-fixes/fixes (44acfc22c7d0 platform/surface: aggregator: Fix initialization order when compiling as builtin module)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes
+Already up to date.
+Merging samsung-krzk-fixes/fixes (436ce66003d5 ARM: s3c: mark as deprecated and schedule removal)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes
+Auto-merging arch/arm/Kconfig
+Merge made by the 'ort' strategy.
+ arch/arm/Kconfig | 7 ++++++-
+ arch/arm/mach-s3c/Kconfig.s3c64xx | 7 ++++++-
+ arch/arm/mach-s3c/cpu.c | 1 +
+ arch/arm/mach-s3c/init.c | 2 ++
+ arch/arm/mach-s3c/s3c24xx.c | 7 +++++++
+ arch/arm/mach-s3c/s3c64xx.c | 7 +++++++
+ 6 files changed, 29 insertions(+), 2 deletions(-)
+Merging pinctrl-samsung-fixes/fixes (ac875df4d854 pinctrl: samsung: fix missing GPIOLIB on ARM64 Exynos config)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes
+Already up to date.
+Merging devicetree-fixes/dt/linus (5dc463042651 dt-bindings: pci: apple,pcie: Drop max-link-speed from example)
+$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus
+Already up to date.
+Merging scsi-fixes/fixes (d5d92b644084 scsi: ufs: core: Fix referencing invalid rsp field)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes
+Already up to date.
+Merging drm-fixes/drm-fixes (4b0986a3613c Linux 5.18)
+$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes
+Already up to date.
+Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
+$ git merge -m Merge branch 'drm-fixes' of git://people.freedesktop.org/~agd5f/linux amdgpu-fixes/drm-fixes
+Already up to date.
+Merging drm-intel-fixes/for-linux-next-fixes (4b0986a3613c Linux 5.18)
+$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes
+Already up to date.
+Merging mmc-fixes/fixes (e949dee3625e mmc: core: Fix busy polling for MMC_SEND_OP_COND again)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes
+Already up to date.
+Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt())
+$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes
+Auto-merging drivers/rtc/rtc-cmos.c
+Merge made by the 'ort' strategy.
+Merging gnss-fixes/gnss-linus (312310928417 Linux 5.18-rc1)
+$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus
+Already up to date.
+Merging hyperv-fixes/hyperv-fixes (eaa03d345358 Drivers: hv: vmbus: Replace smp_store_mb() with virt_store_mb())
+$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes
+Already up to date.
+Merging soc-fsl-fixes/fix (a222fd854139 soc: fsl: qe: Check of ioremap return value)
+$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix
+Already up to date.
+Merging risc-v-fixes/fixes (c932edeaf6d6 riscv: dts: microchip: fix gpio1 reg property typo)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes
+Already up to date.
+Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range())
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd-fixes/fixes
+Already up to date.
+Merging fpga-fixes/fixes (312310928417 Linux 5.18-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes
+Already up to date.
+Merging spdx/spdx-linus (53c83d6d8e39 siphash: add SPDX tags as sole licensing authority)
+$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus
+Auto-merging fs/freevxfs/vxfs_immed.c
+Auto-merging fs/freevxfs/vxfs_subr.c
+Auto-merging include/linux/siphash.h
+Auto-merging lib/siphash.c
+Merge made by the 'ort' strategy.
+ fs/freevxfs/vxfs.h | 27 +------
+ fs/freevxfs/vxfs_bmap.c | 26 +------
+ fs/freevxfs/vxfs_dir.h | 27 +------
+ fs/freevxfs/vxfs_extern.h | 27 +------
+ fs/freevxfs/vxfs_fshead.c | 26 +------
+ fs/freevxfs/vxfs_fshead.h | 27 +------
+ fs/freevxfs/vxfs_immed.c | 26 +------
+ fs/freevxfs/vxfs_inode.c | 26 +------
+ fs/freevxfs/vxfs_inode.h | 27 +------
+ fs/freevxfs/vxfs_lookup.c | 26 +------
+ fs/freevxfs/vxfs_olt.c | 26 +------
+ fs/freevxfs/vxfs_olt.h | 27 +------
+ fs/freevxfs/vxfs_subr.c | 26 +------
+ fs/freevxfs/vxfs_super.c | 26 +------
+ include/linux/siphash.h | 5 +-
+ lib/siphash.c | 5 +-
+ lib/test_siphash.c | 7 +-
+ scripts/spdxcheck.py | 175 ++++++++++++++++++++++++++++++++++++++++++----
+ scripts/spdxexclude | 18 +++++
+ 19 files changed, 202 insertions(+), 378 deletions(-)
+ create mode 100644 scripts/spdxexclude
+Merging gpio-brgl-fixes/gpio/for-current (3ecb10175b1f gpio: mvebu/pwm: Refuse requests with inverted polarity)
+$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current
+Already up to date.
+Merging gpio-intel-fixes/fixes (0c2cae09a765 gpiolib: acpi: Convert type for pin to be unsigned)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes
+Already up to date.
+Merging pinctrl-intel-fixes/fixes (7b923e67a4a7 pinctrl: intel: Fix kernel doc format, i.e. add return sections)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes
+Merge made by the 'ort' strategy.
+ Documentation/driver-api/gpio/driver.rst | 30 ++++++++------
+ drivers/pinctrl/intel/pinctrl-baytrail.c | 42 +++++++++++--------
+ drivers/pinctrl/intel/pinctrl-broxton.c | 1 +
+ drivers/pinctrl/intel/pinctrl-cherryview.c | 66 +++++++++++++++++-------------
+ drivers/pinctrl/intel/pinctrl-intel.c | 45 +++++++++++++-------
+ drivers/pinctrl/intel/pinctrl-intel.h | 2 -
+ drivers/pinctrl/intel/pinctrl-lynxpoint.c | 26 +++++++-----
+ 7 files changed, 128 insertions(+), 84 deletions(-)
+Merging erofs-fixes/fixes (8b1ac84dcf2c Documentation/ABI: sysfs-fs-erofs: Fix Sphinx errors)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes
+Already up to date.
+Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc())
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity-fixes/fixes
+Already up to date.
+Merging kunit-fixes/kunit-fixes (02c7efa43627 Documentation: kunit: fix path to .kunitconfig in start.rst)
+$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes
+Already up to date.
+Merging ubifs-fixes/fixes (c3c07fc25f37 ubi: fastmap: Return error code if memory allocation fails in add_aeb())
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes
+Already up to date.
+Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes
+Already up to date.
+Merging cel-fixes/for-rc (4b0986a3613c Linux 5.18)
+$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel-fixes/for-rc
+Already up to date.
+Merging irqchip-fixes/irq/irqchip-fixes (544808f7e21c irqchip/gic, gic-v3: Prevent GSI to SGI translations)
+$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes
+Already up to date.
+Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes
+Already up to date.
+Merging perf-current/perf/urgent (eaea45fc0e7b Merge tag 'perf-tools-fixes-for-v5.18-2022-05-21' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux)
+$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent
+Already up to date.
+Merging efi-fixes/urgent (9feaf8b387ee efi: fix return value of __setup handlers)
+$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent
+Already up to date.
+Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.)
+$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus
+Merge made by the 'ort' strategy.
+ include/linux/zstd_lib.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging drm-misc-fixes/for-linux-next-fixes (6e516faf0431 drm/panfrost: Job should reference MMU not file_priv)
+$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/bridge/ti-sn65dsi83.c | 2 +-
+ drivers/gpu/drm/panfrost/panfrost_drv.c | 5 +++--
+ drivers/gpu/drm/panfrost/panfrost_job.c | 6 +++---
+ drivers/gpu/drm/panfrost/panfrost_job.h | 2 +-
+ 4 files changed, 8 insertions(+), 7 deletions(-)
+Merging kbuild/for-next (58d493ffabad scripts/kallsyms: update usage message of the kallsyms program)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next
+Auto-merging Makefile
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/s390/Makefile
+Auto-merging arch/x86/Makefile
+Auto-merging certs/Makefile
+Auto-merging init/Kconfig
+Auto-merging kernel/module/main.c
+CONFLICT (content): Merge conflict in kernel/module/main.c
+Auto-merging scripts/Makefile.build
+CONFLICT (content): Merge conflict in scripts/Makefile.build
+Auto-merging scripts/link-vmlinux.sh
+Auto-merging tools/objtool/Makefile
+Resolved 'kernel/module/main.c' using previous resolution.
+Resolved 'scripts/Makefile.build' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master edfe19d3d574] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git
+$ git diff -M --stat --summary HEAD^..
+ .gitignore | 1 +
+ Documentation/kbuild/kconfig-language.rst | 6 +
+ Makefile | 16 +-
+ arch/arm/Makefile | 4 +-
+ arch/arm/boot/install.sh | 21 -
+ arch/arm64/Makefile | 6 +-
+ arch/arm64/boot/install.sh | 21 -
+ arch/ia64/Makefile | 5 +-
+ arch/ia64/install.sh | 10 -
+ arch/m68k/Makefile | 3 +-
+ arch/m68k/include/asm/Kbuild | 1 +
+ arch/m68k/include/asm/export.h | 2 -
+ arch/m68k/install.sh | 22 -
+ arch/nios2/Makefile | 3 +-
+ arch/nios2/boot/install.sh | 22 -
+ arch/parisc/Makefile | 11 +-
+ arch/parisc/install.sh | 28 --
+ arch/powerpc/Kconfig | 1 -
+ arch/powerpc/Makefile | 3 +-
+ arch/powerpc/boot/Makefile | 4 +-
+ arch/powerpc/boot/install.sh | 23 -
+ arch/riscv/Makefile | 7 +-
+ arch/riscv/boot/install.sh | 21 -
+ arch/s390/Kconfig | 1 -
+ arch/s390/Makefile | 3 +-
+ arch/s390/boot/install.sh | 6 -
+ arch/sparc/Makefile | 3 +-
+ arch/sparc/boot/install.sh | 22 -
+ arch/um/Kconfig | 1 -
+ arch/x86/Makefile | 3 +-
+ arch/x86/boot/install.sh | 22 -
+ certs/Makefile | 4 +-
+ include/asm-generic/export.h | 22 +-
+ include/linux/export-internal.h | 17 +
+ include/linux/export.h | 30 +-
+ init/Kconfig | 4 -
+ kernel/gen_kheaders.sh | 2 +-
+ scripts/Kbuild.include | 10 +-
+ scripts/Makefile | 4 +-
+ scripts/Makefile.build | 208 ++++-----
+ scripts/Makefile.clean | 8 +-
+ scripts/Makefile.extrawarn | 13 +-
+ scripts/Makefile.lib | 13 +-
+ scripts/Makefile.modfinal | 5 +-
+ scripts/Makefile.modpost | 12 +-
+ scripts/Makefile.vmlinux | 32 ++
+ scripts/adjust_autoksyms.sh | 2 +-
+ scripts/check-local-export | 65 +++
+ scripts/checksyscalls.sh | 2 +-
+ scripts/dummy-tools/pahole | 4 +
+ scripts/gen_autoksyms.sh | 18 +-
+ scripts/genksyms/genksyms.c | 18 +-
+ scripts/install.sh | 40 ++
+ scripts/kallsyms.c | 2 +-
+ scripts/kconfig/gconf-cfg.sh | 12 +-
+ scripts/kconfig/mconf-cfg.sh | 16 +-
+ scripts/kconfig/nconf-cfg.sh | 16 +-
+ scripts/kconfig/qconf-cfg.sh | 14 +-
+ scripts/link-vmlinux.sh | 40 +-
+ scripts/mod/list.h | 213 +++++++++
+ scripts/mod/modpost.c | 699 +++++++++++++++---------------
+ scripts/mod/modpost.h | 31 +-
+ scripts/mod/sumversion.c | 19 +-
+ scripts/prune-kernel | 6 +-
+ tools/objtool/Makefile | 4 +-
+ usr/include/Makefile | 2 +-
+ 66 files changed, 982 insertions(+), 927 deletions(-)
+ mode change 100644 => 100755 arch/arm/boot/install.sh
+ mode change 100644 => 100755 arch/arm64/boot/install.sh
+ mode change 100644 => 100755 arch/ia64/install.sh
+ delete mode 100644 arch/m68k/include/asm/export.h
+ mode change 100644 => 100755 arch/m68k/install.sh
+ mode change 100644 => 100755 arch/nios2/boot/install.sh
+ mode change 100644 => 100755 arch/parisc/install.sh
+ mode change 100644 => 100755 arch/powerpc/boot/install.sh
+ mode change 100644 => 100755 arch/riscv/boot/install.sh
+ mode change 100644 => 100755 arch/s390/boot/install.sh
+ mode change 100644 => 100755 arch/sparc/boot/install.sh
+ mode change 100644 => 100755 arch/x86/boot/install.sh
+ create mode 100644 include/linux/export-internal.h
+ create mode 100644 scripts/Makefile.vmlinux
+ create mode 100755 scripts/check-local-export
+ create mode 100755 scripts/dummy-tools/pahole
+ create mode 100755 scripts/install.sh
+ create mode 100644 scripts/mod/list.h
+Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros)
+$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format
+Merge made by the 'ort' strategy.
+ .clang-format | 218 +++++++++++++++++++++++++++++++++++++++++++++-------------
+ 1 file changed, 170 insertions(+), 48 deletions(-)
+Merging perf/perf/core (5d2b6bc3a6a2 perf intel-pt: Add guest_code support)
+$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core
+Merge made by the 'ort' strategy.
+ tools/lib/perf/evlist.c | 13 +-
+ tools/lib/perf/evsel.c | 34 +-
+ tools/lib/perf/include/internal/evlist.h | 3 +-
+ tools/lib/perf/include/internal/lib.h | 2 +
+ tools/lib/perf/include/perf/cpumap.h | 3 +
+ tools/lib/perf/include/perf/evsel.h | 1 +
+ tools/lib/perf/lib.c | 20 +
+ tools/perf/.gitignore | 1 -
+ tools/perf/Documentation/perf-annotate.txt | 5 +
+ tools/perf/Documentation/perf-arm-spe.txt | 218 +
+ tools/perf/Documentation/perf-c2c.txt | 8 +-
+ tools/perf/Documentation/perf-intel-pt.txt | 165 +
+ tools/perf/Documentation/perf-kvm.txt | 3 +
+ tools/perf/Documentation/perf-lock.txt | 21 +
+ tools/perf/Documentation/perf-script.txt | 4 +
+ tools/perf/Documentation/perf-stat.txt | 10 +
+ tools/perf/Documentation/perf.txt | 2 +-
+ tools/perf/Makefile.config | 42 +-
+ tools/perf/Makefile.perf | 5 +-
+ tools/perf/arch/arm/util/cs-etm.c | 1 +
+ tools/perf/arch/arm64/util/arm-spe.c | 1 +
+ tools/perf/arch/riscv/Makefile | 1 +
+ tools/perf/arch/s390/util/auxtrace.c | 1 +
+ tools/perf/arch/x86/util/evlist.c | 7 +-
+ tools/perf/arch/x86/util/evsel.c | 31 +
+ tools/perf/arch/x86/util/intel-bts.c | 1 +
+ tools/perf/arch/x86/util/intel-pt.c | 1 +
+ tools/perf/arch/x86/util/topdown.c | 25 +
+ tools/perf/arch/x86/util/topdown.h | 7 +
+ tools/perf/bench/Build | 1 +
+ tools/perf/bench/bench.h | 2 +
+ tools/perf/bench/breakpoint.c | 244 +
+ tools/perf/builtin-annotate.c | 24 +
+ tools/perf/builtin-bench.c | 8 +
+ tools/perf/builtin-c2c.c | 80 +-
+ tools/perf/builtin-inject.c | 162 +-
+ tools/perf/builtin-kvm.c | 2 +
+ tools/perf/builtin-lock.c | 92 +-
+ tools/perf/builtin-record.c | 13 +-
+ tools/perf/builtin-script.c | 37 +-
+ tools/perf/builtin-stat.c | 71 +-
+ tools/perf/builtin-version.c | 1 +
+ tools/perf/perf-with-kcore.sh | 247 -
+ .../arch/arm64/arm/cortex-a34/branch.json | 11 +
+ .../pmu-events/arch/arm64/arm/cortex-a34/bus.json | 17 +
+ .../arch/arm64/arm/cortex-a34/cache.json | 32 +
+ .../arch/arm64/arm/cortex-a34/exception.json | 14 +
+ .../arch/arm64/arm/cortex-a34/instruction.json | 29 +
+ .../arch/arm64/arm/cortex-a34/memory.json | 8 +
+ .../arch/arm64/arm/cortex-a35/branch.json | 11 +
+ .../pmu-events/arch/arm64/arm/cortex-a35/bus.json | 17 +
+ .../arch/arm64/arm/cortex-a35/cache.json | 32 +
+ .../arch/arm64/arm/cortex-a35/exception.json | 14 +
+ .../arch/arm64/arm/cortex-a35/instruction.json | 44 +
+ .../arch/arm64/arm/cortex-a35/memory.json | 8 +
+ .../arch/arm64/arm/cortex-a510/branch.json | 59 +
+ .../pmu-events/arch/arm64/arm/cortex-a510/bus.json | 17 +
+ .../arch/arm64/arm/cortex-a510/cache.json | 182 +
+ .../arch/arm64/arm/cortex-a510/exception.json | 14 +
+ .../arch/arm64/arm/cortex-a510/instruction.json | 95 +
+ .../arch/arm64/arm/cortex-a510/memory.json | 32 +
+ .../arch/arm64/arm/cortex-a510/pipeline.json | 107 +
+ .../pmu-events/arch/arm64/arm/cortex-a510/pmu.json | 8 +
+ .../arch/arm64/arm/cortex-a510/trace.json | 32 +
+ .../arch/arm64/arm/cortex-a55/branch.json | 59 +
+ .../pmu-events/arch/arm64/arm/cortex-a55/bus.json | 17 +
+ .../arch/arm64/arm/cortex-a55/cache.json | 188 +
+ .../arch/arm64/arm/cortex-a55/exception.json | 20 +
+ .../arch/arm64/arm/cortex-a55/instruction.json | 65 +
+ .../arch/arm64/arm/cortex-a55/memory.json | 17 +
+ .../arch/arm64/arm/cortex-a55/pipeline.json | 80 +
+ .../arch/arm64/arm/cortex-a57-a72/branch.json | 17 +
+ .../arch/arm64/arm/cortex-a57-a72/bus.json | 29 +
+ .../arch/arm64/arm/cortex-a57-a72/cache.json | 80 +
+ .../arm64/arm/cortex-a57-a72/core-imp-def.json | 179 -
+ .../arch/arm64/arm/cortex-a57-a72/exception.json | 47 +
+ .../arch/arm64/arm/cortex-a57-a72/instruction.json | 68 +
+ .../arch/arm64/arm/cortex-a57-a72/memory.json | 20 +
+ .../arch/arm64/arm/cortex-a65/branch.json | 17 +
+ .../pmu-events/arch/arm64/arm/cortex-a65/bus.json | 17 +
+ .../arch/arm64/arm/cortex-a65/cache.json | 236 +
+ .../pmu-events/arch/arm64/arm/cortex-a65/dpu.json | 32 +
+ .../arch/arm64/arm/cortex-a65/exception.json | 14 +
+ .../pmu-events/arch/arm64/arm/cortex-a65/ifu.json | 122 +
+ .../arch/arm64/arm/cortex-a65/instruction.json | 71 +
+ .../arch/arm64/arm/cortex-a65/memory.json | 35 +
+ .../arch/arm64/arm/cortex-a65/pipeline.json | 8 +
+ .../arch/arm64/arm/cortex-a710/branch.json | 17 +
+ .../pmu-events/arch/arm64/arm/cortex-a710/bus.json | 20 +
+ .../arch/arm64/arm/cortex-a710/cache.json | 155 +
+ .../arch/arm64/arm/cortex-a710/exception.json | 47 +
+ .../arch/arm64/arm/cortex-a710/instruction.json | 134 +
+ .../arch/arm64/arm/cortex-a710/memory.json | 41 +
+ .../arch/arm64/arm/cortex-a710/pipeline.json | 23 +
+ .../arch/arm64/arm/cortex-a710/trace.json | 29 +
+ .../arch/arm64/arm/cortex-a73/branch.json | 11 +
+ .../pmu-events/arch/arm64/arm/cortex-a73/bus.json | 23 +
+ .../arch/arm64/arm/cortex-a73/cache.json | 107 +
+ .../pmu-events/arch/arm64/arm/cortex-a73/etm.json | 14 +
+ .../arch/arm64/arm/cortex-a73/exception.json | 14 +
+ .../arch/arm64/arm/cortex-a73/instruction.json | 65 +
+ .../arch/arm64/arm/cortex-a73/memory.json | 14 +
+ .../pmu-events/arch/arm64/arm/cortex-a73/mmu.json | 44 +
+ .../arch/arm64/arm/cortex-a73/pipeline.json | 38 +
+ .../arch/arm64/arm/cortex-a75/branch.json | 11 +
+ .../pmu-events/arch/arm64/arm/cortex-a75/bus.json | 17 +
+ .../arch/arm64/arm/cortex-a75/cache.json | 164 +
+ .../pmu-events/arch/arm64/arm/cortex-a75/etm.json | 14 +
+ .../arch/arm64/arm/cortex-a75/exception.json | 17 +
+ .../arch/arm64/arm/cortex-a75/instruction.json | 74 +
+ .../arch/arm64/arm/cortex-a75/memory.json | 17 +
+ .../pmu-events/arch/arm64/arm/cortex-a75/mmu.json | 44 +
+ .../arch/arm64/arm/cortex-a75/pipeline.json | 44 +
+ .../arch/arm64/arm/cortex-a77/branch.json | 17 +
+ .../pmu-events/arch/arm64/arm/cortex-a77/bus.json | 17 +
+ .../arch/arm64/arm/cortex-a77/cache.json | 143 +
+ .../arch/arm64/arm/cortex-a77/exception.json | 47 +
+ .../arch/arm64/arm/cortex-a77/instruction.json | 77 +
+ .../arch/arm64/arm/cortex-a77/memory.json | 23 +
+ .../arch/arm64/arm/cortex-a77/pipeline.json | 8 +
+ .../arch/arm64/arm/cortex-a78/branch.json | 17 +
+ .../pmu-events/arch/arm64/arm/cortex-a78/bus.json | 20 +
+ .../arch/arm64/arm/cortex-a78/cache.json | 155 +
+ .../arch/arm64/arm/cortex-a78/exception.json | 47 +
+ .../arch/arm64/arm/cortex-a78/instruction.json | 80 +
+ .../arch/arm64/arm/cortex-a78/memory.json | 23 +
+ .../arch/arm64/arm/cortex-a78/pipeline.json | 23 +
+ .../arch/arm64/arm/cortex-x1/branch.json | 17 +
+ .../pmu-events/arch/arm64/arm/cortex-x1/bus.json | 20 +
+ .../pmu-events/arch/arm64/arm/cortex-x1/cache.json | 155 +
+ .../arch/arm64/arm/cortex-x1/exception.json | 47 +
+ .../arch/arm64/arm/cortex-x1/instruction.json | 80 +
+ .../arch/arm64/arm/cortex-x1/memory.json | 23 +
+ .../arch/arm64/arm/cortex-x1/pipeline.json | 23 +
+ .../arch/arm64/arm/cortex-x2/branch.json | 17 +
+ .../pmu-events/arch/arm64/arm/cortex-x2/bus.json | 20 +
+ .../pmu-events/arch/arm64/arm/cortex-x2/cache.json | 155 +
+ .../arch/arm64/arm/cortex-x2/exception.json | 47 +
+ .../arch/arm64/arm/cortex-x2/instruction.json | 134 +
+ .../arch/arm64/arm/cortex-x2/memory.json | 41 +
+ .../arch/arm64/arm/cortex-x2/pipeline.json | 23 +
+ .../pmu-events/arch/arm64/arm/cortex-x2/trace.json | 29 +
+ .../arch/arm64/arm/neoverse-e1/branch.json | 17 +
+ .../pmu-events/arch/arm64/arm/neoverse-e1/bus.json | 17 +
+ .../arch/arm64/arm/neoverse-e1/cache.json | 107 +
+ .../arch/arm64/arm/neoverse-e1/exception.json | 14 +
+ .../arch/arm64/arm/neoverse-e1/instruction.json | 65 +
+ .../arch/arm64/arm/neoverse-e1/memory.json | 23 +
+ .../arch/arm64/arm/neoverse-e1/pipeline.json | 8 +
+ .../pmu-events/arch/arm64/arm/neoverse-e1/spe.json | 14 +
+ .../arch/arm64/common-and-microarch.json | 66 +
+ tools/perf/pmu-events/arch/arm64/mapfile.csv | 13 +
+ .../pmu-events/arch/x86/alderlake/adl-metrics.json | 729 +++
+ .../pmu-events/arch/x86/cascadelakex/cache.json | 1164 +----
+ .../pmu-events/arch/x86/cascadelakex/memory.json | 702 +--
+ .../pmu-events/arch/x86/cascadelakex/other.json | 156 +-
+ .../pmu-events/arch/x86/cascadelakex/pipeline.json | 14 +-
+ .../arch/x86/cascadelakex/uncore-memory.json | 61 +
+ .../arch/x86/cascadelakex/uncore-other.json | 96 +-
+ .../pmu-events/arch/x86/elkhartlake/other.json | 13 +-
+ .../pmu-events/arch/x86/elkhartlake/pipeline.json | 13 +-
+ tools/perf/pmu-events/arch/x86/goldmont/other.json | 31 +-
+ .../pmu-events/arch/x86/goldmont/pipeline.json | 31 +-
+ .../pmu-events/arch/x86/goldmontplus/other.json | 37 +-
+ .../pmu-events/arch/x86/goldmontplus/pipeline.json | 37 +-
+ tools/perf/pmu-events/arch/x86/icelake/cache.json | 41 +-
+ .../pmu-events/arch/x86/icelake/icl-metrics.json | 36 +-
+ tools/perf/pmu-events/arch/x86/icelake/memory.json | 10 +-
+ tools/perf/pmu-events/arch/x86/icelake/other.json | 38 +-
+ .../perf/pmu-events/arch/x86/icelake/pipeline.json | 26 +-
+ tools/perf/pmu-events/arch/x86/icelakex/cache.json | 31 +-
+ .../pmu-events/arch/x86/icelakex/icx-metrics.json | 24 +-
+ .../perf/pmu-events/arch/x86/icelakex/memory.json | 21 +-
+ tools/perf/pmu-events/arch/x86/icelakex/other.json | 70 +-
+ .../pmu-events/arch/x86/icelakex/pipeline.json | 14 +-
+ .../perf/pmu-events/arch/x86/ivytown/pipeline.json | 4 +-
+ .../pmu-events/arch/x86/ivytown/uncore-memory.json | 3 +-
+ tools/perf/pmu-events/arch/x86/mapfile.csv | 1 +
+ .../perf/pmu-events/arch/x86/nehalemep/other.json | 66 +-
+ .../pmu-events/arch/x86/nehalemep/pipeline.json | 66 +-
+ .../pmu-events/arch/x86/sapphirerapids/cache.json | 1083 ++++
+ .../arch/x86/sapphirerapids/floating-point.json | 218 +
+ .../arch/x86/sapphirerapids/frontend.json | 471 ++
+ .../pmu-events/arch/x86/sapphirerapids/memory.json | 415 ++
+ .../pmu-events/arch/x86/sapphirerapids/other.json | 362 ++
+ .../arch/x86/sapphirerapids/pipeline.json | 1283 +++++
+ .../arch/x86/sapphirerapids/uncore-memory.json | 499 ++
+ .../arch/x86/sapphirerapids/uncore-other.json | 5150 ++++++++++++++++++++
+ .../arch/x86/sapphirerapids/uncore-power.json | 12 +
+ .../arch/x86/sapphirerapids/virtual-memory.json | 225 +
+ tools/perf/pmu-events/arch/x86/skylake/cache.json | 174 +-
+ tools/perf/pmu-events/arch/x86/skylake/memory.json | 90 +-
+ .../perf/pmu-events/arch/x86/skylake/pipeline.json | 14 +-
+ tools/perf/pmu-events/arch/x86/skylakex/cache.json | 74 +-
+ .../perf/pmu-events/arch/x86/skylakex/memory.json | 74 +-
+ .../pmu-events/arch/x86/skylakex/pipeline.json | 14 +-
+ .../arch/x86/skylakex/uncore-memory.json | 20 +
+ .../pmu-events/arch/x86/skylakex/uncore-other.json | 96 +-
+ .../perf/pmu-events/arch/x86/tigerlake/other.json | 13 +-
+ .../pmu-events/arch/x86/tigerlake/pipeline.json | 13 +-
+ tools/perf/pmu-events/arch/x86/tremontx/other.json | 13 +-
+ .../pmu-events/arch/x86/tremontx/pipeline.json | 13 +-
+ .../arch/x86/tremontx/uncore-memory.json | 22 +
+ .../pmu-events/arch/x86/tremontx/uncore-other.json | 94 +
+ .../pmu-events/arch/x86/westmereep-dp/other.json | 66 +-
+ .../arch/x86/westmereep-dp/pipeline.json | 66 +-
+ .../pmu-events/arch/x86/westmereep-sp/cache.json | 14 +-
+ .../pmu-events/arch/x86/westmereep-sp/memory.json | 6 +-
+ .../pmu-events/arch/x86/westmereep-sp/other.json | 66 +-
+ .../arch/x86/westmereep-sp/pipeline.json | 66 +-
+ .../perf/pmu-events/arch/x86/westmereex/cache.json | 14 +-
+ .../pmu-events/arch/x86/westmereex/memory.json | 6 +-
+ .../perf/pmu-events/arch/x86/westmereex/other.json | 66 +-
+ .../pmu-events/arch/x86/westmereex/pipeline.json | 66 +-
+ tools/perf/pmu-events/jevents.c | 90 +-
+ tools/perf/scripts/python/intel-pt-events.py | 8 +-
+ tools/perf/tests/builtin-test.c | 10 +-
+ tools/perf/tests/evsel-roundtrip-name.c | 2 +-
+ tools/perf/tests/mmap-basic.c | 18 +-
+ tools/perf/tests/openat-syscall-all-cpus.c | 23 +-
+ tools/perf/tests/openat-syscall.c | 20 +-
+ tools/perf/tests/parse-events.c | 492 +-
+ tools/perf/tests/perf-record.c | 18 +-
+ tools/perf/tests/pmu-events.c | 30 +-
+ tools/perf/tests/shell/record.sh | 80 +
+ tools/perf/tests/shell/stat.sh | 80 +
+ tools/perf/tests/vmlinux-kallsyms.c | 12 +-
+ tools/perf/util/auxtrace.c | 16 +
+ tools/perf/util/bpf-loader.c | 27 +-
+ tools/perf/util/bpf_counter.c | 61 +-
+ tools/perf/util/bpf_counter_cgroup.c | 42 +-
+ tools/perf/util/data.c | 14 +
+ tools/perf/util/data.h | 2 +
+ tools/perf/util/event.c | 7 +-
+ tools/perf/util/evlist.c | 66 +-
+ tools/perf/util/evlist.h | 2 -
+ tools/perf/util/evsel.c | 77 +-
+ tools/perf/util/evsel.h | 29 +-
+ tools/perf/util/genelf.h | 3 +
+ tools/perf/util/header.c | 62 +-
+ tools/perf/util/header.h | 15 +
+ .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 99 +-
+ .../perf/util/intel-pt-decoder/intel-pt-decoder.h | 1 +
+ .../util/intel-pt-decoder/intel-pt-insn-decoder.c | 1 +
+ .../util/intel-pt-decoder/intel-pt-insn-decoder.h | 1 +
+ tools/perf/util/intel-pt.c | 57 +-
+ tools/perf/util/machine.c | 101 +-
+ tools/perf/util/machine.h | 5 +-
+ tools/perf/util/mem-events.c | 32 +-
+ tools/perf/util/mem-events.h | 1 +
+ tools/perf/util/metricgroup.c | 124 +-
+ tools/perf/util/parse-events.c | 46 +-
+ tools/perf/util/parse-events.l | 2 +
+ tools/perf/util/path.c | 14 +-
+ tools/perf/util/path.h | 1 +
+ .../util/scripting-engines/trace-event-python.c | 49 +-
+ tools/perf/util/session.c | 7 +
+ tools/perf/util/stat-display.c | 46 +-
+ tools/perf/util/stat-shadow.c | 29 +-
+ tools/perf/util/stat.c | 14 +-
+ tools/perf/util/stat.h | 22 +
+ tools/perf/util/symbol_conf.h | 3 +-
+ tools/perf/util/topdown.c | 17 +-
+ tools/perf/util/topdown.h | 3 +-
+ tools/perf/util/util.c | 5 +
+ 265 files changed, 19159 insertions(+), 4151 deletions(-)
+ create mode 100644 tools/perf/Documentation/perf-arm-spe.txt
+ create mode 100644 tools/perf/arch/x86/util/topdown.h
+ create mode 100644 tools/perf/bench/breakpoint.c
+ delete mode 100644 tools/perf/perf-with-kcore.sh
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a34/branch.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a34/bus.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a34/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a34/exception.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a34/instruction.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a34/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a35/branch.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a35/bus.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a35/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a35/exception.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a35/instruction.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a35/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a510/branch.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a510/bus.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a510/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a510/exception.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a510/instruction.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a510/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a510/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a510/pmu.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a510/trace.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a55/branch.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a55/bus.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a55/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a55/exception.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a55/instruction.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a55/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a55/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a57-a72/branch.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a57-a72/bus.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a57-a72/cache.json
+ delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a57-a72/core-imp-def.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a57-a72/exception.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a57-a72/instruction.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a57-a72/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a65/branch.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a65/bus.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a65/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a65/dpu.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a65/exception.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a65/ifu.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a65/instruction.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a65/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a65/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a710/branch.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a710/bus.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a710/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a710/exception.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a710/instruction.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a710/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a710/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a710/trace.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a73/branch.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a73/bus.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a73/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a73/etm.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a73/exception.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a73/instruction.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a73/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a73/mmu.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a73/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a75/branch.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a75/bus.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a75/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a75/etm.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a75/exception.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a75/instruction.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a75/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a75/mmu.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a75/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a77/branch.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a77/bus.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a77/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a77/exception.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a77/instruction.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a77/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a77/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a78/branch.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a78/bus.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a78/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a78/exception.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a78/instruction.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a78/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a78/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-x1/branch.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-x1/bus.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-x1/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-x1/exception.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-x1/instruction.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-x1/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-x1/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-x2/branch.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-x2/bus.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-x2/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-x2/exception.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-x2/instruction.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-x2/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-x2/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-x2/trace.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/branch.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/bus.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/exception.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/instruction.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/spe.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/alderlake/adl-metrics.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-power.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/virtual-memory.json
+ create mode 100755 tools/perf/tests/shell/record.sh
+ create mode 100755 tools/perf/tests/shell/stat.sh
+Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn)
+$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes
+Already up to date.
+Merging dma-mapping/for-next (4a37f3dd9a83 dma-direct: don't over-decrypt memory)
+$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next
+Auto-merging arch/arm64/mm/init.c
+Auto-merging arch/riscv/mm/init.c
+Auto-merging arch/x86/kernel/Makefile
+Auto-merging arch/x86/mm/mem_encrypt_amd.c
+Merge made by the 'ort' strategy.
+ arch/arm/include/asm/xen/page-coherent.h | 2 -
+ arch/arm/mm/init.c | 6 +-
+ arch/arm/xen/mm.c | 38 ++---
+ arch/arm64/include/asm/xen/page-coherent.h | 2 -
+ arch/arm64/mm/init.c | 6 +-
+ arch/ia64/include/asm/iommu_table.h | 7 -
+ arch/ia64/mm/init.c | 4 +-
+ arch/mips/cavium-octeon/dma-octeon.c | 15 +-
+ arch/mips/loongson64/dma.c | 2 +-
+ arch/mips/pci/pci-octeon.c | 2 +-
+ arch/mips/sibyte/common/dma.c | 2 +-
+ arch/powerpc/include/asm/svm.h | 4 -
+ arch/powerpc/include/asm/swiotlb.h | 1 +
+ arch/powerpc/kernel/dma-swiotlb.c | 1 +
+ arch/powerpc/mm/mem.c | 6 +-
+ arch/powerpc/platforms/pseries/setup.c | 3 -
+ arch/powerpc/platforms/pseries/svm.c | 26 +---
+ arch/riscv/mm/init.c | 8 +-
+ arch/s390/mm/init.c | 3 +-
+ arch/x86/include/asm/dma-mapping.h | 12 --
+ arch/x86/include/asm/gart.h | 5 +-
+ arch/x86/include/asm/iommu.h | 8 +
+ arch/x86/include/asm/iommu_table.h | 102 -------------
+ arch/x86/include/asm/swiotlb.h | 30 ----
+ arch/x86/include/asm/xen/page-coherent.h | 24 ---
+ arch/x86/include/asm/xen/page.h | 5 -
+ arch/x86/include/asm/xen/swiotlb-xen.h | 8 +-
+ arch/x86/kernel/Makefile | 2 -
+ arch/x86/kernel/amd_gart_64.c | 5 +-
+ arch/x86/kernel/aperture_64.c | 14 +-
+ arch/x86/kernel/cpu/mshyperv.c | 8 -
+ arch/x86/kernel/pci-dma.c | 114 +++++++++++---
+ arch/x86/kernel/pci-iommu_table.c | 77 ----------
+ arch/x86/kernel/pci-swiotlb.c | 77 ----------
+ arch/x86/kernel/tboot.c | 1 -
+ arch/x86/kernel/vmlinux.lds.S | 12 --
+ arch/x86/mm/mem_encrypt_amd.c | 3 -
+ arch/x86/pci/sta2x11-fixup.c | 2 +-
+ arch/x86/xen/Makefile | 2 -
+ arch/x86/xen/mmu_pv.c | 1 +
+ arch/x86/xen/pci-swiotlb-xen.c | 96 ------------
+ drivers/iommu/amd/init.c | 6 -
+ drivers/iommu/amd/iommu.c | 5 +-
+ drivers/iommu/intel/dmar.c | 6 +-
+ drivers/xen/swiotlb-xen.c | 231 +++++------------------------
+ include/linux/dmar.h | 6 +-
+ include/linux/swiotlb.h | 22 +--
+ include/trace/events/swiotlb.h | 29 ++--
+ include/xen/arm/page-coherent.h | 20 ---
+ include/xen/arm/page.h | 1 -
+ include/xen/swiotlb-xen.h | 2 -
+ include/xen/xen-ops.h | 7 -
+ kernel/dma/debug.c | 2 +-
+ kernel/dma/direct.c | 31 ++--
+ kernel/dma/direct.h | 2 +-
+ kernel/dma/swiotlb.c | 186 +++++++++++------------
+ 56 files changed, 319 insertions(+), 983 deletions(-)
+ delete mode 100644 arch/arm/include/asm/xen/page-coherent.h
+ delete mode 100644 arch/arm64/include/asm/xen/page-coherent.h
+ delete mode 100644 arch/ia64/include/asm/iommu_table.h
+ delete mode 100644 arch/x86/include/asm/iommu_table.h
+ delete mode 100644 arch/x86/include/asm/swiotlb.h
+ delete mode 100644 arch/x86/include/asm/xen/page-coherent.h
+ delete mode 100644 arch/x86/kernel/pci-iommu_table.c
+ delete mode 100644 arch/x86/kernel/pci-swiotlb.c
+ delete mode 100644 arch/x86/xen/pci-swiotlb-xen.c
+ delete mode 100644 include/xen/arm/page-coherent.h
+Merging asm-generic/master (b2441b3bdce6 h8300: remove stale bindings and symlink)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master
+CONFLICT (modify/delete): Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml deleted in asm-generic/master and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml left in tree.
+Auto-merging Documentation/features/debug/debug-vm-pgtable/arch-support.txt
+Auto-merging Documentation/features/time/context-tracking/arch-support.txt
+Auto-merging Documentation/features/time/virt-cpuacct/arch-support.txt
+Auto-merging MAINTAINERS
+Auto-merging arch/riscv/Kconfig
+Auto-merging drivers/clocksource/Kconfig
+Auto-merging drivers/clocksource/Makefile
+Auto-merging drivers/irqchip/Kconfig
+Auto-merging drivers/irqchip/Makefile
+Auto-merging include/asm-generic/qrwlock.h
+Auto-merging init/Kconfig
+Auto-merging usr/include/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml
+rm 'Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml'
+$ git commit --no-edit -v -a
+[master 070634929965] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/clock/renesas,h8300-div-clock.txt | 24 --
+ .../bindings/clock/renesas,h8s2678-pll-clock.txt | 23 --
+ Documentation/devicetree/bindings/h8300/cpu.txt | 13 -
+ .../interrupt-controller/renesas,h8300h-intc.txt | 22 --
+ .../interrupt-controller/renesas,h8s-intc.txt | 22 --
+ .../memory-controllers/renesas,h8300-bsc.yaml | 35 --
+ .../bindings/timer/renesas,16bit-timer.txt | 25 --
+ .../bindings/timer/renesas,8bit-timer.txt | 25 --
+ .../features/core/cBPF-JIT/arch-support.txt | 1 -
+ .../features/core/eBPF-JIT/arch-support.txt | 1 -
+ .../core/generic-idle-thread/arch-support.txt | 1 -
+ .../features/core/jump-labels/arch-support.txt | 1 -
+ .../core/thread-info-in-task/arch-support.txt | 1 -
+ .../features/core/tracehook/arch-support.txt | 1 -
+ .../features/debug/KASAN/arch-support.txt | 1 -
+ .../debug/debug-vm-pgtable/arch-support.txt | 1 -
+ .../debug/gcov-profile-all/arch-support.txt | 1 -
+ Documentation/features/debug/kcov/arch-support.txt | 1 -
+ Documentation/features/debug/kgdb/arch-support.txt | 1 -
+ .../features/debug/kmemleak/arch-support.txt | 1 -
+ .../debug/kprobes-on-ftrace/arch-support.txt | 1 -
+ .../features/debug/kprobes/arch-support.txt | 1 -
+ .../features/debug/kretprobes/arch-support.txt | 1 -
+ .../features/debug/optprobes/arch-support.txt | 1 -
+ .../features/debug/stackprotector/arch-support.txt | 1 -
+ .../features/debug/uprobes/arch-support.txt | 1 -
+ .../debug/user-ret-profiler/arch-support.txt | 1 -
+ .../features/io/dma-contiguous/arch-support.txt | 1 -
+ .../locking/cmpxchg-local/arch-support.txt | 1 -
+ .../features/locking/lockdep/arch-support.txt | 1 -
+ .../locking/queued-rwlocks/arch-support.txt | 1 -
+ .../locking/queued-spinlocks/arch-support.txt | 1 -
+ .../features/perf/kprobes-event/arch-support.txt | 1 -
+ .../features/perf/perf-regs/arch-support.txt | 1 -
+ .../features/perf/perf-stackdump/arch-support.txt | 1 -
+ .../sched/membarrier-sync-core/arch-support.txt | 1 -
+ .../features/sched/numa-balancing/arch-support.txt | 1 -
+ .../seccomp/seccomp-filter/arch-support.txt | 1 -
+ .../time/arch-tick-broadcast/arch-support.txt | 1 -
+ .../features/time/clockevents/arch-support.txt | 1 -
+ .../time/context-tracking/arch-support.txt | 1 -
+ .../features/time/irq-time-acct/arch-support.txt | 1 -
+ .../features/time/virt-cpuacct/arch-support.txt | 1 -
+ .../features/vm/ELF-ASLR/arch-support.txt | 1 -
+ .../features/vm/PG_uncached/arch-support.txt | 1 -
+ Documentation/features/vm/THP/arch-support.txt | 1 -
+ Documentation/features/vm/TLB/arch-support.txt | 1 -
+ .../features/vm/huge-vmap/arch-support.txt | 1 -
+ .../features/vm/ioremap_prot/arch-support.txt | 1 -
+ .../features/vm/pte_special/arch-support.txt | 1 -
+ MAINTAINERS | 11 -
+ arch/csky/include/asm/Kbuild | 3 +
+ arch/csky/include/asm/spinlock.h | 89 -----
+ arch/csky/include/asm/spinlock_types.h | 27 --
+ arch/h8300/Kbuild | 5 -
+ arch/h8300/Kconfig | 49 ---
+ arch/h8300/Kconfig.cpu | 99 -----
+ arch/h8300/Kconfig.debug | 2 -
+ arch/h8300/Makefile | 44 ---
+ arch/h8300/boot/Makefile | 27 --
+ arch/h8300/boot/compressed/Makefile | 45 ---
+ arch/h8300/boot/compressed/head.S | 49 ---
+ arch/h8300/boot/compressed/misc.c | 76 ----
+ arch/h8300/boot/compressed/vmlinux.lds | 35 --
+ arch/h8300/boot/compressed/vmlinux.scr | 9 -
+ arch/h8300/boot/dts/Makefile | 6 -
+ arch/h8300/boot/dts/edosk2674.dts | 108 -----
+ arch/h8300/boot/dts/h8300h_sim.dts | 97 -----
+ arch/h8300/boot/dts/h8s_sim.dts | 100 -----
+ arch/h8300/configs/edosk2674_defconfig | 48 ---
+ arch/h8300/configs/h8300h-sim_defconfig | 48 ---
+ arch/h8300/configs/h8s-sim_defconfig | 48 ---
+ arch/h8300/include/asm/Kbuild | 8 -
+ arch/h8300/include/asm/bitops.h | 179 ---------
+ arch/h8300/include/asm/bug.h | 13 -
+ arch/h8300/include/asm/byteorder.h | 7 -
+ arch/h8300/include/asm/cache.h | 12 -
+ arch/h8300/include/asm/elf.h | 102 -----
+ arch/h8300/include/asm/flat.h | 36 --
+ arch/h8300/include/asm/hash.h | 54 ---
+ arch/h8300/include/asm/io.h | 67 ----
+ arch/h8300/include/asm/irq.h | 25 --
+ arch/h8300/include/asm/irqflags.h | 97 -----
+ arch/h8300/include/asm/kgdb.h | 45 ---
+ arch/h8300/include/asm/mmu_context.h | 6 -
+ arch/h8300/include/asm/page.h | 17 -
+ arch/h8300/include/asm/page_offset.h | 2 -
+ arch/h8300/include/asm/pgtable.h | 43 --
+ arch/h8300/include/asm/processor.h | 126 ------
+ arch/h8300/include/asm/ptrace.h | 39 --
+ arch/h8300/include/asm/signal.h | 23 --
+ arch/h8300/include/asm/smp.h | 1 -
+ arch/h8300/include/asm/string.h | 18 -
+ arch/h8300/include/asm/switch_to.h | 52 ---
+ arch/h8300/include/asm/syscall.h | 43 --
+ arch/h8300/include/asm/thread_info.h | 102 -----
+ arch/h8300/include/asm/tlb.h | 7 -
+ arch/h8300/include/asm/traps.h | 41 --
+ arch/h8300/include/asm/user.h | 71 ----
+ arch/h8300/include/asm/vmalloc.h | 4 -
+ arch/h8300/include/uapi/asm/Kbuild | 2 -
+ arch/h8300/include/uapi/asm/byteorder.h | 7 -
+ arch/h8300/include/uapi/asm/posix_types.h | 13 -
+ arch/h8300/include/uapi/asm/ptrace.h | 43 --
+ arch/h8300/include/uapi/asm/sigcontext.h | 19 -
+ arch/h8300/include/uapi/asm/signal.h | 92 -----
+ arch/h8300/include/uapi/asm/unistd.h | 8 -
+ arch/h8300/kernel/.gitignore | 2 -
+ arch/h8300/kernel/Makefile | 22 --
+ arch/h8300/kernel/asm-offsets.c | 70 ----
+ arch/h8300/kernel/entry.S | 433 ---------------------
+ arch/h8300/kernel/h8300_ksyms.c | 35 --
+ arch/h8300/kernel/head_ram.S | 60 ---
+ arch/h8300/kernel/head_rom.S | 111 ------
+ arch/h8300/kernel/irq.c | 99 -----
+ arch/h8300/kernel/kgdb.c | 135 -------
+ arch/h8300/kernel/module.c | 71 ----
+ arch/h8300/kernel/process.c | 173 --------
+ arch/h8300/kernel/ptrace.c | 199 ----------
+ arch/h8300/kernel/ptrace_h.c | 256 ------------
+ arch/h8300/kernel/ptrace_s.c | 44 ---
+ arch/h8300/kernel/setup.c | 213 ----------
+ arch/h8300/kernel/signal.c | 287 --------------
+ arch/h8300/kernel/sim-console.c | 31 --
+ arch/h8300/kernel/syscalls.c | 15 -
+ arch/h8300/kernel/traps.c | 156 --------
+ arch/h8300/kernel/vmlinux.lds.S | 69 ----
+ arch/h8300/lib/Makefile | 9 -
+ arch/h8300/lib/abs.S | 21 -
+ arch/h8300/lib/ashldi3.c | 25 --
+ arch/h8300/lib/ashrdi3.c | 25 --
+ arch/h8300/lib/delay.c | 41 --
+ arch/h8300/lib/libgcc.h | 78 ----
+ arch/h8300/lib/lshrdi3.c | 24 --
+ arch/h8300/lib/memcpy.S | 86 ----
+ arch/h8300/lib/memset.S | 70 ----
+ arch/h8300/lib/moddivsi3.S | 73 ----
+ arch/h8300/lib/modsi3.S | 73 ----
+ arch/h8300/lib/muldi3.c | 45 ---
+ arch/h8300/lib/mulsi3.S | 39 --
+ arch/h8300/lib/ucmpdi2.c | 18 -
+ arch/h8300/lib/udivsi3.S | 77 ----
+ arch/h8300/mm/Makefile | 6 -
+ arch/h8300/mm/fault.c | 57 ---
+ arch/h8300/mm/init.c | 95 -----
+ arch/h8300/mm/memory.c | 52 ---
+ arch/mips/include/uapi/asm/stat.h | 20 +-
+ arch/openrisc/Kconfig | 1 -
+ arch/openrisc/include/asm/Kbuild | 5 +-
+ arch/openrisc/include/asm/spinlock.h | 27 --
+ arch/openrisc/include/asm/spinlock_types.h | 7 -
+ arch/powerpc/include/uapi/asm/stat.h | 10 +-
+ arch/riscv/Kconfig | 1 +
+ arch/riscv/include/asm/Kbuild | 4 +
+ arch/riscv/include/asm/spinlock.h | 135 -------
+ arch/riscv/include/asm/spinlock_types.h | 25 --
+ arch/sparc/include/uapi/asm/stat.h | 12 +-
+ drivers/clk/Makefile | 1 -
+ drivers/clk/h8300/Makefile | 3 -
+ drivers/clk/h8300/clk-div.c | 57 ---
+ drivers/clk/h8300/clk-h8s2678.c | 145 -------
+ drivers/clocksource/Kconfig | 20 -
+ drivers/clocksource/Makefile | 3 -
+ drivers/clocksource/h8300_timer16.c | 192 ---------
+ drivers/clocksource/h8300_timer8.c | 211 ----------
+ drivers/clocksource/h8300_tpu.c | 158 --------
+ drivers/irqchip/Kconfig | 11 -
+ drivers/irqchip/Makefile | 2 -
+ drivers/irqchip/irq-renesas-h8300h.c | 94 -----
+ drivers/irqchip/irq-renesas-h8s.c | 102 -----
+ drivers/net/ethernet/smsc/Kconfig | 4 +-
+ drivers/net/ethernet/smsc/smc91x.h | 11 -
+ drivers/tty/serial/Kconfig | 5 +-
+ include/asm-generic/qrwlock.h | 4 +
+ include/asm-generic/qspinlock.h | 29 ++
+ include/asm-generic/spinlock.h | 94 ++++-
+ include/asm-generic/spinlock_types.h | 17 +
+ include/uapi/linux/agpgart.h | 9 +-
+ init/Kconfig | 3 +-
+ scripts/dtc/include-prefixes/h8300 | 1 -
+ tools/arch/h8300/include/asm/bitsperlong.h | 15 -
+ tools/arch/h8300/include/uapi/asm/mman.h | 7 -
+ usr/dummy-include/stdbool.h | 7 +
+ usr/dummy-include/stdlib.h | 7 +
+ usr/include/Makefile | 12 +-
+ 185 files changed, 192 insertions(+), 7354 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/clock/renesas,h8300-div-clock.txt
+ delete mode 100644 Documentation/devicetree/bindings/clock/renesas,h8s2678-pll-clock.txt
+ delete mode 100644 Documentation/devicetree/bindings/h8300/cpu.txt
+ delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,h8300h-intc.txt
+ delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,h8s-intc.txt
+ delete mode 100644 Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/timer/renesas,16bit-timer.txt
+ delete mode 100644 Documentation/devicetree/bindings/timer/renesas,8bit-timer.txt
+ delete mode 100644 arch/csky/include/asm/spinlock.h
+ delete mode 100644 arch/csky/include/asm/spinlock_types.h
+ delete mode 100644 arch/h8300/Kbuild
+ delete mode 100644 arch/h8300/Kconfig
+ delete mode 100644 arch/h8300/Kconfig.cpu
+ delete mode 100644 arch/h8300/Kconfig.debug
+ delete mode 100644 arch/h8300/Makefile
+ delete mode 100644 arch/h8300/boot/Makefile
+ delete mode 100644 arch/h8300/boot/compressed/Makefile
+ delete mode 100644 arch/h8300/boot/compressed/head.S
+ delete mode 100644 arch/h8300/boot/compressed/misc.c
+ delete mode 100644 arch/h8300/boot/compressed/vmlinux.lds
+ delete mode 100644 arch/h8300/boot/compressed/vmlinux.scr
+ delete mode 100644 arch/h8300/boot/dts/Makefile
+ delete mode 100644 arch/h8300/boot/dts/edosk2674.dts
+ delete mode 100644 arch/h8300/boot/dts/h8300h_sim.dts
+ delete mode 100644 arch/h8300/boot/dts/h8s_sim.dts
+ delete mode 100644 arch/h8300/configs/edosk2674_defconfig
+ delete mode 100644 arch/h8300/configs/h8300h-sim_defconfig
+ delete mode 100644 arch/h8300/configs/h8s-sim_defconfig
+ delete mode 100644 arch/h8300/include/asm/Kbuild
+ delete mode 100644 arch/h8300/include/asm/bitops.h
+ delete mode 100644 arch/h8300/include/asm/bug.h
+ delete mode 100644 arch/h8300/include/asm/byteorder.h
+ delete mode 100644 arch/h8300/include/asm/cache.h
+ delete mode 100644 arch/h8300/include/asm/elf.h
+ delete mode 100644 arch/h8300/include/asm/flat.h
+ delete mode 100644 arch/h8300/include/asm/hash.h
+ delete mode 100644 arch/h8300/include/asm/io.h
+ delete mode 100644 arch/h8300/include/asm/irq.h
+ delete mode 100644 arch/h8300/include/asm/irqflags.h
+ delete mode 100644 arch/h8300/include/asm/kgdb.h
+ delete mode 100644 arch/h8300/include/asm/mmu_context.h
+ delete mode 100644 arch/h8300/include/asm/page.h
+ delete mode 100644 arch/h8300/include/asm/page_offset.h
+ delete mode 100644 arch/h8300/include/asm/pgtable.h
+ delete mode 100644 arch/h8300/include/asm/processor.h
+ delete mode 100644 arch/h8300/include/asm/ptrace.h
+ delete mode 100644 arch/h8300/include/asm/signal.h
+ delete mode 100644 arch/h8300/include/asm/smp.h
+ delete mode 100644 arch/h8300/include/asm/string.h
+ delete mode 100644 arch/h8300/include/asm/switch_to.h
+ delete mode 100644 arch/h8300/include/asm/syscall.h
+ delete mode 100644 arch/h8300/include/asm/thread_info.h
+ delete mode 100644 arch/h8300/include/asm/tlb.h
+ delete mode 100644 arch/h8300/include/asm/traps.h
+ delete mode 100644 arch/h8300/include/asm/user.h
+ delete mode 100644 arch/h8300/include/asm/vmalloc.h
+ delete mode 100644 arch/h8300/include/uapi/asm/Kbuild
+ delete mode 100644 arch/h8300/include/uapi/asm/byteorder.h
+ delete mode 100644 arch/h8300/include/uapi/asm/posix_types.h
+ delete mode 100644 arch/h8300/include/uapi/asm/ptrace.h
+ delete mode 100644 arch/h8300/include/uapi/asm/sigcontext.h
+ delete mode 100644 arch/h8300/include/uapi/asm/signal.h
+ delete mode 100644 arch/h8300/include/uapi/asm/unistd.h
+ delete mode 100644 arch/h8300/kernel/.gitignore
+ delete mode 100644 arch/h8300/kernel/Makefile
+ delete mode 100644 arch/h8300/kernel/asm-offsets.c
+ delete mode 100644 arch/h8300/kernel/entry.S
+ delete mode 100644 arch/h8300/kernel/h8300_ksyms.c
+ delete mode 100644 arch/h8300/kernel/head_ram.S
+ delete mode 100644 arch/h8300/kernel/head_rom.S
+ delete mode 100644 arch/h8300/kernel/irq.c
+ delete mode 100644 arch/h8300/kernel/kgdb.c
+ delete mode 100644 arch/h8300/kernel/module.c
+ delete mode 100644 arch/h8300/kernel/process.c
+ delete mode 100644 arch/h8300/kernel/ptrace.c
+ delete mode 100644 arch/h8300/kernel/ptrace_h.c
+ delete mode 100644 arch/h8300/kernel/ptrace_s.c
+ delete mode 100644 arch/h8300/kernel/setup.c
+ delete mode 100644 arch/h8300/kernel/signal.c
+ delete mode 100644 arch/h8300/kernel/sim-console.c
+ delete mode 100644 arch/h8300/kernel/syscalls.c
+ delete mode 100644 arch/h8300/kernel/traps.c
+ delete mode 100644 arch/h8300/kernel/vmlinux.lds.S
+ delete mode 100644 arch/h8300/lib/Makefile
+ delete mode 100644 arch/h8300/lib/abs.S
+ delete mode 100644 arch/h8300/lib/ashldi3.c
+ delete mode 100644 arch/h8300/lib/ashrdi3.c
+ delete mode 100644 arch/h8300/lib/delay.c
+ delete mode 100644 arch/h8300/lib/libgcc.h
+ delete mode 100644 arch/h8300/lib/lshrdi3.c
+ delete mode 100644 arch/h8300/lib/memcpy.S
+ delete mode 100644 arch/h8300/lib/memset.S
+ delete mode 100644 arch/h8300/lib/moddivsi3.S
+ delete mode 100644 arch/h8300/lib/modsi3.S
+ delete mode 100644 arch/h8300/lib/muldi3.c
+ delete mode 100644 arch/h8300/lib/mulsi3.S
+ delete mode 100644 arch/h8300/lib/ucmpdi2.c
+ delete mode 100644 arch/h8300/lib/udivsi3.S
+ delete mode 100644 arch/h8300/mm/Makefile
+ delete mode 100644 arch/h8300/mm/fault.c
+ delete mode 100644 arch/h8300/mm/init.c
+ delete mode 100644 arch/h8300/mm/memory.c
+ delete mode 100644 arch/openrisc/include/asm/spinlock.h
+ delete mode 100644 arch/openrisc/include/asm/spinlock_types.h
+ delete mode 100644 arch/riscv/include/asm/spinlock.h
+ delete mode 100644 arch/riscv/include/asm/spinlock_types.h
+ delete mode 100644 drivers/clk/h8300/Makefile
+ delete mode 100644 drivers/clk/h8300/clk-div.c
+ delete mode 100644 drivers/clk/h8300/clk-h8s2678.c
+ delete mode 100644 drivers/clocksource/h8300_timer16.c
+ delete mode 100644 drivers/clocksource/h8300_timer8.c
+ delete mode 100644 drivers/clocksource/h8300_tpu.c
+ delete mode 100644 drivers/irqchip/irq-renesas-h8300h.c
+ delete mode 100644 drivers/irqchip/irq-renesas-h8s.c
+ create mode 100644 include/asm-generic/spinlock_types.h
+ delete mode 120000 scripts/dtc/include-prefixes/h8300
+ delete mode 100644 tools/arch/h8300/include/asm/bitsperlong.h
+ delete mode 100644 tools/arch/h8300/include/uapi/asm/mman.h
+ create mode 100644 usr/dummy-include/stdbool.h
+ create mode 100644 usr/dummy-include/stdlib.h
+Merging arc/for-next (6aa98f621786 ARC: bpf: define uapi for BPF_PROG_TYPE_PERF_EVENT program type)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next
+Merge made by the 'ort' strategy.
+ arch/arc/Kconfig | 2 +
+ arch/arc/include/asm/perf_event.h | 4 +
+ arch/arc/include/asm/ptrace.h | 27 ++++++
+ arch/arc/include/asm/syscall.h | 2 +
+ arch/arc/include/asm/thread_info.h | 5 +-
+ arch/arc/include/uapi/asm/bpf_perf_event.h | 9 ++
+ arch/arc/kernel/disasm.c | 64 ++++++++++++-
+ arch/arc/kernel/entry.S | 12 +--
+ arch/arc/kernel/ptrace.c | 140 ++++++++++++++++++++++++++++-
+ 9 files changed, 253 insertions(+), 12 deletions(-)
+ create mode 100644 arch/arc/include/uapi/asm/bpf_perf_event.h
+Merging arm/for-next (b6f21d14f1ac ARM: 9204/2: module: Add all unwind tables when load module)
+$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next
+Already up to date.
+Merging arm64/for-next/core (0616ea3f1b93 Merge branch 'for-next/esr-elx-64-bit' into for-next/core)
+$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core
+Already up to date.
+Merging arm-perf/for-next/perf (c5781212985a perf/arm-cmn: Decode CAL devices properly in debugfs)
+$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf
+Already up to date.
+Merging arm-soc/for-next (2b7d17d4b7c1 soc: document merges)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next
+Auto-merging Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/Kconfig
+CONFLICT (content): Merge conflict in arch/arm/Kconfig
+Auto-merging arch/arm/Makefile
+Auto-merging arch/arm/include/asm/io.h
+Auto-merging arch/arm/mach-s3c/cpu.c
+Auto-merging arch/arm/mach-s3c/s3c24xx.c
+Auto-merging arch/arm/mach-s3c/s3c64xx.c
+Auto-merging arch/arm/mach-sunxi/Kconfig
+Auto-merging arch/arm/mm/ioremap.c
+Auto-merging arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
+Auto-merging arch/arm64/boot/dts/mediatek/mt7622.dtsi
+Auto-merging drivers/soc/rockchip/pm_domains.c
+Auto-merging drivers/spi/Kconfig
+Auto-merging sound/soc/pxa/hx4700.c
+Auto-merging sound/soc/pxa/palm27x.c
+Auto-merging sound/soc/pxa/z2.c
+Resolved 'arch/arm/Kconfig' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 91198f4f7826] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/arm/arm,corstone1000.yaml | 45 +
+ .../devicetree/bindings/arm/bcm/brcm,bcm4708.yaml | 10 +-
+ .../devicetree/bindings/arm/bcm/brcm,bcmbca.yaml | 33 +
+ Documentation/devicetree/bindings/arm/fsl.yaml | 119 +-
+ .../devicetree/bindings/arm/mediatek.yaml | 5 +
+ .../bindings/arm/mediatek/mediatek,mmsys.yaml | 32 +
+ .../bindings/arm/mediatek/mediatek,pericfg.yaml | 1 +
+ .../devicetree/bindings/arm/msm/qcom,llcc.yaml | 2 +
+ .../devicetree/bindings/arm/omap/prcm.txt | 7 +-
+ Documentation/devicetree/bindings/arm/qcom.yaml | 21 +
+ Documentation/devicetree/bindings/arm/renesas.yaml | 20 +
+ .../devicetree/bindings/arm/rockchip.yaml | 23 +-
+ .../devicetree/bindings/arm/stm32/stm32.yaml | 63 +-
+ Documentation/devicetree/bindings/arm/sunxi.yaml | 5 +
+ Documentation/devicetree/bindings/arm/syna.txt | 4 -
+ Documentation/devicetree/bindings/arm/ux500.yaml | 5 +
+ .../bindings/bus/qcom,ssc-block-bus.yaml | 147 +
+ .../bindings/clock/qcom,sc7280-lpasscorecc.yaml | 172 +
+ .../bindings/clock/samsung,exynosautov9-clock.yaml | 219 ++
+ .../devicetree/bindings/clock/st,stm32mp1-rcc.yaml | 41 +
+ .../devicetree/bindings/clock/ti-clkctrl.txt | 4 +-
+ .../devicetree/bindings/clock/ti/clockdomain.txt | 3 +
+ .../devicetree/bindings/clock/ti/composite.txt | 3 +
+ .../bindings/clock/ti/fixed-factor-clock.txt | 1 +
+ .../devicetree/bindings/clock/ti/gate.txt | 1 +
+ .../devicetree/bindings/clock/ti/interface.txt | 1 +
+ Documentation/devicetree/bindings/clock/ti/mux.txt | 1 +
+ .../devicetree/bindings/dma/fsl-imx-dma.txt | 8 +-
+ .../devicetree/bindings/firmware/qcom,scm.txt | 3 +-
+ .../bindings/interconnect/qcom,bcm-voter.yaml | 8 +-
+ .../devicetree/bindings/iommu/apple,sart.yaml | 52 +
+ .../memory-controllers/nvidia,tegra186-mc.yaml | 80 +-
+ .../memory-controllers/renesas,rpc-if.yaml | 6 +
+ .../bindings/net/wireless/silabs,wfx.yaml | 1 +
+ .../devicetree/bindings/nvme/apple,nvme-ans.yaml | 111 +
+ .../devicetree/bindings/power/qcom,rpmpd.yaml | 3 +
+ .../bindings/power/renesas,rcar-sysc.yaml | 1 +
+ .../bindings/regulator/qcom,smd-rpm-regulator.yaml | 5 +-
+ .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 2 +-
+ .../bindings/remoteproc/qcom,wcnss-pil.txt | 2 +-
+ .../devicetree/bindings/reset/altr,rst-mgr.yaml | 47 +
+ .../bindings/reset/amlogic,meson-axg-audio-arb.txt | 22 -
+ .../reset/amlogic,meson-axg-audio-arb.yaml | 56 +
+ .../bindings/reset/amlogic,meson-reset.yaml | 1 +
+ .../devicetree/bindings/reset/ath79-reset.txt | 20 -
+ .../devicetree/bindings/reset/berlin,reset.txt | 23 -
+ .../bindings/reset/bitmain,bm1880-reset.txt | 18 -
+ .../bindings/reset/bitmain,bm1880-reset.yaml | 36 +
+ .../devicetree/bindings/reset/lantiq,reset.txt | 30 -
+ .../devicetree/bindings/reset/lantiq,reset.yaml | 49 +
+ .../bindings/reset/marvell,berlin2-reset.yaml | 38 +
+ .../bindings/reset/nuvoton,npcm-reset.txt | 32 -
+ .../bindings/reset/nuvoton,npcm750-reset.yaml | 50 +
+ .../bindings/reset/qca,ar7100-reset.yaml | 40 +
+ .../devicetree/bindings/reset/renesas,rst.yaml | 1 +
+ .../bindings/reset/snps,axs10x-reset.txt | 33 -
+ .../bindings/reset/snps,axs10x-reset.yaml | 48 +
+ .../devicetree/bindings/reset/socfpga-reset.txt | 16 -
+ .../reset/socionext,uniphier-glue-reset.yaml | 52 +-
+ .../bindings/reset/st,sti-picophyreset.txt | 42 -
+ .../devicetree/bindings/reset/st,sti-powerdown.txt | 45 -
+ .../bindings/reset/st,stih407-picophyreset.yaml | 47 +
+ .../bindings/reset/st,stih407-powerdown.yaml | 49 +
+ .../bindings/soc/imx/fsl,imx8mp-hdmi-blk-ctrl.yaml | 84 +
+ .../soc/imx/fsl,imx8mp-media-blk-ctrl.yaml | 104 +
+ .../devicetree/bindings/soc/mediatek/pwrap.txt | 10 +-
+ .../devicetree/bindings/soc/qcom/qcom,geni-se.yaml | 99 +-
+ .../devicetree/bindings/soc/qcom/qcom,gsbi.txt | 87 -
+ .../devicetree/bindings/soc/qcom/qcom,gsbi.yaml | 132 +
+ .../bindings/soc/qcom/qcom,rpmh-rsc.yaml | 272 ++
+ .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 7 +-
+ .../devicetree/bindings/soc/qcom/qcom,smd.txt | 98 -
+ .../devicetree/bindings/soc/qcom/qcom,smd.yaml | 137 +
+ .../devicetree/bindings/soc/qcom/qcom,smp2p.txt | 110 -
+ .../devicetree/bindings/soc/qcom/qcom,smp2p.yaml | 145 +
+ .../devicetree/bindings/soc/qcom/qcom,smsm.txt | 104 -
+ .../devicetree/bindings/soc/qcom/qcom,smsm.yaml | 138 +
+ .../devicetree/bindings/soc/qcom/qcom,wcnss.txt | 131 -
+ .../devicetree/bindings/soc/qcom/qcom,wcnss.yaml | 137 +
+ .../devicetree/bindings/soc/qcom/rpmh-rsc.txt | 137 -
+ .../{power => soc/renesas}/renesas,rzg2l-sysc.yaml | 7 +-
+ .../devicetree/bindings/soc/rockchip/grf.yaml | 3 +
+ .../bindings/soc/samsung/exynos-usi.yaml | 2 +-
+ .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 1 +
+ .../devicetree/bindings/spi/qcom,spi-geni-qcom.txt | 39 -
+ .../bindings/spi/qcom,spi-geni-qcom.yaml | 116 +
+ .../bindings/timer/samsung,exynos4210-mct.yaml | 67 +-
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 24 +-
+ MAINTAINERS | 87 +-
+ arch/arm/Kconfig | 128 +-
+ arch/arm/Kconfig.debug | 28 +-
+ arch/arm/Makefile | 9 +-
+ arch/arm/arm-soc-for-next-contents.txt | 267 ++
+ .../uncompress.h => boot/compressed/misc-ep93xx.h} | 70 +-
+ arch/arm/boot/compressed/misc.c | 4 +
+ arch/arm/boot/dts/Makefile | 54 +-
+ arch/arm/boot/dts/am335x-baltos.dtsi | 2 +-
+ arch/arm/boot/dts/am335x-bone-common.dtsi | 4 +
+ arch/arm/boot/dts/am335x-evm.dts | 4 +
+ arch/arm/boot/dts/am335x-evmsk.dts | 4 +
+ arch/arm/boot/dts/am335x-guardian.dts | 376 +-
+ 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-myirtech-myc.dtsi | 12 +-
+ arch/arm/boot/dts/am335x-myirtech-myd.dts | 20 +-
+ arch/arm/boot/dts/am335x-phycore-som.dtsi | 2 +-
+ arch/arm/boot/dts/am335x-sl50.dts | 2 +-
+ arch/arm/boot/dts/am33xx-clocks.dtsi | 373 +-
+ arch/arm/boot/dts/am33xx.dtsi | 3 +
+ arch/arm/boot/dts/am35xx-clocks.dtsi | 52 +-
+ arch/arm/boot/dts/am3874-iceboard.dts | 2 +-
+ arch/arm/boot/dts/am437x-cm-t43.dts | 2 +-
+ arch/arm/boot/dts/am437x-gp-evm.dts | 5 +
+ arch/arm/boot/dts/am437x-idk-evm.dts | 2 +-
+ arch/arm/boot/dts/am437x-sk-evm.dts | 6 +-
+ arch/arm/boot/dts/am43x-epos-evm.dts | 6 +-
+ arch/arm/boot/dts/am43xx-clocks.dtsi | 339 +-
+ arch/arm/boot/dts/am574x-idk.dts | 2 +-
+ arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 2 +-
+ arch/arm/boot/dts/am57xx-idk-common.dtsi | 2 +-
+ arch/arm/boot/dts/armada-370-db.dts | 2 +-
+ .../dts/armada-370-seagate-personal-cloud.dtsi | 2 +-
+ arch/arm/boot/dts/armada-370-synology-ds213j.dts | 2 +-
+ arch/arm/boot/dts/armada-375-db.dts | 2 +-
+ arch/arm/boot/dts/armada-381-netgear-gs110emx.dts | 2 +-
+ arch/arm/boot/dts/armada-385-atl-x530.dts | 2 +-
+ arch/arm/boot/dts/armada-385-clearfog-gtr.dtsi | 2 +-
+ arch/arm/boot/dts/armada-385-db-88f6820-amc.dts | 2 +-
+ arch/arm/boot/dts/armada-385-db-ap.dts | 2 +-
+ arch/arm/boot/dts/armada-385-synology-ds116.dts | 2 +-
+ arch/arm/boot/dts/armada-385-turris-omnia.dts | 8 +-
+ arch/arm/boot/dts/armada-388-db.dts | 2 +-
+ arch/arm/boot/dts/armada-388-gp.dts | 2 +-
+ arch/arm/boot/dts/armada-388-rd.dts | 2 +-
+ .../arm/boot/dts/armada-38x-solidrun-microsom.dtsi | 2 +-
+ arch/arm/boot/dts/armada-390-db.dts | 2 +-
+ arch/arm/boot/dts/armada-398-db.dts | 2 +-
+ arch/arm/boot/dts/armada-xp-axpwifiap.dts | 2 +-
+ arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dts | 2 +-
+ arch/arm/boot/dts/armada-xp-crs305-1g-4s.dtsi | 2 +-
+ arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dts | 2 +-
+ arch/arm/boot/dts/armada-xp-crs326-24g-2s.dtsi | 2 +-
+ .../boot/dts/armada-xp-crs328-4c-20s-4s-bit.dts | 2 +-
+ arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dtsi | 2 +-
+ arch/arm/boot/dts/armada-xp-db-dxbc2.dts | 2 +-
+ arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts | 2 +-
+ arch/arm/boot/dts/armada-xp-db.dts | 2 +-
+ arch/arm/boot/dts/armada-xp-gp.dts | 2 +-
+ arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 2 +-
+ arch/arm/boot/dts/armada-xp-synology-ds414.dts | 2 +-
+ arch/arm/boot/dts/bcm-cygnus.dtsi | 12 +-
+ arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 21 +-
+ arch/arm/boot/dts/bcm2835-rpi-a.dts | 35 +-
+ arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 19 +-
+ arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 35 +-
+ arch/arm/boot/dts/bcm2835-rpi-b.dts | 48 +-
+ arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts | 1 -
+ arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 25 +-
+ arch/arm/boot/dts/bcm2835-rpi-zero.dts | 29 +-
+ arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 3 +-
+ arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 1 -
+ arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 5 +-
+ arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 3 +-
+ arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts | 5 +-
+ arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 12 +-
+ arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi | 2 +-
+ arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi | 2 +-
+ .../dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi | 192 +
+ arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp.dts | 26 +
+ arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp2.dts | 26 +
+ arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts | 19 +-
+ arch/arm/boot/dts/bcm47622.dtsi | 126 +
+ arch/arm/boot/dts/bcm53016-meraki-mr32.dts | 2 +-
+ arch/arm/boot/dts/bcm5301x.dtsi | 2 +-
+ arch/arm/boot/dts/bcm53340-ubnt-unifi-switch8.dts | 2 +-
+ arch/arm/boot/dts/bcm947622.dts | 30 +
+ arch/arm/boot/dts/bcm953012er.dts | 2 +-
+ arch/arm/boot/dts/bcm953012hr.dts | 2 +-
+ arch/arm/boot/dts/bcm953012k.dts | 2 +-
+ arch/arm/boot/dts/bcm958522er.dts | 2 +-
+ arch/arm/boot/dts/bcm958525er.dts | 2 +-
+ arch/arm/boot/dts/bcm958525xmc.dts | 2 +-
+ arch/arm/boot/dts/bcm958622hr.dts | 2 +-
+ arch/arm/boot/dts/bcm958623hr.dts | 2 +-
+ arch/arm/boot/dts/bcm958625hr.dts | 2 +-
+ arch/arm/boot/dts/bcm958625k.dts | 2 +-
+ arch/arm/boot/dts/bcm988312hr.dts | 2 +-
+ arch/arm/boot/dts/dm814x.dtsi | 3 +
+ arch/arm/boot/dts/dm816x.dtsi | 3 +
+ arch/arm/boot/dts/dove-cubox.dts | 2 +-
+ arch/arm/boot/dts/dove-d2plug.dts | 2 +-
+ arch/arm/boot/dts/dove-d3plug.dts | 2 +-
+ arch/arm/boot/dts/dove-dove-db.dts | 2 +-
+ arch/arm/boot/dts/dra7-evm-common.dtsi | 2 +-
+ arch/arm/boot/dts/dra72-evm-common.dtsi | 2 +-
+ arch/arm/boot/dts/dra76-evm.dts | 2 +-
+ arch/arm/boot/dts/dra7xx-clocks.dtsi | 693 ++--
+ arch/arm/boot/dts/exynos3250.dtsi | 7 +-
+ arch/arm/boot/dts/exynos4.dtsi | 10 +-
+ arch/arm/boot/dts/exynos4210-universal_c210.dts | 2 -
+ arch/arm/boot/dts/exynos4412-odroidu3.dts | 4 +-
+ arch/arm/boot/dts/exynos4412-odroidx.dts | 8 +-
+ arch/arm/boot/dts/exynos5250-smdk5250.dts | 4 +-
+ arch/arm/boot/dts/exynos5250.dtsi | 16 +-
+ arch/arm/boot/dts/exynos5260.dtsi | 3 +-
+ arch/arm/boot/dts/exynos5410-odroidxu.dts | 4 +-
+ arch/arm/boot/dts/exynos5410.dtsi | 4 -
+ arch/arm/boot/dts/exynos5420.dtsi | 10 -
+ arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 7 +-
+ arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 6 +-
+ arch/arm/boot/dts/exynos5422-odroidxu3.dts | 6 +-
+ arch/arm/boot/dts/exynos54xx.dtsi | 3 +-
+ arch/arm/boot/dts/imx27.dtsi | 2 +-
+ arch/arm/boot/dts/imx28-evk.dts | 2 +-
+ arch/arm/boot/dts/imx28-m28evk.dts | 2 +-
+ arch/arm/boot/dts/imx28-sps1.dts | 2 +-
+ arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts | 8 +
+ arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 25 +-
+ arch/arm/boot/dts/imx51.dtsi | 6 +
+ arch/arm/boot/dts/imx6dl-colibri-aster.dts | 113 +
+ arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 110 +-
+ arch/arm/boot/dts/imx6dl-colibri-iris-v2.dts | 46 +
+ arch/arm/boot/dts/imx6dl-colibri-iris.dts | 152 +
+ arch/arm/boot/dts/imx6dl-colibri-v1_1-eval-v3.dts | 31 -
+ arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts | 6 +-
+ arch/arm/boot/dts/imx6dl-plybas.dts | 2 +-
+ arch/arm/boot/dts/imx6dl-rex-basic.dts | 2 +-
+ arch/arm/boot/dts/imx6dl-victgo.dts | 657 +---
+ arch/arm/boot/dts/imx6dl-vicut1.dts | 1 +
+ arch/arm/boot/dts/imx6q-ba16.dtsi | 2 +-
+ arch/arm/boot/dts/imx6q-bosch-acc.dts | 779 ++++
+ arch/arm/boot/dts/imx6q-bx50v3.dtsi | 2 +-
+ arch/arm/boot/dts/imx6q-cm-fx6.dts | 2 +-
+ arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 2 +-
+ arch/arm/boot/dts/imx6q-dms-ba16.dts | 2 +-
+ arch/arm/boot/dts/imx6q-gw5400-a.dts | 2 +-
+ arch/arm/boot/dts/imx6q-marsboard.dts | 2 +-
+ arch/arm/boot/dts/imx6q-rex-pro.dts | 2 +-
+ arch/arm/boot/dts/imx6q-vicut1.dts | 5 +-
+ arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-colibri-v1_1-uhs.dtsi | 44 -
+ arch/arm/boot/dts/imx6qdl-colibri.dtsi | 771 +++-
+ arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 4 +-
+ arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-tx6.dtsi | 5 -
+ arch/arm/boot/dts/imx6qdl-udoo.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-vicut1-12inch.dtsi | 128 +
+ arch/arm/boot/dts/imx6qdl-vicut1.dtsi | 261 +-
+ arch/arm/boot/dts/imx6qp-vicutp.dts | 1 +
+ arch/arm/boot/dts/imx6sl-evk.dts | 2 +-
+ arch/arm/boot/dts/imx6sl.dtsi | 2 +-
+ arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 2 +-
+ arch/arm/boot/dts/imx6sx-sdb-reva.dts | 4 +-
+ arch/arm/boot/dts/imx6sx-sdb.dts | 4 +-
+ arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 2 +-
+ arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi | 2 +-
+ arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi | 2 +-
+ arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi | 2 +-
+ .../boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi | 2 +-
+ .../boot/dts/imx6ul-phytec-segin-peb-av-02.dtsi | 3 +-
+ arch/arm/boot/dts/imx6ul-tqma6ul-common.dtsi | 211 ++
+ arch/arm/boot/dts/imx6ul-tqma6ul1-mba6ulx.dts | 55 +
+ arch/arm/boot/dts/imx6ul-tqma6ul1.dtsi | 37 +
+ arch/arm/boot/dts/imx6ul-tqma6ul2-mba6ulx.dts | 15 +
+ arch/arm/boot/dts/imx6ul-tqma6ul2.dtsi | 71 +
+ arch/arm/boot/dts/imx6ul-tqma6ul2l-mba6ulx.dts | 15 +
+ arch/arm/boot/dts/imx6ul-tqma6ul2l.dtsi | 71 +
+ arch/arm/boot/dts/imx6ul-tqma6ulx-common.dtsi | 43 +
+ arch/arm/boot/dts/imx6ul-tqma6ulxl-common.dtsi | 48 +
+ arch/arm/boot/dts/imx6ull-colibri-aster.dts | 20 +
+ arch/arm/boot/dts/imx6ull-colibri-aster.dtsi | 145 +
+ arch/arm/boot/dts/imx6ull-colibri-emmc-aster.dts | 17 +
+ arch/arm/boot/dts/imx6ull-colibri-emmc-iris-v2.dts | 17 +
+ arch/arm/boot/dts/imx6ull-colibri-emmc-iris.dts | 17 +
+ .../arm/boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi | 8 +-
+ arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts | 6 +-
+ arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 63 +-
+ arch/arm/boot/dts/imx6ull-colibri-iris-v2.dts | 65 +
+ arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi | 27 +
+ arch/arm/boot/dts/imx6ull-colibri-iris.dts | 20 +
+ arch/arm/boot/dts/imx6ull-colibri-iris.dtsi | 132 +
+ arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi | 145 +-
+ arch/arm/boot/dts/imx6ull-colibri-wifi-aster.dts | 20 +
+ arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts | 4 +-
+ arch/arm/boot/dts/imx6ull-colibri-wifi-iris-v2.dts | 65 +
+ arch/arm/boot/dts/imx6ull-colibri-wifi-iris.dts | 20 +
+ arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 144 +-
+ arch/arm/boot/dts/imx6ull-colibri.dtsi | 285 +-
+ arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi | 2 +-
+ arch/arm/boot/dts/imx6ull-phytec-tauri-emmc.dts | 20 +
+ arch/arm/boot/dts/imx6ull-phytec-tauri-nand.dts | 20 +
+ arch/arm/boot/dts/imx6ull-phytec-tauri.dtsi | 588 +++
+ arch/arm/boot/dts/imx6ull-tqma6ull2-mba6ulx.dts | 15 +
+ arch/arm/boot/dts/imx6ull-tqma6ull2.dtsi | 76 +
+ arch/arm/boot/dts/imx6ull-tqma6ull2l-mba6ulx.dts | 15 +
+ arch/arm/boot/dts/imx6ull-tqma6ull2l.dtsi | 76 +
+ arch/arm/boot/dts/imx7d-smegw01.dts | 469 +++
+ arch/arm/boot/dts/imx7s.dtsi | 2 +-
+ arch/arm/boot/dts/imxrt1050-evk.dts | 72 +
+ arch/arm/boot/dts/imxrt1050.dtsi | 160 +
+ arch/arm/boot/dts/keystone-k2e-evm.dts | 4 +-
+ arch/arm/boot/dts/keystone-k2g-evm.dts | 2 +-
+ arch/arm/boot/dts/keystone-k2g-ice.dts | 2 +-
+ arch/arm/boot/dts/keystone-k2hk-evm.dts | 4 +-
+ arch/arm/boot/dts/keystone-k2l-evm.dts | 4 +-
+ arch/arm/boot/dts/kirkwood-dir665.dts | 2 +-
+ arch/arm/boot/dts/kirkwood-synology.dtsi | 2 +-
+ .../dts/lan966x-kontron-kswitch-d10-mmt-6g-2gs.dts | 94 +
+ .../dts/lan966x-kontron-kswitch-d10-mmt-8g.dts | 39 +
+ .../boot/dts/lan966x-kontron-kswitch-d10-mmt.dtsi | 190 +
+ arch/arm/boot/dts/lan966x-pcb8291.dts | 2 +-
+ arch/arm/boot/dts/lan966x.dtsi | 353 +-
+ arch/arm/boot/dts/logicpd-som-lv.dtsi | 10 +-
+ arch/arm/boot/dts/ls1021a-iot.dts | 227 ++
+ arch/arm/boot/dts/ls1021a.dtsi | 6 +-
+ arch/arm/boot/dts/mba6ulx.dtsi | 569 +++
+ arch/arm/boot/dts/meson8-minix-neo-x8.dts | 2 +-
+ arch/arm/boot/dts/mt2701.dtsi | 2 -
+ arch/arm/boot/dts/mt7623n.dtsi | 5 -
+ arch/arm/boot/dts/nspire-classic.dtsi | 10 +-
+ arch/arm/boot/dts/nspire-cx.dts | 4 +-
+ arch/arm/boot/dts/nspire.dtsi | 60 +-
+ arch/arm/boot/dts/nuvoton-npcm730-gbs.dts | 6 +-
+ arch/arm/boot/dts/nuvoton-npcm730-gsj.dts | 2 +-
+ arch/arm/boot/dts/nuvoton-npcm730-kudo.dts | 6 +-
+ arch/arm/boot/dts/nuvoton-npcm750-evb.dts | 8 +-
+ .../boot/dts/nuvoton-npcm750-runbmc-olympus.dts | 6 +-
+ arch/arm/boot/dts/omap3-beagle-xm.dts | 2 +-
+ arch/arm/boot/dts/omap3430es1-clocks.dtsi | 184 +-
+ arch/arm/boot/dts/omap34xx-omap36xx-clocks.dtsi | 275 +-
+ .../omap36xx-am35xx-omap3430es2plus-clocks.dtsi | 79 +-
+ arch/arm/boot/dts/omap36xx-clocks.dtsi | 17 +-
+ .../boot/dts/omap36xx-omap3430es2plus-clocks.dtsi | 136 +-
+ arch/arm/boot/dts/omap3xxx-clocks.dtsi | 2044 ++++++-----
+ arch/arm/boot/dts/omap4-panda-common.dtsi | 2 +-
+ arch/arm/boot/dts/omap443x-clocks.dtsi | 1 +
+ arch/arm/boot/dts/omap446x-clocks.dtsi | 2 +
+ arch/arm/boot/dts/omap44xx-clocks.dtsi | 173 +-
+ arch/arm/boot/dts/omap5-igep0050.dts | 2 +-
+ arch/arm/boot/dts/omap5-uevm.dts | 2 +-
+ arch/arm/boot/dts/omap54xx-clocks.dtsi | 160 +-
+ arch/arm/boot/dts/ox820.dtsi | 2 +-
+ arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts | 294 ++
+ ...dts => qcom-apq8064-sony-xperia-lagan-yuga.dts} | 0
+ arch/arm/boot/dts/qcom-apq8064.dtsi | 16 +-
+ arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 582 ++-
+ arch/arm/boot/dts/qcom-apq8084.dtsi | 2 +-
+ arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi | 4 +-
+ arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts | 2 +-
+ arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi | 4 +-
+ arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1-c1.dts | 2 +-
+ arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi | 4 +-
+ arch/arm/boot/dts/qcom-ipq4019.dtsi | 42 +-
+ arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi | 2 +-
+ arch/arm/boot/dts/qcom-ipq8064.dtsi | 12 +-
+ arch/arm/boot/dts/qcom-mdm9615.dtsi | 4 +-
+ arch/arm/boot/dts/qcom-msm8226.dtsi | 9 +
+ arch/arm/boot/dts/qcom-msm8660.dtsi | 1 +
+ arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts | 409 ---
+ .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 1052 +++---
+ arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts | 908 -----
+ .../boot/dts/qcom-msm8974-sony-xperia-amami.dts | 435 ---
+ .../boot/dts/qcom-msm8974-sony-xperia-castor.dts | 723 ----
+ .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 484 ---
+ .../dts/qcom-msm8974-sony-xperia-rhine-amami.dts | 13 +
+ .../dts/qcom-msm8974-sony-xperia-rhine-honami.dts | 7 +
+ .../boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi | 457 +++
+ arch/arm/boot/dts/qcom-msm8974.dtsi | 1916 +++++-----
+ .../arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts | 432 +++
+ arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts | 813 +++++
+ .../qcom-msm8974pro-sony-xperia-shinano-castor.dts | 608 ++++
+ arch/arm/boot/dts/qcom-msm8974pro.dtsi | 32 +-
+ arch/arm/boot/dts/qcom-pm8226.dtsi | 41 +
+ arch/arm/boot/dts/qcom-pm8941.dtsi | 2 +-
+ arch/arm/boot/dts/qcom-pmx65.dtsi | 32 +
+ arch/arm/boot/dts/qcom-sdx55.dtsi | 9 +-
+ arch/arm/boot/dts/qcom-sdx65-mtp.dts | 221 ++
+ arch/arm/boot/dts/qcom-sdx65.dtsi | 193 +-
+ arch/arm/boot/dts/r8a7743.dtsi | 1 +
+ arch/arm/boot/dts/r8a7744.dtsi | 1 +
+ arch/arm/boot/dts/r8a7745.dtsi | 1 +
+ arch/arm/boot/dts/r8a77470.dtsi | 1 +
+ arch/arm/boot/dts/r8a7790.dtsi | 1 +
+ arch/arm/boot/dts/r8a7791.dtsi | 1 +
+ arch/arm/boot/dts/r8a7792.dtsi | 1 +
+ arch/arm/boot/dts/r8a7793.dtsi | 1 +
+ arch/arm/boot/dts/r8a7794.dtsi | 1 +
+ arch/arm/boot/dts/r9a06g032.dtsi | 113 +-
+ arch/arm/boot/dts/rk3036.dtsi | 4 +-
+ arch/arm/boot/dts/rk3188-bqedison2qc.dts | 3 +-
+ arch/arm/boot/dts/rk322x.dtsi | 2 +-
+ arch/arm/boot/dts/s5pv210-aquila.dts | 3 +-
+ arch/arm/boot/dts/s5pv210-aries.dtsi | 11 +-
+ arch/arm/boot/dts/s5pv210-goni.dts | 6 +-
+ arch/arm/boot/dts/s5pv210.dtsi | 46 +-
+ arch/arm/boot/dts/sama7g5.dtsi | 1 -
+ arch/arm/boot/dts/socfpga.dtsi | 4 +-
+ arch/arm/boot/dts/socfpga_arria10.dtsi | 4 +-
+ arch/arm/boot/dts/ste-dbx5x0.dtsi | 12 +-
+ arch/arm/boot/dts/ste-ux500-samsung-codina-tmo.dts | 785 ++++
+ arch/arm/boot/dts/ste-ux500-samsung-codina.dts | 80 +-
+ arch/arm/boot/dts/ste-ux500-samsung-gavini.dts | 4 +
+ arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 4 +
+ arch/arm/boot/dts/ste-ux500-samsung-janice.dts | 44 +-
+ arch/arm/boot/dts/ste-ux500-samsung-kyle.dts | 4 +
+ arch/arm/boot/dts/ste-ux500-samsung-skomer.dts | 35 +-
+ arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 2 +-
+ arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 2 +-
+ arch/arm/boot/dts/stm32h743.dtsi | 2 +-
+ arch/arm/boot/dts/stm32mp131.dtsi | 19 +-
+ arch/arm/boot/dts/stm32mp135f-dk.dts | 29 +
+ arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 64 +
+ arch/arm/boot/dts/stm32mp151.dtsi | 45 +-
+ arch/arm/boot/dts/stm32mp151a-prtt1a.dts | 52 +
+ arch/arm/boot/dts/stm32mp151a-prtt1c.dts | 304 ++
+ arch/arm/boot/dts/stm32mp151a-prtt1l.dtsi | 229 ++
+ arch/arm/boot/dts/stm32mp151a-prtt1s.dts | 63 +
+ arch/arm/boot/dts/stm32mp157a-dk1-scmi.dts | 86 +
+ arch/arm/boot/dts/stm32mp157c-dk2-scmi.dts | 95 +
+ arch/arm/boot/dts/stm32mp157c-ed1-scmi.dts | 91 +
+ arch/arm/boot/dts/stm32mp157c-ev1-scmi.dts | 100 +
+ arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 22 +-
+ arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 1 +
+ arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 1 -
+ arch/arm/boot/dts/suniv-f1c100s-licheepi-nano.dts | 31 +
+ arch/arm/boot/dts/suniv-f1c100s.dtsi | 104 +-
+ arch/arm/boot/dts/zynq-7000.dtsi | 2 -
+ arch/arm/common/locomo.c | 1 -
+ arch/arm/common/sa1111.c | 5 +-
+ arch/arm/configs/am200epdkit_defconfig | 1 +
+ arch/arm/configs/at91_dt_defconfig | 4 +-
+ arch/arm/configs/cm_x300_defconfig | 1 +
+ arch/arm/configs/colibri_pxa270_defconfig | 1 +
+ arch/arm/configs/colibri_pxa300_defconfig | 1 +
+ arch/arm/configs/corgi_defconfig | 1 +
+ arch/arm/configs/dove_defconfig | 2 +
+ arch/arm/configs/ep93xx_defconfig | 2 +
+ arch/arm/configs/eseries_pxa_defconfig | 1 +
+ arch/arm/configs/ezx_defconfig | 1 +
+ arch/arm/configs/h5000_defconfig | 1 +
+ arch/arm/configs/imx_v6_v7_defconfig | 1 +
+ arch/arm/configs/iop32x_defconfig | 1 +
+ arch/arm/configs/ixp4xx_defconfig | 88 +-
+ arch/arm/configs/lpd270_defconfig | 1 +
+ arch/arm/configs/lubbock_defconfig | 1 +
+ arch/arm/configs/magician_defconfig | 1 +
+ arch/arm/configs/mainstone_defconfig | 1 +
+ arch/arm/configs/mini2440_defconfig | 5 +-
+ arch/arm/configs/multi_v7_defconfig | 7 +
+ arch/arm/configs/omap1_defconfig | 3 +
+ arch/arm/configs/omap2plus_defconfig | 3 +
+ arch/arm/configs/palmz72_defconfig | 1 +
+ arch/arm/configs/pcm027_defconfig | 1 +
+ arch/arm/configs/pxa255-idp_defconfig | 1 +
+ arch/arm/configs/pxa3xx_defconfig | 1 +
+ arch/arm/configs/pxa_defconfig | 1 +
+ arch/arm/configs/qcom_defconfig | 8 +
+ arch/arm/configs/s3c2410_defconfig | 5 +
+ arch/arm/configs/sama5_defconfig | 3 +-
+ arch/arm/configs/sama7_defconfig | 8 +
+ arch/arm/configs/shmobile_defconfig | 4 +-
+ arch/arm/configs/spitz_defconfig | 1 +
+ arch/arm/configs/tct_hammer_defconfig | 2 +
+ arch/arm/configs/trizeps4_defconfig | 1 +
+ arch/arm/configs/viper_defconfig | 1 +
+ arch/arm/configs/xcep_defconfig | 1 +
+ arch/arm/configs/zeus_defconfig | 1 +
+ arch/arm/include/asm/hardware/sa1111.h | 2 -
+ arch/arm/include/asm/io.h | 27 +-
+ arch/arm/mach-asm9260/Kconfig | 1 +
+ arch/arm/mach-aspeed/Kconfig | 2 +-
+ arch/arm/mach-at91/Kconfig | 23 +-
+ arch/arm/mach-at91/Makefile | 2 +-
+ arch/arm/mach-at91/pm.c | 431 ++-
+ arch/arm/mach-at91/sam_secure.c | 46 +
+ arch/arm/mach-at91/sam_secure.h | 18 +
+ arch/arm/mach-at91/sama5.c | 2 +
+ arch/arm/mach-bcm/Kconfig | 12 +
+ arch/arm/mach-bcm/platsmp-brcmstb.c | 2 +-
+ arch/arm/mach-clps711x/Kconfig | 1 +
+ arch/arm/mach-davinci/Kconfig | 1 +
+ arch/arm/mach-davinci/Makefile | 4 +-
+ arch/arm/mach-davinci/board-da830-evm.c | 7 +-
+ arch/arm/mach-davinci/board-da850-evm.c | 7 +-
+ arch/arm/mach-davinci/board-dm355-evm.c | 5 +-
+ arch/arm/mach-davinci/board-dm355-leopard.c | 5 +-
+ arch/arm/mach-davinci/board-dm365-evm.c | 6 +-
+ arch/arm/mach-davinci/board-dm644x-evm.c | 7 +-
+ arch/arm/mach-davinci/board-dm646x-evm.c | 5 +-
+ arch/arm/mach-davinci/board-mityomapl138.c | 8 +-
+ arch/arm/mach-davinci/board-neuros-osd2.c | 7 +-
+ arch/arm/mach-davinci/board-omapl138-hawk.c | 6 +-
+ arch/arm/mach-davinci/board-sffsdr.c | 6 +-
+ arch/arm/mach-davinci/common.c | 4 +-
+ arch/arm/mach-davinci/{include/mach => }/common.h | 0
+ arch/arm/mach-davinci/{include/mach => }/cputype.h | 2 +-
+ arch/arm/mach-davinci/da830.c | 11 +-
+ arch/arm/mach-davinci/da850.c | 12 +-
+ arch/arm/mach-davinci/da8xx-dt.c | 4 +-
+ arch/arm/mach-davinci/{include/mach => }/da8xx.h | 5 +-
+ arch/arm/mach-davinci/davinci.h | 3 +-
+ arch/arm/mach-davinci/devices-da8xx.c | 7 +-
+ arch/arm/mach-davinci/devices.c | 7 +-
+ arch/arm/mach-davinci/dm355.c | 12 +-
+ arch/arm/mach-davinci/dm365.c | 12 +-
+ arch/arm/mach-davinci/dm644x.c | 12 +-
+ arch/arm/mach-davinci/dm646x.c | 12 +-
+ .../arm/mach-davinci/{include/mach => }/hardware.h | 0
+ arch/arm/mach-davinci/include/mach/mux.h | 990 ------
+ arch/arm/mach-davinci/include/mach/uncompress.h | 97 -
+ arch/arm/mach-davinci/mux.c | 4 +-
+ arch/arm/mach-davinci/mux.h | 969 ++++-
+ arch/arm/mach-davinci/pdata-quirks.c | 4 +-
+ arch/arm/mach-davinci/pm.c | 9 +-
+ arch/arm/mach-davinci/{include/mach => }/pm.h | 0
+ arch/arm/mach-davinci/serial.c | 4 +-
+ arch/arm/mach-davinci/{include/mach => }/serial.h | 2 +-
+ arch/arm/mach-davinci/sram.c | 2 +-
+ arch/arm/mach-davinci/usb-da8xx.c | 7 +-
+ arch/arm/mach-davinci/usb.c | 5 +-
+ arch/arm/mach-dove/Kconfig | 16 +-
+ arch/arm/mach-dove/Makefile | 2 +
+ arch/arm/mach-dove/include/mach/uncompress.h | 34 -
+ arch/arm/mach-ep93xx/Kconfig | 13 +
+ arch/arm/mach-ep93xx/adssphere.c | 1 +
+ arch/arm/mach-ep93xx/core.c | 5 +-
+ arch/arm/mach-ep93xx/edb93xx.c | 8 +
+ .../mach-ep93xx/{include/mach => }/ep93xx-regs.h | 4 -
+ arch/arm/mach-ep93xx/gesbc9312.c | 1 +
+ arch/arm/mach-ep93xx/gpio-ep93xx.h | 2 +-
+ arch/arm/mach-ep93xx/include/mach/irqs.h | 79 -
+ arch/arm/mach-ep93xx/irqs.h | 76 +
+ arch/arm/mach-ep93xx/micro9.c | 4 +
+ arch/arm/mach-ep93xx/simone.c | 1 +
+ arch/arm/mach-ep93xx/snappercl15.c | 1 +
+ arch/arm/mach-ep93xx/soc.h | 3 +-
+ arch/arm/mach-ep93xx/ts72xx.c | 3 +-
+ arch/arm/mach-ep93xx/vision_ep9307.c | 1 +
+ arch/arm/mach-exynos/Kconfig | 1 -
+ arch/arm/mach-gemini/Kconfig | 1 +
+ arch/arm/mach-highbank/Kconfig | 1 -
+ arch/arm/mach-hisi/Kconfig | 2 +-
+ arch/arm/mach-hisi/platsmp.c | 4 +
+ arch/arm/mach-imx/Kconfig | 4 +-
+ arch/arm/mach-integrator/Kconfig | 125 -
+ arch/arm/mach-integrator/Makefile | 10 -
+ arch/arm/mach-iop32x/Kconfig | 18 +-
+ arch/arm/mach-iop32x/em7210.c | 1 +
+ arch/arm/mach-iop32x/glantank.c | 1 +
+ arch/arm/mach-iop32x/include/mach/irqs.h | 14 -
+ arch/arm/mach-iop32x/include/mach/uncompress.h | 25 -
+ arch/arm/mach-iop32x/iq31244.c | 1 +
+ arch/arm/mach-iop32x/iq80321.c | 1 +
+ arch/arm/mach-iop32x/irqs.h | 2 +
+ arch/arm/mach-iop32x/n2100.c | 1 +
+ arch/arm/mach-ixp4xx/Kconfig | 22 +-
+ arch/arm/mach-ixp4xx/Makefile.boot | 4 -
+ arch/arm/mach-ixp4xx/include/mach/uncompress.h | 54 -
+ arch/arm/mach-keystone/Kconfig | 1 -
+ arch/arm/mach-lpc32xx/Kconfig | 1 +
+ arch/arm/mach-mediatek/Kconfig | 1 +
+ arch/arm/mach-mmp/Kconfig | 12 +-
+ arch/arm/mach-mmp/Makefile | 1 -
+ arch/arm/mach-mmp/devices.c | 2 +-
+ arch/arm/mach-mmp/devices.h | 10 +-
+ arch/arm/mach-mmp/mfp.h | 2 +-
+ arch/arm/mach-mmp/mmp2.h | 48 +-
+ arch/arm/mach-mmp/pxa168.h | 60 +-
+ arch/arm/mach-mmp/pxa910.h | 38 +-
+ arch/arm/mach-mmp/tavorevb.c | 113 -
+ arch/arm/mach-mmp/ttc_dkb.c | 6 +-
+ arch/arm/mach-moxart/Kconfig | 1 +
+ arch/arm/mach-mv78xx0/Kconfig | 1 +
+ arch/arm/mach-mvebu/Kconfig | 3 +-
+ arch/arm/mach-mxs/Kconfig | 1 +
+ arch/arm/mach-nomadik/Kconfig | 2 +-
+ arch/arm/mach-npcm/Kconfig | 2 +-
+ arch/arm/mach-nspire/Kconfig | 1 +
+ arch/arm/mach-omap1/Kconfig | 73 +
+ arch/arm/mach-omap1/Makefile | 6 +-
+ arch/arm/mach-omap1/ams-delta-fiq-handler.S | 3 +-
+ arch/arm/mach-omap1/ams-delta-fiq.c | 2 +
+ arch/arm/mach-omap1/ams-delta-fiq.h | 2 +-
+ arch/arm/mach-omap1/board-ams-delta.c | 20 +-
+ arch/arm/mach-omap1/board-fsample.c | 10 +-
+ arch/arm/mach-omap1/board-generic.c | 8 +-
+ arch/arm/mach-omap1/board-h2.c | 14 +-
+ arch/arm/mach-omap1/board-h3.c | 16 +-
+ arch/arm/mach-omap1/board-htcherald.c | 12 +-
+ arch/arm/mach-omap1/board-innovator.c | 34 +-
+ arch/arm/mach-omap1/board-nokia770.c | 8 +-
+ arch/arm/mach-omap1/board-osk.c | 49 +-
+ arch/arm/mach-omap1/board-palmte.c | 14 +-
+ arch/arm/mach-omap1/board-palmtt.c | 14 +-
+ arch/arm/mach-omap1/board-palmz71.c | 14 +-
+ arch/arm/mach-omap1/board-perseus2.c | 15 +-
+ arch/arm/mach-omap1/board-sx1-mmc.c | 3 +-
+ arch/arm/mach-omap1/board-sx1.c | 12 +-
+ arch/arm/mach-omap1/clock.c | 797 ++---
+ arch/arm/mach-omap1/clock.h | 191 +-
+ arch/arm/mach-omap1/clock_data.c | 510 ++-
+ arch/arm/mach-omap1/common.h | 3 +-
+ arch/arm/mach-omap1/devices.c | 12 +-
+ arch/arm/mach-omap1/dma.c | 2 +-
+ arch/arm/mach-omap1/fb.c | 19 +-
+ arch/arm/mach-omap1/flash.c | 5 +-
+ arch/arm/mach-omap1/fpga.c | 3 +-
+ arch/arm/mach-omap1/gpio15xx.c | 3 +-
+ arch/arm/mach-omap1/gpio16xx.c | 5 +-
+ arch/arm/mach-omap1/gpio7xx.c | 3 +-
+ arch/arm/mach-omap1/{include/mach => }/hardware.h | 136 +-
+ arch/arm/mach-omap1/i2c.c | 4 +-
+ arch/arm/mach-omap1/id.c | 5 +-
+ arch/arm/mach-omap1/include/mach/io.h | 45 -
+ arch/arm/mach-omap1/include/mach/lcdc.h | 44 -
+ arch/arm/mach-omap1/include/mach/memory.h | 12 -
+ arch/arm/mach-omap1/include/mach/uncompress.h | 117 -
+ arch/arm/mach-omap1/io.c | 12 +-
+ arch/arm/mach-omap1/irq.c | 4 +-
+ arch/arm/mach-omap1/{include/mach => }/irqs.h | 2 -
+ arch/arm/mach-omap1/mcbsp.c | 17 +-
+ arch/arm/mach-omap1/{include/mach => }/mtd-xip.h | 3 +-
+ arch/arm/mach-omap1/mux.c | 6 +-
+ arch/arm/mach-omap1/mux.h | 144 +
+ arch/arm/mach-omap1/ocpi.c | 8 +-
+ .../arm/{plat-omap/dma.c => mach-omap1/omap-dma.c} | 269 +-
+ arch/arm/mach-omap1/{include/mach => }/omap1510.h | 0
+ arch/arm/mach-omap1/{include/mach => }/omap16xx.h | 0
+ arch/arm/mach-omap1/{include/mach => }/omap7xx.h | 0
+ arch/arm/mach-omap1/pm.c | 9 +-
+ arch/arm/mach-omap1/pm.h | 2 +
+ arch/arm/mach-omap1/reset.c | 3 +-
+ arch/arm/mach-omap1/serial.c | 10 +-
+ arch/arm/mach-omap1/{include/mach => }/serial.h | 0
+ arch/arm/mach-omap1/sleep.S | 2 +-
+ arch/arm/mach-omap1/soc.h | 6 +-
+ arch/arm/mach-omap1/sram-init.c | 91 +-
+ arch/arm/mach-omap1/sram.S | 4 +-
+ arch/arm/mach-omap1/sram.h | 4 +-
+ arch/arm/mach-omap1/{include/mach => }/tc.h | 2 -
+ arch/arm/mach-omap1/time.c | 7 +-
+ arch/arm/mach-omap1/timer.c | 1 +
+ arch/arm/mach-omap1/timer32k.c | 100 +-
+ arch/arm/mach-omap1/usb.c | 8 +-
+ arch/arm/mach-omap1/usb.h | 25 +
+ arch/arm/mach-omap2/Kconfig | 49 +
+ arch/arm/mach-omap2/Makefile | 3 -
+ arch/arm/mach-omap2/cm_common.c | 8 +-
+ arch/arm/mach-omap2/common.h | 13 +-
+ arch/arm/mach-omap2/control.c | 19 +-
+ arch/arm/mach-omap2/dma.c | 1 +
+ arch/arm/mach-omap2/include/mach/hardware.h | 3 -
+ arch/arm/mach-omap2/include/mach/irqs.h | 3 -
+ arch/arm/mach-omap2/include/mach/serial.h | 66 -
+ arch/arm/mach-omap2/omap-iommu.c | 1 +
+ arch/arm/mach-omap2/omap-secure.c | 2 +-
+ arch/arm/mach-omap2/omap-secure.h | 2 +-
+ arch/arm/mach-omap2/omap4-common.c | 2 +-
+ arch/arm/mach-omap2/omap_device.c | 20 -
+ arch/arm/mach-omap2/omap_device.h | 1 -
+ arch/arm/mach-omap2/pdata-quirks.c | 11 -
+ arch/arm/mach-omap2/prm_common.c | 8 +-
+ arch/arm/mach-omap2/serial.h | 67 +-
+ arch/arm/mach-omap2/sram.c | 91 +-
+ arch/arm/mach-omap2/sram.h | 5 +-
+ arch/arm/mach-orion5x/Kconfig | 1 +
+ arch/arm/mach-oxnas/Kconfig | 2 +-
+ arch/arm/mach-pxa/Kconfig | 15 +
+ arch/arm/mach-pxa/Makefile | 18 +-
+ arch/arm/mach-pxa/Makefile.boot | 3 -
+ arch/arm/mach-pxa/{include/mach => }/addr-map.h | 0
+ arch/arm/mach-pxa/am300epd.c | 2 +-
+ .../arm/mach-pxa/balloon3-pcmcia.c | 4 +-
+ arch/arm/mach-pxa/balloon3.c | 4 +-
+ arch/arm/mach-pxa/{include/mach => }/balloon3.h | 0
+ arch/arm/mach-pxa/cm-x300.c | 12 +-
+ arch/arm/mach-pxa/colibri-evalboard.c | 1 -
+ .../arm/mach-pxa/colibri-pcmcia.c | 2 +-
+ arch/arm/mach-pxa/colibri-pxa270-income.c | 1 -
+ arch/arm/mach-pxa/colibri-pxa270.c | 2 +-
+ arch/arm/mach-pxa/colibri-pxa300.c | 3 +-
+ arch/arm/mach-pxa/colibri-pxa320.c | 2 +-
+ arch/arm/mach-pxa/colibri-pxa3xx.c | 3 +-
+ arch/arm/mach-pxa/colibri.h | 2 +-
+ arch/arm/mach-pxa/corgi.c | 23 +-
+ arch/arm/mach-pxa/{include/mach => }/corgi.h | 0
+ arch/arm/mach-pxa/corgi_pm.c | 5 +-
+ arch/arm/mach-pxa/csb726.c | 5 +-
+ arch/arm/mach-pxa/csb726.h | 2 +-
+ arch/arm/mach-pxa/devices.c | 17 +-
+ .../arm/mach-pxa/e740-pcmcia.c | 4 +-
+ .../arm/mach-pxa/{include/mach => }/eseries-gpio.h | 0
+ arch/arm/mach-pxa/eseries.c | 38 +-
+ arch/arm/mach-pxa/ezx.c | 1 -
+ arch/arm/mach-pxa/generic.c | 62 +-
+ arch/arm/mach-pxa/generic.h | 9 -
+ arch/arm/mach-pxa/gumstix.c | 1 -
+ arch/arm/mach-pxa/gumstix.h | 2 +-
+ arch/arm/mach-pxa/h5000.c | 2 +-
+ .../arm/mach-pxa/hx4700-pcmcia.c | 4 +-
+ arch/arm/mach-pxa/hx4700.c | 18 +-
+ arch/arm/mach-pxa/{include/mach => }/hx4700.h | 0
+ arch/arm/mach-pxa/idp.c | 2 -
+ arch/arm/mach-pxa/idp.h | 2 +-
+ arch/arm/mach-pxa/include/mach/bitfield.h | 114 -
+ arch/arm/mach-pxa/include/mach/dma.h | 17 -
+ arch/arm/mach-pxa/include/mach/generic.h | 1 -
+ arch/arm/mach-pxa/include/mach/mtd-xip.h | 36 -
+ arch/arm/mach-pxa/include/mach/uncompress.h | 70 -
+ arch/arm/mach-pxa/irq.c | 5 +-
+ arch/arm/mach-pxa/{include/mach => }/irqs.h | 0
+ arch/arm/mach-pxa/littleton.c | 1 -
+ arch/arm/mach-pxa/lpd270.c | 6 +-
+ arch/arm/mach-pxa/lubbock.c | 17 +-
+ arch/arm/mach-pxa/{include/mach => }/lubbock.h | 4 +-
+ arch/arm/mach-pxa/magician.c | 56 +-
+ arch/arm/mach-pxa/{include/mach => }/magician.h | 2 +-
+ arch/arm/mach-pxa/mainstone.c | 17 +-
+ arch/arm/mach-pxa/{include/mach => }/mainstone.h | 4 +-
+ arch/arm/mach-pxa/mfp-pxa2xx.c | 3 +-
+ arch/arm/mach-pxa/mfp-pxa2xx.h | 2 +-
+ arch/arm/mach-pxa/mfp-pxa3xx.c | 3 +-
+ arch/arm/mach-pxa/mfp-pxa3xx.h | 2 +-
+ arch/arm/mach-pxa/{include/mach => }/mfp.h | 2 +-
+ arch/arm/mach-pxa/mioa701.c | 4 +-
+ arch/arm/mach-pxa/mxm8x10.c | 8 +-
+ arch/arm/mach-pxa/palm27x.c | 2 +-
+ .../arm/mach-pxa/palmld-pcmcia.c | 5 +-
+ arch/arm/mach-pxa/palmld.c | 23 +-
+ arch/arm/mach-pxa/{include/mach => }/palmld.h | 0
+ arch/arm/mach-pxa/palmt5.c | 11 +-
+ arch/arm/mach-pxa/palmt5.h | 2 +-
+ .../arm/mach-pxa/palmtc-pcmcia.c | 4 +-
+ arch/arm/mach-pxa/palmtc.c | 4 +-
+ arch/arm/mach-pxa/{include/mach => }/palmtc.h | 0
+ arch/arm/mach-pxa/palmte2.c | 2 +-
+ arch/arm/mach-pxa/palmtreo.c | 4 +-
+ .../arm/mach-pxa/palmtx-pcmcia.c | 4 +-
+ arch/arm/mach-pxa/palmtx.c | 13 +-
+ arch/arm/mach-pxa/{include/mach => }/palmtx.h | 0
+ arch/arm/mach-pxa/palmz72.c | 2 +-
+ arch/arm/mach-pxa/pcm027.h | 2 +-
+ arch/arm/mach-pxa/pcm990-baseboard.c | 2 +-
+ arch/arm/mach-pxa/pcm990_baseboard.h | 2 +-
+ arch/arm/mach-pxa/poodle.c | 31 +-
+ arch/arm/mach-pxa/{include/mach => }/poodle.h | 2 -
+ arch/arm/mach-pxa/pxa-dt.c | 2 +-
+ arch/arm/mach-pxa/pxa-regs.h | 52 +
+ arch/arm/mach-pxa/pxa25x.c | 12 +-
+ arch/arm/mach-pxa/pxa25x.h | 6 +-
+ arch/arm/mach-pxa/pxa27x-udc.h | 2 +
+ arch/arm/mach-pxa/pxa27x.c | 12 +-
+ arch/arm/mach-pxa/pxa27x.h | 6 +-
+ arch/arm/mach-pxa/{include/mach => }/pxa2xx-regs.h | 47 +-
+ arch/arm/mach-pxa/pxa2xx.c | 32 +-
+ arch/arm/mach-pxa/pxa300.c | 1 +
+ arch/arm/mach-pxa/pxa320.c | 1 +
+ arch/arm/mach-pxa/{include/mach => }/pxa3xx-regs.h | 71 +-
+ arch/arm/mach-pxa/pxa3xx-ulpi.c | 2 +-
+ arch/arm/mach-pxa/pxa3xx.c | 19 +-
+ arch/arm/mach-pxa/pxa3xx.h | 6 +-
+ arch/arm/mach-pxa/pxa930.c | 1 +
+ arch/arm/mach-pxa/{include/mach => }/regs-ost.h | 4 +-
+ arch/arm/mach-pxa/regs-rtc.h | 2 +-
+ arch/arm/mach-pxa/regs-u2d.h | 2 -
+ arch/arm/mach-pxa/{include/mach => }/regs-uart.h | 2 +
+ arch/arm/mach-pxa/reset.c | 9 +-
+ arch/arm/mach-pxa/{include/mach => }/reset.h | 2 +-
+ arch/arm/mach-pxa/sharpsl_pm.c | 2 +-
+ arch/arm/mach-pxa/sleep.S | 9 +-
+ arch/arm/mach-pxa/smemc.c | 13 +-
+ arch/arm/mach-pxa/{include/mach => }/smemc.h | 0
+ arch/arm/mach-pxa/spitz.c | 37 +-
+ arch/arm/mach-pxa/{include/mach => }/spitz.h | 0
+ arch/arm/mach-pxa/spitz_pm.c | 3 +-
+ arch/arm/mach-pxa/standby.S | 3 +-
+ arch/arm/mach-pxa/tosa.c | 80 +-
+ arch/arm/mach-pxa/{include/mach => }/tosa.h | 18 -
+ .../arm/mach-pxa/trizeps4-pcmcia.c | 6 +-
+ arch/arm/mach-pxa/trizeps4.c | 6 +-
+ arch/arm/mach-pxa/{include/mach => }/trizeps4.h | 1 +
+ .../arm/mach-pxa/viper-pcmcia.c | 6 +-
+ .../arm/mach-pxa/viper-pcmcia.h | 0
+ arch/arm/mach-pxa/viper.c | 20 +-
+ .../arm/mach-pxa/vpac270-pcmcia.c | 4 +-
+ arch/arm/mach-pxa/vpac270.c | 4 +-
+ arch/arm/mach-pxa/{include/mach => }/vpac270.h | 0
+ arch/arm/mach-pxa/xcep.c | 4 +-
+ arch/arm/mach-pxa/z2.c | 13 +-
+ arch/arm/mach-pxa/{include/mach => }/z2.h | 0
+ arch/arm/mach-pxa/zeus.c | 20 +-
+ arch/arm/mach-pxa/zylonite.c | 34 +-
+ arch/arm/mach-pxa/zylonite.h | 2 +
+ arch/arm/mach-pxa/zylonite_pxa300.c | 1 +
+ arch/arm/mach-pxa/zylonite_pxa320.c | 1 +
+ arch/arm/mach-qcom/Kconfig | 1 -
+ arch/arm/mach-realview/Kconfig | 103 -
+ arch/arm/mach-realview/Makefile | 8 -
+ arch/arm/mach-rockchip/platsmp.c | 2 +-
+ arch/arm/mach-s3c/Kconfig | 8 -
+ arch/arm/mach-s3c/Kconfig.s3c24xx | 31 +-
+ arch/arm/mach-s3c/Makefile | 2 -
+ arch/arm/mach-s3c/Makefile.s3c64xx | 3 -
+ arch/arm/mach-s3c/bast-ide.c | 2 +-
+ arch/arm/mach-s3c/bast-irq.c | 2 +-
+ arch/arm/mach-s3c/cpu.c | 2 +-
+ arch/arm/mach-s3c/dev-audio-s3c64xx.c | 2 +-
+ arch/arm/mach-s3c/dev-uart-s3c64xx.c | 2 +-
+ arch/arm/mach-s3c/devs.c | 2 +-
+ arch/arm/mach-s3c/gpio-samsung.c | 2 +-
+ arch/arm/mach-s3c/include/mach/io-s3c24xx.h | 50 -
+ arch/arm/mach-s3c/include/mach/io.h | 8 -
+ arch/arm/mach-s3c/iotiming-s3c2410.c | 2 +-
+ arch/arm/mach-s3c/irq-pm-s3c24xx.c | 2 +-
+ arch/arm/mach-s3c/irq-s3c24xx.c | 2 +-
+ .../arm/mach-s3c/{include/mach => }/irqs-s3c24xx.h | 18 +-
+ .../arm/mach-s3c/{include/mach => }/irqs-s3c64xx.h | 0
+ arch/arm/mach-s3c/{include/mach => }/irqs.h | 0
+ arch/arm/mach-s3c/mach-amlm5900.c | 2 +
+ arch/arm/mach-s3c/mach-anubis.c | 6 +-
+ arch/arm/mach-s3c/mach-anw6410.c | 2 +-
+ arch/arm/mach-s3c/mach-at2440evb.c | 1 +
+ arch/arm/mach-s3c/mach-bast.c | 6 +-
+ arch/arm/mach-s3c/mach-crag6410-module.c | 2 +-
+ arch/arm/mach-s3c/mach-crag6410.c | 2 +-
+ arch/arm/mach-s3c/mach-gta02.c | 1 +
+ arch/arm/mach-s3c/mach-h1940.c | 1 +
+ arch/arm/mach-s3c/mach-hmt.c | 2 +-
+ arch/arm/mach-s3c/mach-jive.c | 2 +-
+ arch/arm/mach-s3c/mach-mini2440.c | 3 +-
+ arch/arm/mach-s3c/mach-mini6410.c | 2 +-
+ arch/arm/mach-s3c/mach-n30.c | 2 +
+ arch/arm/mach-s3c/mach-ncp.c | 2 +-
+ arch/arm/mach-s3c/mach-nexcoder.c | 1 +
+ arch/arm/mach-s3c/mach-osiris.c | 6 +-
+ arch/arm/mach-s3c/mach-otom.c | 1 +
+ arch/arm/mach-s3c/mach-qt2410.c | 1 +
+ arch/arm/mach-s3c/mach-real6410.c | 2 +-
+ arch/arm/mach-s3c/mach-rx1950.c | 1 +
+ arch/arm/mach-s3c/mach-rx3715.c | 7 +-
+ arch/arm/mach-s3c/mach-smartq5.c | 2 +-
+ arch/arm/mach-s3c/mach-smartq7.c | 2 +-
+ arch/arm/mach-s3c/mach-smdk2410.c | 1 +
+ arch/arm/mach-s3c/mach-smdk2413.c | 3 +
+ arch/arm/mach-s3c/mach-smdk2416.c | 11 +-
+ arch/arm/mach-s3c/mach-smdk2440.c | 11 +-
+ arch/arm/mach-s3c/mach-smdk2443.c | 12 +-
+ arch/arm/mach-s3c/mach-smdk6400.c | 2 +-
+ arch/arm/mach-s3c/mach-smdk6410.c | 2 +-
+ arch/arm/mach-s3c/mach-tct_hammer.c | 1 +
+ arch/arm/mach-s3c/mach-vr1000.c | 6 +-
+ arch/arm/mach-s3c/mach-vstms.c | 1 +
+ arch/arm/mach-s3c/{include/mach => }/map-base.h | 6 +
+ arch/arm/mach-s3c/map-s3c24xx.h | 2 +-
+ arch/arm/mach-s3c/map-s3c64xx.h | 2 +-
+ arch/arm/mach-s3c/pl080.c | 2 +-
+ arch/arm/mach-s3c/pm-core-s3c24xx.h | 2 +-
+ arch/arm/mach-s3c/pm-s3c2412.c | 2 +-
+ arch/arm/mach-s3c/pm-s3c64xx.c | 4 +-
+ arch/arm/mach-s3c/pm.c | 2 +-
+ arch/arm/mach-s3c/s3c2443.c | 2 +-
+ arch/arm/mach-s3c/s3c24xx.c | 2 +-
+ arch/arm/mach-s3c/s3c24xx.h | 2 +-
+ arch/arm/mach-s3c/s3c64xx.c | 2 +-
+ arch/arm/mach-s3c/simtec-usb.c | 2 +-
+ arch/arm/mach-sa1100/generic.c | 6 +-
+ arch/arm/mach-sa1100/include/mach/reset.h | 1 -
+ arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 2 +-
+ arch/arm/mach-shmobile/setup-emev2.c | 2 +-
+ arch/arm/mach-shmobile/setup-r7s72100.c | 2 +-
+ arch/arm/mach-shmobile/setup-r7s9210.c | 2 +-
+ arch/arm/mach-shmobile/setup-r8a73a4.c | 2 +-
+ arch/arm/mach-shmobile/setup-r8a7740.c | 2 +-
+ arch/arm/mach-shmobile/setup-r8a7778.c | 2 +-
+ arch/arm/mach-shmobile/setup-r8a7779.c | 2 +-
+ arch/arm/mach-shmobile/setup-rcar-gen2.c | 4 +-
+ arch/arm/mach-shmobile/setup-sh73a0.c | 2 +-
+ arch/arm/mach-socfpga/Kconfig | 1 -
+ arch/arm/mach-spear/Kconfig | 2 +-
+ arch/arm/mach-spear/Makefile | 2 -
+ arch/arm/mach-spear/include/mach/irqs.h | 35 -
+ arch/arm/mach-spear/include/mach/uncompress.h | 42 -
+ arch/arm/mach-spear/{include/mach => }/misc_regs.h | 4 +-
+ arch/arm/mach-spear/pl080.c | 4 +-
+ arch/arm/mach-spear/platsmp.c | 2 +-
+ arch/arm/mach-spear/restart.c | 2 +-
+ arch/arm/mach-spear/{include/mach => }/spear.h | 0
+ arch/arm/mach-spear/spear1310.c | 2 +-
+ arch/arm/mach-spear/spear13xx.c | 2 +-
+ arch/arm/mach-spear/spear300.c | 2 +-
+ arch/arm/mach-spear/spear310.c | 2 +-
+ arch/arm/mach-spear/spear320.c | 2 +-
+ arch/arm/mach-spear/spear3xx.c | 4 +-
+ arch/arm/mach-spear/spear6xx.c | 4 +-
+ arch/arm/mach-sunxi/Kconfig | 3 +-
+ arch/arm/mach-tegra/platsmp.c | 2 +-
+ arch/arm/mach-versatile/Kconfig | 309 ++
+ arch/arm/mach-versatile/Makefile | 32 +-
+ .../Makefile.boot | 0
+ arch/arm/{mach-vexpress => mach-versatile}/dcscb.c | 5 +-
+ .../dcscb_setup.S | 2 -
+ .../{plat-versatile => mach-versatile}/headsmp.S | 2 -
+ .../{plat-versatile => mach-versatile}/hotplug.c | 2 +-
+ .../cm.h => mach-versatile/integrator-cm.h} | 0
+ .../integrator-hardware.h} | 0
+ .../core.c => mach-versatile/integrator.c} | 8 +-
+ .../common.h => mach-versatile/integrator.h} | 0
+ .../integrator_ap.c | 13 +-
+ .../integrator_cp.c | 8 +-
+ .../platsmp-realview.c} | 2 +-
+ .../platsmp-vexpress.c} | 7 +-
+ .../{plat-versatile => mach-versatile}/platsmp.c | 4 +-
+ .../include/plat => mach-versatile}/platsmp.h | 2 -
+ .../realview-dt.c => mach-versatile/realview.c} | 0
+ arch/arm/{mach-vexpress => mach-versatile}/spc.c | 0
+ arch/arm/{mach-vexpress => mach-versatile}/spc.h | 0
+ .../arm/{mach-vexpress => mach-versatile}/tc2_pm.c | 2 -
+ .../{mach-vexpress => mach-versatile}/v2m-mps2.c | 0
+ arch/arm/{mach-vexpress => mach-versatile}/v2m.c | 2 +-
+ .../mach-versatile/{versatile_dt.c => versatile.c} | 0
+ .../core.h => mach-versatile/vexpress.h} | 0
+ arch/arm/mach-vexpress/Kconfig | 81 -
+ arch/arm/mach-vexpress/Makefile | 19 -
+ arch/arm/mach-vt8500/Kconfig | 1 +
+ arch/arm/mach-zynq/Kconfig | 1 -
+ arch/arm/mm/Kconfig | 28 +-
+ arch/arm/mm/cache-b15-rac.c | 2 +-
+ arch/arm/mm/copypage-xsc3.c | 2 +
+ arch/arm/mm/ioremap.c | 2 +-
+ arch/arm/plat-omap/Kconfig | 119 -
+ arch/arm/plat-omap/Makefile | 13 -
+ arch/arm/plat-omap/counter_32k.c | 114 -
+ arch/arm/plat-omap/debug-leds.c | 171 -
+ arch/arm/plat-omap/include/plat/counter-32k.h | 1 -
+ arch/arm/plat-omap/include/plat/cpu.h | 21 -
+ arch/arm/plat-omap/include/plat/sram.h | 8 -
+ arch/arm/plat-omap/sram.c | 129 -
+ arch/arm/plat-versatile/Makefile | 5 -
+ .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 30 +
+ .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 8 +
+ arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 2 -
+ arch/arm64/boot/dts/amlogic/Makefile | 38 +-
+ .../dts/amlogic/meson-axg-jethome-jethub-j100.dts | 16 +-
+ .../boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 2 +-
+ .../dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 2 +-
+ .../amlogic/meson-gxl-s905w-jethome-jethub-j80.dts | 6 +
+ .../amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 2 +-
+ .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 2 +-
+ arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 33 +
+ .../boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 2 +-
+ arch/arm64/boot/dts/arm/Makefile | 1 +
+ arch/arm64/boot/dts/arm/corstone1000-fvp.dts | 51 +
+ arch/arm64/boot/dts/arm/corstone1000-mps3.dts | 32 +
+ arch/arm64/boot/dts/arm/corstone1000.dtsi | 164 +
+ arch/arm64/boot/dts/arm/foundation-v8.dtsi | 2 +-
+ arch/arm64/boot/dts/arm/fvp-base-revc.dts | 3 +-
+ arch/arm64/boot/dts/arm/juno-base.dtsi | 164 +-
+ arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi | 37 +-
+ arch/arm64/boot/dts/arm/juno-r1-scmi.dts | 8 +-
+ arch/arm64/boot/dts/arm/juno-r1.dts | 25 +
+ arch/arm64/boot/dts/arm/juno-r2-scmi.dts | 8 +-
+ arch/arm64/boot/dts/arm/juno-r2.dts | 25 +
+ arch/arm64/boot/dts/arm/juno-scmi.dtsi | 25 +
+ arch/arm64/boot/dts/arm/juno.dts | 25 +
+ .../boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi | 11 +-
+ arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 4 +-
+ .../arm64/boot/dts/broadcom/northstar2/ns2-svk.dts | 2 +-
+ .../arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts | 2 +-
+ arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 2 -
+ .../boot/dts/broadcom/stingray/bcm958742k.dts | 4 +-
+ .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 2 -
+ arch/arm64/boot/dts/exynos/exynos5433.dtsi | 9 +-
+ arch/arm64/boot/dts/exynos/exynos7.dtsi | 4 -
+ arch/arm64/boot/dts/exynos/exynos850-e850-96.dts | 5 +
+ arch/arm64/boot/dts/exynos/exynos850.dtsi | 19 +-
+ arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts | 4 +
+ arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 116 +-
+ arch/arm64/boot/dts/freescale/Makefile | 9 +
+ .../dts/freescale/fsl-ls1028a-kontron-sl28.dts | 9 +
+ arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 2 +
+ arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 2 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 -
+ arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 6 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 6 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 6 +-
+ arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi | 10 +-
+ arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 2 +-
+ arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 6 +-
+ arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 6 +-
+ arch/arm64/boot/dts/freescale/imx8-ss-vpu.dtsi | 74 +
+ .../dts/freescale/imx8mm-beacon-baseboard.dtsi | 3 +
+ .../dts/freescale/imx8mm-data-modul-edm-sbc.dts | 997 ++++++
+ arch/arm64/boot/dts/freescale/imx8mm-emcon.dtsi | 2 +-
+ arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 20 +
+ .../boot/dts/freescale/imx8mm-kontron-n801x-s.dts | 2 +-
+ .../dts/freescale/imx8mm-kontron-n801x-som.dtsi | 2 +-
+ arch/arm64/boot/dts/freescale/imx8mm-mx8menlo.dts | 334 ++
+ .../boot/dts/freescale/imx8mm-venice-gw71xx.dtsi | 1 +
+ .../boot/dts/freescale/imx8mm-venice-gw72xx.dtsi | 1 +
+ .../boot/dts/freescale/imx8mm-venice-gw73xx.dtsi | 2 +
+ .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 16 +-
+ .../boot/dts/freescale/imx8mm-venice-gw7902.dts | 17 +-
+ .../boot/dts/freescale/imx8mm-venice-gw7903.dts | 1 +
+ .../boot/dts/freescale/imx8mm-verdin-dahlia.dtsi | 2 +-
+ .../boot/dts/freescale/imx8mm-verdin-wifi.dtsi | 26 +-
+ arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 411 ++-
+ arch/arm64/boot/dts/freescale/imx8mm.dtsi | 8 +-
+ .../dts/freescale/imx8mn-beacon-baseboard.dtsi | 3 +
+ .../boot/dts/freescale/imx8mn-bsh-smm-s2pro.dts | 90 +
+ arch/arm64/boot/dts/freescale/imx8mn-ddr3l-evk.dts | 114 +
+ arch/arm64/boot/dts/freescale/imx8mn-evk.dts | 54 +-
+ arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 45 +
+ .../boot/dts/freescale/imx8mn-venice-gw7902.dts | 8 +
+ arch/arm64/boot/dts/freescale/imx8mn.dtsi | 14 +-
+ .../dts/freescale/imx8mp-icore-mx8mp-edimm2.2.dts | 175 +
+ .../boot/dts/freescale/imx8mp-icore-mx8mp.dtsi | 186 +
+ .../boot/dts/freescale/imx8mp-venice-gw74xx.dts | 896 +++++
+ .../boot/dts/freescale/imx8mp-verdin-dahlia.dtsi | 129 +
+ .../boot/dts/freescale/imx8mp-verdin-dev.dtsi | 46 +
+ .../dts/freescale/imx8mp-verdin-nonwifi-dahlia.dts | 18 +
+ .../dts/freescale/imx8mp-verdin-nonwifi-dev.dts | 18 +
+ .../boot/dts/freescale/imx8mp-verdin-nonwifi.dtsi | 54 +
+ .../dts/freescale/imx8mp-verdin-wifi-dahlia.dts | 18 +
+ .../boot/dts/freescale/imx8mp-verdin-wifi-dev.dts | 18 +
+ .../boot/dts/freescale/imx8mp-verdin-wifi.dtsi | 82 +
+ arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 1380 +++++++
+ arch/arm64/boot/dts/freescale/imx8mp.dtsi | 247 +-
+ .../dts/freescale/imx8mq-kontron-pitx-imx8m.dts | 2 +-
+ .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 2 +-
+ .../arm64/boot/dts/freescale/imx8mq-librem5-r4.dts | 4 +
+ arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 15 +-
+ .../boot/dts/freescale/imx8mq-mnt-reform2.dts | 2 +-
+ arch/arm64/boot/dts/freescale/imx8mq.dtsi | 15 +-
+ arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 25 +
+ arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 24 +
+ arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 4 +-
+ arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 4 +-
+ arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 2 -
+ arch/arm64/boot/dts/marvell/armada-3720-db.dts | 2 +-
+ .../dts/marvell/armada-3720-espressobin-ultra.dts | 9 +-
+ .../boot/dts/marvell/armada-3720-turris-mox.dts | 2 +-
+ arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 21 +-
+ arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 4 +-
+ arch/arm64/boot/dts/marvell/armada-7040-db.dts | 4 +-
+ .../boot/dts/marvell/armada-7040-mochabin.dts | 2 +-
+ .../dts/marvell/armada-8040-clearfog-gt-8k.dts | 2 +-
+ arch/arm64/boot/dts/marvell/armada-8040-db.dts | 4 +-
+ arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi | 2 +-
+ .../boot/dts/marvell/armada-8040-puzzle-m801.dts | 2 +-
+ arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 2 +-
+ arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 2 +-
+ arch/arm64/boot/dts/marvell/cn9130-crb.dtsi | 2 +-
+ arch/arm64/boot/dts/marvell/cn9130-db.dtsi | 2 +-
+ arch/arm64/boot/dts/marvell/cn9131-db.dtsi | 2 +-
+ arch/arm64/boot/dts/mediatek/Makefile | 2 +
+ arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 10 +-
+ arch/arm64/boot/dts/mediatek/mt6359.dtsi | 298 ++
+ arch/arm64/boot/dts/mediatek/mt7622.dtsi | 20 +
+ arch/arm64/boot/dts/mediatek/mt8167.dtsi | 2 +-
+ arch/arm64/boot/dts/mediatek/mt8173.dtsi | 29 +-
+ .../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 2 +-
+ arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2 +-
+ arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts | 2 +-
+ arch/arm64/boot/dts/mediatek/mt8183.dtsi | 17 +-
+ arch/arm64/boot/dts/mediatek/mt8192-evb.dts | 1 +
+ arch/arm64/boot/dts/mediatek/mt8192.dtsi | 526 ++-
+ arch/arm64/boot/dts/mediatek/mt8195-demo.dts | 450 +++
+ arch/arm64/boot/dts/mediatek/mt8195-evb.dts | 181 +
+ arch/arm64/boot/dts/mediatek/mt8195.dtsi | 1045 ++++++
+ arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 1 -
+ arch/arm64/boot/dts/microchip/sparx5_nand.dtsi | 2 +-
+ arch/arm64/boot/dts/microchip/sparx5_pcb125.dts | 4 +-
+ .../boot/dts/microchip/sparx5_pcb134_board.dtsi | 4 +-
+ .../boot/dts/microchip/sparx5_pcb135_board.dtsi | 4 +-
+ arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 223 ++
+ .../dts/nvidia/tegra186-p3509-0000+p3636-0001.dts | 2 +-
+ arch/arm64/boot/dts/nvidia/tegra186.dtsi | 15 +-
+ arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 225 +-
+ .../arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi | 225 +-
+ arch/arm64/boot/dts/nvidia/tegra194.dtsi | 42 +-
+ arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 2 +-
+ arch/arm64/boot/dts/nvidia/tegra210.dtsi | 5 +-
+ .../arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi | 12 +
+ .../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 223 ++
+ arch/arm64/boot/dts/nvidia/tegra234.dtsi | 67 +-
+ arch/arm64/boot/dts/qcom/Makefile | 5 +-
+ arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 6 +
+ arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts | 2 +-
+ arch/arm64/boot/dts/qcom/ipq6018.dtsi | 34 +-
+ arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 2 +-
+ arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/ipq8074.dtsi | 42 +-
+ arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 59 +-
+ arch/arm64/boot/dts/qcom/msm8916.dtsi | 102 +-
+ arch/arm64/boot/dts/qcom/msm8953.dtsi | 52 +-
+ arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 36 +-
+ arch/arm64/boot/dts/qcom/msm8992.dtsi | 24 +-
+ .../dts/qcom/msm8994-huawei-angler-rev-101.dts | 21 +-
+ .../dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 89 +-
+ arch/arm64/boot/dts/qcom/msm8994.dtsi | 126 +-
+ arch/arm64/boot/dts/qcom/msm8996-mtp.dts | 8 +-
+ .../boot/dts/qcom/msm8996-sony-xperia-tone.dtsi | 18 +-
+ .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 36 +-
+ arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 9 +
+ .../arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts | 9 +
+ arch/arm64/boot/dts/qcom/msm8996.dtsi | 250 +-
+ .../boot/dts/qcom/msm8998-oneplus-common.dtsi | 31 +
+ arch/arm64/boot/dts/qcom/msm8998.dtsi | 15 +
+ arch/arm64/boot/dts/qcom/pm8350.dtsi | 31 +
+ arch/arm64/boot/dts/qcom/pm8350b.dtsi | 31 +
+ arch/arm64/boot/dts/qcom/pm8350c.dtsi | 41 +-
+ arch/arm64/boot/dts/qcom/pm8450.dtsi | 59 +
+ arch/arm64/boot/dts/qcom/pmr735a.dtsi | 32 +-
+ arch/arm64/boot/dts/qcom/pmr735b.dtsi | 31 +
+ arch/arm64/boot/dts/qcom/qcs404.dtsi | 94 +-
+ arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 2 +-
+ arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 193 +
+ .../arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 11 +-
+ .../boot/dts/qcom/sc7180-trogdor-homestar-r2.dts | 2 +-
+ .../boot/dts/qcom/sc7180-trogdor-homestar-r3.dts | 2 +-
+ .../boot/dts/qcom/sc7180-trogdor-homestar-r4.dts | 2 +-
+ .../boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 7 -
+ .../qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts | 2 +-
+ .../qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts | 4 +-
+ .../dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts | 2 +-
+ .../dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dts | 2 +-
+ .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 2 +-
+ .../boot/dts/qcom/sc7180-trogdor-lazor-r1-lte.dts | 4 -
+ .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 2 +-
+ .../boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts | 2 +-
+ .../boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 6 +-
+ .../boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 2 +-
+ .../boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts | 2 +-
+ .../boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts | 6 +-
+ .../boot/dts/qcom/sc7180-trogdor-lazor-r9.dts | 2 +-
+ arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 7 +-
+ .../arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 9 +-
+ arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 9 +-
+ arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 9 +-
+ arch/arm64/boot/dts/qcom/sc7180.dtsi | 9 +-
+ .../dts/qcom/{sc7280-crd.dts => sc7280-crd-r3.dts} | 7 +-
+ arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts | 365 ++
+ .../dts/qcom/sc7280-herobrine-herobrine-r0.dts | 1352 -------
+ .../dts/qcom/sc7280-herobrine-herobrine-r1.dts | 38 +
+ .../boot/dts/qcom/sc7280-herobrine-villager-r0.dts | 304 ++
+ arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 93 +-
+ arch/arm64/boot/dts/qcom/sc7280-idp.dts | 2 +-
+ arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 36 +-
+ arch/arm64/boot/dts/qcom/sc7280-idp2.dts | 4 +
+ arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 73 +-
+ arch/arm64/boot/dts/qcom/sc7280.dtsi | 336 +-
+ arch/arm64/boot/dts/qcom/sdm630.dtsi | 4 +-
+ arch/arm64/boot/dts/qcom/sdm660.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 33 +
+ .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 35 +-
+ arch/arm64/boot/dts/qcom/sdm845.dtsi | 34 +-
+ arch/arm64/boot/dts/qcom/sm6350.dtsi | 241 +-
+ arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 61 +-
+ arch/arm64/boot/dts/qcom/sm8150.dtsi | 330 +-
+ .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 30 +-
+ arch/arm64/boot/dts/qcom/sm8250.dtsi | 339 +-
+ arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 4 +
+ .../dts/qcom/sm8350-microsoft-surface-duo2.dts | 12 +
+ arch/arm64/boot/dts/qcom/sm8350.dtsi | 186 +-
+ arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 41 +
+ arch/arm64/boot/dts/qcom/sm8450-qrd.dts | 34 +
+ arch/arm64/boot/dts/qcom/sm8450.dtsi | 3750 ++++++++++++++++----
+ arch/arm64/boot/dts/renesas/Makefile | 6 +
+ .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 10 +-
+ arch/arm64/boot/dts/renesas/draak.dtsi | 60 +-
+ arch/arm64/boot/dts/renesas/ebisu.dtsi | 60 +-
+ arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 6 +-
+ arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 6 +-
+ arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 2 +-
+ arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 8 +-
+ arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 5 +-
+ arch/arm64/boot/dts/renesas/r8a77951.dtsi | 22 +-
+ arch/arm64/boot/dts/renesas/r8a77960.dtsi | 22 +-
+ arch/arm64/boot/dts/renesas/r8a77961.dtsi | 47 +-
+ arch/arm64/boot/dts/renesas/r8a77965.dtsi | 22 +-
+ arch/arm64/boot/dts/renesas/r8a77970.dtsi | 6 +-
+ arch/arm64/boot/dts/renesas/r8a77980.dtsi | 6 +-
+ arch/arm64/boot/dts/renesas/r8a77990.dtsi | 24 +-
+ arch/arm64/boot/dts/renesas/r8a77995.dtsi | 24 +-
+ .../boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 12 +-
+ arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts | 24 +
+ arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 131 +-
+ .../boot/dts/renesas/r8a779f0-spider-cpu.dtsi | 20 +
+ .../boot/dts/renesas/r8a779f0-spider-ethernet.dtsi | 15 +
+ arch/arm64/boot/dts/renesas/r8a779f0-spider.dts | 10 +
+ arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 163 +
+ .../boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi | 45 +
+ .../arm64/boot/dts/renesas/r8a779g0-white-hawk.dts | 22 +
+ arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 122 +
+ arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 885 +++++
+ arch/arm64/boot/dts/renesas/r9a07g043u11-smarc.dts | 21 +
+ arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 8 +-
+ arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts | 76 -
+ arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 592 ++-
+ arch/arm64/boot/dts/renesas/r9a07g054l2-smarc.dts | 8 -
+ arch/arm64/boot/dts/renesas/r9a09g011-v2mevk2.dts | 44 +
+ arch/arm64/boot/dts/renesas/r9a09g011.dtsi | 93 +
+ arch/arm64/boot/dts/renesas/rz-smarc-common.dtsi | 24 -
+ arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 30 +
+ .../boot/dts/renesas/rzg2lc-smarc-pinfunction.dtsi | 64 +-
+ arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi | 61 +
+ arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi | 38 +
+ .../boot/dts/renesas/rzg2ul-smarc-pinfunction.dtsi | 119 +
+ arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi | 251 ++
+ arch/arm64/boot/dts/renesas/rzg2ul-smarc.dtsi | 63 +
+ arch/arm64/boot/dts/renesas/salvator-common.dtsi | 51 +-
+ arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 10 +-
+ arch/arm64/boot/dts/renesas/ulcb.dtsi | 49 +
+ arch/arm64/boot/dts/rockchip/Makefile | 6 +-
+ arch/arm64/boot/dts/rockchip/rk3328.dtsi | 22 +-
+ arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 3 +-
+ .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 7 +
+ .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 12 +
+ arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 28 +
+ arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts | 3 +-
+ .../boot/dts/rockchip/rk3399-khadas-edge.dtsi | 3 +-
+ arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts | 3 +-
+ arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi | 25 +
+ arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 3 +-
+ arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 3 +-
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 45 +-
+ arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi | 80 +
+ arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 37 +
+ arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts | 615 ++++
+ arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 579 +++
+ .../boot/dts/rockchip/rk3566-soquartz-cm4.dts | 177 +
+ arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi | 616 ++++
+ arch/arm64/boot/dts/rockchip/rk3566.dtsi | 11 +
+ arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 102 +
+ arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 46 +
+ arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 562 +++
+ arch/arm64/boot/dts/rockchip/rk3568.dtsi | 23 +
+ arch/arm64/boot/dts/rockchip/rk356x.dtsi | 74 +-
+ arch/arm64/boot/dts/synaptics/as370.dtsi | 173 -
+ arch/arm64/boot/dts/tesla/fsd.dtsi | 10 +-
+ arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 307 ++
+ arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi | 48 +
+ arch/arm64/boot/dts/ti/k3-am62.dtsi | 1 +
+ arch/arm64/boot/dts/ti/k3-am625-sk.dts | 289 ++
+ arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi | 2 -
+ arch/arm64/boot/dts/ti/k3-am642-sk.dts | 62 +
+ .../boot/dts/ti/k3-j721e-common-proc-board.dts | 77 +-
+ arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 75 +-
+ arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 139 +-
+ arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts | 9 -
+ .../boot/dts/toshiba/tmpv7708-visrobo-vrb.dts | 6 -
+ .../boot/dts/toshiba/tmpv7708-visrobo-vrc.dtsi | 4 -
+ arch/arm64/boot/dts/toshiba/tmpv7708.dtsi | 96 +-
+ arch/arm64/configs/defconfig | 33 +
+ arch/mips/alchemy/devboards/db1300.c | 9 -
+ drivers/ata/pata_palmld.c | 3 +-
+ drivers/bus/Kconfig | 11 +
+ drivers/bus/Makefile | 1 +
+ drivers/bus/brcmstb_gisb.c | 1 -
+ drivers/bus/qcom-ssc-block-bus.c | 389 ++
+ drivers/bus/ti-sysc.c | 4 +-
+ drivers/clk/pxa/clk-pxa.c | 8 +-
+ drivers/clk/pxa/clk-pxa.h | 9 +-
+ drivers/clk/pxa/clk-pxa25x.c | 46 +-
+ drivers/clk/pxa/clk-pxa27x.c | 68 +-
+ drivers/clk/pxa/clk-pxa2xx.h | 58 +
+ drivers/clk/pxa/clk-pxa3xx.c | 139 +-
+ drivers/clocksource/timer-ti-dm.c | 2 +-
+ drivers/cpufreq/pxa2xx-cpufreq.c | 6 +-
+ drivers/cpufreq/pxa3xx-cpufreq.c | 65 +-
+ drivers/dma/ti/omap-dma.c | 19 +-
+ drivers/firmware/arm_ffa/driver.c | 24 +-
+ drivers/firmware/arm_scmi/Kconfig | 1 +
+ drivers/firmware/arm_scmi/base.c | 46 +-
+ drivers/firmware/arm_scmi/clock.c | 343 +-
+ drivers/firmware/arm_scmi/common.h | 225 +-
+ drivers/firmware/arm_scmi/driver.c | 168 +-
+ drivers/firmware/arm_scmi/optee.c | 144 +-
+ drivers/firmware/arm_scmi/perf.c | 162 +-
+ drivers/firmware/arm_scmi/power.c | 44 +-
+ drivers/firmware/arm_scmi/protocols.h | 318 ++
+ drivers/firmware/arm_scmi/reset.c | 40 +-
+ drivers/firmware/arm_scmi/sensors.c | 645 ++--
+ drivers/firmware/arm_scmi/system.c | 9 +-
+ drivers/firmware/arm_scmi/voltage.c | 218 +-
+ drivers/firmware/qcom_scm.c | 4 +
+ drivers/firmware/ti_sci.c | 61 +-
+ drivers/input/keyboard/omap-keypad.c | 1 +
+ drivers/input/mouse/pxa930_trkball.c | 1 -
+ drivers/input/touchscreen/Kconfig | 2 +
+ drivers/input/touchscreen/mainstone-wm97xx.c | 130 +-
+ drivers/input/touchscreen/wm97xx-core.c | 42 +-
+ drivers/input/touchscreen/zylonite-wm97xx.c | 43 +-
+ drivers/leds/leds-locomo.c | 1 -
+ drivers/memory/Kconfig | 2 +-
+ drivers/memory/brcmstb_dpfe.c | 10 +-
+ drivers/memory/da8xx-ddrctl.c | 3 +-
+ drivers/memory/emif.c | 15 +-
+ drivers/memory/fsl-corenet-cf.c | 9 +-
+ drivers/memory/omap-gpmc.c | 43 +-
+ drivers/memory/renesas-rpc-if.c | 31 +-
+ drivers/memory/samsung/exynos5422-dmc.c | 5 +-
+ drivers/memory/tegra/Makefile | 2 +
+ drivers/memory/tegra/mc.c | 141 +-
+ drivers/memory/tegra/mc.h | 50 +-
+ drivers/memory/tegra/tegra186-emc.c | 3 +
+ drivers/memory/tegra/tegra186.c | 39 +
+ drivers/memory/tegra/tegra194.c | 9 +
+ drivers/memory/tegra/tegra234.c | 110 +
+ drivers/memory/ti-aemif.c | 4 +-
+ drivers/memory/ti-emif-pm.c | 6 +-
+ drivers/mfd/tc6393xb.c | 130 +-
+ drivers/mmc/host/pxamci.c | 2 +-
+ drivers/mtd/maps/pxa2xx-flash.c | 2 -
+ drivers/nvme/host/Kconfig | 13 +
+ drivers/nvme/host/Makefile | 3 +
+ drivers/nvme/host/apple.c | 1593 +++++++++
+ drivers/pcmcia/Kconfig | 3 +-
+ drivers/pcmcia/Makefile | 13 -
+ drivers/pcmcia/omap_cf.c | 48 +-
+ drivers/pcmcia/pxa2xx_base.c | 48 +-
+ drivers/pcmcia/pxa2xx_sharpsl.c | 3 +-
+ drivers/pcmcia/sa1111_generic.c | 1 -
+ drivers/pcmcia/sa1111_lubbock.c | 1 -
+ drivers/pcmcia/soc_common.c | 19 +-
+ drivers/pcmcia/soc_common.h | 120 +-
+ drivers/power/supply/tosa_battery.c | 172 +-
+ drivers/reset/Kconfig | 4 +-
+ drivers/reset/core.c | 15 +-
+ drivers/reset/reset-meson.c | 6 +
+ drivers/reset/reset-simple.c | 1 +
+ drivers/reset/reset-uniphier-glue.c | 75 +-
+ drivers/rtc/rtc-pxa.c | 2 -
+ drivers/soc/Kconfig | 1 +
+ drivers/soc/Makefile | 5 +-
+ drivers/soc/apple/Kconfig | 24 +
+ drivers/soc/apple/Makefile | 6 +
+ drivers/soc/apple/rtkit-crashlog.c | 154 +
+ drivers/soc/apple/rtkit-internal.h | 62 +
+ drivers/soc/apple/rtkit.c | 958 +++++
+ drivers/soc/apple/sart.c | 328 ++
+ drivers/soc/bcm/bcm63xx/bcm-pmb.c | 3 +
+ drivers/soc/imx/Makefile | 1 +
+ drivers/soc/imx/gpcv2.c | 430 ++-
+ drivers/soc/imx/imx8m-blk-ctrl.c | 124 +-
+ drivers/soc/imx/imx8mp-blk-ctrl.c | 696 ++++
+ drivers/soc/mediatek/mt8167-mmsys.h | 2 +-
+ drivers/soc/mediatek/mt8183-mmsys.h | 2 +-
+ drivers/soc/mediatek/mt8186-mmsys.h | 4 +-
+ drivers/soc/mediatek/mt8192-mmsys.h | 4 +-
+ drivers/soc/mediatek/mt8195-mmsys.h | 370 ++
+ drivers/soc/mediatek/mt8365-mmsys.h | 4 +-
+ drivers/soc/mediatek/mtk-cmdq-helper.c | 25 +-
+ drivers/soc/mediatek/mtk-mmsys.c | 153 +-
+ drivers/soc/mediatek/mtk-mmsys.h | 6 +
+ drivers/soc/mediatek/mtk-mutex.c | 92 +-
+ {arch/arm/plat-pxa => drivers/soc/pxa}/Kconfig | 5 +-
+ {arch/arm/plat-pxa => drivers/soc/pxa}/Makefile | 4 -
+ {arch/arm/plat-pxa => drivers/soc/pxa}/mfp.c | 2 +-
+ {arch/arm/plat-pxa => drivers/soc/pxa}/ssp.c | 0
+ drivers/soc/qcom/llcc-qcom.c | 61 +
+ drivers/soc/qcom/pdr_interface.c | 11 +-
+ drivers/soc/qcom/pdr_internal.h | 20 +-
+ drivers/soc/qcom/rpmhpd.c | 73 +-
+ drivers/soc/qcom/smem.c | 305 +-
+ drivers/soc/qcom/smp2p.c | 1 +
+ drivers/soc/qcom/smsm.c | 1 +
+ drivers/soc/qcom/socinfo.c | 26 +-
+ drivers/soc/renesas/Kconfig | 26 +
+ drivers/soc/renesas/Makefile | 1 +
+ drivers/soc/renesas/r8a779g0-sysc.c | 62 +
+ drivers/soc/renesas/rcar-gen4-sysc.c | 3 +
+ drivers/soc/renesas/rcar-gen4-sysc.h | 1 +
+ drivers/soc/renesas/rcar-rst.c | 1 +
+ drivers/soc/renesas/renesas-soc.c | 23 +-
+ drivers/soc/rockchip/Kconfig | 24 +-
+ drivers/soc/rockchip/grf.c | 17 +
+ drivers/soc/rockchip/pm_domains.c | 10 +-
+ drivers/soc/tegra/Kconfig | 1 +
+ drivers/soc/tegra/fuse/fuse-tegra.c | 8 +-
+ drivers/soc/tegra/fuse/fuse-tegra30.c | 17 +-
+ drivers/soc/tegra/pmc.c | 35 +-
+ drivers/soc/ti/knav_dma.c | 29 +-
+ drivers/soc/ti/knav_qmss_queue.c | 21 +-
+ drivers/soc/ti/omap_prm.c | 7 +-
+ drivers/soc/ti/pm33xx.c | 6 +-
+ drivers/soc/ti/pruss.c | 3 +-
+ drivers/soc/ti/ti_sci_pm_domains.c | 2 +
+ drivers/soc/ti/wkup_m3_ipc.c | 210 +-
+ drivers/spi/Kconfig | 2 +-
+ drivers/spi/spi-omap-uwire.c | 15 +-
+ drivers/tee/Kconfig | 5 +-
+ drivers/tee/optee/call.c | 240 +-
+ drivers/tee/optee/core.c | 1 +
+ drivers/tee/optee/ffa_abi.c | 38 +-
+ drivers/tee/optee/optee_ffa.h | 12 +-
+ drivers/tee/optee/optee_private.h | 31 +-
+ drivers/tee/optee/optee_smc.h | 48 +-
+ drivers/tee/optee/smc_abi.c | 197 +-
+ drivers/tee/tee_core.c | 2 -
+ drivers/tee/tee_shm.c | 85 +-
+ drivers/tty/serial/8250/8250.h | 1 +
+ drivers/usb/gadget/udc/omap_udc.c | 19 +-
+ drivers/usb/gadget/udc/pxa25x_udc.c | 37 +-
+ drivers/usb/gadget/udc/pxa25x_udc.h | 7 +-
+ drivers/usb/host/Kconfig | 2 +-
+ drivers/usb/host/ohci-omap.c | 60 +-
+ drivers/usb/host/ohci-pxa27x.c | 3 +-
+ drivers/usb/phy/Kconfig | 3 +-
+ drivers/usb/phy/phy-isp1301-omap.c | 6 +-
+ drivers/video/backlight/Kconfig | 4 +-
+ drivers/video/backlight/omap1_bl.c | 4 +-
+ drivers/video/fbdev/Makefile | 2 +-
+ drivers/video/fbdev/omap/Kconfig | 4 +-
+ drivers/video/fbdev/omap/Makefile | 5 +
+ drivers/video/fbdev/omap/lcd_ams_delta.c | 6 +-
+ .../video/fbdev/omap}/lcd_dma.c | 7 +-
+ .../mach => drivers/video/fbdev/omap}/lcd_dma.h | 2 -
+ drivers/video/fbdev/omap/lcd_inn1510.c | 9 +-
+ drivers/video/fbdev/omap/lcd_osk.c | 4 +-
+ drivers/video/fbdev/omap/lcdc.c | 10 +-
+ drivers/video/fbdev/omap/lcdc.h | 35 +
+ drivers/video/fbdev/omap/omapfb.h | 2 +
+ drivers/video/fbdev/omap/omapfb_main.c | 19 +-
+ drivers/video/fbdev/omap/sossi.c | 4 +-
+ .../video/fbdev/pxa3xx-regs.h | 24 +-
+ drivers/video/fbdev/pxafb.c | 4 +-
+ drivers/watchdog/sa1100_wdt.c | 88 +-
+ include/dt-bindings/clock/qcom,gcc-msm8998.h | 4 +
+ .../dt-bindings/clock/qcom,lpassaudiocc-sc7280.h | 43 +
+ .../dt-bindings/clock/qcom,lpasscorecc-sc7280.h | 26 +
+ include/dt-bindings/clock/r8a779g0-cpg-mssr.h | 90 +
+ include/dt-bindings/clock/r9a07g043-cpg.h | 184 +
+ include/dt-bindings/clock/r9a09g011-cpg.h | 352 ++
+ include/dt-bindings/clock/samsung,exynosautov9.h | 299 ++
+ include/dt-bindings/clock/stm32mp1-clks.h | 46 +-
+ include/dt-bindings/clock/tegra234-clock.h | 8 +
+ include/dt-bindings/power/imx8mp-power.h | 18 +
+ include/dt-bindings/power/qcom-rpmpd.h | 26 +
+ include/dt-bindings/power/r8a779g0-sysc.h | 45 +
+ include/dt-bindings/reset/amlogic,meson-s4-reset.h | 125 +
+ include/dt-bindings/reset/mt8192-resets.h | 3 +
+ include/dt-bindings/reset/stm32mp1-resets.h | 24 +-
+ include/dt-bindings/reset/tegra234-reset.h | 2 +
+ include/linux/arm_ffa.h | 7 +-
+ include/linux/clk/pxa.h | 16 +
+ include/linux/gpio/machine.h | 12 +
+ include/linux/mfd/tc6393xb.h | 3 -
+ include/linux/omap-dma.h | 35 +-
+ include/linux/platform_data/asoc-poodle.h | 16 +
+ .../linux/platform_data/asoc-pxa.h | 4 +-
+ include/linux/platform_data/usb-omap1.h | 2 +
+ include/linux/platform_data/video-pxafb.h | 22 +-
+ include/linux/scmi_protocol.h | 31 +-
+ include/linux/soc/apple/rtkit.h | 155 +
+ include/linux/soc/apple/sart.h | 53 +
+ include/linux/soc/mediatek/mtk-cmdq.h | 5 +-
+ include/linux/soc/mediatek/mtk-mmsys.h | 12 +
+ .../mach/hardware.h => include/linux/soc/pxa/cpu.h | 61 +-
+ .../include/plat => include/linux/soc/pxa}/mfp.h | 6 +-
+ include/linux/soc/pxa/smemc.h | 13 +
+ include/linux/soc/qcom/llcc-qcom.h | 2 +
+ include/linux/soc/ti/omap1-io.h | 143 +
+ .../mach/mux.h => include/linux/soc/ti/omap1-mux.h | 142 +-
+ .../mach/soc.h => include/linux/soc/ti/omap1-soc.h | 22 -
+ .../mach/usb.h => include/linux/soc/ti/omap1-usb.h | 28 +-
+ include/linux/tee_drv.h | 18 -
+ include/linux/wkup_m3_ipc.h | 13 +
+ include/linux/wm97xx.h | 4 -
+ include/pcmcia/soc_common.h | 125 +
+ include/soc/tegra/mc.h | 8 +-
+ include/sound/pxa2xx-lib.h | 4 +
+ include/uapi/linux/tee.h | 4 -
+ sound/arm/pxa2xx-ac97-lib.c | 145 +-
+ .../regs-ac97.h => sound/arm/pxa2xx-ac97-regs.h | 42 +-
+ sound/arm/pxa2xx-ac97.c | 3 +-
+ sound/soc/pxa/corgi.c | 43 +-
+ sound/soc/pxa/e740_wm9705.c | 37 +-
+ sound/soc/pxa/e750_wm9705.c | 33 +-
+ sound/soc/pxa/e800_wm9712.c | 33 +-
+ sound/soc/pxa/em-x270.c | 2 +-
+ sound/soc/pxa/hx4700.c | 37 +-
+ sound/soc/pxa/magician.c | 141 +-
+ sound/soc/pxa/mioa701_wm9713.c | 2 +-
+ sound/soc/pxa/palm27x.c | 2 +-
+ sound/soc/pxa/poodle.c | 51 +-
+ sound/soc/pxa/pxa2xx-ac97.c | 24 +-
+ sound/soc/pxa/pxa2xx-i2s.c | 112 +-
+ sound/soc/pxa/spitz.c | 58 +-
+ sound/soc/pxa/tosa.c | 25 +-
+ sound/soc/pxa/z2.c | 8 +-
+ 1505 files changed, 61879 insertions(+), 21854 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/arm,corstone1000.yaml
+ create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
+ create mode 100644 Documentation/devicetree/bindings/bus/qcom,ssc-block-bus.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7280-lpasscorecc.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/samsung,exynosautov9-clock.yaml
+ create mode 100644 Documentation/devicetree/bindings/iommu/apple,sart.yaml
+ create mode 100644 Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml
+ create mode 100644 Documentation/devicetree/bindings/reset/altr,rst-mgr.yaml
+ delete mode 100644 Documentation/devicetree/bindings/reset/amlogic,meson-axg-audio-arb.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/amlogic,meson-axg-audio-arb.yaml
+ delete mode 100644 Documentation/devicetree/bindings/reset/ath79-reset.txt
+ delete mode 100644 Documentation/devicetree/bindings/reset/berlin,reset.txt
+ delete mode 100644 Documentation/devicetree/bindings/reset/bitmain,bm1880-reset.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/bitmain,bm1880-reset.yaml
+ delete mode 100644 Documentation/devicetree/bindings/reset/lantiq,reset.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/lantiq,reset.yaml
+ create mode 100644 Documentation/devicetree/bindings/reset/marvell,berlin2-reset.yaml
+ delete mode 100644 Documentation/devicetree/bindings/reset/nuvoton,npcm-reset.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/nuvoton,npcm750-reset.yaml
+ create mode 100644 Documentation/devicetree/bindings/reset/qca,ar7100-reset.yaml
+ delete mode 100644 Documentation/devicetree/bindings/reset/snps,axs10x-reset.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/snps,axs10x-reset.yaml
+ delete mode 100644 Documentation/devicetree/bindings/reset/socfpga-reset.txt
+ delete mode 100644 Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt
+ delete mode 100644 Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/st,stih407-picophyreset.yaml
+ create mode 100644 Documentation/devicetree/bindings/reset/st,stih407-powerdown.yaml
+ create mode 100644 Documentation/devicetree/bindings/soc/imx/fsl,imx8mp-hdmi-blk-ctrl.yaml
+ create mode 100644 Documentation/devicetree/bindings/soc/imx/fsl,imx8mp-media-blk-ctrl.yaml
+ delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt
+ create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.yaml
+ create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,rpmh-rsc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smd.txt
+ create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smd.yaml
+ delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smp2p.txt
+ create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smp2p.yaml
+ delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smsm.txt
+ create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smsm.yaml
+ delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.txt
+ create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.yaml
+ delete mode 100644 Documentation/devicetree/bindings/soc/qcom/rpmh-rsc.txt
+ rename Documentation/devicetree/bindings/{power => soc/renesas}/renesas,rzg2l-sysc.yaml (87%)
+ delete mode 100644 Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.yaml
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ rename arch/arm/{mach-ep93xx/include/mach/uncompress.h => boot/compressed/misc-ep93xx.h} (51%)
+ create mode 100644 arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi
+ create mode 100644 arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp.dts
+ create mode 100644 arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp2.dts
+ create mode 100644 arch/arm/boot/dts/bcm47622.dtsi
+ create mode 100644 arch/arm/boot/dts/bcm947622.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-colibri-aster.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-colibri-iris-v2.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-colibri-iris.dts
+ delete mode 100644 arch/arm/boot/dts/imx6dl-colibri-v1_1-eval-v3.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-bosch-acc.dts
+ delete mode 100644 arch/arm/boot/dts/imx6qdl-colibri-v1_1-uhs.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-vicut1-12inch.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul-common.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul1-mba6ulx.dts
+ create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul1.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul2-mba6ulx.dts
+ create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul2.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul2l-mba6ulx.dts
+ create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ul2l.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ulx-common.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ul-tqma6ulxl-common.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ull-colibri-aster.dts
+ create mode 100644 arch/arm/boot/dts/imx6ull-colibri-aster.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ull-colibri-emmc-aster.dts
+ create mode 100644 arch/arm/boot/dts/imx6ull-colibri-emmc-iris-v2.dts
+ create mode 100644 arch/arm/boot/dts/imx6ull-colibri-emmc-iris.dts
+ create mode 100644 arch/arm/boot/dts/imx6ull-colibri-iris-v2.dts
+ create mode 100644 arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ull-colibri-iris.dts
+ create mode 100644 arch/arm/boot/dts/imx6ull-colibri-iris.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ull-colibri-wifi-aster.dts
+ create mode 100644 arch/arm/boot/dts/imx6ull-colibri-wifi-iris-v2.dts
+ create mode 100644 arch/arm/boot/dts/imx6ull-colibri-wifi-iris.dts
+ create mode 100644 arch/arm/boot/dts/imx6ull-phytec-tauri-emmc.dts
+ create mode 100644 arch/arm/boot/dts/imx6ull-phytec-tauri-nand.dts
+ create mode 100644 arch/arm/boot/dts/imx6ull-phytec-tauri.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ull-tqma6ull2-mba6ulx.dts
+ create mode 100644 arch/arm/boot/dts/imx6ull-tqma6ull2.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ull-tqma6ull2l-mba6ulx.dts
+ create mode 100644 arch/arm/boot/dts/imx6ull-tqma6ull2l.dtsi
+ create mode 100644 arch/arm/boot/dts/imx7d-smegw01.dts
+ create mode 100644 arch/arm/boot/dts/imxrt1050-evk.dts
+ create mode 100644 arch/arm/boot/dts/imxrt1050.dtsi
+ create mode 100644 arch/arm/boot/dts/lan966x-kontron-kswitch-d10-mmt-6g-2gs.dts
+ create mode 100644 arch/arm/boot/dts/lan966x-kontron-kswitch-d10-mmt-8g.dts
+ create mode 100644 arch/arm/boot/dts/lan966x-kontron-kswitch-d10-mmt.dtsi
+ create mode 100644 arch/arm/boot/dts/ls1021a-iot.dts
+ create mode 100644 arch/arm/boot/dts/mba6ulx.dtsi
+ create mode 100644 arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts
+ rename arch/arm/boot/dts/{qcom-apq8064-sony-xperia-yuga.dts => qcom-apq8064-sony-xperia-lagan-yuga.dts} (100%)
+ delete mode 100644 arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts
+ delete mode 100644 arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts
+ delete mode 100644 arch/arm/boot/dts/qcom-msm8974-sony-xperia-amami.dts
+ delete mode 100644 arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts
+ delete mode 100644 arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts
+ create mode 100644 arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine-amami.dts
+ create mode 100644 arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine-honami.dts
+ create mode 100644 arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi
+ create mode 100644 arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
+ create mode 100644 arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
+ create mode 100644 arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
+ create mode 100644 arch/arm/boot/dts/qcom-pmx65.dtsi
+ create mode 100644 arch/arm/boot/dts/ste-ux500-samsung-codina-tmo.dts
+ create mode 100644 arch/arm/boot/dts/stm32mp151a-prtt1a.dts
+ create mode 100644 arch/arm/boot/dts/stm32mp151a-prtt1c.dts
+ create mode 100644 arch/arm/boot/dts/stm32mp151a-prtt1l.dtsi
+ create mode 100644 arch/arm/boot/dts/stm32mp151a-prtt1s.dts
+ create mode 100644 arch/arm/boot/dts/stm32mp157a-dk1-scmi.dts
+ create mode 100644 arch/arm/boot/dts/stm32mp157c-dk2-scmi.dts
+ create mode 100644 arch/arm/boot/dts/stm32mp157c-ed1-scmi.dts
+ create mode 100644 arch/arm/boot/dts/stm32mp157c-ev1-scmi.dts
+ create mode 100644 arch/arm/mach-at91/sam_secure.c
+ create mode 100644 arch/arm/mach-at91/sam_secure.h
+ rename arch/arm/mach-davinci/{include/mach => }/common.h (100%)
+ rename arch/arm/mach-davinci/{include/mach => }/cputype.h (98%)
+ rename arch/arm/mach-davinci/{include/mach => }/da8xx.h (99%)
+ rename arch/arm/mach-davinci/{include/mach => }/hardware.h (100%)
+ delete mode 100644 arch/arm/mach-davinci/include/mach/mux.h
+ delete mode 100644 arch/arm/mach-davinci/include/mach/uncompress.h
+ rename arch/arm/mach-davinci/{include/mach => }/pm.h (100%)
+ rename arch/arm/mach-davinci/{include/mach => }/serial.h (97%)
+ delete mode 100644 arch/arm/mach-dove/include/mach/uncompress.h
+ rename arch/arm/mach-ep93xx/{include/mach => }/ep93xx-regs.h (94%)
+ delete mode 100644 arch/arm/mach-ep93xx/include/mach/irqs.h
+ create mode 100644 arch/arm/mach-ep93xx/irqs.h
+ delete mode 100644 arch/arm/mach-integrator/Kconfig
+ delete mode 100644 arch/arm/mach-integrator/Makefile
+ delete mode 100644 arch/arm/mach-iop32x/include/mach/irqs.h
+ delete mode 100644 arch/arm/mach-iop32x/include/mach/uncompress.h
+ delete mode 100644 arch/arm/mach-ixp4xx/Makefile.boot
+ delete mode 100644 arch/arm/mach-ixp4xx/include/mach/uncompress.h
+ delete mode 100644 arch/arm/mach-mmp/tavorevb.c
+ rename arch/arm/mach-omap1/{include/mach => }/hardware.h (59%)
+ delete mode 100644 arch/arm/mach-omap1/include/mach/io.h
+ delete mode 100644 arch/arm/mach-omap1/include/mach/lcdc.h
+ delete mode 100644 arch/arm/mach-omap1/include/mach/memory.h
+ delete mode 100644 arch/arm/mach-omap1/include/mach/uncompress.h
+ rename arch/arm/mach-omap1/{include/mach => }/irqs.h (99%)
+ rename arch/arm/mach-omap1/{include/mach => }/mtd-xip.h (97%)
+ create mode 100644 arch/arm/mach-omap1/mux.h
+ rename arch/arm/{plat-omap/dma.c => mach-omap1/omap-dma.c} (83%)
+ rename arch/arm/mach-omap1/{include/mach => }/omap1510.h (100%)
+ rename arch/arm/mach-omap1/{include/mach => }/omap16xx.h (100%)
+ rename arch/arm/mach-omap1/{include/mach => }/omap7xx.h (100%)
+ rename arch/arm/mach-omap1/{include/mach => }/serial.h (100%)
+ rename arch/arm/mach-omap1/{include/mach => }/tc.h (98%)
+ create mode 100644 arch/arm/mach-omap1/usb.h
+ delete mode 100644 arch/arm/mach-omap2/include/mach/hardware.h
+ delete mode 100644 arch/arm/mach-omap2/include/mach/irqs.h
+ delete mode 100644 arch/arm/mach-omap2/include/mach/serial.h
+ delete mode 100644 arch/arm/mach-pxa/Makefile.boot
+ rename arch/arm/mach-pxa/{include/mach => }/addr-map.h (100%)
+ rename drivers/pcmcia/pxa2xx_balloon3.c => arch/arm/mach-pxa/balloon3-pcmcia.c (98%)
+ rename arch/arm/mach-pxa/{include/mach => }/balloon3.h (100%)
+ rename drivers/pcmcia/pxa2xx_colibri.c => arch/arm/mach-pxa/colibri-pcmcia.c (99%)
+ rename arch/arm/mach-pxa/{include/mach => }/corgi.h (100%)
+ rename drivers/pcmcia/pxa2xx_e740.c => arch/arm/mach-pxa/e740-pcmcia.c (98%)
+ rename arch/arm/mach-pxa/{include/mach => }/eseries-gpio.h (100%)
+ rename drivers/pcmcia/pxa2xx_hx4700.c => arch/arm/mach-pxa/hx4700-pcmcia.c (98%)
+ rename arch/arm/mach-pxa/{include/mach => }/hx4700.h (100%)
+ delete mode 100644 arch/arm/mach-pxa/include/mach/bitfield.h
+ delete mode 100644 arch/arm/mach-pxa/include/mach/dma.h
+ delete mode 100644 arch/arm/mach-pxa/include/mach/generic.h
+ delete mode 100644 arch/arm/mach-pxa/include/mach/mtd-xip.h
+ delete mode 100644 arch/arm/mach-pxa/include/mach/uncompress.h
+ rename arch/arm/mach-pxa/{include/mach => }/irqs.h (100%)
+ rename arch/arm/mach-pxa/{include/mach => }/lubbock.h (95%)
+ rename arch/arm/mach-pxa/{include/mach => }/magician.h (99%)
+ rename arch/arm/mach-pxa/{include/mach => }/mainstone.h (98%)
+ rename arch/arm/mach-pxa/{include/mach => }/mfp.h (91%)
+ rename drivers/pcmcia/pxa2xx_palmld.c => arch/arm/mach-pxa/palmld-pcmcia.c (98%)
+ rename arch/arm/mach-pxa/{include/mach => }/palmld.h (100%)
+ rename drivers/pcmcia/pxa2xx_palmtc.c => arch/arm/mach-pxa/palmtc-pcmcia.c (98%)
+ rename arch/arm/mach-pxa/{include/mach => }/palmtc.h (100%)
+ rename drivers/pcmcia/pxa2xx_palmtx.c => arch/arm/mach-pxa/palmtx-pcmcia.c (98%)
+ rename arch/arm/mach-pxa/{include/mach => }/palmtx.h (100%)
+ rename arch/arm/mach-pxa/{include/mach => }/poodle.h (98%)
+ create mode 100644 arch/arm/mach-pxa/pxa-regs.h
+ rename arch/arm/mach-pxa/{include/mach => }/pxa2xx-regs.h (76%)
+ rename arch/arm/mach-pxa/{include/mach => }/pxa3xx-regs.h (61%)
+ rename arch/arm/mach-pxa/{include/mach => }/regs-ost.h (94%)
+ rename arch/arm/mach-pxa/{include/mach => }/regs-uart.h (99%)
+ rename arch/arm/mach-pxa/{include/mach => }/reset.h (92%)
+ rename arch/arm/mach-pxa/{include/mach => }/smemc.h (100%)
+ rename arch/arm/mach-pxa/{include/mach => }/spitz.h (100%)
+ rename arch/arm/mach-pxa/{include/mach => }/tosa.h (88%)
+ rename drivers/pcmcia/pxa2xx_trizeps4.c => arch/arm/mach-pxa/trizeps4-pcmcia.c (98%)
+ rename arch/arm/mach-pxa/{include/mach => }/trizeps4.h (99%)
+ rename drivers/pcmcia/pxa2xx_viper.c => arch/arm/mach-pxa/viper-pcmcia.c (97%)
+ rename include/linux/platform_data/pcmcia-pxa2xx_viper.h => arch/arm/mach-pxa/viper-pcmcia.h (100%)
+ rename drivers/pcmcia/pxa2xx_vpac270.c => arch/arm/mach-pxa/vpac270-pcmcia.c (98%)
+ rename arch/arm/mach-pxa/{include/mach => }/vpac270.h (100%)
+ rename arch/arm/mach-pxa/{include/mach => }/z2.h (100%)
+ delete mode 100644 arch/arm/mach-realview/Kconfig
+ delete mode 100644 arch/arm/mach-realview/Makefile
+ delete mode 100644 arch/arm/mach-s3c/include/mach/io-s3c24xx.h
+ delete mode 100644 arch/arm/mach-s3c/include/mach/io.h
+ rename arch/arm/mach-s3c/{include/mach => }/irqs-s3c24xx.h (95%)
+ rename arch/arm/mach-s3c/{include/mach => }/irqs-s3c64xx.h (100%)
+ rename arch/arm/mach-s3c/{include/mach => }/irqs.h (100%)
+ rename arch/arm/mach-s3c/{include/mach => }/map-base.h (87%)
+ delete mode 100644 arch/arm/mach-spear/include/mach/irqs.h
+ delete mode 100644 arch/arm/mach-spear/include/mach/uncompress.h
+ rename arch/arm/mach-spear/{include/mach => }/misc_regs.h (87%)
+ rename arch/arm/mach-spear/{include/mach => }/spear.h (100%)
+ rename arch/arm/{mach-vexpress => mach-versatile}/Makefile.boot (100%)
+ rename arch/arm/{mach-vexpress => mach-versatile}/dcscb.c (97%)
+ rename arch/arm/{mach-vexpress => mach-versatile}/dcscb_setup.S (95%)
+ rename arch/arm/{plat-versatile => mach-versatile}/headsmp.S (94%)
+ rename arch/arm/{plat-versatile => mach-versatile}/hotplug.c (98%)
+ rename arch/arm/{mach-integrator/cm.h => mach-versatile/integrator-cm.h} (100%)
+ rename arch/arm/{mach-integrator/hardware.h => mach-versatile/integrator-hardware.h} (100%)
+ rename arch/arm/{mach-integrator/core.c => mach-versatile/integrator.c} (95%)
+ rename arch/arm/{mach-integrator/common.h => mach-versatile/integrator.h} (100%)
+ rename arch/arm/{mach-integrator => mach-versatile}/integrator_ap.c (95%)
+ rename arch/arm/{mach-integrator => mach-versatile}/integrator_cp.c (96%)
+ rename arch/arm/{mach-realview/platsmp-dt.c => mach-versatile/platsmp-realview.c} (98%)
+ rename arch/arm/{mach-vexpress/platsmp.c => mach-versatile/platsmp-vexpress.c} (96%)
+ rename arch/arm/{plat-versatile => mach-versatile}/platsmp.c (97%)
+ rename arch/arm/{plat-versatile/include/plat => mach-versatile}/platsmp.h (87%)
+ rename arch/arm/{mach-realview/realview-dt.c => mach-versatile/realview.c} (100%)
+ rename arch/arm/{mach-vexpress => mach-versatile}/spc.c (100%)
+ rename arch/arm/{mach-vexpress => mach-versatile}/spc.h (100%)
+ rename arch/arm/{mach-vexpress => mach-versatile}/tc2_pm.c (99%)
+ rename arch/arm/{mach-vexpress => mach-versatile}/v2m-mps2.c (100%)
+ rename arch/arm/{mach-vexpress => mach-versatile}/v2m.c (97%)
+ rename arch/arm/mach-versatile/{versatile_dt.c => versatile.c} (100%)
+ rename arch/arm/{mach-vexpress/core.h => mach-versatile/vexpress.h} (100%)
+ delete mode 100644 arch/arm/mach-vexpress/Kconfig
+ delete mode 100644 arch/arm/mach-vexpress/Makefile
+ delete mode 100644 arch/arm/plat-omap/Kconfig
+ delete mode 100644 arch/arm/plat-omap/Makefile
+ delete mode 100644 arch/arm/plat-omap/counter_32k.c
+ delete mode 100644 arch/arm/plat-omap/debug-leds.c
+ delete mode 100644 arch/arm/plat-omap/include/plat/counter-32k.h
+ delete mode 100644 arch/arm/plat-omap/include/plat/cpu.h
+ delete mode 100644 arch/arm/plat-omap/include/plat/sram.h
+ delete mode 100644 arch/arm/plat-omap/sram.c
+ delete mode 100644 arch/arm/plat-versatile/Makefile
+ create mode 100644 arch/arm64/boot/dts/arm/corstone1000-fvp.dts
+ create mode 100644 arch/arm64/boot/dts/arm/corstone1000-mps3.dts
+ create mode 100644 arch/arm64/boot/dts/arm/corstone1000.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-vpu.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-mx8menlo.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-ddr3l-evk.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-icore-mx8mp-edimm2.2.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-icore-mx8mp.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-dahlia.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-dev.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-nonwifi-dahlia.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-nonwifi-dev.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-nonwifi.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-wifi-dahlia.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-wifi-dev.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-wifi.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt6359.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8195-demo.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8195-evb.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8195.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/pm8450.dtsi
+ rename arch/arm64/boot/dts/qcom/{sc7280-crd.dts => sc7280-crd-r3.dts} (88%)
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
+ delete mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a779f0-spider-ethernet.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a779g0-white-hawk.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a779g0.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r9a07g043.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r9a07g043u11-smarc.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r9a09g011-v2mevk2.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r9a09g011.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/rzg2ul-smarc-pinfunction.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/rzg2ul-smarc.dtsi
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-soquartz-cm4.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
+ delete mode 100644 arch/arm64/boot/dts/synaptics/as370.dtsi
+ create mode 100644 drivers/bus/qcom-ssc-block-bus.c
+ create mode 100644 drivers/clk/pxa/clk-pxa2xx.h
+ create mode 100644 drivers/firmware/arm_scmi/protocols.h
+ create mode 100644 drivers/memory/tegra/tegra234.c
+ create mode 100644 drivers/nvme/host/apple.c
+ create mode 100644 drivers/soc/apple/rtkit-crashlog.c
+ create mode 100644 drivers/soc/apple/rtkit-internal.h
+ create mode 100644 drivers/soc/apple/rtkit.c
+ create mode 100644 drivers/soc/apple/sart.c
+ create mode 100644 drivers/soc/imx/imx8mp-blk-ctrl.c
+ create mode 100644 drivers/soc/mediatek/mt8195-mmsys.h
+ rename {arch/arm/plat-pxa => drivers/soc/pxa}/Kconfig (83%)
+ rename {arch/arm/plat-pxa => drivers/soc/pxa}/Makefile (51%)
+ rename {arch/arm/plat-pxa => drivers/soc/pxa}/mfp.c (99%)
+ rename {arch/arm/plat-pxa => drivers/soc/pxa}/ssp.c (100%)
+ create mode 100644 drivers/soc/renesas/r8a779g0-sysc.c
+ rename {arch/arm/mach-omap1 => drivers/video/fbdev/omap}/lcd_dma.c (98%)
+ rename {arch/arm/mach-omap1/include/mach => drivers/video/fbdev/omap}/lcd_dma.h (98%)
+ rename arch/arm/mach-pxa/include/mach/regs-lcd.h => drivers/video/fbdev/pxa3xx-regs.h (90%)
+ create mode 100644 include/dt-bindings/clock/qcom,lpassaudiocc-sc7280.h
+ create mode 100644 include/dt-bindings/clock/qcom,lpasscorecc-sc7280.h
+ create mode 100644 include/dt-bindings/clock/r8a779g0-cpg-mssr.h
+ create mode 100644 include/dt-bindings/clock/r9a07g043-cpg.h
+ create mode 100644 include/dt-bindings/clock/r9a09g011-cpg.h
+ create mode 100644 include/dt-bindings/clock/samsung,exynosautov9.h
+ create mode 100644 include/dt-bindings/power/r8a779g0-sysc.h
+ create mode 100644 include/dt-bindings/reset/amlogic,meson-s4-reset.h
+ create mode 100644 include/linux/clk/pxa.h
+ create mode 100644 include/linux/platform_data/asoc-poodle.h
+ rename arch/arm/mach-pxa/include/mach/audio.h => include/linux/platform_data/asoc-pxa.h (93%)
+ create mode 100644 include/linux/soc/apple/rtkit.h
+ create mode 100644 include/linux/soc/apple/sart.h
+ rename arch/arm/mach-pxa/include/mach/hardware.h => include/linux/soc/pxa/cpu.h (75%)
+ rename {arch/arm/plat-pxa/include/plat => include/linux/soc/pxa}/mfp.h (98%)
+ create mode 100644 include/linux/soc/pxa/smemc.h
+ create mode 100644 include/linux/soc/ti/omap1-io.h
+ rename arch/arm/mach-omap1/include/mach/mux.h => include/linux/soc/ti/omap1-mux.h (53%)
+ rename arch/arm/mach-omap1/include/mach/soc.h => include/linux/soc/ti/omap1-soc.h (90%)
+ rename arch/arm/mach-omap1/include/mach/usb.h => include/linux/soc/ti/omap1-usb.h (86%)
+ create mode 100644 include/pcmcia/soc_common.h
+ rename arch/arm/mach-pxa/include/mach/regs-ac97.h => sound/arm/pxa2xx-ac97-regs.h (71%)
+Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git actions/for-next
+Auto-merging arch/arm/boot/dts/owl-s500-roseapplepi.dts
+Merge made by the 'ort' strategy.
+Merging amlogic/for-next (1dac6e1d8385 Merge branch 'v5.20/drivers' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next
+Merge made by the 'ort' strategy.
+ drivers/soc/amlogic/meson-mx-socinfo.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging aspeed/for-next (8dc7aa0a7246 ARM: dts: aspeed: ast2600-evb: Enable GFX device)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging arch/arm/boot/dts/aspeed-g6.dtsi
+Merge made by the 'ort' strategy.
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/aspeed-ast2600-evb.dts | 39 ++++-
+ .../arm/boot/dts/aspeed-bmc-facebook-bletchley.dts | 182 ++++++++++++++++----
+ arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 2 +-
+ arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 2 +-
+ arch/arm/boot/dts/aspeed-bmc-nuvia-dc-scm.dts | 190 +++++++++++++++++++++
+ arch/arm/boot/dts/aspeed-g4.dtsi | 16 +-
+ arch/arm/boot/dts/aspeed-g5.dtsi | 16 +-
+ arch/arm/boot/dts/aspeed-g6.dtsi | 38 ++++-
+ 9 files changed, 431 insertions(+), 55 deletions(-)
+ create mode 100644 arch/arm/boot/dts/aspeed-bmc-nuvia-dc-scm.dts
+Merging at91/at91-next (3519476d99a4 Merge branch 'at91-dt' into at91-next)
+$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next
+Auto-merging arch/arm/boot/dts/at91-sama7g5ek.dts
+Auto-merging arch/arm/boot/dts/sama7g5.dtsi
+Auto-merging arch/arm/mach-at91/Kconfig
+Merge made by the 'ort' strategy.
+ arch/arm/boot/dts/at91-sama7g5ek.dts | 21 ++++++++++++++++++++-
+ arch/arm/boot/dts/at91sam9261ek.dts | 4 ++++
+ arch/arm/boot/dts/at91sam9263ek.dts | 4 ++++
+ arch/arm/boot/dts/at91sam9rlek.dts | 4 ++++
+ arch/arm/boot/dts/sam9x60.dtsi | 2 +-
+ arch/arm/boot/dts/sama7g5.dtsi | 26 +++++++++++++++++++++++++-
+ arch/arm/mach-at91/Kconfig | 2 +-
+ 7 files changed, 59 insertions(+), 4 deletions(-)
+Merging drivers-memory/for-next (1e2b798e9664 Merge branch 'for-v5.19/tegra-mc' into for-next)
+$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next
+Auto-merging drivers/memory/renesas-rpc-if.c
+Auto-merging drivers/memory/tegra/mc.c
+Merge made by the 'ort' strategy.
+Merging imx-mxs/for-next (6ed2affe8f7f Merge branch 'imx/defconfig' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next
+Auto-merging arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi
+Auto-merging arch/arm/boot/dts/imx6ul-phytec-segin-peb-av-02.dtsi
+Auto-merging arch/arm/boot/dts/imx6ull-colibri.dtsi
+Auto-merging arch/arm64/boot/dts/freescale/imx8mm-venice-gw71xx.dtsi
+Auto-merging arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx.dtsi
+Auto-merging arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx.dtsi
+Auto-merging arch/arm64/boot/dts/freescale/imx8mn.dtsi
+Auto-merging drivers/soc/imx/imx8m-blk-ctrl.c
+Merge made by the 'ort' strategy.
+Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git keystone/next
+Merge made by the 'ort' strategy.
+Merging mediatek/for-next (8434c5a06e3c Merge branch 'v5.18-next/soc' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next
+Merge made by the 'ort' strategy.
+Merging mvebu/for-next (58ec0844bd13 Merge branch 'mvebu/dt64' into mvebu/for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next
+Merge made by the 'ort' strategy.
+ arch/arm/mach-orion5x/dns323-setup.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging omap/for-next (b5418fc0478c Merge branch 'omap-for-v5.19/dt' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/boot/dts/logicpd-som-lv.dtsi
+Auto-merging drivers/bus/ti-sysc.c
+Merge made by the 'ort' strategy.
+Merging qcom/for-next (5faa5cd718a4 Merge branches 'arm64-for-5.19', 'arm64-defconfig-for-5.19', 'clk-for-5.19', 'defconfig-for-5.19', 'drivers-for-5.19', 'dts-for-5.19' and 'arm64-fixes-for-5.18' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next
+Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml
+Auto-merging arch/arm64/boot/dts/qcom/sm8250.dtsi
+Auto-merging drivers/clk/qcom/clk-rcg2.c
+Merge made by the 'ort' strategy.
+ .../bindings/clock/qcom,gcc-apq8064.yaml | 4 +-
+ .../bindings/clock/qcom,gcc-apq8084.yaml | 42 +
+ .../bindings/clock/qcom,gcc-sc8280xp.yaml | 128 +
+ .../devicetree/bindings/clock/qcom,rpmcc.txt | 63 -
+ .../devicetree/bindings/clock/qcom,rpmcc.yaml | 75 +
+ .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 4 +
+ drivers/clk/qcom/Kconfig | 19 +
+ drivers/clk/qcom/Makefile | 2 +
+ drivers/clk/qcom/clk-rcg.h | 2 +
+ drivers/clk/qcom/clk-rcg2.c | 126 +-
+ drivers/clk/qcom/clk-smd-rpm.c | 8 +-
+ drivers/clk/qcom/gcc-msm8976.c | 7 +-
+ drivers/clk/qcom/gcc-msm8998.c | 56 +
+ drivers/clk/qcom/gcc-sc8280xp.c | 7488 ++++++++++++++++++++
+ drivers/clk/qcom/lpassaudiocc-sc7280.c | 838 +++
+ drivers/clk/qcom/lpasscorecc-sc7280.c | 431 ++
+ include/dt-bindings/clock/qcom,gcc-msm8976.h | 1 +
+ include/dt-bindings/clock/qcom,gcc-sc8280xp.h | 496 ++
+ 18 files changed, 9690 insertions(+), 100 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-apq8084.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-sc8280xp.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/qcom,rpmcc.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/qcom,rpmcc.yaml
+ create mode 100644 drivers/clk/qcom/gcc-sc8280xp.c
+ create mode 100644 drivers/clk/qcom/lpassaudiocc-sc7280.c
+ create mode 100644 drivers/clk/qcom/lpasscorecc-sc7280.c
+ create mode 100644 include/dt-bindings/clock/qcom,gcc-sc8280xp.h
+Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git raspberrypi/for-next
+Merge made by the 'ort' strategy.
+ arch/arm/boot/dts/bcm2711-rpi-400.dts | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging renesas/next (7ae962c56cea Merge branch 'renesas-arm-dt-for-v5.19' into renesas-next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next
+Merge made by the 'ort' strategy.
+Merging reset/reset/next (2ca065dc9468 dt-bindings: reset: st,sti-powerdown: Convert to yaml)
+$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next
+Already up to date.
+Merging rockchip/for-next (1378fa35abe3 Merge branch 'v5.19-clk/next' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next
+Auto-merging arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
+Merge made by the 'ort' strategy.
+ .../bindings/clock/rockchip,px30-cru.txt | 70 ------------
+ .../bindings/clock/rockchip,px30-cru.yaml | 119 +++++++++++++++++++++
+ .../bindings/clock/rockchip,rk3036-cru.txt | 56 ----------
+ .../bindings/clock/rockchip,rk3036-cru.yaml | 72 +++++++++++++
+ .../bindings/clock/rockchip,rk3188-cru.txt | 61 -----------
+ .../bindings/clock/rockchip,rk3188-cru.yaml | 78 ++++++++++++++
+ .../bindings/clock/rockchip,rk3228-cru.txt | 58 ----------
+ .../bindings/clock/rockchip,rk3228-cru.yaml | 74 +++++++++++++
+ .../bindings/clock/rockchip,rk3288-cru.txt | 67 ------------
+ .../bindings/clock/rockchip,rk3288-cru.yaml | 85 +++++++++++++++
+ .../bindings/clock/rockchip,rk3308-cru.txt | 60 -----------
+ .../bindings/clock/rockchip,rk3308-cru.yaml | 76 +++++++++++++
+ .../bindings/clock/rockchip,rk3368-cru.txt | 61 -----------
+ .../bindings/clock/rockchip,rk3368-cru.yaml | 78 ++++++++++++++
+ .../bindings/clock/rockchip,rk3399-cru.yaml | 33 +++---
+ .../bindings/clock/rockchip,rk3568-cru.yaml | 13 +++
+ .../bindings/clock/rockchip,rv1108-cru.txt | 59 ----------
+ .../bindings/clock/rockchip,rv1108-cru.yaml | 75 +++++++++++++
+ arch/arm/boot/dts/rk3036.dtsi | 2 +
+ arch/arm/boot/dts/rk3066a.dtsi | 3 +-
+ arch/arm/boot/dts/rk3188.dtsi | 3 +-
+ arch/arm/boot/dts/rk322x.dtsi | 2 +
+ arch/arm/boot/dts/rk3288.dtsi | 2 +
+ arch/arm/boot/dts/rv1108.dtsi | 31 +++---
+ arch/arm64/boot/dts/rockchip/rk3308.dtsi | 5 +-
+ arch/arm64/boot/dts/rockchip/rk3368.dtsi | 2 +
+ arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 63 ++++++++++-
+ arch/arm64/boot/dts/rockchip/rk356x.dtsi | 52 +++++++++
+ drivers/clk/rockchip/clk-rk3568.c | 1 +
+ drivers/soc/rockchip/grf.c | 2 +
+ 30 files changed, 826 insertions(+), 537 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,px30-cru.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/rockchip,px30-cru.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3188-cru.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3188-cru.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3228-cru.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3228-cru.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3288-cru.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3288-cru.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3308-cru.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3308-cru.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3368-cru.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3368-cru.yaml
+ delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rv1108-cru.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rv1108-cru.yaml
+Merging samsung-krzk/for-next (88fb0c4d0aff Merge branch 'next/dt64' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next
+Auto-merging Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml
+Auto-merging arch/arm/mach-s3c/s3c24xx.c
+Merge made by the 'ort' strategy.
+Merging scmi/for-linux-next (4b0986a3613c Linux 5.18)
+$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next
+Already up to date.
+Merging stm32/stm32-next (747a29b9a5a5 dt-bindings: clock: stm32mp1: adapt example for "st,stm32mp1-rcc-secure")
+$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next
+Merge made by the 'ort' strategy.
+Merging sunxi/sunxi/for-next (073220ee354d Merge branch 'sunxi/dt-for-5.19' into sunxi/for-next)
+$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next
+Merge made by the 'ort' strategy.
+ drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 5 +++++
+ drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h | 2 +-
+ drivers/clk/sunxi-ng/ccu-sun50i-h616.c | 8 ++++++++
+ drivers/clk/sunxi-ng/ccu-sun50i-h616.h | 2 +-
+ include/dt-bindings/clock/sun50i-h6-r-ccu.h | 1 +
+ include/dt-bindings/clock/sun50i-h616-ccu.h | 1 +
+ 6 files changed, 17 insertions(+), 2 deletions(-)
+Merging tee/next (db30e53bf897 Merge branch 'tee_cleanup_for_v5.19' into next)
+$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next
+Auto-merging drivers/tee/tee_shm.c
+Merge made by the 'ort' strategy.
+Merging tegra/for-next (864067632632 Merge branch for-5.19/arm64/defconfig into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next
+Auto-merging drivers/memory/tegra/mc.c
+Merge made by the 'ort' strategy.
+ drivers/clk/tegra/clk-bpmp.c | 87 +++++++++++++++++++++++++++++++++-----------
+ drivers/clk/tegra/clk-dfll.c | 20 ++++++++--
+ 2 files changed, 82 insertions(+), 25 deletions(-)
+Merging ti/ti-next (4cc89036bc4f Merge branch 'ti-k3-dts-next' into ti-next)
+$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next
+Merge made by the 'ort' strategy.
+Merging xilinx/for-next (63623390c0d6 arm64: dts: zynqmp: add AMS driver to device tree)
+$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/gpio/gpio-zynq.yaml | 59 +++++++++++++++++++++-
+ arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 4 ++
+ arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 2 +-
+ arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 26 ++++++++++
+ 4 files changed, 89 insertions(+), 2 deletions(-)
+Merging clk/clk-next (71cc785d2955 Merge branch 'clk-qcom' into clk-next)
+$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next
+Auto-merging Documentation/devicetree/bindings/clock/st,stm32mp1-rcc.yaml
+Auto-merging drivers/clk/Makefile
+Merge made by the 'ort' strategy.
+ .../arm/mediatek/mediatek,mt8186-clock.yaml | 56 +
+ .../arm/mediatek/mediatek,mt8186-sys-clock.yaml | 54 +
+ .../bindings/clock/airoha,en7523-scu.yaml | 58 +
+ .../devicetree/bindings/clock/clock-bindings.txt | 188 +--
+ .../bindings/clock/renesas,cpg-mssr.yaml | 1 +
+ .../bindings/clock/renesas,rzg2l-cpg.yaml | 20 +-
+ .../devicetree/bindings/clock/st,stm32mp1-rcc.yaml | 2 +
+ .../bindings/clock/stericsson,u8500-clks.yaml | 57 +
+ .../bindings/clock/ti,am654-ehrpwm-tbclk.yaml | 1 +
+ arch/mips/generic/board-ingenic.c | 26 -
+ drivers/clk/Kconfig | 14 +
+ drivers/clk/Makefile | 2 +
+ drivers/clk/actions/owl-pll.c | 2 +-
+ drivers/clk/bcm/clk-raspberrypi.c | 2 +-
+ drivers/clk/clk-cdce706.c | 5 +-
+ drivers/clk/clk-cdce925.c | 24 +-
+ drivers/clk/clk-cs2000-cp.c | 5 +-
+ drivers/clk/clk-en7523.c | 351 ++++
+ drivers/clk/clk-fixed-rate.c | 2 +-
+ drivers/clk/clk-max9485.c | 5 +-
+ drivers/clk/clk-mux.c | 4 +-
+ drivers/clk/clk-renesas-pcie.c | 4 +-
+ drivers/clk/clk-si514.c | 5 +-
+ drivers/clk/clk-si5341.c | 5 +-
+ drivers/clk/clk-si5351.c | 24 +-
+ drivers/clk/clk-si544.c | 22 +-
+ drivers/clk/clk-si570.c | 24 +-
+ drivers/clk/clk.c | 9 +-
+ drivers/clk/imx/clk-composite-8m.c | 19 +-
+ drivers/clk/imx/clk-imx7d.c | 1 -
+ drivers/clk/imx/clk-imx8mm.c | 3 +-
+ drivers/clk/imx/clk-imx8mn.c | 41 +-
+ drivers/clk/imx/clk-imx8mp.c | 24 +-
+ drivers/clk/imx/clk-imx8mq.c | 5 +-
+ drivers/clk/imx/clk-scu.c | 6 +-
+ drivers/clk/imx/clk.c | 5 +
+ drivers/clk/imx/clk.h | 1 +
+ drivers/clk/ingenic/cgu.c | 2 +-
+ drivers/clk/ingenic/cgu.h | 3 +
+ drivers/clk/ingenic/jz4725b-cgu.c | 10 +
+ drivers/clk/ingenic/jz4740-cgu.c | 10 +
+ drivers/clk/ingenic/jz4760-cgu.c | 10 +
+ drivers/clk/ingenic/jz4770-cgu.c | 5 +
+ drivers/clk/ingenic/jz4780-cgu.c | 15 +
+ drivers/clk/ingenic/tcu.c | 35 +-
+ drivers/clk/ingenic/x1000-cgu.c | 15 +
+ drivers/clk/ingenic/x1830-cgu.c | 11 +
+ drivers/clk/keystone/syscon-clk.c | 11 +
+ drivers/clk/mediatek/Kconfig | 8 +
+ drivers/clk/mediatek/Makefile | 5 +
+ drivers/clk/mediatek/clk-apmixed.c | 12 +-
+ drivers/clk/mediatek/clk-cpumux.c | 50 +-
+ drivers/clk/mediatek/clk-cpumux.h | 6 +-
+ drivers/clk/mediatek/clk-gate.c | 52 +-
+ drivers/clk/mediatek/clk-gate.h | 8 +-
+ drivers/clk/mediatek/clk-mt2701-aud.c | 4 +-
+ drivers/clk/mediatek/clk-mt2701-bdp.c | 4 +-
+ drivers/clk/mediatek/clk-mt2701-eth.c | 4 +-
+ drivers/clk/mediatek/clk-mt2701-g3d.c | 4 +-
+ drivers/clk/mediatek/clk-mt2701-hif.c | 4 +-
+ drivers/clk/mediatek/clk-mt2701-img.c | 4 +-
+ drivers/clk/mediatek/clk-mt2701-mm.c | 4 +-
+ drivers/clk/mediatek/clk-mt2701-vdec.c | 4 +-
+ drivers/clk/mediatek/clk-mt2701.c | 34 +-
+ drivers/clk/mediatek/clk-mt2712-bdp.c | 4 +-
+ drivers/clk/mediatek/clk-mt2712-img.c | 4 +-
+ drivers/clk/mediatek/clk-mt2712-jpgdec.c | 4 +-
+ drivers/clk/mediatek/clk-mt2712-mfg.c | 4 +-
+ drivers/clk/mediatek/clk-mt2712-mm.c | 4 +-
+ drivers/clk/mediatek/clk-mt2712-vdec.c | 4 +-
+ drivers/clk/mediatek/clk-mt2712-venc.c | 4 +-
+ drivers/clk/mediatek/clk-mt2712.c | 58 +-
+ drivers/clk/mediatek/clk-mt6765-audio.c | 4 +-
+ drivers/clk/mediatek/clk-mt6765-cam.c | 4 +-
+ drivers/clk/mediatek/clk-mt6765-img.c | 4 +-
+ drivers/clk/mediatek/clk-mt6765-mipi0a.c | 4 +-
+ drivers/clk/mediatek/clk-mt6765-mm.c | 4 +-
+ drivers/clk/mediatek/clk-mt6765-vcodec.c | 4 +-
+ drivers/clk/mediatek/clk-mt6765.c | 32 +-
+ drivers/clk/mediatek/clk-mt6779-aud.c | 4 +-
+ drivers/clk/mediatek/clk-mt6779-cam.c | 4 +-
+ drivers/clk/mediatek/clk-mt6779-img.c | 4 +-
+ drivers/clk/mediatek/clk-mt6779-ipe.c | 4 +-
+ drivers/clk/mediatek/clk-mt6779-mfg.c | 4 +-
+ drivers/clk/mediatek/clk-mt6779-mm.c | 4 +-
+ drivers/clk/mediatek/clk-mt6779-vdec.c | 4 +-
+ drivers/clk/mediatek/clk-mt6779-venc.c | 4 +-
+ drivers/clk/mediatek/clk-mt6779.c | 36 +-
+ drivers/clk/mediatek/clk-mt6797-img.c | 4 +-
+ drivers/clk/mediatek/clk-mt6797-mm.c | 4 +-
+ drivers/clk/mediatek/clk-mt6797-vdec.c | 4 +-
+ drivers/clk/mediatek/clk-mt6797-venc.c | 4 +-
+ drivers/clk/mediatek/clk-mt6797.c | 42 +-
+ drivers/clk/mediatek/clk-mt7622-aud.c | 4 +-
+ drivers/clk/mediatek/clk-mt7622-eth.c | 8 +-
+ drivers/clk/mediatek/clk-mt7622-hif.c | 8 +-
+ drivers/clk/mediatek/clk-mt7622.c | 48 +-
+ drivers/clk/mediatek/clk-mt7629-eth.c | 8 +-
+ drivers/clk/mediatek/clk-mt7629-hif.c | 8 +-
+ drivers/clk/mediatek/clk-mt7629.c | 42 +-
+ drivers/clk/mediatek/clk-mt7986-apmixed.c | 22 +-
+ drivers/clk/mediatek/clk-mt7986-eth.c | 14 +-
+ drivers/clk/mediatek/clk-mt7986-infracfg.c | 4 +-
+ drivers/clk/mediatek/clk-mt7986-topckgen.c | 16 +-
+ drivers/clk/mediatek/clk-mt8135.c | 38 +-
+ drivers/clk/mediatek/clk-mt8167-aud.c | 4 +-
+ drivers/clk/mediatek/clk-mt8167-img.c | 4 +-
+ drivers/clk/mediatek/clk-mt8167-mfgcfg.c | 4 +-
+ drivers/clk/mediatek/clk-mt8167-mm.c | 4 +-
+ drivers/clk/mediatek/clk-mt8167-vdec.c | 4 +-
+ drivers/clk/mediatek/clk-mt8167.c | 28 +-
+ drivers/clk/mediatek/clk-mt8173-mm.c | 4 +-
+ drivers/clk/mediatek/clk-mt8173.c | 97 +-
+ drivers/clk/mediatek/clk-mt8183-audio.c | 4 +-
+ drivers/clk/mediatek/clk-mt8183-cam.c | 4 +-
+ drivers/clk/mediatek/clk-mt8183-img.c | 4 +-
+ drivers/clk/mediatek/clk-mt8183-ipu0.c | 4 +-
+ drivers/clk/mediatek/clk-mt8183-ipu1.c | 4 +-
+ drivers/clk/mediatek/clk-mt8183-ipu_adl.c | 4 +-
+ drivers/clk/mediatek/clk-mt8183-ipu_conn.c | 4 +-
+ drivers/clk/mediatek/clk-mt8183-mfgcfg.c | 4 +-
+ drivers/clk/mediatek/clk-mt8183-mm.c | 4 +-
+ drivers/clk/mediatek/clk-mt8183-vdec.c | 4 +-
+ drivers/clk/mediatek/clk-mt8183-venc.c | 4 +-
+ drivers/clk/mediatek/clk-mt8183.c | 47 +-
+ drivers/clk/mediatek/clk-mt8186-apmixedsys.c | 133 ++
+ drivers/clk/mediatek/clk-mt8186-cam.c | 90 +
+ drivers/clk/mediatek/clk-mt8186-img.c | 68 +
+ drivers/clk/mediatek/clk-mt8186-imp_iic_wrap.c | 67 +
+ drivers/clk/mediatek/clk-mt8186-infra_ao.c | 216 +++
+ drivers/clk/mediatek/clk-mt8186-ipe.c | 55 +
+ drivers/clk/mediatek/clk-mt8186-mcu.c | 108 ++
+ drivers/clk/mediatek/clk-mt8186-mdp.c | 80 +
+ drivers/clk/mediatek/clk-mt8186-mfg.c | 48 +
+ drivers/clk/mediatek/clk-mt8186-mm.c | 111 ++
+ drivers/clk/mediatek/clk-mt8186-topckgen.c | 780 +++++++++
+ drivers/clk/mediatek/clk-mt8186-vdec.c | 88 +
+ drivers/clk/mediatek/clk-mt8186-venc.c | 51 +
+ drivers/clk/mediatek/clk-mt8186-wpe.c | 51 +
+ drivers/clk/mediatek/clk-mt8192-aud.c | 4 +-
+ drivers/clk/mediatek/clk-mt8192-mm.c | 4 +-
+ drivers/clk/mediatek/clk-mt8192.c | 21 +-
+ drivers/clk/mediatek/clk-mt8195-apmixedsys.c | 6 +-
+ drivers/clk/mediatek/clk-mt8195-apusys_pll.c | 6 +-
+ drivers/clk/mediatek/clk-mt8195-topckgen.c | 6 +-
+ drivers/clk/mediatek/clk-mt8195-vdo0.c | 6 +-
+ drivers/clk/mediatek/clk-mt8195-vdo1.c | 6 +-
+ drivers/clk/mediatek/clk-mt8516-aud.c | 4 +-
+ drivers/clk/mediatek/clk-mt8516.c | 24 +-
+ drivers/clk/mediatek/clk-mtk.c | 173 +-
+ drivers/clk/mediatek/clk-mtk.h | 25 +-
+ drivers/clk/mediatek/clk-mux.c | 50 +-
+ drivers/clk/mediatek/clk-mux.h | 6 +-
+ drivers/clk/mediatek/clk-pll.c | 64 +-
+ drivers/clk/mediatek/clk-pll.h | 6 +-
+ drivers/clk/renesas/Kconfig | 17 +-
+ drivers/clk/renesas/Makefile | 3 +
+ drivers/clk/renesas/r8a774a1-cpg-mssr.c | 9 +-
+ drivers/clk/renesas/r8a774b1-cpg-mssr.c | 9 +-
+ drivers/clk/renesas/r8a774c0-cpg-mssr.c | 8 +-
+ drivers/clk/renesas/r8a774e1-cpg-mssr.c | 9 +-
+ drivers/clk/renesas/r8a7795-cpg-mssr.c | 9 +-
+ drivers/clk/renesas/r8a7796-cpg-mssr.c | 9 +-
+ drivers/clk/renesas/r8a77965-cpg-mssr.c | 9 +-
+ drivers/clk/renesas/r8a77980-cpg-mssr.c | 10 +-
+ drivers/clk/renesas/r8a77990-cpg-mssr.c | 7 +
+ drivers/clk/renesas/r8a77995-cpg-mssr.c | 11 +-
+ drivers/clk/renesas/r8a779a0-cpg-mssr.c | 23 +-
+ drivers/clk/renesas/r8a779f0-cpg-mssr.c | 30 +-
+ drivers/clk/renesas/r8a779g0-cpg-mssr.c | 218 +++
+ drivers/clk/renesas/r9a06g032-clocks.c | 2 +-
+ drivers/clk/renesas/r9a07g043-cpg.c | 320 ++++
+ drivers/clk/renesas/r9a07g044-cpg.c | 96 +-
+ drivers/clk/renesas/r9a09g011-cpg.c | 172 ++
+ drivers/clk/renesas/rcar-gen3-cpg.h | 5 +-
+ drivers/clk/renesas/rcar-gen4-cpg.c | 5 +
+ drivers/clk/renesas/rcar-gen4-cpg.h | 3 +
+ drivers/clk/renesas/renesas-cpg-mssr.c | 6 +
+ drivers/clk/renesas/renesas-cpg-mssr.h | 1 +
+ drivers/clk/renesas/rzg2l-cpg.c | 464 +++++-
+ drivers/clk/renesas/rzg2l-cpg.h | 87 +-
+ drivers/clk/samsung/Makefile | 1 +
+ drivers/clk/samsung/clk-exynosautov9.c | 1733 +++++++++++++++++++
+ drivers/clk/stm32/Makefile | 1 +
+ drivers/clk/stm32/clk-stm32-core.c | 695 ++++++++
+ drivers/clk/stm32/clk-stm32-core.h | 188 +++
+ drivers/clk/stm32/clk-stm32mp13.c | 1620 ++++++++++++++++++
+ drivers/clk/stm32/reset-stm32.c | 122 ++
+ drivers/clk/stm32/reset-stm32.h | 8 +
+ drivers/clk/stm32/stm32mp13_rcc.h | 1748 ++++++++++++++++++++
+ drivers/clk/ti/clkctrl.c | 13 +-
+ drivers/clk/ti/composite.c | 2 +-
+ drivers/clk/ux500/clk-prcmu.c | 252 +--
+ drivers/clk/ux500/clk.h | 70 +-
+ drivers/clk/ux500/reset-prcc.c | 2 +-
+ drivers/clk/ux500/u8500_of_clk.c | 350 ++--
+ include/dt-bindings/clock/en7523-clk.h | 17 +
+ include/dt-bindings/clock/imx8mn-clock.h | 16 +-
+ include/dt-bindings/clock/imx8mp-clock.h | 9 +-
+ include/dt-bindings/clock/mt8186-clk.h | 445 +++++
+ include/dt-bindings/clock/samsung,exynosautov9.h | 14 +-
+ include/dt-bindings/clock/ste-db8500-clkout.h | 17 +
+ include/dt-bindings/clock/stm32mp13-clks.h | 229 +++
+ include/dt-bindings/reset/stm32mp13-resets.h | 100 ++
+ 204 files changed, 12280 insertions(+), 1410 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8186-clock.yaml
+ create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8186-sys-clock.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml
+ create mode 100644 drivers/clk/clk-en7523.c
+ create mode 100644 drivers/clk/mediatek/clk-mt8186-apmixedsys.c
+ create mode 100644 drivers/clk/mediatek/clk-mt8186-cam.c
+ create mode 100644 drivers/clk/mediatek/clk-mt8186-img.c
+ create mode 100644 drivers/clk/mediatek/clk-mt8186-imp_iic_wrap.c
+ create mode 100644 drivers/clk/mediatek/clk-mt8186-infra_ao.c
+ create mode 100644 drivers/clk/mediatek/clk-mt8186-ipe.c
+ create mode 100644 drivers/clk/mediatek/clk-mt8186-mcu.c
+ create mode 100644 drivers/clk/mediatek/clk-mt8186-mdp.c
+ create mode 100644 drivers/clk/mediatek/clk-mt8186-mfg.c
+ create mode 100644 drivers/clk/mediatek/clk-mt8186-mm.c
+ create mode 100644 drivers/clk/mediatek/clk-mt8186-topckgen.c
+ create mode 100644 drivers/clk/mediatek/clk-mt8186-vdec.c
+ create mode 100644 drivers/clk/mediatek/clk-mt8186-venc.c
+ create mode 100644 drivers/clk/mediatek/clk-mt8186-wpe.c
+ create mode 100644 drivers/clk/renesas/r8a779g0-cpg-mssr.c
+ create mode 100644 drivers/clk/renesas/r9a07g043-cpg.c
+ create mode 100644 drivers/clk/renesas/r9a09g011-cpg.c
+ create mode 100644 drivers/clk/samsung/clk-exynosautov9.c
+ create mode 100644 drivers/clk/stm32/Makefile
+ create mode 100644 drivers/clk/stm32/clk-stm32-core.c
+ create mode 100644 drivers/clk/stm32/clk-stm32-core.h
+ create mode 100644 drivers/clk/stm32/clk-stm32mp13.c
+ create mode 100644 drivers/clk/stm32/reset-stm32.c
+ create mode 100644 drivers/clk/stm32/reset-stm32.h
+ create mode 100644 drivers/clk/stm32/stm32mp13_rcc.h
+ create mode 100644 include/dt-bindings/clock/en7523-clk.h
+ create mode 100644 include/dt-bindings/clock/mt8186-clk.h
+ create mode 100644 include/dt-bindings/clock/ste-db8500-clkout.h
+ create mode 100644 include/dt-bindings/clock/stm32mp13-clks.h
+ create mode 100644 include/dt-bindings/reset/stm32mp13-resets.h
+Merging clk-imx/for-next (cf7f3f4fa9e5 clk: imx8mp: fix usb_root_clk parent)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next
+Already up to date.
+Merging clk-renesas/renesas-clk (23426d1be3c2 clk: renesas: r9a09g011: Add eth clock and reset entries)
+$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk
+Already up to date.
+Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next
+Already up to date.
+Merging csky/linux-next (64d83f067746 csky: Move $(core-y) into arch/csky/Kbuild)
+$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next
+Already up to date.
+Merging loongarch/loongarch-next (cdfe896c18ca MAINTAINERS: Add maintainer information for LoongArch)
+$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next
+Auto-merging Documentation/translations/zh_CN/index.rst
+Auto-merging MAINTAINERS
+Auto-merging drivers/acpi/acpica/evevent.c
+Auto-merging drivers/acpi/acpica/hwsleep.c
+Auto-merging drivers/acpi/acpica/utglobal.c
+Auto-merging drivers/firmware/efi/Kconfig
+Auto-merging drivers/firmware/efi/libstub/efi-stub.c
+Auto-merging drivers/irqchip/Kconfig
+Auto-merging drivers/irqchip/Makefile
+Auto-merging drivers/pci/pci.c
+Auto-merging include/acpi/actbl2.h
+CONFLICT (content): Merge conflict in include/acpi/actbl2.h
+Auto-merging include/acpi/actypes.h
+Auto-merging include/linux/cpuhotplug.h
+Auto-merging include/linux/efi.h
+Auto-merging include/uapi/linux/elf.h
+Resolved 'include/acpi/actbl2.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master b431ff10d833] Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/arch.rst | 1 +
+ Documentation/loongarch/features.rst | 3 +
+ Documentation/loongarch/index.rst | 21 +
+ Documentation/loongarch/introduction.rst | 387 +++++
+ Documentation/loongarch/irq-chip-model.rst | 168 +++
+ Documentation/translations/zh_CN/index.rst | 1 +
+ .../translations/zh_CN/loongarch/features.rst | 8 +
+ .../translations/zh_CN/loongarch/index.rst | 26 +
+ .../translations/zh_CN/loongarch/introduction.rst | 351 +++++
+ .../zh_CN/loongarch/irq-chip-model.rst | 167 +++
+ MAINTAINERS | 9 +
+ arch/loongarch/Kbuild | 6 +
+ arch/loongarch/Kconfig | 454 ++++++
+ arch/loongarch/Kconfig.debug | 0
+ arch/loongarch/Makefile | 107 ++
+ arch/loongarch/boot/.gitignore | 2 +
+ arch/loongarch/boot/Makefile | 20 +
+ arch/loongarch/boot/dts/Makefile | 4 +
+ arch/loongarch/configs/loongson3_defconfig | 772 ++++++++++
+ arch/loongarch/include/asm/Kbuild | 30 +
+ arch/loongarch/include/asm/acenv.h | 18 +
+ arch/loongarch/include/asm/acpi.h | 38 +
+ arch/loongarch/include/asm/addrspace.h | 112 ++
+ arch/loongarch/include/asm/asm-offsets.h | 5 +
+ arch/loongarch/include/asm/asm-prototypes.h | 7 +
+ arch/loongarch/include/asm/asm.h | 187 +++
+ arch/loongarch/include/asm/asmmacro.h | 289 ++++
+ arch/loongarch/include/asm/atomic.h | 362 +++++
+ arch/loongarch/include/asm/barrier.h | 159 ++
+ arch/loongarch/include/asm/bitops.h | 33 +
+ arch/loongarch/include/asm/bitrev.h | 34 +
+ arch/loongarch/include/asm/bootinfo.h | 43 +
+ arch/loongarch/include/asm/branch.h | 21 +
+ arch/loongarch/include/asm/bug.h | 23 +
+ arch/loongarch/include/asm/cache.h | 13 +
+ arch/loongarch/include/asm/cacheflush.h | 80 ++
+ arch/loongarch/include/asm/cacheops.h | 37 +
+ arch/loongarch/include/asm/clocksource.h | 12 +
+ arch/loongarch/include/asm/cmpxchg.h | 122 ++
+ arch/loongarch/include/asm/compiler.h | 15 +
+ arch/loongarch/include/asm/cpu-features.h | 73 +
+ arch/loongarch/include/asm/cpu-info.h | 116 ++
+ arch/loongarch/include/asm/cpu.h | 127 ++
+ arch/loongarch/include/asm/cpufeature.h | 24 +
+ arch/loongarch/include/asm/delay.h | 26 +
+ arch/loongarch/include/asm/dma-direct.h | 11 +
+ arch/loongarch/include/asm/dma.h | 13 +
+ arch/loongarch/include/asm/dmi.h | 24 +
+ arch/loongarch/include/asm/efi.h | 41 +
+ arch/loongarch/include/asm/elf.h | 301 ++++
+ arch/loongarch/include/asm/entry-common.h | 13 +
+ arch/loongarch/include/asm/exec.h | 10 +
+ arch/loongarch/include/asm/fb.h | 23 +
+ arch/loongarch/include/asm/fixmap.h | 13 +
+ arch/loongarch/include/asm/fpregdef.h | 53 +
+ arch/loongarch/include/asm/fpu.h | 129 ++
+ arch/loongarch/include/asm/futex.h | 108 ++
+ arch/loongarch/include/asm/hardirq.h | 26 +
+ arch/loongarch/include/asm/hugetlb.h | 79 +
+ arch/loongarch/include/asm/hw_irq.h | 17 +
+ arch/loongarch/include/asm/idle.h | 9 +
+ arch/loongarch/include/asm/inst.h | 117 ++
+ arch/loongarch/include/asm/io.h | 129 ++
+ arch/loongarch/include/asm/irq.h | 133 ++
+ arch/loongarch/include/asm/irq_regs.h | 27 +
+ arch/loongarch/include/asm/irqflags.h | 78 +
+ arch/loongarch/include/asm/kdebug.h | 23 +
+ arch/loongarch/include/asm/linkage.h | 36 +
+ arch/loongarch/include/asm/local.h | 138 ++
+ arch/loongarch/include/asm/loongarch.h | 1519 ++++++++++++++++++++
+ arch/loongarch/include/asm/loongson.h | 153 ++
+ arch/loongarch/include/asm/mmu.h | 16 +
+ arch/loongarch/include/asm/mmu_context.h | 152 ++
+ arch/loongarch/include/asm/mmzone.h | 18 +
+ arch/loongarch/include/asm/module.h | 80 ++
+ arch/loongarch/include/asm/module.lds.h | 7 +
+ arch/loongarch/include/asm/numa.h | 69 +
+ arch/loongarch/include/asm/page.h | 113 ++
+ arch/loongarch/include/asm/pci.h | 40 +
+ arch/loongarch/include/asm/percpu.h | 214 +++
+ arch/loongarch/include/asm/perf_event.h | 10 +
+ arch/loongarch/include/asm/pgalloc.h | 103 ++
+ arch/loongarch/include/asm/pgtable-bits.h | 131 ++
+ arch/loongarch/include/asm/pgtable.h | 565 ++++++++
+ arch/loongarch/include/asm/prefetch.h | 29 +
+ arch/loongarch/include/asm/processor.h | 209 +++
+ arch/loongarch/include/asm/ptrace.h | 152 ++
+ arch/loongarch/include/asm/reboot.h | 10 +
+ arch/loongarch/include/asm/regdef.h | 41 +
+ arch/loongarch/include/asm/seccomp.h | 20 +
+ arch/loongarch/include/asm/serial.h | 11 +
+ arch/loongarch/include/asm/setup.h | 21 +
+ arch/loongarch/include/asm/shmparam.h | 12 +
+ arch/loongarch/include/asm/smp.h | 124 ++
+ arch/loongarch/include/asm/sparsemem.h | 23 +
+ arch/loongarch/include/asm/stackframe.h | 219 +++
+ arch/loongarch/include/asm/stacktrace.h | 74 +
+ arch/loongarch/include/asm/string.h | 12 +
+ arch/loongarch/include/asm/switch_to.h | 37 +
+ arch/loongarch/include/asm/syscall.h | 74 +
+ arch/loongarch/include/asm/thread_info.h | 106 ++
+ arch/loongarch/include/asm/time.h | 50 +
+ arch/loongarch/include/asm/timex.h | 33 +
+ arch/loongarch/include/asm/tlb.h | 180 +++
+ arch/loongarch/include/asm/tlbflush.h | 48 +
+ arch/loongarch/include/asm/topology.h | 41 +
+ arch/loongarch/include/asm/types.h | 19 +
+ arch/loongarch/include/asm/uaccess.h | 269 ++++
+ arch/loongarch/include/asm/unistd.h | 11 +
+ arch/loongarch/include/asm/vdso.h | 38 +
+ arch/loongarch/include/asm/vdso/clocksource.h | 8 +
+ arch/loongarch/include/asm/vdso/gettimeofday.h | 99 ++
+ arch/loongarch/include/asm/vdso/processor.h | 14 +
+ arch/loongarch/include/asm/vdso/vdso.h | 30 +
+ arch/loongarch/include/asm/vdso/vsyscall.h | 27 +
+ arch/loongarch/include/asm/vermagic.h | 19 +
+ arch/loongarch/include/asm/vmalloc.h | 4 +
+ arch/loongarch/include/uapi/asm/Kbuild | 2 +
+ arch/loongarch/include/uapi/asm/auxvec.h | 17 +
+ arch/loongarch/include/uapi/asm/bitsperlong.h | 9 +
+ arch/loongarch/include/uapi/asm/break.h | 23 +
+ arch/loongarch/include/uapi/asm/byteorder.h | 13 +
+ arch/loongarch/include/uapi/asm/hwcap.h | 20 +
+ arch/loongarch/include/uapi/asm/ptrace.h | 52 +
+ arch/loongarch/include/uapi/asm/reg.h | 59 +
+ arch/loongarch/include/uapi/asm/sigcontext.h | 44 +
+ arch/loongarch/include/uapi/asm/signal.h | 13 +
+ arch/loongarch/include/uapi/asm/ucontext.h | 35 +
+ arch/loongarch/include/uapi/asm/unistd.h | 5 +
+ arch/loongarch/kernel/.gitignore | 2 +
+ arch/loongarch/kernel/Makefile | 25 +
+ arch/loongarch/kernel/access-helper.h | 13 +
+ arch/loongarch/kernel/acpi.c | 501 +++++++
+ arch/loongarch/kernel/asm-offsets.c | 264 ++++
+ arch/loongarch/kernel/cacheinfo.c | 122 ++
+ arch/loongarch/kernel/cpu-probe.c | 292 ++++
+ arch/loongarch/kernel/dma.c | 40 +
+ arch/loongarch/kernel/efi-header.S | 100 ++
+ arch/loongarch/kernel/efi.c | 229 +++
+ arch/loongarch/kernel/elf.c | 30 +
+ arch/loongarch/kernel/entry.S | 89 ++
+ arch/loongarch/kernel/env.c | 70 +
+ arch/loongarch/kernel/fpu.S | 261 ++++
+ arch/loongarch/kernel/genex.S | 95 ++
+ arch/loongarch/kernel/head.S | 129 ++
+ arch/loongarch/kernel/idle.c | 16 +
+ arch/loongarch/kernel/image-vars.h | 29 +
+ arch/loongarch/kernel/inst.c | 40 +
+ arch/loongarch/kernel/io.c | 94 ++
+ arch/loongarch/kernel/irq.c | 142 ++
+ arch/loongarch/kernel/mem.c | 64 +
+ arch/loongarch/kernel/module-sections.c | 121 ++
+ arch/loongarch/kernel/module.c | 375 +++++
+ arch/loongarch/kernel/numa.c | 466 ++++++
+ arch/loongarch/kernel/proc.c | 127 ++
+ arch/loongarch/kernel/process.c | 267 ++++
+ arch/loongarch/kernel/ptrace.c | 431 ++++++
+ arch/loongarch/kernel/reset.c | 102 ++
+ arch/loongarch/kernel/setup.c | 377 +++++
+ arch/loongarch/kernel/signal.c | 566 ++++++++
+ arch/loongarch/kernel/smp.c | 760 ++++++++++
+ arch/loongarch/kernel/switch.S | 35 +
+ arch/loongarch/kernel/syscall.c | 63 +
+ arch/loongarch/kernel/time.c | 220 +++
+ arch/loongarch/kernel/topology.c | 52 +
+ arch/loongarch/kernel/traps.c | 725 ++++++++++
+ arch/loongarch/kernel/vdso.c | 138 ++
+ arch/loongarch/kernel/vmlinux.lds.S | 121 ++
+ arch/loongarch/lib/Makefile | 6 +
+ arch/loongarch/lib/clear_user.S | 43 +
+ arch/loongarch/lib/copy_user.S | 47 +
+ arch/loongarch/lib/delay.c | 43 +
+ arch/loongarch/lib/dump_tlb.c | 111 ++
+ arch/loongarch/mm/Makefile | 9 +
+ arch/loongarch/mm/cache.c | 140 ++
+ arch/loongarch/mm/extable.c | 22 +
+ arch/loongarch/mm/fault.c | 261 ++++
+ arch/loongarch/mm/hugetlbpage.c | 87 ++
+ arch/loongarch/mm/init.c | 178 +++
+ arch/loongarch/mm/ioremap.c | 27 +
+ arch/loongarch/mm/maccess.c | 10 +
+ arch/loongarch/mm/mmap.c | 125 ++
+ arch/loongarch/mm/page.S | 84 ++
+ arch/loongarch/mm/pgtable.c | 130 ++
+ arch/loongarch/mm/tlb.c | 305 ++++
+ arch/loongarch/mm/tlbex.S | 546 +++++++
+ arch/loongarch/pci/Makefile | 7 +
+ arch/loongarch/pci/acpi.c | 175 +++
+ arch/loongarch/pci/pci.c | 98 ++
+ arch/loongarch/vdso/.gitignore | 2 +
+ arch/loongarch/vdso/Makefile | 96 ++
+ arch/loongarch/vdso/elf.S | 15 +
+ arch/loongarch/vdso/gen_vdso_offsets.sh | 13 +
+ arch/loongarch/vdso/sigreturn.S | 24 +
+ arch/loongarch/vdso/vdso.S | 22 +
+ arch/loongarch/vdso/vdso.lds.S | 72 +
+ arch/loongarch/vdso/vgettimeofday.c | 25 +
+ drivers/acpi/acpica/evevent.c | 17 +-
+ drivers/acpi/acpica/hwsleep.c | 12 +
+ drivers/acpi/acpica/utglobal.c | 4 +
+ drivers/acpi/pci_mcfg.c | 13 +
+ drivers/acpi/tables.c | 10 +
+ drivers/firmware/efi/Kconfig | 2 +-
+ drivers/firmware/efi/libstub/Makefile | 10 +
+ drivers/firmware/efi/libstub/efi-stub-helper.c | 2 +-
+ drivers/firmware/efi/libstub/efi-stub.c | 2 +-
+ drivers/firmware/efi/libstub/loongarch-stub.c | 87 ++
+ drivers/gpu/drm/drm_vm.c | 2 +-
+ drivers/gpu/drm/ttm/ttm_module.c | 2 +-
+ drivers/irqchip/Kconfig | 38 +-
+ drivers/irqchip/Makefile | 3 +
+ drivers/irqchip/irq-loongarch-cpu.c | 92 ++
+ drivers/irqchip/irq-loongson-eiointc.c | 379 +++++
+ drivers/irqchip/irq-loongson-htvec.c | 146 +-
+ drivers/irqchip/irq-loongson-liointc.c | 204 ++-
+ drivers/irqchip/irq-loongson-pch-lpc.c | 225 +++
+ drivers/irqchip/irq-loongson-pch-msi.c | 128 +-
+ drivers/irqchip/irq-loongson-pch-pic.c | 155 +-
+ drivers/pci/controller/Kconfig | 2 +-
+ drivers/pci/controller/pci-loongson.c | 223 ++-
+ drivers/pci/pci.c | 6 +
+ drivers/pci/pcie/portdrv_core.c | 6 +-
+ include/acpi/actbl2.h | 125 +-
+ include/acpi/actypes.h | 3 +-
+ include/drm/drm_cache.h | 8 +
+ include/linux/cpuhotplug.h | 2 +
+ include/linux/efi.h | 1 +
+ include/linux/pci-ecam.h | 1 +
+ include/linux/pci.h | 2 +
+ include/linux/pe.h | 1 +
+ include/uapi/linux/audit.h | 2 +
+ include/uapi/linux/elf-em.h | 1 +
+ include/uapi/linux/elf.h | 5 +
+ include/uapi/linux/kexec.h | 1 +
+ scripts/sorttable.c | 5 +
+ scripts/subarch.include | 2 +-
+ tools/include/uapi/asm/bitsperlong.h | 2 +
+ 237 files changed, 23605 insertions(+), 252 deletions(-)
+ create mode 100644 Documentation/loongarch/features.rst
+ create mode 100644 Documentation/loongarch/index.rst
+ create mode 100644 Documentation/loongarch/introduction.rst
+ create mode 100644 Documentation/loongarch/irq-chip-model.rst
+ create mode 100644 Documentation/translations/zh_CN/loongarch/features.rst
+ create mode 100644 Documentation/translations/zh_CN/loongarch/index.rst
+ create mode 100644 Documentation/translations/zh_CN/loongarch/introduction.rst
+ create mode 100644 Documentation/translations/zh_CN/loongarch/irq-chip-model.rst
+ create mode 100644 arch/loongarch/Kbuild
+ create mode 100644 arch/loongarch/Kconfig
+ create mode 100644 arch/loongarch/Kconfig.debug
+ create mode 100644 arch/loongarch/Makefile
+ create mode 100644 arch/loongarch/boot/.gitignore
+ create mode 100644 arch/loongarch/boot/Makefile
+ create mode 100644 arch/loongarch/boot/dts/Makefile
+ create mode 100644 arch/loongarch/configs/loongson3_defconfig
+ create mode 100644 arch/loongarch/include/asm/Kbuild
+ create mode 100644 arch/loongarch/include/asm/acenv.h
+ create mode 100644 arch/loongarch/include/asm/acpi.h
+ create mode 100644 arch/loongarch/include/asm/addrspace.h
+ create mode 100644 arch/loongarch/include/asm/asm-offsets.h
+ create mode 100644 arch/loongarch/include/asm/asm-prototypes.h
+ create mode 100644 arch/loongarch/include/asm/asm.h
+ create mode 100644 arch/loongarch/include/asm/asmmacro.h
+ create mode 100644 arch/loongarch/include/asm/atomic.h
+ create mode 100644 arch/loongarch/include/asm/barrier.h
+ create mode 100644 arch/loongarch/include/asm/bitops.h
+ create mode 100644 arch/loongarch/include/asm/bitrev.h
+ create mode 100644 arch/loongarch/include/asm/bootinfo.h
+ create mode 100644 arch/loongarch/include/asm/branch.h
+ create mode 100644 arch/loongarch/include/asm/bug.h
+ create mode 100644 arch/loongarch/include/asm/cache.h
+ create mode 100644 arch/loongarch/include/asm/cacheflush.h
+ create mode 100644 arch/loongarch/include/asm/cacheops.h
+ create mode 100644 arch/loongarch/include/asm/clocksource.h
+ create mode 100644 arch/loongarch/include/asm/cmpxchg.h
+ create mode 100644 arch/loongarch/include/asm/compiler.h
+ create mode 100644 arch/loongarch/include/asm/cpu-features.h
+ create mode 100644 arch/loongarch/include/asm/cpu-info.h
+ create mode 100644 arch/loongarch/include/asm/cpu.h
+ create mode 100644 arch/loongarch/include/asm/cpufeature.h
+ create mode 100644 arch/loongarch/include/asm/delay.h
+ create mode 100644 arch/loongarch/include/asm/dma-direct.h
+ create mode 100644 arch/loongarch/include/asm/dma.h
+ create mode 100644 arch/loongarch/include/asm/dmi.h
+ create mode 100644 arch/loongarch/include/asm/efi.h
+ create mode 100644 arch/loongarch/include/asm/elf.h
+ create mode 100644 arch/loongarch/include/asm/entry-common.h
+ create mode 100644 arch/loongarch/include/asm/exec.h
+ create mode 100644 arch/loongarch/include/asm/fb.h
+ create mode 100644 arch/loongarch/include/asm/fixmap.h
+ create mode 100644 arch/loongarch/include/asm/fpregdef.h
+ create mode 100644 arch/loongarch/include/asm/fpu.h
+ create mode 100644 arch/loongarch/include/asm/futex.h
+ create mode 100644 arch/loongarch/include/asm/hardirq.h
+ create mode 100644 arch/loongarch/include/asm/hugetlb.h
+ create mode 100644 arch/loongarch/include/asm/hw_irq.h
+ create mode 100644 arch/loongarch/include/asm/idle.h
+ create mode 100644 arch/loongarch/include/asm/inst.h
+ create mode 100644 arch/loongarch/include/asm/io.h
+ create mode 100644 arch/loongarch/include/asm/irq.h
+ create mode 100644 arch/loongarch/include/asm/irq_regs.h
+ create mode 100644 arch/loongarch/include/asm/irqflags.h
+ create mode 100644 arch/loongarch/include/asm/kdebug.h
+ create mode 100644 arch/loongarch/include/asm/linkage.h
+ create mode 100644 arch/loongarch/include/asm/local.h
+ create mode 100644 arch/loongarch/include/asm/loongarch.h
+ create mode 100644 arch/loongarch/include/asm/loongson.h
+ create mode 100644 arch/loongarch/include/asm/mmu.h
+ create mode 100644 arch/loongarch/include/asm/mmu_context.h
+ create mode 100644 arch/loongarch/include/asm/mmzone.h
+ create mode 100644 arch/loongarch/include/asm/module.h
+ create mode 100644 arch/loongarch/include/asm/module.lds.h
+ create mode 100644 arch/loongarch/include/asm/numa.h
+ create mode 100644 arch/loongarch/include/asm/page.h
+ create mode 100644 arch/loongarch/include/asm/pci.h
+ create mode 100644 arch/loongarch/include/asm/percpu.h
+ create mode 100644 arch/loongarch/include/asm/perf_event.h
+ create mode 100644 arch/loongarch/include/asm/pgalloc.h
+ create mode 100644 arch/loongarch/include/asm/pgtable-bits.h
+ create mode 100644 arch/loongarch/include/asm/pgtable.h
+ create mode 100644 arch/loongarch/include/asm/prefetch.h
+ create mode 100644 arch/loongarch/include/asm/processor.h
+ create mode 100644 arch/loongarch/include/asm/ptrace.h
+ create mode 100644 arch/loongarch/include/asm/reboot.h
+ create mode 100644 arch/loongarch/include/asm/regdef.h
+ create mode 100644 arch/loongarch/include/asm/seccomp.h
+ create mode 100644 arch/loongarch/include/asm/serial.h
+ create mode 100644 arch/loongarch/include/asm/setup.h
+ create mode 100644 arch/loongarch/include/asm/shmparam.h
+ create mode 100644 arch/loongarch/include/asm/smp.h
+ create mode 100644 arch/loongarch/include/asm/sparsemem.h
+ create mode 100644 arch/loongarch/include/asm/stackframe.h
+ create mode 100644 arch/loongarch/include/asm/stacktrace.h
+ create mode 100644 arch/loongarch/include/asm/string.h
+ create mode 100644 arch/loongarch/include/asm/switch_to.h
+ create mode 100644 arch/loongarch/include/asm/syscall.h
+ create mode 100644 arch/loongarch/include/asm/thread_info.h
+ create mode 100644 arch/loongarch/include/asm/time.h
+ create mode 100644 arch/loongarch/include/asm/timex.h
+ create mode 100644 arch/loongarch/include/asm/tlb.h
+ create mode 100644 arch/loongarch/include/asm/tlbflush.h
+ create mode 100644 arch/loongarch/include/asm/topology.h
+ create mode 100644 arch/loongarch/include/asm/types.h
+ create mode 100644 arch/loongarch/include/asm/uaccess.h
+ create mode 100644 arch/loongarch/include/asm/unistd.h
+ create mode 100644 arch/loongarch/include/asm/vdso.h
+ create mode 100644 arch/loongarch/include/asm/vdso/clocksource.h
+ create mode 100644 arch/loongarch/include/asm/vdso/gettimeofday.h
+ create mode 100644 arch/loongarch/include/asm/vdso/processor.h
+ create mode 100644 arch/loongarch/include/asm/vdso/vdso.h
+ create mode 100644 arch/loongarch/include/asm/vdso/vsyscall.h
+ create mode 100644 arch/loongarch/include/asm/vermagic.h
+ create mode 100644 arch/loongarch/include/asm/vmalloc.h
+ create mode 100644 arch/loongarch/include/uapi/asm/Kbuild
+ create mode 100644 arch/loongarch/include/uapi/asm/auxvec.h
+ create mode 100644 arch/loongarch/include/uapi/asm/bitsperlong.h
+ create mode 100644 arch/loongarch/include/uapi/asm/break.h
+ create mode 100644 arch/loongarch/include/uapi/asm/byteorder.h
+ create mode 100644 arch/loongarch/include/uapi/asm/hwcap.h
+ create mode 100644 arch/loongarch/include/uapi/asm/ptrace.h
+ create mode 100644 arch/loongarch/include/uapi/asm/reg.h
+ create mode 100644 arch/loongarch/include/uapi/asm/sigcontext.h
+ create mode 100644 arch/loongarch/include/uapi/asm/signal.h
+ create mode 100644 arch/loongarch/include/uapi/asm/ucontext.h
+ create mode 100644 arch/loongarch/include/uapi/asm/unistd.h
+ create mode 100644 arch/loongarch/kernel/.gitignore
+ create mode 100644 arch/loongarch/kernel/Makefile
+ create mode 100644 arch/loongarch/kernel/access-helper.h
+ create mode 100644 arch/loongarch/kernel/acpi.c
+ create mode 100644 arch/loongarch/kernel/asm-offsets.c
+ create mode 100644 arch/loongarch/kernel/cacheinfo.c
+ create mode 100644 arch/loongarch/kernel/cpu-probe.c
+ create mode 100644 arch/loongarch/kernel/dma.c
+ create mode 100644 arch/loongarch/kernel/efi-header.S
+ create mode 100644 arch/loongarch/kernel/efi.c
+ create mode 100644 arch/loongarch/kernel/elf.c
+ create mode 100644 arch/loongarch/kernel/entry.S
+ create mode 100644 arch/loongarch/kernel/env.c
+ create mode 100644 arch/loongarch/kernel/fpu.S
+ create mode 100644 arch/loongarch/kernel/genex.S
+ create mode 100644 arch/loongarch/kernel/head.S
+ create mode 100644 arch/loongarch/kernel/idle.c
+ create mode 100644 arch/loongarch/kernel/image-vars.h
+ create mode 100644 arch/loongarch/kernel/inst.c
+ create mode 100644 arch/loongarch/kernel/io.c
+ create mode 100644 arch/loongarch/kernel/irq.c
+ create mode 100644 arch/loongarch/kernel/mem.c
+ create mode 100644 arch/loongarch/kernel/module-sections.c
+ create mode 100644 arch/loongarch/kernel/module.c
+ create mode 100644 arch/loongarch/kernel/numa.c
+ create mode 100644 arch/loongarch/kernel/proc.c
+ create mode 100644 arch/loongarch/kernel/process.c
+ create mode 100644 arch/loongarch/kernel/ptrace.c
+ create mode 100644 arch/loongarch/kernel/reset.c
+ create mode 100644 arch/loongarch/kernel/setup.c
+ create mode 100644 arch/loongarch/kernel/signal.c
+ create mode 100644 arch/loongarch/kernel/smp.c
+ create mode 100644 arch/loongarch/kernel/switch.S
+ create mode 100644 arch/loongarch/kernel/syscall.c
+ create mode 100644 arch/loongarch/kernel/time.c
+ create mode 100644 arch/loongarch/kernel/topology.c
+ create mode 100644 arch/loongarch/kernel/traps.c
+ create mode 100644 arch/loongarch/kernel/vdso.c
+ create mode 100644 arch/loongarch/kernel/vmlinux.lds.S
+ create mode 100644 arch/loongarch/lib/Makefile
+ create mode 100644 arch/loongarch/lib/clear_user.S
+ create mode 100644 arch/loongarch/lib/copy_user.S
+ create mode 100644 arch/loongarch/lib/delay.c
+ create mode 100644 arch/loongarch/lib/dump_tlb.c
+ create mode 100644 arch/loongarch/mm/Makefile
+ create mode 100644 arch/loongarch/mm/cache.c
+ create mode 100644 arch/loongarch/mm/extable.c
+ create mode 100644 arch/loongarch/mm/fault.c
+ create mode 100644 arch/loongarch/mm/hugetlbpage.c
+ create mode 100644 arch/loongarch/mm/init.c
+ create mode 100644 arch/loongarch/mm/ioremap.c
+ create mode 100644 arch/loongarch/mm/maccess.c
+ create mode 100644 arch/loongarch/mm/mmap.c
+ create mode 100644 arch/loongarch/mm/page.S
+ create mode 100644 arch/loongarch/mm/pgtable.c
+ create mode 100644 arch/loongarch/mm/tlb.c
+ create mode 100644 arch/loongarch/mm/tlbex.S
+ create mode 100644 arch/loongarch/pci/Makefile
+ create mode 100644 arch/loongarch/pci/acpi.c
+ create mode 100644 arch/loongarch/pci/pci.c
+ create mode 100644 arch/loongarch/vdso/.gitignore
+ create mode 100644 arch/loongarch/vdso/Makefile
+ create mode 100644 arch/loongarch/vdso/elf.S
+ create mode 100755 arch/loongarch/vdso/gen_vdso_offsets.sh
+ create mode 100644 arch/loongarch/vdso/sigreturn.S
+ create mode 100644 arch/loongarch/vdso/vdso.S
+ create mode 100644 arch/loongarch/vdso/vdso.lds.S
+ create mode 100644 arch/loongarch/vdso/vgettimeofday.c
+ create mode 100644 drivers/firmware/efi/libstub/loongarch-stub.c
+ create mode 100644 drivers/irqchip/irq-loongarch-cpu.c
+ create mode 100644 drivers/irqchip/irq-loongson-eiointc.c
+ create mode 100644 drivers/irqchip/irq-loongson-pch-lpc.c
+Merging m68k/for-next (30b5e6ef4a32 m68k: atari: Make Atari ROM port I/O write macros return void)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next
+Already up to date.
+Merging m68knommu/for-next (6b8be804ff37 m68knommu: fix 68000 CPU link with no platform selected)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next
+Auto-merging arch/m68k/Kconfig.cpu
+Auto-merging arch/m68k/Kconfig.machine
+Auto-merging arch/m68k/kernel/ptrace.c
+CONFLICT (content): Merge conflict in arch/m68k/kernel/ptrace.c
+Auto-merging arch/m68k/kernel/setup_mm.c
+Auto-merging fs/Kconfig.binfmt
+Resolved 'arch/m68k/kernel/ptrace.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 9f78e57733a0] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git
+$ git diff -M --stat --summary HEAD^..
+ arch/m68k/Kconfig.bus | 10 -
+ arch/m68k/Kconfig.cpu | 2 +-
+ arch/m68k/Kconfig.machine | 1 +
+ arch/m68k/coldfire/Makefile | 2 +-
+ arch/m68k/coldfire/dma.c | 43 ----
+ arch/m68k/coldfire/intc.c | 2 +-
+ arch/m68k/coldfire/m53xx.c | 2 +-
+ arch/m68k/coldfire/pci.c | 2 +-
+ arch/m68k/hp300/config.c | 7 -
+ arch/m68k/include/asm/dma.h | 483 ------------------------------------
+ arch/m68k/include/asm/elf.h | 9 +
+ arch/m68k/include/asm/machdep.h | 1 -
+ arch/m68k/include/asm/mmu.h | 4 +-
+ arch/m68k/include/asm/pgtable_no.h | 3 +-
+ arch/m68k/include/uapi/asm/ptrace.h | 5 +
+ arch/m68k/kernel/ptrace.c | 58 +++++
+ arch/m68k/kernel/setup_mm.c | 9 -
+ arch/m68k/kernel/setup_no.c | 1 -
+ arch/m68k/kernel/time.c | 9 +
+ arch/m68k/mm/motorola.c | 1 -
+ arch/m68k/q40/config.c | 7 -
+ drivers/mmc/host/Kconfig | 2 +-
+ fs/Kconfig.binfmt | 2 +-
+ sound/core/Makefile | 2 -
+ sound/isa/Kconfig | 2 +-
+ 25 files changed, 93 insertions(+), 576 deletions(-)
+ delete mode 100644 arch/m68k/coldfire/dma.c
+Merging microblaze/next (78b5f52ab6f6 microblaze: fix typos in comments)
+$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next
+Merge made by the 'ort' strategy.
+ arch/microblaze/include/asm/string.h | 2 ++
+ arch/microblaze/kernel/kgdb.c | 2 +-
+ arch/microblaze/lib/memcpy.c | 18 ++----------------
+ arch/microblaze/lib/memmove.c | 31 +++----------------------------
+ arch/microblaze/lib/memset.c | 33 ++++++++++++++-------------------
+ arch/microblaze/mm/init.c | 5 +++++
+ 6 files changed, 27 insertions(+), 64 deletions(-)
+Merging mips/mips-next (795d82ed389b MIPS: Use memblock_add_node() in early_parse_mem() under CONFIG_NUMA)
+$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next
+Merge made by the 'ort' strategy.
+ arch/mips/Kconfig | 12 +-
+ arch/mips/alchemy/common/dbdma.c | 2 +-
+ arch/mips/bmips/dma.c | 1 +
+ arch/mips/boot/dts/brcm/bcm97358svmb.dts | 2 +-
+ arch/mips/boot/dts/brcm/bcm97360svmb.dts | 2 +-
+ arch/mips/boot/dts/brcm/bcm97425svmb.dts | 2 +-
+ arch/mips/boot/dts/ingenic/cu1000-neo.dts | 77 +++++++------
+ arch/mips/boot/dts/ingenic/cu1830-neo.dts | 76 ++++++------
+ arch/mips/boot/dts/ingenic/x1000.dtsi | 32 ++++++
+ arch/mips/boot/dts/ingenic/x1830.dtsi | 53 +++++++++
+ arch/mips/boot/dts/mscc/jaguar2_pcb110.dts | 10 +-
+ arch/mips/boot/dts/mscc/jaguar2_pcb111.dts | 10 +-
+ arch/mips/boot/dts/mscc/jaguar2_pcb118.dts | 6 +-
+ arch/mips/boot/dts/mscc/ocelot.dtsi | 4 +-
+ arch/mips/boot/dts/mscc/ocelot_pcb120.dts | 6 +-
+ arch/mips/boot/dts/mscc/serval_common.dtsi | 14 +--
+ .../dts/ralink/gardena_smart_gateway_mt7688.dts | 2 +-
+ arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts | 26 ++---
+ arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts | 30 ++---
+ arch/mips/boot/dts/ralink/mt7621.dtsi | 2 +-
+ arch/mips/boot/tools/relocs.c | 2 +-
+ arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 2 +-
+ .../cavium-octeon/executive/cvmx-helper-xaui.c | 5 +-
+ arch/mips/cavium-octeon/executive/cvmx-helper.c | 6 +
+ arch/mips/cavium-octeon/executive/cvmx-pko.c | 2 +-
+ arch/mips/cavium-octeon/octeon-irq.c | 2 +-
+ arch/mips/cavium-octeon/octeon-usb.c | 2 +-
+ arch/mips/configs/cu1000-neo_defconfig | 2 +-
+ arch/mips/configs/cu1830-neo_defconfig | 2 +-
+ arch/mips/dec/ioasic-irq.c | 4 +-
+ arch/mips/dec/setup.c | 2 +-
+ arch/mips/fw/arc/memory.c | 2 +-
+ arch/mips/include/asm/checksum.h | 79 ++++++-------
+ arch/mips/include/asm/cpu-features.h | 3 +
+ .../include/asm/mach-ip27/cpu-feature-overrides.h | 1 -
+ .../include/asm/mach-ip30/cpu-feature-overrides.h | 1 -
+ arch/mips/include/asm/octeon/cvmx-bootinfo.h | 2 +
+ arch/mips/jazz/irq.c | 2 +-
+ arch/mips/kernel/cmpxchg.c | 2 +-
+ arch/mips/kernel/cpu-probe.c | 2 +-
+ arch/mips/kernel/idle.c | 2 +-
+ arch/mips/kernel/kprobes.c | 36 ++++--
+ arch/mips/kernel/mips-cpc.c | 1 +
+ arch/mips/kernel/perf_event_mipsxx.c | 2 +-
+ arch/mips/kernel/setup.c | 17 ++-
+ arch/mips/kernel/smp.c | 6 +
+ arch/mips/kvm/tlb.c | 2 +-
+ arch/mips/loongson32/Kconfig | 2 +-
+ arch/mips/mm/fault.c | 6 +-
+ arch/mips/net/bpf_jit_comp32.c | 2 +-
+ arch/mips/pci/pcie-octeon.c | 4 +-
+ arch/mips/pic32/pic32mzda/config.c | 2 +-
+ arch/mips/sgi-ip22/ip22-reset.c | 11 +-
+ arch/mips/sgi-ip27/ip27-xtalk.c | 4 +
+ arch/mips/sgi-ip30/ip30-xtalk.c | 4 +
+ arch/mips/sibyte/bcm1480/setup.c | 4 +-
+ arch/mips/tools/loongson3-llsc-check.c | 2 +-
+ arch/mips/txx9/generic/pci.c | 2 +-
+ arch/mips/vr41xx/common/cmu.c | 2 -
+ drivers/platform/mips/cpu_hwmon.c | 127 +++++++--------------
+ .../ftrace/test.d/kprobe/multiple_kprobes.tc | 2 +
+ 61 files changed, 399 insertions(+), 335 deletions(-)
+Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git nios2/for-next
+Already up to date.
+Merging openrisc/for-next (83da38d82b2f openrisc: Allow power off handler overriding)
+$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next
+Auto-merging arch/openrisc/Kconfig
+Auto-merging arch/openrisc/kernel/head.S
+Merge made by the 'ort' strategy.
+ arch/openrisc/Kconfig | 53 +++++
+ arch/openrisc/Makefile | 17 ++
+ arch/openrisc/configs/or1klitex_defconfig | 32 +++
+ arch/openrisc/kernel/entry.S | 20 +-
+ arch/openrisc/kernel/head.S | 368 ++++++++----------------------
+ arch/openrisc/kernel/process.c | 19 +-
+ arch/openrisc/kernel/time.c | 3 +-
+ arch/openrisc/kernel/traps.c | 63 ++---
+ arch/openrisc/lib/delay.c | 1 +
+ arch/openrisc/mm/fault.c | 9 +-
+ arch/openrisc/mm/tlb.c | 2 +-
+ 11 files changed, 272 insertions(+), 315 deletions(-)
+Merging parisc-hd/for-next (c17709184924 parisc: Optimize tmpalias function calls)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next
+Merge made by the 'ort' strategy.
+ arch/parisc/include/asm/assembly.h | 12 ++++-
+ arch/parisc/include/asm/cache.h | 1 +
+ arch/parisc/include/asm/fixmap.h | 25 ++++++++--
+ arch/parisc/kernel/cache.c | 3 ++
+ arch/parisc/kernel/entry.S | 22 ++++-----
+ arch/parisc/kernel/pacache.S | 94 ++++++--------------------------------
+ arch/parisc/mm/init.c | 6 +++
+ drivers/video/console/sticore.c | 21 +++++++++
+ 8 files changed, 86 insertions(+), 98 deletions(-)
+Merging powerpc/next (a5d28039ecb2 powerpc/powernv/pci: Drop VF MPS fixup)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next
+Auto-merging arch/Kconfig
+Auto-merging arch/arm64/include/asm/processor.h
+Auto-merging arch/powerpc/Kconfig
+CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
+Auto-merging arch/powerpc/Makefile
+Auto-merging arch/powerpc/boot/Makefile
+Auto-merging arch/powerpc/include/asm/svm.h
+Auto-merging arch/powerpc/kernel/fadump.c
+Auto-merging arch/powerpc/mm/mem.c
+Auto-merging arch/powerpc/platforms/pseries/setup.c
+Auto-merging fs/hugetlbfs/inode.c
+Auto-merging mm/util.c
+Resolved 'arch/powerpc/Kconfig' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 1cb4a57066e0] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-class-cxl | 4 +-
+ .../devicetree/bindings/powerpc/fsl/cache_sram.txt | 20 -
+ Documentation/powerpc/dawr-power9.rst | 26 +-
+ Documentation/powerpc/kasan.txt | 58 ++
+ arch/Kconfig | 2 -
+ arch/arm64/include/asm/processor.h | 4 +-
+ arch/powerpc/Kconfig | 25 +-
+ arch/powerpc/Kconfig.debug | 3 +-
+ arch/powerpc/Makefile | 12 +-
+ arch/powerpc/boot/Makefile | 10 +-
+ arch/powerpc/boot/crt0.S | 45 +-
+ arch/powerpc/boot/cuboot-hotfoot.c | 2 +-
+ arch/powerpc/boot/dts/fsl/p2020si-post.dtsi | 5 +
+ arch/powerpc/boot/dts/microwatt.dts | 2 +
+ arch/powerpc/boot/ops.h | 6 -
+ arch/powerpc/boot/wrapper | 2 +-
+ arch/powerpc/crypto/aes-spe-glue.c | 2 +-
+ arch/powerpc/include/asm/book3s/64/hash.h | 4 +
+ arch/powerpc/include/asm/book3s/64/hugetlb.h | 4 -
+ arch/powerpc/include/asm/book3s/64/mmu-hash.h | 1 +
+ arch/powerpc/include/asm/book3s/64/mmu.h | 6 -
+ arch/powerpc/include/asm/book3s/64/pgtable.h | 3 +
+ arch/powerpc/include/asm/book3s/64/radix.h | 12 +-
+ arch/powerpc/include/asm/book3s/64/slice.h | 24 +
+ arch/powerpc/include/asm/checksum.h | 26 +-
+ arch/powerpc/include/asm/code-patching.h | 67 +-
+ arch/powerpc/include/asm/cputable.h | 16 +-
+ arch/powerpc/include/asm/drmem.h | 3 +
+ arch/powerpc/include/asm/eeh.h | 6 -
+ arch/powerpc/include/asm/elf.h | 14 +-
+ arch/powerpc/include/asm/fadump-internal.h | 2 +-
+ arch/powerpc/include/asm/fsl_85xx_cache_sram.h | 35 --
+ arch/powerpc/include/asm/ftrace.h | 8 +-
+ arch/powerpc/include/asm/hugetlb.h | 2 +-
+ arch/powerpc/include/asm/inst.h | 13 +-
+ arch/powerpc/include/asm/interrupt.h | 52 +-
+ arch/powerpc/include/asm/io.h | 2 -
+ arch/powerpc/include/asm/iommu.h | 6 +-
+ arch/powerpc/include/asm/kasan.h | 22 +
+ arch/powerpc/include/asm/kup.h | 1 -
+ arch/powerpc/include/asm/kvm_book3s_asm.h | 3 -
+ arch/powerpc/include/asm/kvm_host.h | 10 +-
+ arch/powerpc/include/asm/kvm_ppc.h | 14 +-
+ arch/powerpc/include/asm/linkage.h | 2 +-
+ arch/powerpc/include/asm/mmu_context.h | 5 -
+ arch/powerpc/include/asm/module.h | 2 -
+ arch/powerpc/include/asm/nohash/tlbflush.h | 12 +-
+ arch/powerpc/include/asm/paca.h | 7 -
+ arch/powerpc/include/asm/page.h | 8 +-
+ arch/powerpc/include/asm/parport.h | 2 +-
+ arch/powerpc/include/asm/pci-bridge.h | 14 +-
+ arch/powerpc/include/asm/pnv-pci.h | 1 +
+ arch/powerpc/include/asm/ppc-opcode.h | 109 ++--
+ arch/powerpc/include/asm/ppc_asm.h | 4 +-
+ arch/powerpc/include/asm/probes.h | 36 ++
+ arch/powerpc/include/asm/processor.h | 2 -
+ arch/powerpc/include/asm/ptrace.h | 2 +-
+ arch/powerpc/include/asm/reg.h | 3 -
+ arch/powerpc/include/asm/signal.h | 5 +
+ arch/powerpc/include/asm/slice.h | 46 --
+ arch/powerpc/include/asm/smp.h | 2 -
+ arch/powerpc/include/asm/svm.h | 2 +
+ arch/powerpc/include/asm/switch_to.h | 9 +
+ arch/powerpc/include/asm/task_size_64.h | 8 +
+ arch/powerpc/include/asm/time.h | 1 +
+ arch/powerpc/include/asm/topology.h | 8 +-
+ arch/powerpc/include/asm/types.h | 8 -
+ arch/powerpc/include/asm/vas.h | 2 +-
+ arch/powerpc/include/uapi/asm/auxvec.h | 4 +-
+ arch/powerpc/include/uapi/asm/signal.h | 5 +
+ arch/powerpc/kernel/Makefile | 13 +-
+ arch/powerpc/kernel/btext.c | 5 +-
+ arch/powerpc/kernel/cacheinfo.c | 1 -
+ arch/powerpc/kernel/cputable.c | 28 +-
+ arch/powerpc/kernel/crash_dump.c | 2 +-
+ arch/powerpc/kernel/dawr.c | 2 +-
+ arch/powerpc/kernel/dt_cpu_ftrs.c | 10 +-
+ arch/powerpc/kernel/eeh.c | 4 +-
+ arch/powerpc/kernel/eeh_driver.c | 1 -
+ arch/powerpc/kernel/eeh_event.c | 2 +-
+ arch/powerpc/kernel/eeh_pe.c | 3 +-
+ arch/powerpc/kernel/eeh_sysfs.c | 1 +
+ arch/powerpc/kernel/entry_32.S | 49 --
+ arch/powerpc/kernel/entry_64.S | 150 -----
+ arch/powerpc/kernel/fadump.c | 52 +-
+ arch/powerpc/kernel/head_64.S | 4 +-
+ arch/powerpc/kernel/idle.c | 2 +-
+ arch/powerpc/kernel/interrupt_64.S | 12 +-
+ arch/powerpc/kernel/iommu.c | 5 +-
+ arch/powerpc/kernel/irq.c | 86 +--
+ arch/powerpc/kernel/isa-bridge.c | 2 +-
+ arch/powerpc/kernel/kprobes.c | 10 +-
+ arch/powerpc/kernel/legacy_serial.c | 2 +-
+ arch/powerpc/kernel/misc_64.S | 2 +-
+ arch/powerpc/kernel/module.c | 4 +-
+ arch/powerpc/kernel/module_32.c | 40 +-
+ arch/powerpc/kernel/module_64.c | 11 +-
+ arch/powerpc/kernel/nvram_64.c | 2 +-
+ arch/powerpc/kernel/paca.c | 5 -
+ arch/powerpc/kernel/pci-common.c | 6 +-
+ arch/powerpc/kernel/pci-hotplug.c | 1 +
+ arch/powerpc/kernel/pci_32.c | 1 -
+ arch/powerpc/kernel/pci_64.c | 11 +-
+ arch/powerpc/kernel/pci_dn.c | 2 +-
+ arch/powerpc/kernel/pci_of_scan.c | 4 +-
+ arch/powerpc/kernel/proc_powerpc.c | 2 +-
+ arch/powerpc/kernel/process.c | 46 +-
+ arch/powerpc/kernel/prom.c | 1 -
+ arch/powerpc/kernel/prom_init.c | 4 +-
+ arch/powerpc/kernel/ptrace/ptrace-view.c | 2 +-
+ arch/powerpc/kernel/ptrace/ptrace.c | 6 -
+ arch/powerpc/kernel/rtas-proc.c | 9 +-
+ arch/powerpc/kernel/rtas-rtc.c | 1 -
+ arch/powerpc/kernel/rtas.c | 21 +-
+ arch/powerpc/kernel/rtas_entry.S | 172 ++++++
+ arch/powerpc/kernel/rtas_flash.c | 2 +-
+ arch/powerpc/kernel/rtas_pci.c | 3 +-
+ arch/powerpc/kernel/rtasd.c | 1 -
+ arch/powerpc/kernel/setup-common.c | 79 ++-
+ arch/powerpc/kernel/setup_32.c | 3 +-
+ arch/powerpc/kernel/setup_64.c | 3 +-
+ arch/powerpc/kernel/signal.c | 15 +
+ arch/powerpc/kernel/signal_32.c | 6 +
+ arch/powerpc/kernel/signal_64.c | 7 +-
+ arch/powerpc/kernel/smp.c | 27 +-
+ arch/powerpc/kernel/syscalls.c | 2 +-
+ arch/powerpc/kernel/sysfs.c | 2 +-
+ arch/powerpc/kernel/time.c | 15 +-
+ arch/powerpc/kernel/trace/Makefile | 5 +-
+ arch/powerpc/kernel/trace/ftrace.c | 383 ++++--------
+ arch/powerpc/kernel/traps.c | 6 +-
+ arch/powerpc/kernel/uprobes.c | 5 +
+ arch/powerpc/kernel/vdso.c | 1 -
+ arch/powerpc/kernel/vdso/Makefile | 1 +
+ arch/powerpc/kernel/vdso/vdso32.lds.S | 1 -
+ arch/powerpc/kernel/vdso/vdso64.lds.S | 1 -
+ arch/powerpc/kernel/watchdog.c | 2 +-
+ arch/powerpc/kexec/Makefile | 2 +
+ arch/powerpc/kexec/core.c | 1 -
+ arch/powerpc/kexec/core_64.c | 4 +-
+ arch/powerpc/kexec/crash.c | 1 -
+ arch/powerpc/kvm/Makefile | 10 +-
+ arch/powerpc/kvm/book3s_64_entry.S | 2 +-
+ arch/powerpc/kvm/book3s_64_mmu_hv.c | 42 +-
+ arch/powerpc/kvm/book3s_64_vio.c | 43 ++
+ arch/powerpc/kvm/book3s_64_vio_hv.c | 672 ---------------------
+ arch/powerpc/kvm/book3s_emulate.c | 2 +-
+ arch/powerpc/kvm/book3s_hv.c | 74 ++-
+ arch/powerpc/kvm/book3s_hv_builtin.c | 64 --
+ arch/powerpc/kvm/book3s_hv_nested.c | 137 +++--
+ arch/powerpc/kvm/book3s_hv_p9_entry.c | 17 +-
+ arch/powerpc/kvm/book3s_hv_rm_xics.c | 7 +-
+ arch/powerpc/kvm/book3s_hv_rm_xive.c | 46 --
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 30 +-
+ arch/powerpc/kvm/book3s_hv_uvmem.c | 10 +-
+ arch/powerpc/kvm/book3s_interrupts.S | 2 +-
+ arch/powerpc/kvm/book3s_pr.c | 2 +-
+ arch/powerpc/kvm/book3s_pr_papr.c | 6 +
+ arch/powerpc/kvm/book3s_rmhandlers.S | 2 +-
+ arch/powerpc/kvm/book3s_xics.c | 2 +-
+ arch/powerpc/kvm/book3s_xive.c | 655 +++++++++++++++++++-
+ arch/powerpc/kvm/book3s_xive.h | 7 -
+ arch/powerpc/kvm/book3s_xive_native.c | 2 +-
+ arch/powerpc/kvm/book3s_xive_template.c | 636 -------------------
+ arch/powerpc/kvm/e500mc.c | 3 +-
+ arch/powerpc/kvm/powerpc.c | 31 +-
+ arch/powerpc/kvm/trace_hv.h | 8 +-
+ arch/powerpc/lib/Makefile | 3 +
+ arch/powerpc/lib/code-patching.c | 61 +-
+ arch/powerpc/lib/feature-fixups.c | 2 +-
+ arch/powerpc/lib/sstep.c | 52 +-
+ arch/powerpc/mm/Makefile | 3 +-
+ arch/powerpc/mm/book3s32/mmu.c | 1 -
+ arch/powerpc/mm/book3s64/Makefile | 11 +-
+ arch/powerpc/mm/book3s64/hash_pgtable.c | 2 +-
+ arch/powerpc/mm/book3s64/hash_utils.c | 39 +-
+ arch/powerpc/mm/book3s64/iommu_api.c | 68 ---
+ arch/powerpc/mm/book3s64/pgtable.c | 2 +-
+ arch/powerpc/mm/book3s64/radix_hugetlbpage.c | 55 --
+ arch/powerpc/mm/book3s64/radix_pgtable.c | 2 +-
+ arch/powerpc/mm/book3s64/radix_tlb.c | 2 +-
+ arch/powerpc/mm/book3s64/slb.c | 4 +-
+ arch/powerpc/mm/{ => book3s64}/slice.c | 71 ++-
+ arch/powerpc/mm/cacheflush.c | 2 +-
+ arch/powerpc/mm/drmem.c | 2 +-
+ arch/powerpc/mm/hugetlbpage.c | 34 --
+ arch/powerpc/mm/init_32.c | 1 -
+ arch/powerpc/mm/init_64.c | 7 +-
+ arch/powerpc/mm/kasan/Makefile | 3 +-
+ .../mm/kasan/{kasan_init_32.c => init_32.c} | 0
+ arch/powerpc/mm/kasan/init_book3s_64.c | 102 ++++
+ arch/powerpc/mm/mem.c | 4 +
+ arch/powerpc/mm/mmap.c | 256 --------
+ arch/powerpc/mm/mmu_decl.h | 4 +
+ arch/powerpc/mm/nohash/40x.c | 1 -
+ arch/powerpc/mm/nohash/book3e_hugetlbpage.c | 2 +-
+ arch/powerpc/mm/nohash/fsl_book3e.c | 22 +-
+ arch/powerpc/mm/nohash/kaslr_booke.c | 5 +-
+ arch/powerpc/mm/nohash/mmu_context.c | 9 -
+ arch/powerpc/mm/nohash/tlb.c | 6 +-
+ arch/powerpc/mm/numa.c | 36 +-
+ arch/powerpc/mm/pageattr.c | 1 +
+ arch/powerpc/mm/pgtable-frag.c | 2 +-
+ arch/powerpc/mm/pgtable.c | 2 +-
+ arch/powerpc/mm/pgtable_64.c | 1 -
+ arch/powerpc/mm/ptdump/ptdump.c | 3 +-
+ arch/powerpc/net/bpf_jit.h | 4 +-
+ arch/powerpc/net/bpf_jit_comp.c | 2 +-
+ arch/powerpc/net/bpf_jit_comp64.c | 4 +-
+ arch/powerpc/perf/8xx-pmu.c | 2 +-
+ arch/powerpc/perf/core-book3s.c | 6 +-
+ arch/powerpc/perf/hv-24x7.c | 40 +-
+ arch/powerpc/perf/imc-pmu.c | 5 +-
+ arch/powerpc/perf/isa207-common.c | 18 +-
+ arch/powerpc/perf/power9-pmu.c | 4 +-
+ arch/powerpc/platforms/40x/ppc40x_simple.c | 1 -
+ arch/powerpc/platforms/44x/canyonlands.c | 1 +
+ arch/powerpc/platforms/44x/fsp2.c | 2 +-
+ arch/powerpc/platforms/44x/ppc44x_simple.c | 1 -
+ arch/powerpc/platforms/44x/ppc476.c | 2 +-
+ arch/powerpc/platforms/44x/sam440ep.c | 1 -
+ arch/powerpc/platforms/44x/warp.c | 3 +-
+ arch/powerpc/platforms/4xx/cpm.c | 2 +-
+ arch/powerpc/platforms/4xx/hsta_msi.c | 1 +
+ arch/powerpc/platforms/4xx/pci.c | 1 +
+ arch/powerpc/platforms/4xx/uic.c | 3 +-
+ arch/powerpc/platforms/512x/clock-commonclk.c | 2 +-
+ arch/powerpc/platforms/512x/mpc5121_ads.c | 1 -
+ arch/powerpc/platforms/512x/mpc5121_ads_cpld.c | 3 +-
+ arch/powerpc/platforms/512x/mpc512x_generic.c | 1 -
+ arch/powerpc/platforms/512x/mpc512x_shared.c | 4 +-
+ arch/powerpc/platforms/52xx/efika.c | 1 -
+ arch/powerpc/platforms/52xx/lite5200.c | 1 -
+ arch/powerpc/platforms/52xx/lite5200_pm.c | 2 +
+ arch/powerpc/platforms/52xx/media5200.c | 3 +-
+ arch/powerpc/platforms/52xx/mpc5200_simple.c | 2 +-
+ arch/powerpc/platforms/52xx/mpc52xx_common.c | 4 +-
+ arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 8 +-
+ arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 5 +-
+ arch/powerpc/platforms/52xx/mpc52xx_pci.c | 22 +-
+ arch/powerpc/platforms/52xx/mpc52xx_pic.c | 3 +-
+ arch/powerpc/platforms/52xx/mpc52xx_pm.c | 2 +
+ arch/powerpc/platforms/82xx/ep8248e.c | 1 -
+ arch/powerpc/platforms/82xx/km82xx.c | 1 -
+ arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 2 +-
+ arch/powerpc/platforms/83xx/km83xx.c | 1 -
+ arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 15 +-
+ arch/powerpc/platforms/83xx/mpc832x_mds.c | 1 -
+ arch/powerpc/platforms/83xx/mpc832x_rdb.c | 1 +
+ arch/powerpc/platforms/83xx/mpc834x_itx.c | 1 -
+ arch/powerpc/platforms/83xx/mpc834x_mds.c | 2 +-
+ arch/powerpc/platforms/83xx/mpc836x_mds.c | 1 -
+ arch/powerpc/platforms/83xx/mpc836x_rdk.c | 1 -
+ arch/powerpc/platforms/83xx/mpc837x_mds.c | 2 +-
+ arch/powerpc/platforms/83xx/suspend.c | 7 +-
+ arch/powerpc/platforms/83xx/usb.c | 2 +-
+ arch/powerpc/platforms/85xx/Kconfig | 9 -
+ arch/powerpc/platforms/85xx/corenet_generic.c | 1 -
+ arch/powerpc/platforms/85xx/ge_imp3a.c | 2 +-
+ arch/powerpc/platforms/85xx/ksi8560.c | 1 -
+ arch/powerpc/platforms/85xx/mpc8536_ds.c | 1 -
+ arch/powerpc/platforms/85xx/mpc85xx_cds.c | 5 +-
+ arch/powerpc/platforms/85xx/mpc85xx_ds.c | 2 +-
+ arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1 -
+ arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 1 -
+ arch/powerpc/platforms/85xx/p1010rdb.c | 1 -
+ arch/powerpc/platforms/85xx/p1022_ds.c | 1 +
+ arch/powerpc/platforms/85xx/p1022_rdk.c | 1 +
+ arch/powerpc/platforms/85xx/p1023_rdb.c | 2 +-
+ arch/powerpc/platforms/85xx/qemu_e500.c | 1 +
+ arch/powerpc/platforms/85xx/smp.c | 2 +-
+ arch/powerpc/platforms/85xx/socrates.c | 1 -
+ arch/powerpc/platforms/85xx/stx_gp3.c | 1 -
+ arch/powerpc/platforms/85xx/tqm85xx.c | 1 -
+ arch/powerpc/platforms/85xx/xes_mpc85xx.c | 2 +-
+ arch/powerpc/platforms/86xx/gef_ppc9a.c | 4 +-
+ arch/powerpc/platforms/86xx/gef_sbc310.c | 4 +-
+ arch/powerpc/platforms/86xx/gef_sbc610.c | 4 +-
+ arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 3 +-
+ arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 1 -
+ arch/powerpc/platforms/86xx/mvme7100.c | 1 +
+ arch/powerpc/platforms/8xx/Makefile | 2 +-
+ arch/powerpc/platforms/8xx/adder875.c | 4 +-
+ arch/powerpc/platforms/8xx/cpm1-ic.c | 188 ++++++
+ arch/powerpc/platforms/8xx/cpm1.c | 142 +----
+ arch/powerpc/platforms/8xx/ep88xc.c | 3 +-
+ arch/powerpc/platforms/8xx/m8xx_setup.c | 31 +-
+ arch/powerpc/platforms/8xx/mpc86xads_setup.c | 3 +-
+ arch/powerpc/platforms/8xx/mpc885ads_setup.c | 3 +-
+ arch/powerpc/platforms/8xx/mpc8xx.h | 1 -
+ arch/powerpc/platforms/8xx/pic.c | 20 +-
+ arch/powerpc/platforms/8xx/pic.h | 2 +-
+ arch/powerpc/platforms/8xx/tqm8xx_setup.c | 3 +-
+ arch/powerpc/platforms/Kconfig.cputype | 11 +-
+ arch/powerpc/platforms/amigaone/setup.c | 1 +
+ arch/powerpc/platforms/book3s/vas-api.c | 2 +-
+ arch/powerpc/platforms/cell/axon_msi.c | 2 +-
+ arch/powerpc/platforms/cell/cbe_powerbutton.c | 2 +-
+ arch/powerpc/platforms/cell/cbe_regs.c | 4 +-
+ arch/powerpc/platforms/cell/cbe_thermal.c | 1 -
+ arch/powerpc/platforms/cell/interrupt.c | 3 +-
+ arch/powerpc/platforms/cell/iommu.c | 4 +-
+ arch/powerpc/platforms/cell/pervasive.c | 1 -
+ arch/powerpc/platforms/cell/ras.c | 2 +-
+ arch/powerpc/platforms/cell/setup.c | 1 -
+ arch/powerpc/platforms/cell/smp.c | 1 -
+ arch/powerpc/platforms/cell/spider-pci.c | 3 +-
+ arch/powerpc/platforms/cell/spider-pic.c | 3 +-
+ arch/powerpc/platforms/cell/spu_base.c | 1 -
+ arch/powerpc/platforms/cell/spu_manage.c | 5 +-
+ arch/powerpc/platforms/cell/spu_priv1_mmio.c | 1 -
+ arch/powerpc/platforms/cell/spufs/inode.c | 2 +-
+ arch/powerpc/platforms/chrp/nvram.c | 2 +-
+ arch/powerpc/platforms/chrp/pci.c | 2 +-
+ arch/powerpc/platforms/chrp/setup.c | 6 +-
+ arch/powerpc/platforms/chrp/smp.c | 1 -
+ arch/powerpc/platforms/chrp/time.c | 4 +-
+ arch/powerpc/platforms/embedded6xx/gamecube.c | 1 -
+ arch/powerpc/platforms/embedded6xx/holly.c | 3 +-
+ arch/powerpc/platforms/embedded6xx/linkstation.c | 1 -
+ arch/powerpc/platforms/embedded6xx/ls_uart.c | 2 +-
+ arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 2 +-
+ arch/powerpc/platforms/embedded6xx/mvme5100.c | 2 +-
+ arch/powerpc/platforms/embedded6xx/storcenter.c | 1 -
+ arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c | 3 +-
+ arch/powerpc/platforms/embedded6xx/wii.c | 2 +-
+ arch/powerpc/platforms/fsl_uli1575.c | 1 +
+ arch/powerpc/platforms/maple/pci.c | 2 +-
+ arch/powerpc/platforms/maple/setup.c | 2 +-
+ arch/powerpc/platforms/maple/time.c | 2 +-
+ arch/powerpc/platforms/pasemi/dma_lib.c | 2 +
+ arch/powerpc/platforms/pasemi/iommu.c | 1 +
+ arch/powerpc/platforms/pasemi/misc.c | 1 +
+ arch/powerpc/platforms/pasemi/msi.c | 2 +-
+ arch/powerpc/platforms/pasemi/pci.c | 1 +
+ arch/powerpc/platforms/pasemi/setup.c | 2 +-
+ arch/powerpc/platforms/powermac/backlight.c | 1 -
+ arch/powerpc/platforms/powermac/bootx_init.c | 3 +-
+ arch/powerpc/platforms/powermac/feature.c | 1 -
+ arch/powerpc/platforms/powermac/low_i2c.c | 4 +-
+ arch/powerpc/platforms/powermac/nvram.c | 4 +-
+ arch/powerpc/platforms/powermac/pci.c | 3 +-
+ arch/powerpc/platforms/powermac/pfunc_core.c | 4 +-
+ arch/powerpc/platforms/powermac/pic.c | 6 +-
+ arch/powerpc/platforms/powermac/pmac.h | 2 +
+ arch/powerpc/platforms/powermac/setup.c | 5 -
+ arch/powerpc/platforms/powermac/smp.c | 4 +-
+ arch/powerpc/platforms/powermac/time.c | 2 +-
+ arch/powerpc/platforms/powermac/udbg_adb.c | 2 +-
+ arch/powerpc/platforms/powermac/udbg_scc.c | 2 +-
+ arch/powerpc/platforms/powernv/Makefile | 8 +
+ arch/powerpc/platforms/powernv/eeh-powernv.c | 29 +-
+ arch/powerpc/platforms/powernv/idle.c | 4 +-
+ arch/powerpc/platforms/powernv/ocxl.c | 2 +-
+ arch/powerpc/platforms/powernv/opal-fadump.c | 102 ++--
+ arch/powerpc/platforms/powernv/opal-fadump.h | 10 +-
+ arch/powerpc/platforms/powernv/opal-flash.c | 4 +
+ arch/powerpc/platforms/powernv/opal-imc.c | 2 +-
+ arch/powerpc/platforms/powernv/opal-lpc.c | 2 +-
+ .../powerpc/platforms/powernv/opal-memory-errors.c | 2 +-
+ arch/powerpc/platforms/powernv/pci-cxl.c | 1 +
+ arch/powerpc/platforms/powernv/pci-ioda-tce.c | 5 +-
+ arch/powerpc/platforms/powernv/pci-ioda.c | 51 +-
+ arch/powerpc/platforms/powernv/pci-sriov.c | 4 +-
+ arch/powerpc/platforms/powernv/pci.c | 1 -
+ arch/powerpc/platforms/powernv/pci.h | 3 +-
+ arch/powerpc/platforms/powernv/setup.c | 9 +
+ arch/powerpc/platforms/powernv/smp.c | 2 +-
+ arch/powerpc/platforms/powernv/ultravisor.c | 1 +
+ arch/powerpc/platforms/powernv/vas-fault.c | 2 +-
+ arch/powerpc/platforms/powernv/vas-window.c | 4 +-
+ arch/powerpc/platforms/powernv/vas.h | 2 +-
+ arch/powerpc/platforms/ps3/Kconfig | 2 +-
+ arch/powerpc/platforms/ps3/htab.c | 1 -
+ arch/powerpc/platforms/ps3/mm.c | 3 +-
+ arch/powerpc/platforms/ps3/os-area.c | 2 -
+ arch/powerpc/platforms/ps3/setup.c | 2 +-
+ arch/powerpc/platforms/ps3/system-bus.c | 2 +-
+ arch/powerpc/platforms/pseries/Makefile | 4 +
+ arch/powerpc/platforms/pseries/cmm.c | 4 +-
+ arch/powerpc/platforms/pseries/dlpar.c | 3 +-
+ arch/powerpc/platforms/pseries/eeh_pseries.c | 9 +-
+ arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 +-
+ arch/powerpc/platforms/pseries/hotplug-memory.c | 1 -
+ arch/powerpc/platforms/pseries/iommu.c | 5 +-
+ arch/powerpc/platforms/pseries/kexec.c | 8 +
+ arch/powerpc/platforms/pseries/lpar.c | 1 -
+ arch/powerpc/platforms/pseries/lparcfg.c | 1 -
+ arch/powerpc/platforms/pseries/msi.c | 1 +
+ arch/powerpc/platforms/pseries/nvram.c | 2 +-
+ arch/powerpc/platforms/pseries/papr_scm.c | 54 +-
+ arch/powerpc/platforms/pseries/pci.c | 1 -
+ arch/powerpc/platforms/pseries/pmem.c | 1 -
+ arch/powerpc/platforms/pseries/pseries.h | 1 +
+ arch/powerpc/platforms/pseries/reconfig.c | 1 -
+ arch/powerpc/platforms/pseries/rtas-fadump.c | 17 +-
+ arch/powerpc/platforms/pseries/setup.c | 18 +-
+ arch/powerpc/platforms/pseries/smp.c | 1 -
+ arch/powerpc/platforms/pseries/vas-sysfs.c | 18 +-
+ arch/powerpc/platforms/pseries/vas.c | 2 +-
+ arch/powerpc/platforms/pseries/vio.c | 1 +
+ arch/powerpc/sysdev/Makefile | 1 -
+ arch/powerpc/sysdev/cpm2_pic.c | 2 +-
+ arch/powerpc/sysdev/dart_iommu.c | 8 +-
+ arch/powerpc/sysdev/dcr.c | 2 +-
+ arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h | 88 ---
+ arch/powerpc/sysdev/fsl_85xx_cache_sram.c | 147 -----
+ arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 216 -------
+ arch/powerpc/sysdev/fsl_lbc.c | 5 +-
+ arch/powerpc/sysdev/fsl_msi.c | 4 +-
+ arch/powerpc/sysdev/fsl_pci.c | 5 +-
+ arch/powerpc/sysdev/fsl_rio.c | 2 +
+ arch/powerpc/sysdev/fsl_soc.c | 1 -
+ arch/powerpc/sysdev/ge/ge_pic.c | 6 +-
+ arch/powerpc/sysdev/grackle.c | 2 +-
+ arch/powerpc/sysdev/i8259.c | 2 +-
+ arch/powerpc/sysdev/indirect_pci.c | 1 -
+ arch/powerpc/sysdev/ipic.c | 3 +-
+ arch/powerpc/sysdev/mmio_nvram.c | 2 +-
+ arch/powerpc/sysdev/mpic.c | 2 +
+ arch/powerpc/sysdev/mpic_msgr.c | 5 +-
+ arch/powerpc/sysdev/mpic_msi.c | 5 +-
+ arch/powerpc/sysdev/mpic_timer.c | 2 +-
+ arch/powerpc/sysdev/mpic_u3msi.c | 4 +-
+ arch/powerpc/sysdev/msi_bitmap.c | 1 +
+ arch/powerpc/sysdev/pmi.c | 3 +-
+ arch/powerpc/sysdev/rtc_cmos_setup.c | 2 +-
+ arch/powerpc/sysdev/tsi108_dev.c | 3 +-
+ arch/powerpc/sysdev/tsi108_pci.c | 3 +-
+ arch/powerpc/sysdev/xics/icp-native.c | 3 +-
+ arch/powerpc/sysdev/xics/icp-opal.c | 1 +
+ arch/powerpc/sysdev/xics/ics-native.c | 1 -
+ arch/powerpc/sysdev/xics/ics-opal.c | 1 -
+ arch/powerpc/sysdev/xics/ics-rtas.c | 1 -
+ arch/powerpc/sysdev/xics/xics-common.c | 6 +-
+ arch/powerpc/sysdev/xive/common.c | 6 +-
+ arch/powerpc/sysdev/xive/native.c | 4 +-
+ arch/powerpc/sysdev/xive/spapr.c | 9 +-
+ arch/powerpc/xmon/ppc-opc.c | 2 +-
+ arch/powerpc/xmon/xmon.c | 16 +-
+ drivers/crypto/nx/nx-common-powernv.c | 2 +-
+ drivers/macintosh/Kconfig | 6 +
+ drivers/macintosh/Makefile | 3 +-
+ drivers/macintosh/adb.c | 2 +-
+ drivers/macintosh/adbhid.c | 9 +-
+ drivers/macintosh/ams/ams-core.c | 2 +-
+ drivers/macintosh/ams/ams-i2c.c | 6 +-
+ drivers/macintosh/ans-lcd.c | 2 +-
+ drivers/macintosh/macio-adb.c | 5 +-
+ drivers/macintosh/macio_asic.c | 9 +-
+ drivers/macintosh/macio_sysfs.c | 2 +
+ drivers/macintosh/mediabay.c | 2 +-
+ drivers/macintosh/rack-meter.c | 1 -
+ drivers/macintosh/smu.c | 7 +-
+ drivers/macintosh/therm_adt746x.c | 1 -
+ drivers/macintosh/therm_windtunnel.c | 1 -
+ drivers/macintosh/via-cuda.c | 10 +-
+ drivers/macintosh/via-pmu-backlight.c | 1 -
+ drivers/macintosh/via-pmu-led.c | 2 +-
+ drivers/macintosh/via-pmu.c | 9 +-
+ drivers/macintosh/windfarm_ad7417_sensor.c | 2 +-
+ drivers/macintosh/windfarm_core.c | 2 -
+ drivers/macintosh/windfarm_cpufreq_clamp.c | 2 -
+ drivers/macintosh/windfarm_fcu_controls.c | 2 +-
+ drivers/macintosh/windfarm_lm75_sensor.c | 1 -
+ drivers/macintosh/windfarm_lm87_sensor.c | 2 +-
+ drivers/macintosh/windfarm_max6690_sensor.c | 2 +-
+ drivers/macintosh/windfarm_mpu.h | 2 +
+ drivers/macintosh/windfarm_pm112.c | 4 +-
+ drivers/macintosh/windfarm_pm121.c | 3 +-
+ drivers/macintosh/windfarm_pm72.c | 2 +-
+ drivers/macintosh/windfarm_pm81.c | 3 +-
+ drivers/macintosh/windfarm_pm91.c | 3 +-
+ drivers/macintosh/windfarm_rm31.c | 2 +-
+ drivers/macintosh/windfarm_smu_controls.c | 3 +-
+ drivers/macintosh/windfarm_smu_sat.c | 2 +-
+ drivers/macintosh/windfarm_smu_sensors.c | 3 +-
+ drivers/misc/cxl/api.c | 1 +
+ drivers/misc/cxl/cxl.h | 2 +
+ drivers/misc/cxl/cxllib.c | 1 +
+ drivers/misc/cxl/flash.c | 1 +
+ drivers/misc/cxl/guest.c | 2 +
+ drivers/misc/cxl/irq.c | 1 +
+ drivers/misc/cxl/main.c | 1 +
+ drivers/misc/cxl/native.c | 1 +
+ drivers/misc/ocxl/afu_irq.c | 1 +
+ drivers/misc/ocxl/file.c | 2 +
+ drivers/misc/ocxl/link.c | 1 +
+ fs/hugetlbfs/inode.c | 23 +-
+ include/linux/hugetlb.h | 5 +
+ include/linux/of_irq.h | 6 +-
+ include/linux/sched/mm.h | 11 +-
+ mm/mmap.c | 35 +-
+ mm/util.c | 2 +-
+ tools/testing/selftests/powerpc/include/utils.h | 5 +
+ tools/testing/selftests/powerpc/math/Makefile | 4 +-
+ tools/testing/selftests/powerpc/math/mma.S | 33 +
+ tools/testing/selftests/powerpc/math/mma.c | 48 ++
+ tools/testing/selftests/powerpc/mm/.gitignore | 1 +
+ tools/testing/selftests/powerpc/mm/Makefile | 4 +-
+ .../selftests/powerpc/mm/large_vm_gpr_corruption.c | 156 +++++
+ .../powerpc/pmu/ebb/fixed_instruction_loop.S | 43 --
+ .../selftests/powerpc/pmu/sampling_tests/misc.c | 2 +-
+ .../selftests/powerpc/security/spectre_v2.c | 32 +-
+ 504 files changed, 3405 insertions(+), 4602 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/powerpc/fsl/cache_sram.txt
+ create mode 100644 Documentation/powerpc/kasan.txt
+ delete mode 100644 arch/powerpc/include/asm/fsl_85xx_cache_sram.h
+ delete mode 100644 arch/powerpc/include/asm/slice.h
+ create mode 100644 arch/powerpc/kernel/rtas_entry.S
+ delete mode 100644 arch/powerpc/kvm/book3s_64_vio_hv.c
+ delete mode 100644 arch/powerpc/kvm/book3s_hv_rm_xive.c
+ delete mode 100644 arch/powerpc/kvm/book3s_xive_template.c
+ rename arch/powerpc/mm/{ => book3s64}/slice.c (91%)
+ rename arch/powerpc/mm/kasan/{kasan_init_32.c => init_32.c} (100%)
+ create mode 100644 arch/powerpc/mm/kasan/init_book3s_64.c
+ delete mode 100644 arch/powerpc/mm/mmap.c
+ create mode 100644 arch/powerpc/platforms/8xx/cpm1-ic.c
+ delete mode 100644 arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h
+ delete mode 100644 arch/powerpc/sysdev/fsl_85xx_cache_sram.c
+ delete mode 100644 arch/powerpc/sysdev/fsl_85xx_l2ctlr.c
+ create mode 100644 tools/testing/selftests/powerpc/math/mma.S
+ create mode 100644 tools/testing/selftests/powerpc/math/mma.c
+ create mode 100644 tools/testing/selftests/powerpc/mm/large_vm_gpr_corruption.c
+ delete mode 100644 tools/testing/selftests/powerpc/pmu/ebb/fixed_instruction_loop.S
+Merging soc-fsl/next (1ce93cb102e7 soc: fsl: qe: Check of ioremap return value)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+Merging risc-v/for-next (19bc59bbeddf Merge tag 'generic-ticket-spinlocks-v6' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/parisc/Kconfig
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/riscv/Kconfig
+Auto-merging arch/riscv/Kconfig.socs
+Auto-merging arch/riscv/Makefile
+Auto-merging arch/riscv/boot/dts/sifive/fu540-c000.dtsi
+CONFLICT (content): Merge conflict in arch/riscv/boot/dts/sifive/fu540-c000.dtsi
+Auto-merging arch/riscv/mm/init.c
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/s390/include/asm/compat.h
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/x86/include/asm/compat.h
+Auto-merging fs/stat.c
+Auto-merging include/linux/compat.h
+Auto-merging init/Kconfig
+Auto-merging mm/readahead.c
+Resolved 'arch/riscv/boot/dts/sifive/fu540-c000.dtsi' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 7924f82c8d87] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
+$ git diff -M --stat --summary HEAD^..
+ arch/arm64/Kconfig | 4 -
+ arch/arm64/include/asm/compat.h | 93 +----
+ arch/arm64/include/asm/unistd.h | 1 +
+ arch/mips/Kconfig | 5 -
+ arch/mips/include/asm/compat.h | 41 +-
+ arch/mips/include/asm/unistd.h | 2 +
+ arch/mips/include/uapi/asm/fcntl.h | 30 +-
+ arch/parisc/Kconfig | 4 -
+ arch/parisc/include/asm/compat.h | 45 +--
+ arch/parisc/include/asm/unistd.h | 1 +
+ arch/powerpc/Kconfig | 5 -
+ arch/powerpc/include/asm/compat.h | 50 +--
+ arch/powerpc/include/asm/unistd.h | 1 +
+ arch/riscv/Kbuild | 2 +
+ arch/riscv/Kconfig | 67 +++
+ arch/riscv/Kconfig.erratas | 34 +-
+ arch/riscv/Kconfig.socs | 1 -
+ arch/riscv/Makefile | 11 +-
+ arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 3 +-
+ arch/riscv/errata/Makefile | 2 +-
+ arch/riscv/errata/alternative.c | 75 ----
+ arch/riscv/errata/sifive/errata.c | 20 +-
+ arch/riscv/errata/thead/Makefile | 11 +
+ arch/riscv/errata/thead/errata.c | 82 ++++
+ arch/riscv/include/asm/alternative-macros.h | 129 ++++--
+ arch/riscv/include/asm/alternative.h | 25 +-
+ arch/riscv/include/asm/compat.h | 129 ++++++
+ arch/riscv/include/asm/csr.h | 7 +
+ arch/riscv/include/asm/elf.h | 50 ++-
+ arch/riscv/include/asm/errata_list.h | 59 +++
+ arch/riscv/include/asm/fixmap.h | 2 -
+ arch/riscv/include/asm/hwcap.h | 1 +
+ arch/riscv/include/asm/kexec.h | 4 +
+ arch/riscv/include/asm/mmu.h | 1 +
+ arch/riscv/include/asm/pgtable-32.h | 17 +
+ arch/riscv/include/asm/pgtable-64.h | 79 +++-
+ arch/riscv/include/asm/pgtable-bits.h | 10 -
+ arch/riscv/include/asm/pgtable.h | 68 +++-
+ arch/riscv/include/asm/processor.h | 6 +-
+ arch/riscv/include/asm/signal32.h | 18 +
+ arch/riscv/include/asm/syscall.h | 1 +
+ arch/riscv/include/asm/thread_info.h | 1 +
+ arch/riscv/include/asm/unistd.h | 11 +
+ arch/riscv/include/asm/vdso.h | 9 +
+ arch/riscv/include/asm/vendorid_list.h | 1 +
+ arch/riscv/include/uapi/asm/unistd.h | 2 +-
+ arch/riscv/kernel/Makefile | 19 +
+ arch/riscv/kernel/alternative.c | 118 ++++++
+ arch/riscv/kernel/compat_signal.c | 243 +++++++++++
+ arch/riscv/kernel/compat_syscall_table.c | 19 +
+ arch/riscv/kernel/compat_vdso/.gitignore | 2 +
+ arch/riscv/kernel/compat_vdso/Makefile | 78 ++++
+ arch/riscv/kernel/compat_vdso/compat_vdso.S | 8 +
+ arch/riscv/kernel/compat_vdso/compat_vdso.lds.S | 3 +
+ arch/riscv/kernel/compat_vdso/flush_icache.S | 3 +
+ .../kernel/compat_vdso/gen_compat_vdso_offsets.sh | 5 +
+ arch/riscv/kernel/compat_vdso/getcpu.S | 3 +
+ arch/riscv/kernel/compat_vdso/note.S | 3 +
+ arch/riscv/kernel/compat_vdso/rt_sigreturn.S | 3 +
+ arch/riscv/kernel/cpu.c | 1 +
+ arch/riscv/kernel/cpufeature.c | 80 +++-
+ arch/riscv/kernel/elf_kexec.c | 448 +++++++++++++++++++++
+ arch/riscv/kernel/entry.S | 18 +-
+ arch/riscv/kernel/machine_kexec.c | 4 +-
+ arch/riscv/kernel/machine_kexec_file.c | 14 +
+ arch/riscv/kernel/module.c | 29 ++
+ arch/riscv/kernel/process.c | 37 ++
+ arch/riscv/kernel/ptrace.c | 87 +++-
+ arch/riscv/kernel/setup.c | 2 +
+ arch/riscv/kernel/signal.c | 7 +-
+ arch/riscv/kernel/smpboot.c | 4 -
+ arch/riscv/kernel/sys_riscv.c | 6 +-
+ arch/riscv/kernel/traps.c | 2 +-
+ arch/riscv/kernel/vdso.c | 105 +++--
+ arch/riscv/kernel/vdso/vdso.S | 6 +-
+ arch/riscv/mm/fault.c | 10 +-
+ arch/riscv/mm/init.c | 1 +
+ arch/riscv/purgatory/.gitignore | 4 +
+ arch/riscv/purgatory/Makefile | 95 +++++
+ arch/riscv/purgatory/entry.S | 47 +++
+ arch/riscv/purgatory/purgatory.c | 45 +++
+ arch/s390/Kconfig | 3 -
+ arch/s390/include/asm/compat.h | 99 +----
+ arch/s390/include/asm/unistd.h | 1 +
+ arch/sparc/Kconfig | 5 -
+ arch/sparc/include/asm/compat.h | 61 +--
+ arch/sparc/include/asm/unistd.h | 1 +
+ arch/x86/Kconfig | 4 -
+ arch/x86/include/asm/compat.h | 104 +----
+ arch/x86/include/asm/unistd.h | 1 +
+ fs/open.c | 24 ++
+ fs/read_write.c | 16 +
+ fs/stat.c | 2 +-
+ fs/sync.c | 9 +
+ include/asm-generic/compat.h | 113 ++++++
+ include/linux/compat.h | 68 ++++
+ include/linux/kexec.h | 2 +-
+ include/uapi/asm-generic/fcntl.h | 23 +-
+ include/uapi/asm-generic/unistd.h | 4 +-
+ init/Kconfig | 4 +
+ kernel/kexec_file.c | 4 +-
+ mm/fadvise.c | 11 +
+ mm/readahead.c | 7 +
+ tools/include/uapi/asm-generic/fcntl.h | 21 +-
+ tools/include/uapi/asm-generic/unistd.h | 4 +-
+ 105 files changed, 2634 insertions(+), 736 deletions(-)
+ delete mode 100644 arch/riscv/errata/alternative.c
+ create mode 100644 arch/riscv/errata/thead/Makefile
+ create mode 100644 arch/riscv/errata/thead/errata.c
+ create mode 100644 arch/riscv/include/asm/compat.h
+ create mode 100644 arch/riscv/include/asm/signal32.h
+ create mode 100644 arch/riscv/kernel/alternative.c
+ create mode 100644 arch/riscv/kernel/compat_signal.c
+ create mode 100644 arch/riscv/kernel/compat_syscall_table.c
+ create mode 100644 arch/riscv/kernel/compat_vdso/.gitignore
+ create mode 100644 arch/riscv/kernel/compat_vdso/Makefile
+ create mode 100644 arch/riscv/kernel/compat_vdso/compat_vdso.S
+ create mode 100644 arch/riscv/kernel/compat_vdso/compat_vdso.lds.S
+ create mode 100644 arch/riscv/kernel/compat_vdso/flush_icache.S
+ create mode 100755 arch/riscv/kernel/compat_vdso/gen_compat_vdso_offsets.sh
+ create mode 100644 arch/riscv/kernel/compat_vdso/getcpu.S
+ create mode 100644 arch/riscv/kernel/compat_vdso/note.S
+ create mode 100644 arch/riscv/kernel/compat_vdso/rt_sigreturn.S
+ create mode 100644 arch/riscv/kernel/elf_kexec.c
+ create mode 100644 arch/riscv/kernel/machine_kexec_file.c
+ create mode 100644 arch/riscv/purgatory/.gitignore
+ create mode 100644 arch/riscv/purgatory/Makefile
+ create mode 100644 arch/riscv/purgatory/entry.S
+ create mode 100644 arch/riscv/purgatory/purgatory.c
+Merging s390/for-next (1905a336ba03 Merge branch 'features' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next
+Auto-merging arch/s390/Makefile
+Merge made by the 'ort' strategy.
+ arch/s390/crypto/aes_s390.c | 4 ++--
+ arch/s390/include/asm/processor.h | 6 ------
+ arch/s390/kernel/Makefile | 2 +-
+ arch/s390/kernel/asm-offsets.c | 16 ++++++++++++++++
+ arch/s390/kernel/early.c | 5 ++---
+ arch/s390/kernel/{base.S => earlypgm.S} | 33 +++------------------------------
+ arch/s390/kernel/entry.S | 17 -----------------
+ arch/s390/kernel/entry.h | 2 ++
+ arch/s390/kernel/perf_event.c | 2 +-
+ 9 files changed, 27 insertions(+), 60 deletions(-)
+ rename arch/s390/kernel/{base.S => earlypgm.S} (52%)
+Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size)
+$ git merge -m Merge branch 'for-next' of git://git.libc.org/linux-sh sh/for-next
+Already up to date.
+Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git sparc-next/master
+Already up to date.
+Merging uml/linux-next (82017457957a um: run_helper: Write error message to kernel log on exec failure on host)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git uml/linux-next
+Already up to date.
+Merging xtensa/xtensa-for-next (dc60001e1a30 xtensa: Return true/false (not 1/0) from bool function)
+$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next
+Already up to date.
+Merging pidfd/for-next (e1bbcd277a53 fs: hold writers when changing mount's idmapping)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next
+Already up to date.
+Merging fscrypt/master (218d921b581e fscrypt: add new helper functions for test_dummy_encryption)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt/master
+Already up to date.
+Merging fscache/fscache-next (713423282ae1 netfs: Fix gcc-12 warning by embedding vfs inode in netfs_i_context)
+$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next
+Auto-merging Documentation/filesystems/netfs_library.rst
+Auto-merging fs/9p/vfs_addr.c
+Auto-merging fs/afs/dir.c
+Auto-merging fs/afs/file.c
+Auto-merging fs/afs/inode.c
+Auto-merging fs/afs/internal.h
+Auto-merging fs/afs/write.c
+Auto-merging fs/ceph/addr.c
+Auto-merging fs/cifs/file.c
+Auto-merging fs/netfs/buffered_read.c
+Auto-merging include/linux/netfs.h
+CONFLICT (content): Merge conflict in include/linux/netfs.h
+Resolved 'include/linux/netfs.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 81d9e06e9c11] Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/netfs_library.rst | 37 +++++-----
+ fs/9p/cache.c | 4 +-
+ fs/9p/v9fs.c | 2 +-
+ fs/9p/v9fs.h | 10 +--
+ fs/9p/vfs_addr.c | 2 +-
+ fs/9p/vfs_inode.c | 4 +-
+ fs/afs/callback.c | 2 +-
+ fs/afs/dir.c | 32 ++++-----
+ fs/afs/dir_edit.c | 10 +--
+ fs/afs/dir_silly.c | 4 +-
+ fs/afs/dynroot.c | 2 +-
+ fs/afs/file.c | 4 +-
+ fs/afs/fs_operation.c | 6 +-
+ fs/afs/inode.c | 38 +++++-----
+ fs/afs/internal.h | 23 +++---
+ fs/afs/super.c | 6 +-
+ fs/afs/write.c | 21 +++---
+ fs/ceph/addr.c | 4 +-
+ fs/ceph/cache.c | 4 +-
+ fs/ceph/cache.h | 2 +-
+ fs/ceph/caps.c | 104 ++++++++++++++--------------
+ fs/ceph/file.c | 2 +-
+ fs/ceph/inode.c | 10 +--
+ fs/ceph/mds_client.c | 4 +-
+ fs/ceph/snap.c | 8 +--
+ fs/ceph/super.c | 2 +-
+ fs/ceph/super.h | 10 +--
+ fs/ceph/xattr.c | 14 ++--
+ fs/cifs/cifsfs.c | 8 +--
+ fs/cifs/cifsglob.h | 12 ++--
+ fs/cifs/file.c | 8 +--
+ fs/cifs/fscache.c | 8 +--
+ fs/cifs/fscache.h | 8 +--
+ fs/cifs/inode.c | 4 +-
+ fs/cifs/misc.c | 4 +-
+ fs/cifs/smb2ops.c | 8 +--
+ fs/netfs/buffered_read.c | 6 +-
+ fs/netfs/internal.h | 2 +-
+ fs/netfs/objects.c | 2 +-
+ include/linux/netfs.h | 39 ++++-------
+ 40 files changed, 226 insertions(+), 254 deletions(-)
+Merging afs/afs-next (26291c54e111 Linux 5.17-rc2)
+$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next
+Already up to date.
+Merging btrfs/for-next (0a05fafe9def btrfs: zoned: introduce a minimal zone size 4M and reject mount)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next
+Already up to date.
+Merging ceph/master (c4a9c116dbbb fs: change test in inode_insert5 for adding to the sb list)
+$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master
+Auto-merging MAINTAINERS
+Auto-merging drivers/block/rbd.c
+Auto-merging fs/ceph/addr.c
+Auto-merging fs/ceph/caps.c
+CONFLICT (content): Merge conflict in fs/ceph/caps.c
+Auto-merging fs/ceph/inode.c
+Auto-merging fs/ceph/mds_client.c
+Auto-merging fs/ceph/super.c
+Auto-merging fs/ceph/super.h
+Auto-merging fs/ceph/xattr.c
+Recorded preimage for 'fs/ceph/caps.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'fs/ceph/caps.c'.
+[master 4466ab99a7be] Merge branch 'master' of git://github.com/ceph/ceph-client.git
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 4 +-
+ drivers/block/rbd.c | 13 +++---
+ fs/ceph/addr.c | 42 ++++++++++-------
+ fs/ceph/caps.c | 75 +++++++++++++++++++-----------
+ fs/ceph/inode.c | 35 ++++++++++++--
+ fs/ceph/mds_client.c | 121 +++++++++++++++++++++++++++++++++++++-----------
+ fs/ceph/mds_client.h | 2 +-
+ fs/ceph/quota.c | 19 ++++----
+ fs/ceph/super.c | 1 +
+ fs/ceph/super.h | 29 ++++++++++--
+ fs/ceph/xattr.c | 10 +++-
+ fs/inode.c | 10 ++--
+ net/ceph/crush/mapper.c | 5 +-
+ 13 files changed, 260 insertions(+), 106 deletions(-)
+Merging cifs/for-next (b1f26cfaee3d cifs: Remove unused code)
+$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next
+Auto-merging fs/cifs/cifsfs.c
+Auto-merging fs/cifs/cifsglob.h
+Auto-merging fs/cifs/file.c
+Auto-merging fs/cifs/fscache.c
+Auto-merging fs/cifs/fscache.h
+Auto-merging fs/cifs/misc.c
+Auto-merging fs/cifs/smb2ops.c
+Merge made by the 'ort' strategy.
+ fs/cifs/cifs_debug.c | 11 +-
+ fs/cifs/cifsencrypt.c | 40 +-
+ fs/cifs/cifsfs.c | 2 +
+ fs/cifs/cifsfs.h | 3 +
+ fs/cifs/cifsglob.h | 153 ++++--
+ fs/cifs/cifsproto.h | 20 +-
+ fs/cifs/cifssmb.c | 239 ++++++---
+ fs/cifs/connect.c | 123 +++--
+ fs/cifs/dfs_cache.c | 6 +-
+ fs/cifs/file.c | 1280 +++++++++++++++-----------------------------
+ fs/cifs/fs_context.c | 33 +-
+ fs/cifs/fs_context.h | 4 +-
+ fs/cifs/fscache.c | 22 +-
+ fs/cifs/fscache.h | 10 +-
+ fs/cifs/misc.c | 120 +----
+ fs/cifs/readdir.c | 181 ++++++-
+ fs/cifs/sess.c | 33 +-
+ fs/cifs/smb2inode.c | 7 +-
+ fs/cifs/smb2misc.c | 12 +-
+ fs/cifs/smb2ops.c | 398 +++++++-------
+ fs/cifs/smb2pdu.c | 40 +-
+ fs/cifs/smb2pdu.h | 22 -
+ fs/cifs/smb2transport.c | 7 +-
+ fs/cifs/smbdirect.c | 319 +++++------
+ fs/cifs/smbdirect.h | 4 +-
+ fs/cifs/trace.h | 2 +
+ fs/cifs/transport.c | 45 +-
+ fs/smbfs_common/smb2pdu.h | 108 +++-
+ fs/smbfs_common/smbfsctl.h | 6 +
+ include/linux/uio.h | 8 +
+ lib/iov_iter.c | 133 +++++
+ 31 files changed, 1662 insertions(+), 1729 deletions(-)
+Merging configfs/for-next (84ec758fb2da configfs: fix a race in configfs_{,un}register_subsystem())
+$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next
+Already up to date.
+Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next
+Already up to date.
+Merging erofs/dev (ba73eadd23d1 erofs: scan devices from device table)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev
+Already up to date.
+Merging exfat/dev (64ba4b15e5c0 exfat: check if cluster num is valid)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev
+Already up to date.
+Merging ext3/for_next (5c905e1a0180 Pull typo fix from Julia Lawall.)
+$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next
+Auto-merging fs/ext2/inode.c
+Auto-merging fs/fs-writeback.c
+Merge made by the 'ort' strategy.
+ fs/ext2/inode.c | 1 -
+ fs/fs-writeback.c | 2 +-
+ fs/nfsd/filecache.c | 14 +++--
+ fs/notify/dnotify/dnotify.c | 13 ++--
+ fs/notify/fanotify/fanotify.c | 24 ++------
+ fs/notify/fanotify/fanotify.h | 12 ++++
+ fs/notify/fanotify/fanotify_user.c | 104 +++++++++++++++++++++-----------
+ fs/notify/fdinfo.c | 21 ++-----
+ fs/notify/fsnotify.c | 89 ++++++++++++++--------------
+ fs/notify/group.c | 32 ++++++----
+ fs/notify/inotify/inotify.h | 19 ++++++
+ fs/notify/inotify/inotify_fsnotify.c | 2 +-
+ fs/notify/inotify/inotify_user.c | 47 +++++++++------
+ fs/notify/mark.c | 112 +++++++++++++++++++++++------------
+ include/linux/fanotify.h | 1 +
+ include/linux/fsnotify_backend.h | 98 +++++++++++++++++++++++-------
+ include/uapi/linux/fanotify.h | 1 +
+ kernel/audit_fsnotify.c | 5 +-
+ kernel/audit_tree.c | 34 +++++------
+ kernel/audit_watch.c | 2 +-
+ 20 files changed, 397 insertions(+), 236 deletions(-)
+Merging ext4/dev (5f41fdaea63d ext4: only allow test_dummy_encryption when supported)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev
+Already up to date.
+Merging f2fs/dev (908ea6541661 f2fs: add f2fs_init_write_merge_io function)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev
+Auto-merging fs/f2fs/checkpoint.c
+Auto-merging fs/f2fs/data.c
+CONFLICT (content): Merge conflict in fs/f2fs/data.c
+Auto-merging fs/f2fs/f2fs.h
+Auto-merging fs/f2fs/file.c
+Auto-merging fs/f2fs/node.c
+Auto-merging fs/f2fs/segment.c
+Auto-merging fs/f2fs/super.c
+Auto-merging fs/f2fs/verity.c
+Auto-merging include/trace/events/f2fs.h
+Resolved 'fs/f2fs/data.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 8e2a3ff4574e] Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
+$ git diff -M --stat --summary HEAD^..
+ fs/f2fs/checkpoint.c | 16 +-
+ fs/f2fs/data.c | 213 +++++++++++++-------
+ fs/f2fs/debug.c | 18 +-
+ fs/f2fs/dir.c | 3 +-
+ fs/f2fs/f2fs.h | 131 ++++++-------
+ fs/f2fs/file.c | 290 ++++++++++++----------------
+ fs/f2fs/gc.c | 186 ++++++++++++------
+ fs/f2fs/hash.c | 11 +-
+ fs/f2fs/inline.c | 29 ++-
+ fs/f2fs/inode.c | 22 ++-
+ fs/f2fs/namei.c | 38 ++--
+ fs/f2fs/node.c | 29 ++-
+ fs/f2fs/node.h | 1 -
+ fs/f2fs/segment.c | 460 +++++++++++++++++---------------------------
+ fs/f2fs/segment.h | 40 ++--
+ fs/f2fs/super.c | 88 ++++-----
+ fs/f2fs/verity.c | 2 +-
+ include/trace/events/f2fs.h | 141 +++++++++++---
+ 18 files changed, 910 insertions(+), 808 deletions(-)
+Merging fsverity/fsverity (e6af1bb07704 fs-verity: Use struct_size() helper in enable_verity())
+$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity
+Already up to date.
+Merging fuse/for-next (6b49bc9d8a5f fuse: avoid unnecessary spinlock bump)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next
+Auto-merging fs/fuse/dir.c
+Auto-merging fs/fuse/file.c
+Merge made by the 'ort' strategy.
+ fs/fuse/dax.c | 2 +-
+ fs/fuse/dir.c | 7 ++++++-
+ fs/fuse/file.c | 39 ++++++++++++++++++++++++++-------------
+ 3 files changed, 33 insertions(+), 15 deletions(-)
+Merging gfs2/for-next (c360abbb9db2 gfs2: Convert function bh_get to use iomap)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next
+Already up to date.
+Merging jfs/jfs-next (e471e5942c00 fs/jfs: Remove dead code)
+$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next
+Auto-merging fs/jfs/inode.c
+Merge made by the 'ort' strategy.
+ fs/jfs/Makefile | 2 -
+ fs/jfs/inode.c | 18 -
+ fs/jfs/jfs_dmap.c | 71 +---
+ fs/jfs/jfs_dtree.c | 298 ----------------
+ fs/jfs/jfs_extent.c | 255 --------------
+ fs/jfs/jfs_logmgr.c | 8 -
+ fs/jfs/jfs_mount.c | 4 +-
+ fs/jfs/jfs_txnmgr.c | 34 --
+ fs/jfs/jfs_xtree.c | 961 ----------------------------------------------------
+ fs/jfs/jfs_xtree.h | 4 -
+ 10 files changed, 3 insertions(+), 1652 deletions(-)
+Merging ksmbd/ksmbd-for-next (376b91338268 ksmbd: fix outstanding credits related bugs)
+$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next
+Merge made by the 'ort' strategy.
+ fs/ksmbd/connection.c | 22 +--
+ fs/ksmbd/connection.h | 27 ++--
+ fs/ksmbd/ksmbd_netlink.h | 3 +-
+ fs/ksmbd/misc.c | 10 +-
+ fs/ksmbd/smb2misc.c | 2 +-
+ fs/ksmbd/smb2pdu.c | 126 ++++++++---------
+ fs/ksmbd/smb_common.c | 4 +-
+ fs/ksmbd/smbacl.c | 1 +
+ fs/ksmbd/transport_ipc.c | 3 +
+ fs/ksmbd/transport_rdma.c | 350 +++++++++++++++++++++++++++-------------------
+ fs/ksmbd/transport_rdma.h | 8 ++
+ 11 files changed, 320 insertions(+), 236 deletions(-)
+Merging nfs/linux-next (42226c989789 Linux 5.18-rc7)
+$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next
+Already up to date.
+Merging nfs-anna/linux-next (9c4a5c75a62e NFS: Pass i_size to fscache_unuse_cookie() when a file is released)
+$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next
+Auto-merging fs/nfs/file.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/nfs/nfs-client.rst | 15 +-
+ .../filesystems/nfs/client-identifier.rst | 216 +++++++++++++++++++++
+ Documentation/filesystems/nfs/index.rst | 2 +
+ fs/nfs/file.c | 50 ++---
+ fs/nfs/filelayout/filelayout.c | 7 +-
+ fs/nfs/fscache.c | 7 +-
+ fs/nfs/internal.h | 1 +
+ fs/nfs/nfs4proc.c | 141 +++++++++++---
+ fs/nfs/nfs4state.c | 20 +-
+ fs/nfs/nfs4xdr.c | 95 +++++----
+ fs/nfs/pnfs.c | 2 +
+ fs/nfs/write.c | 50 ++---
+ include/linux/nfs4.h | 2 +
+ include/linux/nfs_xdr.h | 10 +
+ 14 files changed, 488 insertions(+), 130 deletions(-)
+ create mode 100644 Documentation/filesystems/nfs/client-identifier.rst
+Merging nfsd/for-next (d2c87a674b96 NFSD: nfsd_file_put() can sleep)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next
+Auto-merging Documentation/filesystems/locking.rst
+Auto-merging fs/nfsd/filecache.c
+Auto-merging fs/open.c
+Auto-merging include/linux/fs.h
+Auto-merging net/sunrpc/svcsock.c
+Merge made by the 'ort' strategy.
+ Documentation/filesystems/locking.rst | 4 +
+ fs/locks.c | 61 +++++-
+ fs/nfsd/filecache.c | 54 ++++-
+ fs/nfsd/filecache.h | 2 +
+ fs/nfsd/nfs3proc.c | 141 ++++++++++--
+ fs/nfsd/nfs4proc.c | 264 +++++++++++++++++++----
+ fs/nfsd/nfs4state.c | 353 +++++++++++++++++++++++++------
+ fs/nfsd/nfs4xdr.c | 2 +-
+ fs/nfsd/nfscache.c | 2 +-
+ fs/nfsd/nfsctl.c | 20 +-
+ fs/nfsd/nfsd.h | 5 +
+ fs/nfsd/state.h | 31 +++
+ fs/nfsd/trace.h | 34 ++-
+ fs/nfsd/vfs.c | 255 +++++-----------------
+ fs/nfsd/vfs.h | 14 +-
+ fs/nfsd/xdr4.h | 1 +
+ fs/open.c | 42 ++++
+ include/linux/fs.h | 12 ++
+ include/linux/sunrpc/cache.h | 8 +-
+ include/linux/sunrpc/svc.h | 4 +-
+ include/trace/events/sunrpc.h | 12 +-
+ net/sunrpc/auth_gss/svcauth_gss.c | 4 +-
+ net/sunrpc/cache.c | 18 +-
+ net/sunrpc/debugfs.c | 3 +
+ net/sunrpc/fail.h | 2 +-
+ net/sunrpc/svc.c | 24 ++-
+ net/sunrpc/svc_xprt.c | 17 +-
+ net/sunrpc/svcsock.c | 19 +-
+ net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 1 -
+ net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 +-
+ 30 files changed, 985 insertions(+), 426 deletions(-)
+Merging ntfs3/master (52e00ea6b26e fs/ntfs3: Update valid size if -EIOCBQUEUED)
+$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master
+Auto-merging fs/ntfs3/file.c
+Auto-merging fs/ntfs3/inode.c
+Merge made by the 'ort' strategy.
+ fs/ntfs3/file.c | 12 +++--
+ fs/ntfs3/frecord.c | 10 ++--
+ fs/ntfs3/fslog.c | 6 ++-
+ fs/ntfs3/inode.c | 8 +++-
+ fs/ntfs3/xattr.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++-------
+ 5 files changed, 145 insertions(+), 27 deletions(-)
+Merging orangefs/for-next (40a74870b2d1 orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next
+Already up to date.
+Merging overlayfs/overlayfs-next (bc70682a497c ovl: support idmapped layers)
+$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next
+Auto-merging fs/namei.c
+Merge made by the 'ort' strategy.
+ fs/exportfs/expfs.c | 5 +-
+ fs/namei.c | 70 ++++++++++++--
+ fs/overlayfs/copy_up.c | 90 +++++++++---------
+ fs/overlayfs/dir.c | 147 +++++++++++++++---------------
+ fs/overlayfs/export.c | 5 +
+ fs/overlayfs/file.c | 43 +++++----
+ fs/overlayfs/inode.c | 68 ++++++++------
+ fs/overlayfs/namei.c | 53 +++++++----
+ fs/overlayfs/overlayfs.h | 232 +++++++++++++++++++++++++++++++++--------------
+ fs/overlayfs/ovl_entry.h | 7 +-
+ fs/overlayfs/readdir.c | 48 +++++-----
+ fs/overlayfs/super.c | 57 ++++++------
+ fs/overlayfs/util.c | 103 ++++++++++++++++-----
+ include/linux/namei.h | 6 ++
+ 14 files changed, 598 insertions(+), 336 deletions(-)
+Merging ubifs/next (705757274599 ubifs: rename_whiteout: correct old_dir size computing)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next
+Already up to date.
+Merging v9fs/9p-next (22e424feb665 Revert "fs/9p: search open fids first")
+$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next
+Already up to date.
+Merging xfs/for-next (ab6a8d3f1a2a Merge branch 'guilt/xfs-5.19-misc-3' into xfs-5.19-for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next
+Auto-merging fs/xfs/xfs_file.c
+Auto-merging fs/xfs/xfs_log_cil.c
+Auto-merging fs/xfs/xfs_super.c
+Merge made by the 'ort' strategy.
+ fs/xfs/Makefile | 1 +
+ fs/xfs/libxfs/xfs_alloc.c | 12 +-
+ fs/xfs/libxfs/xfs_alloc.h | 2 +-
+ fs/xfs/libxfs/xfs_attr.c | 1688 +++++++++++++++++-------------------
+ fs/xfs/libxfs/xfs_attr.h | 205 ++++-
+ fs/xfs/libxfs/xfs_attr_leaf.c | 64 +-
+ fs/xfs/libxfs/xfs_attr_remote.c | 37 +-
+ fs/xfs/libxfs/xfs_attr_remote.h | 6 +-
+ fs/xfs/libxfs/xfs_bmap.c | 167 ++--
+ fs/xfs/libxfs/xfs_bmap.h | 58 +-
+ fs/xfs/libxfs/xfs_bmap_btree.c | 9 +-
+ fs/xfs/libxfs/xfs_btree.c | 150 +++-
+ fs/xfs/libxfs/xfs_btree.h | 26 +-
+ fs/xfs/libxfs/xfs_da_btree.c | 15 +
+ fs/xfs/libxfs/xfs_da_btree.h | 26 +-
+ fs/xfs/libxfs/xfs_da_format.h | 9 +-
+ fs/xfs/libxfs/xfs_defer.c | 97 ++-
+ fs/xfs/libxfs/xfs_defer.h | 3 +
+ fs/xfs/libxfs/xfs_dir2.c | 8 +
+ fs/xfs/libxfs/xfs_errortag.h | 8 +-
+ fs/xfs/libxfs/xfs_format.h | 189 ++--
+ fs/xfs/libxfs/xfs_fs.h | 41 +-
+ fs/xfs/libxfs/xfs_ialloc.c | 8 +-
+ fs/xfs/libxfs/xfs_ialloc.h | 2 +-
+ fs/xfs/libxfs/xfs_inode_buf.c | 118 ++-
+ fs/xfs/libxfs/xfs_inode_fork.c | 51 +-
+ fs/xfs/libxfs/xfs_inode_fork.h | 76 +-
+ fs/xfs/libxfs/xfs_log_format.h | 87 +-
+ fs/xfs/libxfs/xfs_log_recover.h | 2 +
+ fs/xfs/libxfs/xfs_log_rlimit.c | 75 +-
+ fs/xfs/libxfs/xfs_quota_defs.h | 50 +-
+ fs/xfs/libxfs/xfs_refcount.c | 14 +-
+ fs/xfs/libxfs/xfs_refcount.h | 13 +-
+ fs/xfs/libxfs/xfs_rmap.c | 161 ++--
+ fs/xfs/libxfs/xfs_rmap.h | 7 +-
+ fs/xfs/libxfs/xfs_rtbitmap.c | 9 +-
+ fs/xfs/libxfs/xfs_sb.c | 80 +-
+ fs/xfs/libxfs/xfs_shared.h | 24 +-
+ fs/xfs/libxfs/xfs_symlink_remote.c | 2 +-
+ fs/xfs/libxfs/xfs_trans_resv.c | 225 +++--
+ fs/xfs/libxfs/xfs_trans_resv.h | 16 +-
+ fs/xfs/libxfs/xfs_types.h | 11 +-
+ fs/xfs/scrub/bmap.c | 26 +-
+ fs/xfs/scrub/common.c | 2 +
+ fs/xfs/scrub/inode.c | 20 +-
+ fs/xfs/scrub/rtbitmap.c | 9 +-
+ fs/xfs/xfs_acl.c | 4 +-
+ fs/xfs/xfs_acl.h | 8 +-
+ fs/xfs/xfs_attr_item.c | 882 +++++++++++++++++++
+ fs/xfs/xfs_attr_item.h | 54 ++
+ fs/xfs/xfs_attr_list.c | 1 +
+ fs/xfs/xfs_bmap_item.c | 27 +-
+ fs/xfs/xfs_bmap_util.c | 27 +-
+ fs/xfs/xfs_buf_item.h | 24 +-
+ fs/xfs/xfs_dquot.c | 18 +-
+ fs/xfs/xfs_dquot.h | 8 -
+ fs/xfs/xfs_error.c | 9 +
+ fs/xfs/xfs_error.h | 20 +-
+ fs/xfs/xfs_extfree_item.c | 23 +-
+ fs/xfs/xfs_file.c | 26 +-
+ fs/xfs/xfs_filestream.c | 7 +-
+ fs/xfs/xfs_fsmap.c | 6 +-
+ fs/xfs/xfs_fsops.c | 7 +-
+ fs/xfs/xfs_globals.c | 1 +
+ fs/xfs/xfs_icache.c | 9 +-
+ fs/xfs/xfs_icreate_item.c | 1 +
+ fs/xfs/xfs_inode.c | 80 +-
+ fs/xfs/xfs_inode.h | 29 +-
+ fs/xfs/xfs_inode_item.c | 48 +-
+ fs/xfs/xfs_inode_item_recover.c | 145 +++-
+ fs/xfs/xfs_ioctl.c | 7 +-
+ fs/xfs/xfs_ioctl32.c | 2 +
+ fs/xfs/xfs_iomap.c | 33 +-
+ fs/xfs/xfs_iops.c | 4 +-
+ fs/xfs/xfs_itable.c | 15 +-
+ fs/xfs/xfs_itable.h | 5 +-
+ fs/xfs/xfs_iwalk.h | 2 +-
+ fs/xfs/xfs_log.c | 807 ++++++++---------
+ fs/xfs/xfs_log.h | 97 ++-
+ fs/xfs/xfs_log_cil.c | 391 ++++++---
+ fs/xfs/xfs_log_priv.h | 89 +-
+ fs/xfs/xfs_log_recover.c | 61 +-
+ fs/xfs/xfs_message.c | 58 +-
+ fs/xfs/xfs_message.h | 55 +-
+ fs/xfs/xfs_mount.c | 91 +-
+ fs/xfs/xfs_mount.h | 32 +-
+ fs/xfs/xfs_ondisk.h | 2 +
+ fs/xfs/xfs_qm.c | 9 -
+ fs/xfs/xfs_qm.h | 5 -
+ fs/xfs/xfs_qm_syscalls.c | 26 +-
+ fs/xfs/xfs_quotaops.c | 8 +-
+ fs/xfs/xfs_refcount_item.c | 25 +-
+ fs/xfs/xfs_reflink.c | 100 ++-
+ fs/xfs/xfs_rmap_item.c | 25 +-
+ fs/xfs/xfs_rtalloc.c | 41 +
+ fs/xfs/xfs_rtalloc.h | 9 +-
+ fs/xfs/xfs_super.c | 37 +-
+ fs/xfs/xfs_symlink.c | 5 -
+ fs/xfs/xfs_sysctl.h | 1 +
+ fs/xfs/xfs_sysfs.c | 24 +
+ fs/xfs/xfs_trace.h | 100 ++-
+ fs/xfs/xfs_trans.c | 52 +-
+ fs/xfs/xfs_trans.h | 38 +-
+ fs/xfs/xfs_trans_dquot.c | 4 +-
+ fs/xfs/xfs_xattr.c | 2 +-
+ 105 files changed, 4862 insertions(+), 2773 deletions(-)
+ create mode 100644 fs/xfs/xfs_attr_item.c
+ create mode 100644 fs/xfs/xfs_attr_item.h
+Merging zonefs/for-next (31a644b3c2ae documentation: zonefs: Document sysfs attributes)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next
+Already up to date.
+Merging iomap/iomap-for-next (e9c3a8e820ed iomap: don't invalidate folios after writeback errors)
+$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next
+Already up to date.
+Merging djw-vfs/vfs-for-next (49df34221804 fs: fix an infinite loop in iomap_fiemap)
+$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next
+Already up to date.
+Merging file-locks/locks-next (80d8e4d3f313 fs/locks: fix fcntl_getlk64/fcntl_setlk64 stub prototypes)
+$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next
+Auto-merging include/linux/fs.h
+Merge made by the 'ort' strategy.
+Merging vfs/for-next (e9921ffd594f Merge branches 'work.namei', 'work.mount' and 'work.fd' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next
+Auto-merging drivers/android/binder.c
+Auto-merging fs/file_table.c
+Auto-merging fs/internal.h
+Auto-merging fs/io_uring.c
+CONFLICT (content): Merge conflict in fs/io_uring.c
+Auto-merging fs/namei.c
+Auto-merging fs/namespace.c
+Auto-merging fs/nfs/nfs4file.c
+Auto-merging include/linux/fs.h
+Auto-merging security/smack/smackfs.c
+Resolved 'fs/io_uring.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 059011ced0f7] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git
+$ git diff -M --stat --summary HEAD^..
+ arch/alpha/kernel/osf_sys.c | 1 +
+ drivers/android/binder.c | 2 +-
+ fs/file.c | 110 +++++++++++++++++---------------------------
+ fs/file_table.c | 9 +---
+ fs/fsopen.c | 4 +-
+ fs/internal.h | 3 +-
+ fs/io_uring.c | 18 +++-----
+ fs/namei.c | 11 +----
+ fs/namespace.c | 2 +-
+ fs/nfs/nfs4file.c | 4 +-
+ include/linux/fdtable.h | 2 +-
+ include/linux/file.h | 2 -
+ include/linux/fs.h | 15 +-----
+ include/linux/mount.h | 29 +++++++-----
+ kernel/usermode_driver.c | 4 +-
+ security/smack/smackfs.c | 1 +
+ 16 files changed, 84 insertions(+), 133 deletions(-)
+Merging printk/for-next (a110b11164a5 Merge branch 'rework/kthreads' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next
+Merge made by the 'ort' strategy.
+Merging pci/next (32f479d05a44 Merge branch 'remotes/lorenzo/pci/vmd')
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging arch/x86/include/asm/pci_x86.h
+Auto-merging drivers/pci/controller/dwc/pcie-qcom.c
+Auto-merging drivers/pci/pci-acpi.c
+Auto-merging drivers/pci/pci.c
+Auto-merging include/linux/pci.h
+Merge made by the 'ort' strategy.
+ Documentation/PCI/pci.rst | 4 +-
+ Documentation/admin-guide/kernel-parameters.txt | 9 +
+ .../devicetree/bindings/pci/layerscape-pci.txt | 65 +-
+ .../devicetree/bindings/pci/qcom,pcie.txt | 397 ------------
+ .../devicetree/bindings/pci/qcom,pcie.yaml | 714 +++++++++++++++++++++
+ .../devicetree/bindings/pci/rockchip-dw-pcie.yaml | 12 +-
+ arch/x86/include/asm/e820/api.h | 5 +
+ arch/x86/include/asm/pci_x86.h | 2 +
+ arch/x86/kernel/resource.c | 25 +-
+ arch/x86/pci/acpi.c | 93 +++
+ arch/x86/pci/common.c | 8 +
+ drivers/pci/controller/cadence/pci-j721e.c | 3 +
+ drivers/pci/controller/cadence/pcie-cadence-ep.c | 21 +-
+ drivers/pci/controller/cadence/pcie-cadence-host.c | 10 +
+ drivers/pci/controller/cadence/pcie-cadence.h | 7 +
+ drivers/pci/controller/dwc/pci-imx6.c | 23 +-
+ drivers/pci/controller/dwc/pcie-designware-host.c | 3 +-
+ drivers/pci/controller/dwc/pcie-dw-rockchip.c | 119 +++-
+ drivers/pci/controller/dwc/pcie-qcom-ep.c | 91 +--
+ drivers/pci/controller/dwc/pcie-qcom.c | 23 +-
+ drivers/pci/controller/dwc/pcie-tegra194.c | 9 -
+ drivers/pci/controller/pci-mvebu.c | 97 ++-
+ drivers/pci/controller/pci-versatile.c | 3 +-
+ drivers/pci/controller/pcie-mediatek-gen3.c | 8 +
+ drivers/pci/controller/pcie-mediatek.c | 1 +
+ drivers/pci/controller/pcie-microchip-host.c | 18 +-
+ drivers/pci/controller/pcie-rockchip-ep.c | 3 +-
+ drivers/pci/controller/vmd.c | 7 +-
+ drivers/pci/hotplug/pnv_php.c | 1 +
+ drivers/pci/hotplug/rpadlpar_core.c | 1 +
+ drivers/pci/hotplug/rpaphp_core.c | 2 +
+ drivers/pci/hotplug/rpaphp_pci.c | 1 +
+ drivers/pci/hotplug/rpaphp_slot.c | 1 +
+ drivers/pci/of.c | 70 ++
+ drivers/pci/p2pdma.c | 25 +-
+ drivers/pci/pci-acpi.c | 41 +-
+ drivers/pci/pci-driver.c | 45 +-
+ drivers/pci/pci.c | 353 +++++-----
+ drivers/pci/pci.h | 15 +
+ drivers/pci/pcie/aer.c | 7 +-
+ drivers/pci/quirks.c | 47 ++
+ include/linux/pci.h | 4 -
+ include/uapi/linux/pci_regs.h | 1 +
+ 43 files changed, 1646 insertions(+), 748 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/pci/qcom,pcie.txt
+ create mode 100644 Documentation/devicetree/bindings/pci/qcom,pcie.yaml
+Merging pstore/for-next/pstore (8126b1c73108 pstore: Don't use semaphores in always-atomic-context code)
+$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore
+Already up to date.
+Merging hid/for-next (b01c83388f54 Revert "HID: Driver for Google Hangouts Meet Speakermic")
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/hid/hid-ids.h
+Auto-merging drivers/hid/hid-ids.h
+Auto-merging drivers/hid/hid-ids.h
+Merge made by the 'ort' strategy.
+Merging i2c/i2c/for-next (44e66c3bda45 Merge branch 'i2c/for-mergewindow' into i2c/for-next)
+$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/i2c/qcom,i2c-qup.txt | 40 ----
+ .../devicetree/bindings/i2c/qcom,i2c-qup.yaml | 89 +++++++++
+ .../devicetree/bindings/i2c/renesas,rcar-i2c.yaml | 2 +-
+ Documentation/i2c/writing-clients.rst | 13 +-
+ drivers/i2c/busses/i2c-at91-master.c | 11 ++
+ drivers/i2c/busses/i2c-cadence.c | 12 +-
+ drivers/i2c/busses/i2c-davinci.c | 12 +-
+ drivers/i2c/busses/i2c-designware-amdpsp.c | 4 +-
+ drivers/i2c/busses/i2c-designware-common.c | 2 +-
+ drivers/i2c/busses/i2c-meson.c | 115 ++++++++---
+ drivers/i2c/busses/i2c-mt65xx.c | 11 +-
+ drivers/i2c/busses/i2c-mt7621.c | 5 +-
+ drivers/i2c/busses/i2c-npcm7xx.c | 122 ++++++++----
+ drivers/i2c/busses/i2c-powermac.c | 2 +-
+ drivers/i2c/busses/i2c-qcom-geni.c | 6 +-
+ drivers/i2c/busses/i2c-rcar.c | 217 ++++++++++++---------
+ drivers/i2c/busses/i2c-xiic.c | 84 ++++----
+ 17 files changed, 469 insertions(+), 278 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/i2c/qcom,i2c-qup.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/qcom,i2c-qup.yaml
+Merging i3c/i3c/next (227fab1ee7ca i3c: master: svc: fix returnvar.cocci warning)
+$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/i3c/cdns,i3c-master.txt | 43 ----------------
+ .../devicetree/bindings/i3c/cdns,i3c-master.yaml | 60 ++++++++++++++++++++++
+ .../devicetree/bindings/i3c/snps,dw-i3c-master.txt | 41 ---------------
+ .../bindings/i3c/snps,dw-i3c-master.yaml | 52 +++++++++++++++++++
+ drivers/i3c/master/mipi-i3c-hci/core.c | 7 +--
+ drivers/i3c/master/svc-i3c-master.c | 3 +-
+ 6 files changed, 114 insertions(+), 92 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/i3c/cdns,i3c-master.txt
+ create mode 100644 Documentation/devicetree/bindings/i3c/cdns,i3c-master.yaml
+ delete mode 100644 Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.txt
+ create mode 100644 Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.yaml
+Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias)
+$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next
+Already up to date.
+Merging hwmon-staging/hwmon-next (8877ecb0fc8d hwmon: (aquacomputer_d5next) Fix an error handling path in aqc_probe())
+$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next
+Already up to date.
+Merging jc_docs/docs-next (b86f46d5ce3e docs: pdfdocs: Add space for chapter counts >= 100 in TOC)
+$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next
+Already up to date.
+Merging v4l-dvb/master (340ce50f75a6 media: hantro: Enable HOLD_CAPTURE_BUF for H.264)
+$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master
+Already up to date.
+Merging v4l-dvb-next/master (340ce50f75a6 media: hantro: Enable HOLD_CAPTURE_BUF for H.264)
+$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master
+Already up to date.
+Merging pm/linux-next (15e13f9dc84a Merge branch 'pm-opp' into linux-next)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next
+Auto-merging arch/arm64/boot/dts/nvidia/tegra234.dtsi
+Auto-merging arch/m68k/include/asm/machdep.h
+Auto-merging arch/m68k/kernel/setup_mm.c
+Auto-merging arch/m68k/kernel/setup_no.c
+Auto-merging arch/powerpc/kernel/setup-common.c
+Auto-merging arch/powerpc/xmon/xmon.c
+Auto-merging drivers/memory/emif.c
+Auto-merging drivers/soc/tegra/pmc.c
+Auto-merging kernel/reboot.c
+Merge made by the 'ort' strategy.
+ .../arm/tegra/nvidia,tegra-ccplex-cluster.yaml | 52 ++
+ .../bindings/cpufreq/cpufreq-mediatek.txt | 7 +
+ .../devicetree/bindings/opp/opp-v2-kryo-cpu.yaml | 56 +-
+ arch/arm/kernel/reboot.c | 4 +-
+ arch/arm64/kernel/process.c | 3 +-
+ arch/csky/kernel/power.c | 6 +-
+ arch/ia64/kernel/process.c | 4 +-
+ arch/m68k/emu/natfeat.c | 3 +-
+ arch/m68k/include/asm/machdep.h | 1 -
+ arch/m68k/kernel/process.c | 5 +-
+ arch/m68k/kernel/setup_mm.c | 1 -
+ arch/m68k/kernel/setup_no.c | 1 -
+ arch/m68k/mac/config.c | 4 +-
+ arch/m68k/virt/config.c | 4 +-
+ arch/mips/kernel/reset.c | 3 +-
+ arch/parisc/kernel/process.c | 4 +-
+ arch/powerpc/kernel/setup-common.c | 4 +-
+ arch/powerpc/xmon/xmon.c | 3 +-
+ arch/riscv/kernel/reset.c | 12 +-
+ arch/sh/kernel/reboot.c | 3 +-
+ arch/x86/kernel/reboot.c | 4 +-
+ arch/x86/xen/enlighten_pv.c | 4 +-
+ drivers/acpi/ac.c | 4 +-
+ drivers/acpi/acpi_video.c | 31 +-
+ drivers/acpi/battery.c | 24 +-
+ drivers/acpi/glue.c | 16 +-
+ drivers/acpi/osl.c | 86 ---
+ drivers/acpi/processor_idle.c | 10 +-
+ drivers/acpi/sleep.c | 16 +-
+ drivers/cpufreq/mediatek-cpufreq.c | 636 ++++++++++++++-------
+ drivers/cpufreq/tegra194-cpufreq.c | 246 ++++++--
+ drivers/memory/emif.c | 2 +-
+ drivers/opp/core.c | 339 +++++++----
+ drivers/opp/debugfs.c | 10 +-
+ drivers/opp/of.c | 2 +-
+ drivers/regulator/pfuze100-regulator.c | 42 +-
+ drivers/soc/tegra/pmc.c | 87 ++-
+ drivers/usb/typec/ucsi/ucsi_acpi.c | 19 +-
+ include/linux/acpi.h | 3 -
+ include/linux/notifier.h | 7 +
+ include/linux/pm.h | 1 -
+ include/linux/pm_opp.h | 41 +-
+ include/linux/reboot.h | 91 +++
+ kernel/notifier.c | 101 +++-
+ kernel/reboot.c | 348 ++++++++++-
+ 45 files changed, 1652 insertions(+), 698 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra-ccplex-cluster.yaml
+Merging cpufreq-arm/cpufreq/arm/linux-next (39b360102f3a cpufreq: mediatek: Add support for MT8186)
+$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next
+Already up to date.
+Merging cpupower/cpupower (312310928417 Linux 5.18-rc1)
+$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower
+Already up to date.
+Merging devfreq/devfreq-next (2e691421a2c9 PM / devfreq: rk3399_dmc: Block PMU during transitions)
+$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next
+Already up to date.
+Merging opp/opp/linux-next (22079af7df5a opp: Reorder definition of ceil/floor helpers)
+$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next
+Already up to date.
+Merging thermal/thermal/linux-next (72b3fc61c752 thermal: k3_j72xx_bandgap: Add the bandgap driver support)
+$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next
+Auto-merging MAINTAINERS
+Auto-merging tools/Makefile
+Merge made by the 'ort' strategy.
+Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next
+Already up to date.
+Merging dlm/next (8e51ec6146fd dlm: use kref_put_lock in __put_lkb)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next
+Already up to date.
+Merging rdma/for-next (b90c7e97c48b RDMA/hfi1: Remove all traces of diagpkt support)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next
+Auto-merging drivers/infiniband/hw/mlx5/main.c
+Auto-merging drivers/infiniband/hw/mlx5/mlx5_ib.h
+Auto-merging drivers/infiniband/hw/mlx5/qp.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c
+CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/main.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c
+Auto-merging drivers/nvme/host/rdma.c
+Auto-merging fs/cifs/smbdirect.c
+Merge made by the 'ort' strategy.
+ drivers/infiniband/core/device.c | 24 +-
+ drivers/infiniband/core/nldev.c | 2 +-
+ drivers/infiniband/core/sa_query.c | 16 +-
+ drivers/infiniband/core/umem_odp.c | 2 +-
+ drivers/infiniband/core/uverbs_cmd.c | 2 +-
+ drivers/infiniband/core/verbs.c | 8 +-
+ drivers/infiniband/hw/bnxt_re/ib_verbs.c | 2 +-
+ drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 1 -
+ drivers/infiniband/hw/cxgb4/provider.c | 8 +-
+ drivers/infiniband/hw/hfi1/common.h | 55 --
+ drivers/infiniband/hw/hfi1/driver.c | 6 -
+ drivers/infiniband/hw/hfi1/efivar.c | 2 +-
+ drivers/infiniband/hw/hfi1/file_ops.c | 4 +-
+ drivers/infiniband/hw/hfi1/init.c | 2 +-
+ drivers/infiniband/hw/hfi1/sdma.c | 12 +-
+ drivers/infiniband/hw/hfi1/verbs.c | 4 +-
+ drivers/infiniband/hw/hns/hns_roce_device.h | 32 +-
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 451 +++++++----------
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 326 ++++--------
+ drivers/infiniband/hw/hns/hns_roce_main.c | 2 +-
+ drivers/infiniband/hw/hns/hns_roce_mr.c | 3 +-
+ drivers/infiniband/hw/hns/hns_roce_qp.c | 20 -
+ drivers/infiniband/hw/hns/hns_roce_restrack.c | 49 +-
+ drivers/infiniband/hw/irdma/hw.c | 35 +-
+ drivers/infiniband/hw/irdma/main.h | 1 -
+ drivers/infiniband/hw/irdma/puda.c | 7 +-
+ drivers/infiniband/hw/irdma/utils.c | 147 ++++++
+ drivers/infiniband/hw/irdma/verbs.c | 60 ++-
+ drivers/infiniband/hw/irdma/verbs.h | 13 +-
+ drivers/infiniband/hw/mlx4/cm.c | 29 +-
+ drivers/infiniband/hw/mlx4/main.c | 18 +-
+ drivers/infiniband/hw/mlx4/mlx4_ib.h | 3 +
+ drivers/infiniband/hw/mlx5/Makefile | 1 +
+ drivers/infiniband/hw/mlx5/fs.c | 5 -
+ drivers/infiniband/hw/mlx5/main.c | 124 +----
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 89 +---
+ drivers/infiniband/hw/mlx5/mr.c | 421 +---------------
+ drivers/infiniband/hw/mlx5/odp.c | 64 ++-
+ drivers/infiniband/hw/mlx5/qp.c | 1 +
+ drivers/infiniband/hw/mlx5/umr.c | 700 ++++++++++++++++++++++++++
+ drivers/infiniband/hw/mlx5/umr.h | 97 ++++
+ drivers/infiniband/hw/mlx5/wr.c | 377 +++-----------
+ drivers/infiniband/hw/mlx5/wr.h | 60 +++
+ drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +-
+ drivers/infiniband/hw/qedr/main.c | 1 -
+ drivers/infiniband/hw/qedr/verbs.c | 3 +-
+ drivers/infiniband/hw/qib/qib.h | 2 +-
+ drivers/infiniband/hw/usnic/usnic_ib_main.c | 11 +-
+ drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 6 +-
+ drivers/infiniband/hw/usnic/usnic_uiom.c | 15 +-
+ drivers/infiniband/hw/usnic/usnic_uiom.h | 3 +-
+ drivers/infiniband/sw/rdmavt/qp.c | 6 +-
+ drivers/infiniband/sw/rxe/rxe.c | 1 +
+ drivers/infiniband/sw/rxe/rxe_comp.c | 3 +-
+ drivers/infiniband/sw/rxe/rxe_loc.h | 17 +-
+ drivers/infiniband/sw/rxe/rxe_mcast.c | 6 +-
+ drivers/infiniband/sw/rxe/rxe_mr.c | 10 +-
+ drivers/infiniband/sw/rxe/rxe_mw.c | 65 +--
+ drivers/infiniband/sw/rxe/rxe_opcode.c | 2 -
+ drivers/infiniband/sw/rxe/rxe_param.h | 2 -
+ drivers/infiniband/sw/rxe/rxe_pool.c | 11 +-
+ drivers/infiniband/sw/rxe/rxe_pool.h | 5 -
+ drivers/infiniband/sw/rxe/rxe_qp.c | 36 +-
+ drivers/infiniband/sw/rxe/rxe_recv.c | 1 -
+ drivers/infiniband/sw/rxe/rxe_req.c | 28 +-
+ drivers/infiniband/sw/rxe/rxe_resp.c | 8 +-
+ drivers/infiniband/sw/rxe/rxe_srq.c | 129 +++--
+ drivers/infiniband/sw/rxe/rxe_verbs.c | 40 +-
+ drivers/infiniband/sw/rxe/rxe_verbs.h | 3 +-
+ drivers/infiniband/sw/siw/siw_main.c | 5 +-
+ drivers/infiniband/sw/siw/siw_verbs.c | 4 +-
+ drivers/infiniband/ulp/ipoib/ipoib.h | 1 +
+ drivers/infiniband/ulp/ipoib/ipoib_main.c | 5 +-
+ drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 6 +-
+ drivers/infiniband/ulp/iser/iscsi_iser.c | 2 +-
+ drivers/infiniband/ulp/iser/iscsi_iser.h | 2 +-
+ drivers/infiniband/ulp/iser/iser_verbs.c | 8 +-
+ drivers/infiniband/ulp/isert/ib_isert.c | 27 +-
+ drivers/infiniband/ulp/srp/ib_srp.c | 8 +-
+ drivers/nvme/host/rdma.c | 4 +-
+ drivers/nvme/target/rdma.c | 4 +-
+ fs/cifs/smbdirect.c | 2 +-
+ include/rdma/ib_verbs.h | 138 ++---
+ include/rdma/opa_vnic.h | 3 +-
+ include/uapi/rdma/ib_user_verbs.h | 42 ++
+ net/rds/ib.c | 4 +-
+ net/sunrpc/xprtrdma/frwr_ops.c | 2 +-
+ 87 files changed, 1967 insertions(+), 2001 deletions(-)
+ create mode 100644 drivers/infiniband/hw/mlx5/umr.c
+ create mode 100644 drivers/infiniband/hw/mlx5/umr.h
+Merging net-next/master (7e062cda7d90 Merge tag 'net-next-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master
+Already up to date.
+Merging bpf-next/for-next (7e062cda7d90 Merge tag 'net-next-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next
+Already up to date.
+Merging ipsec-next/master (0f9008e5c510 Merge branch 'Be explicit with XFRM offload direction')
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master
+Already up to date.
+Merging mlx5-next/mlx5-next (846e437387e7 net/mlx5: Expose mlx5_sriov_blocking_notifier_register / unregister APIs)
+$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next
+Auto-merging include/linux/mlx5/driver.h
+Merge made by the 'ort' strategy.
+ drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 65 ++++++++++++++++++++++++-
+ include/linux/mlx5/driver.h | 12 +++++
+ 2 files changed, 76 insertions(+), 1 deletion(-)
+Merging netfilter-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master
+Already up to date.
+Merging ipvs-next/master (0c7b27616fbd selftests: netfilter: add fib expression forward test case)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/master
+Already up to date.
+Merging bluetooth/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master
+Already up to date.
+Merging wireless-next/main (805cb5aadc2a Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next)
+$ git merge -m Merge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/main
+Already up to date.
+Merging mtd/mtd/next (2c51d0d88020 Merge tag 'nand/for-5.19' into mtd/next)
+$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next
+Already up to date.
+Merging nand/nand/next (6a2277a0ebe7 mtd: rawnand: renesas: Use runtime PM instead of the raw clock API)
+$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next
+Already up to date.
+Merging spi-nor/spi-nor/next (c47452194641 mtd: spi-nor: debugfs: fix format specifier)
+$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next
+Already up to date.
+Merging crypto/master (e4e62bbc6aba hwrng: omap3-rom - fix using wrong clk_disable() in omap_rom_rng_runtime_resume())
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master
+Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml
+Auto-merging drivers/crypto/caam/Kconfig
+CONFLICT (content): Merge conflict in drivers/crypto/caam/Kconfig
+Auto-merging drivers/crypto/caam/Makefile
+Auto-merging drivers/crypto/caam/ctrl.c
+Auto-merging drivers/crypto/caam/intern.h
+Resolved 'drivers/crypto/caam/Kconfig' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 49e704110f30] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/debugfs-hisi-hpre | 14 +
+ Documentation/ABI/testing/debugfs-hisi-sec | 14 +
+ Documentation/ABI/testing/debugfs-hisi-zip | 14 +
+ Documentation/ABI/testing/sysfs-driver-ccp | 87 +++
+ .../devicetree/bindings/crypto/ti,sa2ul.yaml | 1 +
+ .../devicetree/bindings/trivial-devices.yaml | 4 +-
+ arch/arm64/crypto/Kconfig | 16 +-
+ arch/arm64/crypto/Makefile | 8 +-
+ arch/arm64/crypto/sm4-ce-cipher-core.S | 36 ++
+ arch/arm64/crypto/sm4-ce-cipher-glue.c | 82 +++
+ arch/arm64/crypto/sm4-ce-core.S | 688 ++++++++++++++++++++-
+ arch/arm64/crypto/sm4-ce-glue.c | 386 ++++++++++--
+ arch/arm64/crypto/sm4-neon-core.S | 487 +++++++++++++++
+ arch/arm64/crypto/sm4-neon-glue.c | 442 +++++++++++++
+ arch/s390/crypto/chacha-glue.c | 34 +-
+ arch/x86/crypto/blowfish_glue.c | 8 +-
+ arch/x86/crypto/camellia_glue.c | 8 +-
+ arch/x86/crypto/serpent_avx2_glue.c | 8 +-
+ arch/x86/crypto/twofish_glue.c | 8 +-
+ arch/x86/crypto/twofish_glue_3way.c | 8 +-
+ crypto/Kconfig | 18 +-
+ crypto/Makefile | 6 +-
+ crypto/cryptd.c | 23 +-
+ crypto/crypto_engine.c | 1 +
+ crypto/ecrdsa.c | 8 +-
+ {lib/crypto => crypto}/sm3.c | 0
+ {lib/crypto => crypto}/sm4.c | 10 +-
+ crypto/testmgr.c | 75 ++-
+ drivers/char/hw_random/Kconfig | 15 +-
+ drivers/char/hw_random/Makefile | 1 +
+ drivers/char/hw_random/cn10k-rng.c | 31 +-
+ drivers/char/hw_random/mpfs-rng.c | 104 ++++
+ drivers/char/hw_random/omap3-rom-rng.c | 2 +-
+ drivers/char/hw_random/optee-rng.c | 2 +-
+ drivers/crypto/Kconfig | 4 +-
+ drivers/crypto/Makefile | 1 +
+ .../crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c | 22 +-
+ drivers/crypto/allwinner/sun4i-ss/sun4i-ss.h | 1 +
+ .../crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c | 102 +--
+ drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 54 +-
+ drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 130 ++--
+ drivers/crypto/allwinner/sun8i-ce/sun8i-ce-prng.c | 6 +-
+ drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 19 +-
+ .../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 180 ++++--
+ drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 92 ++-
+ drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 385 ++++++++++--
+ drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c | 6 +-
+ drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h | 33 +-
+ drivers/crypto/atmel-ecc.c | 2 +-
+ drivers/crypto/atmel-i2c.c | 30 +-
+ drivers/crypto/atmel-i2c.h | 1 +
+ drivers/crypto/atmel-sha204a.c | 11 +-
+ drivers/crypto/caam/Kconfig | 8 +
+ drivers/crypto/caam/Makefile | 1 +
+ drivers/crypto/caam/caamprng.c | 235 +++++++
+ drivers/crypto/caam/ctrl.c | 18 +
+ drivers/crypto/caam/intern.h | 15 +
+ drivers/crypto/caam/jr.c | 3 +-
+ drivers/crypto/cavium/nitrox/nitrox_main.c | 10 +-
+ drivers/crypto/ccp/psp-dev.c | 49 +-
+ drivers/crypto/ccp/psp-dev.h | 22 +
+ drivers/crypto/ccp/sev-dev.c | 32 +-
+ drivers/crypto/ccp/sp-pci.c | 62 ++
+ drivers/crypto/ccree/cc_buffer_mgr.c | 27 +-
+ drivers/crypto/ccree/cc_driver.c | 24 +-
+ drivers/crypto/hisilicon/Kconfig | 1 +
+ drivers/crypto/hisilicon/hpre/hpre_main.c | 222 +++++--
+ drivers/crypto/hisilicon/qm.c | 282 ++++++++-
+ drivers/crypto/hisilicon/sec2/sec_crypto.c | 2 -
+ drivers/crypto/hisilicon/sec2/sec_main.c | 108 +++-
+ drivers/crypto/hisilicon/sgl.c | 6 +-
+ drivers/crypto/hisilicon/zip/zip_crypto.c | 2 +-
+ drivers/crypto/hisilicon/zip/zip_main.c | 185 +++++-
+ drivers/crypto/inside-secure/safexcel.c | 9 +
+ drivers/crypto/keembay/keembay-ocs-aes-core.c | 9 +-
+ drivers/crypto/marvell/cesa/cipher.c | 1 -
+ drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c | 7 +-
+ drivers/crypto/qat/qat_4xxx/adf_drv.c | 8 +-
+ drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c | 15 +-
+ drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.h | 4 -
+ drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c | 15 +-
+ drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.h | 4 -
+ drivers/crypto/qat/qat_common/Makefile | 1 +
+ drivers/crypto/qat/qat_common/adf_accel_devices.h | 6 +-
+ drivers/crypto/qat/qat_common/adf_common_drv.h | 18 +-
+ drivers/crypto/qat/qat_common/adf_gen2_hw_data.c | 13 +
+ drivers/crypto/qat/qat_common/adf_gen2_hw_data.h | 6 +
+ drivers/crypto/qat/qat_common/adf_gen2_pfvf.c | 78 ++-
+ drivers/crypto/qat/qat_common/adf_gen4_pfvf.c | 61 +-
+ drivers/crypto/qat/qat_common/adf_isr.c | 21 +-
+ drivers/crypto/qat/qat_common/adf_pfvf_msg.h | 4 +-
+ drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.c | 6 +-
+ drivers/crypto/qat/qat_common/adf_sriov.c | 16 +-
+ drivers/crypto/qat/qat_common/adf_transport.c | 11 +
+ drivers/crypto/qat/qat_common/adf_transport.h | 1 +
+ .../crypto/qat/qat_common/adf_transport_internal.h | 1 +
+ drivers/crypto/qat/qat_common/adf_vf_isr.c | 1 +
+ drivers/crypto/qat/qat_common/qat_algs.c | 153 +++--
+ drivers/crypto/qat/qat_common/qat_algs_send.c | 86 +++
+ drivers/crypto/qat/qat_common/qat_algs_send.h | 11 +
+ drivers/crypto/qat/qat_common/qat_asym_algs.c | 307 +++++----
+ drivers/crypto/qat/qat_common/qat_crypto.c | 10 +-
+ drivers/crypto/qat/qat_common/qat_crypto.h | 44 ++
+ drivers/crypto/qat/qat_common/qat_hal.c | 1 +
+ drivers/crypto/qat/qat_common/qat_uclo.c | 3 +-
+ .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 126 ++--
+ .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 4 -
+ drivers/crypto/sa2ul.c | 1 +
+ drivers/crypto/talitos.c | 10 +-
+ drivers/crypto/ux500/hash/hash_core.c | 4 +-
+ drivers/crypto/vmx/Makefile | 17 +-
+ include/crypto/sm4.h | 4 +
+ include/linux/hisi_acc_qm.h | 23 +-
+ lib/crypto/Kconfig | 6 -
+ lib/crypto/Makefile | 6 -
+ tools/testing/crypto/chacha20-s390/Makefile | 12 +
+ tools/testing/crypto/chacha20-s390/run-tests.sh | 34 +
+ tools/testing/crypto/chacha20-s390/test-cipher.c | 372 +++++++++++
+ 118 files changed, 5534 insertions(+), 1058 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-ccp
+ create mode 100644 arch/arm64/crypto/sm4-ce-cipher-core.S
+ create mode 100644 arch/arm64/crypto/sm4-ce-cipher-glue.c
+ create mode 100644 arch/arm64/crypto/sm4-neon-core.S
+ create mode 100644 arch/arm64/crypto/sm4-neon-glue.c
+ rename {lib/crypto => crypto}/sm3.c (100%)
+ rename {lib/crypto => crypto}/sm4.c (94%)
+ create mode 100644 drivers/char/hw_random/mpfs-rng.c
+ create mode 100644 drivers/crypto/caam/caamprng.c
+ create mode 100644 drivers/crypto/qat/qat_common/qat_algs_send.c
+ create mode 100644 drivers/crypto/qat/qat_common/qat_algs_send.h
+ create mode 100644 tools/testing/crypto/chacha20-s390/Makefile
+ create mode 100644 tools/testing/crypto/chacha20-s390/run-tests.sh
+ create mode 100644 tools/testing/crypto/chacha20-s390/test-cipher.c
+Merging drm/drm-next (c4955d9cd2fc Merge tag 'drm-intel-next-fixes-2022-05-24' of git://anongit.freedesktop.org/drm/drm-intel into drm-next)
+$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging MAINTAINERS
+Auto-merging arch/x86/Kconfig
+Auto-merging drivers/dma-buf/dma-buf.c
+Auto-merging drivers/firmware/Kconfig
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/vi.c
+Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+Auto-merging drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+Auto-merging drivers/gpu/drm/bridge/Kconfig
+Auto-merging drivers/gpu/drm/bridge/ti-sn65dsi83.c
+Auto-merging drivers/gpu/drm/display/drm_dp_mst_topology.c
+Auto-merging drivers/gpu/drm/i915/display/intel_dmc.c
+Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+Auto-merging drivers/gpu/drm/i915/gem/i915_gem_shmem.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_reset.c
+Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc.h
+Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+Auto-merging drivers/gpu/drm/i915/gt/uc/intel_uc.c
+Auto-merging drivers/gpu/drm/i915/i915_reg.h
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h
+Auto-merging drivers/gpu/drm/i915/i915_vma.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_vma.c
+Auto-merging drivers/gpu/drm/msm/dp/dp_display.c
+Auto-merging drivers/gpu/drm/msm/dp/dp_panel.c
+Auto-merging drivers/gpu/drm/msm/dp/dp_panel.h
+Auto-merging drivers/gpu/drm/panfrost/panfrost_drv.c
+Auto-merging drivers/gpu/drm/panfrost/panfrost_job.c
+Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c
+Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
+Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
+Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+Auto-merging drivers/iommu/intel/iommu.c
+Auto-merging drivers/of/platform.c
+Auto-merging drivers/video/fbdev/core/fbsysfs.c
+Auto-merging include/linux/efi.h
+Resolved 'drivers/gpu/drm/i915/i915_reg.h' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/i915_vma.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 2ec58953cbcd] Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git
+$ git diff -M --stat --summary HEAD^..
+ .../allwinner,sun4i-a10-display-engine.yaml | 1 +
+ .../bindings/display/allwinner,sun4i-a10-tcon.yaml | 2 +
+ .../display/allwinner,sun8i-a83t-de2-mixer.yaml | 2 +
+ .../display/allwinner,sun8i-r40-tcon-top.yaml | 133 +-
+ .../bindings/display/bridge/chipone,icn6211.yaml | 18 +-
+ .../bindings/display/bridge/fsl,ldb.yaml | 92 +
+ .../bindings/display/bridge/ite,it66121.yaml | 3 +
+ .../bindings/display/bridge/lontium,lt9211.yaml | 117 +
+ .../bindings/display/bridge/toshiba,tc358767.yaml | 22 +-
+ .../bindings/display/mediatek/mediatek,aal.yaml | 11 +-
+ .../bindings/display/mediatek/mediatek,ccorr.yaml | 5 +-
+ .../bindings/display/mediatek/mediatek,color.yaml | 7 +-
+ .../bindings/display/mediatek/mediatek,dither.yaml | 4 +-
+ .../bindings/display/mediatek/mediatek,dpi.yaml | 1 +
+ .../bindings/display/mediatek/mediatek,gamma.yaml | 4 +-
+ .../bindings/display/mediatek/mediatek,mutex.yaml | 25 +-
+ .../bindings/display/mediatek/mediatek,ovl-2l.yaml | 4 +
+ .../bindings/display/mediatek/mediatek,ovl.yaml | 8 +-
+ .../display/mediatek/mediatek,postmask.yaml | 4 +
+ .../bindings/display/mediatek/mediatek,rdma.yaml | 7 +-
+ .../bindings/display/msm/dpu-qcm2290.yaml | 4 +
+ .../bindings/display/msm/dpu-sc7180.yaml | 4 +
+ .../bindings/display/msm/dpu-sc7280.yaml | 4 +
+ .../bindings/display/msm/dpu-sdm845.yaml | 4 +
+ .../display/panel/leadtek,ltk035c5444t.yaml | 59 +
+ .../bindings/display/panel/panel-simple.yaml | 4 +
+ .../display/rockchip/rockchip,dw-hdmi.yaml | 46 +-
+ .../bindings/display/rockchip/rockchip-vop2.yaml | 146 +
+ .../bindings/display/sitronix,st7735r.yaml | 6 +-
+ .../bindings/display/solomon,ssd1307fb.yaml | 95 +-
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ Documentation/driver-api/vfio-mediated-device.rst | 27 +-
+ Documentation/gpu/amdgpu/amdgpu-glossary.rst | 13 +
+ Documentation/gpu/drm-kms-helpers.rst | 43 +-
+ Documentation/gpu/drm-mm.rst | 9 +
+ Documentation/gpu/drm-uapi.rst | 4 +-
+ Documentation/gpu/drm-usage-stats.rst | 112 +
+ Documentation/gpu/i915.rst | 42 +-
+ Documentation/gpu/index.rst | 1 +
+ Documentation/gpu/introduction.rst | 60 +
+ Documentation/gpu/todo.rst | 14 +
+ MAINTAINERS | 18 +-
+ arch/x86/Kconfig | 6 +
+ arch/x86/boot/video-vesa.c | 4 +-
+ arch/x86/kernel/early-quirks.c | 2 +
+ drivers/dma-buf/dma-buf.c | 26 +-
+ drivers/dma-buf/dma-resv.c | 459 +-
+ drivers/dma-buf/st-dma-resv.c | 157 +-
+ drivers/dma-buf/sync_file.c | 21 +-
+ drivers/firmware/Kconfig | 6 +-
+ drivers/gpu/drm/Kconfig | 41 +-
+ drivers/gpu/drm/Makefile | 29 +-
+ drivers/gpu/drm/amd/amdgpu/Makefile | 37 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 48 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 23 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c | 625 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 116 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 377 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 13 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 81 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 74 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_df.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 420 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 4 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 55 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 13 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 48 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 47 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 48 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 13 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 7 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 49 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 66 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_imu.h | 51 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 15 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 18 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 12 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_lsdma.c | 91 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_lsdma.h | 46 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 1227 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 252 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mes_ctx.h | 121 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 17 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 31 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 672 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 56 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c | 304 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.h | 29 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 147 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 5 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 97 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 193 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 22 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 45 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 24 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 26 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h | 2 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 90 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 10 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 259 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 74 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 45 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 38 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 24 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 32 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 1209 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 52 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 981 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 13 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 359 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h | 89 +
+ drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 99 +-
+ drivers/gpu/drm/amd/amdgpu/athub_v1_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/athub_v1_0.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/athub_v2_0.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/athub_v2_1.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/athub_v3_0.c | 98 +
+ drivers/gpu/drm/amd/amdgpu/athub_v3_0.h | 30 +
+ drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 21 -
+ drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/clearstate_gfx11.h | 988 +
+ drivers/gpu/drm/amd/amdgpu/df_v1_7.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 453 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 6440 +
+ drivers/gpu/drm/amd/amdgpu/gfx_v11_0.h | 29 +
+ drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 62 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 80 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 48 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 55 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 14 +
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.c | 511 +
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.h | 29 +
+ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 26 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 973 +
+ drivers/gpu/drm/amd/amdgpu/gmc_v11_0.h | 30 +
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/hdp_v5_2.c | 45 +
+ .../r600_blit_shaders.h => amd/amdgpu/hdp_v5_2.h} | 27 +-
+ drivers/gpu/drm/amd/amdgpu/hdp_v6_0.c | 142 +
+ drivers/gpu/drm/amd/amdgpu/hdp_v6_0.h | 31 +
+ drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 745 +
+ drivers/gpu/drm/amd/amdgpu/ih_v6_0.h | 28 +
+ drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 367 +
+ drivers/gpu/drm/amd/amdgpu/imu_v11_0.h | 30 +
+ drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 94 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.h | 7 +
+ drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 609 +
+ drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.h | 29 +
+ drivers/gpu/drm/amd/amdgpu/lsdma_v6_0.c | 121 +
+ drivers/gpu/drm/amd/amdgpu/lsdma_v6_0.h | 31 +
+ drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 630 +-
+ drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 1182 +
+ drivers/gpu/drm/amd/amdgpu/mes_v11_0.h | 29 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c | 661 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.h | 28 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_2.c | 571 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_2.h | 28 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c | 368 +
+ drivers/gpu/drm/amd/amdgpu/nbio_v4_3.h | 32 +
+ drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 240 +
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_7.h | 33 +
+ drivers/gpu/drm/amd/amdgpu/nv.c | 15 +-
+ drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 30 +
+ drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 114 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 26 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 34 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 179 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 290 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 1689 +
+ drivers/gpu/drm/amd/amdgpu/sdma_v6_0.h | 30 +
+ drivers/gpu/drm/amd/amdgpu/sdma_v6_0_0_pkt_open.h | 5664 +
+ drivers/gpu/drm/amd/amdgpu/si_dma.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/smuio_v11_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/smuio_v11_0_6.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/smuio_v13_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/smuio_v13_0_6.c | 41 +
+ drivers/gpu/drm/amd/amdgpu/smuio_v13_0_6.h | 30 +
+ drivers/gpu/drm/amd/amdgpu/smuio_v9_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 15 +-
+ drivers/gpu/drm/amd/amdgpu/soc15_common.h | 8 +
+ drivers/gpu/drm/amd/amdgpu/soc21.c | 721 +
+ drivers/gpu/drm/amd/amdgpu/soc21.h | 30 +
+ drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 106 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_sw_ring.c | 86 +
+ drivers/gpu/drm/amd/amdgpu/vcn_sw_ring.h | 44 +
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 15 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 95 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_5.h | 6 +
+ drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 96 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 1874 +
+ drivers/gpu/drm/amd/amdgpu/vcn_v4_0.h | 29 +
+ drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/vi.c | 2 +-
+ drivers/gpu/drm/amd/amdkfd/Makefile | 3 +
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 34 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 88 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 68 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 300 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 5 +
+ .../drm/amd/amdkfd/kfd_device_queue_manager_v11.c | 81 +
+ drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 56 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_events.c | 174 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_events.h | 3 +
+ drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 384 +
+ drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 84 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 11 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 15 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 10 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 508 +
+ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 27 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 42 +-
+ .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 21 +
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 103 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 1 +
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 93 +-
+ drivers/gpu/drm/amd/amdkfd/soc15_int.h | 3 +-
+ drivers/gpu/drm/amd/display/Kconfig | 1 +
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 101 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 8 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 43 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 2 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 4 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 6 +-
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 6 +-
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 3 -
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 13 +-
+ drivers/gpu/drm/amd/display/dc/Makefile | 2 -
+ .../drm/amd/display/dc/bios/bios_parser_common.c | 3 +
+ .../gpu/drm/amd/display/dc/bios/command_table.c | 3 +-
+ .../amd/display/dc/bios/command_table_helper2.c | 3 +-
+ .../amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c | 3 +-
+ .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 17 +-
+ .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 3 +
+ .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c | 2 +
+ .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 3 +-
+ .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 26 +-
+ .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 114 +-
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 54 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 2 -
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c | 220 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 6 -
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 220 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dpcd.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c | 2 -
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 114 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 12 -
+ drivers/gpu/drm/amd/display/dc/dc.h | 59 +-
+ drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 14 +-
+ drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 19 +-
+ drivers/gpu/drm/amd/display/dc/dc_link.h | 14 +-
+ drivers/gpu/drm/amd/display/dc/dc_stream.h | 3 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 2 -
+ .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 19 +-
+ .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 12 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 10 -
+ .../drm/amd/display/dc/dce/dce_stream_encoder.c | 21 +-
+ drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 2 +-
+ .../amd/display/dc/dce110/dce110_hw_sequencer.c | 27 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 2 +-
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 56 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 16 +
+ .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 1 +
+ .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 8 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 13 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h | 2 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 1 -
+ .../gpu/drm/amd/display/dc/dcn201/dcn201_hwseq.c | 2 -
+ .../display/dc/dcn30/dcn30_dio_stream_encoder.h | 4 +
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 6 +-
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h | 5 -
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h | 2 +-
+ .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 6 +-
+ .../drm/amd/display/dc/dcn302/dcn302_resource.c | 6 +-
+ drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 26 -
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c | 3 +-
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 6 +-
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c | 24 +-
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.h | 2 +
+ .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 395 +-
+ .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.h | 13 +-
+ drivers/gpu/drm/amd/display/dc/dcn315/Makefile | 26 -
+ .../drm/amd/display/dc/dcn315/dcn315_resource.c | 239 +-
+ .../drm/amd/display/dc/dcn315/dcn315_resource.h | 3 +
+ drivers/gpu/drm/amd/display/dc/dcn316/Makefile | 26 -
+ .../drm/amd/display/dc/dcn316/dcn316_resource.c | 238 +-
+ .../drm/amd/display/dc/dcn316/dcn316_resource.h | 3 +
+ drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 -
+ drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 +
+ .../gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c | 19 +-
+ .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 2 -
+ .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 784 +
+ .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h | 44 +
+ .../gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.h | 2 +-
+ drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 4 +-
+ drivers/gpu/drm/amd/display/dc/dsc/dscc_types.h | 2 +-
+ drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/gpio/Makefile | 3 +-
+ .../amd/display/dc/gpio/dcn30/hw_factory_dcn30.c | 2 -
+ .../amd/display/dc/gpio/dcn30/hw_factory_dcn30.h | 2 -
+ .../amd/display/dc/gpio/dcn30/hw_translate_dcn30.c | 2 -
+ .../amd/display/dc/gpio/dcn30/hw_translate_dcn30.h | 2 -
+ drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 4 -
+ drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 4 -
+ drivers/gpu/drm/amd/display/dc/inc/core_types.h | 17 +-
+ drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 3 +-
+ drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 2 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 1 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dsc.h | 1 +
+ .../drm/amd/display/dc/inc/hw/timing_generator.h | 2 +
+ drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 9 +-
+ drivers/gpu/drm/amd/display/dc/irq/Makefile | 3 +-
+ .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 3 -
+ .../amd/display/dc/irq/dcn30/irq_service_dcn30.h | 3 -
+ drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 5 -
+ .../gpu/drm/amd/display/dc/link/link_dp_trace.c | 20 +
+ .../gpu/drm/amd/display/dc/link/link_dp_trace.h | 5 +
+ .../gpu/drm/amd/display/dc/link/link_hwss_dio.c | 52 +
+ .../gpu/drm/amd/display/dc/link/link_hwss_dio.h | 1 +
+ .../gpu/drm/amd/display/dc/link/link_hwss_dpia.c | 28 +
+ .../gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.c | 27 +
+ .../drm/amd/display/dc/link/link_hwss_hpo_frl.c | 19 +
+ drivers/gpu/drm/amd/display/dc/os_types.h | 2 +-
+ .../drm/amd/display/dc/virtual/virtual_link_hwss.c | 5 +
+ .../drm/amd/display/dc/virtual/virtual_link_hwss.h | 1 +
+ drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 1 +
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 84 +-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 1 +
+ .../drm/amd/display/include/ddc_service_types.h | 2 +
+ drivers/gpu/drm/amd/display/include/dpcd_defs.h | 2 +-
+ .../gpu/drm/amd/display/include/grph_object_id.h | 1 +
+ .../drm/amd/display/include/link_service_types.h | 6 +
+ .../drm/amd/display/modules/freesync/freesync.c | 76 +-
+ drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 38 +-
+ drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 12 +-
+ .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 6 +-
+ .../gpu/drm/amd/display/modules/inc/mod_freesync.h | 12 +
+ drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 2 +-
+ .../drm/amd/display/modules/power/power_helpers.c | 38 +
+ .../drm/amd/display/modules/power/power_helpers.h | 1 +
+ drivers/gpu/drm/amd/include/amd_shared.h | 71 +-
+ .../include/asic_reg/athub/athub_3_0_0_offset.h | 259 +
+ .../include/asic_reg/athub/athub_3_0_0_sh_mask.h | 1246 +
+ .../amd/include/asic_reg/gc/gc_11_0_0_default.h | 6114 +
+ .../drm/amd/include/asic_reg/gc/gc_11_0_0_offset.h | 11670 ++
+ .../amd/include/asic_reg/gc/gc_11_0_0_sh_mask.h | 41635 +++++
+ .../amd/include/asic_reg/hdp/hdp_5_2_1_offset.h | 217 +
+ .../amd/include/asic_reg/hdp/hdp_5_2_1_sh_mask.h | 684 +
+ .../amd/include/asic_reg/hdp/hdp_6_0_0_offset.h | 209 +
+ .../amd/include/asic_reg/hdp/hdp_6_0_0_sh_mask.h | 646 +
+ .../include/asic_reg/lsdma/lsdma_6_0_0_offset.h | 391 +
+ .../include/asic_reg/lsdma/lsdma_6_0_0_sh_mask.h | 1439 +
+ .../include/asic_reg/mmhub/mmhub_3_0_0_offset.h | 1529 +
+ .../include/asic_reg/mmhub/mmhub_3_0_0_sh_mask.h | 7478 +
+ .../include/asic_reg/mmhub/mmhub_3_0_2_offset.h | 1425 +
+ .../include/asic_reg/mmhub/mmhub_3_0_2_sh_mask.h | 7228 +
+ .../drm/amd/include/asic_reg/mp/mp_13_0_0_offset.h | 461 +
+ .../amd/include/asic_reg/mp/mp_13_0_0_sh_mask.h | 682 +
+ .../drm/amd/include/asic_reg/mp/mp_13_0_2_offset.h | 48 +
+ .../amd/include/asic_reg/mp/mp_13_0_2_sh_mask.h | 72 +
+ .../amd/include/asic_reg/nbio/nbio_4_3_0_offset.h | 17379 ++
+ .../amd/include/asic_reg/nbio/nbio_4_3_0_sh_mask.h | 82049 ++++++++++
+ .../amd/include/asic_reg/nbio/nbio_7_7_0_offset.h | 29654 ++++
+ .../amd/include/asic_reg/nbio/nbio_7_7_0_sh_mask.h | 154403 ++++++++++++++++++
+ .../amd/include/asic_reg/oss/osssys_6_0_0_offset.h | 263 +
+ .../include/asic_reg/oss/osssys_6_0_0_sh_mask.h | 969 +
+ .../include/asic_reg/smuio/smuio_13_0_6_offset.h | 517 +
+ .../include/asic_reg/smuio/smuio_13_0_6_sh_mask.h | 1178 +
+ .../drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h | 13 +
+ .../drm/amd/include/asic_reg/vcn/vcn_2_5_sh_mask.h | 24 +
+ .../amd/include/asic_reg/vcn/vcn_4_0_0_offset.h | 1610 +
+ .../amd/include/asic_reg/vcn/vcn_4_0_0_sh_mask.h | 8055 +
+ drivers/gpu/drm/amd/include/atombios.h | 2 +-
+ drivers/gpu/drm/amd/include/atomfirmware.h | 204 +-
+ drivers/gpu/drm/amd/include/discovery.h | 116 +-
+ .../amd/include/ivsrcid/gfx/irqsrcs_gfx_11_0_0.h | 77 +
+ .../drm/amd/include/ivsrcid/vcn/irqsrcs_vcn_2_0.h | 4 +
+ .../drm/amd/include/ivsrcid/vcn/irqsrcs_vcn_4_0.h | 41 +
+ drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 1 +
+ drivers/gpu/drm/amd/include/kgd_pp_interface.h | 1 +
+ .../gpu/drm/amd/{amdgpu => include}/mes_api_def.h | 167 +-
+ drivers/gpu/drm/amd/include/mes_v11_api_def.h | 579 +
+ drivers/gpu/drm/amd/include/soc15_hw_ip.h | 1 +
+ drivers/gpu/drm/amd/include/soc15_ih_clientid.h | 27 +
+ drivers/gpu/drm/amd/include/soc21_enum.h | 22477 +++
+ drivers/gpu/drm/amd/include/v11_structs.h | 1189 +
+ drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2 +-
+ drivers/gpu/drm/amd/pm/amdgpu_pm.c | 237 +-
+ drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h | 2 +-
+ drivers/gpu/drm/amd/pm/inc/smu_v13_0_0_pptable.h | 203 +
+ drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c | 14 +-
+ drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 8 +-
+ drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 17 +
+ .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 147 +
+ drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 2 +
+ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 128 +-
+ drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 20 +-
+ .../inc/pmfw_if/smu11_driver_if_sienna_cichlid.h | 70 +-
+ .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h | 1544 +
+ .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_4.h | 267 +
+ .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_7.h | 1562 +
+ .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_0_ppsmc.h | 141 +
+ .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_4_pmfw.h | 137 +
+ .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_4_ppsmc.h | 138 +
+ .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_7_ppsmc.h | 134 +
+ drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 28 +-
+ drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 58 +-
+ .../gpu/drm/amd/pm/swsmu/inc/smu_v13_0_7_pptable.h | 200 +
+ .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 209 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 60 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile | 3 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 16 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.h | 8 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 697 +-
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 1648 +
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.h | 28 +
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 1044 +
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.h | 28 +
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 1597 +
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.h | 28 +
+ .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 62 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 32 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 2 +
+ drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 1 +
+ drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 23 +-
+ .../drm/arm/display/komeda/komeda_wb_connector.c | 4 +-
+ drivers/gpu/drm/arm/malidp_crtc.c | 5 +-
+ drivers/gpu/drm/arm/malidp_mw.c | 4 +-
+ drivers/gpu/drm/arm/malidp_planes.c | 16 +-
+ drivers/gpu/drm/ast/Makefile | 2 +-
+ drivers/gpu/drm/ast/ast_dp.c | 282 +
+ drivers/gpu/drm/ast/ast_drv.c | 7 +-
+ drivers/gpu/drm/ast/ast_drv.h | 116 +
+ drivers/gpu/drm/ast/ast_main.c | 9 +-
+ drivers/gpu/drm/ast/ast_mode.c | 172 +-
+ drivers/gpu/drm/ast/ast_post.c | 4 +-
+ drivers/gpu/drm/bridge/Kconfig | 39 +-
+ drivers/gpu/drm/bridge/Makefile | 2 +
+ drivers/gpu/drm/bridge/adv7511/adv7511.h | 27 +-
+ drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 116 +-
+ drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 26 +-
+ drivers/gpu/drm/bridge/analogix/Kconfig | 10 +-
+ drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 2 +-
+ drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 2 +-
+ .../gpu/drm/bridge/analogix/analogix-i2c-dptx.c | 2 +-
+ drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 38 +-
+ drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 2 +-
+ drivers/gpu/drm/bridge/analogix/anx7625.c | 66 +-
+ drivers/gpu/drm/bridge/analogix/anx7625.h | 4 +-
+ drivers/gpu/drm/bridge/cadence/Kconfig | 4 +-
+ .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 4 +-
+ .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
+ .../gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c | 2 +-
+ drivers/gpu/drm/bridge/chipone-icn6211.c | 596 +-
+ drivers/gpu/drm/bridge/display-connector.c | 15 +
+ drivers/gpu/drm/bridge/fsl-ldb.c | 342 +
+ drivers/gpu/drm/bridge/ite-it6505.c | 33 +-
+ drivers/gpu/drm/bridge/ite-it66121.c | 629 +-
+ drivers/gpu/drm/bridge/lontium-lt9211.c | 802 +
+ drivers/gpu/drm/bridge/lontium-lt9611.c | 49 +-
+ drivers/gpu/drm/bridge/nwl-dsi.c | 30 +-
+ drivers/gpu/drm/bridge/nxp-ptn3460.c | 7 +-
+ drivers/gpu/drm/bridge/panel.c | 6 +
+ drivers/gpu/drm/bridge/parade-ps8622.c | 7 +-
+ drivers/gpu/drm/bridge/parade-ps8640.c | 13 +-
+ drivers/gpu/drm/bridge/synopsys/Kconfig | 12 +
+ drivers/gpu/drm/bridge/synopsys/Makefile | 1 +
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c | 197 +
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 192 +-
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 16 +-
+ drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 51 +-
+ drivers/gpu/drm/bridge/tc358762.c | 10 +-
+ drivers/gpu/drm/bridge/tc358764.c | 104 +-
+ drivers/gpu/drm/bridge/tc358767.c | 589 +-
+ drivers/gpu/drm/bridge/tc358775.c | 13 +-
+ drivers/gpu/drm/bridge/ti-sn65dsi83.c | 17 +-
+ drivers/gpu/drm/bridge/ti-sn65dsi86.c | 12 +-
+ drivers/gpu/drm/bridge/ti-tfp410.c | 12 +-
+ drivers/gpu/drm/display/Kconfig | 51 +
+ drivers/gpu/drm/display/Makefile | 16 +
+ .../drm_display_helper_mod.c} | 10 +-
+ drivers/gpu/drm/{dp => display}/drm_dp_aux_bus.c | 4 +-
+ drivers/gpu/drm/{dp => display}/drm_dp_aux_dev.c | 4 +-
+ drivers/gpu/drm/{dp => display}/drm_dp_cec.c | 2 +-
+ .../drm/{dp => display}/drm_dp_dual_mode_helper.c | 2 +-
+ .../drm/{dp/drm_dp.c => display/drm_dp_helper.c} | 95 +-
+ .../drm/{dp => display}/drm_dp_helper_internal.h | 0
+ .../gpu/drm/{dp => display}/drm_dp_mst_topology.c | 7 +-
+ .../{dp => display}/drm_dp_mst_topology_internal.h | 2 +-
+ .../drm/{drm_dsc.c => display/drm_dsc_helper.c} | 5 +-
+ .../drm/{drm_hdcp.c => display/drm_hdcp_helper.c} | 4 +-
+ drivers/gpu/drm/display/drm_hdmi_helper.c | 199 +
+ drivers/gpu/drm/{ => display}/drm_scdc_helper.c | 3 +-
+ drivers/gpu/drm/dp/Makefile | 9 -
+ drivers/gpu/drm/drm_atomic.c | 20 +
+ drivers/gpu/drm/drm_atomic_uapi.c | 51 +-
+ drivers/gpu/drm/drm_blend.c | 2 +-
+ drivers/gpu/drm/drm_bridge_connector.c | 4 +-
+ drivers/gpu/drm/drm_buddy.c | 3 +
+ drivers/gpu/drm/drm_color_mgmt.c | 2 +-
+ drivers/gpu/drm/drm_connector.c | 34 -
+ drivers/gpu/drm/drm_crtc_helper.c | 12 +-
+ drivers/gpu/drm/drm_edid.c | 1101 +-
+ drivers/gpu/drm/drm_fb_helper.c | 15 +-
+ drivers/gpu/drm/drm_format_helper.c | 551 +-
+ drivers/gpu/drm/drm_gem.c | 83 +-
+ drivers/gpu/drm/drm_gem_atomic_helper.c | 77 +-
+ drivers/gpu/drm/drm_gem_vram_helper.c | 2 +-
+ drivers/gpu/drm/drm_managed.c | 27 +
+ drivers/gpu/drm/drm_mipi_dsi.c | 6 +-
+ drivers/gpu/drm/drm_modes.c | 29 +-
+ drivers/gpu/drm/drm_plane.c | 14 +-
+ drivers/gpu/drm/drm_vblank.c | 2 +-
+ drivers/gpu/drm/drm_writeback.c | 73 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem.c | 17 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem.h | 5 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 83 +-
+ drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 54 +-
+ drivers/gpu/drm/etnaviv/etnaviv_sched.c | 63 +-
+ drivers/gpu/drm/etnaviv/etnaviv_sched.h | 3 +-
+ drivers/gpu/drm/exynos/Kconfig | 3 +-
+ drivers/gpu/drm/exynos/exynos_drm_dsi.c | 245 +-
+ drivers/gpu/drm/exynos/exynos_drm_mic.c | 22 +
+ drivers/gpu/drm/gma500/cdv_device.c | 11 +-
+ drivers/gpu/drm/gma500/cdv_intel_crt.c | 6 +-
+ drivers/gpu/drm/gma500/cdv_intel_display.c | 9 +-
+ drivers/gpu/drm/gma500/cdv_intel_dp.c | 8 +-
+ drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 5 +-
+ drivers/gpu/drm/gma500/cdv_intel_lvds.c | 5 +-
+ drivers/gpu/drm/gma500/framebuffer.c | 10 +-
+ drivers/gpu/drm/gma500/gem.c | 161 +-
+ drivers/gpu/drm/gma500/gem.h | 13 +-
+ drivers/gpu/drm/gma500/gma_display.c | 53 +-
+ drivers/gpu/drm/gma500/gma_display.h | 10 +-
+ drivers/gpu/drm/gma500/gtt.c | 295 +-
+ drivers/gpu/drm/gma500/gtt.h | 8 +-
+ drivers/gpu/drm/gma500/intel_bios.c | 3 +-
+ drivers/gpu/drm/gma500/oaktrail_crtc.c | 25 +-
+ drivers/gpu/drm/gma500/oaktrail_device.c | 1 -
+ drivers/gpu/drm/gma500/oaktrail_hdmi.c | 1 -
+ drivers/gpu/drm/gma500/oaktrail_lvds.c | 16 +-
+ drivers/gpu/drm/gma500/opregion.c | 5 +-
+ drivers/gpu/drm/gma500/power.c | 15 +-
+ drivers/gpu/drm/gma500/psb_device.c | 29 +-
+ drivers/gpu/drm/gma500/psb_drv.c | 34 +-
+ drivers/gpu/drm/gma500/psb_drv.h | 90 +-
+ drivers/gpu/drm/gma500/psb_intel_display.c | 39 +-
+ drivers/gpu/drm/gma500/psb_intel_lvds.c | 5 +-
+ drivers/gpu/drm/gma500/psb_intel_sdvo.c | 6 +-
+ drivers/gpu/drm/gma500/psb_irq.c | 94 +-
+ drivers/gpu/drm/gma500/psb_irq.h | 19 +-
+ drivers/gpu/drm/i915/Kconfig | 44 +-
+ drivers/gpu/drm/i915/Makefile | 20 +-
+ drivers/gpu/drm/i915/display/g4x_dp.c | 76 +-
+ drivers/gpu/drm/i915/display/g4x_hdmi.c | 39 +-
+ drivers/gpu/drm/i915/display/i9xx_plane.c | 24 +-
+ drivers/gpu/drm/i915/display/icl_dsi.c | 25 +-
+ drivers/gpu/drm/i915/display/intel_atomic_plane.c | 143 +-
+ drivers/gpu/drm/i915/display/intel_atomic_plane.h | 3 +-
+ drivers/gpu/drm/i915/display/intel_audio.c | 45 +-
+ drivers/gpu/drm/i915/display/intel_backlight.c | 3 +-
+ drivers/gpu/drm/i915/display/intel_bios.c | 828 +-
+ drivers/gpu/drm/i915/display/intel_bw.c | 312 +-
+ drivers/gpu/drm/i915/display/intel_bw.h | 12 +-
+ drivers/gpu/drm/i915/display/intel_cdclk.c | 96 +-
+ drivers/gpu/drm/i915/display/intel_cdclk.h | 2 +
+ drivers/gpu/drm/i915/display/intel_color.c | 95 +-
+ drivers/gpu/drm/i915/display/intel_color.h | 3 +-
+ drivers/gpu/drm/i915/display/intel_combo_phy.c | 35 +-
+ drivers/gpu/drm/i915/display/intel_connector.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_crtc.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_cursor.c | 27 +-
+ drivers/gpu/drm/i915/display/intel_ddi.c | 40 +-
+ drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 44 +-
+ drivers/gpu/drm/i915/display/intel_display.c | 962 +-
+ drivers/gpu/drm/i915/display/intel_display.h | 7 +-
+ .../gpu/drm/i915/display/intel_display_debugfs.c | 302 +-
+ drivers/gpu/drm/i915/display/intel_display_power.c | 5662 +-
+ drivers/gpu/drm/i915/display/intel_display_power.h | 163 +-
+ .../gpu/drm/i915/display/intel_display_power_map.c | 1501 +
+ .../gpu/drm/i915/display/intel_display_power_map.h | 14 +
+ .../drm/i915/display/intel_display_power_well.c | 1912 +
+ .../drm/i915/display/intel_display_power_well.h | 173 +
+ drivers/gpu/drm/i915/display/intel_display_trace.h | 9 +-
+ drivers/gpu/drm/i915/display/intel_display_types.h | 49 +-
+ drivers/gpu/drm/i915/display/intel_dmc.c | 131 +-
+ drivers/gpu/drm/i915/display/intel_dmc.h | 10 +-
+ drivers/gpu/drm/i915/display/intel_dmc_regs.h | 30 +
+ drivers/gpu/drm/i915/display/intel_dp.c | 569 +-
+ drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 6 +-
+ .../gpu/drm/i915/display/intel_dp_link_training.c | 54 +-
+ .../gpu/drm/i915/display/intel_dp_link_training.h | 2 +-
+ drivers/gpu/drm/i915/display/intel_dp_mst.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_dpio_phy.c | 1 +
+ drivers/gpu/drm/i915/display/intel_dpll.c | 240 +-
+ drivers/gpu/drm/i915/display/intel_dpll.h | 6 +-
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 410 +-
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 9 +-
+ drivers/gpu/drm/i915/display/intel_dpt.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_drrs.c | 406 +-
+ drivers/gpu/drm/i915/display/intel_drrs.h | 20 +-
+ drivers/gpu/drm/i915/display/intel_dsb.c | 7 +-
+ drivers/gpu/drm/i915/display/intel_dsi.c | 24 +-
+ drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 40 +-
+ drivers/gpu/drm/i915/display/intel_dvo.c | 49 +-
+ drivers/gpu/drm/i915/display/intel_fb.c | 70 +-
+ drivers/gpu/drm/i915/display/intel_fb.h | 1 +
+ drivers/gpu/drm/i915/display/intel_fb_pin.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_fbc.c | 113 +-
+ drivers/gpu/drm/i915/display/intel_fbc.h | 2 +-
+ drivers/gpu/drm/i915/display/intel_fbdev.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_fdi.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_gmbus.c | 144 +-
+ drivers/gpu/drm/i915/display/intel_hdcp.c | 3 +-
+ drivers/gpu/drm/i915/display/intel_hdmi.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_lspcon.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_lvds.c | 57 +-
+ drivers/gpu/drm/i915/display/intel_overlay.c | 22 +-
+ drivers/gpu/drm/i915/display/intel_panel.c | 363 +-
+ drivers/gpu/drm/i915/display/intel_panel.h | 33 +-
+ drivers/gpu/drm/i915/display/intel_pch_display.c | 99 +-
+ drivers/gpu/drm/i915/display/intel_pch_display.h | 10 +
+ drivers/gpu/drm/i915/display/intel_plane_initial.c | 57 +-
+ drivers/gpu/drm/i915/display/intel_pps.c | 1 +
+ drivers/gpu/drm/i915/display/intel_psr.c | 186 +-
+ drivers/gpu/drm/i915/display/intel_psr.h | 5 +-
+ drivers/gpu/drm/i915/display/intel_qp_tables.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_sdvo.c | 89 +-
+ drivers/gpu/drm/i915/display/intel_snps_phy.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_sprite.c | 51 +-
+ drivers/gpu/drm/i915/display/intel_tc.c | 5 +-
+ drivers/gpu/drm/i915/display/intel_tv.c | 12 +-
+ drivers/gpu/drm/i915/display/intel_vbt_defs.h | 45 +-
+ drivers/gpu/drm/i915/display/intel_vdsc.c | 26 +-
+ drivers/gpu/drm/i915/display/intel_vrr.c | 4 +-
+ drivers/gpu/drm/i915/display/skl_scaler.c | 22 +-
+ drivers/gpu/drm/i915/display/skl_universal_plane.c | 266 +-
+ drivers/gpu/drm/i915/display/vlv_dsi.c | 15 +-
+ drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 8 +-
+ drivers/gpu/drm/i915/gem/i915_gem_busy.c | 10 +-
+ drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 6 +-
+ drivers/gpu/drm/i915/gem/i915_gem_context.c | 71 +-
+ drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 6 +
+ drivers/gpu/drm/i915/gem/i915_gem_create.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 15 +-
+ drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 27 +-
+ drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 8 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object.c | 46 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object.h | 8 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 2 +
+ drivers/gpu/drm/i915/gem/i915_gem_phys.c | 1 +
+ drivers/gpu/drm/i915/gem/i915_gem_region.c | 52 +-
+ drivers/gpu/drm/i915/gem/i915_gem_region.h | 7 +
+ drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 4 +-
+ drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 147 +-
+ drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 4 -
+ drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 8 +
+ drivers/gpu/drm/i915/gem/i915_gem_tiling.h | 2 +
+ drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 54 +-
+ drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 1 +
+ drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 26 +-
+ drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_wait.c | 6 +-
+ drivers/gpu/drm/i915/gem/i915_gemfs.c | 3 +-
+ drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 10 +-
+ .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 7 +-
+ .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 9 +-
+ .../gpu/drm/i915/gem/selftests/i915_gem_migrate.c | 18 +-
+ drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 5 +-
+ drivers/gpu/drm/i915/gem/selftests/mock_context.c | 5 +-
+ drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 2 +-
+ drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 167 +-
+ drivers/gpu/drm/i915/gt/gen8_engine_cs.h | 11 +-
+ drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 12 +-
+ drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 3 +-
+ drivers/gpu/drm/i915/gt/intel_context.c | 29 +-
+ drivers/gpu/drm/i915/gt/intel_context.h | 15 +-
+ drivers/gpu/drm/i915/gt/intel_context_types.h | 24 +-
+ drivers/gpu/drm/i915/gt/intel_engine.h | 13 +-
+ drivers/gpu/drm/i915/gt/intel_engine_cs.c | 51 +-
+ drivers/gpu/drm/i915/gt/intel_engine_regs.h | 3 +
+ drivers/gpu/drm/i915/gt/intel_engine_types.h | 13 +-
+ drivers/gpu/drm/i915/gt/intel_engine_user.c | 13 +-
+ .../gpu/drm/i915/gt/intel_execlists_submission.c | 71 +-
+ drivers/gpu/drm/i915/gt/intel_ggtt.c | 696 +-
+ drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 2 +
+ drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 31 +
+ drivers/gpu/drm/i915/gt/intel_gsc.c | 224 +
+ drivers/gpu/drm/i915/gt/intel_gsc.h | 37 +
+ drivers/gpu/drm/i915/gt/intel_gt.c | 224 +-
+ drivers/gpu/drm/i915/gt/intel_gt.h | 41 +-
+ drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c | 4 +
+ drivers/gpu/drm/i915/gt/intel_gt_debugfs.c | 20 +-
+ drivers/gpu/drm/i915/gt/intel_gt_debugfs.h | 2 +-
+ drivers/gpu/drm/i915/gt/intel_gt_gmch.c | 654 +
+ drivers/gpu/drm/i915/gt/intel_gt_gmch.h | 46 +
+ drivers/gpu/drm/i915/gt/intel_gt_irq.c | 13 +
+ drivers/gpu/drm/i915/gt/intel_gt_pm.c | 21 +-
+ drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 94 +-
+ drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.h | 4 +-
+ drivers/gpu/drm/i915/gt/intel_gt_regs.h | 23 +-
+ drivers/gpu/drm/i915/gt/intel_gt_sysfs.c | 122 +
+ drivers/gpu/drm/i915/gt/intel_gt_sysfs.h | 34 +
+ drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 602 +
+ drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.h | 15 +
+ drivers/gpu/drm/i915/gt/intel_gt_types.h | 18 +
+ drivers/gpu/drm/i915/gt/intel_gtt.c | 68 +-
+ drivers/gpu/drm/i915/gt/intel_gtt.h | 67 +-
+ drivers/gpu/drm/i915/gt/intel_hwconfig.h | 21 +
+ drivers/gpu/drm/i915/gt/intel_lrc.c | 114 +-
+ drivers/gpu/drm/i915/gt/intel_lrc.h | 32 +-
+ drivers/gpu/drm/i915/gt/intel_migrate.c | 385 +-
+ drivers/gpu/drm/i915/gt/intel_ppgtt.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_rc6.c | 13 +-
+ drivers/gpu/drm/i915/gt/intel_region_lmem.c | 10 +-
+ drivers/gpu/drm/i915/gt/intel_reset.c | 10 +-
+ drivers/gpu/drm/i915/gt/intel_ring_submission.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_rps.c | 139 +-
+ drivers/gpu/drm/i915/gt/intel_rps.h | 6 +-
+ drivers/gpu/drm/i915/gt/intel_rps_types.h | 15 +
+ drivers/gpu/drm/i915/gt/intel_sseu.c | 61 +-
+ drivers/gpu/drm/i915/gt/intel_sseu.h | 50 +-
+ drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c | 40 +-
+ drivers/gpu/drm/i915/gt/intel_workarounds.c | 21 +-
+ drivers/gpu/drm/i915/gt/selftest_execlists.c | 86 +-
+ drivers/gpu/drm/i915/gt/selftest_lrc.c | 63 +-
+ drivers/gpu/drm/i915/gt/selftest_migrate.c | 259 +-
+ drivers/gpu/drm/i915/gt/selftest_timeline.c | 3 +-
+ drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h | 16 +-
+ .../drm/i915/gt/uc/abi/guc_communication_ctb_abi.h | 2 +-
+ drivers/gpu/drm/i915/gt/uc/abi/guc_errors_abi.h | 4 +
+ drivers/gpu/drm/i915/gt/uc/abi/guc_klvs_abi.h | 15 +
+ drivers/gpu/drm/i915/gt/uc/abi/guc_messages_abi.h | 2 +-
+ drivers/gpu/drm/i915/gt/uc/guc_capture_fwif.h | 218 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc.c | 48 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc.h | 19 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 185 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c | 1657 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_capture.h | 33 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 5 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 92 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c | 164 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 130 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_log.h | 7 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c | 6 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 2 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 59 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 664 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc.c | 14 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c | 20 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 32 +-
+ drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 2 +-
+ drivers/gpu/drm/i915/gvt/Makefile | 30 +-
+ drivers/gpu/drm/i915/gvt/cfg_space.c | 89 +-
+ drivers/gpu/drm/i915/gvt/cmd_parser.c | 4 +-
+ drivers/gpu/drm/i915/gvt/dmabuf.c | 36 +-
+ drivers/gpu/drm/i915/gvt/execlist.c | 12 +-
+ drivers/gpu/drm/i915/gvt/firmware.c | 25 +-
+ drivers/gpu/drm/i915/gvt/gtt.c | 55 +-
+ drivers/gpu/drm/i915/gvt/gvt.c | 340 -
+ drivers/gpu/drm/i915/gvt/gvt.h | 128 +-
+ drivers/gpu/drm/i915/gvt/handlers.c | 1055 +-
+ drivers/gpu/drm/i915/gvt/hypercall.h | 82 -
+ drivers/gpu/drm/i915/gvt/interrupt.c | 40 +-
+ drivers/gpu/drm/i915/gvt/kvmgt.c | 1097 +-
+ drivers/gpu/drm/i915/gvt/mmio.c | 4 +-
+ drivers/gpu/drm/i915/gvt/mmio.h | 1 -
+ drivers/gpu/drm/i915/gvt/mpt.h | 400 -
+ drivers/gpu/drm/i915/gvt/opregion.c | 148 +-
+ drivers/gpu/drm/i915/gvt/page_track.c | 8 +-
+ drivers/gpu/drm/i915/gvt/reg.h | 9 +-
+ drivers/gpu/drm/i915/gvt/scheduler.c | 37 +-
+ drivers/gpu/drm/i915/gvt/trace.h | 2 +-
+ drivers/gpu/drm/i915/gvt/vgpu.c | 22 +-
+ drivers/gpu/drm/i915/i915_cmd_parser.c | 2 +
+ drivers/gpu/drm/i915/i915_debugfs.c | 30 +-
+ drivers/gpu/drm/i915/i915_deps.c | 2 +-
+ drivers/gpu/drm/i915/i915_driver.c | 49 +-
+ drivers/gpu/drm/i915/i915_driver.h | 4 +
+ drivers/gpu/drm/i915/i915_drm_client.c | 159 +
+ drivers/gpu/drm/i915/i915_drm_client.h | 68 +
+ drivers/gpu/drm/i915/i915_drv.h | 155 +-
+ drivers/gpu/drm/i915/i915_file_private.h | 3 +
+ drivers/gpu/drm/i915/i915_gem.c | 89 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 316 +-
+ drivers/gpu/drm/i915/i915_gpu_error.h | 43 +-
+ drivers/gpu/drm/i915/i915_params.c | 10 +-
+ drivers/gpu/drm/i915/i915_params.h | 1 +
+ drivers/gpu/drm/i915/i915_pci.c | 69 +-
+ drivers/gpu/drm/i915/i915_perf.c | 4 +-
+ drivers/gpu/drm/i915/i915_perf_types.h | 2 +-
+ drivers/gpu/drm/i915/i915_pmu.c | 5 +-
+ drivers/gpu/drm/i915/i915_query.c | 94 +-
+ drivers/gpu/drm/i915/i915_reg.h | 200 +-
+ drivers/gpu/drm/i915/i915_reg_defs.h | 2 -
+ drivers/gpu/drm/i915/i915_request.c | 3 +-
+ drivers/gpu/drm/i915/i915_suspend.c | 4 -
+ drivers/gpu/drm/i915/i915_sw_fence.c | 2 +-
+ drivers/gpu/drm/i915/i915_sysfs.c | 310 +-
+ drivers/gpu/drm/i915/i915_sysfs.h | 3 +
+ drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 4 +-
+ drivers/gpu/drm/i915/i915_utils.c | 11 +
+ drivers/gpu/drm/i915/i915_utils.h | 37 +-
+ drivers/gpu/drm/i915/i915_vma.c | 127 +-
+ drivers/gpu/drm/i915/i915_vma.h | 15 -
+ drivers/gpu/drm/i915/i915_vma_resource.c | 2 +-
+ drivers/gpu/drm/i915/i915_vma_resource.h | 6 +
+ drivers/gpu/drm/i915/i915_vma_types.h | 8 +-
+ drivers/gpu/drm/i915/intel_device_info.c | 42 +-
+ drivers/gpu/drm/i915/intel_device_info.h | 15 +-
+ drivers/gpu/drm/i915/intel_dram.c | 10 +-
+ drivers/gpu/drm/i915/intel_gvt.c | 252 +-
+ drivers/gpu/drm/i915/intel_gvt.h | 32 +-
+ drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 1292 +
+ drivers/gpu/drm/i915/intel_memory_region.c | 4 +-
+ drivers/gpu/drm/i915/intel_memory_region.h | 10 +-
+ drivers/gpu/drm/i915/intel_pch.c | 3 +-
+ drivers/gpu/drm/i915/intel_pcode.c | 4 +-
+ drivers/gpu/drm/i915/intel_pm.c | 545 +-
+ drivers/gpu/drm/i915/intel_pm.h | 1 +
+ drivers/gpu/drm/i915/intel_region_ttm.c | 7 +-
+ drivers/gpu/drm/i915/intel_region_ttm.h | 1 +
+ drivers/gpu/drm/i915/intel_step.c | 7 +
+ drivers/gpu/drm/i915/intel_uncore.c | 113 +-
+ drivers/gpu/drm/i915/intel_uncore.h | 7 +-
+ drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c | 4 +-
+ drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 2 -
+ drivers/gpu/drm/i915/selftests/i915_active.c | 3 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 18 +-
+ .../gpu/drm/i915/selftests/intel_memory_region.c | 10 +-
+ drivers/gpu/drm/i915/selftests/mock_gem_device.c | 13 +-
+ drivers/gpu/drm/i915/selftests/mock_region.c | 4 +
+ drivers/gpu/drm/i915/vlv_suspend.c | 3 +-
+ drivers/gpu/drm/imx/imx-ldb.c | 3 +-
+ drivers/gpu/drm/imx/imx-tve.c | 4 +-
+ drivers/gpu/drm/imx/ipuv3-plane.c | 8 +-
+ drivers/gpu/drm/ingenic/Kconfig | 9 +
+ drivers/gpu/drm/ingenic/Makefile | 1 +
+ drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 62 +-
+ drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c | 103 +
+ drivers/gpu/drm/lima/lima_gem.c | 17 +-
+ drivers/gpu/drm/mediatek/mtk_cec.c | 2 +-
+ drivers/gpu/drm/mediatek/mtk_disp_aal.c | 2 +-
+ drivers/gpu/drm/mediatek/mtk_disp_drv.h | 18 +-
+ drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 34 +-
+ drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 22 +-
+ drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 20 +-
+ drivers/gpu/drm/mediatek/mtk_dpi.c | 4 +-
+ drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 17 +-
+ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 4 +
+ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 29 +-
+ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 31 +
+ drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +-
+ drivers/gpu/drm/mediatek/mtk_dsi.c | 13 +-
+ drivers/gpu/drm/meson/meson_drv.c | 2 +-
+ drivers/gpu/drm/mgag200/mgag200_drv.c | 6 +
+ drivers/gpu/drm/mgag200/mgag200_drv.h | 1 +
+ drivers/gpu/drm/mgag200/mgag200_mode.c | 14 +
+ drivers/gpu/drm/msm/Kconfig | 54 +-
+ drivers/gpu/drm/msm/Makefile | 29 +-
+ drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 21 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 18 +-
+ drivers/gpu/drm/msm/adreno/adreno_gpu.c | 68 +-
+ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 4 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h | 32 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 12 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 592 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 32 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 97 +-
+ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 112 +-
+ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 79 +-
+ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 753 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h | 22 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 157 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 95 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 94 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 23 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c | 215 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h | 80 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 161 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h | 12 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 62 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 2 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 2 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 22 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 32 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h | 14 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 2 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 18 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c | 25 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 19 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c | 279 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.h | 115 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 245 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 13 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 260 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 170 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 2 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 78 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 13 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 93 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c | 78 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.h | 31 +
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c | 3 +
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 64 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c | 3 +
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 14 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 81 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_mdss.c | 252 -
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.c | 15 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.h | 4 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_pipe.c | 15 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_pipe.h | 2 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 22 +-
+ drivers/gpu/drm/msm/dp/dp_audio.c | 52 +-
+ drivers/gpu/drm/msm/dp/dp_aux.c | 21 +-
+ drivers/gpu/drm/msm/dp/dp_aux.h | 5 +-
+ drivers/gpu/drm/msm/dp/dp_catalog.c | 100 +-
+ drivers/gpu/drm/msm/dp/dp_catalog.h | 3 +
+ drivers/gpu/drm/msm/dp/dp_ctrl.c | 169 +-
+ drivers/gpu/drm/msm/dp/dp_ctrl.h | 2 +
+ drivers/gpu/drm/msm/dp/dp_debug.c | 2 -
+ drivers/gpu/drm/msm/dp/dp_display.c | 438 +-
+ drivers/gpu/drm/msm/dp/dp_display.h | 7 +-
+ drivers/gpu/drm/msm/dp/dp_drm.c | 215 +-
+ drivers/gpu/drm/msm/dp/dp_drm.h | 22 +-
+ drivers/gpu/drm/msm/dp/dp_link.c | 103 +-
+ drivers/gpu/drm/msm/dp/dp_panel.c | 49 +-
+ drivers/gpu/drm/msm/dp/dp_panel.h | 3 +-
+ drivers/gpu/drm/msm/dp/dp_parser.c | 25 +-
+ drivers/gpu/drm/msm/dp/dp_parser.h | 14 +-
+ drivers/gpu/drm/msm/dp/dp_power.c | 25 +-
+ drivers/gpu/drm/msm/dsi/dsi.c | 6 +-
+ drivers/gpu/drm/msm/dsi/dsi.h | 3 +
+ drivers/gpu/drm/msm/dsi/dsi.xml.h | 80 +
+ drivers/gpu/drm/msm/dsi/dsi_host.c | 300 +-
+ drivers/gpu/drm/msm/dsi/dsi_manager.c | 47 +-
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 2 +-
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 10 +-
+ drivers/gpu/drm/msm/edp/edp.h | 77 -
+ drivers/gpu/drm/msm/edp/edp_ctrl.c | 1373 -
+ drivers/gpu/drm/msm/hdmi/hdmi.c | 11 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 3 +
+ drivers/gpu/drm/msm/msm_drv.c | 301 +-
+ drivers/gpu/drm/msm/msm_drv.h | 162 +-
+ drivers/gpu/drm/msm/msm_fb.c | 20 +-
+ drivers/gpu/drm/msm/msm_fence.c | 6 +-
+ drivers/gpu/drm/msm/msm_fence.h | 3 +
+ drivers/gpu/drm/msm/msm_gem.c | 154 +-
+ drivers/gpu/drm/msm/msm_gem.h | 53 +-
+ drivers/gpu/drm/msm/msm_gem_prime.c | 2 +-
+ drivers/gpu/drm/msm/msm_gem_submit.c | 61 +-
+ drivers/gpu/drm/msm/msm_gem_vma.c | 61 +-
+ drivers/gpu/drm/msm/msm_gpu.c | 51 +-
+ drivers/gpu/drm/msm/msm_gpu.h | 25 +-
+ drivers/gpu/drm/msm/msm_gpu_devfreq.c | 97 +-
+ drivers/gpu/drm/msm/msm_kms.h | 22 +-
+ drivers/gpu/drm/msm/msm_mdss.c | 415 +
+ drivers/gpu/drm/msm/msm_rd.c | 5 +-
+ drivers/gpu/drm/msm/msm_ringbuffer.c | 15 +-
+ drivers/gpu/drm/msm/msm_ringbuffer.h | 1 -
+ drivers/gpu/drm/msm/msm_submitqueue.c | 2 +
+ drivers/gpu/drm/mxsfb/mxsfb_drv.c | 14 +-
+ drivers/gpu/drm/mxsfb/mxsfb_drv.h | 3 +
+ drivers/gpu/drm/mxsfb/mxsfb_kms.c | 231 +-
+ drivers/gpu/drm/mxsfb/mxsfb_regs.h | 1 +
+ drivers/gpu/drm/nouveau/Kconfig | 4 +-
+ drivers/gpu/drm/nouveau/dispnv50/atom.h | 6 +-
+ drivers/gpu/drm/nouveau/dispnv50/base917c.c | 2 +-
+ drivers/gpu/drm/nouveau/dispnv50/crc.c | 27 +-
+ drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +-
+ drivers/gpu/drm/nouveau/dispnv50/wndw.c | 14 +-
+ drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h | 2 +
+ drivers/gpu/drm/nouveau/nouveau_bo.c | 18 +-
+ drivers/gpu/drm/nouveau/nouveau_connector.h | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_debugfs.c | 12 +-
+ drivers/gpu/drm/nouveau/nouveau_dp.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_encoder.h | 6 +-
+ drivers/gpu/drm/nouveau/nouveau_fence.c | 21 +-
+ drivers/gpu/drm/nouveau/nouveau_gem.c | 3 +-
+ drivers/gpu/drm/nouveau/nouveau_prime.c | 17 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 2 +-
+ .../gpu/drm/nouveau/nvkm/engine/disp/coregv100.c | 4 +-
+ .../gpu/drm/nouveau/nvkm/engine/disp/wimmgv100.c | 2 +-
+ .../gpu/drm/nouveau/nvkm/engine/disp/wndwgv100.c | 4 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/gf108.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/bus/gf100.c | 14 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv31.c | 6 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv50.c | 6 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c | 6 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c | 3 +-
+ .../gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c | 3 +-
+ .../gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c | 3 +-
+ .../gpu/drm/nouveau/nvkm/subdev/devinit/gt215.c | 3 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/gsp/gv100.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 2 +-
+ drivers/gpu/drm/omapdrm/omap_gem.c | 198 +-
+ drivers/gpu/drm/omapdrm/omap_gem.h | 3 +-
+ drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 5 +-
+ drivers/gpu/drm/omapdrm/omap_overlay.c | 2 +-
+ drivers/gpu/drm/panel/Kconfig | 12 +-
+ drivers/gpu/drm/panel/Makefile | 1 +
+ drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 30 +-
+ drivers/gpu/drm/panel/panel-edp.c | 6 +-
+ drivers/gpu/drm/panel/panel-innolux-ej030na.c | 31 +-
+ drivers/gpu/drm/panel/panel-lvds.c | 37 +-
+ drivers/gpu/drm/panel/panel-newvision-nv3052c.c | 482 +
+ drivers/gpu/drm/panel/panel-samsung-atna33xc20.c | 4 +-
+ drivers/gpu/drm/panel/panel-simple.c | 69 +-
+ drivers/gpu/drm/panel/panel-truly-nt35597.c | 3 +-
+ drivers/gpu/drm/panel/panel-visionox-rm69299.c | 4 +-
+ drivers/gpu/drm/panfrost/panfrost_drv.c | 3 +-
+ drivers/gpu/drm/panfrost/panfrost_job.c | 6 +-
+ drivers/gpu/drm/qxl/qxl_debugfs.c | 3 +-
+ drivers/gpu/drm/qxl/qxl_display.c | 8 +-
+ drivers/gpu/drm/qxl/qxl_kms.c | 4 +-
+ drivers/gpu/drm/qxl/qxl_release.c | 5 +-
+ drivers/gpu/drm/qxl/qxl_ttm.c | 45 +-
+ drivers/gpu/drm/radeon/Makefile | 8 +-
+ drivers/gpu/drm/radeon/atombios.h | 10 +-
+ drivers/gpu/drm/radeon/atombios_dp.c | 2 +-
+ drivers/gpu/drm/radeon/cayman_blit_shaders.c | 320 -
+ drivers/gpu/drm/radeon/cayman_blit_shaders.h | 294 +-
+ drivers/gpu/drm/radeon/cik_blit_shaders.c | 246 -
+ drivers/gpu/drm/radeon/cik_blit_shaders.h | 219 +-
+ drivers/gpu/drm/radeon/evergreen_blit_shaders.c | 303 -
+ drivers/gpu/drm/radeon/evergreen_blit_shaders.h | 278 +-
+ drivers/gpu/drm/radeon/r600_blit_shaders.c | 719 -
+ drivers/gpu/drm/radeon/radeon_connectors.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_cs.c | 4 +
+ drivers/gpu/drm/radeon/radeon_display.c | 8 +-
+ drivers/gpu/drm/radeon/radeon_dp_mst.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_gem.c | 9 +-
+ drivers/gpu/drm/radeon/radeon_mn.c | 4 +-
+ drivers/gpu/drm/radeon/radeon_mode.h | 4 +-
+ drivers/gpu/drm/radeon/radeon_object.c | 21 +-
+ drivers/gpu/drm/radeon/radeon_pm.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_prime.c | 16 +-
+ drivers/gpu/drm/radeon/radeon_sync.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_ttm.c | 36 +-
+ drivers/gpu/drm/radeon/radeon_uvd.c | 12 +-
+ drivers/gpu/drm/radeon/radeon_vm.c | 2 +-
+ drivers/gpu/drm/radeon/si_blit_shaders.c | 253 -
+ drivers/gpu/drm/radeon/si_blit_shaders.h | 223 +-
+ drivers/gpu/drm/radeon/si_dpm.c | 4 +-
+ drivers/gpu/drm/rcar-du/rcar_du_writeback.c | 4 +-
+ drivers/gpu/drm/rockchip/Kconfig | 18 +-
+ drivers/gpu/drm/rockchip/Makefile | 4 +-
+ drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 34 +-
+ drivers/gpu/drm/rockchip/cdn-dp-core.c | 22 +-
+ drivers/gpu/drm/rockchip/cdn-dp-core.h | 4 +-
+ drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 17 +-
+ drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 108 +-
+ drivers/gpu/drm/rockchip/inno_hdmi.c | 40 +-
+ drivers/gpu/drm/rockchip/rk3066_hdmi.c | 40 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 96 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 23 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 2 +
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 24 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 15 +
+ drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 2706 +
+ drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 477 +
+ drivers/gpu/drm/rockchip/rockchip_lvds.c | 28 +-
+ drivers/gpu/drm/rockchip/rockchip_rgb.c | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 281 +
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 11 +
+ drivers/gpu/drm/scheduler/gpu_scheduler_trace.h | 43 +-
+ drivers/gpu/drm/scheduler/sched_main.c | 5 +-
+ drivers/gpu/drm/selftests/test-drm_buddy.c | 10 +-
+ drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c | 4 +-
+ drivers/gpu/drm/solomon/Kconfig | 20 +-
+ drivers/gpu/drm/solomon/Makefile | 1 +
+ drivers/gpu/drm/solomon/ssd130x-i2c.c | 60 +-
+ drivers/gpu/drm/solomon/ssd130x-spi.c | 178 +
+ drivers/gpu/drm/solomon/ssd130x.c | 154 +-
+ drivers/gpu/drm/solomon/ssd130x.h | 18 +-
+ drivers/gpu/drm/sti/sti_gdp.c | 2 +-
+ drivers/gpu/drm/sti/sti_hdmi.c | 22 +-
+ drivers/gpu/drm/stm/ltdc.c | 16 +-
+ drivers/gpu/drm/sun4i/Kconfig | 2 +-
+ drivers/gpu/drm/sun4i/sun4i_backend.c | 40 +-
+ drivers/gpu/drm/sun4i/sun4i_crtc.c | 1 +
+ drivers/gpu/drm/sun4i/sun4i_drv.c | 1 +
+ drivers/gpu/drm/sun4i/sun4i_hdmi.h | 1 -
+ drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 6 +-
+ drivers/gpu/drm/sun4i/sun4i_hdmi_i2c.c | 4 +-
+ drivers/gpu/drm/sun4i/sun4i_tcon.c | 8 +
+ drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 7 +-
+ drivers/gpu/drm/sun4i/sun8i_csc.c | 7 +-
+ drivers/gpu/drm/sun4i/sun8i_csc.h | 1 +
+ drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 2 +-
+ drivers/gpu/drm/sun4i/sun8i_mixer.c | 74 +-
+ drivers/gpu/drm/sun4i/sun8i_mixer.h | 14 +-
+ drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 15 +-
+ drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 30 -
+ drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 6 +-
+ drivers/gpu/drm/sun4i/sunxi_engine.h | 27 +
+ drivers/gpu/drm/tegra/Kconfig | 4 +-
+ drivers/gpu/drm/tegra/dp.c | 2 +-
+ drivers/gpu/drm/tegra/dpaux.c | 4 +-
+ drivers/gpu/drm/tegra/gem.c | 1 +
+ drivers/gpu/drm/tegra/sor.c | 4 +-
+ drivers/gpu/drm/tegra/vic.c | 5 +-
+ drivers/gpu/drm/tidss/tidss_dispc.c | 18 +
+ drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 4 +-
+ drivers/gpu/drm/tilcdc/tilcdc_external.c | 8 +-
+ drivers/gpu/drm/tiny/repaper.c | 2 +-
+ drivers/gpu/drm/tiny/simpledrm.c | 1 -
+ drivers/gpu/drm/ttm/ttm_agp_backend.c | 2 +-
+ drivers/gpu/drm/ttm/ttm_bo.c | 262 +-
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 40 +-
+ drivers/gpu/drm/ttm/ttm_bo_vm.c | 34 +-
+ drivers/gpu/drm/ttm/ttm_device.c | 82 +-
+ drivers/gpu/drm/ttm/ttm_execbuf_util.c | 21 +-
+ drivers/gpu/drm/ttm/ttm_resource.c | 231 +-
+ drivers/gpu/drm/ttm/ttm_tt.c | 28 +-
+ drivers/gpu/drm/v3d/v3d_gem.c | 19 +-
+ drivers/gpu/drm/v3d/v3d_perfmon.c | 3 +-
+ drivers/gpu/drm/vc4/Kconfig | 2 +
+ drivers/gpu/drm/vc4/vc4_bo.c | 8 +-
+ drivers/gpu/drm/vc4/vc4_crtc.c | 14 +-
+ drivers/gpu/drm/vc4/vc4_drv.h | 15 +-
+ drivers/gpu/drm/vc4/vc4_gem.c | 15 +-
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 487 +-
+ drivers/gpu/drm/vc4/vc4_hdmi.h | 40 +-
+ drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 2 +-
+ drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 6 +
+ drivers/gpu/drm/vc4/vc4_hvs.c | 153 +-
+ drivers/gpu/drm/vc4/vc4_irq.c | 5 +
+ drivers/gpu/drm/vc4/vc4_kms.c | 87 +-
+ drivers/gpu/drm/vc4/vc4_plane.c | 7 +-
+ drivers/gpu/drm/vc4/vc4_regs.h | 28 +-
+ drivers/gpu/drm/vc4/vc4_trace.h | 95 +
+ drivers/gpu/drm/vc4/vc4_txp.c | 11 +-
+ drivers/gpu/drm/vgem/vgem_fence.c | 13 +-
+ drivers/gpu/drm/virtio/virtgpu_display.c | 2 +
+ drivers/gpu/drm/virtio/virtgpu_gem.c | 12 +-
+ drivers/gpu/drm/virtio/virtgpu_ioctl.c | 8 +-
+ drivers/gpu/drm/vkms/vkms_writeback.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 23 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 4 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 38 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 15 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 10 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 27 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 55 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 437 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 29 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 36 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 18 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 17 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 27 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 +-
+ drivers/gpu/drm/xlnx/Kconfig | 3 +-
+ drivers/gpu/drm/xlnx/zynqmp_dp.c | 2 +-
+ drivers/gpu/host1x/debug.c | 11 +-
+ drivers/gpu/host1x/job.c | 4 +-
+ drivers/gpu/ipu-v3/ipu-dc.c | 5 +-
+ drivers/gpu/ipu-v3/ipu-image-convert.c | 9 +-
+ drivers/hid/hid-picolcd_fb.c | 3 +-
+ drivers/infiniband/core/umem_dmabuf.c | 9 +-
+ drivers/iommu/intel/iommu.c | 2 +-
+ drivers/misc/mei/Kconfig | 14 +
+ drivers/misc/mei/Makefile | 3 +
+ drivers/misc/mei/bus-fixup.c | 25 +
+ drivers/misc/mei/gsc-me.c | 259 +
+ drivers/misc/mei/hdcp/mei_hdcp.h | 2 +-
+ drivers/misc/mei/hw-me.c | 29 +-
+ drivers/misc/mei/hw-me.h | 2 +
+ drivers/of/platform.c | 83 +-
+ drivers/s390/cio/vfio_ccw_ops.c | 7 +-
+ drivers/s390/crypto/vfio_ap_ops.c | 9 +-
+ drivers/staging/fbtft/fbtft-core.c | 21 +-
+ drivers/vfio/mdev/Makefile | 2 +-
+ drivers/vfio/mdev/mdev_core.c | 52 +-
+ drivers/vfio/mdev/mdev_driver.c | 10 -
+ drivers/vfio/mdev/mdev_private.h | 6 +-
+ drivers/vfio/mdev/mdev_sysfs.c | 37 +-
+ drivers/vfio/mdev/vfio_mdev.c | 152 -
+ drivers/video/fbdev/Kconfig | 14 +-
+ drivers/video/fbdev/broadsheetfb.c | 27 +-
+ drivers/video/fbdev/core/fb_defio.c | 209 +-
+ drivers/video/fbdev/core/fbcon.c | 708 +-
+ drivers/video/fbdev/core/fbcon.h | 8 +-
+ drivers/video/fbdev/core/fbmem.c | 106 +-
+ drivers/video/fbdev/core/fbsysfs.c | 2 +
+ drivers/video/fbdev/hecubafb.c | 4 +-
+ drivers/video/fbdev/hyperv_fb.c | 10 +-
+ drivers/video/fbdev/metronomefb.c | 23 +-
+ drivers/video/fbdev/offb.c | 98 +-
+ drivers/video/fbdev/sh_mobile_lcdcfb.c | 27 +-
+ drivers/video/fbdev/smscufx.c | 13 +-
+ drivers/video/fbdev/ssd1307fb.c | 4 +-
+ drivers/video/fbdev/udlfb.c | 18 +-
+ drivers/video/fbdev/xen-fbfront.c | 10 +-
+ include/drm/bridge/dw_hdmi.h | 11 +-
+ .../drm/{dp/drm_dp_helper.h => display/drm_dp.h} | 697 +-
+ include/drm/{dp => display}/drm_dp_aux_bus.h | 0
+ .../drm/{dp => display}/drm_dp_dual_mode_helper.h | 0
+ include/drm/display/drm_dp_helper.h | 722 +
+ include/drm/{dp => display}/drm_dp_mst_helper.h | 2 +-
+ include/drm/{ => display}/drm_dsc.h | 8 +-
+ include/drm/display/drm_dsc_helper.h | 20 +
+ include/drm/{ => display}/drm_hdcp.h | 14 +-
+ include/drm/display/drm_hdcp_helper.h | 22 +
+ include/drm/display/drm_hdmi_helper.h | 27 +
+ .../drm/{drm_scdc_helper.h => display/drm_scdc.h} | 52 +-
+ include/drm/display/drm_scdc_helper.h | 79 +
+ include/drm/drm_atomic.h | 27 +-
+ include/drm/drm_atomic_uapi.h | 2 -
+ include/drm/drm_connector.h | 3 -
+ include/drm/drm_edid.h | 24 +-
+ include/drm/drm_fb_helper.h | 3 +-
+ include/drm/drm_file.h | 2 +-
+ include/drm/drm_format_helper.h | 5 +-
+ include/drm/drm_gem.h | 5 -
+ include/drm/drm_managed.h | 3 +
+ include/drm/drm_mipi_dsi.h | 2 +
+ include/drm/drm_modes.h | 2 +
+ include/drm/drm_modeset_helper_vtables.h | 2 +-
+ include/drm/drm_panel.h | 7 +
+ include/drm/drm_plane.h | 4 +-
+ include/drm/drm_writeback.h | 11 +-
+ include/drm/gpu_scheduler.h | 1 +
+ include/drm/i915_drm.h | 3 +-
+ include/drm/i915_mei_hdcp_interface.h | 2 +-
+ include/drm/i915_pciids.h | 35 +-
+ include/drm/ttm/ttm_bo_api.h | 64 +-
+ include/drm/ttm/ttm_bo_driver.h | 40 +-
+ include/drm/ttm/ttm_device.h | 11 -
+ include/drm/ttm/ttm_resource.h | 77 +
+ include/drm/ttm/ttm_tt.h | 4 +-
+ include/dt-bindings/soc/rockchip,vop2.h | 14 +
+ include/linux/dma-buf.h | 26 +-
+ include/linux/dma-resv.h | 233 +-
+ include/linux/efi.h | 4 -
+ include/linux/fb.h | 19 +-
+ include/linux/host1x.h | 6 +
+ include/linux/mdev.h | 82 +-
+ include/linux/mei_aux.h | 19 +
+ include/linux/seqlock.h | 8 +-
+ include/uapi/drm/amdgpu_drm.h | 2 +
+ include/uapi/drm/drm_fourcc.h | 69 +
+ include/uapi/drm/i915_drm.h | 353 +-
+ include/uapi/drm/msm_drm.h | 7 +
+ include/uapi/drm/vmwgfx_drm.h | 9 +-
+ kernel/futex/futex.h | 1 +
+ samples/vfio-mdev/mbochs.c | 9 +-
+ samples/vfio-mdev/mdpy.c | 9 +-
+ samples/vfio-mdev/mtty.c | 39 +-
+ 1297 files changed, 495682 insertions(+), 31991 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/fsl,ldb.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/lontium,lt9211.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/panel/leadtek,ltk035c5444t.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml
+ create mode 100644 Documentation/gpu/drm-usage-stats.rst
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_imu.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_lsdma.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_lsdma.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_mes_ctx.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/athub_v3_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/athub_v3_0.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/clearstate_gfx11.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v11_0.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v11_0.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/hdp_v5_2.c
+ rename drivers/gpu/drm/{radeon/r600_blit_shaders.h => amd/amdgpu/hdp_v5_2.h} (56%)
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/hdp_v6_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/hdp_v6_0.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/ih_v6_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/ih_v6_0.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/imu_v11_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/imu_v11_0.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/lsdma_v6_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/lsdma_v6_0.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/mes_v11_0.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_2.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_2.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v4_3.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_7.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v6_0.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v6_0_0_pkt_open.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v13_0_6.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v13_0_6.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/soc21.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/soc21.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_sw_ring.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_sw_ring.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v4_0.h
+ create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v11.c
+ create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c
+ create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/athub/athub_3_0_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/athub/athub_3_0_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_0_0_default.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_0_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_0_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_5_2_1_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_5_2_1_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_6_0_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_6_0_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/lsdma/lsdma_6_0_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/lsdma/lsdma_6_0_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_0_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_0_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_0_2_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_0_2_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_4_3_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_4_3_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_7_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_7_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_6_0_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_6_0_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_13_0_6_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_13_0_6_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_4_0_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_4_0_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/gfx/irqsrcs_gfx_11_0_0.h
+ create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/vcn/irqsrcs_vcn_4_0.h
+ rename drivers/gpu/drm/amd/{amdgpu => include}/mes_api_def.h (68%)
+ create mode 100644 drivers/gpu/drm/amd/include/mes_v11_api_def.h
+ create mode 100644 drivers/gpu/drm/amd/include/soc21_enum.h
+ create mode 100644 drivers/gpu/drm/amd/include/v11_structs.h
+ create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v13_0_0_pptable.h
+ create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h
+ create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_4.h
+ create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_7.h
+ create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_0_ppsmc.h
+ create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_4_pmfw.h
+ create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_4_ppsmc.h
+ create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_7_ppsmc.h
+ create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0_7_pptable.h
+ create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
+ create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.h
+ create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c
+ create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.h
+ create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
+ create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.h
+ create mode 100644 drivers/gpu/drm/ast/ast_dp.c
+ create mode 100644 drivers/gpu/drm/bridge/fsl-ldb.c
+ create mode 100644 drivers/gpu/drm/bridge/lontium-lt9211.c
+ create mode 100644 drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c
+ create mode 100644 drivers/gpu/drm/display/Kconfig
+ create mode 100644 drivers/gpu/drm/display/Makefile
+ rename drivers/gpu/drm/{dp/drm_dp_helper_mod.c => display/drm_display_helper_mod.c} (51%)
+ rename drivers/gpu/drm/{dp => display}/drm_dp_aux_bus.c (99%)
+ rename drivers/gpu/drm/{dp => display}/drm_dp_aux_dev.c (99%)
+ rename drivers/gpu/drm/{dp => display}/drm_dp_cec.c (99%)
+ rename drivers/gpu/drm/{dp => display}/drm_dp_dual_mode_helper.c (99%)
+ rename drivers/gpu/drm/{dp/drm_dp.c => display/drm_dp_helper.c} (98%)
+ rename drivers/gpu/drm/{dp => display}/drm_dp_helper_internal.h (100%)
+ rename drivers/gpu/drm/{dp => display}/drm_dp_mst_topology.c (99%)
+ rename drivers/gpu/drm/{dp => display}/drm_dp_mst_topology_internal.h (94%)
+ rename drivers/gpu/drm/{drm_dsc.c => display/drm_dsc_helper.c} (99%)
+ rename drivers/gpu/drm/{drm_hdcp.c => display/drm_hdcp_helper.c} (99%)
+ create mode 100644 drivers/gpu/drm/display/drm_hdmi_helper.c
+ rename drivers/gpu/drm/{ => display}/drm_scdc_helper.c (99%)
+ delete mode 100644 drivers/gpu/drm/dp/Makefile
+ create mode 100644 drivers/gpu/drm/i915/display/intel_display_power_map.c
+ create mode 100644 drivers/gpu/drm/i915/display/intel_display_power_map.h
+ create mode 100644 drivers/gpu/drm/i915/display/intel_display_power_well.c
+ create mode 100644 drivers/gpu/drm/i915/display/intel_display_power_well.h
+ create mode 100644 drivers/gpu/drm/i915/display/intel_dmc_regs.h
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_gsc.c
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_gsc.h
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_gmch.c
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_gmch.h
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_sysfs.c
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_sysfs.h
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.h
+ create mode 100644 drivers/gpu/drm/i915/gt/intel_hwconfig.h
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/guc_capture_fwif.h
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_capture.h
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c
+ delete mode 100644 drivers/gpu/drm/i915/gvt/gvt.c
+ delete mode 100644 drivers/gpu/drm/i915/gvt/hypercall.h
+ delete mode 100644 drivers/gpu/drm/i915/gvt/mpt.h
+ create mode 100644 drivers/gpu/drm/i915/i915_drm_client.c
+ create mode 100644 drivers/gpu/drm/i915/i915_drm_client.h
+ create mode 100644 drivers/gpu/drm/i915/intel_gvt_mmio_table.c
+ create mode 100644 drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
+ create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c
+ create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c
+ create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h
+ create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
+ create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.h
+ delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c
+ create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c
+ create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.h
+ delete mode 100644 drivers/gpu/drm/msm/disp/mdp5/mdp5_mdss.c
+ delete mode 100644 drivers/gpu/drm/msm/edp/edp.h
+ delete mode 100644 drivers/gpu/drm/msm/edp/edp_ctrl.c
+ create mode 100644 drivers/gpu/drm/msm/msm_mdss.c
+ create mode 100644 drivers/gpu/drm/panel/panel-newvision-nv3052c.c
+ delete mode 100644 drivers/gpu/drm/radeon/cayman_blit_shaders.c
+ delete mode 100644 drivers/gpu/drm/radeon/cik_blit_shaders.c
+ delete mode 100644 drivers/gpu/drm/radeon/evergreen_blit_shaders.c
+ delete mode 100644 drivers/gpu/drm/radeon/r600_blit_shaders.c
+ delete mode 100644 drivers/gpu/drm/radeon/si_blit_shaders.c
+ create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
+ create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_vop2.h
+ create mode 100644 drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
+ create mode 100644 drivers/gpu/drm/solomon/ssd130x-spi.c
+ create mode 100644 drivers/misc/mei/gsc-me.c
+ delete mode 100644 drivers/vfio/mdev/vfio_mdev.c
+ rename include/drm/{dp/drm_dp_helper.h => display/drm_dp.h} (74%)
+ rename include/drm/{dp => display}/drm_dp_aux_bus.h (100%)
+ rename include/drm/{dp => display}/drm_dp_dual_mode_helper.h (100%)
+ create mode 100644 include/drm/display/drm_dp_helper.h
+ rename include/drm/{dp => display}/drm_dp_mst_helper.h (99%)
+ rename include/drm/{ => display}/drm_dsc.h (97%)
+ create mode 100644 include/drm/display/drm_dsc_helper.h
+ rename include/drm/{ => display}/drm_hdcp.h (95%)
+ create mode 100644 include/drm/display/drm_hdcp_helper.h
+ create mode 100644 include/drm/display/drm_hdmi_helper.h
+ rename include/drm/{drm_scdc_helper.h => display/drm_scdc.h} (65%)
+ create mode 100644 include/drm/display/drm_scdc_helper.h
+ create mode 100644 include/dt-bindings/soc/rockchip,vop2.h
+ create mode 100644 include/linux/mei_aux.h
+$ git am -3 ../patches/0001-fi-up-for-drm-i915-dmc-Add-MMIO-range-restrictions.patch
+Applying: fi up for "drm/i915/dmc: Add MMIO range restrictions"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/gpu/drm/i915/display/intel_dmc_regs.h
+$ git add -A .
+$ git commit -v -a --amend
+[master fad0c86c02a6] Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git
+ Date: Thu May 26 11:34:27 2022 +1000
+Merging drm-misc/for-linux-next (5ee8c8f930ba drm/rockchip: Change register space names in vop2)
+$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next
+Already up to date.
+Merging amdgpu/drm-next (62ba2ab31f67 drm/amd/pm: Return auto perf level, if unsupported)
+$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+Auto-merging drivers/gpu/drm/radeon/radeon_connectors.c
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 223 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 23 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 19 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 68 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 29 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 42 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 4 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 48 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 21 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 3 +
+ drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 3 +
+ drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 15 +-
+ drivers/gpu/drm/amd/amdgpu/soc21.c | 1 +
+ drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 2974 +++++++++++---------
+ .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 394 ++-
+ .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 244 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 6 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 22 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 19 +-
+ .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 2 +-
+ .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 3 +-
+ .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 3 +-
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 15 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c | 24 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 248 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c | 19 +
+ drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 2 +
+ drivers/gpu/drm/amd/display/dc/dc.h | 6 +-
+ drivers/gpu/drm/amd/display/dc/dc_link.h | 2 -
+ drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 3 +-
+ .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 9 +-
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 27 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 17 +-
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 10 +
+ .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 516 +---
+ .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.h | 5 +
+ .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +
+ .../drm/amd/display/dc/dcn302/dcn302_resource.c | 2 +
+ .../drm/amd/display/dc/dcn303/dcn303_resource.c | 2 +
+ .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 2 +
+ drivers/gpu/drm/amd/display/dc/dml/Makefile | 3 +-
+ .../gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 617 ++++
+ .../gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.h | 67 +
+ drivers/gpu/drm/amd/display/dc/inc/core_types.h | 7 +
+ drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 3 +-
+ drivers/gpu/drm/amd/display/dc/inc/dc_link_dpia.h | 5 +
+ .../drm/amd/display/include/link_service_types.h | 6 -
+ .../amd/include/asic_reg/dce/dce_10_0_sh_mask.h | 2 +
+ .../amd/include/asic_reg/dce/dce_11_0_sh_mask.h | 2 +
+ .../amd/include/asic_reg/dce/dce_11_2_sh_mask.h | 2 +
+ .../amd/include/asic_reg/dce/dce_12_0_sh_mask.h | 2 +
+ .../drm/amd/include/asic_reg/dce/dce_8_0_sh_mask.h | 2 +
+ .../drm/amd/include/asic_reg/dcn/dcn_1_0_sh_mask.h | 2 +
+ .../amd/include/asic_reg/dcn/dcn_2_0_0_sh_mask.h | 2 +
+ .../amd/include/asic_reg/dcn/dcn_2_0_3_sh_mask.h | 4 +-
+ .../amd/include/asic_reg/dcn/dcn_2_1_0_sh_mask.h | 2 +
+ drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 3 +
+ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 1 +
+ .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h | 22 +-
+ drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 2 +-
+ .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 57 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 1 +
+ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 47 +-
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 8 +-
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 62 +-
+ .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 3 +
+ drivers/gpu/drm/radeon/radeon_connectors.c | 4 +
+ include/uapi/drm/amdgpu_drm.h | 8 +
+ 82 files changed, 3547 insertions(+), 2536 deletions(-)
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.h
+Merging drm-intel/for-linux-next (0ea917819d12 drm/i915/dsi: fix VBT send packet port selection for ICL+)
+$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next
+Already up to date.
+Merging drm-tegra/drm/tegra/for-next (b53c24f69199 drm/tegra: Support YVYU, VYUY and YU24 formats)
+$ git merge -m Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git drm-tegra/drm/tegra/for-next
+Merge made by the 'ort' strategy.
+Merging drm-msm/msm-next (24df12013853 MAINTAINERS: Add Dmitry as MSM DRM driver co-maintainer)
+$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next
+Already up to date.
+Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation)
+$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next
+Already up to date.
+Merging etnaviv/etnaviv/next (2829a9fcb738 drm/etnaviv: reap idle softpin mappings when necessary)
+$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next
+Already up to date.
+Merging fbdev/for-next (9f56390f8c49 video: fbdev: xen: remove setting of 'transp' parameter)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next
+Auto-merging drivers/video/fbdev/hyperv_fb.c
+Auto-merging drivers/video/fbdev/xen-fbfront.c
+Merge made by the 'ort' strategy.
+ drivers/video/fbdev/amba-clcd.c | 5 ++++-
+ drivers/video/fbdev/hyperv_fb.c | 19 +------------------
+ .../omap2/omapfb/displays/panel-nec-nl8048hl11.c | 7 +------
+ drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c | 8 +-------
+ drivers/video/fbdev/pxa3xx-gcu.c | 12 +++++++-----
+ drivers/video/fbdev/xen-fbfront.c | 1 -
+ 6 files changed, 14 insertions(+), 38 deletions(-)
+Merging regmap/for-next (5c422f0b970d regmap: Add missing map->bus check)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next
+Already up to date.
+Merging sound/for-next (0125de38122f ALSA: usb-audio: Cancel pending work at closing a MIDI substream)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next
+Already up to date.
+Merging sound-asoc/for-next (69203f3f937d Merge remote-tracking branch 'asoc/for-5.18' into asoc-linus)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next
+Already up to date.
+Merging modules/modules-next (7390b94a3c2d module: merge check_exported_symbol() into find_exported_symbol_in_section())
+$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next
+Already up to date.
+$ git am -3 ../patches/0001-fix-up-for-module-Move-version-support-into-a-separa.patch
+Applying: fix up for "module: Move version support into a separate file"
+$ git reset HEAD^
+Unstaged changes after reset:
+M kernel/module/version.c
+$ git add -A .
+$ git commit -v -a --amend
+[master dcc1deb3c795] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git
+ Date: Thu May 26 11:51:45 2022 +1000
+Merging input/next (fabcf4d86968 Input: cypress_ps2 - fix typo in comment)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next
+Auto-merging MAINTAINERS
+Auto-merging drivers/input/input.c
+Merge made by the 'ort' strategy.
+ .../input/allwinner,sun4i-a10-lradc-keys.yaml | 22 +
+ .../devicetree/bindings/input/azoteq,iqs7222.yaml | 960 ++++++++
+ .../bindings/input/google,cros-ec-keyb.yaml | 36 +-
+ drivers/input/input.c | 4 +-
+ drivers/input/joystick/Kconfig | 11 +
+ drivers/input/joystick/Makefile | 1 +
+ drivers/input/joystick/sensehat-joystick.c | 137 ++
+ drivers/input/keyboard/bcm-keypad.c | 3 +-
+ drivers/input/keyboard/clps711x-keypad.c | 3 +-
+ drivers/input/keyboard/cros_ec_keyb.c | 29 +-
+ drivers/input/keyboard/ep93xx_keypad.c | 7 +-
+ drivers/input/keyboard/mt6779-keypad.c | 10 +-
+ drivers/input/keyboard/sun4i-lradc-keys.c | 63 +-
+ drivers/input/misc/Kconfig | 10 +
+ drivers/input/misc/Makefile | 1 +
+ drivers/input/misc/iqs7222.c | 2446 ++++++++++++++++++++
+ drivers/input/misc/pm8941-pwrkey.c | 127 +-
+ drivers/input/misc/sparcspkr.c | 1 +
+ drivers/input/mouse/cypress_ps2.c | 2 +-
+ drivers/input/mouse/psmouse-smbus.c | 11 +-
+ drivers/input/mouse/vmmouse.c | 14 +
+ drivers/input/rmi4/rmi_f54.c | 1 -
+ drivers/input/tablet/aiptek.c | 3 +-
+ 23 files changed, 3843 insertions(+), 59 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml
+ create mode 100644 drivers/input/joystick/sensehat-joystick.c
+ create mode 100644 drivers/input/misc/iqs7222.c
+Merging block/for-next (44d8538d7e7d Merge branch 'for-5.19/drivers' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next
+Auto-merging block/bfq-iosched.c
+Auto-merging block/blk-core.c
+Auto-merging block/blk-iocost.c
+Auto-merging block/blk-mq.c
+Auto-merging block/blk-mq.c
+Auto-merging drivers/block/loop.c
+Auto-merging drivers/block/pktcdvd.c
+Auto-merging drivers/block/zram/zram_drv.c
+Auto-merging drivers/md/bcache/request.c
+Auto-merging drivers/nvme/host/core.c
+Auto-merging drivers/nvme/host/nvme.h
+Auto-merging drivers/target/target_core_pscsi.c
+Auto-merging fs/btrfs/disk-io.c
+Auto-merging fs/btrfs/volumes.h
+Auto-merging fs/btrfs/zoned.c
+Auto-merging fs/ext4/ioctl.c
+Auto-merging fs/ext4/super.c
+Auto-merging fs/f2fs/f2fs.h
+Auto-merging fs/f2fs/segment.c
+Auto-merging fs/io_uring.c
+Auto-merging fs/io_uring.c
+Auto-merging fs/io_uring.c
+CONFLICT (content): Merge conflict in fs/io_uring.c
+Auto-merging fs/io_uring.c
+Auto-merging fs/io_uring.c
+Auto-merging fs/io_uring.c
+CONFLICT (content): Merge conflict in fs/io_uring.c
+Auto-merging fs/io_uring.c
+CONFLICT (content): Merge conflict in fs/io_uring.c
+Auto-merging fs/zonefs/super.c
+Auto-merging include/linux/bio.h
+Auto-merging include/linux/blk_types.h
+Auto-merging include/linux/blkdev.h
+Auto-merging include/trace/events/io_uring.h
+Auto-merging include/trace/events/io_uring.h
+Auto-merging include/uapi/linux/io_uring.h
+Auto-merging include/uapi/linux/io_uring.h
+Auto-merging include/uapi/linux/io_uring.h
+Auto-merging mm/readahead.c
+Resolved 'fs/io_uring.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 7cb47c7dff02] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git
+$ git diff -M --stat --summary HEAD^..
+ block/blk-mq.c | 7 +-
+ drivers/md/bcache/btree.c | 58 ++++++-------
+ drivers/md/bcache/btree.h | 2 +-
+ drivers/md/bcache/journal.c | 31 +++++--
+ drivers/md/bcache/journal.h | 2 +
+ drivers/md/bcache/super.c | 1 +
+ drivers/md/bcache/writeback.c | 101 +++++++++--------------
+ drivers/md/bcache/writeback.h | 2 +-
+ drivers/md/dm-raid.c | 2 +-
+ drivers/md/md-linear.c | 5 +-
+ drivers/md/md-multipath.c | 15 ++--
+ drivers/md/md.c | 185 +++++++++++++++++++-----------------------
+ drivers/md/md.h | 2 +-
+ drivers/md/raid0.c | 29 +++----
+ drivers/md/raid1.c | 24 +++---
+ drivers/md/raid10.c | 54 +++++-------
+ drivers/md/raid5-cache.c | 5 +-
+ drivers/md/raid5-ppl.c | 27 +++---
+ drivers/md/raid5.c | 37 ++++-----
+ 19 files changed, 265 insertions(+), 324 deletions(-)
+Merging device-mapper/for-next (ca522482e3ea dm: pass NULL bdev to bio_alloc_clone)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next
+Merge made by the 'ort' strategy.
+ drivers/md/dm-cache-metadata.c | 3 +-
+ drivers/md/dm-core.h | 38 +-
+ drivers/md/dm-crypt.c | 14 +-
+ drivers/md/dm-delay.c | 3 +-
+ drivers/md/dm-flakey.c | 4 +-
+ drivers/md/dm-integrity.c | 2 -
+ drivers/md/dm-linear.c | 11 +-
+ drivers/md/dm-mpath.c | 8 +-
+ drivers/md/dm-path-selector.h | 15 +
+ drivers/md/dm-ps-historical-service-time.c | 1 +
+ drivers/md/dm-stats.c | 11 +
+ drivers/md/dm-table.c | 16 +-
+ drivers/md/dm-zone.c | 10 -
+ drivers/md/dm.c | 556 +++++++++++++++++------------
+ drivers/md/dm.h | 4 +-
+ 15 files changed, 409 insertions(+), 287 deletions(-)
+Merging libata/for-next (71abb4df2981 ata: pata_ftide010: Remove unneeded ERROR check before clk_disable_unprepare)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next
+Already up to date.
+Merging pcmcia/pcmcia-next (3928cf08334e pcmcia: db1xxx_ss: restrict to MIPS_DB1XXX boards)
+$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next
+Auto-merging drivers/pcmcia/Kconfig
+Merge made by the 'ort' strategy.
+ drivers/pcmcia/Kconfig | 2 +-
+ drivers/pcmcia/rsrc_nonstatic.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging mmc/next (ded2c4c34500 mmc: sdhci-of-arasan: Add NULL check for data field)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next
+Already up to date.
+Merging mfd/for-mfd-next (f93afd8e7567 dt-bindings: cros-ec: Fix a typo in description)
+$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next
+Auto-merging Documentation/devicetree/bindings/mfd/samsung,exynos5433-lpass.yaml
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/mfd/google,cros-ec.yaml | 2 +-
+ Documentation/devicetree/bindings/mfd/rk808.txt | 465 ---------------------
+ .../devicetree/bindings/mfd/rockchip,rk805.yaml | 219 ++++++++++
+ .../devicetree/bindings/mfd/rockchip,rk808.yaml | 257 ++++++++++++
+ .../devicetree/bindings/mfd/rockchip,rk809.yaml | 284 +++++++++++++
+ .../devicetree/bindings/mfd/rockchip,rk817.yaml | 330 +++++++++++++++
+ .../devicetree/bindings/mfd/rockchip,rk818.yaml | 282 +++++++++++++
+ .../bindings/mfd/samsung,exynos5433-lpass.yaml | 4 +-
+ Documentation/devicetree/bindings/mfd/syscon.yaml | 8 -
+ .../devicetree/bindings/mfd/wlf,arizona.yaml | 1 +
+ Documentation/devicetree/bindings/mux/reg-mux.yaml | 1 -
+ drivers/mfd/cros_ec_dev.c | 19 +
+ drivers/mfd/davinci_voicecodec.c | 6 +-
+ drivers/mfd/hi655x-pmic.c | 27 +-
+ drivers/mfd/intel-lpss-pci.c | 2 +
+ drivers/mfd/ipaq-micro.c | 2 +-
+ drivers/mfd/mt6397-core.c | 13 +
+ drivers/mfd/rt4831.c | 7 +-
+ drivers/mfd/sprd-sc27xx-spi.c | 3 +-
+ drivers/mfd/twl-core.c | 8 +-
+ drivers/mfd/twl-core.h | 4 +-
+ drivers/mfd/twl4030-irq.c | 7 +-
+ drivers/mfd/twl6030-irq.c | 3 +-
+ include/linux/mfd/hi655x-pmic.h | 4 +-
+ include/linux/mfd/mt6359/registers.h | 2 +
+ include/linux/mfd/tps65218.h | 2 +-
+ 26 files changed, 1442 insertions(+), 520 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/mfd/rk808.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/rockchip,rk805.yaml
+ create mode 100644 Documentation/devicetree/bindings/mfd/rockchip,rk808.yaml
+ create mode 100644 Documentation/devicetree/bindings/mfd/rockchip,rk809.yaml
+ create mode 100644 Documentation/devicetree/bindings/mfd/rockchip,rk817.yaml
+ create mode 100644 Documentation/devicetree/bindings/mfd/rockchip,rk818.yaml
+Merging backlight/for-backlight-next (023a8830a628 backlight: backlight: Slighly simplify devm_of_find_backlight())
+$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next
+Already up to date.
+Merging battery/for-next (d96a89407e5f power: supply: bq24190_charger: using pm_runtime_resume_and_get instead of pm_runtime_get_sync)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next
+Merge made by the 'ort' strategy.
+ drivers/power/supply/bq24190_charger.c | 63 ++++++++++++----------------------
+ drivers/power/supply/bq27xxx_battery.c | 60 +++++++++++++++-----------------
+ 2 files changed, 48 insertions(+), 75 deletions(-)
+Merging regulator/for-next (a5b8e4a5ceec Merge remote-tracking branch 'regulator/for-5.19' into regulator-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next
+Already up to date.
+Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing)
+$ git merge -m Merge branch 'next-testing' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git security/next-testing
+Auto-merging security/commoncap.c
+Merge made by the 'ort' strategy.
+Merging apparmor/apparmor-next (c2489617b3b9 apparmor: Fix undefined reference to `zlib_deflate_workspacesize')
+$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next
+Auto-merging MAINTAINERS
+Auto-merging security/apparmor/lsm.c
+Auto-merging security/apparmor/policy_unpack_test.c
+CONFLICT (content): Merge conflict in security/apparmor/policy_unpack_test.c
+Resolved 'security/apparmor/policy_unpack_test.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master f2ecf64c2fbc] Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 7 ++-
+ security/apparmor/Kconfig | 86 ++++++++++++++++++++---------
+ security/apparmor/apparmorfs.c | 99 +++++++++++++++++++---------------
+ security/apparmor/audit.c | 2 +-
+ security/apparmor/include/apparmor.h | 1 +
+ security/apparmor/include/apparmorfs.h | 14 +++++
+ security/apparmor/include/lib.h | 5 ++
+ security/apparmor/label.c | 17 +++---
+ security/apparmor/lib.c | 2 +-
+ security/apparmor/lsm.c | 23 ++++----
+ security/apparmor/mount.c | 11 ++--
+ security/apparmor/policy.c | 35 ++++++------
+ security/apparmor/policy_unpack.c | 37 ++++++++-----
+ security/apparmor/policy_unpack_test.c | 28 +++++-----
+ security/apparmor/procattr.c | 2 +-
+ 15 files changed, 231 insertions(+), 138 deletions(-)
+Merging integrity/next-integrity (048ae41bb080 integrity: Fix sparse warnings in keyring_handler)
+$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity
+Already up to date.
+Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
+$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next
+Already up to date.
+Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata)
+$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next
+Already up to date.
+Merging selinux/next (1af0e4a0233f security: declare member holding string literal const)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next
+Already up to date.
+Merging smack/next (ba6b652bd863 smack: Remove redundant assignments)
+$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next
+Auto-merging security/smack/smackfs.c
+Merge made by the 'ort' strategy.
+Merging tomoyo/master (e449c388913c workqueue: Wrap flush_workqueue() using an inline function)
+$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master
+Auto-merging kernel/workqueue.c
+Merge made by the 'ort' strategy.
+ include/linux/workqueue.h | 61 +++++++++++++++++++++++++++++++++++++++++++----
+ kernel/workqueue.c | 16 +++++++++----
+ 2 files changed, 68 insertions(+), 9 deletions(-)
+Merging tpmdd/next (7f3113e3b9f7 MAINTAINERS: add KEYS-TRUSTED-CAAM)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next
+Already up to date.
+Merging watchdog/master (5d24df3d6908 watchdog: ts4800_wdt: Fix refcount leak in ts4800_wdt_probe)
+$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/mfd/da9063.txt | 9 +-
+ .../devicetree/bindings/watchdog/da9062-wdt.txt | 6 +
+ .../bindings/watchdog/faraday,ftwdt010.txt | 22 ---
+ .../bindings/watchdog/faraday,ftwdt010.yaml | 67 +++++++
+ .../bindings/watchdog/fsl-imx7ulp-wdt.yaml | 1 +
+ .../devicetree/bindings/watchdog/mtk-wdt.txt | 1 +
+ .../devicetree/bindings/watchdog/qcom-wdt.yaml | 39 ++--
+ .../devicetree/bindings/watchdog/renesas,wdt.yaml | 12 +-
+ .../bindings/watchdog/socionext,uniphier-wdt.yaml | 2 +-
+ .../bindings/watchdog/sunplus,sp7021-wdt.yaml | 47 +++++
+ MAINTAINERS | 7 +
+ drivers/watchdog/Kconfig | 19 ++
+ drivers/watchdog/Makefile | 2 +
+ drivers/watchdog/bcm7038_wdt.c | 1 +
+ drivers/watchdog/da9063_wdt.c | 36 ++++
+ drivers/watchdog/iTCO_wdt.c | 20 +-
+ drivers/watchdog/mtk_wdt.c | 12 ++
+ drivers/watchdog/rti_wdt.c | 10 +-
+ drivers/watchdog/rzg2l_wdt.c | 83 ++++----
+ drivers/watchdog/rzn1_wdt.c | 203 +++++++++++++++++++
+ drivers/watchdog/sp805_wdt.c | 1 +
+ drivers/watchdog/sunplus_wdt.c | 220 +++++++++++++++++++++
+ drivers/watchdog/ts4800_wdt.c | 5 +-
+ drivers/watchdog/wdat_wdt.c | 6 +-
+ include/dt-bindings/reset/mt7986-resets.h | 55 ++++++
+ include/dt-bindings/reset/mt8186-resets.h | 36 ++++
+ 26 files changed, 822 insertions(+), 100 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/watchdog/faraday,ftwdt010.txt
+ create mode 100644 Documentation/devicetree/bindings/watchdog/faraday,ftwdt010.yaml
+ create mode 100644 Documentation/devicetree/bindings/watchdog/sunplus,sp7021-wdt.yaml
+ create mode 100644 drivers/watchdog/rzn1_wdt.c
+ create mode 100644 drivers/watchdog/sunplus_wdt.c
+ create mode 100644 include/dt-bindings/reset/mt7986-resets.h
+ create mode 100644 include/dt-bindings/reset/mt8186-resets.h
+Merging iommu/next (b0dacee202ef Merge branches 'apple/dart', 'arm/mediatek', 'arm/msm', 'arm/smmu', 'ppc/pamu', 'x86/vt-d', 'x86/amd' and 'vfio-notifier-fix' into next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Auto-merging drivers/amba/bus.c
+Auto-merging drivers/iommu/amd/init.c
+Auto-merging drivers/iommu/amd/iommu.c
+CONFLICT (content): Merge conflict in drivers/iommu/amd/iommu.c
+Auto-merging drivers/iommu/intel/iommu.c
+Auto-merging drivers/pci/of.c
+Auto-merging drivers/pci/pci-driver.c
+Auto-merging include/linux/pci.h
+Resolved 'MAINTAINERS' using previous resolution.
+Resolved 'drivers/iommu/amd/iommu.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 395b891b4d34] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/iommu/arm,smmu.yaml | 25 +-
+ .../devicetree/bindings/iommu/mediatek,iommu.yaml | 34 +-
+ .../devicetree/bindings/iommu/samsung,sysmmu.yaml | 10 -
+ MAINTAINERS | 10 +-
+ drivers/amba/bus.c | 37 +-
+ drivers/base/dd.c | 5 +
+ drivers/base/platform.c | 21 +-
+ drivers/bus/fsl-mc/fsl-mc-bus.c | 24 +-
+ drivers/iommu/amd/amd_iommu_types.h | 4 +
+ drivers/iommu/amd/init.c | 8 +-
+ drivers/iommu/amd/iommu.c | 19 +-
+ drivers/iommu/amd/iommu_v2.c | 12 +-
+ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 13 +-
+ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 +
+ drivers/iommu/arm/arm-smmu/arm-smmu-impl.c | 3 +-
+ drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 1 +
+ drivers/iommu/arm/arm-smmu/arm-smmu.c | 8 +-
+ drivers/iommu/dma-iommu.c | 25 +-
+ drivers/iommu/fsl_pamu.c | 3 +
+ drivers/iommu/fsl_pamu_domain.c | 1 +
+ drivers/iommu/intel/iommu.c | 216 ++---
+ drivers/iommu/intel/pasid.c | 45 +-
+ drivers/iommu/intel/pasid.h | 2 +
+ drivers/iommu/iommu.c | 354 +++++---
+ drivers/iommu/msm_iommu.c | 22 +-
+ drivers/iommu/mtk_iommu.c | 980 +++++++++++++++------
+ drivers/iommu/mtk_iommu.h | 101 ---
+ drivers/iommu/mtk_iommu_v1.c | 242 ++---
+ drivers/iommu/s390-iommu.c | 15 +-
+ drivers/pci/of.c | 8 +-
+ drivers/pci/pci-driver.c | 18 +
+ drivers/pci/pci-stub.c | 1 +
+ drivers/pci/pcie/portdrv_pci.c | 2 +
+ drivers/thunderbolt/domain.c | 12 +-
+ drivers/thunderbolt/nhi.c | 44 +
+ drivers/vfio/fsl-mc/vfio_fsl_mc.c | 1 +
+ drivers/vfio/pci/vfio_pci.c | 1 +
+ drivers/vfio/platform/vfio_amba.c | 1 +
+ drivers/vfio/platform/vfio_platform.c | 1 +
+ drivers/vfio/vfio.c | 252 +-----
+ drivers/vfio/vfio_iommu_type1.c | 30 +-
+ include/dt-bindings/memory/mt8186-memory-port.h | 217 +++++
+ include/dt-bindings/memory/mt8195-memory-port.h | 408 +++++++++
+ include/dt-bindings/memory/mtk-memory-port.h | 2 +
+ include/linux/amba/bus.h | 8 +
+ include/linux/device/bus.h | 3 +
+ include/linux/fsl/mc.h | 8 +
+ include/linux/intel-iommu.h | 3 +-
+ include/linux/intel-svm.h | 2 +-
+ include/linux/iommu.h | 69 +-
+ include/linux/pci.h | 8 +
+ include/linux/platform_device.h | 10 +-
+ include/linux/thunderbolt.h | 2 +
+ 53 files changed, 2317 insertions(+), 1036 deletions(-)
+ delete mode 100644 drivers/iommu/mtk_iommu.h
+ create mode 100644 include/dt-bindings/memory/mt8186-memory-port.h
+ create mode 100644 include/dt-bindings/memory/mt8195-memory-port.h
+Merging audit/next (312310928417 Linux 5.18-rc1)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next
+Already up to date.
+Merging devicetree/for-next (d036d915b61f of/irq: fix typo in comment)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next
+Auto-merging Documentation/devicetree/bindings/clock/samsung,exynos4412-isp-clock.yaml
+Auto-merging Documentation/devicetree/bindings/hwmon/adt7475.yaml
+Auto-merging Documentation/devicetree/bindings/i2c/samsung,s3c2410-i2c.yaml
+Auto-merging Documentation/devicetree/bindings/input/google,cros-ec-keyb.yaml
+Auto-merging Documentation/devicetree/bindings/iommu/samsung,sysmmu.yaml
+Auto-merging Documentation/devicetree/bindings/media/microchip,xisc.yaml
+Auto-merging Documentation/devicetree/bindings/mux/reg-mux.yaml
+Auto-merging Documentation/devicetree/bindings/net/cdns,macb.yaml
+Auto-merging Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml
+Auto-merging Documentation/devicetree/bindings/power/renesas,rcar-sysc.yaml
+Auto-merging Documentation/devicetree/bindings/regulator/socionext,uniphier-regulator.yaml
+Auto-merging Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.yaml
+Auto-merging Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml
+Auto-merging Documentation/devicetree/bindings/spi/qcom,spi-qcom-qspi.yaml
+Auto-merging Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
+Auto-merging Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.yaml
+Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging MAINTAINERS
+Auto-merging drivers/of/fdt.c
+Auto-merging drivers/of/platform.c
+Auto-merging drivers/of/property.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/bcm/brcm,bcm63138.txt | 2 +-
+ .../bindings/arm/freescale/fsl,layerscape-dcfg.txt | 19 --
+ .../bindings/arm/freescale/fsl,layerscape-scfg.txt | 19 --
+ .../hisilicon/controller/hip04-bootwrapper.yaml | 5 +-
+ .../bindings/arm/mediatek/mediatek,apmixedsys.txt | 35 ---
+ .../bindings/arm/mediatek/mediatek,infracfg.txt | 42 ---
+ .../bindings/arm/mediatek/mediatek,infracfg.yaml | 81 +++++
+ .../bindings/arm/mediatek/mediatek,topckgen.txt | 35 ---
+ Documentation/devicetree/bindings/arm/sp810.txt | 46 ---
+ Documentation/devicetree/bindings/arm/sp810.yaml | 80 +++++
+ Documentation/devicetree/bindings/arm/spe-pmu.txt | 20 --
+ .../devicetree/bindings/arm/vexpress-config.yaml | 285 +++++++++++++++++
+ .../devicetree/bindings/arm/vexpress-sysreg.txt | 103 -------
+ .../devicetree/bindings/arm/vexpress-sysreg.yaml | 90 ++++++
+ .../bindings/clock/mediatek,apmixedsys.yaml | 61 ++++
+ .../bindings/clock/mediatek,topckgen.yaml | 61 ++++
+ .../clock/samsung,exynos4412-isp-clock.yaml | 1 -
+ .../bindings/crypto/allwinner,sun8i-ce.yaml | 1 -
+ .../bindings/display/amlogic,meson-dw-hdmi.yaml | 1 -
+ .../devicetree/bindings/display/arm,hdlcd.txt | 79 -----
+ .../devicetree/bindings/display/arm,hdlcd.yaml | 89 ++++++
+ .../devicetree/bindings/display/arm,komeda.txt | 78 -----
+ .../devicetree/bindings/display/arm,komeda.yaml | 130 ++++++++
+ .../devicetree/bindings/display/arm,malidp.txt | 68 -----
+ .../devicetree/bindings/display/arm,malidp.yaml | 124 ++++++++
+ .../devicetree/bindings/display/arm,pl11x.txt | 110 -------
+ .../devicetree/bindings/display/arm,pl11x.yaml | 183 +++++++++++
+ .../display/bridge/google,cros-ec-anx7688.yaml | 1 -
+ .../devicetree/bindings/display/bridge/ps8640.yaml | 1 -
+ .../bindings/display/bridge/toshiba,tc358768.yaml | 1 +
+ .../bindings/display/imx/nxp,imx8mq-dcss.yaml | 1 -
+ .../bindings/display/mediatek/mediatek,merge.yaml | 1 -
+ .../bindings/display/panel/ilitek,ili9341.yaml | 1 -
+ .../bindings/display/panel/orisetech,otm8009a.yaml | 1 -
+ .../bindings/display/panel/panel-timing.yaml | 5 +
+ .../bindings/display/panel/raydium,rm67191.yaml | 1 +
+ .../bindings/display/panel/samsung,s6e8aa0.yaml | 1 +
+ .../display/sprd/sprd,display-subsystem.yaml | 1 -
+ .../devicetree/bindings/display/st,stm32-ltdc.yaml | 1 -
+ .../devicetree/bindings/dma/st,stm32-dmamux.yaml | 1 -
+ .../devicetree/bindings/dma/st,stm32-mdma.yaml | 1 -
+ Documentation/devicetree/bindings/eeprom/at24.txt | 1 -
+ Documentation/devicetree/bindings/eeprom/at24.yaml | 4 +-
+ .../devicetree/bindings/example-schema.yaml | 14 +-
+ .../devicetree/bindings/gnss/brcm,bcm4751.yaml | 69 +++++
+ .../devicetree/bindings/gnss/mediatek.txt | 35 ---
+ .../devicetree/bindings/gnss/mediatek.yaml | 59 ++++
+ .../bindings/gpio/fairchild,74hc595.yaml | 1 +
+ .../devicetree/bindings/gpu/samsung-rotator.yaml | 1 -
+ .../devicetree/bindings/hwmon/adt7475.yaml | 1 -
+ .../devicetree/bindings/i2c/i2c-gate.yaml | 1 -
+ .../devicetree/bindings/i2c/i2c-mt65xx.txt | 53 ----
+ .../devicetree/bindings/i2c/i2c-mt65xx.yaml | 118 +++++++
+ .../devicetree/bindings/i2c/i2c-mux-gpmux.yaml | 1 -
+ .../bindings/i2c/qcom,i2c-geni-qcom.yaml | 100 ++++++
+ .../devicetree/bindings/i2c/renesas,riic.yaml | 2 +
+ .../bindings/i2c/samsung,s3c2410-i2c.yaml | 2 +-
+ .../devicetree/bindings/iio/adc/adi,ad7291.yaml | 1 -
+ .../devicetree/bindings/iio/dac/lltc,ltc1660.yaml | 2 +-
+ .../bindings/input/google,cros-ec-keyb.yaml | 1 +
+ .../devicetree/bindings/input/ilitek,ili2xxx.txt | 27 --
+ .../bindings/input/touchscreen/ilitek_ts_i2c.yaml | 7 +-
+ .../interrupt-controller/fsl,ls-extirq.txt | 53 ----
+ .../interrupt-controller/fsl,ls-extirq.yaml | 118 +++++++
+ .../bindings/interrupt-controller/qcom,pdc.txt | 5 +-
+ .../devicetree/bindings/iommu/arm,smmu-v3.yaml | 16 +-
+ .../devicetree/bindings/iommu/samsung,sysmmu.yaml | 1 -
+ .../bindings/leds/backlight/qcom-wled.yaml | 2 +-
+ .../devicetree/bindings/leds/leds-mt6360.yaml | 2 +-
+ .../bindings/mailbox/amlogic,meson-gxbb-mhu.yaml | 1 -
+ .../devicetree/bindings/mailbox/qcom-ipcc.yaml | 1 +
+ .../bindings/mailbox/xlnx,zynqmp-ipi-mailbox.txt | 127 --------
+ .../bindings/mailbox/xlnx,zynqmp-ipi-mailbox.yaml | 140 +++++++++
+ .../devicetree/bindings/media/i2c/adv7604.yaml | 3 +-
+ .../devicetree/bindings/media/microchip,xisc.yaml | 1 -
+ .../devicetree/bindings/mfd/mediatek,mt6360.yaml | 256 ++++++++++++++++
+ .../devicetree/bindings/mfd/qcom,spmi-pmic.txt | 2 +-
+ Documentation/devicetree/bindings/mtd/common.txt | 1 -
+ .../bindings/mtd/hisilicon,fmc-spi-nor.txt | 2 +-
+ Documentation/devicetree/bindings/mux/reg-mux.yaml | 8 +-
+ .../devicetree/bindings/net/asix,ax88178.yaml | 68 +++++
+ .../devicetree/bindings/net/cdns,macb.yaml | 1 +
+ .../devicetree/bindings/net/ingenic,mac.yaml | 1 +
+ .../devicetree/bindings/net/microchip,lan95xx.yaml | 63 ++++
+ .../devicetree/bindings/net/qcom,ipa.yaml | 7 +
+ .../devicetree/bindings/net/smsc,lan91c111.yaml | 61 ++++
+ .../devicetree/bindings/net/smsc-lan91c111.txt | 17 --
+ .../devicetree/bindings/net/ti,davinci-mdio.yaml | 1 +
+ .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 1 -
+ .../bindings/net/wireless/qcom,ath11k.yaml | 2 +-
+ .../bindings/net/wireless/ti,wlcore.yaml | 2 +
+ .../devicetree/bindings/nvmem/snvs-lpgpr.yaml | 4 +
+ .../devicetree/bindings/pci/snps,dw-pcie-ep.yaml | 6 +-
+ .../devicetree/bindings/pci/snps,dw-pcie.yaml | 2 +
+ .../bindings/pci/socionext,uniphier-pcie.yaml | 96 ++++++
+ .../devicetree/bindings/pci/uniphier-pcie.txt | 82 -----
+ .../devicetree/bindings/perf/spe-pmu.yaml | 40 +++
+ .../bindings/pinctrl/canaan,k210-fpioa.yaml | 2 +
+ .../bindings/power/amlogic,meson-sec-pwrc.yaml | 1 -
+ .../devicetree/bindings/power/avs/qcom,cpr.yaml | 1 +
+ .../bindings/power/renesas,rcar-sysc.yaml | 15 +-
+ .../devicetree/bindings/power/supply/battery.yaml | 7 +-
+ .../bindings/power/supply/charger-manager.yaml | 1 +
+ .../bindings/power/supply/cw2015_battery.yaml | 1 -
+ .../bindings/power/supply/power-supply.yaml | 1 -
+ .../bindings/power/supply/ti,lp8727.yaml | 1 -
+ .../bindings/power/supply/tps65217-charger.yaml | 2 +-
+ .../devicetree/bindings/pwm/pwm-omap-dmtimer.txt | 2 +-
+ .../regulator/socionext,uniphier-regulator.yaml | 1 -
+ .../bindings/regulator/st,stm32-vrefbuf.yaml | 1 -
+ .../bindings/reserved-memory/ramoops.yaml | 1 -
+ .../bindings/reset/hisilicon,hi6220-reset.txt | 37 ---
+ .../devicetree/bindings/reset/microchip,rst.yaml | 1 -
+ .../devicetree/bindings/rng/intel,ixp46x-rng.yaml | 1 -
+ .../devicetree/bindings/rng/st,stm32-rng.yaml | 1 +
+ Documentation/devicetree/bindings/rtc/rtc.txt | 1 -
+ Documentation/devicetree/bindings/serial/8250.yaml | 1 +
+ .../devicetree/bindings/serial/qcom,msm-uartdm.txt | 81 -----
+ .../bindings/serial/qcom,msm-uartdm.yaml | 112 +++++++
+ .../devicetree/bindings/serial/sprd-uart.yaml | 2 +-
+ .../devicetree/bindings/serio/arm,pl050.yaml | 67 ++++
+ .../bindings/soc/amlogic/amlogic,canvas.yaml | 1 -
+ .../bindings/soc/fsl/fsl,layerscape-dcfg.yaml | 68 +++++
+ .../bindings/soc/fsl/fsl,layerscape-scfg.yaml | 58 ++++
+ .../devicetree/bindings/soc/qcom/qcom,geni-se.yaml | 3 +-
+ .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 1 +
+ .../devicetree/bindings/soc/ti/wkup-m3-ipc.yaml | 175 +++++++++++
+ .../devicetree/bindings/soc/ti/wkup_m3_ipc.txt | 57 ----
+ .../devicetree/bindings/sound/adi,adau1372.yaml | 1 -
+ .../bindings/sound/amlogic,gx-sound-card.yaml | 1 -
+ .../devicetree/bindings/sound/arm,pl041.yaml | 62 ++++
+ .../bindings/sound/audio-graph-card2.yaml | 3 +
+ .../devicetree/bindings/sound/imx-audio-hdmi.yaml | 3 +
+ .../devicetree/bindings/sound/maxim,max98520.yaml | 1 -
+ .../devicetree/bindings/sound/mchp,spdifrx.yaml | 2 +-
+ .../devicetree/bindings/sound/mchp,spdiftx.yaml | 2 +-
+ .../bindings/sound/nvidia,tegra-audio-rt5640.yaml | 1 -
+ .../bindings/sound/samsung,aries-wm8994.yaml | 1 -
+ .../devicetree/bindings/sound/samsung,odroid.yaml | 1 -
+ .../devicetree/bindings/sound/tas2562.yaml | 1 -
+ .../devicetree/bindings/sound/tas2770.yaml | 1 -
+ .../bindings/spi/amlogic,meson-gx-spicc.yaml | 1 -
+ .../bindings/spi/amlogic,meson6-spifc.yaml | 1 -
+ .../bindings/spi/qcom,spi-qcom-qspi.yaml | 3 +-
+ .../devicetree/bindings/spi/qcom,spi-qup.txt | 103 -------
+ .../devicetree/bindings/spi/qcom,spi-qup.yaml | 81 +++++
+ .../devicetree/bindings/spi/renesas,hspi.yaml | 1 -
+ .../devicetree/bindings/spi/spi-davinci.txt | 2 +-
+ .../devicetree/bindings/spi/spi-pl022.yaml | 2 +-
+ .../bindings/spmi/qcom,spmi-pmic-arb.txt | 65 ----
+ .../bindings/spmi/qcom,spmi-pmic-arb.yaml | 117 +++++++
+ .../devicetree/bindings/thermal/qcom-tsens.yaml | 1 +
+ .../devicetree/bindings/timer/cdns,ttc.yaml | 1 -
+ .../devicetree/bindings/timer/rda,8810pl-timer.txt | 20 --
+ .../bindings/timer/rda,8810pl-timer.yaml | 47 +++
+ .../devicetree/bindings/timer/renesas,ostm.yaml | 2 +
+ .../bindings/timer/samsung,exynos4210-mct.yaml | 5 +-
+ .../devicetree/bindings/timer/ti,timer-dm.yaml | 152 +++++++++
+ .../devicetree/bindings/timer/ti,timer.txt | 44 ---
+ .../devicetree/bindings/trivial-devices.yaml | 4 +
+ .../devicetree/bindings/usb/ci-hdrc-usb2.txt | 2 +-
+ Documentation/devicetree/bindings/usb/dwc2.yaml | 4 +-
+ .../bindings/usb/mediatek,mt6360-tcpc.yaml | 5 +
+ .../devicetree/bindings/usb/smsc,usb3503.yaml | 3 +-
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ .../devicetree/bindings/writing-bindings.rst | 25 ++
+ .../devicetree/bindings/writing-schema.rst | 8 +
+ Documentation/devicetree/overlay-notes.rst | 30 +-
+ MAINTAINERS | 6 +-
+ drivers/of/fdt.c | 3 +
+ drivers/of/irq.c | 15 +-
+ drivers/of/overlay.c | 339 ++++++++++-----------
+ drivers/of/platform.c | 14 +-
+ drivers/of/property.c | 5 +-
+ drivers/of/unittest-data/Makefile | 10 +
+ drivers/of/unittest-data/overlay_16.dts | 15 +
+ drivers/of/unittest-data/overlay_17.dts | 15 +
+ drivers/of/unittest-data/overlay_18.dts | 15 +
+ drivers/of/unittest-data/overlay_19.dts | 15 +
+ drivers/of/unittest-data/overlay_20.dts | 15 +
+ drivers/of/unittest.c | 201 ++++++++++++
+ include/linux/of.h | 16 +-
+ 182 files changed, 3998 insertions(+), 1760 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/arm/freescale/fsl,layerscape-dcfg.txt
+ delete mode 100644 Documentation/devicetree/bindings/arm/freescale/fsl,layerscape-scfg.txt
+ delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,apmixedsys.txt
+ delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,infracfg.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,infracfg.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,topckgen.txt
+ delete mode 100644 Documentation/devicetree/bindings/arm/sp810.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/sp810.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/spe-pmu.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/vexpress-config.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/vexpress-sysreg.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/vexpress-sysreg.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/mediatek,apmixedsys.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/mediatek,topckgen.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/arm,hdlcd.txt
+ create mode 100644 Documentation/devicetree/bindings/display/arm,hdlcd.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/arm,komeda.txt
+ create mode 100644 Documentation/devicetree/bindings/display/arm,komeda.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/arm,malidp.txt
+ create mode 100644 Documentation/devicetree/bindings/display/arm,malidp.yaml
+ delete mode 100644 Documentation/devicetree/bindings/display/arm,pl11x.txt
+ create mode 100644 Documentation/devicetree/bindings/display/arm,pl11x.yaml
+ delete mode 100644 Documentation/devicetree/bindings/eeprom/at24.txt
+ create mode 100644 Documentation/devicetree/bindings/gnss/brcm,bcm4751.yaml
+ delete mode 100644 Documentation/devicetree/bindings/gnss/mediatek.txt
+ create mode 100644 Documentation/devicetree/bindings/gnss/mediatek.yaml
+ delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mt65xx.yaml
+ create mode 100644 Documentation/devicetree/bindings/i2c/qcom,i2c-geni-qcom.yaml
+ delete mode 100644 Documentation/devicetree/bindings/input/ilitek,ili2xxx.txt
+ delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/fsl,ls-extirq.txt
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/fsl,ls-extirq.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mailbox/xlnx,zynqmp-ipi-mailbox.txt
+ create mode 100644 Documentation/devicetree/bindings/mailbox/xlnx,zynqmp-ipi-mailbox.yaml
+ create mode 100644 Documentation/devicetree/bindings/mfd/mediatek,mt6360.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mtd/common.txt
+ create mode 100644 Documentation/devicetree/bindings/net/asix,ax88178.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/microchip,lan95xx.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/smsc,lan91c111.yaml
+ delete mode 100644 Documentation/devicetree/bindings/net/smsc-lan91c111.txt
+ create mode 100644 Documentation/devicetree/bindings/pci/socionext,uniphier-pcie.yaml
+ delete mode 100644 Documentation/devicetree/bindings/pci/uniphier-pcie.txt
+ create mode 100644 Documentation/devicetree/bindings/perf/spe-pmu.yaml
+ delete mode 100644 Documentation/devicetree/bindings/reset/hisilicon,hi6220-reset.txt
+ delete mode 100644 Documentation/devicetree/bindings/rtc/rtc.txt
+ delete mode 100644 Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt
+ create mode 100644 Documentation/devicetree/bindings/serial/qcom,msm-uartdm.yaml
+ create mode 100644 Documentation/devicetree/bindings/serio/arm,pl050.yaml
+ create mode 100644 Documentation/devicetree/bindings/soc/fsl/fsl,layerscape-dcfg.yaml
+ create mode 100644 Documentation/devicetree/bindings/soc/fsl/fsl,layerscape-scfg.yaml
+ create mode 100644 Documentation/devicetree/bindings/soc/ti/wkup-m3-ipc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/soc/ti/wkup_m3_ipc.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/arm,pl041.yaml
+ delete mode 100644 Documentation/devicetree/bindings/spi/qcom,spi-qup.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/qcom,spi-qup.yaml
+ delete mode 100644 Documentation/devicetree/bindings/spmi/qcom,spmi-pmic-arb.txt
+ create mode 100644 Documentation/devicetree/bindings/spmi/qcom,spmi-pmic-arb.yaml
+ delete mode 100644 Documentation/devicetree/bindings/timer/rda,8810pl-timer.txt
+ create mode 100644 Documentation/devicetree/bindings/timer/rda,8810pl-timer.yaml
+ create mode 100644 Documentation/devicetree/bindings/timer/ti,timer-dm.yaml
+ delete mode 100644 Documentation/devicetree/bindings/timer/ti,timer.txt
+ create mode 100644 drivers/of/unittest-data/overlay_16.dts
+ create mode 100644 drivers/of/unittest-data/overlay_17.dts
+ create mode 100644 drivers/of/unittest-data/overlay_18.dts
+ create mode 100644 drivers/of/unittest-data/overlay_19.dts
+ create mode 100644 drivers/of/unittest-data/overlay_20.dts
+Merging mailbox/mailbox-for-next (79f9fbe30352 mailbox: qcom-ipcc: Fix -Wunused-function with CONFIG_PM_SLEEP=n)
+$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next
+Auto-merging Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/mailbox/mtk,adsp-mbox.yaml | 7 +-
+ .../bindings/mailbox/nvidia,tegra186-hsp.yaml | 9 +
+ .../devicetree/bindings/mailbox/qcom-ipcc.yaml | 29 +-
+ .../devicetree/bindings/mailbox/st,stm32-ipcc.yaml | 11 +-
+ drivers/mailbox/arm_mhu_db.c | 2 +-
+ drivers/mailbox/arm_mhuv2.c | 3 +-
+ drivers/mailbox/imx-mailbox.c | 7 +-
+ drivers/mailbox/mailbox.c | 19 +-
+ drivers/mailbox/mtk-adsp-mailbox.c | 8 +
+ drivers/mailbox/omap-mailbox.c | 6 +-
+ drivers/mailbox/pcc.c | 2 +-
+ drivers/mailbox/qcom-ipcc.c | 26 +-
+ drivers/mailbox/tegra-hsp.c | 151 ++++++--
+ include/dt-bindings/gce/mt8186-gce.h | 421 +++++++++++++++++++++
+ include/dt-bindings/mailbox/tegra186-hsp.h | 5 +
+ include/linux/mailbox_controller.h | 1 +
+ 16 files changed, 628 insertions(+), 79 deletions(-)
+ create mode 100644 include/dt-bindings/gce/mt8186-gce.h
+Merging spi/for-next (9c63b846e6df spi: spi-mem: Convert Aspeed SMC driver to spi-mem)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next
+Already up to date.
+Merging tip/master (d092c10c647e Merge branch into tip/master: 'x86/cleanups')
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master
+Auto-merging arch/x86/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/Kconfig
+Recorded preimage for 'arch/x86/Kconfig'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'arch/x86/Kconfig'.
+[master bb76c799e298] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
+$ git diff -M --stat --summary HEAD^..
+ arch/x86/Kconfig | 101 +++++++++++++++++++++----------------------
+ arch/x86/Kconfig.debug | 29 ++++++-------
+ arch/x86/events/Kconfig | 12 ++---
+ arch/x86/events/intel/core.c | 2 +-
+ arch/x86/kernel/setup.c | 6 +--
+ arch/x86/kernel/tracepoint.c | 3 --
+ 6 files changed, 73 insertions(+), 80 deletions(-)
+Merging clockevents/timers/drivers/next (ff714ee7191b clocksource/drivers/timer-ti-dm: Add compatible for am6 SoCs)
+$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next
+Auto-merging arch/arm/mach-omap2/Kconfig
+Auto-merging drivers/clocksource/Kconfig
+Auto-merging drivers/clocksource/Makefile
+Auto-merging drivers/clocksource/timer-ti-dm.c
+Merge made by the 'ort' strategy.
+ .../bindings/timer/mediatek,mtk-timer.txt | 1 +
+ arch/arm/mach-omap2/Kconfig | 2 +
+ drivers/clocksource/Kconfig | 10 +-
+ drivers/clocksource/Makefile | 2 +-
+ drivers/clocksource/bcm_kona_timer.c | 14 +-
+ drivers/clocksource/jcore-pit.c | 5 +-
+ drivers/clocksource/mips-gic-timer.c | 9 +-
+ drivers/clocksource/timer-armada-370-xp.c | 5 +-
+ drivers/clocksource/timer-digicolor.c | 5 +-
+ drivers/clocksource/timer-ixp4xx.c | 25 ----
+ drivers/clocksource/timer-lpc32xx.c | 6 +-
+ drivers/clocksource/timer-orion.c | 5 +-
+ drivers/clocksource/timer-pistachio.c | 5 +-
+ drivers/clocksource/timer-riscv.c | 2 +-
+ drivers/clocksource/timer-sp804.c | 10 +-
+ drivers/clocksource/timer-sun4i.c | 5 +-
+ drivers/clocksource/timer-sun5i.c | 5 +-
+ drivers/clocksource/timer-ti-dm.c | 123 ++++++++++++++++++
+ include/clocksource/timer-ti-dm.h | 144 ---------------------
+ include/linux/platform_data/timer-ixp4xx.h | 11 --
+ 20 files changed, 153 insertions(+), 241 deletions(-)
+ delete mode 100644 include/linux/platform_data/timer-ixp4xx.h
+Merging edac/edac-for-next (92705c9f9956 Merge edac-misc into for-next)
+$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next
+Auto-merging drivers/edac/synopsys_edac.c
+Merge made by the 'ort' strategy.
+ drivers/edac/synopsys_edac.c | 44 +++++++++++++++++++++++++-------------------
+ 1 file changed, 25 insertions(+), 19 deletions(-)
+Merging irqchip/irq/irqchip-next (492449ae4f0a Merge branch irq/gic-v3-nmi-fixes-5.19 into irq/irqchip-next)
+$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next
+Already up to date.
+Merging ftrace/for-next (c87857e21486 Merge branch 'trace/for-next-rtla' into trace/for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/for-next
+Auto-merging include/linux/trace_events.h
+Auto-merging kernel/trace/ftrace.c
+Auto-merging kernel/trace/trace.c
+Auto-merging kernel/trace/trace.h
+Auto-merging kernel/trace/trace_events_hist.c
+Merge made by the 'ort' strategy.
+Merging rcu/rcu/next (409db57c8d45 Merge branch 'lkmm.2022.05.03a' into HEAD)
+$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next
+Merge made by the 'ort' strategy.
+Merging kvm/next (85165781c5d9 KVM: Do not pin pages tracked by gfn=>pfn caches)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next
+Auto-merging Documentation/virt/kvm/api.rst
+Auto-merging MAINTAINERS
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm64/include/asm/cputype.h
+Auto-merging arch/arm64/include/asm/esr.h
+Auto-merging arch/arm64/include/asm/kvm_emulate.h
+Auto-merging arch/arm64/include/asm/kvm_host.h
+Auto-merging arch/arm64/include/uapi/asm/kvm.h
+Auto-merging arch/arm64/kernel/cpufeature.c
+Auto-merging arch/arm64/kernel/cpufeature.c
+Auto-merging arch/arm64/kvm/arm.c
+Auto-merging arch/arm64/kvm/handle_exit.c
+Auto-merging arch/arm64/kvm/hyp/nvhe/sys_regs.c
+Auto-merging arch/arm64/kvm/sys_regs.c
+CONFLICT (content): Merge conflict in arch/arm64/kvm/sys_regs.c
+Auto-merging arch/riscv/include/asm/csr.h
+Auto-merging arch/x86/include/asm/cpufeatures.h
+Auto-merging arch/x86/kvm/mmu/mmu.c
+Auto-merging arch/x86/kvm/pmu.c
+Auto-merging arch/x86/kvm/svm/sev.c
+Auto-merging arch/x86/kvm/svm/svm.c
+Auto-merging arch/x86/kvm/svm/svm.h
+Auto-merging include/linux/kvm_host.h
+Auto-merging include/uapi/linux/elf.h
+Auto-merging init/Kconfig
+Auto-merging scripts/kallsyms.c
+Auto-merging tools/testing/selftests/Makefile
+Auto-merging virt/kvm/kvm_main.c
+Resolved 'arch/arm64/kvm/sys_regs.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master da4ed514ec19] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/arm64/cpu-feature-registers.rst | 2 +
+ Documentation/arm64/elf_hwcaps.rst | 4 +
+ Documentation/virt/kvm/api.rst | 252 +++-
+ Documentation/virt/kvm/arm/hypercalls.rst | 138 +++
+ Documentation/virt/kvm/arm/index.rst | 2 +-
+ Documentation/virt/kvm/arm/psci.rst | 77 --
+ Documentation/virt/kvm/x86/mmu.rst | 4 +
+ MAINTAINERS | 5 +
+ arch/arm64/include/asm/barrier.h | 4 +
+ arch/arm64/include/asm/cputype.h | 8 +
+ arch/arm64/include/asm/esr.h | 8 +-
+ arch/arm64/include/asm/hwcap.h | 1 +
+ arch/arm64/include/asm/kvm_arm.h | 3 +-
+ arch/arm64/include/asm/kvm_asm.h | 1 +
+ arch/arm64/include/asm/kvm_emulate.h | 7 -
+ arch/arm64/include/asm/kvm_host.h | 44 +-
+ arch/arm64/include/asm/kvm_mmu.h | 3 +
+ arch/arm64/include/uapi/asm/hwcap.h | 1 +
+ arch/arm64/include/uapi/asm/kvm.h | 34 +
+ arch/arm64/kernel/cpufeature.c | 13 +
+ arch/arm64/kernel/cpuinfo.c | 1 +
+ arch/arm64/kvm/Makefile | 4 +-
+ arch/arm64/kvm/arch_timer.c | 47 +-
+ arch/arm64/kvm/arm.c | 164 ++-
+ arch/arm64/kvm/guest.c | 10 +-
+ arch/arm64/kvm/handle_exit.c | 49 +-
+ arch/arm64/kvm/hyp/include/nvhe/mm.h | 6 +-
+ arch/arm64/kvm/hyp/nvhe/host.S | 32 +-
+ arch/arm64/kvm/hyp/nvhe/hyp-main.c | 18 +-
+ arch/arm64/kvm/hyp/nvhe/mm.c | 78 +-
+ arch/arm64/kvm/hyp/nvhe/setup.c | 31 +-
+ arch/arm64/kvm/hyp/nvhe/switch.c | 57 +-
+ arch/arm64/kvm/hyp/nvhe/sys_regs.c | 3 -
+ arch/arm64/kvm/hypercalls.c | 327 ++++-
+ arch/arm64/kvm/mmu.c | 68 +-
+ arch/arm64/kvm/pmu-emul.c | 3 +-
+ arch/arm64/kvm/pmu.c | 40 +-
+ arch/arm64/kvm/psci.c | 248 +---
+ arch/arm64/kvm/sys_regs.c | 294 +++--
+ arch/arm64/kvm/sys_regs.h | 9 +-
+ arch/arm64/kvm/vgic/vgic-init.c | 13 +-
+ arch/arm64/kvm/vgic/vgic-its.c | 160 ++-
+ arch/arm64/kvm/vgic/vgic-mmio-v2.c | 18 +-
+ arch/arm64/kvm/vgic/vgic-mmio-v3.c | 125 +-
+ arch/arm64/kvm/vgic/vgic-v3.c | 4 +
+ arch/arm64/kvm/vgic/vgic.h | 10 +
+ arch/arm64/lib/delay.c | 12 +-
+ arch/arm64/tools/cpucaps | 1 +
+ arch/riscv/include/asm/csr.h | 1 +
+ arch/riscv/include/asm/kvm_host.h | 124 +-
+ arch/riscv/include/uapi/asm/kvm.h | 20 +
+ arch/riscv/kvm/main.c | 11 +-
+ arch/riscv/kvm/mmu.c | 264 +++--
+ arch/riscv/kvm/tlb.S | 74 --
+ arch/riscv/kvm/tlb.c | 461 ++++++++
+ arch/riscv/kvm/vcpu.c | 144 ++-
+ arch/riscv/kvm/vcpu_exit.c | 6 +-
+ arch/riscv/kvm/vcpu_sbi_replace.c | 40 +-
+ arch/riscv/kvm/vcpu_sbi_v01.c | 35 +-
+ arch/riscv/kvm/vm.c | 8 +-
+ arch/riscv/kvm/vmid.c | 30 +-
+ arch/s390/include/asm/uv.h | 23 +-
+ arch/s390/include/uapi/asm/uvdevice.h | 51 +
+ arch/s390/kvm/gaccess.c | 22 +-
+ arch/x86/include/asm/cpufeatures.h | 1 +
+ arch/x86/include/asm/kvm-x86-ops.h | 1 +
+ arch/x86/include/asm/kvm-x86-pmu-ops.h | 31 +
+ arch/x86/include/asm/kvm_host.h | 93 +-
+ arch/x86/include/asm/uaccess.h | 142 +++
+ arch/x86/include/asm/vmx.h | 10 +-
+ arch/x86/include/uapi/asm/kvm.h | 11 +-
+ arch/x86/kernel/asm-offsets_64.c | 4 +-
+ arch/x86/kernel/fpu/core.c | 17 +-
+ arch/x86/kernel/kvm.c | 118 +-
+ arch/x86/kernel/kvmclock.c | 2 +-
+ arch/x86/kvm/i8259.c | 1 -
+ arch/x86/kvm/irq.c | 10 +-
+ arch/x86/kvm/irq_comm.c | 2 +-
+ arch/x86/kvm/lapic.c | 5 +-
+ arch/x86/kvm/lapic.h | 1 -
+ arch/x86/kvm/mmu.h | 109 +-
+ arch/x86/kvm/mmu/mmu.c | 597 +++++-----
+ arch/x86/kvm/mmu/mmu_internal.h | 123 +-
+ arch/x86/kvm/mmu/mmutrace.h | 1 +
+ arch/x86/kvm/mmu/paging_tmpl.h | 71 +-
+ arch/x86/kvm/mmu/spte.c | 47 +-
+ arch/x86/kvm/mmu/spte.h | 16 +-
+ arch/x86/kvm/mmu/tdp_mmu.c | 14 +-
+ arch/x86/kvm/pmu.c | 66 +-
+ arch/x86/kvm/pmu.h | 7 +-
+ arch/x86/kvm/svm/avic.c | 84 +-
+ arch/x86/kvm/svm/nested.c | 308 +++--
+ arch/x86/kvm/svm/pmu.c | 2 +-
+ arch/x86/kvm/svm/sev.c | 28 +-
+ arch/x86/kvm/svm/svm.c | 215 +++-
+ arch/x86/kvm/svm/svm.h | 55 +-
+ arch/x86/kvm/trace.h | 20 +
+ arch/x86/kvm/vmx/nested.c | 63 +-
+ arch/x86/kvm/vmx/pmu_intel.c | 2 +-
+ arch/x86/kvm/vmx/posted_intr.c | 11 +-
+ arch/x86/kvm/vmx/vmcs.h | 5 +
+ arch/x86/kvm/vmx/vmx.c | 53 +-
+ arch/x86/kvm/x86.c | 380 +++---
+ arch/x86/kvm/xen.c | 1245 ++++++++++++++++----
+ arch/x86/kvm/xen.h | 62 +-
+ drivers/s390/char/Kconfig | 11 +
+ drivers/s390/char/Makefile | 1 +
+ drivers/s390/char/uvdevice.c | 257 ++++
+ include/kvm/arm_arch_timer.h | 2 -
+ include/kvm/arm_hypercalls.h | 8 +
+ include/kvm/arm_pmu.h | 34 +-
+ include/kvm/arm_psci.h | 7 -
+ include/kvm/arm_vgic.h | 8 +-
+ include/linux/kvm_host.h | 4 +-
+ include/linux/kvm_types.h | 2 +
+ include/uapi/linux/kvm.h | 54 +-
+ init/Kconfig | 5 +
+ scripts/kallsyms.c | 3 +-
+ tools/include/linux/arm-smccc.h | 193 +++
+ tools/testing/selftests/Makefile | 1 +
+ tools/testing/selftests/drivers/.gitignore | 1 +
+ .../selftests/drivers/s390x/uvdevice/Makefile | 22 +
+ .../selftests/drivers/s390x/uvdevice/config | 1 +
+ .../drivers/s390x/uvdevice/test_uvdevice.c | 276 +++++
+ tools/testing/selftests/kvm/.gitignore | 6 +-
+ tools/testing/selftests/kvm/Makefile | 7 +-
+ tools/testing/selftests/kvm/aarch64/get-reg-list.c | 8 +
+ tools/testing/selftests/kvm/aarch64/hypercalls.c | 336 ++++++
+ .../selftests/kvm/aarch64/psci_cpu_on_test.c | 121 --
+ tools/testing/selftests/kvm/aarch64/psci_test.c | 213 ++++
+ .../selftests/kvm/include/aarch64/processor.h | 22 +
+ .../selftests/kvm/include/riscv/processor.h | 8 +-
+ .../testing/selftests/kvm/lib/aarch64/processor.c | 25 +
+ tools/testing/selftests/kvm/lib/riscv/processor.c | 11 +-
+ tools/testing/selftests/kvm/lib/riscv/ucall.c | 31 +-
+ tools/testing/selftests/kvm/s390x/memop.c | 46 +-
+ tools/testing/selftests/kvm/steal_time.c | 13 +-
+ .../selftests/kvm/x86_64/fix_hypercall_test.c | 170 +++
+ .../selftests/kvm/x86_64/tsc_scaling_sync.c | 119 ++
+ .../{vmx_pmu_msrs_test.c => vmx_pmu_caps_test.c} | 18 +-
+ .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 366 +++++-
+ virt/kvm/kvm_main.c | 12 +-
+ virt/kvm/pfncache.c | 231 ++--
+ 143 files changed, 8018 insertions(+), 2425 deletions(-)
+ create mode 100644 Documentation/virt/kvm/arm/hypercalls.rst
+ delete mode 100644 Documentation/virt/kvm/arm/psci.rst
+ delete mode 100644 arch/riscv/kvm/tlb.S
+ create mode 100644 arch/riscv/kvm/tlb.c
+ create mode 100644 arch/s390/include/uapi/asm/uvdevice.h
+ create mode 100644 arch/x86/include/asm/kvm-x86-pmu-ops.h
+ create mode 100644 drivers/s390/char/uvdevice.c
+ create mode 100644 tools/include/linux/arm-smccc.h
+ create mode 100644 tools/testing/selftests/drivers/s390x/uvdevice/Makefile
+ create mode 100644 tools/testing/selftests/drivers/s390x/uvdevice/config
+ create mode 100644 tools/testing/selftests/drivers/s390x/uvdevice/test_uvdevice.c
+ create mode 100644 tools/testing/selftests/kvm/aarch64/hypercalls.c
+ delete mode 100644 tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c
+ create mode 100644 tools/testing/selftests/kvm/aarch64/psci_test.c
+ create mode 100644 tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c
+ create mode 100644 tools/testing/selftests/kvm/x86_64/tsc_scaling_sync.c
+ rename tools/testing/selftests/kvm/x86_64/{vmx_pmu_msrs_test.c => vmx_pmu_caps_test.c} (83%)
+Merging kvm-arm/next (5c0ad551e9aa Merge branch kvm-arm64/its-save-restore-fixes-5.19 into kvmarm-master/next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next
+Already up to date.
+Merging kvms390/next (c71159648c3c KVM: s390: selftest: Test suppression indication on key prot exception)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next
+Already up to date.
+Merging xen-tip/linux-next (5b3353949e89 xen: add support for initializing xenstore later as HVM domain)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next
+Already up to date.
+Merging percpu/for-next (4e1f82dce05b Merge branch 'for-5.16-fixes' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next
+Merge made by the 'ort' strategy.
+Merging workqueues/for-next (10a5a651e3af workqueue: Restrict kworker in the offline CPU pool running on housekeeping CPUs)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next
+Already up to date.
+Merging drivers-x86/for-next (badb81a58b9e platform/x86/intel/ifs: Add CPU_SUP_INTEL dependency)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next
+Already up to date.
+Merging chrome-platform/for-next (abd4fd43f2af platform/chrome: Use imperative mood for ChromeOS ACPI sysfs ABI descriptions)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next
+Merge made by the 'ort' strategy.
+ .../ABI/testing/sysfs-driver-chromeos-acpi | 137 ++++++++
+ .../firmware-guide/acpi/chromeos-acpi-device.rst | 363 +++++++++++++++++++++
+ Documentation/firmware-guide/acpi/index.rst | 1 +
+ drivers/platform/chrome/Kconfig | 11 +
+ drivers/platform/chrome/Makefile | 1 +
+ drivers/platform/chrome/chromeos_acpi.c | 257 +++++++++++++++
+ drivers/platform/chrome/cros_ec.c | 36 +-
+ drivers/platform/chrome/cros_ec_chardev.c | 2 +-
+ drivers/platform/chrome/cros_ec_i2c.c | 12 +-
+ drivers/platform/chrome/cros_ec_ishtp.c | 4 +-
+ drivers/platform/chrome/cros_ec_lpc.c | 49 ++-
+ drivers/platform/chrome/cros_ec_proto.c | 63 +++-
+ drivers/platform/chrome/cros_ec_rpmsg.c | 2 +
+ drivers/platform/chrome/cros_ec_spi.c | 15 +-
+ drivers/platform/chrome/cros_ec_typec.c | 3 +
+ include/linux/platform_data/cros_ec_commands.h | 10 +-
+ include/linux/platform_data/cros_ec_proto.h | 6 +-
+ 17 files changed, 914 insertions(+), 58 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-chromeos-acpi
+ create mode 100644 Documentation/firmware-guide/acpi/chromeos-acpi-device.rst
+ create mode 100644 drivers/platform/chrome/chromeos_acpi.c
+Merging hsi/for-next (43c14f8d18a7 HSI: omap_ssi: Fix refcount leak in ssi_probe)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next
+Merge made by the 'ort' strategy.
+ drivers/hsi/clients/ssi_protocol.c | 1 -
+ drivers/hsi/controllers/omap_ssi_core.c | 1 +
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+Merging leds/for-next (e98a860f6542 leds: qcom-lpg: Require pattern to follow documentation)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/leds/kinetic,ktd2692.yaml | 87 ++
+ .../bindings/leds/leds-class-multicolor.yaml | 2 +-
+ .../devicetree/bindings/leds/leds-ktd2692.txt | 50 -
+ .../bindings/leds/leds-pwm-multicolor.yaml | 79 ++
+ .../devicetree/bindings/leds/leds-qcom-lpg.yaml | 174 +++
+ .../devicetree/bindings/leds/regulator-led.yaml | 55 +
+ Documentation/leds/leds-qcom-lpg.rst | 78 ++
+ drivers/leds/Kconfig | 3 +
+ drivers/leds/Makefile | 3 +
+ drivers/leds/flash/leds-ktd2692.c | 15 +-
+ drivers/leds/leds-is31fl32xx.c | 8 +-
+ drivers/leds/leds-lp50xx.c | 4 +-
+ drivers/leds/leds-pca9532.c | 11 +-
+ drivers/leds/leds-regulator.c | 47 +-
+ drivers/leds/rgb/Kconfig | 29 +
+ drivers/leds/rgb/Makefile | 4 +
+ drivers/leds/rgb/leds-pwm-multicolor.c | 186 +++
+ drivers/leds/rgb/leds-qcom-lpg.c | 1451 ++++++++++++++++++++
+ 18 files changed, 2193 insertions(+), 93 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/leds/kinetic,ktd2692.yaml
+ delete mode 100644 Documentation/devicetree/bindings/leds/leds-ktd2692.txt
+ create mode 100644 Documentation/devicetree/bindings/leds/leds-pwm-multicolor.yaml
+ create mode 100644 Documentation/devicetree/bindings/leds/leds-qcom-lpg.yaml
+ create mode 100644 Documentation/devicetree/bindings/leds/regulator-led.yaml
+ create mode 100644 Documentation/leds/leds-qcom-lpg.rst
+ create mode 100644 drivers/leds/rgb/Kconfig
+ create mode 100644 drivers/leds/rgb/Makefile
+ create mode 100644 drivers/leds/rgb/leds-pwm-multicolor.c
+ create mode 100644 drivers/leds/rgb/leds-qcom-lpg.c
+Merging ipmi/for-next (a508e33956b5 ipmi:ipmb: Fix refcount leak in ipmi_ipmb_probe)
+$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next
+Already up to date.
+Merging driver-core/driver-core-next (b232b02bf3c2 driver core: fix deadlock in __device_attach)
+$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging MAINTAINERS
+Auto-merging drivers/amba/bus.c
+Auto-merging drivers/base/dd.c
+Auto-merging drivers/base/firmware_loader/main.c
+Auto-merging drivers/base/platform.c
+Auto-merging drivers/bus/fsl-mc/fsl-mc-bus.c
+Auto-merging drivers/clk/imx/clk-scu.c
+Auto-merging drivers/spi/spi.c
+Auto-merging include/linux/amba/bus.h
+Auto-merging include/linux/export.h
+Auto-merging include/linux/fsl/mc.h
+Auto-merging include/linux/pci.h
+Auto-merging include/linux/platform_device.h
+Auto-merging include/linux/spi/spi.h
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-class-firmware | 77 ++++
+ .../ABI/testing/sysfs-devices-physical_location | 42 ++
+ Documentation/admin-guide/kernel-parameters.txt | 11 +-
+ Documentation/driver-api/firmware/fw_upload.rst | 126 ++++++
+ Documentation/driver-api/firmware/index.rst | 1 +
+ MAINTAINERS | 1 +
+ drivers/amba/bus.c | 28 +-
+ drivers/base/Makefile | 1 +
+ drivers/base/arch_topology.c | 5 +
+ drivers/base/base.h | 1 +
+ drivers/base/bus.c | 4 +-
+ drivers/base/core.c | 15 +
+ drivers/base/dd.c | 44 ++-
+ drivers/base/driver.c | 70 ++++
+ drivers/base/firmware_loader/Kconfig | 42 +-
+ drivers/base/firmware_loader/Makefile | 2 +
+ drivers/base/firmware_loader/fallback.c | 430 ---------------------
+ drivers/base/firmware_loader/fallback.h | 46 +--
+ drivers/base/firmware_loader/firmware.h | 16 +
+ drivers/base/firmware_loader/main.c | 94 ++++-
+ drivers/base/firmware_loader/sysfs.c | 422 ++++++++++++++++++++
+ drivers/base/firmware_loader/sysfs.h | 117 ++++++
+ drivers/base/firmware_loader/sysfs_upload.c | 397 +++++++++++++++++++
+ drivers/base/firmware_loader/sysfs_upload.h | 41 ++
+ drivers/base/memory.c | 5 +-
+ drivers/base/node.c | 1 +
+ drivers/base/physical_location.c | 143 +++++++
+ drivers/base/physical_location.h | 16 +
+ drivers/base/platform.c | 34 +-
+ drivers/bus/fsl-mc/fsl-mc-bus.c | 25 +-
+ drivers/clk/imx/clk-scu.c | 7 +-
+ drivers/firmware/edd.c | 3 +-
+ drivers/hv/vmbus_drv.c | 28 +-
+ drivers/pci/pci-sysfs.c | 28 +-
+ drivers/rpmsg/rpmsg_core.c | 42 +-
+ drivers/rpmsg/rpmsg_internal.h | 5 +-
+ drivers/rpmsg/rpmsg_ns.c | 4 +-
+ drivers/s390/cio/cio.h | 6 +-
+ drivers/s390/cio/css.c | 28 +-
+ drivers/slimbus/qcom-ngd-ctrl.c | 13 +-
+ drivers/spi/spi.c | 26 +-
+ drivers/vdpa/vdpa.c | 29 +-
+ fs/kernfs/dir.c | 31 +-
+ fs/kernfs/file.c | 47 ++-
+ include/linux/amba/bus.h | 6 +-
+ include/linux/device.h | 73 ++++
+ include/linux/device/driver.h | 2 +
+ include/linux/export.h | 7 +-
+ include/linux/firmware.h | 82 ++++
+ include/linux/fsl/mc.h | 6 +-
+ include/linux/hyperv.h | 6 +-
+ include/linux/pci.h | 6 +-
+ include/linux/platform_device.h | 6 +-
+ include/linux/rpmsg.h | 14 +-
+ include/linux/spi/spi.h | 2 +
+ include/linux/vdpa.h | 4 +-
+ include/trace/events/thermal_pressure.h | 29 ++
+ lib/test_firmware.c | 381 ++++++++++++++++++
+ scripts/get_abi.pl | 4 +-
+ tools/testing/selftests/firmware/Makefile | 2 +-
+ tools/testing/selftests/firmware/config | 1 +
+ tools/testing/selftests/firmware/fw_filesystem.sh | 170 ++++----
+ tools/testing/selftests/firmware/fw_lib.sh | 19 +-
+ tools/testing/selftests/firmware/fw_run_tests.sh | 4 +
+ tools/testing/selftests/firmware/fw_upload.sh | 214 ++++++++++
+ 65 files changed, 2736 insertions(+), 856 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-class-firmware
+ create mode 100644 Documentation/ABI/testing/sysfs-devices-physical_location
+ create mode 100644 Documentation/driver-api/firmware/fw_upload.rst
+ create mode 100644 drivers/base/firmware_loader/sysfs.c
+ create mode 100644 drivers/base/firmware_loader/sysfs.h
+ create mode 100644 drivers/base/firmware_loader/sysfs_upload.c
+ create mode 100644 drivers/base/firmware_loader/sysfs_upload.h
+ create mode 100644 drivers/base/physical_location.c
+ create mode 100644 drivers/base/physical_location.h
+ create mode 100644 include/trace/events/thermal_pressure.h
+ create mode 100755 tools/testing/selftests/firmware/fw_upload.sh
+Merging usb/usb-next (97fa5887cf28 USB: new quirk for Dell Gen 2 devices)
+$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next
+Auto-merging Documentation/devicetree/bindings/usb/dwc2.yaml
+Auto-merging arch/arm/boot/dts/qcom-ipq4019.dtsi
+Auto-merging arch/arm/boot/dts/qcom-sdx55.dtsi
+Auto-merging arch/arm64/boot/dts/qcom/apq8096-db820c.dts
+Auto-merging arch/arm64/boot/dts/qcom/ipq6018.dtsi
+Auto-merging arch/arm64/boot/dts/qcom/ipq8074.dtsi
+Auto-merging arch/arm64/boot/dts/qcom/msm8953.dtsi
+Auto-merging arch/arm64/boot/dts/qcom/msm8994.dtsi
+Auto-merging arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
+Auto-merging arch/arm64/boot/dts/qcom/msm8996.dtsi
+Auto-merging arch/arm64/boot/dts/qcom/msm8998.dtsi
+Auto-merging arch/arm64/boot/dts/qcom/qcs404.dtsi
+Auto-merging arch/arm64/boot/dts/qcom/sc7180.dtsi
+Auto-merging arch/arm64/boot/dts/qcom/sc7280.dtsi
+Auto-merging arch/arm64/boot/dts/qcom/sdm630.dtsi
+Auto-merging arch/arm64/boot/dts/qcom/sdm845.dtsi
+Auto-merging arch/arm64/boot/dts/qcom/sm6350.dtsi
+Auto-merging arch/arm64/boot/dts/qcom/sm8150.dtsi
+Auto-merging arch/arm64/boot/dts/qcom/sm8250.dtsi
+Auto-merging arch/arm64/boot/dts/qcom/sm8350.dtsi
+Auto-merging arch/arm64/boot/dts/qcom/sm8450.dtsi
+Auto-merging arch/mips/boot/dts/ingenic/x1000.dtsi
+Auto-merging arch/mips/boot/dts/ingenic/x1830.dtsi
+Auto-merging drivers/base/property.c
+Auto-merging drivers/net/usb/cdc_ncm.c
+Auto-merging drivers/net/usb/lan78xx.c
+Auto-merging drivers/net/usb/rndis_host.c
+Auto-merging drivers/net/usb/usbnet.c
+Auto-merging drivers/thunderbolt/nhi.c
+Auto-merging drivers/thunderbolt/test.c
+CONFLICT (content): Merge conflict in drivers/thunderbolt/test.c
+Auto-merging drivers/usb/gadget/function/f_uvc.c
+Auto-merging drivers/usb/gadget/function/uvc.h
+Auto-merging drivers/usb/gadget/legacy/raw_gadget.c
+Auto-merging drivers/usb/gadget/udc/omap_udc.c
+Auto-merging drivers/usb/host/ohci-omap.c
+Auto-merging drivers/usb/serial/option.c
+Auto-merging drivers/usb/serial/pl2303.c
+Auto-merging include/linux/property.h
+Auto-merging include/linux/thunderbolt.h
+Auto-merging sound/usb/midi.c
+Resolved 'drivers/thunderbolt/test.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 913d3395025e] Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/configfs-usb-gadget-uvc | 1 +
+ Documentation/ABI/testing/sysfs-bus-thunderbolt | 10 +
+ .../devicetree/bindings/usb/am33xx-usb.txt | 7 +-
+ .../devicetree/bindings/usb/da8xx-usb.txt | 5 +-
+ Documentation/devicetree/bindings/usb/dwc2.yaml | 7 +
+ .../devicetree/bindings/usb/dwc3-xilinx.yaml | 4 +
+ .../devicetree/bindings/usb/fcs,fsa4480.yaml | 72 +++
+ .../devicetree/bindings/usb/generic-ehci.yaml | 1 +
+ .../devicetree/bindings/usb/generic-ohci.yaml | 1 +
+ .../devicetree/bindings/usb/mediatek,mtu3.yaml | 1 +
+ .../devicetree/bindings/usb/qcom,dwc3.yaml | 227 +++++++-
+ .../devicetree/bindings/usb/renesas,usbhs.yaml | 4 +
+ .../bindings/usb/samsung,exynos-usb2.yaml | 15 +-
+ .../devicetree/bindings/usb/ti,am62-usb.yaml | 103 ++++
+ Documentation/usb/gadget-testing.rst | 1 +
+ arch/arm/boot/dts/qcom-ipq4019.dtsi | 2 +-
+ arch/arm/boot/dts/qcom-sdx55.dtsi | 11 +-
+ arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 18 +-
+ arch/arm64/boot/dts/qcom/ipq6018.dtsi | 12 +-
+ arch/arm64/boot/dts/qcom/ipq8074.dtsi | 16 +-
+ arch/arm64/boot/dts/qcom/msm8953.dtsi | 11 +-
+ arch/arm64/boot/dts/qcom/msm8994.dtsi | 7 +-
+ .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 20 +-
+ arch/arm64/boot/dts/qcom/msm8996.dtsi | 23 +-
+ arch/arm64/boot/dts/qcom/msm8998.dtsi | 13 +-
+ arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 7 +-
+ arch/arm64/boot/dts/qcom/qcs404.dtsi | 8 +-
+ arch/arm64/boot/dts/qcom/sc7180.dtsi | 13 +-
+ arch/arm64/boot/dts/qcom/sc7280.dtsi | 68 ++-
+ arch/arm64/boot/dts/qcom/sdm630.dtsi | 12 +-
+ arch/arm64/boot/dts/qcom/sdm845.dtsi | 26 +-
+ arch/arm64/boot/dts/qcom/sm6125.dtsi | 16 +-
+ arch/arm64/boot/dts/qcom/sm6350.dtsi | 11 +-
+ arch/arm64/boot/dts/qcom/sm8150.dtsi | 22 +-
+ arch/arm64/boot/dts/qcom/sm8250.dtsi | 20 +-
+ arch/arm64/boot/dts/qcom/sm8350.dtsi | 21 +-
+ arch/arm64/boot/dts/qcom/sm8450.dtsi | 20 +-
+ arch/mips/boot/dts/ingenic/jz4780.dtsi | 2 +-
+ arch/mips/boot/dts/ingenic/x1000.dtsi | 2 +-
+ arch/mips/boot/dts/ingenic/x1830.dtsi | 2 +-
+ drivers/base/property.c | 96 +++-
+ drivers/hid/usbhid/hid-core.c | 2 +-
+ drivers/hid/usbhid/usbkbd.c | 2 +-
+ drivers/hid/usbhid/usbmouse.c | 2 +-
+ drivers/input/misc/ati_remote2.c | 2 +-
+ drivers/input/misc/cm109.c | 2 +-
+ drivers/input/misc/powermate.c | 2 +-
+ drivers/input/misc/yealink.c | 2 +-
+ drivers/input/tablet/acecad.c | 2 +-
+ drivers/input/tablet/pegasus_notetaker.c | 2 +-
+ drivers/media/rc/ati_remote.c | 4 +-
+ drivers/media/rc/mceusb.c | 2 +-
+ drivers/media/rc/streamzap.c | 2 +-
+ drivers/media/rc/xbox_remote.c | 2 +-
+ drivers/media/usb/tm6000/tm6000-dvb.c | 2 +-
+ drivers/media/usb/tm6000/tm6000-input.c | 2 +-
+ drivers/media/usb/tm6000/tm6000-video.c | 2 +-
+ drivers/misc/mei/hdcp/mei_hdcp.c | 2 +-
+ drivers/misc/mei/pxp/mei_pxp.c | 2 +-
+ drivers/net/usb/cdc_ncm.c | 4 +-
+ drivers/net/usb/lan78xx.c | 4 +-
+ drivers/net/usb/rndis_host.c | 2 +-
+ drivers/net/usb/usbnet.c | 4 +-
+ drivers/net/wireless/mediatek/mt76/usb.c | 2 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 4 +-
+ drivers/thunderbolt/ctl.c | 15 +-
+ drivers/thunderbolt/nhi.c | 2 +-
+ drivers/thunderbolt/path.c | 6 +
+ drivers/thunderbolt/switch.c | 109 +++-
+ drivers/thunderbolt/tb.c | 25 +-
+ drivers/thunderbolt/tb.h | 6 +-
+ drivers/thunderbolt/tb_msgs.h | 39 ++
+ drivers/thunderbolt/tb_regs.h | 5 +
+ drivers/thunderbolt/test.c | 108 +++-
+ drivers/thunderbolt/tunnel.c | 18 +-
+ drivers/thunderbolt/tunnel.h | 4 +-
+ drivers/thunderbolt/usb4_port.c | 38 ++
+ drivers/thunderbolt/xdomain.c | 609 ++++++++++++++++++---
+ drivers/usb/atm/usbatm.c | 2 +-
+ drivers/usb/c67x00/c67x00-drv.c | 6 +-
+ drivers/usb/c67x00/c67x00-sched.c | 4 +-
+ drivers/usb/cdns3/cdns3-gadget.c | 47 +-
+ drivers/usb/cdns3/cdns3-gadget.h | 9 +-
+ drivers/usb/core/devices.c | 47 --
+ drivers/usb/core/driver.c | 25 +-
+ drivers/usb/core/hcd-pci.c | 5 +-
+ drivers/usb/core/hcd.c | 29 +-
+ drivers/usb/core/hub.c | 10 +-
+ drivers/usb/core/quirks.c | 3 +
+ drivers/usb/core/usb-acpi.c | 7 +-
+ drivers/usb/dwc2/core.c | 9 +
+ drivers/usb/dwc2/core.h | 5 +
+ drivers/usb/dwc2/gadget.c | 1 -
+ drivers/usb/dwc2/params.c | 50 +-
+ drivers/usb/dwc3/Kconfig | 9 +
+ drivers/usb/dwc3/Makefile | 1 +
+ drivers/usb/dwc3/core.c | 81 ++-
+ drivers/usb/dwc3/core.h | 2 +
+ drivers/usb/dwc3/drd.c | 50 --
+ drivers/usb/dwc3/dwc3-am62.c | 332 +++++++++++
+ drivers/usb/dwc3/dwc3-pci.c | 2 +-
+ drivers/usb/dwc3/dwc3-xilinx.c | 17 +
+ drivers/usb/dwc3/ep0.c | 14 +-
+ drivers/usb/dwc3/gadget.c | 190 ++++---
+ drivers/usb/dwc3/gadget.h | 2 +
+ drivers/usb/dwc3/host.c | 2 -
+ drivers/usb/gadget/composite.c | 2 +-
+ drivers/usb/gadget/configfs.c | 2 +-
+ drivers/usb/gadget/function/f_acm.c | 10 +
+ drivers/usb/gadget/function/f_uvc.c | 5 +-
+ drivers/usb/gadget/function/u_audio.c | 4 +-
+ drivers/usb/gadget/function/u_uvc.h | 1 +
+ drivers/usb/gadget/function/uvc.h | 1 +
+ drivers/usb/gadget/function/uvc_configfs.c | 189 +++----
+ drivers/usb/gadget/function/uvc_configfs.h | 120 +++-
+ drivers/usb/gadget/function/uvc_queue.c | 30 +-
+ drivers/usb/gadget/function/uvc_queue.h | 3 +-
+ drivers/usb/gadget/function/uvc_video.c | 17 +-
+ drivers/usb/gadget/legacy/dbgp.c | 2 +-
+ drivers/usb/gadget/legacy/inode.c | 2 +-
+ drivers/usb/gadget/legacy/raw_gadget.c | 4 +-
+ drivers/usb/gadget/udc/core.c | 289 +++++-----
+ drivers/usb/gadget/udc/net2272.c | 6 +-
+ drivers/usb/gadget/udc/net2280.c | 14 +-
+ drivers/usb/gadget/udc/omap_udc.c | 2 +-
+ drivers/usb/gadget/udc/pxa27x_udc.h | 2 +-
+ drivers/usb/gadget/udc/s3c-hsudc.c | 4 +-
+ drivers/usb/gadget/udc/tegra-xudc.c | 4 +-
+ drivers/usb/gadget/udc/udc-xilinx.c | 2 +-
+ drivers/usb/host/ehci-omap.c | 5 -
+ drivers/usb/host/ehci-platform.c | 1 +
+ drivers/usb/host/ehci-q.c | 4 +-
+ drivers/usb/host/ehci-xilinx-of.c | 12 +-
+ drivers/usb/host/fhci-hcd.c | 3 +-
+ drivers/usb/host/fotg210-hcd.c | 2 +-
+ drivers/usb/host/isp116x-hcd.c | 11 +-
+ drivers/usb/host/isp1362-hcd.c | 6 +-
+ drivers/usb/host/max3421-hcd.c | 6 +-
+ drivers/usb/host/ohci-hcd.c | 3 +-
+ drivers/usb/host/ohci-platform.c | 1 +
+ drivers/usb/host/ohci-ppc-of.c | 3 -
+ drivers/usb/host/oxu210hp-hcd.c | 16 +-
+ drivers/usb/host/r8a66597-hcd.c | 3 +-
+ drivers/usb/host/sl811-hcd.c | 6 +-
+ drivers/usb/host/xhci-hub.c | 3 +-
+ drivers/usb/host/xhci-mem.c | 23 +-
+ drivers/usb/host/xhci-pci.c | 5 +-
+ drivers/usb/host/xhci-plat.c | 46 +-
+ drivers/usb/host/xhci-ring.c | 144 ++---
+ drivers/usb/host/xhci.c | 175 +++---
+ drivers/usb/host/xhci.h | 30 +-
+ drivers/usb/isp1760/isp1760-core.c | 8 +
+ drivers/usb/isp1760/isp1760-hcd.c | 6 +-
+ drivers/usb/misc/ftdi-elan.c | 15 +-
+ drivers/usb/misc/lvstest.c | 2 +-
+ drivers/usb/musb/mediatek.c | 73 +--
+ drivers/usb/musb/omap2430.c | 1 +
+ drivers/usb/serial/ftdi_sio.c | 2 +-
+ drivers/usb/serial/option.c | 2 +
+ drivers/usb/serial/pl2303.c | 3 +
+ drivers/usb/storage/alauda.c | 4 +-
+ drivers/usb/storage/isd200.c | 8 +-
+ drivers/usb/storage/karma.c | 15 +-
+ drivers/usb/storage/onetouch.c | 2 +-
+ drivers/usb/storage/shuttle_usbat.c | 28 +-
+ drivers/usb/storage/transport.c | 2 +-
+ drivers/usb/typec/bus.c | 2 +-
+ drivers/usb/typec/mux.c | 271 ++++++---
+ drivers/usb/typec/mux.h | 12 +-
+ drivers/usb/typec/mux/Kconfig | 10 +
+ drivers/usb/typec/mux/Makefile | 1 +
+ drivers/usb/typec/mux/fsa4480.c | 218 ++++++++
+ drivers/usb/typec/mux/intel_pmc_mux.c | 29 +-
+ drivers/usb/typec/mux/pi3usb30532.c | 8 +-
+ drivers/usb/typec/tipd/core.c | 32 +-
+ drivers/usb/typec/ucsi/ucsi.c | 85 +--
+ drivers/usb/typec/ucsi/ucsi.h | 6 +-
+ drivers/usb/usbip/stub_dev.c | 2 +-
+ drivers/usb/usbip/stub_rx.c | 2 +
+ include/linux/property.h | 5 +
+ include/linux/thunderbolt.h | 19 +-
+ include/linux/usb.h | 17 +-
+ include/linux/usb/gadget.h | 28 +-
+ include/linux/usb/hcd.h | 2 +
+ include/linux/usb/typec_mux.h | 22 +-
+ sound/usb/line6/pcm.c | 4 +-
+ sound/usb/midi.c | 4 +-
+ sound/usb/usx2y/usb_stream.c | 6 +-
+ sound/usb/usx2y/usbusx2yaudio.c | 2 +-
+ sound/usb/usx2y/usx2yhwdeppcm.c | 2 +-
+ tools/usb/testusb.c | 2 +-
+ 191 files changed, 3652 insertions(+), 1474 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/usb/fcs,fsa4480.yaml
+ create mode 100644 Documentation/devicetree/bindings/usb/ti,am62-usb.yaml
+ create mode 100644 drivers/usb/dwc3/dwc3-am62.c
+ create mode 100644 drivers/usb/typec/mux/fsa4480.c
+Merging thunderbolt/next (c7c99a09ef0e thunderbolt: Add KUnit test for devices with no DisplayPort adapters)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next
+Already up to date.
+Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget/next
+Already up to date.
+Merging usb-serial/usb-next (33b7af2f459d USB: serial: option: add Quectel BG95 modem)
+$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next
+Already up to date.
+Merging tty/tty-next (25e02ba60f0f tty: Rework receive flow control char logic)
+$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next
+Auto-merging Documentation/firmware-guide/acpi/enumeration.rst
+Auto-merging Documentation/index.rst
+Auto-merging MAINTAINERS
+Auto-merging drivers/tty/goldfish.c
+Auto-merging drivers/tty/serial/8250/8250.h
+Auto-merging drivers/tty/serial/Kconfig
+Auto-merging drivers/tty/serial/imx.c
+Auto-merging drivers/tty/sysrq.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/serial/fsl-lpuart.yaml | 4 +-
+ .../bindings/serial/qcom,serial-geni-qcom.yaml | 86 ++++
+ .../bindings/serial/renesas,em-uart.yaml | 37 +-
+ .../devicetree/bindings/serial/renesas,hscif.yaml | 9 +-
+ .../devicetree/bindings/serial/renesas,scif.yaml | 2 +-
+ .../devicetree/bindings/serial/rs485.yaml | 5 +
+ .../bindings/serial/socionext,uniphier-uart.yaml | 5 +-
+ Documentation/driver-api/index.rst | 1 +
+ Documentation/driver-api/serial/driver.rst | 2 +-
+ Documentation/driver-api/serial/index.rst | 2 -
+ Documentation/driver-api/serial/n_gsm.rst | 159 ------
+ Documentation/{ => driver-api}/tty/index.rst | 22 +-
+ .../driver-api/{serial => tty}/moxa-smartio.rst | 0
+ Documentation/driver-api/tty/n_gsm.rst | 153 ++++++
+ Documentation/{ => driver-api}/tty/n_tty.rst | 0
+ Documentation/{ => driver-api}/tty/tty_buffer.rst | 0
+ Documentation/{ => driver-api}/tty/tty_driver.rst | 0
+ .../{ => driver-api}/tty/tty_internals.rst | 0
+ Documentation/{ => driver-api}/tty/tty_ldisc.rst | 0
+ Documentation/{ => driver-api}/tty/tty_port.rst | 0
+ Documentation/{ => driver-api}/tty/tty_struct.rst | 0
+ Documentation/firmware-guide/acpi/enumeration.rst | 25 +
+ Documentation/index.rst | 1 -
+ Documentation/misc-devices/index.rst | 1 +
+ Documentation/misc-devices/oxsemi-tornado.rst | 131 +++++
+ MAINTAINERS | 2 +-
+ arch/alpha/include/uapi/asm/termbits.h | 214 +++-----
+ arch/mips/include/uapi/asm/termbits.h | 249 ++++------
+ arch/parisc/include/uapi/asm/termbits.h | 241 ++++-----
+ arch/powerpc/include/uapi/asm/termbits.h | 182 +++----
+ arch/sparc/include/uapi/asm/termbits.h | 223 ++++-----
+ drivers/char/Kconfig | 3 +-
+ drivers/char/pcmcia/synclink_cs.c | 8 +-
+ drivers/char/ttyprintk.c | 16 +
+ drivers/tty/amiserial.c | 2 -
+ drivers/tty/goldfish.c | 2 +
+ drivers/tty/hvc/Kconfig | 19 +
+ drivers/tty/hvc/hvc_dcc.c | 194 +++++++-
+ drivers/tty/hvc/hvc_opal.c | 6 +-
+ drivers/tty/hvc/hvc_vio.c | 2 +-
+ drivers/tty/hvc/hvcs.c | 5 +-
+ drivers/tty/hvc/hvsi.c | 2 +-
+ drivers/tty/mxser.c | 5 +-
+ drivers/tty/n_gsm.c | 37 +-
+ drivers/tty/n_tty.c | 73 ++-
+ drivers/tty/serial/8250/8250.h | 41 ++
+ drivers/tty/serial/8250/8250_aspeed_vuart.c | 2 +
+ drivers/tty/serial/8250/8250_core.c | 1 -
+ drivers/tty/serial/8250/8250_dma.c | 7 +-
+ drivers/tty/serial/8250/8250_dw.c | 229 ++++++---
+ drivers/tty/serial/8250/8250_dwlib.c | 116 ++++-
+ drivers/tty/serial/8250/8250_dwlib.h | 51 ++
+ drivers/tty/serial/8250/8250_fintek.c | 8 +-
+ drivers/tty/serial/8250/8250_mtk.c | 7 -
+ drivers/tty/serial/8250/8250_of.c | 2 +
+ drivers/tty/serial/8250/8250_pci.c | 480 ++++++++++++------
+ drivers/tty/serial/8250/8250_port.c | 140 ++++--
+ drivers/tty/serial/8250/8250_pxa.c | 1 -
+ drivers/tty/serial/8250/Kconfig | 2 +-
+ drivers/tty/serial/Kconfig | 9 +-
+ drivers/tty/serial/altera_jtaguart.c | 6 +-
+ drivers/tty/serial/amba-pl011.c | 48 +-
+ drivers/tty/serial/amba-pl011.h | 35 --
+ drivers/tty/serial/atmel_serial.c | 4 +-
+ drivers/tty/serial/cpm_uart/cpm_uart.h | 2 +
+ drivers/tty/serial/cpm_uart/cpm_uart_core.c | 2 +-
+ drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c | 1 -
+ drivers/tty/serial/digicolor-usart.c | 2 +
+ drivers/tty/serial/fsl_lpuart.c | 66 +--
+ drivers/tty/serial/icom.c | 538 +++++++++++++++------
+ drivers/tty/serial/icom.h | 274 -----------
+ drivers/tty/serial/imx.c | 2 -
+ drivers/tty/serial/jsm/jsm_cls.c | 8 +-
+ drivers/tty/serial/jsm/jsm_neo.c | 8 +-
+ drivers/tty/serial/max310x.c | 1 -
+ drivers/tty/serial/men_z135_uart.c | 1 -
+ drivers/tty/serial/meson_uart.c | 40 +-
+ drivers/tty/serial/mpc52xx_uart.c | 5 +-
+ drivers/tty/serial/msm_serial.c | 5 +
+ drivers/tty/serial/omap-serial.c | 13 +-
+ drivers/tty/serial/owl-uart.c | 7 +-
+ drivers/tty/serial/pch_uart.c | 77 +--
+ drivers/tty/serial/pic32_uart.c | 159 ++++--
+ drivers/tty/serial/pic32_uart.h | 125 -----
+ drivers/tty/serial/pmac_zilog.c | 69 +--
+ drivers/tty/serial/pmac_zilog.h | 11 -
+ drivers/tty/serial/qcom_geni_serial.c | 58 ++-
+ drivers/tty/serial/rda-uart.c | 2 +
+ drivers/tty/serial/sa1100.c | 4 +-
+ drivers/tty/serial/samsung_tty.c | 13 +
+ drivers/tty/serial/sc16is7xx.c | 10 -
+ drivers/tty/serial/serial_core.c | 89 +++-
+ drivers/tty/serial/serial_txx9.c | 2 +
+ drivers/tty/serial/sh-sci.c | 6 +-
+ drivers/tty/serial/sifive.c | 20 +-
+ drivers/tty/serial/st-asc.c | 4 +
+ drivers/tty/serial/stm32-usart.c | 225 +++++++--
+ drivers/tty/serial/stm32-usart.h | 3 +
+ drivers/tty/serial/sunplus-uart.c | 2 +-
+ drivers/tty/serial/sunsu.c | 2 -
+ drivers/tty/serial/uartlite.c | 3 +-
+ drivers/tty/serial/xilinx_uartps.c | 46 +-
+ drivers/tty/serial/zs.c | 2 +-
+ drivers/tty/synclink_gt.c | 2 +
+ drivers/tty/sysrq.c | 27 +-
+ drivers/tty/tty_baudrate.c | 35 +-
+ drivers/tty/tty_ioctl.c | 2 -
+ drivers/usb/class/cdc-acm.h | 8 -
+ drivers/usb/serial/ark3116.c | 3 +-
+ drivers/usb/serial/whiteheat.c | 4 -
+ include/linux/serial_core.h | 1 +
+ include/linux/serial_s3c.h | 3 +
+ include/uapi/asm-generic/termbits-common.h | 65 +++
+ include/uapi/asm-generic/termbits.h | 239 ++++-----
+ 114 files changed, 3164 insertions(+), 2451 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/serial/qcom,serial-geni-qcom.yaml
+ delete mode 100644 Documentation/driver-api/serial/n_gsm.rst
+ rename Documentation/{ => driver-api}/tty/index.rst (81%)
+ rename Documentation/driver-api/{serial => tty}/moxa-smartio.rst (100%)
+ create mode 100644 Documentation/driver-api/tty/n_gsm.rst
+ rename Documentation/{ => driver-api}/tty/n_tty.rst (100%)
+ rename Documentation/{ => driver-api}/tty/tty_buffer.rst (100%)
+ rename Documentation/{ => driver-api}/tty/tty_driver.rst (100%)
+ rename Documentation/{ => driver-api}/tty/tty_internals.rst (100%)
+ rename Documentation/{ => driver-api}/tty/tty_ldisc.rst (100%)
+ rename Documentation/{ => driver-api}/tty/tty_port.rst (100%)
+ rename Documentation/{ => driver-api}/tty/tty_struct.rst (100%)
+ create mode 100644 Documentation/misc-devices/oxsemi-tornado.rst
+ delete mode 100644 drivers/tty/serial/amba-pl011.h
+ delete mode 100644 drivers/tty/serial/icom.h
+ delete mode 100644 drivers/tty/serial/pic32_uart.h
+ create mode 100644 include/uapi/asm-generic/termbits-common.h
+Merging char-misc/char-misc-next (90de6805267f habanalabs: use separate structure info for each error collect data)
+$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Auto-merging drivers/android/binder.c
+Auto-merging drivers/bus/ti-sysc.c
+Auto-merging drivers/char/pcmcia/synclink_cs.c
+Auto-merging drivers/iio/accel/mma8452.c
+Auto-merging drivers/iio/gyro/mpu3050-core.c
+Auto-merging drivers/iio/trigger/iio-trig-sysfs.c
+Auto-merging drivers/misc/lkdtm/stackleak.c
+CONFLICT (content): Merge conflict in drivers/misc/lkdtm/stackleak.c
+Auto-merging drivers/slimbus/qcom-ctrl.c
+CONFLICT (content): Merge conflict in drivers/slimbus/qcom-ctrl.c
+Auto-merging drivers/slimbus/qcom-ngd-ctrl.c
+Auto-merging drivers/usb/dwc3/drd.c
+CONFLICT (content): Merge conflict in drivers/usb/dwc3/drd.c
+Auto-merging tools/testing/selftests/filesystems/binderfs/binderfs_test.c
+Resolved 'MAINTAINERS' using previous resolution.
+Resolved 'drivers/misc/lkdtm/stackleak.c' using previous resolution.
+Resolved 'drivers/slimbus/qcom-ctrl.c' using previous resolution.
+Resolved 'drivers/usb/dwc3/drd.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 1644db008bfd] Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/stable/sysfs-bus-mhi | 10 +
+ .../ABI/testing/debugfs-driver-habanalabs | 38 +
+ .../bindings/extcon/siliconmitus,sm5502-muic.yaml | 5 +-
+ .../bindings/iio/adc/renesas,rzg2l-adc.yaml | 3 +-
+ .../bindings/iio/adc/sprd,sc2720-adc.yaml | 60 +-
+ .../devicetree/bindings/iio/adc/ti,ads1015.yaml | 7 +-
+ .../devicetree/bindings/iio/dac/adi,ad3552r.yaml | 2 +-
+ .../devicetree/bindings/iio/dac/lltc,ltc2632.yaml | 2 +-
+ .../bindings/iio/imu/invensense,mpu6050.yaml | 34 +-
+ .../devicetree/bindings/iio/imu/st,lsm6dsx.yaml | 38 +-
+ .../devicetree/bindings/iio/light/stk33xx.yaml | 6 +
+ .../iio/potentiometer/microchip,mcp4131.yaml | 2 +-
+ .../devicetree/bindings/iio/st,st-sensors.yaml | 1 +
+ .../bindings/interconnect/qcom,rpmh.yaml | 18 +-
+ .../devicetree/bindings/nvmem/apple,efuses.yaml | 50 +
+ .../bindings/nvmem/fsl,layerscape-sfp.yaml | 30 +-
+ .../phy/allwinner,sun6i-a31-mipi-dphy.yaml | 12 +
+ .../bindings/phy/marvell,armada-3700-utmi-phy.yaml | 2 +-
+ .../devicetree/bindings/phy/mixel,mipi-dsi-phy.txt | 29 -
+ .../bindings/phy/mixel,mipi-dsi-phy.yaml | 107 +
+ .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 4 +
+ .../devicetree/bindings/phy/renesas,usb2-phy.yaml | 1 +
+ .../bindings/phy/socionext,uniphier-ahci-phy.yaml | 91 +-
+ .../bindings/phy/socionext,uniphier-pcie-phy.yaml | 47 +-
+ .../bindings/phy/socionext,uniphier-usb2-phy.yaml | 3 +
+ .../phy/socionext,uniphier-usb3hs-phy.yaml | 89 +-
+ .../phy/socionext,uniphier-usb3ss-phy.yaml | 98 +-
+ .../devicetree/bindings/soundwire/qcom,sdw.txt | 14 +
+ Documentation/fpga/dfl.rst | 5 +
+ MAINTAINERS | 18 +-
+ drivers/accessibility/speakup/fakekey.c | 4 +-
+ drivers/accessibility/speakup/serialio.c | 2 +-
+ drivers/accessibility/speakup/speakup_acntpc.c | 2 +-
+ drivers/accessibility/speakup/speakup_acntsa.c | 2 +-
+ drivers/accessibility/speakup/speakup_apollo.c | 2 +-
+ drivers/accessibility/speakup/speakup_audptr.c | 2 +-
+ drivers/accessibility/speakup/speakup_bns.c | 2 +-
+ drivers/accessibility/speakup/speakup_decext.c | 2 +-
+ drivers/accessibility/speakup/speakup_dectlk.c | 2 +-
+ drivers/accessibility/speakup/speakup_dtlk.c | 2 +-
+ drivers/accessibility/speakup/speakup_dummy.c | 2 +-
+ drivers/accessibility/speakup/speakup_keypc.c | 2 +-
+ drivers/accessibility/speakup/speakup_ltlk.c | 2 +-
+ drivers/accessibility/speakup/speakup_soft.c | 3 +-
+ drivers/accessibility/speakup/speakup_spkout.c | 2 +-
+ drivers/accessibility/speakup/speakup_txprt.c | 2 +-
+ drivers/android/binder.c | 197 +-
+ drivers/android/binder_alloc.c | 22 +-
+ drivers/android/binder_internal.h | 5 +
+ drivers/android/binderfs.c | 8 +
+ drivers/bus/mhi/Kconfig | 1 +
+ drivers/bus/mhi/Makefile | 3 +
+ drivers/bus/mhi/common.h | 22 +
+ drivers/bus/mhi/ep/Kconfig | 10 +
+ drivers/bus/mhi/ep/Makefile | 2 +
+ drivers/bus/mhi/ep/internal.h | 218 ++
+ drivers/bus/mhi/ep/main.c | 1591 +++++++++++++
+ drivers/bus/mhi/ep/mmio.c | 273 +++
+ drivers/bus/mhi/ep/ring.c | 207 ++
+ drivers/bus/mhi/ep/sm.c | 148 ++
+ drivers/bus/mhi/host/boot.c | 22 +-
+ drivers/bus/mhi/host/init.c | 89 +-
+ drivers/bus/mhi/host/internal.h | 7 +-
+ drivers/bus/mhi/host/main.c | 18 +-
+ drivers/bus/mhi/host/pci_generic.c | 133 +-
+ drivers/bus/mhi/host/pm.c | 24 +-
+ drivers/bus/ti-sysc.c | 4 +-
+ drivers/char/mem.c | 2 +-
+ drivers/char/misc.c | 24 +-
+ drivers/char/pcmcia/synclink_cs.c | 2 +-
+ drivers/char/xillybus/xillybus_class.c | 26 +-
+ drivers/char/xillybus/xillyusb.c | 1 +
+ drivers/comedi/drivers.c | 2 +-
+ drivers/dio/dio.c | 5 +-
+ drivers/extcon/Kconfig | 3 +-
+ drivers/extcon/extcon-axp288.c | 4 +-
+ drivers/extcon/extcon-intel-int3496.c | 54 +-
+ drivers/extcon/extcon-ptn5150.c | 36 +
+ drivers/extcon/extcon-sm5502.c | 2 +
+ drivers/extcon/extcon-usb-gpio.c | 15 -
+ drivers/extcon/extcon-usbc-cros-ec.c | 2 +-
+ drivers/extcon/extcon.c | 37 +-
+ drivers/firmware/dmi-sysfs.c | 2 +-
+ drivers/firmware/stratix10-svc.c | 12 +-
+ drivers/firmware/xilinx/zynqmp.c | 131 +-
+ drivers/fpga/Makefile | 6 +-
+ drivers/fpga/dfl-pci.c | 9 +
+ drivers/fpga/dfl.c | 38 +-
+ drivers/fpga/dfl.h | 1 +
+ drivers/fpga/fpga-mgr.c | 13 +-
+ drivers/fpga/fpga-region.c | 6 +-
+ drivers/fpga/of-fpga-region.c | 22 +-
+ drivers/hwtracing/coresight/coresight-core.c | 33 +-
+ drivers/hwtracing/coresight/coresight-cpu-debug.c | 7 +-
+ drivers/hwtracing/coresight/coresight-etm3x-core.c | 2 +-
+ .../hwtracing/coresight/coresight-etm3x-sysfs.c | 2 +-
+ drivers/hwtracing/coresight/coresight-etm4x-core.c | 136 +-
+ .../hwtracing/coresight/coresight-etm4x-sysfs.c | 180 +-
+ drivers/hwtracing/coresight/coresight-etm4x.h | 120 +-
+ drivers/iio/accel/Kconfig | 1 -
+ drivers/iio/accel/adxl355_core.c | 7 +-
+ drivers/iio/accel/adxl367.c | 1 -
+ drivers/iio/accel/bmc150-accel-core.c | 4 +-
+ drivers/iio/accel/dmard09.c | 2 +-
+ drivers/iio/accel/fxls8962af-core.c | 1 -
+ drivers/iio/accel/kxsd9-spi.c | 4 +-
+ drivers/iio/accel/mma8452.c | 1 +
+ drivers/iio/accel/sca3000.c | 1 -
+ drivers/iio/accel/ssp_accel_sensor.c | 1 -
+ drivers/iio/accel/st_accel.h | 28 +-
+ drivers/iio/accel/st_accel_core.c | 14 +-
+ drivers/iio/accel/st_accel_i2c.c | 5 +
+ drivers/iio/accel/st_accel_spi.c | 5 +
+ drivers/iio/adc/Kconfig | 2 +-
+ drivers/iio/adc/ad7124.c | 86 +-
+ drivers/iio/adc/ad7192.c | 68 +-
+ drivers/iio/adc/ad7266.c | 44 +-
+ drivers/iio/adc/ad7280a.c | 2 +-
+ drivers/iio/adc/ad_sigma_delta.c | 143 +-
+ drivers/iio/adc/at91-sama5d2_adc.c | 4 +-
+ drivers/iio/adc/ina2xx-adc.c | 3 +-
+ drivers/iio/adc/palmas_gpadc.c | 3 +-
+ drivers/iio/adc/sc27xx_adc.c | 470 +++-
+ drivers/iio/adc/stm32-dfsdm-adc.c | 5 +-
+ drivers/iio/adc/stmpe-adc.c | 21 +-
+ drivers/iio/adc/ti-ads1015.c | 398 ++--
+ drivers/iio/adc/ti-ads8688.c | 1 +
+ drivers/iio/adc/ti_am335x_adc.c | 4 +-
+ drivers/iio/afe/Kconfig | 1 -
+ drivers/iio/afe/iio-rescale.c | 5 +-
+ drivers/iio/buffer/kfifo_buf.c | 10 +-
+ .../common/cros_ec_sensors/cros_ec_sensors_core.c | 5 +-
+ drivers/iio/common/scmi_sensors/scmi_iio.c | 1 -
+ drivers/iio/common/ssp_sensors/ssp_spi.c | 13 +-
+ drivers/iio/common/st_sensors/st_sensors_core.c | 50 +-
+ drivers/iio/dac/Kconfig | 4 +-
+ drivers/iio/dac/ad5064.c | 2 +-
+ drivers/iio/dac/ad5360.c | 2 +-
+ drivers/iio/dac/ad5380.c | 2 +-
+ drivers/iio/dac/ad5446.c | 2 +-
+ drivers/iio/dac/ad5504.c | 2 +-
+ drivers/iio/dac/ad5624r_spi.c | 2 +-
+ drivers/iio/dac/ad5686.c | 2 +-
+ drivers/iio/dac/ad5755.c | 2 +-
+ drivers/iio/dac/ad5791.c | 2 +-
+ drivers/iio/dac/ad7303.c | 2 +-
+ drivers/iio/dac/ltc2632.c | 8 +-
+ drivers/iio/dac/ltc2688.c | 19 +-
+ drivers/iio/dac/max5821.c | 2 +-
+ drivers/iio/dac/mcp4725.c | 4 +-
+ drivers/iio/dac/stm32-dac.c | 2 +-
+ drivers/iio/dac/ti-dac082s085.c | 2 +-
+ drivers/iio/dac/ti-dac5571.c | 2 +-
+ drivers/iio/dac/ti-dac7311.c | 2 +-
+ drivers/iio/dummy/iio_simple_dummy.c | 20 +-
+ drivers/iio/frequency/ad9523.c | 2 +-
+ drivers/iio/gyro/fxas21002c_core.c | 8 +-
+ drivers/iio/gyro/mpu3050-core.c | 14 +-
+ drivers/iio/gyro/mpu3050-i2c.c | 4 +-
+ drivers/iio/gyro/mpu3050.h | 2 +-
+ drivers/iio/gyro/ssp_gyro_sensor.c | 1 -
+ drivers/iio/gyro/st_gyro_core.c | 15 +-
+ drivers/iio/health/max30100.c | 1 -
+ drivers/iio/health/max30102.c | 1 -
+ drivers/iio/imu/adis16480.c | 91 +-
+ drivers/iio/imu/bmi160/bmi160_core.c | 27 +-
+ drivers/iio/imu/bmi160/bmi160_i2c.c | 13 +-
+ drivers/iio/imu/bmi160/bmi160_spi.c | 18 +-
+ drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c | 1 -
+ drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c | 1 -
+ drivers/iio/imu/inv_mpu6050/Kconfig | 4 +-
+ drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 9 +
+ drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 6 +
+ drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 2 +
+ drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 5 +
+ drivers/iio/imu/st_lsm6dsx/Kconfig | 6 +-
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 +
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 4 +-
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 6 +-
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 5 +
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 5 +
+ drivers/iio/industrialio-buffer.c | 42 +-
+ drivers/iio/industrialio-core.c | 46 +-
+ drivers/iio/industrialio-event.c | 2 +-
+ drivers/iio/industrialio-trigger.c | 2 +-
+ drivers/iio/light/Kconfig | 1 -
+ drivers/iio/light/apds9960.c | 1 -
+ drivers/iio/light/stk3310.c | 25 +
+ drivers/iio/light/tsl2772.c | 25 +-
+ drivers/iio/magnetometer/Kconfig | 1 -
+ drivers/iio/magnetometer/rm3100-core.c | 15 +-
+ drivers/iio/magnetometer/st_magn_core.c | 15 +-
+ drivers/iio/multiplexer/Kconfig | 1 -
+ drivers/iio/multiplexer/iio-mux.c | 49 +-
+ drivers/iio/pressure/st_pressure_core.c | 8 +-
+ drivers/iio/proximity/mb1232.c | 8 +-
+ drivers/iio/proximity/ping.c | 5 +-
+ drivers/iio/proximity/vl53l0x-i2c.c | 7 +-
+ drivers/iio/temperature/ltc2983.c | 236 +-
+ drivers/iio/temperature/max31856.c | 6 +-
+ drivers/iio/temperature/max31865.c | 4 +-
+ drivers/iio/trigger/iio-trig-sysfs.c | 11 +-
+ drivers/interconnect/qcom/Kconfig | 18 +
+ drivers/interconnect/qcom/Makefile | 4 +
+ drivers/interconnect/qcom/icc-rpm.c | 16 +-
+ drivers/interconnect/qcom/icc-rpm.h | 6 +-
+ drivers/interconnect/qcom/icc-rpmh.c | 2 +-
+ drivers/interconnect/qcom/icc-rpmh.h | 6 +-
+ drivers/interconnect/qcom/msm8916.c | 12 +-
+ drivers/interconnect/qcom/msm8939.c | 16 +-
+ drivers/interconnect/qcom/msm8974.c | 28 +-
+ drivers/interconnect/qcom/msm8996.c | 16 +-
+ drivers/interconnect/qcom/osm-l3.c | 16 +-
+ drivers/interconnect/qcom/qcm2290.c | 24 +-
+ drivers/interconnect/qcom/qcs404.c | 12 +-
+ drivers/interconnect/qcom/sc7180.c | 66 +-
+ drivers/interconnect/qcom/sc7280.c | 72 +-
+ drivers/interconnect/qcom/sc8180x.c | 1895 ++++++++++++---
+ drivers/interconnect/qcom/sc8180x.h | 7 +
+ drivers/interconnect/qcom/sc8280xp.c | 2438 ++++++++++++++++++++
+ drivers/interconnect/qcom/sc8280xp.h | 209 ++
+ drivers/interconnect/qcom/sdm660.c | 24 +-
+ drivers/interconnect/qcom/sdm845.c | 32 +-
+ drivers/interconnect/qcom/sdx55.c | 12 +-
+ drivers/interconnect/qcom/sdx65.c | 231 ++
+ drivers/interconnect/qcom/sdx65.h | 65 +
+ drivers/interconnect/qcom/sm8150.c | 66 +-
+ drivers/interconnect/qcom/sm8250.c | 66 +-
+ drivers/interconnect/qcom/sm8350.c | 60 +-
+ drivers/interconnect/qcom/sm8450.c | 68 +-
+ drivers/misc/altera-stapl/altera.c | 56 +-
+ drivers/misc/bcm-vk/bcm_vk_msg.c | 29 +-
+ drivers/misc/cardreader/alcor_pci.c | 6 +-
+ drivers/misc/cardreader/rts5261.c | 115 +-
+ drivers/misc/cardreader/rtsx_usb.c | 1 +
+ drivers/misc/fastrpc.c | 18 +-
+ drivers/misc/habanalabs/common/Makefile | 2 +-
+ drivers/misc/habanalabs/common/command_buffer.c | 413 ++--
+ .../misc/habanalabs/common/command_submission.c | 89 +-
+ drivers/misc/habanalabs/common/context.c | 4 +-
+ drivers/misc/habanalabs/common/debugfs.c | 304 ++-
+ drivers/misc/habanalabs/common/device.c | 280 ++-
+ drivers/misc/habanalabs/common/firmware_if.c | 86 +-
+ drivers/misc/habanalabs/common/habanalabs.h | 415 ++--
+ drivers/misc/habanalabs/common/habanalabs_drv.c | 44 +-
+ drivers/misc/habanalabs/common/habanalabs_ioctl.c | 108 +-
+ drivers/misc/habanalabs/common/irq.c | 14 +-
+ drivers/misc/habanalabs/common/memory.c | 289 +--
+ drivers/misc/habanalabs/common/memory_mgr.c | 349 +++
+ drivers/misc/habanalabs/common/mmu/mmu.c | 296 +--
+ drivers/misc/habanalabs/common/mmu/mmu_v1.c | 297 +--
+ drivers/misc/habanalabs/common/pci/pci.c | 10 +-
+ drivers/misc/habanalabs/gaudi/gaudi.c | 412 +---
+ drivers/misc/habanalabs/gaudi/gaudiP.h | 4 +-
+ drivers/misc/habanalabs/goya/goya.c | 363 +--
+ drivers/misc/habanalabs/include/common/cpucp_if.h | 70 +-
+ .../habanalabs/include/hw_ip/mmu/mmu_general.h | 10 +
+ drivers/misc/lkdtm/bugs.c | 96 +-
+ drivers/misc/lkdtm/cfi.c | 145 +-
+ drivers/misc/lkdtm/core.c | 138 +-
+ drivers/misc/lkdtm/fortify.c | 17 +-
+ drivers/misc/lkdtm/heap.c | 48 +-
+ drivers/misc/lkdtm/lkdtm.h | 142 +-
+ drivers/misc/lkdtm/perms.c | 47 +-
+ drivers/misc/lkdtm/powerpc.c | 11 +-
+ drivers/misc/lkdtm/refcount.c | 65 +-
+ drivers/misc/lkdtm/stackleak.c | 12 +-
+ drivers/misc/lkdtm/usercopy.c | 146 +-
+ drivers/misc/pvpanic/pvpanic.c | 10 +-
+ drivers/misc/vmw_balloon.c | 4 +-
+ drivers/misc/vmw_vmci/Kconfig | 2 +-
+ drivers/misc/vmw_vmci/vmci_context.c | 15 +-
+ drivers/misc/vmw_vmci/vmci_guest.c | 4 +
+ drivers/misc/vmw_vmci/vmci_queue_pair.c | 12 +
+ drivers/nvmem/Kconfig | 13 +
+ drivers/nvmem/Makefile | 2 +
+ drivers/nvmem/apple-efuses.c | 80 +
+ drivers/nvmem/bcm-ocotp.c | 2 +-
+ drivers/nvmem/brcm_nvram.c | 2 +
+ drivers/nvmem/core.c | 1 +
+ drivers/nvmem/layerscape-sfp.c | 36 +-
+ drivers/nvmem/qfprom.c | 3 +-
+ drivers/nvmem/sunplus-ocotp.c | 4 +-
+ drivers/phy/Kconfig | 1 +
+ drivers/phy/allwinner/phy-sun6i-mipi-dphy.c | 166 +-
+ drivers/phy/cadence/phy-cadence-sierra.c | 193 +-
+ drivers/phy/freescale/phy-fsl-imx8-mipi-dphy.c | 276 ++-
+ drivers/phy/freescale/phy-fsl-imx8m-pcie.c | 10 +-
+ drivers/phy/mediatek/phy-mtk-hdmi.c | 50 +-
+ drivers/phy/mediatek/phy-mtk-mipi-dsi.c | 29 +-
+ drivers/phy/phy-can-transceiver.c | 24 +-
+ drivers/phy/phy-core.c | 44 +-
+ drivers/phy/qualcomm/phy-qcom-qmp.c | 124 +-
+ drivers/phy/rockchip/phy-rockchip-dphy-rx0.c | 7 +-
+ drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 129 +-
+ drivers/phy/rockchip/phy-rockchip-typec.c | 6 +-
+ drivers/power/supply/axp288_charger.c | 17 +-
+ drivers/power/supply/charger-manager.c | 7 +-
+ drivers/power/supply/max8997_charger.c | 8 +-
+ drivers/slimbus/qcom-ctrl.c | 4 +-
+ drivers/slimbus/qcom-ngd-ctrl.c | 10 +-
+ drivers/soc/xilinx/xlnx_event_manager.c | 203 +-
+ drivers/soc/xilinx/zynqmp_power.c | 7 +-
+ drivers/soundwire/bus.c | 27 +-
+ drivers/soundwire/cadence_master.c | 42 +-
+ drivers/soundwire/intel.c | 11 +-
+ drivers/soundwire/qcom.c | 22 +-
+ drivers/soundwire/stream.c | 1 +
+ drivers/staging/iio/cdc/ad7746.c | 2 +-
+ drivers/staging/iio/impedance-analyzer/ad5933.c | 1 -
+ drivers/staging/iio/resolver/ad2s1210.c | 1 -
+ drivers/uio/uio_dfl.c | 2 +
+ drivers/usb/phy/phy-omap-otg.c | 4 +-
+ drivers/usb/typec/tcpm/fusb302.c | 4 +-
+ drivers/virt/fsl_hypervisor.c | 3 +-
+ drivers/w1/masters/ds2490.c | 124 +-
+ include/dt-bindings/interconnect/qcom,sc8180x.h | 7 +
+ include/dt-bindings/interconnect/qcom,sc8280xp.h | 232 ++
+ include/dt-bindings/interconnect/qcom,sdx65.h | 67 +
+ include/linux/extcon.h | 2 +-
+ include/linux/firmware/xlnx-event-manager.h | 4 +-
+ include/linux/firmware/xlnx-zynqmp.h | 11 +
+ include/linux/fpga/fpga-region.h | 6 +-
+ include/linux/iio/adc/ad_sigma_delta.h | 38 +
+ include/linux/iio/common/st_sensors.h | 3 +
+ include/linux/iio/iio-opaque.h | 4 +
+ include/linux/iio/iio.h | 70 +-
+ include/linux/iio/kfifo_buf.h | 5 +-
+ include/linux/mhi_ep.h | 277 +++
+ include/linux/mod_devicetable.h | 2 +
+ include/linux/nvmem-consumer.h | 1 +
+ include/linux/phy/phy-lvds.h | 32 +
+ include/linux/phy/phy.h | 4 +
+ include/linux/rtsx_pci.h | 3 +
+ include/uapi/linux/android/binder.h | 16 +
+ include/uapi/misc/habanalabs.h | 87 +-
+ scripts/mod/file2alias.c | 10 +
+ scripts/tags.sh | 11 +-
+ .../selftests/filesystems/binderfs/binderfs_test.c | 1 +
+ tools/testing/selftests/lkdtm/config | 4 +
+ tools/testing/selftests/lkdtm/tests.txt | 9 +-
+ 341 files changed, 15530 insertions(+), 4625 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/nvmem/apple,efuses.yaml
+ delete mode 100644 Documentation/devicetree/bindings/phy/mixel,mipi-dsi-phy.txt
+ create mode 100644 Documentation/devicetree/bindings/phy/mixel,mipi-dsi-phy.yaml
+ create mode 100644 drivers/bus/mhi/ep/Kconfig
+ create mode 100644 drivers/bus/mhi/ep/Makefile
+ create mode 100644 drivers/bus/mhi/ep/internal.h
+ create mode 100644 drivers/bus/mhi/ep/main.c
+ create mode 100644 drivers/bus/mhi/ep/mmio.c
+ create mode 100644 drivers/bus/mhi/ep/ring.c
+ create mode 100644 drivers/bus/mhi/ep/sm.c
+ create mode 100644 drivers/interconnect/qcom/sc8280xp.c
+ create mode 100644 drivers/interconnect/qcom/sc8280xp.h
+ create mode 100644 drivers/interconnect/qcom/sdx65.c
+ create mode 100644 drivers/interconnect/qcom/sdx65.h
+ create mode 100644 drivers/misc/habanalabs/common/memory_mgr.c
+ create mode 100644 drivers/nvmem/apple-efuses.c
+ create mode 100644 include/dt-bindings/interconnect/qcom,sc8280xp.h
+ create mode 100644 include/dt-bindings/interconnect/qcom,sdx65.h
+ create mode 100644 include/linux/mhi_ep.h
+ create mode 100644 include/linux/phy/phy-lvds.h
+$ git am -3 ../patches/0001-fixup-for-usb-dwc3-Don-t-switch-OTG-peripheral-if-ex.patch
+Applying: fixup for "usb: dwc3: Don't switch OTG -> peripheral if extcon is present"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/usb/dwc3/core.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 0ecf5c4718b5] Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
+ Date: Thu May 26 13:54:14 2022 +1000
+Merging coresight/next (1adff542d67a coresight: cpu-debug: Replace mutex with mutex_trylock on panic notifier)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next
+Already up to date.
+Merging fpga/for-next (ae23f746d744 fpga: dfl: Allow Port to be linked to FME's DFL)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next
+Already up to date.
+Merging icc/icc-next (3be0ec65fd17 dt-bindings: interconnect: Remove sc7180/sdx55 ipa compatibles)
+$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next
+Already up to date.
+Merging iio/togreg (c321674386d8 iio: adc: rzg2l_adc: Remove unnecessary channel check from rzg2l_adc_read_label())
+$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg
+Auto-merging drivers/iio/adc/rzg2l_adc.c
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-bus-iio | 5 +
+ .../bindings/iio/adc/renesas,rzg2l-adc.yaml | 28 +-
+ drivers/iio/accel/Kconfig | 2 +
+ drivers/iio/accel/bma400.h | 50 +-
+ drivers/iio/accel/bma400_core.c | 710 +++++++++++++++++++--
+ drivers/iio/accel/bma400_i2c.c | 10 +-
+ drivers/iio/accel/bma400_spi.c | 8 +-
+ drivers/iio/accel/cros_ec_accel_legacy.c | 2 +-
+ drivers/iio/accel/mc3230.c | 4 +-
+ drivers/iio/accel/stk8312.c | 4 +-
+ drivers/iio/accel/stk8ba50.c | 4 +-
+ drivers/iio/adc/rzg2l_adc.c | 3 -
+ drivers/iio/adc/stx104.c | 56 +-
+ .../common/cros_ec_sensors/cros_ec_sensors_core.c | 30 +-
+ drivers/iio/dac/cio-dac.c | 14 +-
+ drivers/iio/health/afe4404.c | 4 +-
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c | 2 +-
+ drivers/iio/light/bh1780.c | 7 +-
+ drivers/iio/light/cros_ec_light_prox.c | 2 -
+ drivers/iio/light/isl29028.c | 4 +-
+ drivers/iio/light/jsa1212.c | 4 +-
+ drivers/iio/light/opt3001.c | 3 +-
+ drivers/iio/light/stk3310.c | 4 +-
+ drivers/iio/light/tsl2583.c | 4 +-
+ drivers/iio/pressure/cros_ec_baro.c | 2 -
+ drivers/iio/proximity/srf04.c | 11 +-
+ drivers/iio/trigger/stm32-lptimer-trigger.c | 3 +-
+ include/linux/iio/common/cros_ec_sensors_core.h | 2 -
+ 28 files changed, 822 insertions(+), 160 deletions(-)
+Merging phy-next/next (d413a34932f9 phy: qcom-qmp: rename error labels)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next
+Already up to date.
+Merging soundwire/next (74da272400b4 soundwire: qcom: adjust autoenumeration timeout)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next
+Already up to date.
+Merging extcon/extcon-next (5dcc2afe716d extcon: Modify extcon device to be created after driver data is set)
+$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next
+Already up to date.
+Merging gnss/gnss-next (312310928417 Linux 5.18-rc1)
+$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next
+Already up to date.
+Merging vfio/next (421cfe6596f6 vfio: remove VFIO_GROUP_NOTIFY_SET_KVM)
+$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next
+Auto-merging drivers/iommu/iommu.c
+Auto-merging drivers/vfio/vfio.c
+Merge made by the 'ort' strategy.
+ Documentation/driver-api/vfio-mediated-device.rst | 4 +-
+ drivers/gpu/drm/i915/gvt/gtt.c | 4 +-
+ drivers/gpu/drm/i915/gvt/gvt.h | 8 +-
+ drivers/gpu/drm/i915/gvt/kvmgt.c | 115 +---
+ drivers/s390/cio/vfio_ccw_cp.c | 47 +-
+ drivers/s390/cio/vfio_ccw_cp.h | 4 +-
+ drivers/s390/cio/vfio_ccw_fsm.c | 3 +-
+ drivers/s390/cio/vfio_ccw_ops.c | 7 +-
+ drivers/s390/crypto/vfio_ap_ops.c | 50 +-
+ drivers/s390/crypto/vfio_ap_private.h | 3 -
+ drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 16 +-
+ drivers/vfio/pci/mlx5/cmd.c | 236 +++++--
+ drivers/vfio/pci/mlx5/cmd.h | 52 +-
+ drivers/vfio/pci/mlx5/main.c | 136 ++--
+ drivers/vfio/pci/vfio_pci.c | 6 +-
+ drivers/vfio/pci/vfio_pci_config.c | 56 +-
+ drivers/vfio/pci/vfio_pci_core.c | 254 ++++---
+ drivers/vfio/vfio.c | 781 ++++++++--------------
+ include/linux/vfio.h | 44 +-
+ include/linux/vfio_pci_core.h | 3 +-
+ include/uapi/linux/vfio.h | 4 +-
+ virt/kvm/vfio.c | 329 ++++-----
+ 22 files changed, 1019 insertions(+), 1143 deletions(-)
+Merging staging/staging-next (6a31a95135da staging: r8188eu: remove include/rtw_debug.h)
+$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next
+Auto-merging MAINTAINERS
+Auto-merging MAINTAINERS
+Auto-merging drivers/net/wireless/silabs/wfx/hif_tx.c
+Auto-merging drivers/net/wireless/silabs/wfx/main.c
+Auto-merging drivers/net/wireless/silabs/wfx/sta.c
+CONFLICT (content): Merge conflict in drivers/net/wireless/silabs/wfx/sta.c
+Auto-merging drivers/staging/greybus/audio_codec.c
+Resolved 'drivers/net/wireless/silabs/wfx/sta.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 10e58a408f6f] Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 10 +-
+ drivers/Kconfig | 2 -
+ drivers/Makefile | 1 -
+ drivers/net/wireless/silabs/wfx/hif_tx.c | 10 +-
+ drivers/net/wireless/silabs/wfx/main.c | 2 +-
+ drivers/net/wireless/silabs/wfx/sta.c | 20 +-
+ drivers/staging/Kconfig | 3 +-
+ drivers/staging/Makefile | 3 +-
+ drivers/staging/fieldbus/anybuss/host.c | 2 +-
+ drivers/staging/greybus/arche-apb-ctrl.c | 2 +-
+ drivers/staging/greybus/arche-platform.c | 2 +-
+ drivers/staging/greybus/audio_codec.c | 32 +-
+ drivers/staging/greybus/pwm.c | 1 -
+ drivers/staging/greybus/tools/loopback_test.c | 2 +-
+ drivers/staging/ks7010/ks_hostif.c | 19 +-
+ drivers/staging/ks7010/ks_wlan.h | 2 +-
+ drivers/staging/most/dim2/dim2.c | 29 +-
+ drivers/staging/qlge/qlge.h | 1 +
+ drivers/staging/r8188eu/core/rtw_ap.c | 3 -
+ drivers/staging/r8188eu/core/rtw_br_ext.c | 76 +-
+ drivers/staging/r8188eu/core/rtw_cmd.c | 337 ++-
+ drivers/staging/r8188eu/core/rtw_fw.c | 163 +-
+ drivers/staging/r8188eu/core/rtw_ieee80211.c | 45 +-
+ drivers/staging/r8188eu/core/rtw_ioctl_set.c | 4 +-
+ drivers/staging/r8188eu/core/rtw_iol.c | 4 +-
+ drivers/staging/r8188eu/core/rtw_led.c | 10 +-
+ drivers/staging/r8188eu/core/rtw_mlme.c | 321 ++-
+ drivers/staging/r8188eu/core/rtw_mlme_ext.c | 755 ++++---
+ drivers/staging/r8188eu/core/rtw_p2p.c | 70 +-
+ drivers/staging/r8188eu/core/rtw_pwrctrl.c | 109 +-
+ drivers/staging/r8188eu/core/rtw_recv.c | 319 ++-
+ drivers/staging/r8188eu/core/rtw_security.c | 6 +-
+ drivers/staging/r8188eu/core/rtw_sta_mgt.c | 4 +-
+ drivers/staging/r8188eu/core/rtw_wlan_util.c | 135 +-
+ drivers/staging/r8188eu/core/rtw_xmit.c | 104 +-
+ drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c | 6 +-
+ drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c | 2 +-
+ drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c | 2 +-
+ drivers/staging/r8188eu/hal/HalPwrSeqCmd.c | 22 -
+ drivers/staging/r8188eu/hal/hal_com.c | 4 +-
+ drivers/staging/r8188eu/hal/odm_HWConfig.c | 8 +-
+ drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 49 +-
+ drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 15 +-
+ drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 8 +-
+ drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 7 +-
+ drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 8 +-
+ drivers/staging/r8188eu/hal/usb_halinit.c | 355 +---
+ drivers/staging/r8188eu/hal/usb_ops_linux.c | 10 +-
+ drivers/staging/r8188eu/include/HalVerDef.h | 5 +-
+ drivers/staging/r8188eu/include/basic_types.h | 73 +-
+ drivers/staging/r8188eu/include/drv_types.h | 7 +-
+ drivers/staging/r8188eu/include/hal_intf.h | 34 +-
+ drivers/staging/r8188eu/include/ieee80211.h | 63 -
+ drivers/staging/r8188eu/include/odm.h | 29 -
+ drivers/staging/r8188eu/include/osdep_service.h | 47 -
+ drivers/staging/r8188eu/include/rtl8188e_hal.h | 3 -
+ drivers/staging/r8188eu/include/rtl8188e_spec.h | 10 +-
+ drivers/staging/r8188eu/include/rtw_debug.h | 55 -
+ drivers/staging/r8188eu/include/rtw_eeprom.h | 3 -
+ drivers/staging/r8188eu/include/rtw_fw.h | 5 +
+ drivers/staging/r8188eu/include/rtw_ioctl.h | 79 -
+ drivers/staging/r8188eu/include/rtw_mlme.h | 11 +-
+ drivers/staging/r8188eu/include/rtw_mlme_ext.h | 62 +-
+ drivers/staging/r8188eu/include/rtw_pwrctrl.h | 23 +-
+ drivers/staging/r8188eu/include/rtw_recv.h | 3 -
+ drivers/staging/r8188eu/include/rtw_xmit.h | 4 +-
+ drivers/staging/r8188eu/include/sta_info.h | 2 -
+ drivers/staging/r8188eu/include/usb_ops.h | 22 +-
+ drivers/staging/r8188eu/include/usb_osintf.h | 4 -
+ drivers/staging/r8188eu/include/usb_vendor_req.h | 35 -
+ drivers/staging/r8188eu/include/wifi.h | 60 +-
+ drivers/staging/r8188eu/os_dep/ioctl_linux.c | 295 +--
+ drivers/staging/r8188eu/os_dep/mlme_linux.c | 1 -
+ drivers/staging/r8188eu/os_dep/os_intfs.c | 45 +-
+ drivers/staging/r8188eu/os_dep/osdep_service.c | 27 +-
+ drivers/staging/r8188eu/os_dep/usb_intf.c | 5 +-
+ drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 19 +-
+ drivers/staging/r8188eu/os_dep/xmit_linux.c | 16 +-
+ drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 8 +-
+ drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 2 +-
+ drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 52 +-
+ .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 3 +-
+ drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 22 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 20 +-
+ drivers/staging/rtl8192e/rtl819x_BAProc.c | 5 +-
+ drivers/staging/rtl8192e/rtllib.h | 2 +-
+ drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 10 +-
+ drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 38 +-
+ drivers/staging/rtl8192e/rtllib_rx.c | 22 +-
+ drivers/staging/rtl8192e/rtllib_softmac.c | 63 +-
+ drivers/staging/rtl8192e/rtllib_softmac_wx.c | 4 +-
+ drivers/staging/rtl8192e/rtllib_wx.c | 2 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211.h | 2 +-
+ .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 2 +-
+ .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 2 +-
+ .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 2 +-
+ .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 30 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 8 +-
+ .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 15 +-
+ drivers/staging/rtl8192u/r8192U_core.c | 2 +-
+ drivers/staging/rtl8712/drv_types.h | 3 +-
+ drivers/staging/rtl8712/ieee80211.c | 4 +-
+ drivers/staging/rtl8712/os_intfs.c | 1 -
+ drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h | 1 -
+ drivers/staging/rtl8712/rtl8712_efuse.h | 4 +-
+ .../staging/rtl8712/rtl8712_macsetting_bitdef.h | 3 -
+ .../staging/rtl8712/rtl8712_macsetting_regdef.h | 2 -
+ drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h | 1 -
+ drivers/staging/rtl8712/rtl8712_recv.c | 16 +-
+ drivers/staging/rtl8712/rtl8712_security_bitdef.h | 1 -
+ drivers/staging/rtl8712/rtl8712_spec.h | 3 -
+ drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h | 4 -
+ drivers/staging/rtl8712/rtl8712_syscfg_regdef.h | 2 -
+ drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h | 1 -
+ drivers/staging/rtl8712/rtl8712_wmac_bitdef.h | 1 -
+ drivers/staging/rtl8712/rtl871x_cmd.c | 4 +-
+ drivers/staging/rtl8712/rtl871x_cmd.h | 3 -
+ drivers/staging/rtl8712/rtl871x_ioctl.h | 1 -
+ drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 24 +-
+ drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 1 -
+ drivers/staging/rtl8712/rtl871x_ioctl_set.c | 3 +-
+ drivers/staging/rtl8712/rtl871x_mlme.c | 102 +-
+ drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 1 -
+ drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h | 3 -
+ drivers/staging/rtl8712/rtl871x_recv.c | 1 -
+ drivers/staging/rtl8712/rtl871x_security.c | 1 -
+ drivers/staging/rtl8712/sta_info.h | 1 -
+ drivers/staging/rtl8712/usb_intf.c | 14 +-
+ drivers/staging/rtl8712/usb_ops.c | 27 +-
+ drivers/staging/rtl8712/usb_ops_linux.c | 21 +-
+ drivers/staging/rtl8712/wifi.h | 1 -
+ drivers/staging/rtl8712/xmit_linux.c | 8 +-
+ drivers/staging/rtl8723bs/core/rtw_ap.c | 24 +-
+ drivers/staging/rtl8723bs/core/rtw_cmd.c | 12 +-
+ drivers/staging/rtl8723bs/core/rtw_efuse.c | 54 +-
+ drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 44 +-
+ drivers/staging/rtl8723bs/core/rtw_mlme.c | 66 +-
+ drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 194 +-
+ drivers/staging/rtl8723bs/core/rtw_rf.c | 56 +-
+ drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 11 -
+ drivers/staging/rtl8723bs/hal/hal_btcoex.c | 8 -
+ drivers/staging/rtl8723bs/hal/sdio_ops.c | 15 +-
+ drivers/staging/rtl8723bs/include/HalVerDef.h | 10 -
+ drivers/staging/rtl8723bs/include/drv_types.h | 1 -
+ drivers/staging/rtl8723bs/include/hal_com_reg.h | 295 ---
+ drivers/staging/rtl8723bs/include/rtw_ioctl.h | 72 -
+ drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +-
+ drivers/staging/rts5208/rtsx_transport.c | 12 +-
+ drivers/staging/sm750fb/sm750_hw.c | 1 +
+ .../Documentation/ABI/sysfs-platform-visorchipset | 89 -
+ drivers/staging/unisys/Documentation/overview.txt | 337 ---
+ drivers/staging/unisys/Kconfig | 16 -
+ drivers/staging/unisys/MAINTAINERS | 5 -
+ drivers/staging/unisys/Makefile | 7 -
+ drivers/staging/unisys/TODO | 16 -
+ drivers/staging/unisys/include/iochannel.h | 571 ------
+ drivers/staging/unisys/visorhba/Kconfig | 15 -
+ drivers/staging/unisys/visorhba/Makefile | 10 -
+ drivers/staging/unisys/visorhba/visorhba_main.c | 1142 -----------
+ drivers/staging/unisys/visorinput/Kconfig | 16 -
+ drivers/staging/unisys/visorinput/Makefile | 7 -
+ drivers/staging/unisys/visorinput/visorinput.c | 788 -------
+ drivers/staging/unisys/visornic/Kconfig | 16 -
+ drivers/staging/unisys/visornic/Makefile | 10 -
+ drivers/staging/unisys/visornic/visornic_main.c | 2148 --------------------
+ drivers/staging/vc04_services/Kconfig | 1 +
+ .../staging/vc04_services/bcm2835-audio/Kconfig | 8 +-
+ drivers/staging/vc04_services/bcm2835-audio/TODO | 10 -
+ .../vc04_services/bcm2835-audio/bcm2835-ctl.c | 86 +-
+ .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 5 +-
+ .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 2 +-
+ .../staging/vc04_services/bcm2835-audio/bcm2835.c | 33 +-
+ .../staging/vc04_services/bcm2835-audio/bcm2835.h | 2 +-
+ .../staging/vc04_services/bcm2835-camera/Kconfig | 4 +-
+ .../vc04_services/bcm2835-camera/bcm2835-camera.c | 24 +-
+ .../vc04_services/bcm2835-camera/controls.c | 33 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 26 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_core.h | 1 -
+ .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 13 +-
+ .../vc04_services/vchiq-mmal/mmal-msg-common.h | 7 +-
+ .../vc04_services/vchiq-mmal/mmal-msg-format.h | 6 +-
+ .../vc04_services/vchiq-mmal/mmal-parameters.h | 15 +-
+ .../staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 11 +-
+ drivers/staging/vme/Makefile | 2 -
+ drivers/staging/{vme/devices => vme_user}/Kconfig | 2 +-
+ drivers/staging/{vme/devices => vme_user}/Makefile | 0
+ .../staging/{vme/devices => vme_user}/vme_user.c | 2 +-
+ .../staging/{vme/devices => vme_user}/vme_user.h | 0
+ drivers/staging/vt6655/baseband.c | 15 +-
+ drivers/staging/vt6655/card.c | 38 +-
+ drivers/staging/vt6655/card.h | 2 +-
+ drivers/staging/vt6655/channel.c | 6 +-
+ drivers/staging/vt6655/device_main.c | 37 +-
+ drivers/staging/vt6655/key.c | 1 -
+ drivers/staging/vt6655/mac.c | 1 -
+ drivers/staging/vt6655/mac.h | 271 +--
+ drivers/staging/vt6655/rf.c | 10 +-
+ drivers/staging/vt6655/rxtx.c | 6 +-
+ drivers/staging/vt6655/srom.c | 19 +-
+ drivers/staging/vt6655/tmacro.h | 43 -
+ drivers/staging/vt6655/upc.h | 25 -
+ drivers/staging/vt6656/channel.c | 1 -
+ drivers/staging/vt6656/rf.c | 1 -
+ drivers/staging/wlan-ng/cfg80211.c | 10 +-
+ drivers/staging/wlan-ng/hfa384x.h | 4 +-
+ drivers/staging/wlan-ng/hfa384x_usb.c | 34 +-
+ drivers/staging/wlan-ng/prism2usb.c | 8 +-
+ drivers/visorbus/Kconfig | 15 -
+ drivers/visorbus/Makefile | 10 -
+ drivers/visorbus/controlvmchannel.h | 650 ------
+ drivers/visorbus/vbuschannel.h | 95 -
+ drivers/visorbus/visorbus_main.c | 1234 -----------
+ drivers/visorbus/visorbus_private.h | 48 -
+ drivers/visorbus/visorchannel.c | 434 ----
+ drivers/visorbus/visorchipset.c | 1691 ---------------
+ drivers/vme/Kconfig | 2 -
+ 216 files changed, 2092 insertions(+), 13712 deletions(-)
+ delete mode 100644 drivers/staging/r8188eu/include/rtw_debug.h
+ delete mode 100644 drivers/staging/r8188eu/include/usb_vendor_req.h
+ delete mode 100644 drivers/staging/rtl8723bs/include/rtw_ioctl.h
+ delete mode 100644 drivers/staging/unisys/Documentation/ABI/sysfs-platform-visorchipset
+ delete mode 100644 drivers/staging/unisys/Documentation/overview.txt
+ delete mode 100644 drivers/staging/unisys/Kconfig
+ delete mode 100644 drivers/staging/unisys/MAINTAINERS
+ delete mode 100644 drivers/staging/unisys/Makefile
+ delete mode 100644 drivers/staging/unisys/TODO
+ delete mode 100644 drivers/staging/unisys/include/iochannel.h
+ delete mode 100644 drivers/staging/unisys/visorhba/Kconfig
+ delete mode 100644 drivers/staging/unisys/visorhba/Makefile
+ delete mode 100644 drivers/staging/unisys/visorhba/visorhba_main.c
+ delete mode 100644 drivers/staging/unisys/visorinput/Kconfig
+ delete mode 100644 drivers/staging/unisys/visorinput/Makefile
+ delete mode 100644 drivers/staging/unisys/visorinput/visorinput.c
+ delete mode 100644 drivers/staging/unisys/visornic/Kconfig
+ delete mode 100644 drivers/staging/unisys/visornic/Makefile
+ delete mode 100644 drivers/staging/unisys/visornic/visornic_main.c
+ delete mode 100644 drivers/staging/vc04_services/bcm2835-audio/TODO
+ delete mode 100644 drivers/staging/vme/Makefile
+ rename drivers/staging/{vme/devices => vme_user}/Kconfig (93%)
+ rename drivers/staging/{vme/devices => vme_user}/Makefile (100%)
+ rename drivers/staging/{vme/devices => vme_user}/vme_user.c (99%)
+ rename drivers/staging/{vme/devices => vme_user}/vme_user.h (100%)
+ delete mode 100644 drivers/staging/vt6655/tmacro.h
+ delete mode 100644 drivers/visorbus/Kconfig
+ delete mode 100644 drivers/visorbus/Makefile
+ delete mode 100644 drivers/visorbus/controlvmchannel.h
+ delete mode 100644 drivers/visorbus/vbuschannel.h
+ delete mode 100644 drivers/visorbus/visorbus_main.c
+ delete mode 100644 drivers/visorbus/visorbus_private.h
+ delete mode 100644 drivers/visorbus/visorchannel.c
+ delete mode 100644 drivers/visorbus/visorchipset.c
+Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4)
+$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next
+Already up to date.
+Merging dmaengine/next (d1a285978082 dmaengine: idxd: make idxd_wq_enable() return 0 if wq is already enabled)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next
+Auto-merging Documentation/devicetree/bindings/dma/qcom,gpi.yaml
+Auto-merging MAINTAINERS
+Auto-merging drivers/clk/renesas/r9a06g032-clocks.c
+Auto-merging drivers/dma/at_xdmac.c
+Auto-merging drivers/dma/idxd/device.c
+CONFLICT (content): Merge conflict in drivers/dma/idxd/device.c
+Auto-merging drivers/dma/idxd/sysfs.c
+Resolved 'drivers/dma/idxd/device.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 5c0fb023123b] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/clock/renesas,r9a06g032-sysctrl.yaml | 11 +
+ .../bindings/dma/allwinner,sun50i-a64-dma.yaml | 9 +-
+ .../devicetree/bindings/dma/altr,msgdma.yaml | 2 +-
+ .../devicetree/bindings/dma/arm,pl330.yaml | 3 +
+ Documentation/devicetree/bindings/dma/mmp-dma.txt | 10 +-
+ .../bindings/dma/nvidia,tegra186-gpc-dma.yaml | 110 ++
+ .../devicetree/bindings/dma/qcom,gpi.yaml | 3 +
+ .../devicetree/bindings/dma/renesas,rcar-dmac.yaml | 10 +-
+ .../bindings/dma/renesas,rzn1-dmamux.yaml | 51 +
+ .../bindings/dma/sifive,fu540-c000-pdma.yaml | 19 +-
+ .../bindings/dma/snps,dma-spear1340.yaml | 8 +-
+ Documentation/devicetree/bindings/dma/sprd-dma.txt | 7 +-
+ .../devicetree/bindings/dma/xilinx/xilinx_dma.txt | 6 +-
+ Documentation/driver-api/dmaengine/provider.rst | 8 +-
+ MAINTAINERS | 3 +-
+ drivers/clk/renesas/r9a06g032-clocks.c | 40 +-
+ drivers/dma/Kconfig | 14 +-
+ drivers/dma/Makefile | 1 +
+ drivers/dma/amba-pl08x.c | 11 -
+ drivers/dma/at_hdmac.c | 10 +-
+ drivers/dma/at_xdmac.c | 9 +-
+ drivers/dma/bestcomm/bestcomm.c | 2 +
+ drivers/dma/dma-jz4780.c | 9 +
+ drivers/dma/dmaengine.c | 7 -
+ drivers/dma/dmatest.c | 13 +-
+ drivers/dma/dw/Kconfig | 9 +
+ drivers/dma/dw/Makefile | 2 +
+ drivers/dma/dw/platform.c | 1 +
+ drivers/dma/dw/rzn1-dmamux.c | 155 ++
+ drivers/dma/ep93xx_dma.c | 2 +-
+ drivers/dma/idxd/cdev.c | 18 +-
+ drivers/dma/idxd/device.c | 151 +-
+ drivers/dma/idxd/dma.c | 65 +-
+ drivers/dma/idxd/idxd.h | 20 +-
+ drivers/dma/idxd/init.c | 30 +-
+ drivers/dma/idxd/registers.h | 1 +
+ drivers/dma/idxd/sysfs.c | 12 +-
+ drivers/dma/mediatek/mtk-cqdma.c | 12 +-
+ drivers/dma/mediatek/mtk-hsdma.c | 13 +-
+ drivers/dma/mmp_pdma.c | 14 +-
+ drivers/dma/mv_xor_v2.c | 4 +-
+ drivers/dma/nbpfaxi.c | 14 +-
+ drivers/dma/plx_dma.c | 4 +-
+ drivers/dma/ptdma/ptdma-dev.c | 36 +-
+ drivers/dma/ptdma/ptdma-dmaengine.c | 16 +-
+ drivers/dma/ptdma/ptdma.h | 13 +
+ drivers/dma/pxa_dma.c | 13 +-
+ drivers/dma/qcom/gpi.c | 21 +-
+ drivers/dma/qcom/hidma.c | 13 +-
+ drivers/dma/sf-pdma/sf-pdma.c | 24 +-
+ drivers/dma/sf-pdma/sf-pdma.h | 8 +-
+ drivers/dma/sh/Kconfig | 2 +-
+ drivers/dma/sprd-dma.c | 6 +-
+ drivers/dma/stm32-dma.c | 311 +++-
+ drivers/dma/stm32-dmamux.c | 2 +-
+ drivers/dma/stm32-mdma.c | 53 +-
+ drivers/dma/sun6i-dma.c | 92 +-
+ drivers/dma/tegra186-gpc-dma.c | 1498 ++++++++++++++++++++
+ drivers/dma/ti/cppi41.c | 6 +-
+ drivers/dma/ti/k3-psil-am62.c | 8 +-
+ drivers/dma/xilinx/zynqmp_dma.c | 17 +-
+ include/linux/dmaengine.h | 9 +-
+ include/linux/soc/renesas/r9a06g032-sysctrl.h | 11 +
+ include/uapi/linux/idxd.h | 31 +-
+ 64 files changed, 2744 insertions(+), 349 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dma/nvidia,tegra186-gpc-dma.yaml
+ create mode 100644 Documentation/devicetree/bindings/dma/renesas,rzn1-dmamux.yaml
+ create mode 100644 drivers/dma/dw/rzn1-dmamux.c
+ create mode 100644 drivers/dma/tegra186-gpc-dma.c
+ create mode 100644 include/linux/soc/renesas/r9a06g032-sysctrl.h
+Merging cgroup/for-next (8a4f243bd5cf Merge branch 'for-5.19' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next
+Merge made by the 'ort' strategy.
+Merging scsi/for-next (c4068bc397c5 Merge branch 'misc' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/Kconfig
+Auto-merging drivers/Makefile
+Auto-merging drivers/infiniband/ulp/isert/ib_isert.c
+Auto-merging drivers/nvme/host/fc.c
+Auto-merging drivers/scsi/fcoe/fcoe.c
+Auto-merging drivers/scsi/lpfc/lpfc_scsi.c
+Auto-merging drivers/scsi/sd.c
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-driver-ufs | 18 +-
+ MAINTAINERS | 10 +-
+ drivers/Kconfig | 2 +
+ drivers/Makefile | 1 +
+ drivers/infiniband/ulp/isert/ib_isert.c | 104 +-
+ drivers/infiniband/ulp/isert/ib_isert.h | 4 +-
+ drivers/message/fusion/mptctl.c | 3 -
+ drivers/nvme/host/fc.c | 18 +
+ drivers/scsi/Kconfig | 1 -
+ drivers/scsi/Makefile | 1 -
+ drivers/scsi/aacraid/aacraid.h | 2 +-
+ drivers/scsi/aha1542.c | 20 +-
+ drivers/scsi/bfa/bfad_debugfs.c | 3 +-
+ drivers/scsi/bfa/bfad_im.c | 1 -
+ drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 22 +-
+ drivers/scsi/bnx2fc/bnx2fc_io.c | 17 +-
+ drivers/scsi/dc395x.c | 15 +-
+ drivers/scsi/dpt_i2o.c | 1 -
+ drivers/scsi/elx/efct/efct_hw.c | 1 -
+ drivers/scsi/elx/efct/efct_io.c | 1 -
+ drivers/scsi/elx/efct/efct_lio.c | 3 -
+ drivers/scsi/esas2r/esas2r_flash.c | 2 +-
+ drivers/scsi/fcoe/fcoe.c | 44 +-
+ drivers/scsi/fcoe/fcoe_ctlr.c | 26 +-
+ drivers/scsi/fcoe/fcoe_transport.c | 6 +-
+ drivers/scsi/fnic/fnic.h | 2 +-
+ drivers/scsi/fnic/fnic_debugfs.c | 3 +-
+ drivers/scsi/fnic/fnic_main.c | 10 +-
+ drivers/scsi/hisi_sas/hisi_sas_main.c | 68 +-
+ drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 10 +-
+ drivers/scsi/hosts.c | 8 +-
+ drivers/scsi/ipr.c | 13 +-
+ drivers/scsi/isci/request.c | 2 +-
+ drivers/scsi/libfc/fc_exch.c | 3 +-
+ drivers/scsi/libfc/fc_fcp.c | 29 +-
+ drivers/scsi/libfc/fc_lport.c | 30 +-
+ drivers/scsi/libsas/sas_ata.c | 41 +-
+ drivers/scsi/lpfc/Makefile | 2 +-
+ drivers/scsi/lpfc/lpfc.h | 10 +-
+ drivers/scsi/lpfc/lpfc_attr.c | 55 +-
+ drivers/scsi/lpfc/lpfc_bsg.c | 81 +-
+ drivers/scsi/lpfc/lpfc_crtn.h | 8 +-
+ drivers/scsi/lpfc/lpfc_ct.c | 366 ++--
+ drivers/scsi/lpfc/lpfc_els.c | 715 ++++----
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 164 +-
+ drivers/scsi/lpfc/lpfc_hw.h | 75 +-
+ drivers/scsi/lpfc/lpfc_hw4.h | 17 +-
+ drivers/scsi/lpfc/lpfc_init.c | 274 ++-
+ drivers/scsi/lpfc/lpfc_logmsg.h | 8 +-
+ drivers/scsi/lpfc/lpfc_mbox.c | 203 ++-
+ drivers/scsi/lpfc/lpfc_nportdisc.c | 79 +-
+ drivers/scsi/lpfc/lpfc_nvme.c | 89 +-
+ drivers/scsi/lpfc/lpfc_nvmet.c | 73 +-
+ drivers/scsi/lpfc/lpfc_scsi.c | 317 +---
+ drivers/scsi/lpfc/lpfc_sli.c | 270 ++-
+ drivers/scsi/lpfc/lpfc_sli.h | 34 +-
+ drivers/scsi/lpfc/lpfc_sli4.h | 3 +
+ drivers/scsi/lpfc/lpfc_version.h | 2 +-
+ drivers/scsi/lpfc/lpfc_vmid.c | 288 +++
+ drivers/scsi/lpfc/lpfc_vport.c | 31 +-
+ drivers/scsi/mac53c94.c | 2 +-
+ drivers/scsi/megaraid.c | 2 +-
+ drivers/scsi/megaraid/megaraid_sas_base.c | 2 -
+ drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 -
+ drivers/scsi/mpi3mr/Kconfig | 1 +
+ drivers/scsi/mpi3mr/Makefile | 1 +
+ drivers/scsi/mpi3mr/mpi/mpi30_init.h | 53 -
+ drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 27 -
+ drivers/scsi/mpi3mr/mpi/mpi30_pci.h | 31 +-
+ drivers/scsi/mpi3mr/mpi3mr.h | 137 +-
+ drivers/scsi/mpi3mr/mpi3mr_app.c | 1864 ++++++++++++++++++++
+ drivers/scsi/mpi3mr/mpi3mr_debug.h | 37 +-
+ drivers/scsi/mpi3mr/mpi3mr_fw.c | 335 +++-
+ drivers/scsi/mpi3mr/mpi3mr_os.c | 71 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.c | 34 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.h | 6 +-
+ drivers/scsi/mpt3sas/mpt3sas_ctl.c | 11 +-
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 24 +-
+ drivers/scsi/myrb.c | 11 +-
+ drivers/scsi/pmcraid.c | 4 +-
+ drivers/scsi/qedf/qedf_attr.c | 2 -
+ drivers/scsi/qedf/qedf_io.c | 5 +-
+ drivers/scsi/qedf/qedf_main.c | 13 +-
+ drivers/scsi/qla1280.c | 3 +-
+ drivers/scsi/qla2xxx/qla_edif.c | 3 +-
+ drivers/scsi/qla2xxx/qla_os.c | 1 -
+ drivers/scsi/qla2xxx/qla_target.c | 2 -
+ drivers/scsi/qla2xxx/qla_target.h | 1 -
+ drivers/scsi/qla4xxx/ql4_os.c | 1 -
+ drivers/scsi/scsi.c | 116 +-
+ drivers/scsi/scsi_debug.c | 149 +-
+ drivers/scsi/scsi_lib.c | 2 +-
+ drivers/scsi/scsi_scan.c | 12 +-
+ drivers/scsi/scsi_sysfs.c | 29 +-
+ drivers/scsi/sd.c | 195 +-
+ drivers/scsi/sd.h | 33 +-
+ drivers/scsi/sd_dif.c | 8 +-
+ drivers/scsi/sd_zbc.c | 236 ++-
+ drivers/scsi/smartpqi/smartpqi.h | 2 +-
+ drivers/scsi/sr.c | 14 +-
+ drivers/scsi/storvsc_drv.c | 2 +-
+ drivers/scsi/ufs/Kconfig | 211 ---
+ drivers/scsi/vmw_pvscsi.c | 1 -
+ drivers/target/iscsi/cxgbit/cxgbit.h | 22 +-
+ drivers/target/iscsi/cxgbit/cxgbit_cm.c | 8 +-
+ drivers/target/iscsi/cxgbit/cxgbit_ddp.c | 4 +-
+ drivers/target/iscsi/cxgbit/cxgbit_main.c | 2 +-
+ drivers/target/iscsi/cxgbit/cxgbit_target.c | 72 +-
+ drivers/target/iscsi/iscsi_target.c | 272 +--
+ drivers/target/iscsi/iscsi_target.h | 30 +-
+ drivers/target/iscsi/iscsi_target_auth.c | 10 +-
+ drivers/target/iscsi/iscsi_target_auth.h | 4 +-
+ drivers/target/iscsi/iscsi_target_configfs.c | 34 +-
+ drivers/target/iscsi/iscsi_target_datain_values.c | 28 +-
+ drivers/target/iscsi/iscsi_target_datain_values.h | 12 +-
+ drivers/target/iscsi/iscsi_target_device.c | 4 +-
+ drivers/target/iscsi/iscsi_target_device.h | 8 +-
+ drivers/target/iscsi/iscsi_target_erl0.c | 68 +-
+ drivers/target/iscsi/iscsi_target_erl0.h | 24 +-
+ drivers/target/iscsi/iscsi_target_erl1.c | 92 +-
+ drivers/target/iscsi/iscsi_target_erl1.h | 40 +-
+ drivers/target/iscsi/iscsi_target_erl2.c | 48 +-
+ drivers/target/iscsi/iscsi_target_erl2.h | 26 +-
+ drivers/target/iscsi/iscsi_target_login.c | 78 +-
+ drivers/target/iscsi/iscsi_target_login.h | 22 +-
+ drivers/target/iscsi/iscsi_target_nego.c | 60 +-
+ drivers/target/iscsi/iscsi_target_nego.h | 12 +-
+ drivers/target/iscsi/iscsi_target_nodeattrib.c | 4 +-
+ drivers/target/iscsi/iscsi_target_parameters.c | 8 +-
+ drivers/target/iscsi/iscsi_target_parameters.h | 8 +-
+ drivers/target/iscsi/iscsi_target_seq_pdu_list.c | 44 +-
+ drivers/target/iscsi/iscsi_target_seq_pdu_list.h | 10 +-
+ drivers/target/iscsi/iscsi_target_stat.c | 16 +-
+ drivers/target/iscsi/iscsi_target_tmr.c | 72 +-
+ drivers/target/iscsi/iscsi_target_tmr.h | 16 +-
+ drivers/target/iscsi/iscsi_target_tpg.c | 2 +-
+ drivers/target/iscsi/iscsi_target_tpg.h | 4 +-
+ drivers/target/iscsi/iscsi_target_util.c | 164 +-
+ drivers/target/iscsi/iscsi_target_util.h | 102 +-
+ drivers/target/target_core_configfs.c | 47 +-
+ drivers/target/target_core_spc.c | 2 +-
+ drivers/target/target_core_user.c | 50 +-
+ drivers/ufs/Kconfig | 30 +
+ drivers/ufs/Makefile | 5 +
+ drivers/ufs/core/Kconfig | 60 +
+ drivers/ufs/core/Makefile | 10 +
+ drivers/{scsi/ufs => ufs/core}/ufs-debugfs.c | 3 +-
+ drivers/{scsi/ufs => ufs/core}/ufs-debugfs.h | 0
+ .../{scsi/ufs => ufs/core}/ufs-fault-injection.c | 0
+ .../{scsi/ufs => ufs/core}/ufs-fault-injection.h | 0
+ drivers/{scsi/ufs => ufs/core}/ufs-hwmon.c | 3 +-
+ drivers/{scsi/ufs => ufs/core}/ufs-sysfs.c | 3 +-
+ drivers/{scsi/ufs => ufs/core}/ufs-sysfs.h | 3 +-
+ drivers/{scsi/ufs => ufs/core}/ufs_bsg.c | 6 +
+ drivers/{scsi/ufs => ufs/core}/ufs_bsg.h | 7 +-
+ drivers/{scsi/ufs => ufs/core}/ufshcd-crypto.c | 2 +-
+ drivers/{scsi/ufs => ufs/core}/ufshcd-crypto.h | 7 +-
+ drivers/ufs/core/ufshcd-priv.h | 298 ++++
+ drivers/{scsi/ufs => ufs/core}/ufshcd.c | 256 ++-
+ drivers/{scsi/ufs => ufs/core}/ufshpb.c | 205 ++-
+ drivers/{scsi/ufs => ufs/core}/ufshpb.h | 16 +-
+ drivers/ufs/host/Kconfig | 114 ++
+ drivers/{scsi/ufs => ufs/host}/Makefile | 12 -
+ drivers/{scsi/ufs => ufs/host}/cdns-pltfrm.c | 2 +-
+ drivers/{scsi/ufs => ufs/host}/tc-dwc-g210-pci.c | 3 +-
+ .../{scsi/ufs => ufs/host}/tc-dwc-g210-pltfrm.c | 1 +
+ drivers/{scsi/ufs => ufs/host}/tc-dwc-g210.c | 6 +-
+ drivers/{scsi/ufs => ufs/host}/tc-dwc-g210.h | 2 +
+ drivers/{scsi/ufs => ufs/host}/ti-j721e-ufs.c | 6 +-
+ drivers/{scsi/ufs => ufs/host}/ufs-exynos.c | 11 +-
+ drivers/{scsi/ufs => ufs/host}/ufs-exynos.h | 8 +-
+ drivers/{scsi/ufs => ufs/host}/ufs-hisi.c | 10 +-
+ drivers/{scsi/ufs => ufs/host}/ufs-hisi.h | 0
+ .../{scsi/ufs => ufs/host}/ufs-mediatek-trace.h | 2 +-
+ drivers/{scsi/ufs => ufs/host}/ufs-mediatek.c | 37 +-
+ drivers/{scsi/ufs => ufs/host}/ufs-mediatek.h | 0
+ drivers/{scsi/ufs => ufs/host}/ufs-qcom-ice.c | 2 +-
+ drivers/{scsi/ufs => ufs/host}/ufs-qcom.c | 81 +-
+ drivers/{scsi/ufs => ufs/host}/ufs-qcom.h | 6 +-
+ drivers/{scsi/ufs => ufs/host}/ufshcd-dwc.c | 6 +-
+ drivers/{scsi/ufs => ufs/host}/ufshcd-dwc.h | 2 +
+ drivers/{scsi/ufs => ufs/host}/ufshcd-pci.c | 6 +-
+ drivers/{scsi/ufs => ufs/host}/ufshcd-pltfrm.c | 42 +-
+ drivers/{scsi/ufs => ufs/host}/ufshcd-pltfrm.h | 2 +-
+ drivers/{scsi/ufs => ufs/host}/ufshci-dwc.h | 0
+ include/linux/nvme-fc-driver.h | 14 +
+ include/scsi/libfcoe.h | 2 +
+ include/scsi/libiscsi.h | 6 +-
+ include/scsi/sas_ata.h | 7 +
+ include/scsi/scsi_device.h | 9 +-
+ include/scsi/scsi_proto.h | 9 +-
+ include/target/iscsi/iscsi_target_core.h | 52 +-
+ include/target/iscsi/iscsi_transport.h | 126 +-
+ include/uapi/scsi/scsi_bsg_mpi3mr.h | 582 ++++++
+ {drivers/scsi => include}/ufs/ufs.h | 35 -
+ {drivers/scsi => include}/ufs/ufs_quirks.h | 15 +-
+ {drivers/scsi => include}/ufs/ufshcd.h | 376 +---
+ {drivers/scsi => include}/ufs/ufshci.h | 2 +
+ {drivers/scsi => include}/ufs/unipro.h | 18 +-
+ 199 files changed, 7484 insertions(+), 3978 deletions(-)
+ create mode 100644 drivers/scsi/lpfc/lpfc_vmid.c
+ create mode 100644 drivers/scsi/mpi3mr/mpi3mr_app.c
+ delete mode 100644 drivers/scsi/ufs/Kconfig
+ create mode 100644 drivers/ufs/Kconfig
+ create mode 100644 drivers/ufs/Makefile
+ create mode 100644 drivers/ufs/core/Kconfig
+ create mode 100644 drivers/ufs/core/Makefile
+ rename drivers/{scsi/ufs => ufs/core}/ufs-debugfs.c (99%)
+ rename drivers/{scsi/ufs => ufs/core}/ufs-debugfs.h (100%)
+ rename drivers/{scsi/ufs => ufs/core}/ufs-fault-injection.c (100%)
+ rename drivers/{scsi/ufs => ufs/core}/ufs-fault-injection.h (100%)
+ rename drivers/{scsi/ufs => ufs/core}/ufs-hwmon.c (98%)
+ rename drivers/{scsi/ufs => ufs/core}/ufs-sysfs.c (99%)
+ rename drivers/{scsi/ufs => ufs/core}/ufs-sysfs.h (95%)
+ rename drivers/{scsi/ufs => ufs/core}/ufs_bsg.c (97%)
+ rename drivers/{scsi/ufs => ufs/core}/ufs_bsg.h (77%)
+ rename drivers/{scsi/ufs => ufs/core}/ufshcd-crypto.c (99%)
+ rename drivers/{scsi/ufs => ufs/core}/ufshcd-crypto.h (94%)
+ create mode 100644 drivers/ufs/core/ufshcd-priv.h
+ rename drivers/{scsi/ufs => ufs/core}/ufshcd.c (98%)
+ rename drivers/{scsi/ufs => ufs/core}/ufshpb.c (94%)
+ rename drivers/{scsi/ufs => ufs/core}/ufshpb.h (96%)
+ create mode 100644 drivers/ufs/host/Kconfig
+ rename drivers/{scsi/ufs => ufs/host}/Makefile (56%)
+ rename drivers/{scsi/ufs => ufs/host}/cdns-pltfrm.c (99%)
+ rename drivers/{scsi/ufs => ufs/host}/tc-dwc-g210-pci.c (98%)
+ rename drivers/{scsi/ufs => ufs/host}/tc-dwc-g210-pltfrm.c (98%)
+ rename drivers/{scsi/ufs => ufs/host}/tc-dwc-g210.c (99%)
+ rename drivers/{scsi/ufs => ufs/host}/tc-dwc-g210.h (95%)
+ rename drivers/{scsi/ufs => ufs/host}/ti-j721e-ufs.c (96%)
+ rename drivers/{scsi/ufs => ufs/host}/ufs-exynos.c (99%)
+ rename drivers/{scsi/ufs => ufs/host}/ufs-exynos.h (97%)
+ rename drivers/{scsi/ufs => ufs/host}/ufs-hisi.c (99%)
+ rename drivers/{scsi/ufs => ufs/host}/ufs-hisi.h (100%)
+ rename drivers/{scsi/ufs => ufs/host}/ufs-mediatek-trace.h (93%)
+ rename drivers/{scsi/ufs => ufs/host}/ufs-mediatek.c (97%)
+ rename drivers/{scsi/ufs => ufs/host}/ufs-mediatek.h (100%)
+ rename drivers/{scsi/ufs => ufs/host}/ufs-qcom-ice.c (99%)
+ rename drivers/{scsi/ufs => ufs/host}/ufs-qcom.c (96%)
+ rename drivers/{scsi/ufs => ufs/host}/ufs-qcom.h (98%)
+ rename drivers/{scsi/ufs => ufs/host}/ufshcd-dwc.c (98%)
+ rename drivers/{scsi/ufs => ufs/host}/ufshcd-dwc.h (95%)
+ rename drivers/{scsi/ufs => ufs/host}/ufshcd-pci.c (99%)
+ rename drivers/{scsi/ufs => ufs/host}/ufshcd-pltfrm.c (92%)
+ rename drivers/{scsi/ufs => ufs/host}/ufshcd-pltfrm.h (98%)
+ rename drivers/{scsi/ufs => ufs/host}/ufshci-dwc.h (100%)
+ create mode 100644 include/uapi/scsi/scsi_bsg_mpi3mr.h
+ rename {drivers/scsi => include}/ufs/ufs.h (93%)
+ rename {drivers/scsi => include}/ufs/ufs_quirks.h (94%)
+ rename {drivers/scsi => include}/ufs/ufshcd.h (81%)
+ rename {drivers/scsi => include}/ufs/ufshci.h (99%)
+ rename {drivers/scsi => include}/ufs/unipro.h (98%)
+Merging scsi-mkp/for-next (f9f0a46141e2 scsi: myrb: Fix up null pointer access on myrb_cleanup())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next
+Already up to date.
+Merging vhost/linux-next (73211bf1bc3a vdpasim: allow to enable a vq repeatedly)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next
+Auto-merging drivers/block/virtio_blk.c
+Auto-merging drivers/vdpa/vdpa.c
+Auto-merging include/linux/mlx5/mlx5_ifc.h
+Auto-merging include/linux/vdpa.h
+Merge made by the 'ort' strategy.
+ drivers/block/virtio_blk.c | 228 ++++++++++++++++--
+ .../crypto/virtio/virtio_crypto_akcipher_algs.c | 95 ++++----
+ drivers/crypto/virtio/virtio_crypto_common.h | 21 +-
+ drivers/crypto/virtio/virtio_crypto_core.c | 55 ++++-
+ .../crypto/virtio/virtio_crypto_skcipher_algs.c | 140 +++++------
+ drivers/vdpa/alibaba/eni_vdpa.c | 2 +-
+ drivers/vdpa/ifcvf/ifcvf_main.c | 20 +-
+ drivers/vdpa/mlx5/core/mlx5_vdpa.h | 2 +
+ drivers/vdpa/mlx5/net/mlx5_vnet.c | 197 +++++++++++++--
+ drivers/vdpa/vdpa.c | 257 ++++++++++++++++----
+ drivers/vdpa/vdpa_sim/vdpa_sim.c | 105 ++++++--
+ drivers/vdpa/vdpa_sim/vdpa_sim.h | 3 +
+ drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 169 ++++++++++---
+ drivers/vdpa/vdpa_user/vduse_dev.c | 3 +-
+ drivers/vdpa/virtio_pci/vp_vdpa.c | 161 ++++++++++---
+ drivers/vhost/iotlb.c | 23 +-
+ drivers/vhost/vdpa.c | 267 ++++++++++++++++-----
+ drivers/vhost/vhost.c | 23 +-
+ drivers/vhost/vhost.h | 4 +-
+ drivers/virtio/virtio.c | 2 +-
+ drivers/virtio/virtio_balloon.c | 12 +-
+ drivers/virtio/virtio_mmio.c | 14 +-
+ drivers/virtio/virtio_pci_common.c | 15 +-
+ drivers/virtio/virtio_pci_common.h | 10 +-
+ drivers/virtio/virtio_pci_legacy.c | 10 +-
+ drivers/virtio/virtio_pci_modern.c | 12 +-
+ drivers/virtio/virtio_pci_modern_dev.c | 1 +
+ drivers/virtio/virtio_ring.c | 22 +-
+ drivers/virtio/virtio_vdpa.c | 12 +-
+ include/linux/mlx5/mlx5_ifc.h | 1 +
+ include/linux/mlx5/mlx5_ifc_vdpa.h | 39 +++
+ include/linux/vdpa.h | 61 +++--
+ include/linux/vhost_iotlb.h | 2 +
+ include/uapi/linux/vdpa.h | 6 +
+ include/uapi/linux/vhost.h | 26 +-
+ include/uapi/linux/vhost_types.h | 11 +-
+ 36 files changed, 1574 insertions(+), 457 deletions(-)
+Merging rpmsg/for-next (01a1a0c8d456 Merge branches 'rproc-next', 'rpmsg-next' and 'hwspinlock-next' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next
+Merge made by the 'ort' strategy.
+ .../bindings/remoteproc/fsl,imx-rproc.yaml | 9 +-
+ .../devicetree/bindings/remoteproc/mtk,scp.yaml | 57 ++++++++---
+ .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 31 ++++++
+ .../bindings/remoteproc/st,stm32-rproc.yaml | 16 ++--
+ drivers/hwspinlock/omap_hwspinlock.c | 6 +-
+ drivers/remoteproc/imx_dsp_rproc.c | 105 ++-------------------
+ drivers/remoteproc/imx_rproc.c | 36 +++++++
+ drivers/remoteproc/mtk_common.h | 2 +
+ drivers/remoteproc/mtk_scp.c | 76 +++++++++++----
+ drivers/remoteproc/qcom_q6v5_pas.c | 34 +++++++
+ drivers/remoteproc/remoteproc_cdev.c | 11 ---
+ drivers/remoteproc/remoteproc_core.c | 15 ++-
+ drivers/remoteproc/remoteproc_debugfs.c | 17 +---
+ drivers/remoteproc/remoteproc_elf_loader.c | 2 +-
+ drivers/remoteproc/remoteproc_sysfs.c | 11 ---
+ drivers/rpmsg/qcom_smd.c | 4 +-
+ drivers/rpmsg/virtio_rpmsg_bus.c | 9 +-
+ 17 files changed, 248 insertions(+), 193 deletions(-)
+Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next
+Already up to date.
+Merging gpio-brgl/gpio/for-next (5a7cb9f3978d gpio: sifive: Make the irqchip immutable)
+$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next
+Auto-merging arch/arm/mach-davinci/board-da830-evm.c
+Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c
+Auto-merging arch/arm/mach-davinci/board-dm646x-evm.c
+Auto-merging drivers/gpio/gpio-pca953x.c
+Auto-merging drivers/gpio/gpio-sim.c
+Auto-merging drivers/gpio/gpiolib-of.c
+Auto-merging drivers/gpio/gpiolib.c
+Auto-merging drivers/pinctrl/stm32/pinctrl-stm32.c
+Auto-merging include/linux/gpio/driver.h
+Merge made by the 'ort' strategy.
+ .../bindings/gpio/gpio-consumer-common.yaml | 64 +++++++++
+ .../devicetree/bindings/gpio/gpio-pca95xx.yaml | 1 +
+ .../bindings/gpio/realtek,otto-gpio.yaml | 34 ++++-
+ .../bindings/gpio/renesas,rcar-gpio.yaml | 5 +
+ .../bindings/gpio/socionext,uniphier-gpio.yaml | 17 +++
+ arch/arm/mach-davinci/board-da830-evm.c | 3 +-
+ arch/arm/mach-davinci/board-dm644x-evm.c | 9 +-
+ arch/arm/mach-davinci/board-dm646x-evm.c | 4 +-
+ drivers/gpio/Kconfig | 7 +-
+ drivers/gpio/gpio-104-dio-48e.c | 63 ++++-----
+ drivers/gpio/gpio-104-idi-48.c | 27 ++--
+ drivers/gpio/gpio-104-idio-16.c | 33 ++---
+ drivers/gpio/gpio-amdpt.c | 10 +-
+ drivers/gpio/gpio-brcmstb.c | 12 +-
+ drivers/gpio/gpio-cadence.c | 12 +-
+ drivers/gpio/gpio-dwapb.c | 74 +++++-----
+ drivers/gpio/gpio-ftgpio010.c | 8 +-
+ drivers/gpio/gpio-gpio-mm.c | 43 +++---
+ drivers/gpio/gpio-grgpio.c | 30 ++---
+ drivers/gpio/gpio-hlwd.c | 18 +--
+ drivers/gpio/gpio-idt3243x.c | 12 +-
+ drivers/gpio/gpio-ixp4xx.c | 49 +++----
+ drivers/gpio/gpio-loongson1.c | 8 +-
+ drivers/gpio/gpio-max732x.c | 37 +----
+ drivers/gpio/gpio-max77620.c | 9 +-
+ drivers/gpio/gpio-menz127.c | 8 +-
+ drivers/gpio/gpio-ml-ioh.c | 76 +++--------
+ drivers/gpio/gpio-mlxbf2.c | 18 +--
+ drivers/gpio/gpio-mmio.c | 22 +--
+ drivers/gpio/gpio-pca953x.c | 37 +++--
+ drivers/gpio/gpio-pcf857x.c | 49 ++++---
+ drivers/gpio/gpio-rcar.c | 38 +++---
+ drivers/gpio/gpio-realtek-otto.c | 137 ++++++++++++++++++-
+ drivers/gpio/gpio-sifive.c | 26 ++--
+ drivers/gpio/gpio-sim.c | 4 +-
+ drivers/gpio/gpio-syscon.c | 49 +++----
+ drivers/gpio/gpio-tb10x.c | 4 +-
+ drivers/gpio/gpio-ws16c48.c | 65 ++++-----
+ drivers/gpio/gpio-zevio.c | 25 ++--
+ drivers/gpio/gpiolib-cdev.c | 66 ++++-----
+ drivers/gpio/gpiolib-of.c | 3 +-
+ drivers/gpio/gpiolib-sysfs.c | 3 +-
+ drivers/gpio/gpiolib.c | 75 +++++------
+ drivers/gpio/gpiolib.h | 11 +-
+ drivers/irqchip/irq-ixp4xx.c | 126 +----------------
+ drivers/pinctrl/meson/Kconfig | 2 +-
+ drivers/pinctrl/meson/pinctrl-meson.c | 52 ++++---
+ drivers/pinctrl/meson/pinctrl-meson.h | 28 ++--
+ drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 34 ++---
+ drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 150 +++++++++------------
+ drivers/pinctrl/renesas/pinctrl-rza1.c | 47 ++-----
+ drivers/pinctrl/samsung/pinctrl-exynos.c | 8 +-
+ drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 2 +-
+ drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 4 +-
+ drivers/pinctrl/samsung/pinctrl-samsung.c | 30 ++---
+ drivers/pinctrl/samsung/pinctrl-samsung.h | 2 +-
+ drivers/pinctrl/stm32/pinctrl-stm32.c | 80 +++++------
+ include/linux/gpio/driver.h | 30 ++++-
+ include/linux/irqchip/irq-ixp4xx.h | 12 --
+ include/linux/platform_data/max732x.h | 12 --
+ include/linux/platform_data/pcf857x.h | 2 +-
+ 61 files changed, 965 insertions(+), 961 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-consumer-common.yaml
+ delete mode 100644 include/linux/irqchip/irq-ixp4xx.h
+Merging gpio-intel/for-next (edc5601db664 pinctrl: meson: Replace custom code by gpiochip_node_count() call)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next
+Already up to date.
+Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4)
+$ git merge -m Merge branch 'gpio/gpio-sim' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-sim/gpio/gpio-sim
+Already up to date.
+Merging pinctrl/for-next (83969805cc71 pinctrl: apple: Use a raw spinlock for the regmap)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next
+Auto-merging Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt
+CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt
+Auto-merging MAINTAINERS
+Auto-merging arch/mips/boot/dts/ralink/mt7621.dtsi
+Auto-merging drivers/gpio/gpiolib-of.c
+Auto-merging drivers/gpio/gpiolib.c
+Auto-merging drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
+Auto-merging drivers/pinctrl/pinctrl-ocelot.c
+Auto-merging drivers/pinctrl/stm32/pinctrl-stm32.c
+Auto-merging include/linux/gpio/driver.h
+Auto-merging include/linux/gpio/driver.h
+Auto-merging include/linux/gpio/driver.h
+Resolved 'Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 0db7997ea3b7] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/interrupt-controller/qcom,pdc.txt | 1 +
+ .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 81 +-
+ .../bindings/pinctrl/fsl,imx7d-pinctrl.txt | 87 -
+ .../bindings/pinctrl/fsl,imx7d-pinctrl.yaml | 113 ++
+ .../devicetree/bindings/pinctrl/fsl,imxrt1170.yaml | 77 +
+ .../bindings/pinctrl/marvell,ac5-pinctrl.yaml | 72 +
+ .../bindings/pinctrl/mediatek,pinctrl-mt6795.yaml | 224 +++
+ .../bindings/pinctrl/mscc,ocelot-pinctrl.txt | 42 -
+ .../bindings/pinctrl/mscc,ocelot-pinctrl.yaml | 116 ++
+ .../bindings/pinctrl/pinctrl-mt8192.yaml | 155 +-
+ .../bindings/pinctrl/qcom,pmic-gpio.yaml | 287 +++-
+ .../bindings/pinctrl/qcom,qcm2290-pinctrl.yaml | 3 +-
+ .../pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml | 115 ++
+ .../bindings/pinctrl/qcom,sc7280-pinctrl.yaml | 3 +-
+ .../bindings/pinctrl/qcom,sm6115-pinctrl.yaml | 3 +-
+ ...trl.yaml => qcom,sm8250-lpass-lpi-pinctrl.yaml} | 2 +-
+ .../bindings/pinctrl/qcom,sm8250-pinctrl.yaml | 3 +-
+ .../bindings/pinctrl/qcom,tlmm-common.yaml | 1 -
+ .../bindings/pinctrl/ralink,mt7620-pinctrl.yaml | 91 ++
+ ...2880-pinmux.yaml => ralink,mt7621-pinctrl.yaml} | 27 +-
+ .../bindings/pinctrl/ralink,rt2880-pinctrl.yaml | 68 +
+ .../bindings/pinctrl/ralink,rt305x-pinctrl.yaml | 92 ++
+ .../bindings/pinctrl/ralink,rt3883-pinctrl.yaml | 71 +
+ .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 5 +-
+ .../bindings/pinctrl/rockchip,pinctrl.yaml | 4 +-
+ MAINTAINERS | 7 +
+ arch/mips/boot/dts/ralink/mt7621.dtsi | 2 +-
+ drivers/gpio/gpio-rockchip.c | 29 +-
+ drivers/gpio/gpiolib-of.c | 5 +
+ drivers/pinctrl/bcm/pinctrl-bcm2835.c | 18 +
+ drivers/pinctrl/berlin/berlin-bg4ct.c | 3 +-
+ drivers/pinctrl/freescale/Kconfig | 7 +
+ drivers/pinctrl/freescale/Makefile | 1 +
+ drivers/pinctrl/freescale/pinctrl-imxrt1170.c | 349 ++++
+ drivers/pinctrl/mediatek/Kconfig | 8 +
+ drivers/pinctrl/mediatek/Makefile | 1 +
+ drivers/pinctrl/mediatek/pinctrl-mt6795.c | 623 +++++++
+ drivers/pinctrl/mediatek/pinctrl-mtk-mt6795.h | 1698 ++++++++++++++++++++
+ drivers/pinctrl/meson/pinctrl-meson-s4.c | 3 +-
+ drivers/pinctrl/mvebu/Kconfig | 4 +
+ drivers/pinctrl/mvebu/Makefile | 1 +
+ drivers/pinctrl/mvebu/pinctrl-ac5.c | 261 +++
+ drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 2 +-
+ drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c | 7 +-
+ drivers/pinctrl/nomadik/pinctrl-nomadik.c | 2 +-
+ drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 4 +-
+ drivers/pinctrl/pinctrl-apple-gpio.c | 2 +
+ drivers/pinctrl/pinctrl-equilibrium.c | 11 +-
+ drivers/pinctrl/pinctrl-equilibrium.h | 10 +-
+ drivers/pinctrl/pinctrl-ingenic.c | 118 +-
+ drivers/pinctrl/pinctrl-max77620.c | 1 -
+ drivers/pinctrl/pinctrl-microchip-sgpio.c | 16 +-
+ drivers/pinctrl/pinctrl-ocelot.c | 22 +-
+ drivers/pinctrl/pinctrl-rockchip.c | 532 +++++-
+ drivers/pinctrl/pinctrl-rockchip.h | 177 +-
+ drivers/pinctrl/pinctrl-starfive.c | 11 +-
+ drivers/pinctrl/pinctrl-thunderbay.c | 7 +-
+ drivers/pinctrl/qcom/Kconfig | 19 +
+ drivers/pinctrl/qcom/Makefile | 2 +
+ drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 309 +---
+ drivers/pinctrl/qcom/pinctrl-lpass-lpi.h | 86 +
+ drivers/pinctrl/qcom/pinctrl-sc7280-lpass-lpi.c | 167 ++
+ drivers/pinctrl/qcom/pinctrl-sm8150.c | 22 +
+ drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c | 163 ++
+ drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 +
+ drivers/pinctrl/ralink/Kconfig | 28 +-
+ drivers/pinctrl/ralink/Makefile | 4 +-
+ drivers/pinctrl/ralink/pinctrl-mt7620.c | 302 ++--
+ drivers/pinctrl/ralink/pinctrl-mt7621.c | 76 +-
+ drivers/pinctrl/ralink/pinctrl-ralink.c | 349 ++++
+ .../pinctrl/ralink/{pinmux.h => pinctrl-ralink.h} | 16 +-
+ drivers/pinctrl/ralink/pinctrl-rt2880.c | 381 +----
+ drivers/pinctrl/ralink/pinctrl-rt288x.c | 60 -
+ drivers/pinctrl/ralink/pinctrl-rt305x.c | 66 +-
+ drivers/pinctrl/ralink/pinctrl-rt3883.c | 50 +-
+ drivers/pinctrl/renesas/Kconfig | 7 +-
+ drivers/pinctrl/renesas/core.c | 117 +-
+ drivers/pinctrl/renesas/gpio.c | 1 -
+ drivers/pinctrl/renesas/pfc-emev2.c | 60 +-
+ drivers/pinctrl/renesas/pfc-r8a73a4.c | 58 +-
+ drivers/pinctrl/renesas/pfc-r8a7740.c | 74 +-
+ drivers/pinctrl/renesas/pfc-r8a77470.c | 176 +-
+ drivers/pinctrl/renesas/pfc-r8a7778.c | 98 +-
+ drivers/pinctrl/renesas/pfc-r8a7779.c | 82 +-
+ drivers/pinctrl/renesas/pfc-r8a7790.c | 110 +-
+ drivers/pinctrl/renesas/pfc-r8a7791.c | 111 +-
+ drivers/pinctrl/renesas/pfc-r8a7792.c | 231 +--
+ drivers/pinctrl/renesas/pfc-r8a7794.c | 97 +-
+ drivers/pinctrl/renesas/pfc-r8a77950.c | 170 +-
+ drivers/pinctrl/renesas/pfc-r8a77951.c | 169 +-
+ drivers/pinctrl/renesas/pfc-r8a7796.c | 166 +-
+ drivers/pinctrl/renesas/pfc-r8a77965.c | 166 +-
+ drivers/pinctrl/renesas/pfc-r8a77970.c | 136 +-
+ drivers/pinctrl/renesas/pfc-r8a77980.c | 107 +-
+ drivers/pinctrl/renesas/pfc-r8a77990.c | 252 +--
+ drivers/pinctrl/renesas/pfc-r8a77995.c | 229 +--
+ drivers/pinctrl/renesas/pfc-r8a779a0.c | 246 ++-
+ drivers/pinctrl/renesas/pfc-r8a779f0.c | 121 +-
+ drivers/pinctrl/renesas/pfc-sh7203.c | 53 +-
+ drivers/pinctrl/renesas/pfc-sh7264.c | 104 +-
+ drivers/pinctrl/renesas/pfc-sh7269.c | 82 +-
+ drivers/pinctrl/renesas/pfc-sh73a0.c | 87 +-
+ drivers/pinctrl/renesas/pfc-sh7720.c | 57 +-
+ drivers/pinctrl/renesas/pfc-sh7722.c | 203 +--
+ drivers/pinctrl/renesas/pfc-sh7723.c | 71 +-
+ drivers/pinctrl/renesas/pfc-sh7724.c | 8 +-
+ drivers/pinctrl/renesas/pfc-sh7734.c | 116 +-
+ drivers/pinctrl/renesas/pfc-sh7757.c | 96 +-
+ drivers/pinctrl/renesas/pfc-sh7785.c | 61 +-
+ drivers/pinctrl/renesas/pfc-sh7786.c | 22 +-
+ drivers/pinctrl/renesas/pfc-shx3.c | 1 -
+ drivers/pinctrl/renesas/pinctrl-rzg2l.c | 200 ++-
+ drivers/pinctrl/renesas/pinctrl-rzn1.c | 10 +-
+ drivers/pinctrl/renesas/pinctrl.c | 1 -
+ drivers/pinctrl/renesas/sh_pfc.h | 24 +-
+ drivers/pinctrl/stm32/pinctrl-stm32.c | 198 ++-
+ drivers/pinctrl/stm32/pinctrl-stm32.h | 15 +-
+ drivers/pinctrl/stm32/pinctrl-stm32mp135.c | 3 +-
+ drivers/pinctrl/stm32/pinctrl-stm32mp157.c | 2 +-
+ drivers/pinctrl/tegra/pinctrl-tegra194.c | 9 -
+ include/dt-bindings/pinctrl/mt6795-pinfunc.h | 908 +++++++++++
+ include/linux/gpio/driver.h | 12 +
+ 122 files changed, 8987 insertions(+), 4127 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.yaml
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imxrt1170.yaml
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,ac5-pinctrl.yaml
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,pinctrl-mt6795.yaml
+ delete mode 100644 Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.yaml
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml
+ rename Documentation/devicetree/bindings/pinctrl/{qcom,lpass-lpi-pinctrl.yaml => qcom,sm8250-lpass-lpi-pinctrl.yaml} (97%)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/ralink,mt7620-pinctrl.yaml
+ rename Documentation/devicetree/bindings/pinctrl/{ralink,rt2880-pinmux.yaml => ralink,mt7621-pinctrl.yaml} (63%)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/ralink,rt2880-pinctrl.yaml
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/ralink,rt305x-pinctrl.yaml
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/ralink,rt3883-pinctrl.yaml
+ create mode 100644 drivers/pinctrl/freescale/pinctrl-imxrt1170.c
+ create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt6795.c
+ create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt6795.h
+ create mode 100644 drivers/pinctrl/mvebu/pinctrl-ac5.c
+ create mode 100644 drivers/pinctrl/qcom/pinctrl-lpass-lpi.h
+ create mode 100644 drivers/pinctrl/qcom/pinctrl-sc7280-lpass-lpi.c
+ create mode 100644 drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c
+ create mode 100644 drivers/pinctrl/ralink/pinctrl-ralink.c
+ rename drivers/pinctrl/ralink/{pinmux.h => pinctrl-ralink.h} (75%)
+ delete mode 100644 drivers/pinctrl/ralink/pinctrl-rt288x.c
+ create mode 100644 include/dt-bindings/pinctrl/mt6795-pinfunc.h
+Merging pinctrl-intel/for-next (7b923e67a4a7 pinctrl: intel: Fix kernel doc format, i.e. add return sections)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next
+Already up to date.
+Merging pinctrl-renesas/renesas-pinctrl (fc883ed5a43e pinctrl: renesas: checker: Add reserved field checks)
+$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl
+Already up to date.
+Merging pinctrl-samsung/for-next (ac875df4d854 pinctrl: samsung: fix missing GPIOLIB on ARM64 Exynos config)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next
+Already up to date.
+Merging pwm/for-next (3d593b6e80ad pwm: pwm-cros-ec: Add channel type support)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/gpio/gpio-mvebu.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/pwm/atmel,at91sam-pwm.yaml | 47 +++
+ .../devicetree/bindings/pwm/atmel-pwm.txt | 35 ---
+ .../bindings/pwm/google,cros-ec-pwm.yaml | 9 +-
+ .../devicetree/bindings/pwm/mediatek,pwm-disp.yaml | 75 +++++
+ .../devicetree/bindings/pwm/pwm-mediatek.txt | 1 +
+ .../devicetree/bindings/pwm/pwm-mtk-disp.txt | 45 ---
+ .../bindings/pwm/sunplus,sp7021-pwm.yaml | 42 +++
+ .../devicetree/bindings/timer/xlnx,xps-timer.yaml | 92 ++++++
+ Documentation/driver-api/pwm.rst | 6 +
+ MAINTAINERS | 14 +-
+ arch/microblaze/kernel/timer.c | 4 +
+ drivers/pwm/Kconfig | 25 ++
+ drivers/pwm/Makefile | 2 +
+ drivers/pwm/pwm-atmel-tcb.c | 14 +-
+ drivers/pwm/pwm-clps711x.c | 68 ++---
+ drivers/pwm/pwm-cros-ec.c | 82 +++++-
+ drivers/pwm/pwm-lp3943.c | 42 ++-
+ drivers/pwm/pwm-lpc18xx-sct.c | 43 ++-
+ drivers/pwm/pwm-lpc32xx.c | 29 +-
+ drivers/pwm/pwm-mediatek.c | 36 ++-
+ drivers/pwm/pwm-raspberrypi-poe.c | 2 +-
+ drivers/pwm/pwm-renesas-tpu.c | 317 +++++++++++---------
+ drivers/pwm/pwm-samsung.c | 54 +++-
+ drivers/pwm/pwm-sifive.c | 5 +-
+ drivers/pwm/pwm-sti.c | 29 +-
+ drivers/pwm/pwm-stmpe.c | 29 +-
+ drivers/pwm/pwm-sun4i.c | 18 +-
+ drivers/pwm/pwm-sunplus.c | 232 +++++++++++++++
+ drivers/pwm/pwm-tegra.c | 40 ++-
+ drivers/pwm/pwm-twl-led.c | 76 ++++-
+ drivers/pwm/pwm-xilinx.c | 321 +++++++++++++++++++++
+ include/clocksource/timer-xilinx.h | 73 +++++
+ include/dt-bindings/mfd/cros_ec.h | 18 ++
+ 33 files changed, 1558 insertions(+), 367 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pwm/atmel,at91sam-pwm.yaml
+ delete mode 100644 Documentation/devicetree/bindings/pwm/atmel-pwm.txt
+ create mode 100644 Documentation/devicetree/bindings/pwm/mediatek,pwm-disp.yaml
+ delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-mtk-disp.txt
+ create mode 100644 Documentation/devicetree/bindings/pwm/sunplus,sp7021-pwm.yaml
+ create mode 100644 Documentation/devicetree/bindings/timer/xlnx,xps-timer.yaml
+ create mode 100644 drivers/pwm/pwm-sunplus.c
+ create mode 100644 drivers/pwm/pwm-xilinx.c
+ create mode 100644 include/clocksource/timer-xilinx.h
+ create mode 100644 include/dt-bindings/mfd/cros_ec.h
+Merging userns/for-next (a58ea318d8b9 Merge of per-namespace-ipc-sysctls-for-v5.19, kthread-cleanups-for-v5.19, ptrace_stop-cleanup-for-v5.19, and ucount-rlimits-cleanups-for-v5.19 for testing in linux-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next
+Auto-merging arch/arm64/kernel/process.c
+Auto-merging arch/csky/kernel/process.c
+CONFLICT (modify/delete): arch/h8300/kernel/process.c deleted in HEAD and modified in userns/for-next. Version userns/for-next of arch/h8300/kernel/process.c left in tree.
+Auto-merging arch/ia64/kernel/process.c
+Auto-merging arch/m68k/kernel/process.c
+Auto-merging arch/openrisc/kernel/process.c
+Auto-merging arch/parisc/kernel/process.c
+Auto-merging arch/powerpc/kernel/process.c
+Auto-merging arch/riscv/kernel/process.c
+Auto-merging arch/x86/kernel/fpu/core.c
+Auto-merging arch/x86/kernel/process.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/process.c
+Auto-merging arch/xtensa/kernel/process.c
+Auto-merging arch/xtensa/kernel/ptrace.c
+Auto-merging arch/xtensa/kernel/signal.c
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/sched/signal.h
+Auto-merging init/main.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/sched/fair.c
+Auto-merging kernel/signal.c
+Auto-merging kernel/sys.c
+Resolved 'arch/x86/kernel/process.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/h8300/kernel/process.c
+rm 'arch/h8300/kernel/process.c'
+$ git commit --no-edit -v -a
+[master fd61f1e5c877] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git
+$ git diff -M --stat --summary HEAD^..
+ arch/alpha/kernel/process.c | 13 +--
+ arch/arc/kernel/process.c | 13 +--
+ arch/arm/kernel/process.c | 12 ++-
+ arch/arm64/kernel/process.c | 12 ++-
+ arch/csky/kernel/process.c | 15 ++-
+ arch/hexagon/kernel/process.c | 12 ++-
+ arch/ia64/include/asm/ptrace.h | 4 -
+ arch/ia64/kernel/process.c | 15 +--
+ arch/ia64/kernel/ptrace.c | 57 -----------
+ arch/m68k/kernel/process.c | 12 ++-
+ arch/microblaze/kernel/process.c | 12 ++-
+ arch/mips/kernel/process.c | 13 +--
+ arch/nios2/kernel/process.c | 12 ++-
+ arch/openrisc/kernel/process.c | 12 ++-
+ arch/parisc/kernel/process.c | 18 ++--
+ arch/powerpc/kernel/process.c | 15 +--
+ arch/riscv/kernel/process.c | 12 ++-
+ arch/s390/kernel/process.c | 12 ++-
+ arch/sh/kernel/process_32.c | 12 ++-
+ arch/sparc/kernel/process_32.c | 12 ++-
+ arch/sparc/kernel/process_64.c | 12 ++-
+ arch/um/include/asm/thread_info.h | 2 +
+ arch/um/kernel/exec.c | 2 +-
+ arch/um/kernel/process.c | 17 ++--
+ arch/um/kernel/ptrace.c | 8 +-
+ arch/um/kernel/signal.c | 4 +-
+ arch/x86/include/asm/fpu/sched.h | 2 +-
+ arch/x86/include/asm/switch_to.h | 8 +-
+ arch/x86/kernel/fpu/core.c | 4 +-
+ arch/x86/kernel/process.c | 18 ++--
+ arch/x86/kernel/step.c | 3 +-
+ arch/xtensa/kernel/process.c | 17 ++--
+ arch/xtensa/kernel/ptrace.c | 4 +-
+ arch/xtensa/kernel/signal.c | 4 +-
+ drivers/tty/tty_jobctrl.c | 4 +-
+ fs/exec.c | 10 +-
+ fs/proc/array.c | 2 +-
+ include/linux/ipc_namespace.h | 37 ++++++-
+ include/linux/ptrace.h | 7 --
+ include/linux/sched.h | 10 +-
+ include/linux/sched/jobctl.h | 8 ++
+ include/linux/sched/signal.h | 20 +++-
+ include/linux/sched/task.h | 8 +-
+ include/linux/signal.h | 3 +-
+ include/linux/user_namespace.h | 35 ++++---
+ init/initramfs.c | 2 +
+ init/main.c | 2 +-
+ ipc/ipc_sysctl.c | 205 +++++++++++++++++++++++---------------
+ ipc/mq_sysctl.c | 121 ++++++++++++----------
+ ipc/mqueue.c | 10 +-
+ ipc/namespace.c | 10 ++
+ kernel/fork.c | 58 ++++++++---
+ kernel/ptrace.c | 87 ++++++----------
+ kernel/sched/core.c | 5 +-
+ kernel/sched/fair.c | 2 +-
+ kernel/signal.c | 140 ++++++++++++--------------
+ kernel/sys.c | 2 +-
+ kernel/time/posix-cpu-timers.c | 6 +-
+ kernel/ucount.c | 34 +++----
+ kernel/umh.c | 6 +-
+ kernel/user_namespace.c | 10 +-
+ 61 files changed, 658 insertions(+), 586 deletions(-)
+Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next
+Already up to date.
+Merging kselftest/next (15477b31db10 kselftests/ir : Improve readability of modprobe error message)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next
+Already up to date.
+Merging livepatching/for-next (0e11f2076e7f Merge branch 'for-5.19/cleanup' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next
+Auto-merging MAINTAINERS
+Auto-merging arch/powerpc/kernel/irq.c
+Auto-merging arch/powerpc/kernel/setup_64.c
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 2 --
+ arch/powerpc/include/asm/livepatch.h | 10 +---------
+ arch/powerpc/kernel/irq.c | 1 -
+ arch/powerpc/kernel/setup_64.c | 2 +-
+ arch/s390/include/asm/livepatch.h | 22 ----------------------
+ arch/x86/include/asm/livepatch.h | 20 --------------------
+ include/linux/livepatch.h | 2 --
+ kernel/livepatch/patch.c | 2 +-
+ 8 files changed, 3 insertions(+), 58 deletions(-)
+ delete mode 100644 arch/s390/include/asm/livepatch.h
+ delete mode 100644 arch/x86/include/asm/livepatch.h
+Merging rtc/rtc-next (3f3489248927 rtc: rzn1: Fix a variable type)
+$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/rtc/rtc-sun6i.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/rtc/nxp,pcf85063.txt | 1 +
+ .../devicetree/bindings/rtc/renesas,rzn1-rtc.yaml | 70 ++++
+ MAINTAINERS | 8 +
+ drivers/rtc/Kconfig | 7 +
+ drivers/rtc/Makefile | 1 +
+ drivers/rtc/rtc-ftrtc010.c | 34 +-
+ drivers/rtc/rtc-gamecube.c | 1 +
+ drivers/rtc/rtc-meson.c | 2 +-
+ drivers/rtc/rtc-mt6397.c | 2 +
+ drivers/rtc/rtc-pcf85063.c | 2 +
+ drivers/rtc/rtc-rx8025.c | 7 +-
+ drivers/rtc/rtc-rzn1.c | 418 +++++++++++++++++++++
+ drivers/rtc/rtc-sun6i.c | 42 +++
+ 13 files changed, 578 insertions(+), 17 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/rtc/renesas,rzn1-rtc.yaml
+ create mode 100644 drivers/rtc/rtc-rzn1.c
+Merging nvdimm/libnvdimm-for-next (f42e8e5088b9 pmem: implement pmem_recovery_write())
+$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next
+Auto-merging arch/x86/kernel/cpu/mce/core.c
+Auto-merging arch/x86/mm/pat/set_memory.c
+Auto-merging drivers/md/dm-linear.c
+Auto-merging drivers/md/dm-log-writes.c
+Auto-merging drivers/md/dm.c
+Auto-merging fs/fuse/dax.c
+Merge made by the 'ort' strategy.
+ arch/x86/include/asm/set_memory.h | 52 ----------
+ arch/x86/kernel/cpu/mce/core.c | 6 +-
+ arch/x86/mm/pat/set_memory.c | 49 ++++++++-
+ drivers/acpi/nfit/mce.c | 4 +-
+ drivers/dax/super.c | 14 ++-
+ drivers/md/dm-linear.c | 15 ++-
+ drivers/md/dm-log-writes.c | 15 ++-
+ drivers/md/dm-stripe.c | 15 ++-
+ drivers/md/dm-target.c | 4 +-
+ drivers/md/dm-writecache.c | 7 +-
+ drivers/md/dm.c | 25 ++++-
+ drivers/nvdimm/pmem.c | 203 +++++++++++++++++++++++++++-----------
+ drivers/nvdimm/pmem.h | 5 +-
+ drivers/nvdimm/security.c | 5 -
+ drivers/s390/block/dcssblk.c | 9 +-
+ fs/dax.c | 22 ++++-
+ fs/fuse/dax.c | 4 +-
+ fs/fuse/virtio_fs.c | 6 +-
+ include/linux/dax.h | 22 ++++-
+ include/linux/device-mapper.h | 13 ++-
+ include/linux/set_memory.h | 10 +-
+ tools/testing/nvdimm/pmem-dax.c | 4 +-
+ tools/testing/nvdimm/test/iomap.c | 18 ++--
+ tools/testing/nvdimm/test/nfit.c | 3 -
+ 24 files changed, 359 insertions(+), 171 deletions(-)
+Merging at24/at24/for-next (312310928417 Linux 5.18-rc1)
+$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next
+Already up to date.
+Merging ntb/ntb-next (e9d0fa5e2482 IDT: Fix Build warnings on some 32bit architectures.)
+$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next
+Merge made by the 'ort' strategy.
+ drivers/ntb/hw/idt/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+Merging seccomp/for-next/seccomp (5e91d2a41469 selftests/seccomp: Fix spelling mistake "Coud" -> "Could")
+$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp
+Already up to date.
+Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
+$ git merge -m Merge branch 'for-next' of https://github.com/daniel-walker/cisco-linux.git cisco/for-next
+Already up to date.
+Merging fsi/next (f2af60bb7ce2 fsi: Add trace events in initialization path)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next
+Already up to date.
+Merging slimbus/for-next (54bf672111ee slimbus: qcom: Fix IRQ check in qcom_slim_probe)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next
+Auto-merging drivers/slimbus/qcom-ctrl.c
+CONFLICT (content): Merge conflict in drivers/slimbus/qcom-ctrl.c
+Auto-merging drivers/slimbus/qcom-ngd-ctrl.c
+Resolved 'drivers/slimbus/qcom-ctrl.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 4c0a2ed8cae1] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git
+$ git diff -M --stat --summary HEAD^..
+Merging nvmem/for-next (0f07cbb92a28 nvmem: sfp: Add support for TA 2.1 devices)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Auto-merging drivers/nvmem/brcm_nvram.c
+Resolved 'MAINTAINERS' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 2cc3bb2bcc3b] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git
+$ git diff -M --stat --summary HEAD^..
+ drivers/nvmem/brcm_nvram.c | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging xarray/main (63b1898fffcd XArray: Disallow sibling entries of nodes)
+$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main
+Already up to date.
+Merging hyperv/hyperv-next (b4927bd27262 PCI: hv: Fix synchronization between channel callback and hv_pci_bus_exit())
+$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next
+Auto-merging arch/x86/kernel/cpu/mshyperv.c
+Auto-merging drivers/hv/vmbus_drv.c
+Auto-merging drivers/scsi/storvsc_drv.c
+Auto-merging drivers/video/fbdev/hyperv_fb.c
+Auto-merging include/linux/hyperv.h
+Merge made by the 'ort' strategy.
+ arch/x86/kernel/cpu/mshyperv.c | 2 +
+ drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 5 +-
+ drivers/gpu/drm/hyperv/hyperv_drm_proto.c | 23 +--
+ drivers/hv/channel.c | 116 +++++++++----
+ drivers/hv/channel_mgmt.c | 38 +++--
+ drivers/hv/connection.c | 6 +-
+ drivers/hv/hyperv_vmbus.h | 2 +-
+ drivers/hv/ring_buffer.c | 46 +++---
+ drivers/hv/vmbus_drv.c | 60 ++-----
+ drivers/pci/controller/pci-hyperv.c | 243 +++++++++++++++++++++-------
+ drivers/scsi/storvsc_drv.c | 36 ++---
+ drivers/video/fbdev/hyperv_fb.c | 23 +--
+ include/linux/hyperv.h | 97 ++++++-----
+ net/vmw_vsock/hyperv_transport.c | 21 ++-
+ 14 files changed, 421 insertions(+), 297 deletions(-)
+Merging auxdisplay/auxdisplay (13de23494f38 auxdisplay: lcd2s: Use array size explicitly in lcd2s_gotoxy())
+$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay
+Already up to date.
+Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function)
+$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next
+Already up to date.
+Merging hmm/hmm (312310928417 Linux 5.18-rc1)
+$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm
+Already up to date.
+Merging kunit/test (312310928417 Linux 5.18-rc1)
+$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test
+Already up to date.
+Merging cfi/cfi/next (312310928417 Linux 5.18-rc1)
+$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next
+Already up to date.
+Merging kunit-next/kunit (e7eaffce47b7 kunit: tool: Use qemu-system-i386 for i386 runs)
+$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit
+Already up to date.
+Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next
+Already up to date.
+Merging mhi/mhi-next (13b9b814da2d bus: mhi: host: Add support for Foxconn T99W373 and T99W368)
+$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next
+Already up to date.
+Merging memblock/for-next (000605cd1b14 memblock tests: remove completed TODO item)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next
+Merge made by the 'ort' strategy.
+ tools/testing/memblock/TODO | 3 -
+ tools/testing/memblock/tests/basic_api.c | 392 ++++++++++++++++++++++---------
+ 2 files changed, 278 insertions(+), 117 deletions(-)
+Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy)
+$ git merge -m Merge branch 'init-user-pointers' of git://git.infradead.org/users/hch/misc.git init/init-user-pointers
+Already up to date.
+Merging counters/counters (e71ba9452f0b Linux 5.11-rc2)
+$ git merge -m Merge branch 'counters' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git counters/counters
+Already up to date.
+Merging cxl/next (34e37b4c432c cxl/port: Enable HDM Capability after validating DVSEC Ranges)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next
+Auto-merging drivers/Makefile
+Auto-merging drivers/acpi/bus.c
+Auto-merging drivers/acpi/pci_root.c
+Auto-merging drivers/base/core.c
+Auto-merging drivers/nvdimm/pmem.c
+Auto-merging include/acpi/acpi_bus.h
+Auto-merging include/linux/acpi.h
+Auto-merging include/linux/device.h
+Auto-merging include/linux/pm.h
+Auto-merging kernel/power/main.c
+Auto-merging lib/Kconfig.debug
+Merge made by the 'ort' strategy.
+ drivers/Makefile | 2 +-
+ drivers/acpi/bus.c | 2 +-
+ drivers/acpi/nfit/core.c | 30 ++--
+ drivers/acpi/nfit/nfit.h | 24 ---
+ drivers/acpi/pci_root.c | 238 ++++++++++++++++++++++----
+ drivers/base/core.c | 3 -
+ drivers/cxl/Kconfig | 4 +
+ drivers/cxl/Makefile | 2 +-
+ drivers/cxl/acpi.c | 13 ++
+ drivers/cxl/core/Makefile | 1 +
+ drivers/cxl/core/mbox.c | 334 ++++++++++++++++++++++--------------
+ drivers/cxl/core/memdev.c | 3 +
+ drivers/cxl/core/pci.c | 364 ++++++++++++++++++++++++++++++++++++++++
+ drivers/cxl/core/pmem.c | 10 +-
+ drivers/cxl/core/port.c | 68 ++++----
+ drivers/cxl/core/suspend.c | 24 +++
+ drivers/cxl/cxl.h | 78 ---------
+ drivers/cxl/cxlmem.h | 75 ++++++++-
+ drivers/cxl/cxlpci.h | 2 +
+ drivers/cxl/mem.c | 148 +++-------------
+ drivers/cxl/pci.c | 175 +------------------
+ drivers/cxl/pmem.c | 13 +-
+ drivers/cxl/port.c | 28 +++-
+ drivers/nvdimm/btt_devs.c | 23 +--
+ drivers/nvdimm/bus.c | 38 ++---
+ drivers/nvdimm/core.c | 19 +--
+ drivers/nvdimm/dax_devs.c | 4 +-
+ drivers/nvdimm/dimm_devs.c | 12 +-
+ drivers/nvdimm/namespace_devs.c | 46 ++---
+ drivers/nvdimm/nd-core.h | 68 +-------
+ drivers/nvdimm/pfn_devs.c | 31 ++--
+ drivers/nvdimm/pmem.c | 2 +-
+ drivers/nvdimm/region.c | 2 +-
+ drivers/nvdimm/region_devs.c | 20 ++-
+ include/acpi/acpi_bus.h | 12 +-
+ include/linux/acpi.h | 42 ++++-
+ include/linux/device.h | 48 +++++-
+ include/linux/lockdep.h | 6 +-
+ include/linux/pm.h | 9 +
+ include/uapi/linux/cxl_mem.h | 14 +-
+ kernel/power/hibernate.c | 2 +-
+ kernel/power/main.c | 5 +-
+ kernel/power/suspend.c | 3 +-
+ lib/Kconfig.debug | 23 ---
+ tools/testing/cxl/Kbuild | 3 +-
+ tools/testing/cxl/mock_mem.c | 10 --
+ tools/testing/cxl/test/mem.c | 17 --
+ tools/testing/cxl/test/mock.c | 29 ++++
+ 48 files changed, 1266 insertions(+), 863 deletions(-)
+ create mode 100644 drivers/cxl/core/suspend.c
+ delete mode 100644 tools/testing/cxl/mock_mem.c
+Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller)
+$ git merge -m Merge branch 'folio-iomap' of git://git.infradead.org/users/willy/linux.git folio-iomap/folio-iomap
+Already up to date.
+Merging zstd/zstd-next (88a309465b3f lib: zstd: clean up double word in comment.)
+$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next
+Already up to date.
+Merging efi/next (3f68e69520d3 riscv/efi_stub: Add support for RISCV_EFI_BOOT_PROTOCOL)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next
+Already up to date.
+Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next
+Merge made by the 'ort' strategy.
+ fs/unicode/mkutf8data.c | 38 ++++++++++++++++++++++++--------------
+ 1 file changed, 24 insertions(+), 14 deletions(-)
+Merging slab/for-next (6b2d72729581 Merge branches 'slab/for-5.19/stackdepot' and 'slab/for-5.19/refactor' into slab/for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next
+Auto-merging mm/slab_common.c
+Auto-merging mm/slub.c
+Auto-merging mm/slub.c
+Merge made by the 'ort' strategy.
+Merging random/master (fdaf9a5840ac Merge tag 'folio-5.19' of git://git.infradead.org/users/willy/pagecache)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master
+Already up to date.
+Merging landlock/next (fdaf9a5840ac Merge tag 'folio-5.19' of git://git.infradead.org/users/willy/pagecache)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next
+Already up to date.
+Merging rust/rust-next (9a5fe747d99e init/Kconfig: Specify the interpreter for rust-is-available.sh)
+$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next
+Auto-merging .gitignore
+Auto-merging Documentation/doc-guide/kernel-doc.rst
+Auto-merging Documentation/index.rst
+Auto-merging Documentation/process/changes.rst
+Auto-merging MAINTAINERS
+Auto-merging Makefile
+CONFLICT (content): Merge conflict in Makefile
+Auto-merging arch/Kconfig
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/riscv/Kconfig
+Auto-merging arch/riscv/Makefile
+Auto-merging arch/um/Kconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/x86/Makefile
+Auto-merging drivers/gpio/Kconfig
+Auto-merging include/kunit/test.h
+Auto-merging include/linux/kallsyms.h
+Auto-merging include/uapi/linux/android/binder.h
+CONFLICT (content): Merge conflict in include/uapi/linux/android/binder.h
+Auto-merging init/Kconfig
+Auto-merging kernel/kallsyms.c
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/kunit/test.c
+Auto-merging lib/vsprintf.c
+Auto-merging scripts/Makefile
+Auto-merging scripts/Makefile.build
+Auto-merging scripts/Makefile.lib
+Auto-merging scripts/Makefile.modfinal
+Auto-merging scripts/kallsyms.c
+Auto-merging scripts/min-tool-version.sh
+Resolved 'Makefile' using previous resolution.
+Resolved 'include/uapi/linux/android/binder.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 598de5db665c] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git
+$ git diff -M --stat --summary HEAD^..
+ .gitignore | 5 +
+ .rustfmt.toml | 12 +
+ Documentation/core-api/printk-formats.rst | 10 +
+ Documentation/doc-guide/kernel-doc.rst | 3 +
+ Documentation/index.rst | 1 +
+ Documentation/kbuild/kbuild.rst | 17 +
+ Documentation/kbuild/makefiles.rst | 50 +-
+ Documentation/process/changes.rst | 41 +
+ Documentation/rust/arch-support.rst | 25 +
+ Documentation/rust/coding-guidelines.rst | 216 ++
+ Documentation/rust/general-information.rst | 79 +
+ Documentation/rust/index.rst | 22 +
+ Documentation/rust/quick-start.rst | 232 ++
+ MAINTAINERS | 15 +
+ Makefile | 177 +-
+ arch/Kconfig | 6 +
+ arch/arm/Kconfig | 1 +
+ arch/arm64/Kconfig | 1 +
+ arch/powerpc/Kconfig | 1 +
+ arch/riscv/Kconfig | 1 +
+ arch/riscv/Makefile | 5 +
+ arch/um/Kconfig | 1 +
+ arch/x86/Kconfig | 1 +
+ arch/x86/Makefile | 14 +
+ drivers/android/Kconfig | 6 +
+ drivers/android/Makefile | 2 +
+ drivers/android/allocation.rs | 266 ++
+ drivers/android/context.rs | 80 +
+ drivers/android/defs.rs | 99 +
+ drivers/android/node.rs | 476 ++++
+ drivers/android/process.rs | 960 ++++++++
+ drivers/android/range_alloc.rs | 189 ++
+ drivers/android/rust_binder.rs | 111 +
+ drivers/android/thread.rs | 870 +++++++
+ drivers/android/transaction.rs | 326 +++
+ drivers/gpio/Kconfig | 8 +
+ drivers/gpio/Makefile | 1 +
+ drivers/gpio/gpio_pl061_rust.rs | 370 +++
+ include/linux/kallsyms.h | 2 +-
+ include/linux/spinlock.h | 25 +-
+ include/uapi/linux/android/binder.h | 30 +-
+ init/Kconfig | 51 +-
+ kernel/kallsyms.c | 26 +-
+ kernel/livepatch/core.c | 4 +-
+ lib/Kconfig.debug | 155 ++
+ lib/vsprintf.c | 13 +
+ rust/.gitignore | 10 +
+ rust/Makefile | 398 +++
+ rust/alloc/README.md | 33 +
+ rust/alloc/alloc.rs | 438 ++++
+ rust/alloc/borrow.rs | 498 ++++
+ rust/alloc/boxed.rs | 2007 +++++++++++++++
+ rust/alloc/collections/mod.rs | 156 ++
+ rust/alloc/fmt.rs | 601 +++++
+ rust/alloc/lib.rs | 226 ++
+ rust/alloc/macros.rs | 127 +
+ rust/alloc/raw_vec.rs | 567 +++++
+ rust/alloc/slice.rs | 1282 ++++++++++
+ rust/alloc/str.rs | 632 +++++
+ rust/alloc/string.rs | 2869 ++++++++++++++++++++++
+ rust/alloc/vec/drain.rs | 186 ++
+ rust/alloc/vec/drain_filter.rs | 145 ++
+ rust/alloc/vec/into_iter.rs | 356 +++
+ rust/alloc/vec/is_zero.rs | 106 +
+ rust/alloc/vec/mod.rs | 3362 ++++++++++++++++++++++++++
+ rust/alloc/vec/partial_eq.rs | 49 +
+ rust/alloc/vec/set_len_on_drop.rs | 30 +
+ rust/alloc/vec/spec_extend.rs | 174 ++
+ rust/bindgen_parameters | 17 +
+ rust/build_error.rs | 29 +
+ rust/compiler_builtins.rs | 57 +
+ rust/exports.c | 20 +
+ rust/helpers.c | 644 +++++
+ rust/kernel/allocator.rs | 65 +
+ rust/kernel/amba.rs | 257 ++
+ rust/kernel/bindings.rs | 47 +
+ rust/kernel/bindings_helper.h | 46 +
+ rust/kernel/build_assert.rs | 82 +
+ rust/kernel/c_types.rs | 119 +
+ rust/kernel/chrdev.rs | 207 ++
+ rust/kernel/clk.rs | 79 +
+ rust/kernel/cred.rs | 46 +
+ rust/kernel/device.rs | 546 +++++
+ rust/kernel/driver.rs | 442 ++++
+ rust/kernel/error.rs | 565 +++++
+ rust/kernel/file.rs | 860 +++++++
+ rust/kernel/gpio.rs | 478 ++++
+ rust/kernel/hwrng.rs | 242 ++
+ rust/kernel/io_buffer.rs | 153 ++
+ rust/kernel/io_mem.rs | 275 +++
+ rust/kernel/iov_iter.rs | 81 +
+ rust/kernel/irq.rs | 411 ++++
+ rust/kernel/kasync.rs | 6 +
+ rust/kernel/kasync/net.rs | 322 +++
+ rust/kernel/kunit.rs | 91 +
+ rust/kernel/lib.rs | 261 ++
+ rust/kernel/linked_list.rs | 247 ++
+ rust/kernel/miscdev.rs | 291 +++
+ rust/kernel/mm.rs | 149 ++
+ rust/kernel/module_param.rs | 498 ++++
+ rust/kernel/net.rs | 392 +++
+ rust/kernel/net/filter.rs | 447 ++++
+ rust/kernel/of.rs | 63 +
+ rust/kernel/pages.rs | 144 ++
+ rust/kernel/platform.rs | 223 ++
+ rust/kernel/power.rs | 118 +
+ rust/kernel/prelude.rs | 36 +
+ rust/kernel/print.rs | 405 ++++
+ rust/kernel/random.rs | 42 +
+ rust/kernel/raw_list.rs | 361 +++
+ rust/kernel/rbtree.rs | 563 +++++
+ rust/kernel/revocable.rs | 161 ++
+ rust/kernel/security.rs | 38 +
+ rust/kernel/static_assert.rs | 38 +
+ rust/kernel/std_vendor.rs | 160 ++
+ rust/kernel/str.rs | 597 +++++
+ rust/kernel/sync.rs | 161 ++
+ rust/kernel/sync/arc.rs | 503 ++++
+ rust/kernel/sync/condvar.rs | 138 ++
+ rust/kernel/sync/guard.rs | 169 ++
+ rust/kernel/sync/locked_by.rs | 111 +
+ rust/kernel/sync/mutex.rs | 153 ++
+ rust/kernel/sync/nowait.rs | 188 ++
+ rust/kernel/sync/revocable.rs | 250 ++
+ rust/kernel/sync/rwsem.rs | 197 ++
+ rust/kernel/sync/seqlock.rs | 202 ++
+ rust/kernel/sync/smutex.rs | 295 +++
+ rust/kernel/sync/spinlock.rs | 360 +++
+ rust/kernel/sysctl.rs | 199 ++
+ rust/kernel/task.rs | 175 ++
+ rust/kernel/types.rs | 679 ++++++
+ rust/kernel/user_ptr.rs | 175 ++
+ rust/macros/helpers.rs | 79 +
+ rust/macros/lib.rs | 94 +
+ rust/macros/module.rs | 631 +++++
+ samples/Kconfig | 2 +
+ samples/Makefile | 1 +
+ samples/rust/Kconfig | 140 ++
+ samples/rust/Makefile | 16 +
+ samples/rust/hostprogs/.gitignore | 3 +
+ samples/rust/hostprogs/Makefile | 5 +
+ samples/rust/hostprogs/a.rs | 7 +
+ samples/rust/hostprogs/b.rs | 5 +
+ samples/rust/hostprogs/single.rs | 12 +
+ samples/rust/rust_chrdev.rs | 50 +
+ samples/rust/rust_minimal.rs | 35 +
+ samples/rust/rust_miscdev.rs | 143 ++
+ samples/rust/rust_module_parameters.rs | 69 +
+ samples/rust/rust_netfilter.rs | 54 +
+ samples/rust/rust_platform.rs | 22 +
+ samples/rust/rust_print.rs | 54 +
+ samples/rust/rust_random.rs | 60 +
+ samples/rust/rust_semaphore.rs | 171 ++
+ samples/rust/rust_semaphore_c.c | 212 ++
+ samples/rust/rust_stack_probing.rs | 36 +
+ samples/rust/rust_sync.rs | 93 +
+ scripts/.gitignore | 1 +
+ scripts/Kconfig.include | 6 +-
+ scripts/Makefile | 3 +
+ scripts/Makefile.build | 60 +
+ scripts/Makefile.debug | 10 +
+ scripts/Makefile.host | 34 +-
+ scripts/Makefile.lib | 12 +
+ scripts/Makefile.modfinal | 8 +-
+ scripts/cc-version.sh | 12 +-
+ scripts/checkpatch.pl | 8 +-
+ scripts/decode_stacktrace.sh | 14 +
+ scripts/generate_rust_analyzer.py | 134 +
+ scripts/generate_rust_target.rs | 227 ++
+ scripts/is_rust_module.sh | 13 +
+ scripts/kallsyms.c | 47 +-
+ scripts/kconfig/confdata.c | 75 +
+ scripts/min-tool-version.sh | 6 +
+ scripts/rust-is-available-bindgen-libclang.h | 2 +
+ scripts/rust-is-available.sh | 158 ++
+ scripts/rustdoc_test_builder.py | 59 +
+ scripts/rustdoc_test_gen.py | 164 ++
+ tools/include/linux/kallsyms.h | 2 +-
+ tools/lib/perf/include/perf/event.h | 2 +-
+ tools/lib/symbol/kallsyms.h | 2 +-
+ 180 files changed, 37619 insertions(+), 68 deletions(-)
+ create mode 100644 .rustfmt.toml
+ create mode 100644 Documentation/rust/arch-support.rst
+ create mode 100644 Documentation/rust/coding-guidelines.rst
+ create mode 100644 Documentation/rust/general-information.rst
+ create mode 100644 Documentation/rust/index.rst
+ create mode 100644 Documentation/rust/quick-start.rst
+ create mode 100644 drivers/android/allocation.rs
+ create mode 100644 drivers/android/context.rs
+ create mode 100644 drivers/android/defs.rs
+ create mode 100644 drivers/android/node.rs
+ create mode 100644 drivers/android/process.rs
+ create mode 100644 drivers/android/range_alloc.rs
+ create mode 100644 drivers/android/rust_binder.rs
+ create mode 100644 drivers/android/thread.rs
+ create mode 100644 drivers/android/transaction.rs
+ create mode 100644 drivers/gpio/gpio_pl061_rust.rs
+ create mode 100644 rust/.gitignore
+ create mode 100644 rust/Makefile
+ create mode 100644 rust/alloc/README.md
+ create mode 100644 rust/alloc/alloc.rs
+ create mode 100644 rust/alloc/borrow.rs
+ create mode 100644 rust/alloc/boxed.rs
+ create mode 100644 rust/alloc/collections/mod.rs
+ create mode 100644 rust/alloc/fmt.rs
+ create mode 100644 rust/alloc/lib.rs
+ create mode 100644 rust/alloc/macros.rs
+ create mode 100644 rust/alloc/raw_vec.rs
+ create mode 100644 rust/alloc/slice.rs
+ create mode 100644 rust/alloc/str.rs
+ create mode 100644 rust/alloc/string.rs
+ create mode 100644 rust/alloc/vec/drain.rs
+ create mode 100644 rust/alloc/vec/drain_filter.rs
+ create mode 100644 rust/alloc/vec/into_iter.rs
+ create mode 100644 rust/alloc/vec/is_zero.rs
+ create mode 100644 rust/alloc/vec/mod.rs
+ create mode 100644 rust/alloc/vec/partial_eq.rs
+ create mode 100644 rust/alloc/vec/set_len_on_drop.rs
+ create mode 100644 rust/alloc/vec/spec_extend.rs
+ create mode 100644 rust/bindgen_parameters
+ create mode 100644 rust/build_error.rs
+ create mode 100644 rust/compiler_builtins.rs
+ create mode 100644 rust/exports.c
+ create mode 100644 rust/helpers.c
+ create mode 100644 rust/kernel/allocator.rs
+ create mode 100644 rust/kernel/amba.rs
+ create mode 100644 rust/kernel/bindings.rs
+ create mode 100644 rust/kernel/bindings_helper.h
+ create mode 100644 rust/kernel/build_assert.rs
+ create mode 100644 rust/kernel/c_types.rs
+ create mode 100644 rust/kernel/chrdev.rs
+ create mode 100644 rust/kernel/clk.rs
+ create mode 100644 rust/kernel/cred.rs
+ create mode 100644 rust/kernel/device.rs
+ create mode 100644 rust/kernel/driver.rs
+ create mode 100644 rust/kernel/error.rs
+ create mode 100644 rust/kernel/file.rs
+ create mode 100644 rust/kernel/gpio.rs
+ create mode 100644 rust/kernel/hwrng.rs
+ create mode 100644 rust/kernel/io_buffer.rs
+ create mode 100644 rust/kernel/io_mem.rs
+ create mode 100644 rust/kernel/iov_iter.rs
+ create mode 100644 rust/kernel/irq.rs
+ create mode 100644 rust/kernel/kasync.rs
+ create mode 100644 rust/kernel/kasync/net.rs
+ create mode 100644 rust/kernel/kunit.rs
+ create mode 100644 rust/kernel/lib.rs
+ create mode 100644 rust/kernel/linked_list.rs
+ create mode 100644 rust/kernel/miscdev.rs
+ create mode 100644 rust/kernel/mm.rs
+ create mode 100644 rust/kernel/module_param.rs
+ create mode 100644 rust/kernel/net.rs
+ create mode 100644 rust/kernel/net/filter.rs
+ create mode 100644 rust/kernel/of.rs
+ create mode 100644 rust/kernel/pages.rs
+ create mode 100644 rust/kernel/platform.rs
+ create mode 100644 rust/kernel/power.rs
+ create mode 100644 rust/kernel/prelude.rs
+ create mode 100644 rust/kernel/print.rs
+ create mode 100644 rust/kernel/random.rs
+ create mode 100644 rust/kernel/raw_list.rs
+ create mode 100644 rust/kernel/rbtree.rs
+ create mode 100644 rust/kernel/revocable.rs
+ create mode 100644 rust/kernel/security.rs
+ create mode 100644 rust/kernel/static_assert.rs
+ create mode 100644 rust/kernel/std_vendor.rs
+ create mode 100644 rust/kernel/str.rs
+ create mode 100644 rust/kernel/sync.rs
+ create mode 100644 rust/kernel/sync/arc.rs
+ create mode 100644 rust/kernel/sync/condvar.rs
+ create mode 100644 rust/kernel/sync/guard.rs
+ create mode 100644 rust/kernel/sync/locked_by.rs
+ create mode 100644 rust/kernel/sync/mutex.rs
+ create mode 100644 rust/kernel/sync/nowait.rs
+ create mode 100644 rust/kernel/sync/revocable.rs
+ create mode 100644 rust/kernel/sync/rwsem.rs
+ create mode 100644 rust/kernel/sync/seqlock.rs
+ create mode 100644 rust/kernel/sync/smutex.rs
+ create mode 100644 rust/kernel/sync/spinlock.rs
+ create mode 100644 rust/kernel/sysctl.rs
+ create mode 100644 rust/kernel/task.rs
+ create mode 100644 rust/kernel/types.rs
+ create mode 100644 rust/kernel/user_ptr.rs
+ create mode 100644 rust/macros/helpers.rs
+ create mode 100644 rust/macros/lib.rs
+ create mode 100644 rust/macros/module.rs
+ create mode 100644 samples/rust/Kconfig
+ create mode 100644 samples/rust/Makefile
+ create mode 100644 samples/rust/hostprogs/.gitignore
+ create mode 100644 samples/rust/hostprogs/Makefile
+ create mode 100644 samples/rust/hostprogs/a.rs
+ create mode 100644 samples/rust/hostprogs/b.rs
+ create mode 100644 samples/rust/hostprogs/single.rs
+ create mode 100644 samples/rust/rust_chrdev.rs
+ create mode 100644 samples/rust/rust_minimal.rs
+ create mode 100644 samples/rust/rust_miscdev.rs
+ create mode 100644 samples/rust/rust_module_parameters.rs
+ create mode 100644 samples/rust/rust_netfilter.rs
+ create mode 100644 samples/rust/rust_platform.rs
+ create mode 100644 samples/rust/rust_print.rs
+ create mode 100644 samples/rust/rust_random.rs
+ create mode 100644 samples/rust/rust_semaphore.rs
+ create mode 100644 samples/rust/rust_semaphore_c.c
+ create mode 100644 samples/rust/rust_stack_probing.rs
+ create mode 100644 samples/rust/rust_sync.rs
+ create mode 100755 scripts/generate_rust_analyzer.py
+ create mode 100644 scripts/generate_rust_target.rs
+ create mode 100755 scripts/is_rust_module.sh
+ create mode 100644 scripts/rust-is-available-bindgen-libclang.h
+ create mode 100755 scripts/rust-is-available.sh
+ create mode 100755 scripts/rustdoc_test_builder.py
+ create mode 100755 scripts/rustdoc_test_gen.py
+Merging sysctl/sysctl-next (494dcdf46e5c sched: Fix build warning without CONFIG_SYSCTL)
+$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next
+Auto-merging fs/proc/proc_sysctl.c
+Auto-merging include/linux/ftrace.h
+Auto-merging include/linux/lockdep.h
+Auto-merging include/linux/reboot.h
+Auto-merging kernel/kexec_core.c
+Auto-merging kernel/locking/lockdep.c
+Auto-merging kernel/panic.c
+Auto-merging kernel/rcu/rcu.h
+Auto-merging kernel/reboot.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/sched/deadline.c
+Auto-merging kernel/sched/fair.c
+Auto-merging kernel/sched/rt.c
+Auto-merging kernel/sched/sched.h
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/trace/ftrace.c
+CONFLICT (content): Merge conflict in kernel/trace/ftrace.c
+Auto-merging mm/oom_kill.c
+Auto-merging mm/page-writeback.c
+Resolved 'kernel/trace/ftrace.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 943340dca8e9] Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git
+$ git diff -M --stat --summary HEAD^..
+ fs/proc/proc_sysctl.c | 89 +++++++------
+ include/linux/acct.h | 1 -
+ include/linux/delayacct.h | 3 -
+ include/linux/ftrace.h | 3 -
+ include/linux/initrd.h | 2 -
+ include/linux/latencytop.h | 3 -
+ include/linux/lockdep.h | 4 -
+ include/linux/oom.h | 4 -
+ include/linux/panic.h | 6 -
+ include/linux/reboot.h | 4 -
+ include/linux/sched/sysctl.h | 41 ------
+ include/linux/writeback.h | 15 ---
+ init/do_mounts_initrd.c | 22 +++-
+ kernel/acct.c | 22 +++-
+ kernel/delayacct.c | 22 +++-
+ kernel/kexec_core.c | 22 ++++
+ kernel/latencytop.c | 41 ++++--
+ kernel/locking/lockdep.c | 35 ++++-
+ kernel/panic.c | 26 +++-
+ kernel/rcu/rcu.h | 2 +
+ kernel/reboot.c | 34 ++++-
+ kernel/sched/core.c | 130 ++++++++++++-------
+ kernel/sched/deadline.c | 42 ++++--
+ kernel/sched/fair.c | 32 ++++-
+ kernel/sched/rt.c | 63 ++++++++-
+ kernel/sched/sched.h | 7 +
+ kernel/sched/topology.c | 25 +++-
+ kernel/sysctl.c | 300 -------------------------------------------
+ kernel/trace/ftrace.c | 101 +++++++++------
+ mm/oom_kill.c | 38 +++++-
+ mm/page-writeback.c | 104 +++++++++++++--
+ 31 files changed, 687 insertions(+), 556 deletions(-)
+Merging folio/for-next (516edb456f12 nilfs2: Fix some kernel-doc comments)
+$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next
+Already up to date.
+Merging execve/for-next/execve (70578ff3367d binfmt_flat: Remove shared library support)
+$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve
+Already up to date.
+Merging bitmap/bitmap-for-next (db7b4edf37fe nodemask: Fix return values to be unsigned)
+$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next
+Auto-merging MAINTAINERS
+Auto-merging arch/alpha/kernel/process.c
+Auto-merging arch/mips/cavium-octeon/octeon-irq.c
+Auto-merging arch/powerpc/kernel/smp.c
+Auto-merging arch/powerpc/kernel/watchdog.c
+Auto-merging arch/powerpc/xmon/xmon.c
+Auto-merging arch/riscv/kernel/cpufeature.c
+Auto-merging arch/s390/kvm/kvm-s390.c
+Auto-merging arch/x86/kernel/cpu/resctrl/rdtgroup.c
+Auto-merging arch/x86/kvm/hyperv.c
+CONFLICT (content): Merge conflict in arch/x86/kvm/hyperv.c
+Auto-merging arch/x86/platform/uv/uv_nmi.c
+Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
+Auto-merging drivers/gpu/drm/i915/i915_pmu.c
+Auto-merging drivers/iio/industrialio-trigger.c
+Auto-merging drivers/net/dsa/b53/b53_common.c
+Auto-merging drivers/net/ethernet/broadcom/bcmsysport.c
+Auto-merging drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c
+Auto-merging drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
+Auto-merging drivers/scsi/lpfc/lpfc_init.c
+Auto-merging drivers/staging/media/tegra-video/vi.c
+Auto-merging include/linux/cpufreq.h
+Auto-merging kernel/irq/affinity.c
+Auto-merging mm/page_alloc.c
+Resolved 'arch/x86/kvm/hyperv.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master d8f94d66807a] Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 4 +
+ arch/alpha/kernel/process.c | 2 +-
+ arch/ia64/kernel/setup.c | 2 +-
+ arch/ia64/kernel/smpboot.c | 4 -
+ arch/ia64/mm/tlb.c | 2 +-
+ arch/mips/cavium-octeon/octeon-irq.c | 4 +-
+ arch/mips/kernel/crash.c | 2 +-
+ arch/powerpc/kernel/smp.c | 2 +-
+ arch/powerpc/kernel/watchdog.c | 2 +-
+ arch/powerpc/xmon/xmon.c | 4 +-
+ arch/riscv/kernel/cpufeature.c | 7 +-
+ arch/s390/kernel/perf_cpum_cf.c | 2 +-
+ arch/s390/kvm/kvm-s390.c | 10 +-
+ arch/x86/kernel/cpu/resctrl/rdtgroup.c | 2 +-
+ arch/x86/kvm/hyperv.c | 12 +-
+ drivers/acpi/numa/srat.c | 2 +-
+ drivers/firmware/psci/psci_checker.c | 2 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 2 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 2 +-
+ drivers/gpu/drm/i915/i915_pmu.c | 2 +-
+ drivers/iio/dummy/iio_simple_dummy_buffer.c | 48 +++----
+ drivers/iio/industrialio-trigger.c | 2 +-
+ drivers/infiniband/hw/hfi1/affinity.c | 9 +-
+ drivers/infiniband/hw/qib/qib_file_ops.c | 2 +-
+ drivers/infiniband/hw/qib/qib_iba7322.c | 2 +-
+ drivers/memstick/core/ms_block.c | 4 +-
+ drivers/net/dsa/b53/b53_common.c | 6 +-
+ drivers/net/ethernet/broadcom/bcmsysport.c | 6 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 2 +-
+ .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 2 +-
+ .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 8 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/cmd.c | 33 ++---
+ drivers/net/ethernet/mellanox/mlx4/eq.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx4/fw.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx4/main.c | 2 +-
+ drivers/net/ethernet/qlogic/qed/qed_rdma.c | 45 +++----
+ drivers/net/ethernet/qlogic/qed/qed_roce.c | 2 +-
+ drivers/perf/thunderx2_pmu.c | 4 +-
+ drivers/scsi/lpfc/lpfc_init.c | 2 +-
+ drivers/soc/fsl/qbman/qman_test_stash.c | 2 +-
+ drivers/staging/media/tegra-video/vi.c | 2 +-
+ include/linux/bitmap.h | 139 ++++++++++++++++++---
+ include/linux/cpufreq.h | 2 +-
+ include/linux/cpumask.h | 50 ++++++++
+ include/linux/find.h | 6 +-
+ include/linux/nodemask.h | 78 +++++++++---
+ lib/bitmap.c | 138 +++++++++++++++-----
+ lib/nodemask.c | 4 +-
+ lib/test_bitmap.c | 25 ++++
+ mm/mempolicy.c | 2 +-
+ mm/page_alloc.c | 2 +-
+ mm/vmstat.c | 4 +-
+ tools/include/linux/bitmap.h | 60 +++++++--
+ tools/lib/bitmap.c | 40 ++++--
+ tools/perf/util/pmu.c | 2 +-
+ 56 files changed, 562 insertions(+), 254 deletions(-)
+Merging hte/hte/for-next (af583852d2ef dt-bindings: Renamed hte directory to timestamp)
+$ git merge -m Merge branch 'hte/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git hte/hte/for-next
+Auto-merging Documentation/index.rst
+Auto-merging MAINTAINERS
+Auto-merging drivers/Kconfig
+Auto-merging drivers/Makefile
+Auto-merging drivers/gpio/gpio-tegra186.c
+Auto-merging drivers/gpio/gpiolib-cdev.c
+Auto-merging drivers/gpio/gpiolib.c
+Auto-merging drivers/gpio/gpiolib.h
+Auto-merging include/linux/gpio/consumer.h
+Auto-merging include/linux/gpio/driver.h
+Merge made by the 'ort' strategy.
+ .../timestamp/hardware-timestamps-common.yaml | 29 +
+ .../bindings/timestamp/hte-consumer.yaml | 39 +
+ .../bindings/timestamp/nvidia,tegra194-hte.yaml | 88 ++
+ Documentation/hte/hte.rst | 79 ++
+ Documentation/hte/index.rst | 22 +
+ Documentation/hte/tegra194-hte.rst | 49 ++
+ Documentation/index.rst | 1 +
+ MAINTAINERS | 8 +
+ drivers/Kconfig | 2 +
+ drivers/Makefile | 1 +
+ drivers/gpio/gpio-tegra186.c | 81 +-
+ drivers/gpio/gpiolib-cdev.c | 252 +++++-
+ drivers/gpio/gpiolib.c | 58 ++
+ drivers/gpio/gpiolib.h | 1 +
+ drivers/hte/Kconfig | 33 +
+ drivers/hte/Makefile | 3 +
+ drivers/hte/hte-tegra194-test.c | 238 ++++++
+ drivers/hte/hte-tegra194.c | 730 ++++++++++++++++
+ drivers/hte/hte.c | 947 +++++++++++++++++++++
+ include/linux/gpio/consumer.h | 16 +-
+ include/linux/gpio/driver.h | 10 +
+ include/linux/hte.h | 271 ++++++
+ include/uapi/linux/gpio.h | 3 +
+ tools/gpio/gpio-event-mon.c | 6 +-
+ 24 files changed, 2930 insertions(+), 37 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/timestamp/hardware-timestamps-common.yaml
+ create mode 100644 Documentation/devicetree/bindings/timestamp/hte-consumer.yaml
+ create mode 100644 Documentation/devicetree/bindings/timestamp/nvidia,tegra194-hte.yaml
+ create mode 100644 Documentation/hte/hte.rst
+ create mode 100644 Documentation/hte/index.rst
+ create mode 100644 Documentation/hte/tegra194-hte.rst
+ create mode 100644 drivers/hte/Kconfig
+ create mode 100644 drivers/hte/Makefile
+ create mode 100644 drivers/hte/hte-tegra194-test.c
+ create mode 100644 drivers/hte/hte-tegra194.c
+ create mode 100644 drivers/hte/hte.c
+ create mode 100644 include/linux/hte.h
+Merging kspp/for-next/kspp (d37aa2efc89b gcc-plugins: use KERNELVERSION for plugin version)
+$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp
+Merge made by the 'ort' strategy.
+ scripts/gcc-plugins/Makefile | 2 +-
+ scripts/gcc-plugins/latent_entropy_plugin.c | 2 +-
+ scripts/gcc-plugins/randomize_layout_plugin.c | 2 +-
+ scripts/gcc-plugins/sancov_plugin.c | 2 +-
+ scripts/gcc-plugins/stackleak_plugin.c | 2 +-
+ scripts/gcc-plugins/structleak_plugin.c | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+Merging kspp-gustavo/for-next/kspp (0cf2b91d74b7 Merge branch 'for-next/kspp-stringop-overflow' into for-next/kspp)
+$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp
+Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+Auto-merging drivers/gpu/drm/i915/intel_pm.c
+Auto-merging drivers/scsi/fcoe/fcoe_ctlr.c
+Auto-merging include/scsi/libfcoe.h
+Auto-merging scripts/checkpatch.pl
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 4 ++--
+ drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 4 ++--
+ drivers/gpu/drm/i915/intel_pm.c | 2 +-
+ drivers/scsi/fcoe/fcoe_ctlr.c | 2 +-
+ drivers/virt/acrn/acrn_drv.h | 10 ++++++----
+ drivers/virt/acrn/mm.c | 9 ++++-----
+ fs/afs/security.c | 3 +--
+ include/scsi/libfcoe.h | 3 ++-
+ include/uapi/linux/wireless.h | 2 +-
+ scripts/checkpatch.pl | 8 +++++---
+ 10 files changed, 25 insertions(+), 22 deletions(-)
+Merging mm-stable/mm-stable (f403f22f8ccb mm: kfence: use PAGE_ALIGNED helper)
+$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable
+Auto-merging Documentation/admin-guide/cgroup-v2.rst
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging Documentation/filesystems/locking.rst
+Auto-merging Documentation/filesystems/proc.rst
+Auto-merging Documentation/filesystems/vfs.rst
+Auto-merging Documentation/vm/index.rst
+Auto-merging MAINTAINERS
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm64/include/asm/hugetlb.h
+Auto-merging arch/arm64/include/asm/pgtable.h
+Auto-merging arch/arm64/mm/hugetlbpage.c
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/powerpc/include/asm/book3s/64/pgtable.h
+Auto-merging arch/powerpc/include/asm/hugetlb.h
+Auto-merging arch/powerpc/mm/book3s64/pgtable.c
+Auto-merging arch/riscv/Kconfig
+Auto-merging arch/riscv/include/asm/pgtable-64.h
+Auto-merging arch/riscv/include/asm/pgtable.h
+Auto-merging arch/sparc/Kconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/x86/include/asm/pgtable_types.h
+Auto-merging arch/x86/mm/Makefile
+CONFLICT (content): Merge conflict in arch/x86/mm/Makefile
+Auto-merging arch/x86/mm/init_64.c
+Auto-merging drivers/block/loop.c
+Auto-merging drivers/block/zram/zram_drv.c
+Auto-merging drivers/gpu/drm/ttm/ttm_bo_vm.c
+Auto-merging fs/cifs/file.c
+Auto-merging fs/dax.c
+Auto-merging fs/exec.c
+Auto-merging fs/hugetlbfs/inode.c
+Auto-merging fs/nfs/file.c
+CONFLICT (content): Merge conflict in fs/nfs/file.c
+Auto-merging fs/open.c
+Auto-merging fs/overlayfs/file.c
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/highmem-internal.h
+Auto-merging include/linux/hugetlb.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/nfs_fs.h
+Auto-merging include/linux/nodemask.h
+Auto-merging include/linux/page-flags.h
+Auto-merging include/linux/printk.h
+Auto-merging include/linux/slab.h
+CONFLICT (content): Merge conflict in include/linux/slab.h
+Auto-merging include/linux/writeback.h
+Auto-merging include/trace/events/btrfs.h
+Auto-merging init/Kconfig
+Auto-merging kernel/events/uprobes.c
+Auto-merging kernel/fork.c
+Auto-merging mm/filemap.c
+Auto-merging mm/gup.c
+Auto-merging mm/huge_memory.c
+Auto-merging mm/hugetlb.c
+Auto-merging mm/kfence/core.c
+Auto-merging mm/kfence/kfence_test.c
+Auto-merging mm/memory-failure.c
+Auto-merging mm/memory.c
+Auto-merging mm/mempolicy.c
+Auto-merging mm/migrate.c
+Auto-merging mm/mmap.c
+Auto-merging mm/mremap.c
+Auto-merging mm/page-writeback.c
+Auto-merging mm/page_alloc.c
+Auto-merging mm/page_io.c
+CONFLICT (content): Merge conflict in mm/page_io.c
+Auto-merging mm/page_owner.c
+Auto-merging mm/shmem.c
+Auto-merging mm/slab.c
+Auto-merging mm/slab_common.c
+Auto-merging mm/swapfile.c
+Auto-merging mm/util.c
+Auto-merging mm/vmscan.c
+Auto-merging mm/vmstat.c
+Auto-merging tools/testing/selftests/cgroup/cgroup_util.c
+Auto-merging tools/testing/selftests/cgroup/cgroup_util.h
+Auto-merging tools/testing/selftests/vm/Makefile
+Resolved 'arch/x86/mm/Makefile' using previous resolution.
+Resolved 'fs/nfs/file.c' using previous resolution.
+Resolved 'include/linux/slab.h' using previous resolution.
+Resolved 'mm/page_io.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master ecf0628cf4a4] Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-kernel-mm-damon | 25 +-
+ Documentation/admin-guide/blockdev/zram.rst | 5 +
+ Documentation/admin-guide/cgroup-v2.rst | 49 ++
+ Documentation/admin-guide/kernel-parameters.txt | 10 +-
+ Documentation/admin-guide/mm/damon/reclaim.rst | 11 +
+ Documentation/admin-guide/mm/damon/usage.rst | 41 +-
+ Documentation/admin-guide/mm/hugetlbpage.rst | 2 +-
+ Documentation/admin-guide/mm/ksm.rst | 18 +
+ Documentation/admin-guide/sysctl/vm.rst | 48 ++
+ Documentation/dev-tools/kasan.rst | 228 +++++----
+ Documentation/filesystems/locking.rst | 18 +-
+ Documentation/filesystems/proc.rst | 154 +++---
+ Documentation/filesystems/vfs.rst | 17 +-
+ Documentation/vm/highmem.rst | 100 ++--
+ Documentation/vm/index.rst | 1 +
+ Documentation/vm/page_owner.rst | 45 +-
+ Documentation/vm/vmemmap_dedup.rst | 223 +++++++++
+ MAINTAINERS | 9 +-
+ arch/alpha/include/asm/page.h | 2 +-
+ arch/arm64/Kconfig | 3 +
+ arch/arm64/include/asm/cache.h | 17 +-
+ arch/arm64/include/asm/hugetlb.h | 4 +-
+ arch/arm64/include/asm/mman.h | 24 -
+ arch/arm64/include/asm/mte-kasan.h | 1 +
+ arch/arm64/include/asm/percpu.h | 1 +
+ arch/arm64/include/asm/pgtable-prot.h | 1 +
+ arch/arm64/include/asm/pgtable.h | 91 +++-
+ arch/arm64/mm/flush.c | 14 +
+ arch/arm64/mm/hugetlbpage.c | 12 +-
+ arch/arm64/mm/mmap.c | 25 +
+ arch/csky/include/asm/processor.h | 2 +-
+ arch/ia64/include/asm/hugetlb.h | 5 +-
+ arch/ia64/kernel/uncached.c | 2 +-
+ arch/mips/include/asm/hugetlb.h | 9 +-
+ arch/parisc/include/asm/hugetlb.h | 5 +-
+ arch/powerpc/Kconfig | 1 +
+ arch/powerpc/include/asm/book3s/64/pgtable.h | 31 +-
+ arch/powerpc/include/asm/hugetlb.h | 9 +-
+ arch/powerpc/include/asm/mman.h | 12 -
+ arch/powerpc/mm/book3s64/pgtable.c | 17 +
+ arch/riscv/Kconfig | 1 +
+ arch/riscv/include/asm/pgtable-64.h | 5 +
+ arch/riscv/include/asm/pgtable.h | 66 ++-
+ arch/s390/include/asm/hugetlb.h | 26 +-
+ arch/s390/include/asm/pgtable.h | 36 +-
+ arch/sh/include/asm/hugetlb.h | 5 +-
+ arch/sparc/Kconfig | 1 +
+ arch/sparc/include/asm/hugetlb.h | 5 +-
+ arch/sparc/include/asm/mman.h | 6 -
+ arch/sparc/mm/init_64.c | 12 +
+ arch/x86/Kconfig | 3 +-
+ arch/x86/include/asm/pgtable.h | 54 +-
+ arch/x86/include/asm/pgtable_64.h | 4 +-
+ arch/x86/include/asm/pgtable_64_types.h | 5 +
+ arch/x86/include/asm/pgtable_types.h | 2 +
+ arch/x86/include/asm/tlbflush.h | 97 ++++
+ arch/x86/include/uapi/asm/mman.h | 14 -
+ arch/x86/mm/Makefile | 2 +-
+ arch/x86/mm/init_64.c | 2 +-
+ arch/x86/mm/pgprot.c | 35 ++
+ arch/x86/mm/pgtable.c | 13 +-
+ drivers/block/loop.c | 4 +-
+ drivers/block/zram/Kconfig | 3 +-
+ drivers/block/zram/zram_drv.c | 52 +-
+ drivers/block/zram/zram_drv.h | 1 -
+ drivers/firmware/smccc/kvm_guest.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 2 +-
+ drivers/gpu/drm/ttm/ttm_bo_vm.c | 2 +-
+ drivers/virtio/virtio_mem.c | 6 +-
+ fs/Kconfig | 22 +-
+ fs/cifs/file.c | 7 +-
+ fs/dax.c | 98 +---
+ fs/exec.c | 6 +-
+ fs/fcntl.c | 9 +-
+ fs/hugetlbfs/inode.c | 19 +-
+ fs/nfs/direct.c | 23 +-
+ fs/nfs/file.c | 18 +-
+ fs/open.c | 9 +-
+ fs/overlayfs/file.c | 13 +-
+ fs/proc/base.c | 22 +
+ fs/proc/meminfo.c | 7 +
+ fs/proc/task_mmu.c | 9 +-
+ fs/userfaultfd.c | 32 +-
+ include/asm-generic/hugetlb.h | 28 +-
+ include/asm-generic/pgtable-nopmd.h | 2 +
+ include/asm-generic/tlb.h | 14 +
+ include/linux/cma.h | 4 +-
+ include/linux/compaction.h | 5 +-
+ include/linux/damon.h | 14 +
+ include/linux/fault-inject.h | 2 +
+ include/linux/fs.h | 9 +
+ include/linux/gfp.h | 20 +-
+ include/linux/highmem-internal.h | 18 +-
+ include/linux/highmem.h | 53 +-
+ include/linux/huge_mm.h | 20 +-
+ include/linux/hugetlb.h | 42 +-
+ include/linux/kasan.h | 8 +-
+ include/linux/khugepaged.h | 44 +-
+ include/linux/ksm.h | 4 +-
+ include/linux/memcontrol.h | 72 ++-
+ include/linux/memory_hotplug.h | 14 +-
+ include/linux/migrate.h | 39 +-
+ include/linux/mm.h | 70 ++-
+ include/linux/mm_inline.h | 43 ++
+ include/linux/mm_types.h | 20 +
+ include/linux/mman.h | 4 -
+ include/linux/mmzone.h | 5 +-
+ include/linux/nfs_fs.h | 2 +-
+ include/linux/nodemask.h | 13 +-
+ include/linux/page-flags.h | 62 ++-
+ include/linux/page-isolation.h | 6 +-
+ include/linux/pgtable.h | 84 +++-
+ include/linux/printk.h | 1 -
+ include/linux/rmap.h | 149 +++++-
+ include/linux/sched/coredump.h | 3 +-
+ include/linux/shmem_fs.h | 6 +-
+ include/linux/slab.h | 12 +
+ include/linux/swap.h | 191 ++-----
+ include/linux/swap_slots.h | 2 +-
+ include/linux/swapops.h | 124 ++++-
+ include/linux/userfaultfd_k.h | 84 ++++
+ include/linux/vm_event_item.h | 7 +
+ include/linux/writeback.h | 7 +
+ include/ras/ras_event.h | 1 -
+ include/trace/events/btrfs.h | 4 +-
+ include/trace/events/compaction.h | 4 +-
+ include/trace/events/kmem.h | 26 +-
+ include/trace/events/mmflags.h | 84 ++--
+ include/trace/events/percpu.h | 23 +-
+ include/trace/events/vmscan.h | 20 +-
+ include/uapi/linux/userfaultfd.h | 10 +-
+ init/Kconfig | 140 ------
+ kernel/bpf/bpf_lru_list.h | 1 +
+ kernel/events/uprobes.c | 2 +-
+ kernel/fork.c | 4 +-
+ lib/Kconfig.kasan | 168 +++----
+ lib/fault-inject.c | 3 +
+ lib/kstrtox.c | 6 +-
+ mm/Kconfig | 577 ++++++++++++++--------
+ mm/Makefile | 2 +-
+ mm/compaction.c | 93 ++--
+ mm/damon/core-test.h | 36 ++
+ mm/damon/core.c | 115 ++++-
+ mm/damon/ops-common.c | 3 +-
+ mm/damon/paddr.c | 2 +-
+ mm/damon/reclaim.c | 124 +++--
+ mm/damon/sysfs.c | 406 ++++++++++++---
+ mm/damon/vaddr-test.h | 14 +-
+ mm/damon/vaddr.c | 90 +---
+ mm/debug_vm_pgtable.c | 46 +-
+ mm/failslab.c | 3 +
+ mm/filemap.c | 5 +
+ mm/gup.c | 127 ++++-
+ mm/hmm.c | 2 +-
+ mm/huge_memory.c | 177 +++++--
+ mm/hugetlb.c | 428 +++++++++++-----
+ mm/hugetlb_vmemmap.c | 323 +++++-------
+ mm/hugetlb_vmemmap.h | 24 +-
+ mm/hwpoison-inject.c | 1 +
+ mm/internal.h | 177 +++++--
+ mm/kasan/common.c | 12 +-
+ mm/kasan/generic.c | 6 +-
+ mm/kasan/kasan.h | 92 ++--
+ mm/kasan/quarantine.c | 54 +-
+ mm/kasan/report_generic.c | 8 +-
+ mm/kfence/core.c | 40 +-
+ mm/kfence/kfence_test.c | 5 +-
+ mm/khugepaged.c | 81 +--
+ mm/ksm.c | 35 +-
+ mm/madvise.c | 17 +-
+ mm/memcontrol.c | 329 ++++++++++--
+ mm/memory-failure.c | 126 ++---
+ mm/memory.c | 573 ++++++++++++++-------
+ mm/memory_hotplug.c | 35 +-
+ mm/mempolicy.c | 74 +--
+ mm/memremap.c | 10 +
+ mm/migrate.c | 194 ++++----
+ mm/migrate_device.c | 23 +-
+ mm/mincore.c | 4 +-
+ mm/mmap.c | 67 +--
+ mm/mmu_gather.c | 16 +-
+ mm/mprotect.c | 176 +++++--
+ mm/mremap.c | 16 +-
+ mm/page-writeback.c | 17 +-
+ mm/page_alloc.c | 375 +++++---------
+ mm/page_ext.c | 2 +-
+ mm/page_idle.c | 7 +-
+ mm/page_io.c | 253 +++++++---
+ mm/page_isolation.c | 391 ++++++++++++++-
+ mm/page_owner.c | 4 +-
+ mm/page_table_check.c | 25 +-
+ mm/page_vma_mapped.c | 17 +-
+ mm/percpu-internal.h | 8 +-
+ mm/percpu.c | 5 +-
+ mm/pgtable-generic.c | 8 +
+ mm/rmap.c | 409 ++++++++++-----
+ mm/shmem.c | 353 +++++++------
+ mm/slab.c | 7 +-
+ mm/slab_common.c | 3 +-
+ mm/slob.c | 16 +-
+ mm/sparse-vmemmap.c | 176 ++++++-
+ mm/sparse.c | 53 +-
+ mm/swap.c | 10 +-
+ mm/swap.h | 157 ++++++
+ mm/swap_slots.c | 20 +-
+ mm/swap_state.c | 90 ++--
+ mm/swapfile.c | 135 ++---
+ mm/userfaultfd.c | 62 ++-
+ mm/util.c | 1 +
+ mm/vmalloc.c | 18 +-
+ mm/vmscan.c | 476 +++++++++---------
+ mm/vmstat.c | 9 +-
+ mm/z3fold.c | 64 +--
+ mm/zswap.c | 52 +-
+ tools/testing/selftests/cgroup/cgroup_util.c | 56 ++-
+ tools/testing/selftests/cgroup/cgroup_util.h | 1 +
+ tools/testing/selftests/cgroup/test_memcontrol.c | 199 ++++++--
+ tools/testing/selftests/damon/sysfs.sh | 1 +
+ tools/testing/selftests/vm/.gitignore | 3 +
+ tools/testing/selftests/vm/Makefile | 14 +-
+ tools/testing/selftests/vm/config | 2 +
+ tools/testing/selftests/vm/gup_test.c | 24 +-
+ tools/testing/selftests/vm/hugepage-mremap.c | 6 +
+ tools/testing/selftests/vm/ksm_tests.c | 9 +-
+ tools/testing/selftests/vm/madv_populate.c | 34 +-
+ tools/testing/selftests/vm/migration.c | 193 ++++++++
+ tools/testing/selftests/vm/mrelease_test.c | 200 ++++++++
+ tools/testing/selftests/vm/protection_keys.c | 2 +-
+ tools/testing/selftests/vm/run_vmtests.sh | 525 ++++----------------
+ tools/testing/selftests/vm/settings | 1 +
+ tools/testing/selftests/vm/soft-dirty.c | 145 ++++++
+ tools/testing/selftests/vm/split_huge_page_test.c | 79 +--
+ tools/testing/selftests/vm/userfaultfd.c | 13 +-
+ tools/testing/selftests/vm/vm_util.c | 108 ++++
+ tools/testing/selftests/vm/vm_util.h | 9 +
+ tools/vm/page-types.c | 8 +-
+ tools/vm/page_owner_sort.c | 386 ++++++++++++---
+ 238 files changed, 9204 insertions(+), 4661 deletions(-)
+ create mode 100644 Documentation/vm/vmemmap_dedup.rst
+ create mode 100644 arch/x86/mm/pgprot.c
+ create mode 100644 mm/swap.h
+ create mode 100644 tools/testing/selftests/vm/migration.c
+ create mode 100644 tools/testing/selftests/vm/mrelease_test.c
+ create mode 100644 tools/testing/selftests/vm/settings
+ create mode 100644 tools/testing/selftests/vm/soft-dirty.c
+ create mode 100644 tools/testing/selftests/vm/vm_util.c
+ create mode 100644 tools/testing/selftests/vm/vm_util.h
+Merging mm-nonmm-stable/mm-nonmm-stable (3159d79b56c1 kcov: update pos before writing pc in trace function)
+$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable
+Auto-merging MAINTAINERS
+Auto-merging arch/ia64/kernel/ptrace.c
+Auto-merging arch/ia64/mm/init.c
+Auto-merging arch/ia64/mm/tlb.c
+Auto-merging arch/powerpc/kernel/crash_dump.c
+Auto-merging fs/fat/file.c
+Auto-merging fs/fat/inode.c
+Auto-merging fs/namei.c
+Auto-merging fs/ntfs/file.c
+Auto-merging fs/ntfs3/super.c
+Auto-merging include/linux/list.h
+Auto-merging include/linux/ptrace.h
+CONFLICT (content): Merge conflict in include/linux/ptrace.h
+Auto-merging include/uapi/linux/elf.h
+Auto-merging init/Kconfig
+Auto-merging init/initramfs.c
+Auto-merging ipc/mqueue.c
+Auto-merging kernel/crash_core.c
+Auto-merging kernel/hung_task.c
+Auto-merging kernel/kexec_core.c
+Auto-merging kernel/ptrace.c
+Auto-merging kernel/watchdog.c
+Auto-merging lib/Kconfig.debug
+Auto-merging scripts/decode_stacktrace.sh
+Resolved 'include/linux/ptrace.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 8fff0f150aff] Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 2 +-
+ arch/alpha/lib/csum_partial_copy.c | 1 -
+ arch/arm/kernel/crash_dump.c | 27 +-
+ arch/arm64/kernel/crash_dump.c | 29 +--
+ arch/ia64/kernel/crash_dump.c | 32 +--
+ arch/ia64/kernel/kprobes.c | 64 ++---
+ arch/ia64/kernel/mca.c | 1 -
+ arch/ia64/kernel/palinfo.c | 2 +-
+ arch/ia64/kernel/ptrace.c | 2 +-
+ arch/ia64/kernel/traps.c | 2 +-
+ arch/ia64/mm/init.c | 2 +-
+ arch/ia64/mm/tlb.c | 4 +-
+ arch/m68k/lib/checksum.c | 2 -
+ arch/mips/kernel/crash_dump.c | 27 +-
+ arch/powerpc/kernel/crash_dump.c | 35 +--
+ arch/powerpc/lib/checksum_wrappers.c | 2 -
+ arch/riscv/kernel/crash_dump.c | 26 +-
+ arch/s390/kernel/crash_dump.c | 13 +-
+ arch/sh/kernel/crash_dump.c | 29 +--
+ arch/x86/kernel/crash_dump_32.c | 29 +--
+ arch/x86/kernel/crash_dump_64.c | 48 ++--
+ arch/x86/lib/csum-wrappers_64.c | 2 -
+ drivers/rapidio/devices/rio_mport_cdev.c | 4 +-
+ drivers/tty/tty_buffer.c | 3 +-
+ fs/fat/fat.h | 14 +-
+ fs/fat/fatent.c | 7 +-
+ fs/fat/file.c | 14 +-
+ fs/fat/inode.c | 19 +-
+ fs/fat/misc.c | 78 +++---
+ fs/fat/namei_vfat.c | 4 -
+ fs/namei.c | 8 +-
+ fs/ntfs/file.c | 4 +-
+ fs/ntfs3/super.c | 10 +-
+ fs/ocfs2/dlm/dlmdebug.c | 12 +-
+ fs/ocfs2/dlm/dlmunlock.c | 21 +-
+ fs/ocfs2/dlmfs/userdlm.c | 17 +-
+ fs/ocfs2/inode.c | 4 +-
+ fs/ocfs2/journal.c | 33 ++-
+ fs/ocfs2/journal.h | 2 +
+ fs/ocfs2/quota_local.c | 10 +-
+ fs/ocfs2/reservations.c | 4 +-
+ fs/ocfs2/reservations.h | 9 +-
+ fs/ocfs2/super.c | 180 ++++++++-----
+ fs/pipe.c | 2 +-
+ fs/proc/generic.c | 3 +
+ fs/proc/kcore.c | 14 +-
+ fs/proc/proc_net.c | 3 +
+ fs/proc/vmcore.c | 130 +++++-----
+ fs/sysv/super.c | 4 +-
+ include/linux/crash_dump.h | 19 +-
+ include/linux/list.h | 6 +-
+ include/linux/pipe_fs_i.h | 2 +-
+ include/uapi/linux/acct.h | 3 +-
+ include/uapi/linux/elf.h | 2 +-
+ include/uapi/linux/taskstats.h | 24 +-
+ init/Kconfig | 14 +-
+ init/initramfs.c | 76 ++++--
+ ipc/mqueue.c | 14 ++
+ ipc/sem.c | 25 +-
+ kernel/crash_core.c | 3 -
+ kernel/hung_task.c | 2 +-
+ kernel/kcov.c | 14 +-
+ kernel/kexec_core.c | 2 -
+ kernel/pid_namespace.c | 2 +-
+ kernel/ptrace.c | 6 -
+ kernel/relay.c | 2 +-
+ kernel/taskstats.c | 24 ++
+ kernel/tsacct.c | 10 +-
+ kernel/watchdog.c | 4 +-
+ lib/Kconfig.debug | 21 --
+ lib/glob.c | 2 +-
+ lib/string.c | 25 +-
+ lib/string_helpers.c | 3 +
+ lib/test_meminit.c | 12 +-
+ lib/test_string.c | 33 +++
+ scripts/bloat-o-meter | 1 +
+ scripts/decode_stacktrace.sh | 27 +-
+ scripts/get_maintainer.pl | 1 +
+ tools/accounting/.gitignore | 1 +
+ tools/accounting/Makefile | 2 +-
+ tools/accounting/procacct.c | 417 +++++++++++++++++++++++++++++++
+ usr/gen_init_cpio.c | 92 +++++--
+ 82 files changed, 1180 insertions(+), 705 deletions(-)
+ create mode 100644 tools/accounting/procacct.c
+Merging mm/mm-everything (3fc24b0fa2b6 Merge branch 'mm-nonmm-unstable' into mm-everything)
+$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging MAINTAINERS
+Auto-merging MAINTAINERS
+Auto-merging MAINTAINERS
+Auto-merging fs/ocfs2/refcounttree.c
+Auto-merging include/linux/kexec.h
+Auto-merging include/linux/mm.h
+Auto-merging init/Kconfig
+Auto-merging init/Kconfig
+CONFLICT (content): Merge conflict in init/Kconfig
+Auto-merging init/main.c
+Auto-merging kernel/kexec_file.c
+Auto-merging lib/Kconfig.debug
+CONFLICT (content): Merge conflict in lib/Kconfig.debug
+Auto-merging mm/huge_memory.c
+Auto-merging mm/hugetlb.c
+Auto-merging mm/kfence/core.c
+Auto-merging mm/memory-failure.c
+Auto-merging mm/memory.c
+Auto-merging mm/mremap.c
+Auto-merging mm/page_alloc.c
+Auto-merging mm/shmem.c
+Auto-merging mm/swapfile.c
+Auto-merging scripts/checkpatch.pl
+Auto-merging tools/testing/selftests/vm/Makefile
+Recorded preimage for 'init/Kconfig'
+Recorded preimage for 'lib/Kconfig.debug'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'init/Kconfig'.
+Recorded resolution for 'lib/Kconfig.debug'.
+[master 0c33240a73dd] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/kernel-parameters.txt | 13 +
+ Documentation/vm/balance.rst | 2 +-
+ MAINTAINERS | 1 +
+ arch/s390/include/asm/kexec.h | 10 +
+ arch/x86/include/asm/kexec.h | 8 +
+ drivers/iommu/tegra-smmu.c | 4 +-
+ fs/ocfs2/namei.c | 49 +--
+ fs/ocfs2/namei.h | 2 +
+ fs/ocfs2/refcounttree.c | 15 +-
+ fs/ocfs2/xattr.c | 12 +-
+ fs/ocfs2/xattr.h | 1 +
+ include/linux/gfp.h | 12 +-
+ include/linux/huge_mm.h | 8 +-
+ include/linux/kexec.h | 46 ++-
+ include/linux/mm.h | 9 +-
+ include/linux/mm_types.h | 5 +
+ include/linux/mmzone.h | 12 +-
+ include/linux/rmap.h | 4 +-
+ include/linux/swap.h | 7 +-
+ include/linux/swapops.h | 10 +
+ include/trace/events/mmflags.h | 1 -
+ init/Kconfig | 54 ----
+ init/main.c | 25 +-
+ init/version.c | 17 +
+ kernel/kexec_file.c | 34 --
+ lib/Kconfig.debug | 35 ---
+ lib/test_printf.c | 8 +-
+ mm/Kconfig | 56 ++++
+ mm/Kconfig.debug | 31 ++
+ mm/internal.h | 2 +-
+ mm/kasan/report.c | 2 +-
+ mm/madvise.c | 18 +-
+ mm/memory.c | 5 +-
+ mm/page_alloc.c | 360 ++++++++++++++--------
+ mm/page_vma_mapped.c | 2 +-
+ mm/shmem.c | 39 +++
+ mm/swap_state.c | 3 +
+ mm/swapfile.c | 21 +-
+ mm/z3fold.c | 97 +++---
+ scripts/checkpatch.pl | 3 +-
+ tools/include/linux/gfp.h | 3 +-
+ tools/perf/builtin-kmem.c | 1 -
+ tools/testing/selftests/cgroup/memcg_protection.m | 89 ++++++
+ tools/testing/selftests/cgroup/test_memcontrol.c | 247 ++++-----------
+ 44 files changed, 783 insertions(+), 600 deletions(-)
+ create mode 100644 tools/testing/selftests/cgroup/memcg_protection.m
+$ git am -3 ../patches/0001-fixup-for-mm-change-huge_ptep_clear_flush-to-return-.patch
+Applying: fixup for "mm: change huge_ptep_clear_flush() to return the original pte"
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/arm64/mm/hugetlbpage.c
+$ git add -A .
+$ git commit -v -a --amend
+[master c6f4e5219787] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
+ Date: Thu May 26 16:01:34 2022 +1000
+$ git am -3 ../patches/0001-fix-up-for-mm-Kconfig-reorganize-misplaced-mm-option.patch
+Applying: fix up for "mm: Kconfig: reorganize misplaced mm options"
+$ git reset HEAD^
+Unstaged changes after reset:
+M mm/Kconfig.debug
+$ git add -A .
+$ git commit -v -a --amend
+[master 4fe1c7989fe1] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
+ Date: Thu May 26 16:01:34 2022 +1000
+$ 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/1)
[KSuccessfully rebased and updated refs/heads/akpm.
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + 6bf3ddc7cec0...9a465c091e5d akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (9a465c091e5d mm/oom_kill.c: fix vm_oom_kill_table[] ifdeffery)
+$ git merge --no-ff akpm/master
+Merge made by the 'ort' strategy.
+ mm/oom_kill.c | 58 +++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 0000000000000..78316b2f0f7a0
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20220526
--
GitLab