diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 0000000000000..ed759347c3b5c
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,360 @@
+Name SHA1
+---- ----
+origin 3245cb65fd91cd514801bf91f5a3066d562f0ac4
+fixes 1c23f9e627a7b412978b4e852793c5e3c3efc555
+mm-hotfixes 95bdaeee9e823765a1754ee1a98253cd49c5b316
+kbuild-current 80e78fcce86de0288793a0ef0f6acf37656ee4cf
+arc-current 952deecb065e23784fd6fcab3020de397d51d296
+arm-current 25af7406df5915f04d5f1c8f081dabb0ead1cdcc
+arm64-fixes 3fe3fd5f30720b4afd3345cc186808125e7f5848
+arm-soc-fixes aaa58141a5d7647b14d812dde92b8d680e0985db
+drivers-memory-fixes c941e6305958fb85e0e4d6c632c8a7a489c76f88
+tee-fixes 98268f2a2a9f1dddf20984f79fdc7b655d0e35fe
+m68k-current b508128bb0d1e243beb56cca5d819bcbb5c269b1
+powerpc-fixes a66de5283e16602b74658289360505ceeb308c90
+s390-fixes 8d96bba75a43ba564bf8732e955d9f519d2bbaec
+sparc 05a59d79793d482f628a31753c671f2e92178a21
+fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57
+net 0727a9a5fbc1151fcaebfa9772e9f68f5e38ba9e
+bpf a37a32583e282d8d815e22add29bc1e91e19951a
+ipsec 26dbd66eab8080be51759e48280da04015221e22
+netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65
+ipvs 7fb0269720d7d5359bc8349eef908a1c96866b65
+wireless 781b80f452fcc1cfc16ee41f12556626a9ced049
+rdma-fixes a261786fdc0a5bed2e5f994dcc0ffeeeb0d662c7
+sound-current ba1f818053b0668a1ce2fe86b840e81b592cc560
+sound-asoc-fixes d56ba9a04d7548d4149c46ec86a0e3cc41a70f4a
+regmap-fixes 80e78fcce86de0288793a0ef0f6acf37656ee4cf
+regulator-fixes 80e78fcce86de0288793a0ef0f6acf37656ee4cf
+spi-fixes 80e78fcce86de0288793a0ef0f6acf37656ee4cf
+pci-current 0e1fa5155a364de7d3de770eb382980933376699
+driver-core.current d8ab4685adc1f78aef5ece1334a47ca1a8181745
+tty.current 1d10cd4da593bc0196a239dcc54dac24b6b0a74e
+usb.current ce001778dfc34804f2b1fa6faaad7ac888326afb
+usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120
+usb-serial-fixes d640c4cb8f2f933c0ca896541f9de7fb1ae245f4
+phy 0a6fc70d76bddf98278af2ac000379c82aec8f11
+staging.current 7e18e42e4b280c85b76967a9106a13ca61c16179
+iio-fixes f57f4fb09850eeff7c70992eb0d2f6f0ce86ab04
+counter-current 8294b04153c33602e9c3dd21ac90c1e99bd0fdaf
+char-misc.current ab0b4b575b46d29bf49dc86047dc2964125db722
+soundwire-fixes 4ef3f2aff1267bfa6d5a90c42a30b927b8aa239b
+thunderbolt-fixes 14c7d905283744809e6b82efae2f490660a11cda
+input-current 9c9c71168f7979f3798b61c65b4530fbfbcf19d1
+crypto-current 874b301985ef2f89b8b592ad255e03fb6fbfe605
+vfio-fixes 873aefb376bbc0ed1dd2381ea1d6ec88106fdbd4
+kselftest-fixes bdbf0617bbc3641af158d1aeffeebb1505f76263
+modules-fixes e69a66147d49506062cd837f3b230ee3e98102ab
+dmaengine-fixes e0f1b21c504f050de83922dd49e6a425dad2d518
+backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15
+mtd-fixes 0fddf9ad06fd9f439f137139861556671673e31c
+mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6
+v4l-dvb-fixes 150f7b11cb59670a147e88580a604ce3c6845a88
+reset-fixes 51fd191422d987dfd75a711aae592069ebb03ec9
+mips-fixes 80e78fcce86de0288793a0ef0f6acf37656ee4cf
+at91-fixes f5fc22cbbdcd349402faaddf1a07eb8403658ae8
+omap-fixes 2a906db2824b75444982f5e9df870106982afca8
+kvm-fixes 29250ba51bc1cbe8a87e923f76978b87c3247a8c
+kvms390-fixes ca922fecda6caa5162409406dc3b663062d75089
+hwmon-fixes 80e78fcce86de0288793a0ef0f6acf37656ee4cf
+nvdimm-fixes 17d9c15c9b9e7fb285f7ac5367dfb5f00ff575e3
+cxl-fixes e35f5718903b093be4b1d3833aa8a32f864a3ef1
+btrfs-fixes 351ff18f7481367e8361f527ebd930b956b44067
+vfs-fixes bfbfb6182ad1d7d184b16f25165faad879147f79
+dma-mapping-fixes 3be4562584bba603f33863a00c1c32eecf772ee6
+i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8
+drivers-x86-fixes 647e82dbf85124697be59a4b4cf00c0d38177dcb
+samsung-krzk-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868
+pinctrl-samsung-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868
+devicetree-fixes de11663b75b0a8f1cfeb00d3b4acec9bd5a49cad
+dt-krzk-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868
+scsi-fixes 991df3dd5144f2e6b1c38b8d20ed3d4d21e20b34
+drm-fixes 80e78fcce86de0288793a0ef0f6acf37656ee4cf
+amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01
+drm-intel-fixes 8787f6fab41380189865f5751c0f15b0c298b923
+mmc-fixes 35ca91d1338ae158f6dcc0de5d1e86197924ffda
+rtc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868
+gnss-fixes a111daf0c53ae91e71fd2bfe7497862d14132e3e
+hyperv-fixes f0880e2cb7e1f8039a048fdd01ce45ab77247221
+soc-fsl-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f
+risc-v-fixes af193cc7fc350554e0669a3c6d321911ecf89c80
+risc-v-mc-fixes 0dec364ffeb6149aae572ded1e34d4b444c23be6
+pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d
+fpga-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868
+spdx 568035b01cfb107af8d2e4bd2fb9aea22cf5b868
+gpio-brgl-fixes 09eed5a1ed3c752892663976837eb4244c2f1984
+gpio-intel-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868
+pinctrl-intel-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868
+erofs-fixes 80e78fcce86de0288793a0ef0f6acf37656ee4cf
+integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf
+kunit-fixes 2a2dfc869d3345ccdd91322b023f4b0da84acbe7
+ubifs-fixes c3c07fc25f37c157fde041b3a0c3dfcb1590cbce
+memblock-fixes c94afc46cae7ad41b2ad6a99368147879f4b0e56
+cel-fixes 00801cd92d91e94aa04d687f9bb9a9104e7c3d46
+irqchip-fixes 8d5356f9820dc48578fc50077f5a34905386e47f
+renesas-fixes ab2866f12ca18747413ba41409231d44e0c6149b
+broadcom-fixes b6fa0476585728df492bc1dba993fe34e8cbcc4b
+perf-current 9b4509495418a0effe964b0aad9a522be5a3b6d5
+efi-fixes 9cb636b5f6a8cc6d1b50809ec8f8d33ae0c84c95
+zstd-fixes 88a309465b3f05a100c3b81966982c0f9f5d23a6
+battery-fixes 9db5f08ca99db165dadeec972448e11b97a3ef91
+drm-misc-fixes b0b9408f132623dc88e78adb5282f74e4b64bb57
+kbuild 5f5ef75d1c4bf8177719529f0aaad59f9fd847de
+clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0
+perf 62e64c9d2fd12839c02f1b3e8b873e7cb34e8720
+compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69
+dma-mapping 9fc18f6d56d5b79d527c17a8100a0965d18345cf
+asm-generic fdc5bebfb66bf0d261818c2df2b01c2a005791fe
+arc f2906aa863381afb0015a9eb7fefad885d4e5a56
+arm 5d6dd664478f8758fa255530030fdbf1c6f57953
+arm64 daecb3077f330058d1c53de32d272bc23ff61a25
+arm-perf aaaee7b55c9e58410abcef6e3e2fd80e4135d02e
+arm-soc 5ff4137055a25840be89fa8281fa472732569bca
+actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6
+amlogic 727d51a3ed30a1067b7dec4912209c6efbf64df6
+aspeed 7bc156fbb726a3db8dbd209120b738bf8f16a756
+at91 3d395fc5ca0a467257f13870223404c81d3368a4
+broadcom 122de0c732565a71cd72e5922ce57b922661eb8c
+drivers-memory f492ddd4aaadcb0ad48c3f6b5e2e4c821e8b7439
+imx-mxs e2e1869ddb2afaf24ef6f04eb34f4db2db54c6dc
+keystone cb293d3b430e35dbc1e8425869f27624355ff10a
+mediatek 05980182ed25acc47739d9c22a93005097d37cb4
+mvebu 74de3ae81a4245807d4f5ea066c1fcc906b18a17
+omap 8efe5dea6753bc55111f256d6b401d2aa241b7c8
+qcom 49a649b9cbf328aa582506fde7c9e860ffb7131f
+raspberrypi c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca
+renesas 3319a5eda420fede8f0336d5ee1135a758856ced
+reset d985db83622679fc496ed824088e066528b3a872
+rockchip 875e259a8a86dd2a169e520873021af716547980
+samsung-krzk 37ff5e2f7bd2010c59808bdee5bbe5c1aad3e924
+scmi 1f3a176f26cc8bbb99abad9e767a95207196f390
+stm32 400a100c28fea535422d0e6611e63daa77bfbf82
+sunxi ebb11236fe254ef058eb319ac2bc38f52cac1c15
+tee db30e53bf897670e11fdfa199a3ca7079db20fd2
+tegra 761c03270244ff6a03b8d59c8d1932c644dcf9bc
+ti acf3fdc88665a26abfe22827993a2dabf182a513
+xilinx 0413dd4d95da9f743ff1e0337d413af5a84db515
+clk de86412dc79f95dd1050dc53c7868e3c792eccde
+clk-imx 9dfb5937c56b955232b1f8db55c382b76712ba14
+clk-renesas e312ae92077f90d6ccdca05fb6d640bd9624c37c
+clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862
+csky 45fef4c4b9c94e86d9c13f0b2e7e71bb32254509
+loongarch b90cb1053190353cc30f0fef0ef1f378ccc063c5
+m68k feb159347bb0afb8229d530f3fab7f9201646a81
+m68knommu 9ad3a9ca3510af1dc8499a15b6af373987453a82
+microblaze 568035b01cfb107af8d2e4bd2fb9aea22cf5b868
+mips 0153682e9e6accd1796dd6bbe9df792d03d88b1f
+nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae
+openrisc 52e0ea900202d23843daee8f7089817e81dd3dd7
+parisc-hd 805ce8614958c925877ba6b6dc26cdf9f8800474
+powerpc 78c73c80fd860d5b3471d8eaa2778a105a56f6ab
+soc-fsl 4b0986a3613c92f4ec1bdc7f60ec66fea135991f
+risc-v 096b52fd2bb4996fd68d22b3b7ad21a1296db9d3
+risc-v-mc 7eac0081a8e958106ed3aea402c8105f30fad6d9
+s390 5b5504d5fccd6f6bfe60ef4ad243b20dd5bdb032
+sh 8518e694203d0bfd202ea4a80356785b6992322e
+sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5
+uml af3e16101cee95efaa72095fe06c15ec0b8eb195
+xtensa e3ddb8bbe0f8cc994748c81e17acc58fda6f8abe
+pidfd 6a857ab5b57cdeb16d7ea75591a0ae3c6ec0750a
+vfs-idmapping 6344e66970c619a1623f457910e78819076e9104
+fscrypt 18136e49cb00e02a12fee7aefb261b17ed04cc1e
+fscache 0885eacdc81f920c3e0554d5615e69a66504a28d
+afs 26291c54e111ff6ba87a164d85d4a4e134b7315c
+btrfs caeaee0f40e2020f27c4c8dcb323a0c4e8085790
+ceph 0edddc4160b9196ec972b596d8782155873ba0df
+cifs 8af8aed97bebe8b26a340da5236e277c3d84a8ec
+configfs 84ec758fb2daa236026506868c8796b0500c047d
+ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f
+erofs 80e78fcce86de0288793a0ef0f6acf37656ee4cf
+exfat 2e9ceb6728f1dc2fa4b5d08f37d88cbc49a20a62
+ext3 11fdae37d482718a0c5dd8fad944aeba7a748684
+ext4 d95efb14c0b81b684deb32ba10cdb78b4178ae5b
+f2fs 108d4d310318e091f9546086741a0531667cc706
+fsverity 8377e8a24bba1ae73b3869bc71ee9df16b6bef61
+fuse 247861c325c2e4f5ad3c2f9a77ab9d85d15cbcfc
+gfs2 204c0300c4e99707e9fb6e57840aa1127060e63f
+jfs e471e5942c006532a013eefde239ce1e783ac2d9
+ksmbd 8c9073fa857cf39263f946842a3e0d4a46138594
+nfs 3245cb65fd91cd514801bf91f5a3066d562f0ac4
+nfs-anna 4f40a5b5544618b096d1611a18219dd91fd57f80
+nfsd 395289f8a04892dc7fbee0db60880feadb6b66e5
+ntfs3 3b06a2755758937add738545ba4a544fc5a1c56d
+orangefs 40a74870b2d1d3d44e13b3b73c6571dd34f5614d
+overlayfs 4f1196288dfb6fc63e28e585392f2df3b8a63388
+ubifs 8c03a1c21d72210f81cb369cc528e3fde4b45411
+v9fs 02ed50db058d23363659bf365bbe6545d9724021
+xfs 031d166f968efba6e4f091ff75d0bb5206bb3918
+zonefs 6bac30bb8ff8195cbcfc177b3b6b0732929170c1
+iomap 478af190cb6c501efaa8de2b9c9418ece2e4d0bd
+statx-dioalign 61a223df421f698c253143014cfd384255b3cf1e
+djw-vfs 49df34221804cfd6384135b28b03c9461a31d024
+file-locks 072e51356cd5a4a1c12c1020bc054c99b98333df
+vfs 0a97e98ab197ad57e462a092faa786e670122d42
+printk c0a684057235e5f45a93182df07c81b6f0581d7e
+pci c327b44793ae4197be69c8525871ed753b3c6f5f
+pstore 27001e611bb642287eddf93227bd72d295a35453
+hid d9c1c1a0a501c0a3a2613616a7c412c5343d1b52
+i2c 12452662e011d1f3d398417272b6f596f3ad84fb
+i3c 568035b01cfb107af8d2e4bd2fb9aea22cf5b868
+dmi d2139dfca361a1f5bfc4d4a23455b1a409a69cd4
+hwmon-staging e8a253862802688458e637fb44812116464df829
+jc_docs 7ebeef22dcc2c3db83dcd1e8292744cf29c1859f
+v4l-dvb fbb6c848dd89786fe24856ee6b5e773910ded29c
+v4l-dvb-next f7ec3f62d7736ed14050716943a9562879155fcc
+pm 2bc2aea001d35f669e1fe6c767df0ea79fe3e6e5
+cpufreq-arm ddf958f39741a1dda74020ac8a0f226cb5aa017b
+cpupower 568035b01cfb107af8d2e4bd2fb9aea22cf5b868
+devfreq 68831c5f94cb97c19df9ed18b41c81c838049f66
+opp c7e31e36d8a262eb0bc2daf8f9b7481c83284386
+thermal 64b269c002273cac4c41fb69572f3684dd1e3284
+ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3
+dlm 56171e0db23a5e0edce1596dd2792b95ffe57bd3
+rdma db77d84cfe3608eac938302f8f7178e44415bcba
+net-next 8a26a9dee5e3679637edc6f8caf4beb5f3100dde
+bpf-next 47e34cb74d376ddfeaef94abb1d6dfb3c905ee51
+ipsec-next 50c448bbc19815bf02d336c70627ab9159b213ed
+mlx5-next 4ced81c02b0367ed4d6e1231688539a6afb962cf
+netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3
+ipvs-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3
+bluetooth 812e92b824c1db16c9519f8624d48a9901a0d38f
+wireless-next d5350756c03cdf18696295c6b11d7acc4dbf825c
+mtd 7ec4cdb321738d44ae5d405e7b6ac73dfbf99caa
+nand e16eceea863b417fd328588b1be1a79de0bc937f
+spi-nor f8cd9f632f4415b1e8838bdca8ab42cfb37a6584
+crypto 96d3e6f05f5b7ec1cadb6a26c05093efcf062432
+drm d1e2d6b78ffc0317b41e1465b47e325e2765e5e0
+drm-misc 98a65e6d498c46b0beec7a40aac4b3e404642993
+amdgpu dacd2d2d9d800b7ab2ee2734578112532cba8105
+drm-intel 21f0b7dabf9c358e75a539b5554c0375bf1abe0a
+drm-tegra 4d74f5f6b0be0e12346c84a8ad4c307ca5f0f899
+drm-msm d6463fd4e97545ef4f7069d13a5fa3ac0924dae2
+drm-msm-lumag 6678f47435721e472b9b1744957abab0e7c0d6b9
+imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29
+etnaviv 332f847212e43d584019a8264895f25cf92aa647
+fbdev 1c23f9e627a7b412978b4e852793c5e3c3efc555
+regmap 694cf81e90002e370dc207b767a37b8dac1b8cdd
+sound 39efc9c8a973ddff5918191525d1679d0fb368ea
+sound-asoc 5287d5b77fc25e10907d416658b4bfc40b82cdc0
+modules 77d6354bd422c8a451ef7d2235322dbf33e7427b
+input 7984b43542070f5888546d95b48003c4a8af7c0f
+block 52f3156bd20949af37d819d213eaa6dfdf53cc56
+device-mapper c8e2f5c3682d352218673ac6f45109641c76492d
+libata e9892dce44f23b076cdae54f774a28984dbc6300
+pcmcia 2ef4bb24ff39ae4af89b80bcc5d516f55368e8ae
+mmc 627a78b2dec669c4efa216d827341c948eb3f42d
+mfd e00e66be677af7cd717163c6b00256c250061d93
+backlight e7647de058cba3c05b0d4753d84cbc042d02956a
+battery 55cafd4ba42cf495268f955dd38e277fc4b4381e
+regulator 663ec13e89b400ce9069400303b75feed8b9ab80
+security 1e7d8bcbe37d3c63babe628443f13f77970dd06b
+apparmor 79eb2711c919e6db10ed2b8fb22ab605121e80ea
+integrity 5926586f291b53cb8a0c9631fc19489be1186e2d
+keys 2d743660786ec51f5c1fefd5782bbdee7b227db0
+safesetid 64b634830c919979de4b18163e15d30df66e64a8
+selinux 09b71adab09570fcc715ff31a6835d0e445e4a54
+smack f393b3fd2a4b8197981e4a8f70bf10d71cdcfc0d
+tomoyo 841b171b45343e6af2bb57293003e939e71a7470
+tpmdd 863ed94c589fcd1984f4e3080f069d30508044bb
+watchdog b90cb1053190353cc30f0fef0ef1f378ccc063c5
+iommu d154e4a92f7957178217d03ac1b46009e04524ad
+audit 934f70d9d498a7fffd611edf48356698f1d72e91
+devicetree a607a850ba1fa966cbb035544c1588e24a6307df
+dt-krzk a70369e1b7f6cbe818b61b37dc29bce0811226ed
+mailbox 8a8dc2b9596e6088522d30bc79306b834c681943
+spi 7f9c088f08cb75c5c6b39b8e41525fc563134443
+tip 82eedfedea446ae448f0975f1db7d1631cd24330
+clockevents c19e18637d895e851817b99c65beea74ab7af113
+edac cd687f34d565445a6e92662af9b6e4e1d1eba1a7
+irqchip 2bd1753e8c431fc7475c04ac8d14a4e9930f47f6
+ftrace 07a451dae367ba0191b03a18e963d17052c5ed73
+rcu 7139c19d2ea117976aa892de4fb75682e989ba12
+kvm 372d07084593dc7a399bf9bee815711b1fb1bcf2
+kvm-arm 0982c8d859f8f7022b9fd44d421c7ec721bb41f9
+kvms390 f5ecfee94493475783074e86ded10a0499d779fc
+xen-tip e9ea0b30ada008f4e65933f449db6894832cb242
+percpu a111daf0c53ae91e71fd2bfe7497862d14132e3e
+workqueues c0feea594e058223973db94c1c32a830c9807c86
+drivers-x86 76fba1221e3045570478381c3436c8c2a2656376
+chrome-platform 348a2e8c93d3ca622cf1b293cd2f597c9db74d9d
+hsi 551e325bbd3fb8b5a686ac1e6cf76e5641461cf2
+leds 568035b01cfb107af8d2e4bd2fb9aea22cf5b868
+ipmi ba5829c6543fbcf0b31854cc6970b9012ff71279
+driver-core a791dc135325862fdf491ac088f54993710e2515
+usb 7eb2bf871454d3b35c2e988477aab4c0e12aa7c4
+thunderbolt 387a42cfcf92eac21b2dec2cdadd207ddae0ec78
+usb-gadget e49d033bddf5b565044e2abe4241353959bc9120
+usb-serial cfebcd53e65ec6f932f202fc9769da9e13fa0792
+tty ccf3a570410af607124534396cfc0e9a0986b5e8
+char-misc ceecbbddbf549fe0b7ffa3804a6e255b3360030f
+coresight 5fc1531dd771cd1481116a66f992a190e01efce6
+fpga 562d0bf2cab80810fa50a1f109a6bdb61c25efc2
+icc aff72c797ff02fe855c42d17c28bb7bc063bed5f
+iio 2f61ff8272967c9bdcba810aa978170814b08f7c
+phy-next af96579dc31761a5f5bcb207d046764f1183069a
+soundwire 279e46bc298629b26436c90bd4b5d104cc1e0fb2
+extcon 822a6200734c94ccbfc9ae7acc5da5505b991515
+gnss c0c725d7350ec8b8453257676a440bb4b2df2422
+vfio f39856aacb078c1c93acef011a37121b17d54fe0
+staging 9634b371b66a270821ed8d4d224ef19e9b842507
+counter-next a12224997bec72d231a8dd642876e6364decdc45
+mux 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1
+dmaengine 84dd3b2b95ef8a33a0c2d7c2c21d4d5edb9f7f08
+cgroup a2675ab75dff48666c07afa488eaba0d684becbc
+scsi 002e36fc62e90c9ea9005c389c254df39403e542
+scsi-mkp 7f615c1b5986ff08a725ee489e838c90f8197bcd
+vhost 8f113a4ad40daf303390240a946f07dfdf97fa9a
+rpmsg 5a3a3b45c3574e056fb31ee31cd284746bf38ee0
+gpio e73f0f0ee7541171d89f2e2491130c7771ba58d3
+gpio-brgl d9e7f0e320516c660d6f33e6c16a3d99970eb14e
+gpio-intel 0ea76c401f9245ac209f1b1ce03a7e1fb9de36e5
+gpio-sim 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1
+pinctrl 04fa696fc49cde70440858d87805882e5f0cbc2b
+pinctrl-intel 568035b01cfb107af8d2e4bd2fb9aea22cf5b868
+pinctrl-renesas 96355be8f0a2a7a91aae2e66c0795a13444db5ba
+pinctrl-samsung 9d9292576810d0b36897718c24dfbc1a2835314b
+pwm 8933d30c5f468d6cc1e4bf9bb535149da35f202e
+userns a0b88362d2c797aeb96c42fe94c7518b78ac84e7
+ktest 170f4869e66275f498ae4736106fb54c0fdcd036
+kselftest 2626cd3b3126961630cae396111040c86df7053e
+livepatching 3ea7cd6069be582be5569600fd5b9f540df63471
+rtc 509451ac03eb3afa4c4a32d4c11b1938f08de8e4
+nvdimm 53fc59511fc4c567342b2ef3f7b99a086430e0b4
+at24 568035b01cfb107af8d2e4bd2fb9aea22cf5b868
+ntb 568035b01cfb107af8d2e4bd2fb9aea22cf5b868
+seccomp 4e92863862d17e5383b7245c0cb732c9b21cd0c4
+cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b
+fsi 04823dd2af87341ddf58e9903874e8db6e212670
+slimbus 3f9400e61107f88f6b89b6cf4bd08963ff18b625
+nvmem 2ea556524fbf7a082243bcbe1220395b32fe9f98
+xarray 69cb69ea55420388b444ee30b1530ec15ab584f7
+hyperv d180e0a1be6cea2b7436fadbd1c96aecdf3c46c7
+auxdisplay 13de23494f387315c6cfab6fe78fbed7d1b25586
+kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46
+hmm 568035b01cfb107af8d2e4bd2fb9aea22cf5b868
+kunit 568035b01cfb107af8d2e4bd2fb9aea22cf5b868
+cfi 3123109284176b1532874591f7c81f3837bbdc17
+kunit-next 568035b01cfb107af8d2e4bd2fb9aea22cf5b868
+trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b
+mhi 5db00d7d0d4d6affd52409b37369bca4b64bf10d
+memblock 42c3ba86581896be8dd7fb88ed075b600fd57fa1
+init 38b082236e77d403fed23ac2d30d570598744ec3
+cxl 1cd8a2537eb07751d405ab7e2223f20338a90506
+folio-iomap 4d7bd0eb72e5831ddb1288786a96448b48440825
+zstd 88a309465b3f05a100c3b81966982c0f9f5d23a6
+efi 4bf23298820093992beac22cc1532414ae189acd
+unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1
+slab 0e5d069dcc0c1cae8262fe499b606aba35199f74
+random b931eaf6ef5cef474a1171542a872a5e270e3491
+landlock 4908e7a3045c409fd31c4cb1f8224457dbe87bad
+rust 07a3263c2554af5f8c7670aeb757e808006c1736
+sysctl c06a17fe056b84f5784b2f13753870eb65edc9ed
+folio 03b33c09ea22fa89dd204ad0a2058e512c691b9f
+execve 33a2d6bc3480f9f8ac8c8def29854f98cc8bfee2
+bitmap b9be19eef35587b15da0a5d887d6e04c0c6cefab
+hte 568035b01cfb107af8d2e4bd2fb9aea22cf5b868
+kspp 06c1c49d0cd1d6cec5b78963109ba728e49e0063
+kspp-gustavo 0811296c55b7f0c5b038410828e37a1a1bf04463
+mm-stable 088b8aa537c2c767765f1c19b555f21ffe555786
+mm-nonmm-stable b814751175470b00969a317bf3192260750f9455
+mm fbb5623fcdd8d585eaf5d5428b323157d0358e61
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 0000000000000..2eff0ef003c99
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,362 @@
+Trees included into this release:
+
+Name Type URL
+---- ---- ---
+origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master
+fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes
+mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable
+kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes
+arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr
+arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes
+arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes
+arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes
+drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes
+tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes
+m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus
+powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes
+s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes
+sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master
+fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable
+net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master
+bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master
+ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master
+netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master
+ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master
+wireless git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next
+rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc
+sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus
+sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus
+regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus
+regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus
+spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus
+pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus
+driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus
+tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus
+usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus
+usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes
+usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus
+phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes
+staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus
+iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg
+counter-current git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current
+char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus
+soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes
+thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes
+input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus
+crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master
+vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus
+kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes
+modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-linus
+dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes
+backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes
+mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes
+mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes
+v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes
+reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes
+mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes
+at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes
+omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes
+kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master
+kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master
+hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon
+nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes
+cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes
+btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes
+vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes
+dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus
+i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/fixes
+drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes
+samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes
+pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes
+devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus
+dt-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes
+scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes
+drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes
+amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#drm-fixes
+drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes
+mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes
+rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes
+gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus
+hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes
+soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix
+risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes
+risc-v-mc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#dt-fixes
+pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes
+fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes
+spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus
+gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current
+gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes
+pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes
+erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes
+integrity-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#fixes
+kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes
+ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes
+memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes
+cel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-rc
+irqchip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-fixes
+renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes
+broadcom-fixes git https://github.com/Broadcom/stblinux.git#fixes
+perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/urgent
+efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent
+zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus
+battery-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes
+drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes
+kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next
+clang-format git https://github.com/ojeda/linux.git#clang-format
+perf git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/core
+compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes
+dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next
+asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master
+arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next
+arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next
+arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core
+arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf
+arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next
+actions git git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git#for-next
+amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next
+aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next
+at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next
+broadcom git https://github.com/Broadcom/stblinux.git#next
+drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next
+imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next
+keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next
+mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next
+mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next
+omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next
+qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next
+raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next
+renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next
+reset git https://git.pengutronix.de/git/pza/linux#reset/next
+rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next
+samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next
+scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next
+stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next
+sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next
+tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next
+tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next
+ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next
+xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next
+clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next
+clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next
+clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk
+clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next
+csky git git://github.com/c-sky/csky-linux.git#linux-next
+loongarch git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next
+m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next
+m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next
+microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next
+mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next
+nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next
+openrisc git git://github.com/openrisc/linux.git#for-next
+parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next
+powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next
+soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next
+risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next
+risc-v-mc git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#dt-for-next
+s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next
+sh git git://git.libc.org/linux-sh#for-next
+sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master
+uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next
+xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next
+pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next
+vfs-idmapping git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.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
+statx-dioalign git git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#statx-dioalign
+djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next
+file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next
+vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next
+printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next
+pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next
+pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore
+hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next
+i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next
+i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next
+dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next
+hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next
+jc_docs git git://git.lwn.net/linux.git#docs-next
+v4l-dvb git git://linuxtv.org/media_tree.git#master
+v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master
+pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next
+cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next
+cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower
+devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next
+opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next
+thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next
+ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next
+dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next
+rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next
+net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master
+bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next
+ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master
+mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next
+netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master
+ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master
+bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master
+wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next
+mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next
+nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next
+spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next
+crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master
+drm git git://git.freedesktop.org/git/drm/drm.git#drm-next
+drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next
+amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next
+drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next
+drm-tegra git https://gitlab.freedesktop.org/drm/tegra.git#for-next
+drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next
+drm-msm-lumag git https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag
+imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next
+etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next
+fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next
+regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next
+sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next
+sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next
+modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next
+input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next
+block git git://git.kernel.dk/linux-block.git#for-next
+device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next
+libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#for-next
+pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next
+mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next
+mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next
+backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next
+battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next
+regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next
+security git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next
+apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next
+integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity
+keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next
+safesetid git https://github.com/micah-morton/linux.git#safesetid-next
+selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next
+smack git git://github.com/cschaufler/smack-next#next
+tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master
+tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next
+watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master
+iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next
+audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next
+devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next
+dt-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next
+mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next
+spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next
+tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master
+clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next
+edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next
+irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next
+ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next
+rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next
+kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next
+kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next
+kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next
+xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next
+percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next
+workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next
+drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next
+chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next
+hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next
+leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next
+ipmi git git://github.com/cminyard/linux-ipmi.git#for-next
+driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next
+usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next
+thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next
+usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next
+usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next
+tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next
+char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next
+coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next
+fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next
+icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next
+iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg
+phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next
+soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next
+extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next
+gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next
+vfio git git://github.com/awilliam/linux-vfio.git#next
+staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next
+counter-next git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-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
+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/pateldipen1984/linux.git#for-next
+kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp
+kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp
+mm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable
+mm-nonmm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable
+mm git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-everything
diff --git a/Next/merge.log b/Next/merge.log
new file mode 100644
index 0000000000000..e20a50a4b68ad
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,12003 @@
+$ date -R
+Fri, 16 Sep 2022 07:52:52 +1000
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+Updating files: 76% (6333/8256)
Updating files: 77% (6358/8256)
Updating files: 78% (6440/8256)
Updating files: 79% (6523/8256)
Updating files: 80% (6605/8256)
Updating files: 81% (6688/8256)
Updating files: 82% (6770/8256)
Updating files: 83% (6853/8256)
Updating files: 84% (6936/8256)
Updating files: 85% (7018/8256)
Updating files: 86% (7101/8256)
Updating files: 87% (7183/8256)
Updating files: 88% (7266/8256)
Updating files: 89% (7348/8256)
Updating files: 90% (7431/8256)
Updating files: 91% (7513/8256)
Updating files: 92% (7596/8256)
Updating files: 93% (7679/8256)
Updating files: 94% (7761/8256)
Updating files: 95% (7844/8256)
Updating files: 96% (7926/8256)
Updating files: 97% (8009/8256)
Updating files: 98% (8091/8256)
Updating files: 99% (8174/8256)
Updating files: 100% (8256/8256)
Updating files: 100% (8256/8256), done.
+HEAD is now at 3245cb65fd91 Merge tag 'devicetree-fixes-for-6.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
+Merging origin/master (3245cb65fd91 Merge tag 'devicetree-fixes-for-6.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master
+Already up to date.
+Merging fixes/fixes (1c23f9e627a7 Linux 6.0-rc2)
+$ 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 (95bdaeee9e82 mm/page_isolation: fix isolate_single_pageblock() isolation behavior)
+$ 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.
+ arch/powerpc/mm/book3s64/radix_pgtable.c | 9 -----
+ arch/x86/mm/Makefile | 3 ++
+ fs/ntfs/super.c | 3 +-
+ fs/xfs/xfs_notify_failure.c | 6 +--
+ include/linux/hugetlb.h | 8 ++--
+ include/linux/memremap.h | 5 +++
+ mm/damon/dbgfs.c | 19 +++++++---
+ mm/frontswap.c | 3 ++
+ mm/gup.c | 48 +++++++++++++++++++----
+ mm/huge_memory.c | 6 +--
+ mm/hugetlb.c | 41 ++++++++++----------
+ mm/khugepaged.c | 10 +++--
+ mm/madvise.c | 7 +++-
+ mm/memory-failure.c | 27 +++++++------
+ mm/memory.c | 14 +++++--
+ mm/migrate_device.c | 16 +++++---
+ mm/page_alloc.c | 65 +++++++++++++++++++++++++++-----
+ mm/page_isolation.c | 25 ++++++------
+ mm/secretmem.c | 2 +-
+ mm/swap_state.c | 2 +-
+ mm/vmscan.c | 14 +++----
+ tools/include/linux/gfp.h | 21 +----------
+ tools/include/linux/gfp_types.h | 1 +
+ 23 files changed, 225 insertions(+), 130 deletions(-)
+ create mode 100644 tools/include/linux/gfp_types.h
+Merging kbuild-current/fixes (80e78fcce86d Linux 6.0-rc5)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes
+Already up to date.
+Merging arc-current/for-curr (952deecb065e arc: dts: Harmonize EHCI/OHCI DT nodes name)
+$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr
+Auto-merging arch/arc/kernel/smp.c
+Merge made by the 'ort' strategy.
+ arch/arc/boot/dts/axc003.dtsi | 4 ++--
+ arch/arc/boot/dts/axc003_idu.dtsi | 4 ++--
+ arch/arc/boot/dts/axs10x_mb.dtsi | 4 ++--
+ arch/arc/boot/dts/hsdk.dts | 4 ++--
+ arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 2 +-
+ arch/arc/include/asm/bitops.h | 4 ++--
+ arch/arc/include/asm/entry-compact.h | 2 +-
+ arch/arc/kernel/smp.c | 2 +-
+ arch/arc/mm/cache.c | 4 ++--
+ 9 files changed, 15 insertions(+), 15 deletions(-)
+Merging arm-current/fixes (25af7406df59 ARM: 9229/1: amba: Fix use-after-free in amba_read_periphid())
+$ 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 (3fe3fd5f3072 arm64: mm: fix resume for 52-bit enabled builds)
+$ 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 (aaa58141a5d7 Merge tag 'at91-fixes-6.0-2' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/fixes)
+$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/dma/moxa,moxart-dma.txt | 4 +--
+ .../memory-controllers/fsl/imx8m-ddrc.yaml | 2 +-
+ arch/arm/boot/dts/lan966x.dtsi | 4 +--
+ arch/arm/boot/dts/moxart-uc7112lx.dts | 2 +-
+ arch/arm/boot/dts/moxart.dtsi | 4 +--
+ arch/arm64/boot/dts/freescale/imx8mm-mx8menlo.dts | 10 ++++----
+ .../boot/dts/freescale/imx8mm-tqma8mqml-mba8mx.dts | 1 -
+ .../arm64/boot/dts/freescale/imx8mm-tqma8mqml.dtsi | 1 +
+ arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 10 ++++----
+ arch/arm64/boot/dts/freescale/imx8mn.dtsi | 1 -
+ .../dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 10 ++++++--
+ .../boot/dts/freescale/imx8mp-venice-gw74xx.dts | 12 ++++++---
+ arch/arm64/boot/dts/freescale/imx8ulp.dtsi | 3 +++
+ .../boot/dts/rockchip/px30-engicam-px30-core.dtsi | 4 +--
+ arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts | 5 ++++
+ .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 9 +++++++
+ arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 1 -
+ arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 1 -
+ arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 2 +-
+ arch/arm64/configs/defconfig | 1 +
+ drivers/firmware/arm_scmi/clock.c | 6 ++++-
+ drivers/firmware/arm_scmi/optee.c | 1 +
+ drivers/firmware/arm_scmi/reset.c | 10 +++++---
+ drivers/firmware/arm_scmi/scmi_pm_domain.c | 20 +++++++++++++++
+ drivers/firmware/arm_scmi/sensors.c | 25 +++++++++++++++---
+ include/linux/scmi_protocol.h | 4 +--
+ include/trace/events/scmi.h | 30 +++++++++++-----------
+ 30 files changed, 130 insertions(+), 59 deletions(-)
+Merging drivers-memory-fixes/fixes (c941e6305958 dt-bindings: memory-controllers: fsl,imx8m-ddrc: drop Leonard Crestez)
+$ 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 (b508128bb0d1 m68k: defconfig: Update defconfigs for v5.19-rc1)
+$ 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 (a66de5283e16 powerpc/pseries: Fix plpks crash on non-pseries)
+$ 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 (8d96bba75a43 s390/smp: enforce lowcore protection on CPU restart)
+$ 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 (0727a9a5fbc1 Documentation: mptcp: fix pm_type formatting)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master
+Merge made by the 'ort' strategy.
+ Documentation/networking/mptcp-sysctl.rst | 1 -
+ drivers/net/ipvlan/ipvlan_core.c | 6 +-
+ drivers/net/phy/aquantia_main.c | 53 ++++++++++++++++--
+ net/core/flow_dissector.c | 5 +-
+ net/mptcp/protocol.c | 8 ++-
+ net/netfilter/nf_conntrack_irc.c | 34 +++++++++--
+ net/netfilter/nf_conntrack_sip.c | 4 +-
+ net/netfilter/nfnetlink_osf.c | 4 +-
+ .../selftests/netfilter/nft_concat_range.sh | 65 ++++++++++++++++++----
+ 9 files changed, 148 insertions(+), 32 deletions(-)
+Merging bpf/master (a37a32583e28 bpf: btf: fix truncated last_member_type_id in btf_struct_resolve)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 1 +
+ kernel/bpf/btf.c | 2 +-
+ net/xdp/xsk.c | 22 +++++++++++-----------
+ net/xdp/xsk_queue.h | 22 ++++++++++------------
+ tools/testing/selftests/bpf/xskxceiver.c | 4 ++++
+ 5 files changed, 27 insertions(+), 24 deletions(-)
+Merging ipsec/master (26dbd66eab80 esp: choose the correct inner protocol for GSO on inter address family tunnels)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master
+Merge made by the 'ort' strategy.
+ net/ipv4/esp4_offload.c | 5 ++++-
+ net/ipv6/esp6_offload.c | 5 ++++-
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master
+Already up to date.
+Merging ipvs/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master
+Already up to date.
+Merging wireless/for-next (781b80f452fc wifi: mt76: fix 5 GHz connection regression on mt76x0/mt76x2)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next
+Merge made by the 'ort' strategy.
+ drivers/net/wireless/intel/iwlwifi/Kconfig | 1 +
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 4 ++--
+ drivers/net/wireless/mediatek/mt76/mac80211.c | 3 ++-
+ drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 2 +-
+ 4 files changed, 6 insertions(+), 4 deletions(-)
+Merging rdma-fixes/for-rc (a261786fdc0a RDMA/irdma: Report RNR NAK generation in device caps)
+$ 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 (ba1f818053b0 ALSA: hda/realtek: Add quirk for ASUS GA503R laptop)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus
+Merge made by the 'ort' strategy.
+ sound/pci/hda/hda_bind.c | 4 ++--
+ sound/pci/hda/hda_intel.c | 2 ++
+ sound/pci/hda/patch_hdmi.c | 24 ++++++++++++++++++++----
+ sound/pci/hda/patch_realtek.c | 32 +++++++++++++++++++++++++++++---
+ 4 files changed, 53 insertions(+), 9 deletions(-)
+Merging sound-asoc-fixes/for-linus (d56ba9a04d75 ASoC: imx-card: Fix refcount issue with of_node_put)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus
+Merge made by the 'ort' strategy.
+ sound/soc/codecs/rt5640.c | 64 +++++++++++++++++++++++++++++++++--------------
+ sound/soc/codecs/rt5640.h | 14 +++++++++++
+ sound/soc/fsl/imx-card.c | 4 +++
+ 3 files changed, 63 insertions(+), 19 deletions(-)
+Merging regmap-fixes/for-linus (80e78fcce86d Linux 6.0-rc5)
+$ 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 (80e78fcce86d Linux 6.0-rc5)
+$ 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 (80e78fcce86d Linux 6.0-rc5)
+$ 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 (0e1fa5155a36 MAINTAINERS: Add Mahesh J Salgaonkar as EEH maintainer)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+Merging driver-core.current/driver-core-linus (d8ab4685adc1 Revert "driver core: Set fw_devlink.strict=1 by default")
+$ 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
+Merge made by the 'ort' strategy.
+ drivers/base/core.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging tty.current/tty-linus (1d10cd4da593 serial: tegra-tcu: Use uart_xmit_advance(), fixes icount.tx accounting)
+$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus
+Merge made by the 'ort' strategy.
+ drivers/tty/serial/serial-tegra.c | 5 ++---
+ drivers/tty/serial/tegra-tcu.c | 2 +-
+ include/linux/serial_core.h | 17 +++++++++++++++++
+ 3 files changed, 20 insertions(+), 4 deletions(-)
+Merging usb.current/usb-linus (ce001778dfc3 Merge tag 'thunderbolt-for-v6.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus)
+$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus
+Merge made by the 'ort' strategy.
+ drivers/thunderbolt/icm.c | 1 +
+ drivers/thunderbolt/nhi.h | 1 +
+ drivers/usb/core/hub.c | 2 +-
+ drivers/usb/dwc3/core.c | 13 +++++++------
+ 4 files changed, 10 insertions(+), 7 deletions(-)
+Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes
+Already up to date.
+Merging usb-serial-fixes/usb-linus (d640c4cb8f2f USB: serial: option: add Quectel RM520N)
+$ 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
+Merge made by the 'ort' strategy.
+ drivers/usb/serial/option.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+Merging phy/fixes (0a6fc70d76bd phy: marvell: phy-mvebu-a3700-comphy: Remove broken reset support)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes
+Merge made by the 'ort' strategy.
+ drivers/phy/marvell/phy-mvebu-a3700-comphy.c | 87 ++++++----------------------
+ 1 file changed, 17 insertions(+), 70 deletions(-)
+Merging staging.current/staging-linus (7e18e42e4b28 Linux 6.0-rc4)
+$ 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 (f57f4fb09850 iio: light: tsl2583: Fix module unloading)
+$ 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/light/tsl2583.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging counter-current/counter-current (8294b04153c3 counter: Realign counter_comp comment block to 80 characters)
+$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current
+Merge made by the 'ort' strategy.
+ drivers/counter/104-quad-8.c | 6 +++---
+ include/linux/counter.h | 40 ++++++++++++++++++++--------------------
+ 2 files changed, 23 insertions(+), 23 deletions(-)
+Merging char-misc.current/char-misc-linus (ab0b4b575b46 Merge tag 'phy-fixes-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy into char-misc-linus)
+$ 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
+Merge made by the 'ort' strategy.
+Merging soundwire-fixes/fixes (4ef3f2aff126 soundwire: qcom: fix device status array range)
+$ 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 (14c7d9052837 thunderbolt: Add support for Intel Maple Ridge single port controller)
+$ 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 (9c9c71168f79 Input: iforce - add support for Boeder Force Feedback Wheel)
+$ 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 (874b301985ef crypto: lib - remove unneeded selection of XOR_BLOCKS)
+$ 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 (873aefb376bb vfio/type1: Unpin zero pages)
+$ 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 (bdbf0617bbc3 selftests/vm: fix inability to build any vm tests)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes
+Already up to date.
+Merging modules-fixes/modules-linus (e69a66147d49 module: kallsyms: Ensure preemption in add_kallsyms() with PREEMPT_RT)
+$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus
+Already up to date.
+Merging dmaengine-fixes/fixes (e0f1b21c504f dmaengine: zynqmp_dma: Typecast with enum to fix the coverity warning)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes
+Merge made by the 'ort' strategy.
+ drivers/dma/ti/k3-udma-private.c | 6 +++---
+ drivers/dma/xilinx/xilinx_dma.c | 21 +++++++++++++--------
+ drivers/dma/xilinx/zynqmp_dma.c | 2 +-
+ 3 files changed, 17 insertions(+), 12 deletions(-)
+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 (0fddf9ad06fd mtd: rawnand: gpmi: Set WAIT_FOR_READY timeout based on program/erase times)
+$ 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 (150f7b11cb59 media: uvcvideo: Fix InterfaceProtocol for Quanta camera)
+$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes
+Merge made by the 'ort' strategy.
+ drivers/media/usb/uvc/uvc_driver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging reset-fixes/reset/fixes (51fd191422d9 reset: microchip-sparx5: issue a reset on startup)
+$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes
+Merge made by the 'ort' strategy.
+ drivers/reset/reset-imx7.c | 1 +
+ drivers/reset/reset-microchip-sparx5.c | 22 +++++++++++++++++-----
+ 2 files changed, 18 insertions(+), 5 deletions(-)
+Merging mips-fixes/mips-fixes (80e78fcce86d Linux 6.0-rc5)
+$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes
+Already up to date.
+Merging at91-fixes/at91-fixes (f5fc22cbbdcd ARM: dts: lan966x: Fix the interrupt number for internal PHYs)
+$ 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 (2a906db2824b Merge branch 'am5748-fix' into fixes)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes
+Merge made by the 'ort' strategy.
+ arch/arm/boot/dts/am33xx-l4.dtsi | 3 +--
+ arch/arm/boot/dts/am5748.dtsi | 4 ++++
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+Merging kvm-fixes/master (29250ba51bc1 Merge tag 'kvm-s390-master-6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
+$ 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 (ca922fecda6c KVM: s390: pci: Hook to access KVM lowlevel from VFIO)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master
+Already up to date.
+Merging hwmon-fixes/hwmon (80e78fcce86d Linux 6.0-rc5)
+$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon
+Already up to date.
+Merging nvdimm-fixes/libnvdimm-fixes (17d9c15c9b9e fsdax: Fix infinite loop in dax_iomap_rw())
+$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes
+Auto-merging drivers/nvdimm/pmem.c
+Auto-merging fs/dax.c
+Merge made by the 'ort' strategy.
+ drivers/nvdimm/namespace_devs.c | 2 -
+ drivers/nvdimm/pmem.c | 6 +--
+ fs/dax.c | 3 ++
+ tools/testing/nvdimm/test/ndtest.c | 77 --------------------------------------
+ 4 files changed, 6 insertions(+), 82 deletions(-)
+Merging cxl-fixes/fixes (e35f5718903b cxl/mbox: Fix missing variable payload checks in cmd size validation)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes
+Already up to date.
+Merging btrfs-fixes/next-fixes (351ff18f7481 Merge branch 'misc-6.0' 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 (bfbfb6182ad1 nfsd_splice_actor(): handle compound pages)
+$ 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 (3be4562584bb dma-direct: use the correct size for dma_set_encrypted())
+$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus
+Already up to date.
+Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1)
+$ git merge -m Merge branch 'i3c/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c-fixes/i3c/fixes
+Already up to date.
+Merging drivers-x86-fixes/fixes (647e82dbf851 platform/x86: p2sb: Fix UAF when caller uses resource name)
+$ 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 (568035b01cfb Linux 6.0-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes
+Already up to date.
+Merging pinctrl-samsung-fixes/fixes (568035b01cfb Linux 6.0-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes
+Already up to date.
+Merging devicetree-fixes/dt/linus (de11663b75b0 dt-bindings: pinctrl: qcom: drop non-working codeaurora.org emails)
+$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus
+Already up to date.
+Merging dt-krzk-fixes/fixes (568035b01cfb Linux 6.0-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes
+Already up to date.
+Merging scsi-fixes/fixes (991df3dd5144 scsi: mpt3sas: Fix use-after-free warning)
+$ 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 (80e78fcce86d Linux 6.0-rc5)
+$ 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 (8787f6fab413 Revert "drm/i915/display: Re-add check for low voltage sku for max dp source rate")
+$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/i915/display/icl_dsi.c | 2 ++
+ drivers/gpu/drm/i915/display/intel_dp.c | 33 +++--------------------
+ drivers/gpu/drm/i915/display/intel_vdsc.c | 1 -
+ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 7 ++++-
+ drivers/gpu/drm/i915/i915_reg.h | 16 +++++------
+ drivers/gpu/drm/i915/i915_vma.c | 3 ++-
+ 6 files changed, 22 insertions(+), 40 deletions(-)
+Merging mmc-fixes/fixes (35ca91d1338a mmc: moxart: fix 4-bit bus width and remove 8-bit bus width)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes
+Merge made by the 'ort' strategy.
+ drivers/mmc/host/moxart-mmc.c | 17 +++--------------
+ drivers/mmc/host/sdhci.c | 4 ++--
+ 2 files changed, 5 insertions(+), 16 deletions(-)
+Merging rtc-fixes/rtc-fixes (568035b01cfb Linux 6.0-rc1)
+$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes
+Already up to date.
+Merging gnss-fixes/gnss-linus (a111daf0c53a Linux 5.19-rc3)
+$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus
+Already up to date.
+Merging hyperv-fixes/hyperv-fixes (f0880e2cb7e1 Drivers: hv: Never allocate anything besides framebuffer from framebuffer memory region)
+$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes
+Already up to date.
+Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18)
+$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix
+Already up to date.
+Merging risc-v-fixes/fixes (af193cc7fc35 riscv: fix a nasty sigreturn bug...)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes
+Auto-merging arch/riscv/mm/pageattr.c
+CONFLICT (content): Merge conflict in arch/riscv/mm/pageattr.c
+Recorded preimage for 'arch/riscv/mm/pageattr.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'arch/riscv/mm/pageattr.c'.
+[master 5b5585590f23] Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
+$ git diff -M --stat --summary HEAD^..
+ arch/riscv/Kconfig | 1 +
+ arch/riscv/Kconfig.erratas | 4 +--
+ arch/riscv/errata/thead/errata.c | 1 +
+ arch/riscv/include/asm/cacheflush.h | 1 +
+ arch/riscv/include/asm/set_memory.h | 20 +++---------
+ arch/riscv/kernel/setup.c | 13 +-------
+ arch/riscv/kernel/signal.c | 2 ++
+ arch/riscv/mm/dma-noncoherent.c | 23 ++++++++------
+ arch/riscv/mm/init.c | 29 ++++++++++++++---
+ arch/riscv/mm/pageattr.c | 62 ++++++++++++++++++++++++++++++++-----
+ 10 files changed, 103 insertions(+), 53 deletions(-)
+Merging risc-v-mc-fixes/dt-fixes (0dec364ffeb6 riscv: dts: microchip: use an mpfs specific l2 compatible)
+$ git merge -m Merge branch 'dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git risc-v-mc-fixes/dt-fixes
+Already up to date.
+Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range())
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd-fixes/fixes
+Already up to date.
+Merging fpga-fixes/fixes (568035b01cfb Linux 6.0-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 (568035b01cfb Linux 6.0-rc1)
+$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus
+Already up to date.
+Merging gpio-brgl-fixes/gpio/for-current (09eed5a1ed3c gpio: mt7621: Make the irqchip immutable)
+$ 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
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 2 +-
+ drivers/gpio/gpio-ixp4xx.c | 17 ++++++++++++++---
+ drivers/gpio/gpio-mpc8xxx.c | 1 +
+ drivers/gpio/gpio-mt7621.c | 21 +++++++++++++++------
+ 4 files changed, 31 insertions(+), 10 deletions(-)
+Merging gpio-intel-fixes/fixes (568035b01cfb Linux 6.0-rc1)
+$ 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 (568035b01cfb Linux 6.0-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes
+Already up to date.
+Merging erofs-fixes/fixes (80e78fcce86d Linux 6.0-rc5)
+$ 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 (2a2dfc869d33 tools: Add new "test" taint to kernel-chktaint)
+$ 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 (00801cd92d91 NFSD: fix regression with setting ACLs.)
+$ 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 (8d5356f9820d irqchip: Select downstream irqchip drivers for LoongArch CPU)
+$ 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
+Merge made by the 'ort' strategy.
+ drivers/irqchip/Kconfig | 5 +++++
+ drivers/irqchip/irq-gic-v3-its.c | 14 ++++++++------
+ drivers/irqchip/irq-stm32-exti.c | 2 +-
+ 3 files changed, 14 insertions(+), 7 deletions(-)
+Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes
+Already up to date.
+Merging broadcom-fixes/fixes (b6fa04765857 Merge branch 'drivers/fixes' into fixes)
+$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes
+Merge made by the 'ort' strategy.
+Merging perf-current/perf/urgent (9b4509495418 Merge tag 'for-6.0-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/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 (9cb636b5f6a8 efi: capsule-loader: Fix use-after-free in efi_capsule_write)
+$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent
+Already up to date.
+Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.)
+$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus
+Merge made by the 'ort' strategy.
+ include/linux/zstd_lib.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging battery-fixes/fixes (9db5f08ca99d power: supply: ab8500: remove unused static local variable)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes
+Merge made by the 'ort' strategy.
+ drivers/power/supply/ab8500_chargalg.c | 2 --
+ drivers/power/supply/power_supply_core.c | 2 +-
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+Merging drm-misc-fixes/for-linux-next-fixes (b0b9408f1326 drm/rockchip: Fix return type of cdn_dp_connector_mode_valid)
+$ 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/gma500/cdv_device.c | 4 +---
+ drivers/gpu/drm/gma500/gem.c | 4 ++--
+ drivers/gpu/drm/gma500/gma_display.c | 11 +++++++----
+ drivers/gpu/drm/gma500/oaktrail_device.c | 5 +----
+ drivers/gpu/drm/gma500/power.c | 8 +-------
+ drivers/gpu/drm/gma500/psb_drv.c | 2 +-
+ drivers/gpu/drm/gma500/psb_drv.h | 5 +----
+ drivers/gpu/drm/gma500/psb_irq.c | 15 ++++++++++++---
+ drivers/gpu/drm/gma500/psb_irq.h | 2 +-
+ drivers/gpu/drm/meson/meson_plane.c | 2 +-
+ drivers/gpu/drm/meson/meson_viu.c | 2 +-
+ drivers/gpu/drm/panel/panel-edp.c | 3 ++-
+ drivers/gpu/drm/rockchip/cdn-dp-core.c | 5 +++--
+ drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 4 ++++
+ 14 files changed, 38 insertions(+), 34 deletions(-)
+Merging kbuild/for-next (5f5ef75d1c4b scripts: remove unused argument 'type')
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next
+Merge made by the 'ort' strategy.
+ Documentation/kbuild/makefiles.rst | 27 ++---
+ Kbuild | 76 +++++++++++----
+ Makefile | 146 ++++++++++++++++------------
+ arch/alpha/Makefile | 2 -
+ arch/alpha/kernel/Makefile | 4 +-
+ arch/arc/Makefile | 2 -
+ arch/arc/kernel/Makefile | 4 +-
+ arch/arm/Makefile | 3 -
+ arch/arm/kernel/Makefile | 4 +-
+ arch/arm64/Makefile | 3 -
+ arch/arm64/kernel/Makefile | 4 +-
+ arch/csky/Makefile | 2 -
+ arch/csky/kernel/Makefile | 4 +-
+ arch/hexagon/Makefile | 2 -
+ arch/hexagon/kernel/Makefile | 3 +-
+ arch/ia64/Makefile | 1 -
+ arch/ia64/kernel/Makefile | 4 +-
+ arch/loongarch/Makefile | 2 -
+ arch/loongarch/kernel/Makefile | 4 +-
+ arch/m68k/68000/Makefile | 2 +-
+ arch/m68k/Makefile | 9 --
+ arch/m68k/coldfire/Makefile | 2 +-
+ arch/m68k/kernel/Makefile | 21 ++--
+ arch/microblaze/Makefile | 1 -
+ arch/microblaze/kernel/Makefile | 4 +-
+ arch/mips/Makefile | 2 -
+ arch/mips/kernel/Makefile | 4 +-
+ arch/nios2/Kbuild | 2 +
+ arch/nios2/Makefile | 5 -
+ arch/nios2/kernel/Makefile | 2 +-
+ arch/openrisc/Makefile | 2 -
+ arch/openrisc/kernel/Makefile | 4 +-
+ arch/parisc/Makefile | 2 -
+ arch/parisc/kernel/Makefile | 4 +-
+ arch/powerpc/Makefile | 12 ---
+ arch/powerpc/boot/wrapper | 2 +-
+ arch/powerpc/kernel/Makefile | 20 ++--
+ arch/riscv/Makefile | 2 -
+ arch/riscv/kernel/Makefile | 2 +-
+ arch/s390/Makefile | 2 -
+ arch/s390/boot/version.c | 1 +
+ arch/s390/kernel/Makefile | 4 +-
+ arch/sh/Makefile | 2 -
+ arch/sh/kernel/Makefile | 4 +-
+ arch/sparc/Makefile | 2 -
+ arch/sparc/kernel/Makefile | 3 +-
+ arch/x86/Makefile | 5 -
+ arch/x86/boot/compressed/kaslr.c | 1 +
+ arch/x86/boot/version.c | 1 +
+ arch/x86/kernel/Makefile | 10 +-
+ arch/xtensa/Makefile | 2 -
+ arch/xtensa/kernel/Makefile | 4 +-
+ init/.gitignore | 2 +
+ init/Makefile | 57 +++++++----
+ init/build-version | 10 ++
+ init/version-timestamp.c | 31 ++++++
+ init/version.c | 37 +++----
+ kernel/gen_kheaders.sh | 6 +-
+ scripts/Makefile.build | 72 +++++---------
+ scripts/Makefile.lib | 41 ++++----
+ scripts/Makefile.modfinal | 2 +-
+ scripts/Makefile.modpost | 112 ++++++++++-----------
+ scripts/Makefile.vmlinux_o | 21 ++--
+ scripts/asn1_compiler.c | 6 +-
+ scripts/atomic/check-atomics.sh | 33 -------
+ scripts/check-local-export | 96 +++++++++---------
+ scripts/clang-tools/gen_compile_commands.py | 19 +---
+ scripts/clang-tools/run-clang-tools.py | 1 -
+ scripts/head-object-list.txt | 53 ++++++++++
+ scripts/kconfig/conf.c | 2 +-
+ scripts/kconfig/lkc.h | 6 --
+ scripts/kconfig/menu.c | 5 -
+ scripts/link-vmlinux.sh | 51 ++--------
+ scripts/mkcompile_h | 96 +++---------------
+ 74 files changed, 540 insertions(+), 661 deletions(-)
+ create mode 100644 init/.gitignore
+ create mode 100755 init/build-version
+ create mode 100644 init/version-timestamp.c
+ delete mode 100755 scripts/atomic/check-atomics.sh
+ create mode 100644 scripts/head-object-list.txt
+Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros)
+$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format
+Already up to date.
+Merging perf/perf/core (62e64c9d2fd1 perf test: Add basic core_wide expression test)
+$ 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/build/Makefile.feature | 50 ++--
+ tools/include/uapi/linux/perf_event.h | 36 ++-
+ tools/lib/api/fd/array.h | 5 +-
+ tools/lib/perf/include/perf/event.h | 25 +-
+ tools/perf/Documentation/itrace.txt | 1 +
+ tools/perf/Documentation/perf-config.txt | 7 +
+ tools/perf/Documentation/perf-inject.txt | 7 +-
+ tools/perf/Documentation/perf-intel-pt.txt | 13 +-
+ tools/perf/Documentation/perf-record.txt | 7 +-
+ tools/perf/Makefile.config | 22 +-
+ tools/perf/bench/epoll-ctl.c | 33 +--
+ tools/perf/bench/epoll-wait.c | 33 +--
+ tools/perf/bench/futex-hash.c | 33 +--
+ tools/perf/bench/futex-lock-pi.c | 33 +--
+ tools/perf/bench/futex-requeue.c | 33 +--
+ tools/perf/bench/futex-wake-parallel.c | 33 +--
+ tools/perf/bench/futex-wake.c | 33 +--
+ tools/perf/bench/numa.c | 93 +++----
+ tools/perf/builtin-c2c.c | 65 +++--
+ tools/perf/builtin-inject.c | 89 +++++++
+ tools/perf/builtin-lock.c | 130 ++++------
+ tools/perf/builtin-record.c | 194 +++++++++++++--
+ tools/perf/builtin-report.c | 17 ++
+ tools/perf/builtin-sched.c | 125 ++++++----
+ tools/perf/builtin-script.c | 2 +-
+ tools/perf/builtin-stat.c | 66 +++--
+ tools/perf/builtin-timechart.c | 65 ++---
+ tools/perf/builtin-top.c | 45 ++--
+ tools/perf/builtin-trace.c | 5 +-
+ tools/perf/perf.c | 12 +-
+ .../arm/{cortex-a65 => cortex-a65-e1}/branch.json | 0
+ .../arm/{cortex-a65 => cortex-a65-e1}/bus.json | 0
+ .../arm/{cortex-a65 => cortex-a65-e1}/cache.json | 0
+ .../arm/{cortex-a65 => cortex-a65-e1}/dpu.json | 0
+ .../{cortex-a65 => cortex-a65-e1}/exception.json | 0
+ .../arm/{cortex-a65 => cortex-a65-e1}/ifu.json | 0
+ .../{cortex-a65 => cortex-a65-e1}/instruction.json | 0
+ .../arm/{cortex-a65 => cortex-a65-e1}/memory.json | 0
+ .../{cortex-a65 => cortex-a65-e1}/pipeline.json | 0
+ .../arch/arm64/arm/cortex-a76-n1/memory.json | 3 +
+ .../arch/arm64/arm/cortex-a76-n1/other.json | 5 -
+ .../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/arm/neoverse-n2/memory.json | 3 +
+ .../arch/arm64/arm/neoverse-n2/other.json | 5 -
+ .../arch/arm64/arm/neoverse-v1/instruction.json | 30 +++
+ .../arch/arm64/arm/neoverse-v1/memory.json | 3 +
+ .../arch/arm64/arm/neoverse-v1/other.json | 5 -
+ tools/perf/pmu-events/arch/arm64/mapfile.csv | 4 +-
+ tools/perf/tests/cpumap.c | 52 +++-
+ tools/perf/tests/event_update.c | 14 +-
+ tools/perf/tests/expr.c | 37 ++-
+ tools/perf/tests/mmap-basic.c | 2 -
+ tools/perf/tests/openat-syscall-all-cpus.c | 2 +-
+ tools/perf/tests/perf-record.c | 2 -
+ tools/perf/tests/sigtrap.c | 65 ++++-
+ tools/perf/ui/browser.c | 20 +-
+ tools/perf/ui/browsers/annotate.c | 12 +-
+ tools/perf/ui/setup.c | 5 +-
+ tools/perf/ui/tui/helpline.c | 5 +-
+ tools/perf/ui/tui/progress.c | 8 +-
+ tools/perf/ui/tui/setup.c | 8 +-
+ tools/perf/ui/tui/util.c | 18 +-
+ tools/perf/ui/ui.h | 4 +-
+ tools/perf/util/Build | 1 +
+ tools/perf/util/annotate.c | 15 +-
+ tools/perf/util/annotate.h | 4 +-
+ tools/perf/util/auxtrace.c | 13 +
+ tools/perf/util/auxtrace.h | 3 +
+ tools/perf/util/bpf-event.h | 1 -
+ tools/perf/util/bpf-loader.c | 6 +-
+ tools/perf/util/branch.c | 70 +++++-
+ tools/perf/util/branch.h | 7 +-
+ tools/perf/util/build-id.c | 12 +-
+ tools/perf/util/callchain.c | 12 +-
+ tools/perf/util/config.c | 31 +++
+ tools/perf/util/config.h | 1 +
+ tools/perf/util/cpumap.c | 31 ++-
+ tools/perf/util/cputopo.c | 61 +++++
+ tools/perf/util/cputopo.h | 5 +
+ tools/perf/util/dso.c | 19 +-
+ tools/perf/util/dso.h | 4 +-
+ tools/perf/util/events_stats.h | 1 +
+ tools/perf/util/evlist.c | 270 +++++++++++++++++++--
+ tools/perf/util/evlist.h | 12 +-
+ tools/perf/util/evsel.c | 16 +-
+ tools/perf/util/evsel.h | 1 +
+ tools/perf/util/expr.c | 29 ++-
+ tools/perf/util/expr.h | 25 +-
+ tools/perf/util/expr.l | 6 +-
+ tools/perf/util/header.c | 24 +-
+ tools/perf/util/hist.c | 21 +-
+ tools/perf/util/hist.h | 5 +-
+ tools/perf/util/intel-pt-decoder/intel-pt-log.c | 117 ++++++++-
+ tools/perf/util/intel-pt-decoder/intel-pt-log.h | 3 +-
+ tools/perf/util/intel-pt.c | 23 +-
+ tools/perf/util/map.c | 3 +
+ tools/perf/util/metricgroup.c | 134 +++++++---
+ tools/perf/util/metricgroup.h | 4 +-
+ tools/perf/util/mmap.h | 1 -
+ tools/perf/util/mutex.c | 119 +++++++++
+ tools/perf/util/mutex.h | 108 +++++++++
+ tools/perf/util/parse-branch-options.c | 1 +
+ tools/perf/util/perf_event_attr_fprintf.c | 4 +-
+ tools/perf/util/pmu.c | 2 +-
+ tools/perf/util/pmu.y | 2 -
+ tools/perf/util/probe-event.c | 3 +
+ tools/perf/util/session.c | 7 +-
+ tools/perf/util/smt.c | 110 ++-------
+ tools/perf/util/smt.h | 19 +-
+ tools/perf/util/sort.h | 2 -
+ tools/perf/util/stat-shadow.c | 13 +-
+ tools/perf/util/stat.c | 6 +-
+ tools/perf/util/stat.h | 2 +
+ tools/perf/util/symbol.c | 4 +-
+ tools/perf/util/synthetic-events.c | 159 ++++++------
+ tools/perf/util/top.h | 5 +-
+ 123 files changed, 2288 insertions(+), 1158 deletions(-)
+ rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/branch.json (100%)
+ rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/bus.json (100%)
+ rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/cache.json (100%)
+ rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/dpu.json (100%)
+ rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/exception.json (100%)
+ rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/ifu.json (100%)
+ rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/instruction.json (100%)
+ rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/memory.json (100%)
+ rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a65 => cortex-a65-e1}/pipeline.json (100%)
+ delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/other.json
+ delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/branch.json
+ delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/bus.json
+ delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/cache.json
+ delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/exception.json
+ delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/instruction.json
+ delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/memory.json
+ delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/pipeline.json
+ delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-e1/spe.json
+ delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/other.json
+ delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/other.json
+ create mode 100644 tools/perf/util/mutex.c
+ create mode 100644 tools/perf/util/mutex.h
+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 (9fc18f6d56d5 dma-mapping: mark dma_supported static)
+$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next
+Already up to date.
+Merging asm-generic/master (fdc5bebfb66b parisc: hide ioread64 declaration on 32-bit)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master
+Merge made by the 'ort' strategy.
+ arch/alpha/include/asm/io.h | 78 +++++++++++++++++++++---
+ arch/ia64/mm/numa.c | 1 +
+ arch/parisc/include/asm/io.h | 134 ++++++++++++++---------------------------
+ arch/parisc/lib/iomap.c | 24 +++++++-
+ arch/sparc/include/asm/io.h | 2 +
+ arch/sparc/include/asm/io_64.h | 22 +++++++
+ drivers/parisc/sba_iommu.c | 6 ++
+ include/asm-generic/signal.h | 2 -
+ 8 files changed, 166 insertions(+), 103 deletions(-)
+Merging arc/for-next (f2906aa86338 Linux 5.19-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next
+Already up to date.
+Merging arm/for-next (5d6dd664478f Merge branches 'misc' and 'fixes' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next
+Auto-merging arch/arm/Makefile
+Merge made by the 'ort' strategy.
+ arch/arm/Makefile | 3 +++
+ arch/arm/include/asm/fpstate.h | 3 ---
+ arch/arm/kernel/traps.c | 6 +++---
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+Merging arm64/for-next/core (daecb3077f33 Merge branches 'for-next/misc', 'for-next/kselftest', 'for-next/doc', 'for-next/sve', 'for-next/sysreg', 'for-next/gettimeofday', 'for-next/stacktrace' and 'for-next/atomics' into for-next/core)
+$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm64/kernel/Makefile
+Auto-merging arch/arm64/kernel/head.S
+Auto-merging arch/arm64/kernel/ptrace.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 5 +
+ Documentation/arm64/elf_hwcaps.rst | 3 +
+ Documentation/arm64/sve.rst | 2 +-
+ arch/arm64/Kconfig | 4 +
+ arch/arm64/include/asm/assembler.h | 8 +-
+ arch/arm64/include/asm/atomic_ll_sc.h | 58 +--
+ arch/arm64/include/asm/atomic_lse.h | 46 +-
+ arch/arm64/include/asm/cache.h | 4 -
+ arch/arm64/include/asm/cpufeature.h | 64 +--
+ arch/arm64/include/asm/el2_setup.h | 10 +-
+ arch/arm64/include/asm/exception.h | 1 +
+ arch/arm64/include/asm/hwcap.h | 1 +
+ arch/arm64/include/asm/kvm_pgtable.h | 6 +-
+ arch/arm64/include/asm/module.h | 15 +
+ arch/arm64/include/asm/processor.h | 2 +-
+ arch/arm64/include/asm/sdei.h | 17 -
+ arch/arm64/include/asm/stacktrace.h | 71 ++-
+ arch/arm64/include/asm/stacktrace/common.h | 221 ++++-----
+ arch/arm64/include/asm/stacktrace/nvhe.h | 4 +-
+ arch/arm64/include/asm/sysreg.h | 182 +------
+ arch/arm64/include/asm/vdso.h | 3 +
+ arch/arm64/include/asm/vdso/gettimeofday.h | 19 +-
+ arch/arm64/include/uapi/asm/hwcap.h | 1 +
+ arch/arm64/kernel/Makefile | 1 +
+ arch/arm64/kernel/alternative.c | 28 ++
+ arch/arm64/kernel/compat_alignment.c | 387 +++++++++++++++
+ arch/arm64/kernel/cpufeature.c | 225 ++++-----
+ arch/arm64/kernel/cpuinfo.c | 1 +
+ arch/arm64/kernel/head.S | 10 +-
+ arch/arm64/kernel/hyp-stub.S | 8 +-
+ arch/arm64/kernel/idreg-override.c | 10 +-
+ arch/arm64/kernel/irq.c | 14 +
+ arch/arm64/kernel/module.c | 15 -
+ arch/arm64/kernel/proton-pack.c | 14 +-
+ arch/arm64/kernel/ptrace.c | 2 +-
+ arch/arm64/kernel/sdei.c | 32 --
+ arch/arm64/kernel/stacktrace.c | 66 +--
+ arch/arm64/kernel/vdso.c | 3 -
+ arch/arm64/kernel/vdso/vdso.lds.S | 7 +
+ arch/arm64/kvm/hyp/include/nvhe/fixed_config.h | 60 +--
+ arch/arm64/kvm/hyp/nvhe/pkvm.c | 26 +-
+ arch/arm64/kvm/hyp/nvhe/stacktrace.c | 40 +-
+ arch/arm64/kvm/hyp/nvhe/sys_regs.c | 10 +-
+ arch/arm64/kvm/hyp/pgtable.c | 2 +-
+ arch/arm64/kvm/reset.c | 12 +-
+ arch/arm64/kvm/stacktrace.c | 137 +++---
+ arch/arm64/kvm/sys_regs.c | 32 +-
+ arch/arm64/mm/context.c | 6 +-
+ arch/arm64/mm/fault.c | 3 +
+ arch/arm64/mm/init.c | 2 +-
+ arch/arm64/mm/mmu.c | 2 +-
+ arch/arm64/mm/proc.S | 4 +-
+ arch/arm64/tools/sysreg | 366 +++++++++++++-
+ drivers/firmware/efi/libstub/arm64-stub.c | 4 +-
+ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 6 +-
+ drivers/irqchip/irq-gic-v4.c | 2 +-
+ tools/testing/selftests/arm64/abi/.gitignore | 1 +
+ tools/testing/selftests/arm64/abi/Makefile | 2 +-
+ tools/testing/selftests/arm64/abi/hwcap.c | 188 ++++++++
+ tools/testing/selftests/arm64/abi/syscall-abi.c | 61 ++-
+ tools/testing/selftests/arm64/fp/.gitignore | 1 +
+ tools/testing/selftests/arm64/fp/Makefile | 5 +-
+ tools/testing/selftests/arm64/fp/asm-offsets.h | 1 +
+ tools/testing/selftests/arm64/fp/fp-stress.c | 535 +++++++++++++++++++++
+ tools/testing/selftests/arm64/fp/fpsimd-test.S | 51 +-
+ tools/testing/selftests/arm64/fp/sve-test.S | 51 +-
+ tools/testing/selftests/arm64/fp/za-test.S | 58 ++-
+ .../selftests/arm64/signal/test_signals_utils.c | 59 ++-
+ .../selftests/arm64/signal/test_signals_utils.h | 5 +-
+ .../signal/testcases/fake_sigreturn_bad_magic.c | 2 +-
+ .../signal/testcases/fake_sigreturn_bad_size.c | 2 +-
+ .../testcases/fake_sigreturn_bad_size_for_magic0.c | 2 +-
+ .../testcases/fake_sigreturn_duplicated_fpsimd.c | 2 +-
+ .../testcases/fake_sigreturn_misaligned_sp.c | 2 +-
+ .../testcases/fake_sigreturn_missing_fpsimd.c | 2 +-
+ .../testcases/fake_sigreturn_sme_change_vl.c | 2 +-
+ .../testcases/fake_sigreturn_sve_change_vl.c | 2 +-
+ .../selftests/arm64/signal/testcases/sme_vl.c | 2 +-
+ .../selftests/arm64/signal/testcases/ssve_regs.c | 25 +-
+ .../selftests/arm64/signal/testcases/sve_regs.c | 23 +-
+ .../selftests/arm64/signal/testcases/sve_vl.c | 2 +-
+ .../selftests/arm64/signal/testcases/testcases.c | 48 +-
+ .../selftests/arm64/signal/testcases/testcases.h | 9 +-
+ .../selftests/arm64/signal/testcases/za_no_regs.c | 119 +++++
+ .../selftests/arm64/signal/testcases/za_regs.c | 44 +-
+ 85 files changed, 2637 insertions(+), 953 deletions(-)
+ create mode 100644 arch/arm64/kernel/compat_alignment.c
+ create mode 100644 tools/testing/selftests/arm64/abi/hwcap.c
+ create mode 100644 tools/testing/selftests/arm64/fp/fp-stress.c
+ create mode 100644 tools/testing/selftests/arm64/signal/testcases/za_no_regs.c
+Merging arm-perf/for-next/perf (aaaee7b55c9e docs: perf: Include hns3-pmu.rst in toctree to fix 'htmldocs' WARNING)
+$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf
+Already up to date.
+Merging arm-soc/for-next (5ff4137055a2 Merge branch 'arm/soc' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/Makefile
+Auto-merging arch/arm/kernel/Makefile
+Merge made by the 'ort' strategy.
+ .../ABI/testing/sysfs-platform-brcmstb-memc | 15 +
+ Documentation/devicetree/bindings/arm/amlogic.yaml | 2 +
+ .../devicetree/bindings/arm/bcm/brcm,bcm4908.yaml | 42 -
+ .../devicetree/bindings/arm/bcm/brcm,bcmbca.yaml | 25 +
+ .../devicetree/bindings/arm/bcm/brcm,brcmstb.txt | 11 +-
+ Documentation/devicetree/bindings/arm/renesas.yaml | 16 +
+ .../devicetree/bindings/arm/rockchip.yaml | 25 +
+ .../devicetree/bindings/arm/rockchip/pmu.yaml | 2 +
+ .../bindings/clock/samsung,exynos850-clock.yaml | 69 ++
+ .../bindings/clock/samsung,exynosautov9-clock.yaml | 44 +
+ .../devicetree/bindings/media/exynos5-gsc.txt | 38 -
+ .../bindings/media/samsung,exynos5250-gsc.yaml | 109 +++
+ .../memory-controllers/brcm,brcmstb-memc-ddr.yaml | 52 ++
+ .../memory-controllers/mediatek,smi-common.yaml | 15 +-
+ .../memory-controllers/mediatek,smi-larb.yaml | 3 +
+ .../bindings/power/rockchip,power-controller.yaml | 4 +
+ .../bindings/power/rockchip-io-domain.yaml | 30 +
+ .../devicetree/bindings/serial/samsung_uart.yaml | 5 +-
+ .../bindings/soc/renesas/renesas,rzg2l-sysc.yaml | 4 +-
+ .../devicetree/bindings/soc/rockchip/grf.yaml | 3 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 4 +
+ MAINTAINERS | 14 +-
+ arch/arm/Kconfig | 135 +--
+ arch/arm/Kconfig.debug | 8 +-
+ arch/arm/Makefile | 40 +-
+ arch/arm/arm-soc-for-next-contents.txt | 86 ++
+ arch/arm/boot/Makefile | 27 +-
+ arch/arm/boot/bootp/Makefile | 35 +-
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/at91-sam9x60ek.dts | 78 +-
+ arch/arm/boot/dts/bcm5301x.dtsi | 12 +
+ arch/arm/boot/dts/gemini-ns2502.dts | 33 +-
+ arch/arm/boot/dts/gemini-ssi1328.dts | 4 -
+ arch/arm/boot/dts/lan966x-pcb8290.dts | 175 ++++
+ arch/arm/boot/dts/lan966x-pcb8291.dts | 28 +
+ arch/arm/boot/dts/lan966x-pcb8309.dts | 28 +
+ arch/arm/boot/dts/rk3036-evb.dts | 16 +-
+ arch/arm/boot/dts/rk3036-kylin.dts | 16 +-
+ arch/arm/boot/dts/rk3036.dtsi | 4 +-
+ arch/arm/boot/dts/rk3066a-marsboard.dts | 17 +-
+ arch/arm/boot/dts/rk3066a-rayeager.dts | 15 +-
+ arch/arm/boot/dts/rk3188-radxarock.dts | 19 +-
+ arch/arm/boot/dts/rk3xxx.dtsi | 2 -
+ arch/arm/boot/dts/stm32mp13-pinctrl.dtsi | 57 ++
+ arch/arm/boot/dts/stm32mp131.dtsi | 160 ++++
+ arch/arm/boot/dts/stm32mp135f-dk.dts | 33 +
+ arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 50 +-
+ arch/arm/boot/dts/stm32mp151.dtsi | 34 +
+ .../stm32mp157a-icore-stm32mp1-ctouch2-of10.dts | 2 +-
+ .../dts/stm32mp157a-icore-stm32mp1-ctouch2.dts | 2 +-
+ .../dts/stm32mp157a-icore-stm32mp1-edimm2.2.dts | 2 +-
+ arch/arm/boot/dts/stm32mp157a-icore-stm32mp1.dtsi | 2 +-
+ ...m32mp157a-microgea-stm32mp1-microdev2.0-of7.dts | 2 +-
+ .../stm32mp157a-microgea-stm32mp1-microdev2.0.dts | 2 +-
+ .../boot/dts/stm32mp157a-microgea-stm32mp1.dtsi | 2 +-
+ arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi | 6 -
+ arch/arm/boot/dts/stm32mp157c-ev1.dts | 12 +-
+ arch/arm/configs/assabet_defconfig | 2 +
+ arch/arm/configs/at91_dt_defconfig | 2 +-
+ arch/arm/configs/badge4_defconfig | 2 +
+ arch/arm/configs/bcm2835_defconfig | 2 +-
+ arch/arm/configs/cerfcube_defconfig | 2 +
+ arch/arm/configs/cm_x300_defconfig | 2 +-
+ arch/arm/configs/collie_defconfig | 2 +
+ arch/arm/configs/davinci_all_defconfig | 2 +-
+ arch/arm/configs/dove_defconfig | 4 +-
+ arch/arm/configs/exynos_defconfig | 4 +-
+ arch/arm/configs/ezx_defconfig | 2 +-
+ arch/arm/configs/footbridge_defconfig | 2 +
+ arch/arm/configs/h3600_defconfig | 2 +
+ arch/arm/configs/hackkit_defconfig | 2 +
+ arch/arm/configs/hisi_defconfig | 2 +-
+ arch/arm/configs/imx_v4_v5_defconfig | 2 +-
+ arch/arm/configs/imx_v6_v7_defconfig | 4 +-
+ arch/arm/configs/integrator_defconfig | 2 +-
+ arch/arm/configs/ixp4xx_defconfig | 2 +-
+ arch/arm/configs/jornada720_defconfig | 2 +
+ arch/arm/configs/keystone_defconfig | 7 +-
+ arch/arm/configs/lart_defconfig | 2 +
+ arch/arm/configs/lpc18xx_defconfig | 2 +-
+ arch/arm/configs/lpc32xx_defconfig | 2 +-
+ arch/arm/configs/magician_defconfig | 2 +-
+ arch/arm/configs/milbeaut_m10v_defconfig | 2 +-
+ arch/arm/configs/mmp2_defconfig | 2 +-
+ arch/arm/configs/moxart_defconfig | 2 +-
+ arch/arm/configs/mps2_defconfig | 2 +-
+ arch/arm/configs/multi_v4t_defconfig | 2 -
+ arch/arm/configs/multi_v5_defconfig | 5 +-
+ arch/arm/configs/multi_v7_defconfig | 24 +-
+ arch/arm/configs/mv78xx0_defconfig | 2 +-
+ arch/arm/configs/mvebu_v5_defconfig | 4 +-
+ arch/arm/configs/mxs_defconfig | 6 +-
+ arch/arm/configs/neponset_defconfig | 2 +
+ arch/arm/configs/netwinder_defconfig | 2 +
+ arch/arm/configs/omap1_defconfig | 4 +-
+ arch/arm/configs/omap2plus_defconfig | 9 +-
+ arch/arm/configs/orion5x_defconfig | 4 +-
+ arch/arm/configs/oxnas_v6_defconfig | 2 +-
+ arch/arm/configs/pcm027_defconfig | 2 +-
+ arch/arm/configs/pleb_defconfig | 2 +
+ arch/arm/configs/pxa168_defconfig | 4 +-
+ arch/arm/configs/pxa910_defconfig | 4 +-
+ arch/arm/configs/pxa_defconfig | 4 +-
+ arch/arm/configs/qcom_defconfig | 3 +-
+ arch/arm/configs/rpc_defconfig | 2 +
+ arch/arm/configs/s3c6400_defconfig | 2 +-
+ arch/arm/configs/s5pv210_defconfig | 4 +-
+ arch/arm/configs/sama5_defconfig | 6 +-
+ arch/arm/configs/sama7_defconfig | 4 +-
+ arch/arm/configs/shannon_defconfig | 2 +
+ arch/arm/configs/shmobile_defconfig | 10 +-
+ arch/arm/configs/simpad_defconfig | 2 +
+ arch/arm/configs/socfpga_defconfig | 6 +-
+ arch/arm/configs/sp7021_defconfig | 2 +-
+ arch/arm/configs/spear13xx_defconfig | 2 +-
+ arch/arm/configs/spear3xx_defconfig | 2 +-
+ arch/arm/configs/spear6xx_defconfig | 2 +-
+ arch/arm/configs/stm32_defconfig | 2 +-
+ arch/arm/configs/sunxi_defconfig | 4 +-
+ arch/arm/configs/tegra_defconfig | 4 +-
+ arch/arm/configs/vexpress_defconfig | 2 +-
+ arch/arm/configs/vt8500_v6_v7_defconfig | 2 +-
+ arch/arm/configs/xcep_defconfig | 2 +-
+ arch/arm/include/asm/dma-direct.h | 1 -
+ arch/arm/include/asm/dma.h | 2 +-
+ arch/arm/include/asm/hardware/dec21285.h | 20 +-
+ arch/arm/include/asm/mach/dma.h | 5 -
+ arch/arm/include/asm/memory.h | 11 -
+ arch/arm/kernel/Makefile | 1 -
+ arch/arm/kernel/devtree.c | 2 -
+ arch/arm/mach-at91/Makefile.boot | 4 -
+ arch/arm/mach-davinci/Makefile.boot | 8 -
+ arch/arm/mach-dove/Makefile | 2 +-
+ arch/arm/mach-dove/Makefile.boot | 4 -
+ arch/arm/mach-ep93xx/Makefile.boot | 2 -
+ arch/arm/mach-footbridge/Kconfig | 48 +-
+ arch/arm/mach-footbridge/Makefile | 5 +-
+ arch/arm/mach-footbridge/Makefile.boot | 5 -
+ arch/arm/mach-footbridge/common.c | 79 +-
+ arch/arm/mach-footbridge/dc21285.c | 80 +-
+ arch/arm/{kernel => mach-footbridge}/dma-isa.c | 11 +-
+ arch/arm/mach-footbridge/dma.c | 58 --
+ arch/arm/mach-footbridge/include/mach/dma-direct.h | 8 -
+ arch/arm/mach-footbridge/include/mach/isa-dma.h | 14 +-
+ arch/arm/mach-footbridge/include/mach/memory.h | 31 -
+ arch/arm/mach-footbridge/isa.c | 14 +-
+ arch/arm/mach-imx/Kconfig | 2 +-
+ arch/arm/mach-imx/Makefile.boot | 0
+ arch/arm/mach-iop32x/Makefile.boot | 4 -
+ arch/arm/mach-lpc18xx/Makefile.boot | 4 -
+ arch/arm/mach-lpc32xx/Makefile.boot | 4 -
+ arch/arm/mach-mv78xx0/Makefile | 2 +-
+ arch/arm/mach-mvebu/Makefile | 2 +-
+ arch/arm/mach-nspire/Kconfig | 2 +-
+ arch/arm/mach-omap1/Makefile.boot | 4 -
+ arch/arm/mach-orion5x/Makefile | 2 +-
+ arch/arm/mach-rpc/Kconfig | 21 +
+ arch/arm/mach-rpc/Makefile.boot | 5 -
+ arch/arm/mach-s3c/Makefile.boot | 9 -
+ arch/arm/mach-sa1100/Kconfig | 25 +-
+ arch/arm/mach-sa1100/Makefile.boot | 9 -
+ arch/arm/mach-stm32/Makefile.boot | 4 -
+ arch/arm/mach-versatile/Makefile.boot | 4 -
+ arch/arm/mach-vt8500/Makefile.boot | 4 -
+ arch/arm64/Kconfig.platforms | 62 +-
+ arch/arm64/boot/dts/amlogic/Makefile | 3 +
+ .../dts/amlogic/meson-axg-jethome-jethub-j100.dts | 338 +-------
+ .../meson-axg-jethome-jethub-j110-rev-2.dts | 37 +
+ .../meson-axg-jethome-jethub-j110-rev-3.dts | 27 +
+ .../dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi | 351 ++++++++
+ arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 1 -
+ .../boot/dts/amlogic/meson-gxm-gt1-ultimate.dts | 91 ++
+ arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 1 -
+ arch/arm64/boot/dts/broadcom/Makefile | 1 -
+ arch/arm64/boot/dts/broadcom/bcm4908/Makefile | 5 -
+ arch/arm64/boot/dts/broadcom/bcmbca/Makefile | 5 +
+ .../{bcm4908 => bcmbca}/bcm4906-netgear-r8000p.dts | 2 +-
+ .../bcm4906-tplink-archer-c2300-v1.dts | 2 +-
+ .../dts/broadcom/{bcm4908 => bcmbca}/bcm4906.dtsi | 0
+ .../{bcm4908 => bcmbca}/bcm4908-asus-gt-ac5300.dts | 50 +-
+ .../bcm4908-netgear-raxe500.dts | 2 +-
+ .../dts/broadcom/{bcm4908 => bcmbca}/bcm4908.dtsi | 83 ++
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts | 30 +
+ arch/arm64/boot/dts/exynos/exynos850.dtsi | 83 ++
+ arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 28 +
+ arch/arm64/boot/dts/renesas/Makefile | 1 +
+ arch/arm64/boot/dts/renesas/condor-common.dtsi | 548 ++++++++++++
+ arch/arm64/boot/dts/renesas/ebisu.dtsi | 8 +
+ arch/arm64/boot/dts/renesas/hihope-common.dtsi | 8 +
+ .../boot/dts/renesas/r8a774a1-beacon-rzg2m-kit.dts | 8 +
+ arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 12 -
+ arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 1 -
+ arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 1 -
+ arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 3 +-
+ arch/arm64/boot/dts/renesas/r8a77951.dtsi | 11 -
+ arch/arm64/boot/dts/renesas/r8a77960.dtsi | 11 -
+ arch/arm64/boot/dts/renesas/r8a77965.dtsi | 11 -
+ arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 5 +
+ arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 5 +
+ arch/arm64/boot/dts/renesas/r8a77970.dtsi | 9 -
+ arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 534 +-----------
+ arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 6 +
+ arch/arm64/boot/dts/renesas/r8a77980.dtsi | 10 -
+ arch/arm64/boot/dts/renesas/r8a77980a-condor-i.dts | 15 +
+ arch/arm64/boot/dts/renesas/r8a77980a.dtsi | 11 +
+ arch/arm64/boot/dts/renesas/r8a77990.dtsi | 11 -
+ .../boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 7 +
+ arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 11 -
+ .../boot/dts/renesas/r8a779f0-spider-cpu.dtsi | 45 +
+ arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 212 +++++
+ arch/arm64/boot/dts/renesas/r8a779mb.dtsi | 12 +
+ arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 18 +-
+ arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 73 +-
+ arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 73 +-
+ arch/arm64/boot/dts/renesas/r9a09g011-v2mevk2.dts | 27 +
+ arch/arm64/boot/dts/renesas/r9a09g011.dtsi | 78 ++
+ arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi | 11 +-
+ arch/arm64/boot/dts/renesas/salvator-common.dtsi | 8 +
+ arch/arm64/boot/dts/renesas/ulcb.dtsi | 8 +
+ arch/arm64/boot/dts/rockchip/Makefile | 5 +
+ arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 26 +
+ arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts | 939 +++++++++++++++++++++
+ .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 10 +
+ .../boot/dts/rockchip/rk3399-pinephone-pro.dts | 398 +++++++++
+ .../boot/dts/rockchip/rk3399-rock-4c-plus.dts | 679 +++++++++++++++
+ arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 21 +
+ arch/arm64/boot/dts/rockchip/rk3399-t-opp.dtsi | 114 +++
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 25 +-
+ .../boot/dts/rockchip/rk3566-anbernic-rg353p.dts | 94 +++
+ .../boot/dts/rockchip/rk3566-anbernic-rg503.dts | 87 ++
+ .../boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi | 831 ++++++++++++++++++
+ arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts | 66 +-
+ arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 129 ++-
+ arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 113 +++
+ arch/arm64/boot/dts/rockchip/rk3568.dtsi | 122 +++
+ arch/arm64/boot/dts/rockchip/rk356x.dtsi | 52 ++
+ arch/arm64/configs/defconfig | 6 +-
+ drivers/firmware/arm_ffa/bus.c | 4 +-
+ drivers/firmware/arm_ffa/driver.c | 132 ++-
+ drivers/i2c/busses/Kconfig | 4 +-
+ drivers/memory/Kconfig | 9 +
+ drivers/memory/Makefile | 1 +
+ drivers/memory/brcmstb_memc.c | 301 +++++++
+ drivers/memory/dfl-emif.c | 62 +-
+ drivers/memory/mtk-smi.c | 109 ++-
+ drivers/memory/of_memory.c | 2 +
+ drivers/memory/pl353-smc.c | 1 +
+ drivers/mtd/parsers/Kconfig | 6 +-
+ drivers/net/ethernet/broadcom/Kconfig | 4 +-
+ drivers/pci/controller/Kconfig | 2 +-
+ drivers/phy/broadcom/Kconfig | 4 +-
+ drivers/pinctrl/bcm/Kconfig | 4 +-
+ drivers/reset/Kconfig | 2 +-
+ drivers/soc/amlogic/meson-ee-pwrc.c | 5 +-
+ drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 5 +-
+ drivers/soc/bcm/bcm63xx/Kconfig | 4 +-
+ drivers/soc/bcm/brcmstb/pm/pm-arm.c | 16 +-
+ drivers/soc/renesas/Kconfig | 11 +
+ drivers/soc/renesas/renesas-soc.c | 14 +
+ drivers/soc/rockchip/io-domain.c | 20 +
+ drivers/soc/rockchip/pm_domains.c | 130 ++-
+ drivers/tee/optee/ffa_abi.c | 46 +-
+ drivers/tee/optee/optee_private.h | 1 -
+ drivers/tty/serial/21285.c | 3 -
+ drivers/tty/serial/Kconfig | 4 +-
+ drivers/watchdog/Kconfig | 2 +-
+ include/dt-bindings/clock/exynos850.h | 136 ++-
+ include/dt-bindings/clock/samsung,exynosautov9.h | 128 ++-
+ .../dt-bindings/interrupt-controller/irqc-rzg2l.h | 25 +
+ include/dt-bindings/power/rk3588-power.h | 69 ++
+ include/dt-bindings/power/rockchip,rv1126-power.h | 35 +
+ include/linux/arm_ffa.h | 36 +-
+ include/linux/soc/mediatek/mtk_sip_svc.h | 3 +
+ include/soc/mediatek/smi.h | 5 +
+ 274 files changed, 8425 insertions(+), 2066 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-platform-brcmstb-memc
+ delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml
+ delete mode 100644 Documentation/devicetree/bindings/media/exynos5-gsc.txt
+ create mode 100644 Documentation/devicetree/bindings/media/samsung,exynos5250-gsc.yaml
+ create mode 100644 Documentation/devicetree/bindings/memory-controllers/brcm,brcmstb-memc-ddr.yaml
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 arch/arm/boot/dts/lan966x-pcb8290.dts
+ delete mode 100644 arch/arm/include/asm/dma-direct.h
+ delete mode 100644 arch/arm/mach-at91/Makefile.boot
+ delete mode 100644 arch/arm/mach-davinci/Makefile.boot
+ delete mode 100644 arch/arm/mach-dove/Makefile.boot
+ delete mode 100644 arch/arm/mach-ep93xx/Makefile.boot
+ delete mode 100644 arch/arm/mach-footbridge/Makefile.boot
+ rename arch/arm/{kernel => mach-footbridge}/dma-isa.c (95%)
+ delete mode 100644 arch/arm/mach-footbridge/dma.c
+ delete mode 100644 arch/arm/mach-footbridge/include/mach/dma-direct.h
+ delete mode 100644 arch/arm/mach-imx/Makefile.boot
+ delete mode 100644 arch/arm/mach-iop32x/Makefile.boot
+ delete mode 100644 arch/arm/mach-lpc18xx/Makefile.boot
+ delete mode 100644 arch/arm/mach-lpc32xx/Makefile.boot
+ delete mode 100644 arch/arm/mach-omap1/Makefile.boot
+ create mode 100644 arch/arm/mach-rpc/Kconfig
+ delete mode 100644 arch/arm/mach-rpc/Makefile.boot
+ delete mode 100644 arch/arm/mach-s3c/Makefile.boot
+ delete mode 100644 arch/arm/mach-sa1100/Makefile.boot
+ delete mode 100644 arch/arm/mach-stm32/Makefile.boot
+ delete mode 100644 arch/arm/mach-versatile/Makefile.boot
+ delete mode 100644 arch/arm/mach-vt8500/Makefile.boot
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-3.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dts
+ delete mode 100644 arch/arm64/boot/dts/broadcom/bcm4908/Makefile
+ rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906-netgear-r8000p.dts (96%)
+ rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906-tplink-archer-c2300-v1.dts (99%)
+ rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906.dtsi (100%)
+ rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908-asus-gt-ac5300.dts (69%)
+ rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908-netgear-raxe500.dts (89%)
+ rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908.dtsi (86%)
+ create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/condor-common.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a77980a-condor-i.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a77980a.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a779mb.dtsi
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-t-opp.dtsi
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi
+ create mode 100644 drivers/memory/brcmstb_memc.c
+ create mode 100644 include/dt-bindings/interrupt-controller/irqc-rzg2l.h
+ create mode 100644 include/dt-bindings/power/rk3588-power.h
+ create mode 100644 include/dt-bindings/power/rockchip,rv1126-power.h
+Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git actions/for-next
+Auto-merging arch/arm/boot/dts/owl-s500-roseapplepi.dts
+Merge made by the 'ort' strategy.
+Merging amlogic/for-next (727d51a3ed30 Merge branch 'v6.1/dt64' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next
+Merge made by the 'ort' strategy.
+Merging aspeed/for-next (7bc156fbb726 ARM: config: aspeed_g5: Enable PECI)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next
+Merge made by the 'ort' strategy.
+ arch/arm/boot/dts/aspeed-ast2600-evb.dts | 21 ++++++++++++++++-----
+ arch/arm/boot/dts/aspeed-bmc-facebook-bletchley.dts | 13 ++++++++-----
+ arch/arm/configs/aspeed_g4_defconfig | 10 +++++++---
+ arch/arm/configs/aspeed_g5_defconfig | 20 +++++++++++++++++++-
+ 4 files changed, 50 insertions(+), 14 deletions(-)
+Merging at91/at91-next (3d395fc5ca0a Merge branch 'clk-microchip' 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 MAINTAINERS
+Auto-merging drivers/reset/Kconfig
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/atmel-at91.yaml | 7 +
+ .../bindings/clock/microchip,mpfs-ccc.yaml | 80 +++++
+ ...rochip,mpfs.yaml => microchip,mpfs-clkcfg.yaml} | 19 +-
+ MAINTAINERS | 1 +
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/at91-sama5d3_eds.dts | 307 ++++++++++++++++
+ arch/arm/boot/dts/lan966x-pcb8290.dts | 4 +
+ arch/arm/boot/dts/lan966x-pcb8291.dts | 4 +
+ arch/arm/boot/dts/lan966x-pcb8309.dts | 4 +
+ drivers/clk/at91/sama5d2.c | 10 +
+ drivers/clk/microchip/Kconfig | 1 +
+ drivers/clk/microchip/Makefile | 1 +
+ drivers/clk/microchip/clk-mpfs-ccc.c | 290 ++++++++++++++++
+ drivers/clk/microchip/clk-mpfs.c | 384 +++++++++++----------
+ drivers/reset/Kconfig | 7 +
+ drivers/reset/Makefile | 2 +-
+ drivers/reset/reset-mpfs.c | 157 +++++++++
+ include/dt-bindings/clock/microchip,mpfs-clock.h | 23 ++
+ include/soc/microchip/mpfs.h | 8 +
+ 19 files changed, 1115 insertions(+), 195 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/microchip,mpfs-ccc.yaml
+ rename Documentation/devicetree/bindings/clock/{microchip,mpfs.yaml => microchip,mpfs-clkcfg.yaml} (73%)
+ create mode 100644 arch/arm/boot/dts/at91-sama5d3_eds.dts
+ create mode 100644 drivers/clk/microchip/clk-mpfs-ccc.c
+ create mode 100644 drivers/reset/reset-mpfs.c
+Merging broadcom/next (122de0c73256 Merge branch 'maintainers/next' into next)
+$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next
+Auto-merging MAINTAINERS
+Auto-merging arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts
+Merge made by the 'ort' strategy.
+Merging drivers-memory/for-next (f492ddd4aaad Merge branch 'for-v6.1/mediatek' 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 Documentation/devicetree/bindings/memory-controllers/mediatek,smi-common.yaml
+Merge made by the 'ort' strategy.
+Merging imx-mxs/for-next (e2e1869ddb2a Merge branch 'imx/dt64' 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/Makefile
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/fsl.yaml | 58 +-
+ Documentation/devicetree/bindings/mfd/syscon.yaml | 2 +
+ .../bindings/soc/imx/fsl,imx8mm-vpu-blk-ctrl.yaml | 110 ++-
+ .../bindings/soc/imx/fsl,imx8mp-hdmi-blk-ctrl.yaml | 9 +
+ .../bindings/soc/imx/fsl,imx8mp-hsio-blk-ctrl.yaml | 10 +
+ .../soc/imx/fsl,imx8mp-media-blk-ctrl.yaml | 14 +
+ .../bindings/soc/imx/fsl,imx93-media-blk-ctrl.yaml | 80 ++
+ .../devicetree/bindings/soc/imx/fsl,imx93-src.yaml | 96 +++
+ arch/arm/boot/dts/Makefile | 5 +-
+ arch/arm/boot/dts/imx23-xfi3.dts | 6 +-
+ .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 4 +-
+ arch/arm/boot/dts/imx25.dtsi | 2 +-
+ arch/arm/boot/dts/imx28-cfa10049.dts | 8 +-
+ arch/arm/boot/dts/imx28-cfa10055.dts | 2 +-
+ arch/arm/boot/dts/imx28-cfa10056.dts | 2 +-
+ arch/arm/boot/dts/imx28-duckbill-2-enocean.dts | 2 +-
+ arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi | 8 +-
+ arch/arm/boot/dts/imx28-tx28.dts | 2 +-
+ arch/arm/boot/dts/imx31.dtsi | 2 +-
+ .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 4 +-
+ arch/arm/boot/dts/imx35.dtsi | 2 +-
+ arch/arm/boot/dts/imx50-kobo-aura.dts | 6 +-
+ arch/arm/boot/dts/imx50.dtsi | 2 +-
+ arch/arm/boot/dts/imx51-apf51dev.dts | 2 +-
+ arch/arm/boot/dts/imx51-babbage.dts | 2 +-
+ arch/arm/boot/dts/imx51-zii-rdu1.dts | 2 +-
+ arch/arm/boot/dts/imx51.dtsi | 2 +-
+ arch/arm/boot/dts/imx53-ard.dts | 10 +-
+ arch/arm/boot/dts/imx53-qsb-common.dtsi | 8 +-
+ arch/arm/boot/dts/imx53-smd.dts | 4 +-
+ arch/arm/boot/dts/imx53-tx53.dtsi | 2 +-
+ arch/arm/boot/dts/imx53.dtsi | 2 +-
+ arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi | 8 +-
+ arch/arm/boot/dts/imx6dl-b1x5pv2.dtsi | 2 +-
+ arch/arm/boot/dts/imx6dl-prtmvt.dts | 32 +-
+ arch/arm/boot/dts/imx6dl-prtvt7.dts | 30 +-
+ arch/arm/boot/dts/imx6dl-riotboard.dts | 1 +
+ arch/arm/boot/dts/imx6dl-victgo.dts | 4 +-
+ arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 1 +
+ arch/arm/boot/dts/imx6dl.dtsi | 3 +
+ arch/arm/boot/dts/imx6q-arm2.dts | 1 +
+ arch/arm/boot/dts/imx6q-evi.dts | 1 +
+ arch/arm/boot/dts/imx6q-mccmon6.dts | 2 +
+ arch/arm/boot/dts/imx6q-novena.dts | 4 +-
+ arch/arm/boot/dts/imx6q-pistachio.dts | 2 +-
+ arch/arm/boot/dts/imx6q-sabrelite.dts | 37 +-
+ arch/arm/boot/dts/imx6q-utilite-pro.dts | 2 +-
+ arch/arm/boot/dts/imx6q-var-dt6customboard.dts | 6 +-
+ arch/arm/boot/dts/imx6q.dtsi | 3 +
+ arch/arm/boot/dts/imx6qdl-dhcom-pdk2.dtsi | 33 -
+ arch/arm/boot/dts/imx6qdl-dhcom-som.dtsi | 33 +
+ arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 20 +-
+ arch/arm/boot/dts/imx6qdl-mba6.dtsi | 1 -
+ arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 1 +
+ .../boot/dts/imx6qdl-phytec-mira-peb-av-02.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 37 +-
+ arch/arm/boot/dts/imx6qdl-skov-cpu-revc.dtsi | 65 +-
+ arch/arm/boot/dts/imx6qdl-tqma6a.dtsi | 2 +
+ arch/arm/boot/dts/imx6qdl-tqma6b.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-ts7970.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-vicut1.dtsi | 22 +
+ arch/arm/boot/dts/imx6qdl.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qp.dtsi | 6 +
+ arch/arm/boot/dts/imx6sl.dtsi | 25 +-
+ arch/arm/boot/dts/imx6sll.dtsi | 3 +
+ arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 14 +-
+ arch/arm/boot/dts/imx6sx.dtsi | 8 +-
+ arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 2 +-
+ ...ron-n6310-s-43.dts => imx6ul-kontron-bl-43.dts} | 8 +-
+ ...-n6x1x-s.dtsi => imx6ul-kontron-bl-common.dtsi} | 0
+ ...l-kontron-n6310-s.dts => imx6ul-kontron-bl.dts} | 9 +-
+ arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi | 41 -
+ arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts | 16 -
+ arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi | 40 -
+ ...m-common.dtsi => imx6ul-kontron-sl-common.dtsi} | 15 +
+ arch/arm/boot/dts/imx6ul-kontron-sl.dtsi | 14 +
+ arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 2 +-
+ arch/arm/boot/dts/imx6ul.dtsi | 2 +-
+ arch/arm/boot/dts/imx6ull-kontron-bl.dts | 15 +
+ arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts | 16 -
+ arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi | 40 -
+ arch/arm/boot/dts/imx6ull-kontron-sl.dtsi | 13 +
+ arch/arm/boot/dts/imx7d-pico.dtsi | 10 +-
+ arch/arm/boot/dts/imx7d-sdb.dts | 13 +-
+ arch/arm/boot/dts/imx7d-zii-rmu2.dts | 2 +-
+ arch/arm/boot/dts/imx7d-zii-rpu2.dts | 2 +-
+ arch/arm/boot/dts/imx7s.dtsi | 2 +-
+ arch/arm/boot/dts/imx7ulp.dtsi | 10 +-
+ arch/arm/boot/dts/ls1021a.dtsi | 2 +-
+ arch/arm/boot/dts/vf610-bk4.dts | 2 +-
+ arch/arm/boot/dts/vf610-pinfunc.h | 52 +-
+ arch/arm/boot/dts/vf610-twr.dts | 2 +-
+ arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 2 +-
+ arch/arm/boot/dts/vf610.dtsi | 1 -
+ arch/arm64/boot/dts/freescale/Makefile | 6 +-
+ .../fsl-ls1028a-kontron-kbox-a-230-ls.dts | 9 +-
+ .../freescale/fsl-ls1028a-kontron-sl28-var2.dts | 9 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 12 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 +
+ arch/arm64/boot/dts/freescale/imx8-ss-ddr.dtsi | 2 +-
+ arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi | 20 +-
+ arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 426 ++++++++++
+ arch/arm64/boot/dts/freescale/imx8dxl-ss-adma.dtsi | 52 ++
+ arch/arm64/boot/dts/freescale/imx8dxl-ss-conn.dtsi | 142 ++++
+ arch/arm64/boot/dts/freescale/imx8dxl-ss-ddr.dtsi | 9 +
+ arch/arm64/boot/dts/freescale/imx8dxl-ss-lsio.dtsi | 74 ++
+ arch/arm64/boot/dts/freescale/imx8dxl.dtsi | 238 ++++++
+ .../boot/dts/freescale/imx8mm-icore-mx8mm.dtsi | 2 +-
+ .../boot/dts/freescale/imx8mm-kontron-bl-osm-s.dts | 376 +++++++++
+ ...m-kontron-n801x-s.dts => imx8mm-kontron-bl.dts} | 9 +-
+ .../boot/dts/freescale/imx8mm-kontron-osm-s.dtsi | 330 ++++++++
+ ...ntron-n801x-som.dtsi => imx8mm-kontron-sl.dtsi} | 53 +-
+ .../boot/dts/freescale/imx8mm-venice-gw72xx-0x.dts | 1 -
+ .../boot/dts/freescale/imx8mm-venice-gw7902.dts | 1 -
+ .../boot/dts/freescale/imx8mm-venice-gw7903.dts | 4 +-
+ .../boot/dts/freescale/imx8mm-venice-gw7904.dts | 888 +++++++++++++++++++++
+ arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 19 +-
+ .../boot/dts/freescale/imx8mn-venice-gw7902.dts | 1 -
+ .../arm64/boot/dts/freescale/imx8mp-dhcom-pdk2.dts | 9 +-
+ arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 53 ++
+ .../dts/freescale/imx8mp-icore-mx8mp-edimm2.2.dts | 2 +-
+ .../boot/dts/freescale/imx8mp-icore-mx8mp.dtsi | 2 +-
+ .../dts/freescale/imx8mp-msc-sm2s-14N0600E.dtsi | 68 ++
+ .../boot/dts/freescale/imx8mp-msc-sm2s-ep1.dts | 52 ++
+ arch/arm64/boot/dts/freescale/imx8mp-msc-sm2s.dtsi | 820 +++++++++++++++++++
+ .../dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 48 ++
+ .../boot/dts/freescale/imx8mp-venice-gw74xx.dts | 110 ++-
+ arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 19 +-
+ arch/arm64/boot/dts/freescale/imx8mp.dtsi | 110 +++
+ arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 40 +-
+ .../boot/dts/freescale/imx8mq-mnt-reform2.dts | 1 -
+ arch/arm64/boot/dts/freescale/imx8mq.dtsi | 4 +-
+ arch/arm64/boot/dts/freescale/imx8ulp-evk.dts | 57 ++
+ arch/arm64/boot/dts/freescale/imx8ulp-pinfunc.h | 0
+ arch/arm64/boot/dts/freescale/imx8ulp.dtsi | 65 +-
+ arch/arm64/boot/dts/freescale/imx93.dtsi | 206 ++++-
+ drivers/soc/imx/Kconfig | 8 +
+ drivers/soc/imx/Makefile | 2 +
+ drivers/soc/imx/imx8m-blk-ctrl.c | 96 ++-
+ drivers/soc/imx/imx8mp-blk-ctrl.c | 89 ++-
+ drivers/soc/imx/imx93-blk-ctrl.c | 436 ++++++++++
+ drivers/soc/imx/imx93-pd.c | 164 ++++
+ drivers/soc/imx/imx93-src.c | 33 +
+ include/dt-bindings/clock/imx8mm-clock.h | 1 -
+ include/dt-bindings/firmware/imx/rsrc.h | 7 +
+ include/dt-bindings/power/fsl,imx93-power.h | 15 +
+ include/dt-bindings/power/imx8mp-power.h | 6 +
+ 151 files changed, 5855 insertions(+), 575 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/soc/imx/fsl,imx93-media-blk-ctrl.yaml
+ create mode 100644 Documentation/devicetree/bindings/soc/imx/fsl,imx93-src.yaml
+ rename arch/arm/boot/dts/{imx6ul-kontron-n6310-s-43.dts => imx6ul-kontron-bl-43.dts} (93%)
+ rename arch/arm/boot/dts/{imx6ul-kontron-n6x1x-s.dtsi => imx6ul-kontron-bl-common.dtsi} (100%)
+ rename arch/arm/boot/dts/{imx6ul-kontron-n6310-s.dts => imx6ul-kontron-bl.dts} (52%)
+ delete mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi
+ delete mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts
+ delete mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi
+ rename arch/arm/boot/dts/{imx6ul-kontron-n6x1x-som-common.dtsi => imx6ul-kontron-sl-common.dtsi} (90%)
+ create mode 100644 arch/arm/boot/dts/imx6ul-kontron-sl.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ull-kontron-bl.dts
+ delete mode 100644 arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts
+ delete mode 100644 arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ull-kontron-sl.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8dxl-evk.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8dxl-ss-adma.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8dxl-ss-conn.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8dxl-ss-ddr.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8dxl-ss-lsio.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8dxl.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-kontron-bl-osm-s.dts
+ rename arch/arm64/boot/dts/freescale/{imx8mm-kontron-n801x-s.dts => imx8mm-kontron-bl.dts} (96%)
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-kontron-osm-s.dtsi
+ rename arch/arm64/boot/dts/freescale/{imx8mm-kontron-n801x-som.dtsi => imx8mm-kontron-sl.dtsi} (87%)
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw7904.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-msc-sm2s-14N0600E.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-msc-sm2s-ep1.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-msc-sm2s.dtsi
+ mode change 100755 => 100644 arch/arm64/boot/dts/freescale/imx8ulp-pinfunc.h
+ create mode 100644 drivers/soc/imx/imx93-blk-ctrl.c
+ create mode 100644 drivers/soc/imx/imx93-pd.c
+ create mode 100644 drivers/soc/imx/imx93-src.c
+ create mode 100644 include/dt-bindings/power/fsl,imx93-power.h
+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 (05980182ed25 Merge branch 'v6.0-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.
+ .../bindings/power/mediatek,power-controller.yaml | 135 +--
+ .../bindings/soc/mediatek/mediatek,mutex.yaml | 2 +
+ .../devicetree/bindings/soc/mediatek/pwrap.txt | 1 +
+ arch/arm64/boot/dts/mediatek/Makefile | 1 +
+ arch/arm64/boot/dts/mediatek/mt6795.dtsi | 8 +
+ arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 38 +
+ arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 23 +
+ arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 40 +
+ arch/arm64/boot/dts/mediatek/mt8167.dtsi | 3 +-
+ arch/arm64/boot/dts/mediatek/mt8173.dtsi | 7 +-
+ arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts | 21 +
+ arch/arm64/boot/dts/mediatek/mt8183.dtsi | 75 +-
+ arch/arm64/boot/dts/mediatek/mt8186-evb.dts | 220 ++++
+ arch/arm64/boot/dts/mediatek/mt8186.dtsi | 819 +++++++++++++++
+ arch/arm64/boot/dts/mediatek/mt8192.dtsi | 200 +++-
+ arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 256 +++++
+ arch/arm64/boot/dts/mediatek/mt8195.dtsi | 1072 +++++++++++++++++++-
+ drivers/soc/mediatek/Kconfig | 2 +
+ drivers/soc/mediatek/mtk-mutex.c | 44 +
+ drivers/soc/mediatek/mtk-pm-domains.c | 6 +-
+ drivers/soc/mediatek/mtk-pmic-wrap.c | 2 +-
+ drivers/soc/mediatek/mtk-scpsys.c | 2 +-
+ drivers/soc/mediatek/mtk-svs.c | 284 +++---
+ include/linux/soc/mediatek/mtk-mutex.h | 2 +
+ 24 files changed, 3011 insertions(+), 252 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-evb.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8186.dtsi
+Merging mvebu/for-next (74de3ae81a42 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
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Merge made by the 'ort' strategy.
+ .../bindings/arm/marvell/armada-37xx.txt | 26 ----
+ .../bindings/arm/marvell/armada-37xx.yaml | 47 ++++++
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ arch/arm/boot/dts/armada-370.dtsi | 28 +++-
+ arch/arm/boot/dts/armada-375.dtsi | 28 +++-
+ arch/arm/boot/dts/armada-380.dtsi | 42 +++++-
+ arch/arm/boot/dts/armada-385-turris-omnia.dts | 4 +-
+ arch/arm/boot/dts/armada-38x.dtsi | 2 +
+ arch/arm/boot/dts/armada-39x.dtsi | 56 ++++++--
+ arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 14 +-
+ arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 2 +-
+ arch/arm/boot/dts/armada-xp-mv78230.dtsi | 70 +++++++--
+ arch/arm/boot/dts/armada-xp-mv78260.dtsi | 126 +++++++++++++---
+ arch/arm/boot/dts/armada-xp-mv78460.dtsi | 140 +++++++++++++++---
+ arch/arm/boot/dts/dove.dtsi | 28 +++-
+ arch/arm/boot/dts/kirkwood-6192.dtsi | 14 +-
+ arch/arm/boot/dts/kirkwood-6281.dtsi | 14 +-
+ arch/arm/boot/dts/kirkwood-6282.dtsi | 28 +++-
+ arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 14 +-
+ arch/arm/boot/dts/kirkwood-lsxl.dtsi | 16 +--
+ arch/arm64/boot/dts/marvell/Makefile | 1 +
+ arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 38 ++++-
+ arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts | 14 ++
+ .../dts/marvell/armada-3720-espressobin-ultra.dts | 4 +-
+ arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 155 +-------------------
+ arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi | 160 +++++++++++++++++++++
+ 26 files changed, 788 insertions(+), 285 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-37xx.yaml
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi
+Merging omap/for-next (8efe5dea6753 Merge branch 'omap-for-v6.1/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
+Merge made by the 'ort' strategy.
+ arch/arm/boot/dts/am335x-baltos-ir2110.dts | 144 +++++++++++++++++++++++++
+ arch/arm/boot/dts/am335x-baltos-ir3220.dts | 148 +++++++++++++++++++++++++
+ arch/arm/boot/dts/am335x-baltos-ir5221.dts | 148 +++++++++++++++++++++++++
+ arch/arm/boot/dts/am335x-baltos.dtsi | 2 +-
+ arch/arm/boot/dts/am335x-netcan-plus-1xx.dts | 144 +++++++++++++++++++++++++
+ arch/arm/boot/dts/am335x-netcom-plus-2xx.dts | 144 +++++++++++++++++++++++++
+ arch/arm/boot/dts/am335x-netcom-plus-8xx.dts | 156 +++++++++++++++++++++++++++
+ arch/arm/mach-omap1/Kconfig | 22 ++--
+ arch/arm/mach-omap1/timer.c | 2 +-
+ arch/arm/mach-omap2/omap4-common.c | 1 +
+ drivers/bus/ti-sysc.c | 3 +
+ 11 files changed, 901 insertions(+), 13 deletions(-)
+Merging qcom/for-next (49a649b9cbf3 Merge branches 'arm64-defconfig-for-6.1', 'arm64-for-6.1', 'clk-for-6.1', 'defconfig-for-6.1', 'drivers-for-6.1', 'dts-for-6.1' and 'arm64-fixes-for-6.0' 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 .mailmap
+Auto-merging Documentation/devicetree/bindings/power/qcom,rpmpd.yaml
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Auto-merging arch/arm/configs/qcom_defconfig
+Auto-merging arch/arm64/configs/defconfig
+Merge made by the 'ort' strategy.
+ .mailmap | 3 +
+ Documentation/devicetree/bindings/arm/qcom.yaml | 21 +
+ .../bindings/clock/qcom,gcc-apq8064.yaml | 9 +
+ .../bindings/clock/qcom,gcc-msm8660.yaml | 54 +
+ .../bindings/clock/qcom,gcc-msm8909.yaml | 58 +
+ .../bindings/clock/qcom,gcc-msm8916.yaml | 61 +
+ .../bindings/clock/qcom,gcc-msm8976.yaml | 21 +-
+ .../bindings/clock/qcom,gcc-msm8994.yaml | 21 +-
+ .../bindings/clock/qcom,gcc-msm8996.yaml | 25 +-
+ .../bindings/clock/qcom,gcc-msm8998.yaml | 25 +-
+ .../devicetree/bindings/clock/qcom,gcc-other.yaml | 4 -
+ .../bindings/clock/qcom,gcc-qcm2290.yaml | 25 +-
+ .../devicetree/bindings/clock/qcom,gcc-sc7180.yaml | 25 +-
+ .../devicetree/bindings/clock/qcom,gcc-sc7280.yaml | 21 +-
+ .../bindings/clock/qcom,gcc-sc8180x.yaml | 25 +-
+ .../bindings/clock/qcom,gcc-sc8280xp.yaml | 21 +-
+ .../devicetree/bindings/clock/qcom,gcc-sdm845.yaml | 84 +-
+ .../devicetree/bindings/clock/qcom,gcc-sdx55.yaml | 21 +-
+ .../devicetree/bindings/clock/qcom,gcc-sdx65.yaml | 21 +-
+ .../devicetree/bindings/clock/qcom,gcc-sm6115.yaml | 25 +-
+ .../devicetree/bindings/clock/qcom,gcc-sm6125.yaml | 25 +-
+ .../devicetree/bindings/clock/qcom,gcc-sm6350.yaml | 25 +-
+ .../devicetree/bindings/clock/qcom,gcc-sm8150.yaml | 25 +-
+ .../devicetree/bindings/clock/qcom,gcc-sm8250.yaml | 25 +-
+ .../devicetree/bindings/clock/qcom,gcc-sm8350.yaml | 21 +-
+ .../devicetree/bindings/clock/qcom,gcc-sm8450.yaml | 21 +-
+ .../devicetree/bindings/clock/qcom,mmcc.yaml | 209 +-
+ .../devicetree/bindings/clock/qcom,rpmcc.yaml | 1 +
+ .../bindings/clock/qcom,sc7280-lpasscc.yaml | 6 +-
+ .../bindings/clock/qcom,sc7280-lpasscorecc.yaml | 26 +-
+ .../devicetree/bindings/firmware/qcom,scm.txt | 61 -
+ .../devicetree/bindings/firmware/qcom,scm.yaml | 148 ++
+ .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 3 +
+ .../devicetree/bindings/mfd/qcom,tcsr.yaml | 8 +
+ .../devicetree/bindings/pci/qcom,pcie.yaml | 10 +-
+ .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 +
+ .../devicetree/bindings/soc/qcom/qcom-stats.yaml | 1 +
+ MAINTAINERS | 13 +-
+ arch/arm/boot/dts/Makefile | 3 +
+ arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts | 6 +
+ arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts | 13 +
+ arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 71 +-
+ arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 2 +-
+ arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 2 +-
+ arch/arm/boot/dts/qcom-apq8064.dtsi | 37 +-
+ arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 3 +-
+ arch/arm/boot/dts/qcom-apq8084.dtsi | 32 +-
+ arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi | 3 +-
+ arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi | 4 +-
+ arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1-c1.dts | 5 +-
+ arch/arm/boot/dts/qcom-ipq4019.dtsi | 7 +-
+ arch/arm/boot/dts/qcom-ipq8062-smb208.dtsi | 37 +
+ arch/arm/boot/dts/qcom-ipq8062.dtsi | 8 +
+ arch/arm/boot/dts/qcom-ipq8064-v2.0-smb208.dtsi | 37 +
+ arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi | 69 +
+ arch/arm/boot/dts/qcom-ipq8064.dtsi | 773 +++---
+ arch/arm/boot/dts/qcom-ipq8065-smb208.dtsi | 37 +
+ arch/arm/boot/dts/qcom-ipq8065.dtsi | 8 +
+ arch/arm/boot/dts/qcom-msm8226-samsung-s3ve3g.dts | 6 +-
+ arch/arm/boot/dts/qcom-msm8226.dtsi | 103 +-
+ arch/arm/boot/dts/qcom-msm8660-surf.dts | 57 +-
+ arch/arm/boot/dts/qcom-msm8660.dtsi | 62 +-
+ arch/arm/boot/dts/qcom-msm8916-samsung-e5.dts | 3 +
+ arch/arm/boot/dts/qcom-msm8916-samsung-e7.dts | 3 +
+ .../arm/boot/dts/qcom-msm8916-samsung-grandmax.dts | 3 +
+ arch/arm/boot/dts/qcom-msm8960-cdp.dts | 623 +++--
+ arch/arm/boot/dts/qcom-msm8960.dtsi | 45 +-
+ .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 2 +-
+ arch/arm/boot/dts/qcom-msm8974.dtsi | 29 +-
+ arch/arm/boot/dts/qcom-msm8974pro.dtsi | 6 +-
+ arch/arm/boot/dts/qcom-pm8941.dtsi | 4 +-
+ arch/arm/boot/dts/qcom-pma8084.dtsi | 2 +-
+ arch/arm/boot/dts/qcom-pmx55.dtsi | 2 +-
+ arch/arm/boot/dts/qcom-sdx65.dtsi | 2 +-
+ arch/arm/configs/multi_v7_defconfig | 4 +
+ arch/arm/configs/qcom_defconfig | 4 +
+ arch/arm64/boot/dts/qcom/Makefile | 7 +
+ arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 11 +-
+ arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 2 +-
+ arch/arm64/boot/dts/qcom/ipq6018.dtsi | 15 +-
+ arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 4 +-
+ arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi | 4 +-
+ arch/arm64/boot/dts/qcom/ipq8074.dtsi | 6 +-
+ .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 4 +-
+ .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 4 +-
+ .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 2 +-
+ .../dts/qcom/msm8916-samsung-e2015-common.dtsi | 85 +
+ arch/arm64/boot/dts/qcom/msm8916-samsung-e5.dts | 24 +
+ arch/arm64/boot/dts/qcom/msm8916-samsung-e7.dts | 29 +
+ .../boot/dts/qcom/msm8916-samsung-grandmax.dts | 60 +
+ .../boot/dts/qcom/msm8916-samsung-serranove.dts | 9 +
+ arch/arm64/boot/dts/qcom/msm8916.dtsi | 18 +-
+ arch/arm64/boot/dts/qcom/msm8953.dtsi | 6 +-
+ arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 2 +-
+ .../boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 2 +-
+ .../dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/msm8994.dtsi | 20 +-
+ .../boot/dts/qcom/msm8996-sony-xperia-tone.dtsi | 4 +-
+ .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 52 +
+ arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 5 +-
+ .../arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts | 33 +-
+ arch/arm64/boot/dts/qcom/msm8996.dtsi | 41 +-
+ arch/arm64/boot/dts/qcom/msm8998.dtsi | 24 +-
+ arch/arm64/boot/dts/qcom/pm6150l.dtsi | 19 +
+ arch/arm64/boot/dts/qcom/pm660.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/pm660l.dtsi | 4 +-
+ arch/arm64/boot/dts/qcom/pm7250b.dtsi | 149 ++
+ arch/arm64/boot/dts/qcom/pm8150.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/pm8150b.dtsi | 4 +-
+ arch/arm64/boot/dts/qcom/pm8150l.dtsi | 4 +-
+ arch/arm64/boot/dts/qcom/pm8350c.dtsi | 3 +-
+ arch/arm64/boot/dts/qcom/pm8953.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/pm8994.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/pmi8994.dtsi | 4 +-
+ arch/arm64/boot/dts/qcom/pmi8998.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/pmk8350.dtsi | 3 -
+ arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/pmm8155au_2.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/qcs404.dtsi | 15 +-
+ arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 3 -
+ arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 23 +-
+ .../boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 2 -
+ .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 19 +-
+ .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 12 +-
+ arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 2 -
+ .../dts/qcom/sc7180-trogdor-pazquel-lte-parade.dts | 2 +-
+ .../boot/dts/qcom/sc7180-trogdor-pompom-r1.dts | 11 +-
+ arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 19 +-
+ arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 20 +-
+ arch/arm64/boot/dts/qcom/sc7180.dtsi | 26 +-
+ arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 11 -
+ arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts | 37 +
+ .../dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi | 155 ++
+ arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts | 7 +-
+ .../boot/dts/qcom/sc7280-herobrine-evoker-r0.dts | 333 +++
+ .../dts/qcom/sc7280-herobrine-herobrine-r1.dts | 1 +
+ .../boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi | 17 +
+ .../boot/dts/qcom/sc7280-herobrine-villager-r0.dts | 325 +--
+ .../dts/qcom/sc7280-herobrine-villager-r1-lte.dts | 14 +
+ .../boot/dts/qcom/sc7280-herobrine-villager-r1.dts | 43 +
+ .../boot/dts/qcom/sc7280-herobrine-villager.dtsi | 326 +++
+ arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 87 +-
+ arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi | 8 +-
+ arch/arm64/boot/dts/qcom/sc7280-idp.dts | 3 +-
+ arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 240 +-
+ arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 88 +-
+ arch/arm64/boot/dts/qcom/sc7280.dtsi | 634 +++--
+ arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 31 +-
+ .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 52 +-
+ arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 3 +-
+ arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 4 +
+ arch/arm64/boot/dts/qcom/sdm630.dtsi | 18 +-
+ arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 16 +-
+ arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 12 +-
+ .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 2 +-
+ arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 8 +-
+ arch/arm64/boot/dts/qcom/sdm845.dtsi | 66 +-
+ .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 2 +-
+ arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 2 +-
+ .../dts/qcom/sm6125-sony-xperia-seine-pdx201.dts | 4 +-
+ arch/arm64/boot/dts/qcom/sm6125.dtsi | 10 +-
+ arch/arm64/boot/dts/qcom/sm6350.dtsi | 182 +-
+ arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 67 +
+ arch/arm64/boot/dts/qcom/sm8150.dtsi | 42 +-
+ arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 2 +-
+ arch/arm64/boot/dts/qcom/sm8250.dtsi | 56 +-
+ .../boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 4 +-
+ arch/arm64/boot/dts/qcom/sm8350.dtsi | 44 +-
+ .../dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts | 634 +++++
+ arch/arm64/boot/dts/qcom/sm8450.dtsi | 233 +-
+ arch/arm64/configs/defconfig | 6 +
+ drivers/clk/qcom/Kconfig | 13 +-
+ drivers/clk/qcom/Makefile | 1 +
+ drivers/clk/qcom/a53-pll.c | 4 +-
+ drivers/clk/qcom/clk-rpmh.c | 4 -
+ drivers/clk/qcom/clk-smd-rpm.c | 37 +-
+ drivers/clk/qcom/gcc-msm8660.c | 330 ++-
+ drivers/clk/qcom/gcc-msm8909.c | 2731 ++++++++++++++++++++
+ drivers/clk/qcom/gcc-msm8916.c | 1020 ++++----
+ drivers/clk/qcom/gcc-msm8960.c | 436 ++--
+ drivers/clk/qcom/gcc-sc8280xp.c | 21 +-
+ drivers/clk/qcom/gcc-sdm660.c | 2 +-
+ drivers/clk/qcom/gcc-sdm845.c | 400 ++-
+ drivers/clk/qcom/lcc-msm8960.c | 211 +-
+ drivers/clk/qcom/lpassaudiocc-sc7280.c | 68 +-
+ drivers/clk/qcom/lpasscc-sc7280.c | 44 -
+ drivers/clk/qcom/lpasscorecc-sc7280.c | 33 +
+ drivers/clk/qcom/mmcc-msm8960.c | 454 ++--
+ drivers/clk/qcom/reset.c | 4 +-
+ drivers/clk/qcom/reset.h | 1 +
+ drivers/firmware/qcom_scm.h | 2 -
+ drivers/soc/qcom/Kconfig | 2 +-
+ drivers/soc/qcom/icc-bwmon.c | 479 +++-
+ drivers/soc/qcom/llcc-qcom.c | 92 +-
+ drivers/soc/qcom/qcom_stats.c | 9 +
+ drivers/soc/qcom/qmi_encdec.c | 50 +-
+ drivers/soc/qcom/qmi_interface.c | 12 +-
+ drivers/soc/qcom/rpmpd.c | 22 +
+ drivers/soc/qcom/smem_state.c | 3 +-
+ drivers/soc/qcom/smsm.c | 20 +-
+ drivers/soc/qcom/socinfo.c | 2 +
+ include/dt-bindings/clock/qcom,gcc-msm8909.h | 218 ++
+ include/dt-bindings/clock/qcom,gcc-sdm845.h | 1 +
+ .../dt-bindings/clock/qcom,lpassaudiocc-sc7280.h | 5 +
+ .../dt-bindings/clock/qcom,lpasscorecc-sc7280.h | 2 +
+ include/dt-bindings/power/qcom-rpmpd.h | 12 +
+ include/linux/soc/qcom/llcc-qcom.h | 30 +
+ include/linux/soc/qcom/qmi.h | 20 +-
+ samples/qmi/qmi_sample_client.c | 10 +-
+ 210 files changed, 11110 insertions(+), 3675 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-msm8660.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-msm8909.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-msm8916.yaml
+ delete mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt
+ create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.yaml
+ create mode 100644 arch/arm/boot/dts/qcom-ipq8062-smb208.dtsi
+ create mode 100644 arch/arm/boot/dts/qcom-ipq8062.dtsi
+ create mode 100644 arch/arm/boot/dts/qcom-ipq8064-v2.0-smb208.dtsi
+ create mode 100644 arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi
+ create mode 100644 arch/arm/boot/dts/qcom-ipq8065-smb208.dtsi
+ create mode 100644 arch/arm/boot/dts/qcom-ipq8065.dtsi
+ create mode 100644 arch/arm/boot/dts/qcom-msm8916-samsung-e5.dts
+ create mode 100644 arch/arm/boot/dts/qcom-msm8916-samsung-e7.dts
+ create mode 100644 arch/arm/boot/dts/qcom-msm8916-samsung-grandmax.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-e5.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-e7.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/pm7250b.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-r0.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1-lte.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-villager.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts
+ create mode 100644 drivers/clk/qcom/gcc-msm8909.c
+ create mode 100644 include/dt-bindings/clock/qcom,gcc-msm8909.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
+Auto-merging arch/arm/boot/dts/bcm2711-rpi-400.dts
+Merge made by the 'ort' strategy.
+Merging renesas/next (3319a5eda420 Merge branch 'renesas-arm-dt-for-v6.1' 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
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 35 +++++++++--------------------
+ arch/arm/boot/dts/r9a06g032-rzn1d400-db.dts | 28 +++++++++++++++++++++++
+ arch/arm/boot/dts/r9a06g032.dtsi | 20 +++++++++++++++++
+ 3 files changed, 59 insertions(+), 24 deletions(-)
+Merging reset/reset/next (d985db836226 reset: tps380x: Fix spelling mistake "Voltags" -> "Voltage")
+$ 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 (875e259a8a86 Merge branch 'v6.1-armsoc/dts64' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next
+Auto-merging arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts
+Auto-merging arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
+Auto-merging arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/rockchip.yaml | 27 ++++++++++-
+ .../devicetree/bindings/arm/rockchip/pmu.yaml | 2 +
+ .../devicetree/bindings/soc/rockchip/grf.yaml | 4 ++
+ .../boot/dts/rockchip/rk3399-gru-scarlet-inx.dts | 14 +++++-
+ arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 6 ++-
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 +-
+ arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 52 ++++++++++++++++++++++
+ drivers/clk/rockchip/clk.c | 27 ++++++++---
+ drivers/clk/rockchip/clk.h | 17 +++++++
+ 9 files changed, 141 insertions(+), 12 deletions(-)
+Merging samsung-krzk/for-next (37ff5e2f7bd2 Merge branch 'next/drivers' 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 MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 2 +
+ drivers/clk/samsung/clk-exynos-clkout.c | 6 +-
+ drivers/clk/samsung/clk-exynos7885.c | 207 +++++++++-
+ drivers/clk/samsung/clk-exynos850.c | 682 +++++++++++++++++++++++++++++++-
+ drivers/clk/samsung/clk-exynosautov9.c | 401 ++++++++++++++++++-
+ 5 files changed, 1274 insertions(+), 24 deletions(-)
+Merging scmi/for-linux-next (1f3a176f26cc Merge tag 'ffa-updates-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
+$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next
+Merge made by the 'ort' strategy.
+Merging stm32/stm32-next (400a100c28fe ARM: dts: stm32: argon: remove spidev node)
+$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next
+Auto-merging arch/arm/boot/dts/stm32mp131.dtsi
+Merge made by the 'ort' strategy.
+ arch/arm/boot/dts/stm32mp131.dtsi | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging sunxi/sunxi/for-next (ebb11236fe25 Merge branch 'sunxi/drivers-fixes-for-6.0' 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
+Auto-merging arch/arm64/configs/defconfig
+Merge made by the 'ort' strategy.
+ arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi | 24 ++++++
+ .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 1 +
+ .../boot/dts/allwinner/sun50i-h6-gpu-opp.dtsi | 87 ++++++++++++++++++++++
+ arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 51 ++++++++++++-
+ arch/arm64/configs/defconfig | 1 +
+ drivers/clk/sunxi-ng/ccu-sun20i-d1.c | 8 ++
+ drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 28 +++----
+ drivers/clk/sunxi-ng/ccu-sun9i-a80-de.c | 19 ++---
+ drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c | 9 +--
+ drivers/soc/sunxi/sunxi_sram.c | 23 +++---
+ 10 files changed, 198 insertions(+), 53 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-gpu-opp.dtsi
+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 (761c03270244 Merge branch for-6.1/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 arch/arm64/configs/defconfig
+Merge made by the 'ort' strategy.
+ .../bindings/net/nvidia,tegra234-mgbe.yaml | 162 ++
+ arch/arm64/boot/dts/nvidia/tegra186.dtsi | 49 +-
+ arch/arm64/boot/dts/nvidia/tegra194.dtsi | 49 +-
+ arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 36 +
+ .../arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi | 36 +
+ .../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 73 +
+ arch/arm64/boot/dts/nvidia/tegra234.dtsi | 1115 ++++++++-
+ arch/arm64/configs/defconfig | 5 +-
+ drivers/firmware/tegra/bpmp-debugfs.c | 13 +-
+ drivers/soc/tegra/Kconfig | 10 +-
+ drivers/soc/tegra/Makefile | 1 +
+ drivers/soc/tegra/cbb/Makefile | 9 +
+ drivers/soc/tegra/cbb/tegra-cbb.c | 190 ++
+ drivers/soc/tegra/cbb/tegra194-cbb.c | 2364 ++++++++++++++++++++
+ drivers/soc/tegra/cbb/tegra234-cbb.c | 1113 +++++++++
+ drivers/soc/tegra/fuse/fuse-tegra.c | 1 +
+ drivers/soc/tegra/fuse/tegra-apbmisc.c | 36 +-
+ drivers/soc/tegra/pmc.c | 45 +-
+ include/dt-bindings/memory/tegra234-mc.h | 10 +
+ include/soc/tegra/fuse.h | 6 +
+ include/soc/tegra/tegra-cbb.h | 47 +
+ 21 files changed, 5322 insertions(+), 48 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/nvidia,tegra234-mgbe.yaml
+ create mode 100644 drivers/soc/tegra/cbb/Makefile
+ create mode 100644 drivers/soc/tegra/cbb/tegra-cbb.c
+ create mode 100644 drivers/soc/tegra/cbb/tegra194-cbb.c
+ create mode 100644 drivers/soc/tegra/cbb/tegra234-cbb.c
+ create mode 100644 include/soc/tegra/tegra-cbb.h
+Merging ti/ti-next (acf3fdc88665 arm64: dts: ti: k3-am625-sk: Add epwm nodes)
+$ 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.
+ Documentation/devicetree/bindings/arm/ti/k3.yaml | 48 ++++++-------
+ arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 33 +++++++++
+ arch/arm64/boot/dts/ti/k3-am625-sk.dts | 12 ++++
+ arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 50 +++++++++++++-
+ arch/arm64/boot/dts/ti/k3-am64.dtsi | 1 +
+ arch/arm64/boot/dts/ti/k3-am642-evm.dts | 8 +++
+ arch/arm64/boot/dts/ti/k3-am642-sk.dts | 85 ++++++++++++++++++++++++
+ arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 7 +-
+ arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 18 +++++
+ arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 20 ++++++
+ arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 2 +-
+ 11 files changed, 255 insertions(+), 29 deletions(-)
+Merging xilinx/for-next (0413dd4d95da ARM: dts: zynq: add QSPI controller node)
+$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next
+Merge made by the 'ort' strategy.
+ arch/arm/boot/dts/zynq-7000.dtsi | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+Merging clk/clk-next (de86412dc79f Merge branch 'clk-fixes' 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 MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../bindings/clock/cirrus,cs2000-cp.yaml | 1 -
+ .../devicetree/bindings/clock/gpio-gate-clock.txt | 21 ----
+ .../devicetree/bindings/clock/gpio-gate-clock.yaml | 42 ++++++++
+ .../devicetree/bindings/clock/idt,versaclock5.yaml | 4 +-
+ .../clock/renesas,rcar-usb2-clock-sel.yaml | 2 -
+ .../devicetree/bindings/clock/samsung,s2mps11.yaml | 1 -
+ .../devicetree/bindings/clock/ti/gate.txt | 2 +-
+ .../devicetree/bindings/clock/ti/interface.txt | 2 +-
+ .../bindings/clock/xlnx,clocking-wizard.yaml | 77 +++++++++++++++
+ .../devicetree/bindings/mfd/cirrus,lochnagar.yaml | 2 +-
+ MAINTAINERS | 2 +-
+ .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 2 +-
+ .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 2 +-
+ drivers/clk/at91/dt-compat.c | 108 ++++++++++++++++-----
+ drivers/clk/berlin/bg2.c | 5 +-
+ drivers/clk/berlin/bg2q.c | 6 +-
+ drivers/clk/clk-lochnagar.c | 2 +-
+ drivers/clk/clk-nomadik.c | 5 +-
+ drivers/clk/clk-oxnas.c | 6 +-
+ drivers/clk/clk-qoriq.c | 10 +-
+ drivers/clk/clk-versaclock5.c | 2 +-
+ drivers/clk/clk.c | 5 +-
+ drivers/clk/clkdev.c | 2 +-
+ drivers/clk/davinci/Makefile | 4 -
+ drivers/clk/davinci/pll-dm644x.c | 81 ----------------
+ drivers/clk/davinci/pll-dm646x.c | 85 ----------------
+ drivers/clk/davinci/pll.c | 8 --
+ drivers/clk/davinci/pll.h | 6 --
+ drivers/clk/davinci/psc-dm644x.c | 85 ----------------
+ drivers/clk/davinci/psc-dm646x.c | 82 ----------------
+ drivers/clk/davinci/psc.c | 6 --
+ drivers/clk/davinci/psc.h | 6 --
+ drivers/clk/ingenic/tcu.c | 15 +--
+ drivers/clk/mediatek/clk-mt8195-infra_ao.c | 16 ++-
+ drivers/clk/mediatek/clk-mt8195-vdo0.c | 7 +-
+ drivers/clk/mediatek/clk-mt8195-vdo1.c | 6 +-
+ drivers/clk/meson/meson-aoclk.c | 5 +-
+ drivers/clk/meson/meson-eeclk.c | 5 +-
+ drivers/clk/meson/meson8b.c | 5 +-
+ drivers/clk/mvebu/dove-divider.c | 2 +-
+ drivers/clk/sprd/common.c | 9 +-
+ drivers/clk/st/clkgen-fsyn.c | 5 +-
+ drivers/clk/st/clkgen-mux.c | 5 +-
+ drivers/clk/tegra/clk-bpmp.c | 2 +-
+ drivers/clk/tegra/clk-tegra114.c | 1 +
+ drivers/clk/tegra/clk-tegra124.c | 1 +
+ drivers/clk/tegra/clk-tegra20.c | 1 +
+ drivers/clk/tegra/clk-tegra210.c | 1 +
+ drivers/clk/tegra/clk-tegra30.c | 1 +
+ drivers/clk/xilinx/Kconfig | 11 +++
+ drivers/clk/xilinx/Makefile | 1 +
+ .../xilinx}/clk-xlnx-clock-wizard.c | 19 +++-
+ drivers/clk/zynqmp/clkc.c | 19 +++-
+ drivers/clk/zynqmp/divider.c | 9 +-
+ drivers/clk/zynqmp/pll.c | 31 +++---
+ drivers/staging/Kconfig | 2 -
+ drivers/staging/Makefile | 1 -
+ drivers/staging/clocking-wizard/Kconfig | 10 --
+ drivers/staging/clocking-wizard/Makefile | 2 -
+ drivers/staging/clocking-wizard/TODO | 13 ---
+ drivers/staging/clocking-wizard/dt-binding.txt | 30 ------
+ include/dt-bindings/{clk => clock}/lochnagar.h | 0
+ include/dt-bindings/{clk => clock}/versaclock.h | 0
+ include/dt-bindings/reset/mt8195-resets.h | 3 +
+ include/linux/clk/davinci.h | 8 --
+ 65 files changed, 367 insertions(+), 553 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/clock/gpio-gate-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/gpio-gate-clock.yaml
+ create mode 100644 Documentation/devicetree/bindings/clock/xlnx,clocking-wizard.yaml
+ delete mode 100644 drivers/clk/davinci/pll-dm644x.c
+ delete mode 100644 drivers/clk/davinci/pll-dm646x.c
+ delete mode 100644 drivers/clk/davinci/psc-dm644x.c
+ delete mode 100644 drivers/clk/davinci/psc-dm646x.c
+ rename drivers/{staging/clocking-wizard => clk/xilinx}/clk-xlnx-clock-wizard.c (96%)
+ delete mode 100644 drivers/staging/clocking-wizard/Kconfig
+ delete mode 100644 drivers/staging/clocking-wizard/Makefile
+ delete mode 100644 drivers/staging/clocking-wizard/TODO
+ delete mode 100644 drivers/staging/clocking-wizard/dt-binding.txt
+ rename include/dt-bindings/{clk => clock}/lochnagar.h (100%)
+ rename include/dt-bindings/{clk => clock}/versaclock.h (100%)
+Merging clk-imx/for-next (9dfb5937c56b clk: imx93: add SAI IPG clk)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next
+Merge made by the 'ort' strategy.
+ drivers/clk/imx/Makefile | 1 +
+ drivers/clk/imx/clk-composite-93.c | 171 ++++++++++++++++++++++++++-
+ drivers/clk/imx/clk-gate-93.c | 199 ++++++++++++++++++++++++++++++++
+ drivers/clk/imx/clk-imx8mp.c | 2 +-
+ drivers/clk/imx/clk-imx93.c | 30 +++--
+ drivers/clk/imx/clk.h | 9 +-
+ include/dt-bindings/clock/imx93-clock.h | 9 +-
+ 7 files changed, 402 insertions(+), 19 deletions(-)
+ create mode 100644 drivers/clk/imx/clk-gate-93.c
+Merging clk-renesas/renesas-clk (e312ae92077f dt-bindings: clock: renesas,rzg2l: Document RZ/Five SoC)
+$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk
+Merge made by the 'ort' strategy.
+ .../bindings/clock/renesas,rzg2l-cpg.yaml | 2 +-
+ drivers/clk/renesas/r8a779f0-cpg-mssr.c | 21 ++++++++++++++++++++-
+ drivers/clk/renesas/r9a07g044-cpg.c | 2 ++
+ drivers/clk/renesas/r9a09g011-cpg.c | 4 ++++
+ 4 files changed, 27 insertions(+), 2 deletions(-)
+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 (45fef4c4b9c9 csky: abiv1: Fixup compile error)
+$ 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 (b90cb1053190 Linux 6.0-rc3)
+$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next
+Already up to date.
+Merging m68k/for-next (feb159347bb0 m68k: Allow kexec on M68KCLASSIC with MMU enabled only)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next
+Merge made by the 'ort' strategy.
+ arch/m68k/Kconfig | 2 +-
+ arch/m68k/kernel/setup_mm.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging m68knommu/for-next (9ad3a9ca3510 m68knommu: fix non-mmu classic 68000 legacy timer tick selection)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next
+Merge made by the 'ort' strategy.
+ arch/m68k/68000/ints.c | 6 +++---
+ arch/m68k/Kconfig.cpu | 4 +---
+ 2 files changed, 4 insertions(+), 6 deletions(-)
+Merging microblaze/next (568035b01cfb Linux 6.0-rc1)
+$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next
+Already up to date.
+Merging mips/mips-next (0153682e9e6a MIPS: dts: lantiq: rename dts files with soc name being the prefix)
+$ 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/boot/dts/lantiq/Makefile | 2 +-
+ arch/mips/boot/dts/lantiq/{easy50712.dts => danube_easy50712.dts} | 0
+ arch/mips/cavium-octeon/setup.c | 2 +-
+ arch/mips/kernel/prom.c | 6 +++---
+ arch/mips/kernel/relocate.c | 2 +-
+ arch/mips/math-emu/cp1emu.c | 2 +-
+ arch/mips/pci/pci-ar2315.c | 2 +-
+ arch/mips/pic32/pic32mzda/init.c | 2 +-
+ 8 files changed, 9 insertions(+), 9 deletions(-)
+ rename arch/mips/boot/dts/lantiq/{easy50712.dts => danube_easy50712.dts} (100%)
+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 (52e0ea900202 openrisc: io: Define iounmap argument as volatile)
+$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next
+Already up to date.
+Merging parisc-hd/for-next (805ce8614958 parisc: Allow CONFIG_64BIT with ARCH=parisc)
+$ 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/Kconfig | 12 +++++++++++-
+ drivers/parisc/ccio-dma.c | 1 +
+ drivers/parisc/iosapic.c | 11 +----------
+ include/linux/hp_sdc.h | 2 +-
+ tools/include/uapi/asm/errno.h | 4 ++--
+ 5 files changed, 16 insertions(+), 14 deletions(-)
+Merging powerpc/next (78c73c80fd86 powerpc/math-emu: Inhibit W=1 warnings)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 6 +-
+ Documentation/powerpc/isa-versions.rst | 8 +
+ arch/powerpc/boot/44x.h | 5 +-
+ arch/powerpc/boot/4xx.h | 5 +-
+ arch/powerpc/boot/dts/mgcoge.dts | 7 -
+ arch/powerpc/boot/dummy.c | 4 -
+ arch/powerpc/boot/ops.h | 6 +-
+ arch/powerpc/boot/serial.c | 6 +-
+ arch/powerpc/boot/simple_alloc.c | 6 +-
+ arch/powerpc/configs/microwatt_defconfig | 5 +
+ arch/powerpc/configs/ppc64_defconfig | 2 +
+ arch/powerpc/configs/pseries_defconfig | 3 +
+ arch/powerpc/include/asm/asm-prototypes.h | 13 --
+ arch/powerpc/include/asm/book3s/64/pgtable.h | 2 +
+ arch/powerpc/include/asm/cputime.h | 2 +-
+ arch/powerpc/include/asm/dtl.h | 8 -
+ arch/powerpc/include/asm/lppaca.h | 10 +-
+ arch/powerpc/include/asm/paravirt.h | 12 ++
+ arch/powerpc/include/asm/paravirt_api_clock.h | 2 +
+ arch/powerpc/include/asm/processor.h | 2 +
+ arch/powerpc/include/asm/sections.h | 13 ++
+ arch/powerpc/include/asm/setup.h | 1 -
+ arch/powerpc/include/asm/time.h | 5 +-
+ arch/powerpc/include/asm/vdso.h | 3 -
+ arch/powerpc/kernel/dt_cpu_ftrs.c | 2 +-
+ arch/powerpc/kernel/legacy_serial.c | 2 +
+ arch/powerpc/kernel/pci-common.c | 4 +-
+ arch/powerpc/kernel/pci_dn.c | 1 +
+ arch/powerpc/kernel/security.c | 1 +
+ arch/powerpc/kernel/time.c | 92 +-------
+ arch/powerpc/kernel/traps.c | 2 -
+ arch/powerpc/kernel/vdso.c | 13 +-
+ arch/powerpc/kernel/vdso/Makefile | 4 +-
+ arch/powerpc/lib/code-patching.c | 30 ++-
+ arch/powerpc/math-emu/Makefile | 7 +-
+ arch/powerpc/math-emu/math.c | 18 +-
+ arch/powerpc/math-emu/math_efp.c | 60 +++---
+ arch/powerpc/mm/book3s64/pgtable.c | 11 +-
+ arch/powerpc/mm/fault.c | 6 +-
+ arch/powerpc/mm/init_32.c | 13 --
+ arch/powerpc/mm/mmu_decl.h | 14 --
+ arch/powerpc/mm/nohash/fsl_book3e.c | 4 +-
+ arch/powerpc/perf/imc-pmu.c | 10 +-
+ arch/powerpc/platforms/44x/ppc476.c | 2 +
+ arch/powerpc/platforms/512x/clock-commonclk.c | 8 +-
+ arch/powerpc/platforms/52xx/media5200.c | 3 +
+ arch/powerpc/platforms/83xx/mpc832x_rdb.c | 6 +-
+ arch/powerpc/platforms/85xx/ge_imp3a.c | 6 +-
+ arch/powerpc/platforms/85xx/ksi8560.c | 2 +
+ arch/powerpc/platforms/85xx/sgy_cts1000.c | 35 ++--
+ arch/powerpc/platforms/8xx/tqm8xx_setup.c | 3 +
+ arch/powerpc/platforms/book3s/vas-api.c | 2 +-
+ arch/powerpc/platforms/cell/cbe_regs.c | 37 +++-
+ arch/powerpc/platforms/cell/iommu.c | 4 +-
+ arch/powerpc/platforms/cell/setup.c | 2 +
+ arch/powerpc/platforms/cell/spu_manage.c | 2 +
+ arch/powerpc/platforms/embedded6xx/holly.c | 6 +
+ arch/powerpc/platforms/embedded6xx/ls_uart.c | 2 +
+ arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 3 +
+ arch/powerpc/platforms/embedded6xx/wii.c | 15 --
+ arch/powerpc/platforms/maple/time.c | 1 +
+ arch/powerpc/platforms/pasemi/misc.c | 3 +-
+ arch/powerpc/platforms/pasemi/pci.c | 10 +-
+ arch/powerpc/platforms/powermac/feature.c | 15 +-
+ arch/powerpc/platforms/powermac/low_i2c.c | 1 +
+ arch/powerpc/platforms/powermac/pfunc_base.c | 2 +
+ arch/powerpc/platforms/powermac/smp.c | 1 +
+ arch/powerpc/platforms/powermac/udbg_scc.c | 8 +-
+ arch/powerpc/platforms/powernv/idle.c | 3 +-
+ arch/powerpc/platforms/powernv/opal-core.c | 2 +
+ arch/powerpc/platforms/powernv/opal-powercap.c | 6 +-
+ arch/powerpc/platforms/powernv/opal-psr.c | 6 +-
+ .../powerpc/platforms/powernv/opal-sensor-groups.c | 6 +-
+ arch/powerpc/platforms/powernv/opal.c | 2 +
+ arch/powerpc/platforms/powernv/pci-ioda.c | 2 +-
+ arch/powerpc/platforms/pseries/Kconfig | 8 +
+ arch/powerpc/platforms/pseries/dtl.c | 81 ++++++++
+ arch/powerpc/platforms/pseries/hotplug-cpu.c | 15 +-
+ arch/powerpc/platforms/pseries/hvcserver.c | 2 +-
+ arch/powerpc/platforms/pseries/ibmebus.c | 6 +-
+ arch/powerpc/platforms/pseries/lpar.c | 11 +
+ arch/powerpc/platforms/pseries/mobility.c | 2 +-
+ arch/powerpc/platforms/pseries/setup.c | 19 ++
+ arch/powerpc/sysdev/fsl_msi.c | 2 +
+ arch/powerpc/sysdev/fsl_pci.c | 7 +-
+ arch/powerpc/sysdev/mpic_msgr.c | 9 +-
+ arch/powerpc/sysdev/xive/common.c | 2 +-
+ arch/powerpc/sysdev/xive/native.c | 15 +-
+ drivers/macintosh/therm_windtunnel.c | 6 +-
+ include/math-emu/op-common.h | 3 +
+ init/Kconfig | 3 +-
+ .../selftests/powerpc/benchmarks/gettimeofday.c | 6 +-
+ tools/testing/selftests/powerpc/mm/Makefile | 3 +-
+ tools/testing/selftests/powerpc/mm/exec_prot.c | 231 +++++++++++++++++++++
+ .../selftests/powerpc/mm/large_vm_gpr_corruption.c | 2 +
+ 95 files changed, 726 insertions(+), 343 deletions(-)
+ delete mode 100644 arch/powerpc/boot/dummy.c
+ create mode 100644 arch/powerpc/include/asm/paravirt_api_clock.h
+ create mode 100644 tools/testing/selftests/powerpc/mm/exec_prot.c
+Merging soc-fsl/next (4b0986a3613c Linux 5.18)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next
+Already up to date.
+Merging risc-v/for-next (096b52fd2bb4 perf: RISC-V: throttle perf events)
+$ 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/kernel/topology.c
+Auto-merging arch/riscv/Kconfig
+Auto-merging drivers/base/arch_topology.c
+Auto-merging drivers/perf/riscv_pmu_legacy.c
+Auto-merging drivers/perf/riscv_pmu_sbi.c
+Merge made by the 'ort' strategy.
+ arch/arm64/kernel/topology.c | 40 ----------------------------------------
+ arch/riscv/Kconfig | 2 +-
+ arch/riscv/configs/defconfig | 3 +++
+ arch/riscv/kernel/smpboot.c | 3 ++-
+ drivers/base/arch_topology.c | 19 +++++++++++++++++++
+ drivers/perf/riscv_pmu_legacy.c | 4 ++--
+ drivers/perf/riscv_pmu_sbi.c | 31 ++++++++++++++++++++-----------
+ include/linux/perf/riscv_pmu.h | 2 +-
+ 8 files changed, 48 insertions(+), 56 deletions(-)
+Merging risc-v-mc/dt-for-next (7eac0081a8e9 riscv: dts: microchip: add qspi compatible fallback)
+$ git merge -m Merge branch 'dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git risc-v-mc/dt-for-next
+Auto-merging arch/riscv/boot/dts/microchip/mpfs.dtsi
+Merge made by the 'ort' strategy.
+ arch/riscv/boot/dts/microchip/mpfs.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging s390/for-next (5b5504d5fccd 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/kernel/Makefile
+Merge made by the 'ort' strategy.
+ arch/s390/boot/startup.c | 8 +-
+ arch/s390/include/asm/abs_lowcore.h | 17 ++++
+ arch/s390/include/asm/maccess.h | 17 ++++
+ arch/s390/include/asm/os_info.h | 14 ---
+ arch/s390/include/asm/pgtable.h | 4 +
+ arch/s390/include/asm/processor.h | 17 ----
+ arch/s390/include/asm/smp.h | 4 +-
+ arch/s390/kernel/Makefile | 2 +-
+ arch/s390/kernel/abs_lowcore.c | 95 ++++++++++++++++++++
+ arch/s390/kernel/crash_dump.c | 40 ++++-----
+ arch/s390/kernel/debug.c | 2 +-
+ arch/s390/kernel/early.c | 2 +-
+ arch/s390/kernel/ipl.c | 9 +-
+ arch/s390/kernel/machine_kexec.c | 8 +-
+ arch/s390/kernel/os_info.c | 10 ++-
+ arch/s390/kernel/setup.c | 47 ++++++----
+ arch/s390/kernel/smp.c | 97 +++++++++++---------
+ arch/s390/lib/delay.c | 11 +--
+ arch/s390/mm/dump_pagetables.c | 20 +++++
+ arch/s390/mm/fault.c | 15 ++--
+ arch/s390/mm/init.c | 2 +-
+ arch/s390/mm/maccess.c | 174 ++++++++++++++++--------------------
+ arch/s390/mm/vmem.c | 104 ++++++++++++++++++++-
+ arch/s390/pci/pci_dma.c | 2 +-
+ drivers/s390/block/dasd_devmap.c | 2 +-
+ drivers/s390/block/dasd_eer.c | 4 +-
+ drivers/s390/block/dcssblk.c | 2 +-
+ drivers/s390/char/hmcdrv_cache.c | 2 +-
+ drivers/s390/char/tape_class.c | 4 +-
+ drivers/s390/char/zcore.c | 1 +
+ drivers/s390/cio/qdio_debug.c | 2 +-
+ drivers/s390/net/ctcm_main.c | 2 +-
+ drivers/s390/net/fsm.c | 2 +-
+ drivers/s390/net/qeth_ethtool.c | 4 +-
+ drivers/s390/scsi/zfcp_aux.c | 2 +-
+ drivers/s390/scsi/zfcp_fc.c | 2 +-
+ 36 files changed, 493 insertions(+), 257 deletions(-)
+ create mode 100644 arch/s390/include/asm/abs_lowcore.h
+ create mode 100644 arch/s390/include/asm/maccess.h
+ create mode 100644 arch/s390/kernel/abs_lowcore.c
+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 (af3e16101cee um: include sys/types.h for size_t)
+$ 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 (e3ddb8bbe0f8 xtensa: add FDPIC and static PIE support for noMMU)
+$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next
+Merge made by the 'ort' strategy.
+ arch/xtensa/include/asm/elf.h | 24 ++++++++++++++++++++----
+ arch/xtensa/include/asm/processor.h | 3 +++
+ arch/xtensa/include/uapi/asm/ptrace.h | 4 ++++
+ fs/Kconfig.binfmt | 2 +-
+ 4 files changed, 28 insertions(+), 5 deletions(-)
+Merging pidfd/for-next (6a857ab5b57c Merge branch 'fs.idmapped.overlay.acl' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next
+Auto-merging MAINTAINERS
+Auto-merging include/linux/fs.h
+Merge made by the 'ort' strategy.
+Merging vfs-idmapping/for-next (6344e66970c6 xattr: constify value argument in vfs_setxattr())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git vfs-idmapping/for-next
+Merge made by the 'ort' strategy.
+ fs/ntfs3/inode.c | 2 -
+ fs/ntfs3/xattr.c | 102 +-------------
+ fs/overlayfs/overlayfs.h | 2 +-
+ fs/overlayfs/super.c | 15 +-
+ fs/posix_acl.c | 288 +++++++++++++++++++++++++++++---------
+ fs/xattr.c | 8 +-
+ include/linux/posix_acl_xattr.h | 12 +-
+ include/linux/xattr.h | 2 +-
+ security/integrity/evm/evm_main.c | 17 ++-
+ 9 files changed, 262 insertions(+), 186 deletions(-)
+Merging fscrypt/master (18136e49cb00 fscrypt: work on block_devices instead of request_queues)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt/master
+Merge made by the 'ort' strategy.
+ fs/crypto/bio.c | 16 +-
+ fs/crypto/fscrypt_private.h | 74 +++++--
+ fs/crypto/hooks.c | 10 +-
+ fs/crypto/inline_crypt.c | 147 +++++++------
+ fs/crypto/keyring.c | 495 ++++++++++++++++++++++++--------------------
+ fs/crypto/keysetup.c | 89 ++++----
+ fs/crypto/keysetup_v1.c | 4 +-
+ fs/crypto/policy.c | 21 +-
+ fs/ext4/readpage.c | 10 +-
+ fs/f2fs/data.c | 18 +-
+ fs/f2fs/super.c | 24 +--
+ fs/super.c | 2 +-
+ include/linux/fs.h | 2 +-
+ include/linux/fscrypt.h | 32 ++-
+ 14 files changed, 491 insertions(+), 453 deletions(-)
+Merging fscache/fscache-next (0885eacdc81f Merge tag 'nfsd-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux)
+$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next
+Already up to date.
+Merging afs/afs-next (26291c54e111 Linux 5.17-rc2)
+$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next
+Already up to date.
+Merging btrfs/for-next (caeaee0f40e2 Merge branch 'for-next-next-v6.0-20220913' into for-next-20220913)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next
+Merge made by the 'ort' strategy.
+ fs/btrfs/Makefile | 2 +-
+ fs/btrfs/backref.c | 153 +-
+ fs/btrfs/backref.h | 20 +-
+ fs/btrfs/block-group.c | 197 ++-
+ fs/btrfs/block-group.h | 30 +-
+ fs/btrfs/block-rsv.c | 3 +-
+ fs/btrfs/block-rsv.h | 9 +
+ fs/btrfs/btrfs_inode.h | 3 +-
+ fs/btrfs/compression.c | 54 +-
+ fs/btrfs/ctree.h | 165 ++-
+ fs/btrfs/delayed-inode.c | 292 ++--
+ fs/btrfs/delayed-inode.h | 34 +-
+ fs/btrfs/dev-replace.c | 16 +-
+ fs/btrfs/disk-io.c | 169 ++-
+ fs/btrfs/disk-io.h | 6 +-
+ fs/btrfs/extent-io-tree.c | 1673 +++++++++++++++++++++
+ fs/btrfs/extent-io-tree.h | 126 +-
+ fs/btrfs/extent-tree.c | 24 +-
+ fs/btrfs/extent_io.c | 2879 ++++++++-----------------------------
+ fs/btrfs/extent_io.h | 17 +-
+ fs/btrfs/extent_map.c | 2 +-
+ fs/btrfs/file-item.c | 23 +-
+ fs/btrfs/file.c | 491 ++++++-
+ fs/btrfs/free-space-cache.c | 113 +-
+ fs/btrfs/free-space-cache.h | 1 -
+ fs/btrfs/free-space-tree.c | 8 -
+ fs/btrfs/inode.c | 381 ++---
+ fs/btrfs/ioctl.c | 24 +-
+ fs/btrfs/misc.h | 35 +
+ fs/btrfs/ordered-data.c | 25 +-
+ fs/btrfs/props.c | 5 +-
+ fs/btrfs/qgroup.c | 96 +-
+ fs/btrfs/qgroup.h | 3 +
+ fs/btrfs/raid56.c | 45 +-
+ fs/btrfs/raid56.h | 4 +-
+ fs/btrfs/reflink.c | 10 +-
+ fs/btrfs/relocation.c | 18 +-
+ fs/btrfs/root-tree.c | 16 +-
+ fs/btrfs/scrub.c | 664 +++++----
+ fs/btrfs/send.c | 461 +++---
+ fs/btrfs/send.h | 15 +-
+ fs/btrfs/space-info.c | 93 +-
+ fs/btrfs/space-info.h | 8 +-
+ fs/btrfs/super.c | 111 +-
+ fs/btrfs/sysfs.c | 172 ++-
+ fs/btrfs/tests/btrfs-tests.c | 2 +-
+ fs/btrfs/tests/extent-io-tests.c | 7 +-
+ fs/btrfs/tests/free-space-tests.c | 22 +-
+ fs/btrfs/tests/inode-tests.c | 8 +-
+ fs/btrfs/transaction.c | 162 ++-
+ fs/btrfs/tree-log.c | 1587 ++++++++++++--------
+ fs/btrfs/tree-log.h | 8 +
+ fs/btrfs/verity.c | 3 +-
+ fs/btrfs/volumes.c | 353 +++--
+ fs/btrfs/volumes.h | 23 +-
+ fs/btrfs/zoned.c | 182 +--
+ fs/verity/fsverity_private.h | 2 -
+ include/linux/fsverity.h | 3 +
+ include/trace/events/btrfs.h | 2 -
+ include/uapi/linux/btrfs.h | 6 +
+ include/uapi/linux/btrfs_tree.h | 4 +
+ 61 files changed, 6420 insertions(+), 4650 deletions(-)
+ create mode 100644 fs/btrfs/extent-io-tree.c
+Merging ceph/master (0edddc4160b9 ceph: remove Sage's git tree from documentation)
+$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master
+Merge made by the 'ort' strategy.
+ Documentation/filesystems/ceph.rst | 1 -
+ 1 file changed, 1 deletion(-)
+Merging cifs/for-next (8af8aed97beb cifs: update internal module number)
+$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next
+Merge made by the 'ort' strategy.
+ fs/cifs/cifsfs.h | 4 ++--
+ fs/cifs/connect.c | 14 ++++++--------
+ fs/cifs/file.c | 3 +++
+ fs/cifs/transport.c | 6 +-----
+ 4 files changed, 12 insertions(+), 15 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 (80e78fcce86d Linux 6.0-rc5)
+$ 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 (2e9ceb6728f1 exfat: fix overflow for large capacity partition)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev
+Merge made by the 'ort' strategy.
+ fs/exfat/fatent.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+Merging ext3/for_next (11fdae37d482 Pull udf splice fix.)
+$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next
+Merge made by the 'ort' strategy.
+ fs/isofs/inode.c | 9 +++------
+ fs/notify/fsnotify.h | 4 ----
+ fs/reiserfs/prints.c | 2 +-
+ fs/reiserfs/resize.c | 2 +-
+ fs/reiserfs/super.c | 7 ++-----
+ fs/udf/file.c | 1 +
+ 6 files changed, 8 insertions(+), 17 deletions(-)
+Merging ext4/dev (d95efb14c0b8 ext4: add ioctls to get/set the ext4 superblock uuid)
+$ 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 (108d4d310318 f2fs: fix to do sanity check on summary info)
+$ 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/data.c
+Auto-merging fs/f2fs/super.c
+Merge made by the 'ort' strategy.
+ fs/f2fs/acl.c | 2 +-
+ fs/f2fs/checkpoint.c | 42 ++++++++++++++++++-------
+ fs/f2fs/compress.c | 30 ++++++++----------
+ fs/f2fs/data.c | 15 ++++-----
+ fs/f2fs/debug.c | 3 ++
+ fs/f2fs/extent_cache.c | 3 +-
+ fs/f2fs/f2fs.h | 24 ++++++++++++---
+ fs/f2fs/file.c | 21 +++++++------
+ fs/f2fs/gc.c | 32 ++++++++++++--------
+ fs/f2fs/inline.c | 15 +++------
+ fs/f2fs/inode.c | 21 +++++++------
+ fs/f2fs/iostat.c | 74 ++++++++++++++++++++++++++++++++-------------
+ fs/f2fs/iostat.h | 4 +--
+ fs/f2fs/node.c | 5 ++-
+ fs/f2fs/recovery.c | 23 ++++++++++++--
+ fs/f2fs/segment.c | 13 ++++----
+ fs/f2fs/super.c | 31 ++++++++++---------
+ fs/f2fs/sysfs.c | 1 -
+ fs/f2fs/verity.c | 10 ++----
+ include/trace/events/f2fs.h | 24 ++++++++++++---
+ 20 files changed, 245 insertions(+), 148 deletions(-)
+Merging fsverity/fsverity (8377e8a24bba fs-verity: use kmap_local_page() instead of kmap())
+$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity
+Merge made by the 'ort' strategy.
+ fs/verity/read_metadata.c | 6 +++---
+ fs/verity/verify.c | 14 ++------------
+ 2 files changed, 5 insertions(+), 15 deletions(-)
+Merging fuse/for-next (247861c325c2 fuse: retire block-device-based superblock on force unmount)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next
+Already up to date.
+Merging gfs2/for-next (204c0300c4e9 gfs2: Switch from strlcpy to strscpy)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next
+Merge made by the 'ort' strategy.
+ fs/gfs2/glock.c | 44 +++++++++++++++++++++++++++++++++++++++-----
+ fs/gfs2/glock.h | 1 +
+ fs/gfs2/inode.c | 10 ++++++++--
+ fs/gfs2/ops_fstype.c | 12 +++++++-----
+ fs/gfs2/util.c | 6 ++++++
+ 5 files changed, 61 insertions(+), 12 deletions(-)
+Merging jfs/jfs-next (e471e5942c00 fs/jfs: Remove dead code)
+$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next
+Already up to date.
+Merging ksmbd/ksmbd-for-next (8c9073fa857c ksmbd: constify struct path)
+$ 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/misc.c | 2 +-
+ fs/ksmbd/misc.h | 2 +-
+ fs/ksmbd/smb2pdu.c | 33 ++++++++++++++++-----------------
+ fs/ksmbd/smbacl.c | 6 +++---
+ fs/ksmbd/smbacl.h | 6 +++---
+ fs/ksmbd/vfs.c | 18 ++++++++----------
+ fs/ksmbd/vfs.h | 2 +-
+ 7 files changed, 33 insertions(+), 36 deletions(-)
+Merging nfs/linux-next (3245cb65fd91 Merge tag 'devicetree-fixes-for-6.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux)
+$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next
+Already up to date.
+Merging nfs-anna/linux-next (4f40a5b55446 NFSv4: Add an fattr allocation to _nfs4_discover_trunking())
+$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next
+Already up to date.
+Merging nfsd/for-next (395289f8a048 NFSD: Return nfserr_serverfault if splice_ok but buf->pages have data)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next
+Auto-merging fs/nfsd/vfs.c
+CONFLICT (content): Merge conflict in fs/nfsd/vfs.c
+Resolved 'fs/nfsd/vfs.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 3e59cda1e53e] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
+$ git diff -M --stat --summary HEAD^..
+ fs/lockd/host.c | 2 +-
+ fs/nfsd/nfs3proc.c | 11 ++--
+ fs/nfsd/nfs4idmap.c | 8 +--
+ fs/nfsd/nfs4layouts.c | 2 +-
+ fs/nfsd/nfs4proc.c | 49 ++++++++++-------
+ fs/nfsd/nfs4recover.c | 14 ++---
+ fs/nfsd/nfs4state.c | 41 ++++++++++++++
+ fs/nfsd/nfs4xdr.c | 37 ++++++-------
+ fs/nfsd/nfsd.h | 7 +++
+ fs/nfsd/nfsfh.c | 8 +--
+ fs/nfsd/nfsproc.c | 11 ++--
+ fs/nfsd/nfssvc.c | 2 +-
+ fs/nfsd/state.h | 3 +-
+ fs/nfsd/trace.h | 131 +++++++++++++++++++++++++++++++++++++++++----
+ fs/nfsd/vfs.c | 111 ++++++++++++++++++++++++--------------
+ fs/nfsd/vfs.h | 4 +-
+ fs/nfsd/xdr4.h | 3 +-
+ include/linux/sunrpc/svc.h | 19 +++++--
+ 18 files changed, 332 insertions(+), 131 deletions(-)
+Merging ntfs3/master (3b06a2755758 Merge tag 'ntfs3_for_6.0' of https://github.com/Paragon-Software-Group/linux-ntfs3)
+$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master
+Already up to date.
+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 (4f1196288dfb ovl: fix spelling mistakes)
+$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next
+Already up to date.
+Merging ubifs/next (8c03a1c21d72 ubi: ubi_create_volume: Fix use-after-free when volume creation failed)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next
+Already up to date.
+Merging v9fs/9p-next (02ed50db058d net/9p: allocate appropriate reduced message buffers)
+$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next
+Merge made by the 'ort' strategy.
+ include/net/9p/9p.h | 3 +
+ include/net/9p/transport.h | 5 ++
+ net/9p/client.c | 72 ++++++++++++-------
+ net/9p/protocol.c | 167 +++++++++++++++++++++++++++++++++++++++++++++
+ net/9p/protocol.h | 2 +
+ net/9p/trans_fd.c | 4 +-
+ net/9p/trans_rdma.c | 1 +
+ net/9p/trans_virtio.c | 1 +
+ net/9p/trans_xen.c | 1 +
+ 9 files changed, 230 insertions(+), 26 deletions(-)
+Merging xfs/for-next (031d166f968e xfs: fix inode reservation space for removing transaction)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next
+Already up to date.
+Merging zonefs/for-next (6bac30bb8ff8 zonefs: Call page_address() on page acquired with GFP_KERNEL flag)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next
+Already up to date.
+Merging iomap/iomap-for-next (478af190cb6c iomap: remove iomap_writepage)
+$ 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 statx-dioalign/statx-dioalign (61a223df421f xfs: support STATX_DIOALIGN)
+$ git merge -m Merge branch 'statx-dioalign' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git statx-dioalign/statx-dioalign
+Auto-merging fs/crypto/inline_crypt.c
+Auto-merging fs/f2fs/f2fs.h
+Auto-merging fs/f2fs/file.c
+Auto-merging include/linux/fscrypt.h
+Merge made by the 'ort' strategy.
+ block/bdev.c | 23 ++++++++++++++++++++++
+ fs/crypto/inline_crypt.c | 49 +++++++++++++++++++++++------------------------
+ fs/ext4/ext4.h | 1 +
+ fs/ext4/file.c | 37 ++++++++++++++++++++++++-----------
+ fs/ext4/inode.c | 37 +++++++++++++++++++++++++++++++++++
+ fs/f2fs/f2fs.h | 40 --------------------------------------
+ fs/f2fs/file.c | 43 ++++++++++++++++++++++++++++++++++++++++-
+ fs/stat.c | 14 ++++++++++++++
+ fs/xfs/xfs_iops.c | 10 ++++++++++
+ include/linux/blkdev.h | 4 ++++
+ include/linux/fscrypt.h | 7 ++-----
+ include/linux/stat.h | 2 ++
+ include/uapi/linux/stat.h | 4 +++-
+ 13 files changed, 188 insertions(+), 83 deletions(-)
+Merging djw-vfs/vfs-for-next (49df34221804 fs: fix an infinite loop in iomap_fiemap)
+$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next
+Already up to date.
+Merging file-locks/locks-next (072e51356cd5 Merge tag 'nfs-for-5.20-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs)
+$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next
+Already up to date.
+Merging vfs/for-next (0a97e98ab197 Merge branches 'work.path' and 'work.file_inode' 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 fs/exec.c
+Auto-merging fs/inode.c
+Auto-merging fs/ksmbd/smb2pdu.c
+Auto-merging fs/ksmbd/vfs.c
+Auto-merging fs/nfs/dir.c
+Auto-merging fs/nfs/nfs42proc.c
+Auto-merging fs/nfsd/nfs4recover.c
+Auto-merging fs/nfsd/vfs.c
+Auto-merging fs/overlayfs/inode.c
+Auto-merging fs/overlayfs/overlayfs.h
+Auto-merging fs/overlayfs/super.c
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/lsm_hook_defs.h
+Auto-merging include/linux/security.h
+Auto-merging net/socket.c
+Auto-merging security/security.c
+Auto-merging security/selinux/hooks.c
+Auto-merging security/smack/smack_lsm.c
+Merge made by the 'ort' strategy.
+ Documentation/filesystems/porting.rst | 11 +++++
+ arch/alpha/kernel/osf_sys.c | 10 ++---
+ arch/powerpc/platforms/cell/spufs/inode.c | 6 +--
+ arch/powerpc/platforms/cell/spufs/spufs.h | 2 +-
+ arch/x86/kernel/cpu/sgx/encl.c | 3 +-
+ drivers/dma-buf/dma-buf.c | 4 +-
+ drivers/dma-buf/udmabuf.c | 2 +-
+ drivers/misc/ibmvmc.c | 6 ++-
+ fs/afs/dir.c | 23 +++++------
+ fs/anon_inodes.c | 2 +-
+ fs/d_path.c | 5 +--
+ fs/ecryptfs/ecryptfs_kernel.h | 2 +-
+ fs/ecryptfs/file.c | 40 ++++++++----------
+ fs/ecryptfs/inode.c | 2 +-
+ fs/ecryptfs/main.c | 2 +-
+ fs/exec.c | 3 +-
+ fs/exfat/dir.c | 6 +--
+ fs/exportfs/expfs.c | 7 ++--
+ fs/fat/dir.c | 8 ++--
+ fs/fhandle.c | 2 +-
+ fs/file_table.c | 7 +---
+ fs/gfs2/export.c | 6 +--
+ fs/inode.c | 5 ++-
+ fs/internal.h | 12 +++++-
+ fs/ksmbd/smb2pdu.c | 16 ++++----
+ fs/ksmbd/vfs.c | 14 +++----
+ fs/namei.c | 4 +-
+ fs/nfs/dir.c | 2 +-
+ fs/nfs/nfs42proc.c | 2 +-
+ fs/nfsd/nfs4recover.c | 8 ++--
+ fs/nfsd/vfs.c | 6 +--
+ fs/notify/fanotify/fanotify.c | 2 +-
+ fs/notify/fanotify/fanotify.h | 2 +-
+ fs/notify/fanotify/fanotify_user.c | 6 +--
+ fs/nsfs.c | 2 +-
+ fs/ocfs2/dir.c | 10 ++---
+ fs/ocfs2/journal.c | 14 +++----
+ fs/open.c | 11 ++---
+ fs/orangefs/file.c | 4 +-
+ fs/overlayfs/copy_up.c | 12 +++---
+ fs/overlayfs/file.c | 2 +-
+ fs/overlayfs/inode.c | 6 +--
+ fs/overlayfs/namei.c | 4 +-
+ fs/overlayfs/overlayfs.h | 22 +++++-----
+ fs/overlayfs/readdir.c | 44 ++++++++++----------
+ fs/overlayfs/super.c | 8 ++--
+ fs/overlayfs/util.c | 10 ++---
+ fs/pipe.c | 2 +-
+ fs/proc/base.c | 4 +-
+ fs/readdir.c | 68 +++++++++++++++----------------
+ fs/reiserfs/xattr.c | 20 ++++-----
+ fs/xfs/scrub/dir.c | 8 ++--
+ fs/xfs/scrub/parent.c | 4 +-
+ include/linux/dcache.h | 4 +-
+ include/linux/fs.h | 9 ++--
+ include/linux/lsm_hook_defs.h | 2 +-
+ include/linux/namei.h | 2 +-
+ include/linux/security.h | 4 +-
+ io_uring/xattr.c | 2 +-
+ kernel/audit_watch.c | 2 +-
+ net/socket.c | 2 +-
+ security/apparmor/lsm.c | 2 +-
+ security/security.c | 4 +-
+ security/selinux/hooks.c | 2 +-
+ security/smack/smack_lsm.c | 2 +-
+ security/tomoyo/audit.c | 2 +-
+ security/tomoyo/common.c | 2 +-
+ security/tomoyo/file.c | 2 +-
+ security/tomoyo/realpath.c | 9 +---
+ 69 files changed, 269 insertions(+), 276 deletions(-)
+Merging printk/for-next (c0a684057235 Merge branch 'for-6.1/trivial' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next
+Merge made by the 'ort' strategy.
+ lib/vsprintf.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging pci/next (c327b44793ae Merge branch 'remotes/lorenzo/pci/qcom')
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next
+Auto-merging Documentation/devicetree/bindings/pci/qcom,pcie.yaml
+Merge made by the 'ort' strategy.
+ .../bindings/pci/mediatek-pcie-gen3.yaml | 13 +-
+ .../bindings/pci/microchip,pcie-host.yaml | 31 +++
+ .../devicetree/bindings/pci/qcom,pcie.yaml | 70 ++++-
+ .../devicetree/bindings/pci/sifive,fu740-pcie.yaml | 8 +
+ drivers/pci/controller/dwc/pcie-designware-host.c | 42 +--
+ drivers/pci/controller/dwc/pcie-designware.c | 8 +
+ drivers/pci/controller/dwc/pcie-designware.h | 2 +-
+ drivers/pci/controller/dwc/pcie-kirin.c | 4 +-
+ drivers/pci/controller/dwc/pcie-qcom-ep.c | 5 +
+ drivers/pci/controller/dwc/pcie-qcom.c | 121 ++++-----
+ drivers/pci/controller/pci-aardvark.c | 1 +
+ drivers/pci/controller/pci-mvebu.c | 13 +-
+ drivers/pci/controller/pcie-apple.c | 4 +-
+ drivers/pci/controller/pcie-mediatek-gen3.c | 2 +-
+ drivers/pci/msi/msi.c | 2 +-
+ drivers/pci/pci-bridge-emul.c | 48 ++--
+ drivers/pci/pci-bridge-emul.h | 2 +
+ drivers/pci/pci-driver.c | 30 ++-
+ drivers/pci/pci.c | 35 +--
+ drivers/pci/pci.h | 18 +-
+ drivers/pci/pcie/aspm.c | 100 ++++---
+ drivers/pci/pcie/ptm.c | 300 ++++++++++++---------
+ include/linux/pci.h | 3 +
+ 23 files changed, 522 insertions(+), 340 deletions(-)
+Merging pstore/for-next/pstore (27001e611bb6 pstore/zone: Use GFP_ATOMIC to allocate zone buffer)
+$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore
+Merge made by the 'ort' strategy.
+ fs/pstore/zone.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging hid/for-next (d9c1c1a0a501 Merge branch 'for-6.1/logitech' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next
+Merge made by the 'ort' strategy.
+ drivers/hid/Kconfig | 75 +----------
+ drivers/hid/Makefile | 4 +-
+ drivers/hid/hid-core.c | 1 +
+ drivers/hid/hid-google-hammer.c | 4 +-
+ drivers/hid/hid-ids.h | 2 +
+ drivers/hid/hid-logitech-hidpp.c | 42 +++++--
+ drivers/hid/hid-playstation.c | 16 +--
+ drivers/hid/hid-rmi.c | 6 +-
+ drivers/hid/hid-steam.c | 8 +-
+ drivers/hid/hid-uclogic-core.c | 5 +
+ drivers/hid/hid-uclogic-params-test.c | 192 ++++++++++++++++++++++++++++
+ drivers/hid/hid-uclogic-params.c | 230 ++++++++++++++++++++++++++++------
+ drivers/hid/hid-uclogic-params.h | 10 ++
+ drivers/hid/hid-uclogic-rdesc-test.c | 22 ++--
+ drivers/hid/hid-uclogic-rdesc.c | 76 ++++++++++-
+ drivers/hid/hid-uclogic-rdesc.h | 8 ++
+ drivers/hid/hid-vivaldi-common.c | 29 ++---
+ drivers/hid/hid-vivaldi-common.h | 4 +-
+ drivers/hid/hid-vivaldi.c | 4 +-
+ drivers/hid/i2c-hid/i2c-hid-core.c | 2 +-
+ drivers/hid/usbhid/hid-core.c | 2 +-
+ drivers/hid/usbhid/usbkbd.c | 2 +-
+ drivers/hid/usbhid/usbmouse.c | 2 +-
+ drivers/hid/wacom.h | 5 +-
+ drivers/hid/wacom_sys.c | 11 +-
+ drivers/hid/wacom_wac.c | 10 +-
+ drivers/hid/wacom_wac.h | 4 +-
+ 27 files changed, 579 insertions(+), 197 deletions(-)
+ create mode 100644 drivers/hid/hid-uclogic-params-test.c
+Merging i2c/i2c/for-next (12452662e011 Merge branch 'i2c/for-mergewindow' into i2c/for-next)
+$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next
+Auto-merging drivers/clk/clk-versaclock5.c
+Auto-merging drivers/gpio/gpio-pca953x.c
+Auto-merging drivers/hid/i2c-hid/i2c-hid-core.c
+Auto-merging drivers/hwmon/tps23861.c
+Auto-merging drivers/iio/light/tsl2583.c
+Auto-merging drivers/input/touchscreen/goodix.c
+Auto-merging drivers/macintosh/therm_windtunnel.c
+Auto-merging sound/soc/codecs/cs42l42.c
+Auto-merging sound/soc/codecs/nau8825.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/i2c/i2c-imx-lpi2c.yaml | 20 ++++++-
+ Documentation/devicetree/bindings/i2c/i2c-imx.yaml | 11 ++++
+ .../bindings/i2c/marvell,mv64xxx-i2c.yaml | 13 +++++
+ .../devicetree/bindings/i2c/qcom,i2c-cci.yaml | 1 +
+ Documentation/i2c/writing-clients.rst | 2 +-
+ arch/arm/mach-davinci/board-da850-evm.c | 12 ++--
+ arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 3 +-
+ drivers/auxdisplay/ht16k33.c | 4 +-
+ drivers/auxdisplay/lcd2s.c | 3 +-
+ drivers/char/ipmi/ipmb_dev_int.c | 4 +-
+ drivers/char/ipmi/ipmi_ipmb.c | 4 +-
+ drivers/char/ipmi/ipmi_ssif.c | 6 +-
+ drivers/char/tpm/st33zp24/i2c.c | 4 +-
+ drivers/char/tpm/tpm_i2c_atmel.c | 3 +-
+ drivers/char/tpm/tpm_i2c_infineon.c | 4 +-
+ drivers/char/tpm/tpm_i2c_nuvoton.c | 3 +-
+ drivers/char/tpm/tpm_tis_i2c.c | 3 +-
+ drivers/char/tpm/tpm_tis_i2c_cr50.c | 6 +-
+ drivers/clk/clk-cdce706.c | 3 +-
+ drivers/clk/clk-cs2000-cp.c | 4 +-
+ drivers/clk/clk-si514.c | 3 +-
+ drivers/clk/clk-si5341.c | 4 +-
+ drivers/clk/clk-si5351.c | 4 +-
+ drivers/clk/clk-si570.c | 3 +-
+ drivers/clk/clk-versaclock5.c | 4 +-
+ drivers/crypto/atmel-ecc.c | 6 +-
+ drivers/crypto/atmel-sha204a.c | 6 +-
+ drivers/extcon/extcon-rt8973a.c | 4 +-
+ drivers/gpio/gpio-adp5588.c | 4 +-
+ drivers/gpio/gpio-max7300.c | 4 +-
+ drivers/gpio/gpio-pca953x.c | 13 +----
+ drivers/gpio/gpio-pcf857x.c | 4 +-
+ drivers/gpio/gpio-tpic2810.c | 4 +-
+ drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 4 +-
+ drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 4 +-
+ drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 4 +-
+ drivers/gpu/drm/bridge/analogix/anx7625.c | 4 +-
+ drivers/gpu/drm/bridge/chrontel-ch7033.c | 4 +-
+ drivers/gpu/drm/bridge/cros-ec-anx7688.c | 4 +-
+ drivers/gpu/drm/bridge/ite-it6505.c | 4 +-
+ drivers/gpu/drm/bridge/ite-it66121.c | 4 +-
+ drivers/gpu/drm/bridge/lontium-lt8912b.c | 3 +-
+ drivers/gpu/drm/bridge/lontium-lt9211.c | 4 +-
+ drivers/gpu/drm/bridge/lontium-lt9611.c | 4 +-
+ drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 4 +-
+ .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 8 +--
+ drivers/gpu/drm/bridge/nxp-ptn3460.c | 4 +-
+ drivers/gpu/drm/bridge/parade-ps8622.c | 4 +-
+ drivers/gpu/drm/bridge/sii902x.c | 4 +-
+ drivers/gpu/drm/bridge/sii9234.c | 4 +-
+ drivers/gpu/drm/bridge/sil-sii8620.c | 4 +-
+ drivers/gpu/drm/bridge/tc358767.c | 4 +-
+ drivers/gpu/drm/bridge/tc358768.c | 4 +-
+ drivers/gpu/drm/bridge/tc358775.c | 4 +-
+ drivers/gpu/drm/bridge/ti-dlpc3433.c | 4 +-
+ drivers/gpu/drm/bridge/ti-sn65dsi83.c | 4 +-
+ drivers/gpu/drm/bridge/ti-tfp410.c | 4 +-
+ drivers/gpu/drm/i2c/ch7006_drv.c | 4 +-
+ drivers/gpu/drm/i2c/sil164_drv.c | 7 ---
+ drivers/gpu/drm/i2c/tda9950.c | 4 +-
+ drivers/gpu/drm/i2c/tda998x_drv.c | 3 +-
+ drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 4 +-
+ .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 4 +-
+ drivers/gpu/drm/solomon/ssd130x-i2c.c | 4 +-
+ drivers/hid/i2c-hid/i2c-hid-core.c | 4 +-
+ drivers/hid/i2c-hid/i2c-hid.h | 2 +-
+ drivers/hwmon/adc128d818.c | 4 +-
+ drivers/hwmon/adt7470.c | 3 +-
+ drivers/hwmon/asb100.c | 6 +-
+ drivers/hwmon/asc7621.c | 4 +-
+ drivers/hwmon/dme1737.c | 4 +-
+ drivers/hwmon/f75375s.c | 5 +-
+ drivers/hwmon/fschmd.c | 6 +-
+ drivers/hwmon/ftsteutates.c | 3 +-
+ drivers/hwmon/ina209.c | 4 +-
+ drivers/hwmon/ina3221.c | 4 +-
+ drivers/hwmon/jc42.c | 3 +-
+ drivers/hwmon/occ/p8_i2c.c | 4 +-
+ drivers/hwmon/pcf8591.c | 3 +-
+ drivers/hwmon/smm665.c | 3 +-
+ drivers/hwmon/tps23861.c | 4 +-
+ drivers/hwmon/w83781d.c | 4 +-
+ drivers/hwmon/w83791d.c | 6 +-
+ drivers/hwmon/w83792d.c | 6 +-
+ drivers/hwmon/w83793.c | 6 +-
+ drivers/hwmon/w83795.c | 4 +-
+ drivers/hwmon/w83l785ts.c | 6 +-
+ drivers/i2c/busses/i2c-designware-amdpsp.c | 67 +++++++++++++++++-----
+ drivers/i2c/busses/i2c-designware-pcidrv.c | 5 +-
+ drivers/i2c/busses/i2c-imx-lpi2c.c | 24 ++++----
+ drivers/i2c/busses/i2c-ismt.c | 7 +--
+ drivers/i2c/i2c-core-base.c | 6 +-
+ drivers/i2c/i2c-slave-eeprom.c | 4 +-
+ drivers/i2c/i2c-slave-testunit.c | 3 +-
+ drivers/i2c/i2c-smbus.c | 3 +-
+ drivers/i2c/muxes/Kconfig | 6 +-
+ drivers/i2c/muxes/i2c-mux-ltc4306.c | 4 +-
+ drivers/i2c/muxes/i2c-mux-pca9541.c | 3 +-
+ drivers/i2c/muxes/i2c-mux-pca954x.c | 3 +-
+ drivers/i2c/muxes/i2c-mux-pinctrl.c | 2 +-
+ drivers/iio/accel/bma180.c | 4 +-
+ drivers/iio/accel/bmc150-accel-i2c.c | 4 +-
+ drivers/iio/accel/kxcjk-1013.c | 4 +-
+ drivers/iio/accel/kxsd9-i2c.c | 4 +-
+ drivers/iio/accel/mc3230.c | 4 +-
+ drivers/iio/accel/mma7455_i2c.c | 4 +-
+ drivers/iio/accel/mma7660.c | 4 +-
+ drivers/iio/accel/mma8452.c | 4 +-
+ drivers/iio/accel/mma9551.c | 4 +-
+ drivers/iio/accel/mma9553.c | 4 +-
+ drivers/iio/accel/stk8312.c | 4 +-
+ drivers/iio/accel/stk8ba50.c | 4 +-
+ drivers/iio/adc/ad799x.c | 4 +-
+ drivers/iio/adc/ina2xx-adc.c | 4 +-
+ drivers/iio/adc/ltc2497.c | 4 +-
+ drivers/iio/adc/ti-ads1015.c | 4 +-
+ drivers/iio/chemical/atlas-sensor.c | 4 +-
+ drivers/iio/chemical/ccs811.c | 4 +-
+ drivers/iio/chemical/sgp30.c | 4 +-
+ drivers/iio/dac/ad5380.c | 4 +-
+ drivers/iio/dac/ad5446.c | 4 +-
+ drivers/iio/dac/ad5593r.c | 4 +-
+ drivers/iio/dac/ad5696-i2c.c | 4 +-
+ drivers/iio/dac/ds4424.c | 4 +-
+ drivers/iio/dac/m62332.c | 4 +-
+ drivers/iio/dac/mcp4725.c | 4 +-
+ drivers/iio/dac/ti-dac5571.c | 4 +-
+ drivers/iio/gyro/bmg160_i2c.c | 4 +-
+ drivers/iio/gyro/fxas21002c_i2c.c | 4 +-
+ drivers/iio/gyro/itg3200_core.c | 4 +-
+ drivers/iio/gyro/mpu3050-i2c.c | 4 +-
+ drivers/iio/health/afe4404.c | 4 +-
+ drivers/iio/health/max30100.c | 4 +-
+ drivers/iio/health/max30102.c | 4 +-
+ drivers/iio/humidity/hdc2010.c | 4 +-
+ drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 4 +-
+ drivers/iio/imu/kmx61.c | 4 +-
+ drivers/iio/light/apds9300.c | 4 +-
+ drivers/iio/light/apds9960.c | 4 +-
+ drivers/iio/light/bh1750.c | 4 +-
+ drivers/iio/light/bh1780.c | 4 +-
+ drivers/iio/light/cm3232.c | 4 +-
+ drivers/iio/light/cm36651.c | 4 +-
+ drivers/iio/light/gp2ap002.c | 4 +-
+ drivers/iio/light/gp2ap020a00f.c | 4 +-
+ drivers/iio/light/isl29028.c | 4 +-
+ drivers/iio/light/isl29125.c | 4 +-
+ drivers/iio/light/jsa1212.c | 4 +-
+ drivers/iio/light/ltr501.c | 4 +-
+ drivers/iio/light/opt3001.c | 6 +-
+ drivers/iio/light/pa12203001.c | 4 +-
+ drivers/iio/light/rpr0521.c | 4 +-
+ drivers/iio/light/stk3310.c | 4 +-
+ drivers/iio/light/tcs3472.c | 4 +-
+ drivers/iio/light/tsl2563.c | 4 +-
+ drivers/iio/light/tsl2583.c | 4 +-
+ drivers/iio/light/tsl4531.c | 4 +-
+ drivers/iio/light/us5182d.c | 4 +-
+ drivers/iio/light/vcnl4000.c | 4 +-
+ drivers/iio/light/vcnl4035.c | 4 +-
+ drivers/iio/light/veml6070.c | 4 +-
+ drivers/iio/magnetometer/ak8974.c | 4 +-
+ drivers/iio/magnetometer/ak8975.c | 4 +-
+ drivers/iio/magnetometer/bmc150_magn_i2c.c | 4 +-
+ drivers/iio/magnetometer/hmc5843_i2c.c | 4 +-
+ drivers/iio/magnetometer/mag3110.c | 4 +-
+ drivers/iio/magnetometer/yamaha-yas530.c | 4 +-
+ drivers/iio/potentiostat/lmp91000.c | 4 +-
+ drivers/iio/pressure/mpl3115.c | 4 +-
+ drivers/iio/pressure/ms5611_i2c.c | 4 +-
+ drivers/iio/pressure/zpa2326_i2c.c | 4 +-
+ drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 4 +-
+ drivers/iio/proximity/sx9500.c | 4 +-
+ drivers/iio/temperature/mlx90614.c | 4 +-
+ drivers/iio/temperature/mlx90632.c | 4 +-
+ drivers/input/joystick/as5011.c | 4 +-
+ drivers/input/keyboard/adp5588-keys.c | 3 +-
+ drivers/input/keyboard/lm8323.c | 4 +-
+ drivers/input/keyboard/lm8333.c | 4 +-
+ drivers/input/keyboard/mcs_touchkey.c | 4 +-
+ drivers/input/keyboard/qt1070.c | 4 +-
+ drivers/input/keyboard/qt2160.c | 4 +-
+ drivers/input/keyboard/tca6416-keypad.c | 4 +-
+ drivers/input/misc/adxl34x-i2c.c | 4 +-
+ drivers/input/misc/bma150.c | 4 +-
+ drivers/input/misc/cma3000_d0x_i2c.c | 4 +-
+ drivers/input/misc/pcf8574_keypad.c | 4 +-
+ drivers/input/mouse/synaptics_i2c.c | 4 +-
+ drivers/input/rmi4/rmi_smbus.c | 4 +-
+ drivers/input/touchscreen/atmel_mxt_ts.c | 4 +-
+ drivers/input/touchscreen/bu21013_ts.c | 4 +-
+ drivers/input/touchscreen/cyttsp4_i2c.c | 4 +-
+ drivers/input/touchscreen/edt-ft5x06.c | 4 +-
+ drivers/input/touchscreen/goodix.c | 4 +-
+ drivers/input/touchscreen/migor_ts.c | 4 +-
+ drivers/input/touchscreen/s6sy761.c | 4 +-
+ drivers/input/touchscreen/stmfts.c | 4 +-
+ drivers/input/touchscreen/tsc2004.c | 4 +-
+ drivers/leds/flash/leds-as3645a.c | 4 +-
+ drivers/leds/flash/leds-lm3601x.c | 13 +++--
+ drivers/leds/flash/leds-rt4505.c | 3 +-
+ drivers/leds/leds-an30259a.c | 4 +-
+ drivers/leds/leds-aw2013.c | 4 +-
+ drivers/leds/leds-bd2802.c | 4 +-
+ drivers/leds/leds-blinkm.c | 3 +-
+ drivers/leds/leds-is31fl32xx.c | 4 +-
+ drivers/leds/leds-lm3530.c | 3 +-
+ drivers/leds/leds-lm3532.c | 4 +-
+ drivers/leds/leds-lm355x.c | 4 +-
+ drivers/leds/leds-lm3642.c | 3 +-
+ drivers/leds/leds-lm3692x.c | 4 +-
+ drivers/leds/leds-lm3697.c | 8 +--
+ drivers/leds/leds-lp3944.c | 4 +-
+ drivers/leds/leds-lp3952.c | 4 +-
+ drivers/leds/leds-lp50xx.c | 4 +-
+ drivers/leds/leds-lp5521.c | 4 +-
+ drivers/leds/leds-lp5523.c | 4 +-
+ drivers/leds/leds-lp5562.c | 4 +-
+ drivers/leds/leds-lp8501.c | 4 +-
+ drivers/leds/leds-lp8860.c | 4 +-
+ drivers/leds/leds-pca9532.c | 6 +-
+ drivers/leds/leds-tca6507.c | 4 +-
+ drivers/leds/leds-turris-omnia.c | 4 +-
+ drivers/macintosh/ams/ams-i2c.c | 4 +-
+ drivers/macintosh/therm_adt746x.c | 4 +-
+ drivers/macintosh/therm_windtunnel.c | 4 +-
+ drivers/macintosh/windfarm_ad7417_sensor.c | 4 +-
+ drivers/macintosh/windfarm_fcu_controls.c | 3 +-
+ drivers/macintosh/windfarm_lm75_sensor.c | 4 +-
+ drivers/macintosh/windfarm_lm87_sensor.c | 4 +-
+ drivers/macintosh/windfarm_max6690_sensor.c | 4 +-
+ drivers/macintosh/windfarm_smu_sat.c | 4 +-
+ drivers/media/cec/i2c/ch7322.c | 4 +-
+ drivers/media/dvb-frontends/a8293.c | 3 +-
+ drivers/media/dvb-frontends/af9013.c | 4 +-
+ drivers/media/dvb-frontends/af9033.c | 4 +-
+ drivers/media/dvb-frontends/au8522_decoder.c | 3 +-
+ drivers/media/dvb-frontends/cxd2099.c | 4 +-
+ drivers/media/dvb-frontends/cxd2820r_core.c | 4 +-
+ drivers/media/dvb-frontends/dvb-pll.c | 3 +-
+ drivers/media/dvb-frontends/lgdt3306a.c | 4 +-
+ drivers/media/dvb-frontends/lgdt330x.c | 4 +-
+ drivers/media/dvb-frontends/m88ds3103.c | 3 +-
+ drivers/media/dvb-frontends/mn88443x.c | 4 +-
+ drivers/media/dvb-frontends/mn88472.c | 4 +-
+ drivers/media/dvb-frontends/mn88473.c | 4 +-
+ drivers/media/dvb-frontends/mxl692.c | 4 +-
+ drivers/media/dvb-frontends/rtl2830.c | 4 +-
+ drivers/media/dvb-frontends/rtl2832.c | 4 +-
+ drivers/media/dvb-frontends/si2165.c | 3 +-
+ drivers/media/dvb-frontends/si2168.c | 4 +-
+ drivers/media/dvb-frontends/sp2.c | 3 +-
+ drivers/media/dvb-frontends/stv090x.c | 3 +-
+ drivers/media/dvb-frontends/stv6110x.c | 3 +-
+ drivers/media/dvb-frontends/tc90522.c | 3 +-
+ drivers/media/dvb-frontends/tda10071.c | 3 +-
+ drivers/media/dvb-frontends/ts2020.c | 3 +-
+ drivers/media/i2c/ad5820.c | 3 +-
+ drivers/media/i2c/ad9389b.c | 3 +-
+ drivers/media/i2c/adp1653.c | 4 +-
+ drivers/media/i2c/adv7170.c | 3 +-
+ drivers/media/i2c/adv7175.c | 3 +-
+ drivers/media/i2c/adv7180.c | 4 +-
+ drivers/media/i2c/adv7183.c | 3 +-
+ drivers/media/i2c/adv7343.c | 4 +-
+ drivers/media/i2c/adv7393.c | 4 +-
+ drivers/media/i2c/adv748x/adv748x-core.c | 4 +-
+ drivers/media/i2c/adv7511-v4l2.c | 3 +-
+ drivers/media/i2c/adv7604.c | 3 +-
+ drivers/media/i2c/adv7842.c | 3 +-
+ drivers/media/i2c/ak7375.c | 4 +-
+ drivers/media/i2c/ak881x.c | 4 +-
+ drivers/media/i2c/ar0521.c | 3 +-
+ drivers/media/i2c/bt819.c | 3 +-
+ drivers/media/i2c/bt856.c | 3 +-
+ drivers/media/i2c/bt866.c | 3 +-
+ drivers/media/i2c/ccs/ccs-core.c | 4 +-
+ drivers/media/i2c/cs3308.c | 3 +-
+ drivers/media/i2c/cs5345.c | 3 +-
+ drivers/media/i2c/cs53l32a.c | 3 +-
+ drivers/media/i2c/cx25840/cx25840-core.c | 3 +-
+ drivers/media/i2c/dw9714.c | 4 +-
+ drivers/media/i2c/dw9768.c | 4 +-
+ drivers/media/i2c/dw9807-vcm.c | 4 +-
+ drivers/media/i2c/et8ek8/et8ek8_driver.c | 4 +-
+ drivers/media/i2c/hi556.c | 4 +-
+ drivers/media/i2c/hi846.c | 4 +-
+ drivers/media/i2c/hi847.c | 4 +-
+ drivers/media/i2c/imx208.c | 4 +-
+ drivers/media/i2c/imx214.c | 4 +-
+ drivers/media/i2c/imx219.c | 4 +-
+ drivers/media/i2c/imx258.c | 4 +-
+ drivers/media/i2c/imx274.c | 3 +-
+ drivers/media/i2c/imx290.c | 4 +-
+ drivers/media/i2c/imx319.c | 4 +-
+ drivers/media/i2c/imx334.c | 4 +-
+ drivers/media/i2c/imx335.c | 4 +-
+ drivers/media/i2c/imx355.c | 4 +-
+ drivers/media/i2c/imx412.c | 4 +-
+ drivers/media/i2c/ir-kbd-i2c.c | 4 +-
+ drivers/media/i2c/isl7998x.c | 4 +-
+ drivers/media/i2c/ks0127.c | 3 +-
+ drivers/media/i2c/lm3560.c | 4 +-
+ drivers/media/i2c/lm3646.c | 4 +-
+ drivers/media/i2c/m52790.c | 3 +-
+ drivers/media/i2c/m5mols/m5mols_core.c | 4 +-
+ drivers/media/i2c/max2175.c | 4 +-
+ drivers/media/i2c/max9286.c | 4 +-
+ drivers/media/i2c/ml86v7667.c | 4 +-
+ drivers/media/i2c/msp3400-driver.c | 3 +-
+ drivers/media/i2c/mt9m001.c | 4 +-
+ drivers/media/i2c/mt9m032.c | 3 +-
+ drivers/media/i2c/mt9m111.c | 4 +-
+ drivers/media/i2c/mt9p031.c | 4 +-
+ drivers/media/i2c/mt9t001.c | 3 +-
+ drivers/media/i2c/mt9t112.c | 4 +-
+ drivers/media/i2c/mt9v011.c | 4 +-
+ drivers/media/i2c/mt9v032.c | 4 +-
+ drivers/media/i2c/mt9v111.c | 4 +-
+ drivers/media/i2c/noon010pc30.c | 4 +-
+ drivers/media/i2c/og01a1b.c | 4 +-
+ drivers/media/i2c/ov02a10.c | 4 +-
+ drivers/media/i2c/ov08d10.c | 4 +-
+ drivers/media/i2c/ov13858.c | 4 +-
+ drivers/media/i2c/ov13b10.c | 4 +-
+ drivers/media/i2c/ov2640.c | 3 +-
+ drivers/media/i2c/ov2659.c | 4 +-
+ drivers/media/i2c/ov2680.c | 4 +-
+ drivers/media/i2c/ov2685.c | 4 +-
+ drivers/media/i2c/ov2740.c | 4 +-
+ drivers/media/i2c/ov5640.c | 4 +-
+ drivers/media/i2c/ov5645.c | 4 +-
+ drivers/media/i2c/ov5647.c | 4 +-
+ drivers/media/i2c/ov5648.c | 4 +-
+ drivers/media/i2c/ov5670.c | 4 +-
+ drivers/media/i2c/ov5675.c | 4 +-
+ drivers/media/i2c/ov5693.c | 4 +-
+ drivers/media/i2c/ov5695.c | 4 +-
+ drivers/media/i2c/ov6650.c | 3 +-
+ drivers/media/i2c/ov7251.c | 4 +-
+ drivers/media/i2c/ov7640.c | 4 +-
+ drivers/media/i2c/ov7670.c | 3 +-
+ drivers/media/i2c/ov772x.c | 4 +-
+ drivers/media/i2c/ov7740.c | 3 +-
+ drivers/media/i2c/ov8856.c | 4 +-
+ drivers/media/i2c/ov8865.c | 4 +-
+ drivers/media/i2c/ov9282.c | 4 +-
+ drivers/media/i2c/ov9640.c | 4 +-
+ drivers/media/i2c/ov9650.c | 4 +-
+ drivers/media/i2c/ov9734.c | 4 +-
+ drivers/media/i2c/rdacm20.c | 4 +-
+ drivers/media/i2c/rdacm21.c | 4 +-
+ drivers/media/i2c/rj54n1cb0c.c | 4 +-
+ drivers/media/i2c/s5c73m3/s5c73m3-core.c | 4 +-
+ drivers/media/i2c/s5k4ecgx.c | 4 +-
+ drivers/media/i2c/s5k5baf.c | 4 +-
+ drivers/media/i2c/s5k6a3.c | 3 +-
+ drivers/media/i2c/s5k6aa.c | 4 +-
+ drivers/media/i2c/saa6588.c | 4 +-
+ drivers/media/i2c/saa6752hs.c | 3 +-
+ drivers/media/i2c/saa7110.c | 3 +-
+ drivers/media/i2c/saa7115.c | 3 +-
+ drivers/media/i2c/saa7127.c | 3 +-
+ drivers/media/i2c/saa717x.c | 3 +-
+ drivers/media/i2c/saa7185.c | 3 +-
+ drivers/media/i2c/sony-btf-mpx.c | 4 +-
+ drivers/media/i2c/sr030pc30.c | 3 +-
+ drivers/media/i2c/st-mipid02.c | 4 +-
+ drivers/media/i2c/tc358743.c | 4 +-
+ drivers/media/i2c/tda1997x.c | 4 +-
+ drivers/media/i2c/tda7432.c | 3 +-
+ drivers/media/i2c/tda9840.c | 3 +-
+ drivers/media/i2c/tea6415c.c | 3 +-
+ drivers/media/i2c/tea6420.c | 3 +-
+ drivers/media/i2c/ths7303.c | 4 +-
+ drivers/media/i2c/ths8200.c | 4 +-
+ drivers/media/i2c/tlv320aic23b.c | 3 +-
+ drivers/media/i2c/tvaudio.c | 3 +-
+ drivers/media/i2c/tvp514x.c | 3 +-
+ drivers/media/i2c/tvp5150.c | 4 +-
+ drivers/media/i2c/tvp7002.c | 3 +-
+ drivers/media/i2c/tw2804.c | 3 +-
+ drivers/media/i2c/tw9903.c | 3 +-
+ drivers/media/i2c/tw9906.c | 3 +-
+ drivers/media/i2c/tw9910.c | 4 +-
+ drivers/media/i2c/uda1342.c | 3 +-
+ drivers/media/i2c/upd64031a.c | 3 +-
+ drivers/media/i2c/upd64083.c | 3 +-
+ drivers/media/i2c/video-i2c.c | 4 +-
+ drivers/media/i2c/vp27smpx.c | 3 +-
+ drivers/media/i2c/vpx3220.c | 4 +-
+ drivers/media/i2c/vs6624.c | 3 +-
+ drivers/media/i2c/wm8739.c | 3 +-
+ drivers/media/i2c/wm8775.c | 3 +-
+ drivers/media/radio/radio-tea5764.c | 3 +-
+ drivers/media/radio/saa7706h.c | 3 +-
+ drivers/media/radio/si470x/radio-si470x-i2c.c | 3 +-
+ drivers/media/radio/si4713/si4713.c | 4 +-
+ drivers/media/radio/tef6862.c | 3 +-
+ drivers/media/test-drivers/vidtv/vidtv_demod.c | 4 +-
+ drivers/media/test-drivers/vidtv/vidtv_tuner.c | 4 +-
+ drivers/media/tuners/e4000.c | 4 +-
+ drivers/media/tuners/fc2580.c | 3 +-
+ drivers/media/tuners/m88rs6000t.c | 4 +-
+ drivers/media/tuners/mt2060.c | 4 +-
+ drivers/media/tuners/mxl301rf.c | 3 +-
+ drivers/media/tuners/qm1d1b0004.c | 3 +-
+ drivers/media/tuners/qm1d1c0042.c | 3 +-
+ drivers/media/tuners/si2157.c | 4 +-
+ drivers/media/tuners/tda18212.c | 4 +-
+ drivers/media/tuners/tda18250.c | 4 +-
+ drivers/media/tuners/tua9001.c | 3 +-
+ drivers/media/usb/go7007/s2250-board.c | 3 +-
+ drivers/media/v4l2-core/tuner-core.c | 3 +-
+ drivers/mfd/88pm800.c | 4 +-
+ drivers/mfd/88pm805.c | 4 +-
+ drivers/mfd/88pm860x-core.c | 3 +-
+ drivers/mfd/acer-ec-a500.c | 4 +-
+ drivers/mfd/arizona-i2c.c | 4 +-
+ drivers/mfd/axp20x-i2c.c | 4 +-
+ drivers/mfd/da903x.c | 3 +-
+ drivers/mfd/da9052-i2c.c | 3 +-
+ drivers/mfd/da9055-i2c.c | 4 +-
+ drivers/mfd/da9062-core.c | 4 +-
+ drivers/mfd/da9150-core.c | 4 +-
+ drivers/mfd/dm355evm_msp.c | 3 +-
+ drivers/mfd/ene-kb3930.c | 4 +-
+ drivers/mfd/gateworks-gsc.c | 4 +-
+ drivers/mfd/intel_soc_pmic_core.c | 4 +-
+ drivers/mfd/iqs62x.c | 4 +-
+ drivers/mfd/lm3533-core.c | 4 +-
+ drivers/mfd/lp8788.c | 3 +-
+ drivers/mfd/madera-i2c.c | 4 +-
+ drivers/mfd/max14577.c | 4 +-
+ drivers/mfd/max77693.c | 4 +-
+ drivers/mfd/max8907.c | 4 +-
+ drivers/mfd/max8925-i2c.c | 3 +-
+ drivers/mfd/mc13xxx-i2c.c | 3 +-
+ drivers/mfd/menelaus.c | 3 +-
+ drivers/mfd/ntxec.c | 4 +-
+ drivers/mfd/palmas.c | 4 +-
+ drivers/mfd/pcf50633-core.c | 4 +-
+ drivers/mfd/retu-mfd.c | 4 +-
+ drivers/mfd/rk808.c | 4 +-
+ drivers/mfd/rn5t618.c | 4 +-
+ drivers/mfd/rsmu_i2c.c | 4 +-
+ drivers/mfd/rt4831.c | 4 +-
+ drivers/mfd/si476x-i2c.c | 4 +-
+ drivers/mfd/stmfx.c | 4 +-
+ drivers/mfd/stmpe-i2c.c | 4 +-
+ drivers/mfd/tc3589x.c | 4 +-
+ drivers/mfd/tps6105x.c | 4 +-
+ drivers/mfd/tps65010.c | 3 +-
+ drivers/mfd/tps65086.c | 4 +-
+ drivers/mfd/tps65217.c | 4 +-
+ drivers/mfd/tps6586x.c | 3 +-
+ drivers/mfd/tps65912-i2c.c | 4 +-
+ drivers/mfd/twl-core.c | 3 +-
+ drivers/mfd/twl6040.c | 4 +-
+ drivers/mfd/wm8994-core.c | 4 +-
+ drivers/misc/ad525x_dpot-i2c.c | 3 +-
+ drivers/misc/apds9802als.c | 3 +-
+ drivers/misc/apds990x.c | 3 +-
+ drivers/misc/bh1770glc.c | 4 +-
+ drivers/misc/ds1682.c | 3 +-
+ drivers/misc/eeprom/at24.c | 4 +-
+ drivers/misc/eeprom/ee1004.c | 4 +-
+ drivers/misc/eeprom/eeprom.c | 4 +-
+ drivers/misc/eeprom/idt_89hpesx.c | 4 +-
+ drivers/misc/eeprom/max6875.c | 4 +-
+ drivers/misc/hmc6352.c | 3 +-
+ drivers/misc/ics932s401.c | 5 +-
+ drivers/misc/isl29003.c | 3 +-
+ drivers/misc/isl29020.c | 3 +-
+ drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 3 +-
+ drivers/misc/tsl2550.c | 4 +-
+ drivers/mtd/maps/pismo.c | 4 +-
+ drivers/net/dsa/lan9303_i2c.c | 6 +-
+ drivers/net/dsa/microchip/ksz9477_i2c.c | 4 +-
+ drivers/net/dsa/xrs700x/xrs700x_i2c.c | 6 +-
+ drivers/net/ethernet/mellanox/mlxsw/i2c.c | 4 +-
+ drivers/net/mctp/mctp-i2c.c | 4 +-
+ drivers/nfc/fdp/i2c.c | 4 +-
+ drivers/nfc/microread/i2c.c | 4 +-
+ drivers/nfc/nfcmrvl/i2c.c | 4 +-
+ drivers/nfc/nxp-nci/i2c.c | 4 +-
+ drivers/nfc/pn533/i2c.c | 4 +-
+ drivers/nfc/pn544/i2c.c | 4 +-
+ drivers/nfc/s3fwrn5/i2c.c | 4 +-
+ drivers/nfc/st-nci/i2c.c | 4 +-
+ drivers/nfc/st21nfca/i2c.c | 4 +-
+ drivers/of/unittest.c | 6 +-
+ drivers/platform/chrome/cros_ec_i2c.c | 4 +-
+ drivers/platform/surface/surface3_power.c | 4 +-
+ drivers/platform/x86/asus-tf103c-dock.c | 4 +-
+ drivers/platform/x86/intel/int3472/tps68470.c | 4 +-
+ drivers/power/supply/bq2415x_charger.c | 4 +-
+ drivers/power/supply/bq24190_charger.c | 4 +-
+ drivers/power/supply/bq24257_charger.c | 4 +-
+ drivers/power/supply/bq25890_charger.c | 4 +-
+ drivers/power/supply/bq27xxx_battery_i2c.c | 4 +-
+ drivers/power/supply/cw2015_battery.c | 3 +-
+ drivers/power/supply/ds2782_battery.c | 4 +-
+ drivers/power/supply/lp8727_charger.c | 3 +-
+ drivers/power/supply/rt5033_battery.c | 4 +-
+ drivers/power/supply/rt9455_charger.c | 4 +-
+ drivers/power/supply/smb347-charger.c | 4 +-
+ drivers/power/supply/z2_battery.c | 4 +-
+ drivers/pwm/pwm-pca9685.c | 4 +-
+ drivers/regulator/da9121-regulator.c | 3 +-
+ drivers/regulator/lp8755.c | 4 +-
+ drivers/regulator/rpi-panel-attiny-regulator.c | 4 +-
+ drivers/rtc/rtc-bq32k.c | 4 +-
+ drivers/rtc/rtc-ds1374.c | 4 +-
+ drivers/rtc/rtc-isl12026.c | 3 +-
+ drivers/rtc/rtc-m41t80.c | 4 +-
+ drivers/rtc/rtc-rs5c372.c | 3 +-
+ drivers/rtc/rtc-x1205.c | 3 +-
+ drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 4 +-
+ drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 4 +-
+ drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 4 +-
+ .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 3 +-
+ drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 4 +-
+ drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 4 +-
+ .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 4 +-
+ drivers/staging/media/max96712/max96712.c | 4 +-
+ drivers/staging/most/i2c/i2c.c | 4 +-
+ drivers/staging/olpc_dcon/olpc_dcon.c | 4 +-
+ drivers/tty/serial/max310x.c | 4 +-
+ drivers/tty/serial/sc16is7xx.c | 4 +-
+ drivers/usb/misc/usb3503.c | 4 +-
+ drivers/usb/phy/phy-isp1301-omap.c | 4 +-
+ drivers/usb/phy/phy-isp1301.c | 4 +-
+ drivers/usb/typec/anx7411.c | 4 +-
+ drivers/usb/typec/hd3ss3220.c | 4 +-
+ drivers/usb/typec/mux/fsa4480.c | 4 +-
+ drivers/usb/typec/mux/pi3usb30532.c | 3 +-
+ drivers/usb/typec/rt1719.c | 4 +-
+ drivers/usb/typec/stusb160x.c | 4 +-
+ drivers/usb/typec/tcpm/fusb302.c | 4 +-
+ drivers/usb/typec/tcpm/tcpci.c | 4 +-
+ drivers/usb/typec/tcpm/tcpci_maxim.c | 4 +-
+ drivers/usb/typec/tcpm/tcpci_rt1711h.c | 3 +-
+ drivers/usb/typec/tipd/core.c | 4 +-
+ drivers/usb/typec/ucsi/ucsi_ccg.c | 4 +-
+ drivers/usb/typec/ucsi/ucsi_stm32g0.c | 4 +-
+ drivers/usb/typec/wusb3801.c | 4 +-
+ drivers/video/backlight/adp8860_bl.c | 4 +-
+ drivers/video/backlight/adp8870_bl.c | 4 +-
+ drivers/video/backlight/arcxcnn_bl.c | 4 +-
+ drivers/video/backlight/bd6107.c | 4 +-
+ drivers/video/backlight/lm3630a_bl.c | 3 +-
+ drivers/video/backlight/lm3639_bl.c | 3 +-
+ drivers/video/backlight/lp855x_bl.c | 4 +-
+ drivers/video/backlight/lv5207lp.c | 4 +-
+ drivers/video/backlight/tosa_bl.c | 3 +-
+ drivers/video/fbdev/matrox/matroxfb_maven.c | 3 +-
+ drivers/video/fbdev/ssd1307fb.c | 4 +-
+ drivers/w1/masters/ds2482.c | 3 +-
+ drivers/watchdog/ziirave_wdt.c | 4 +-
+ include/linux/i2c.h | 2 +-
+ include/linux/platform_data/pca953x.h | 2 +-
+ sound/aoa/codecs/onyx.c | 3 +-
+ sound/aoa/codecs/tas.c | 3 +-
+ sound/pci/hda/cs35l41_hda_i2c.c | 4 +-
+ sound/ppc/keywest.c | 6 +-
+ sound/soc/codecs/adau1761-i2c.c | 3 +-
+ sound/soc/codecs/adau1781-i2c.c | 3 +-
+ sound/soc/codecs/ak4375.c | 4 +-
+ sound/soc/codecs/ak4458.c | 4 +-
+ sound/soc/codecs/ak4641.c | 4 +-
+ sound/soc/codecs/ak5558.c | 4 +-
+ sound/soc/codecs/cs35l32.c | 4 +-
+ sound/soc/codecs/cs35l33.c | 4 +-
+ sound/soc/codecs/cs35l34.c | 4 +-
+ sound/soc/codecs/cs35l35.c | 4 +-
+ sound/soc/codecs/cs35l36.c | 4 +-
+ sound/soc/codecs/cs35l41-i2c.c | 4 +-
+ sound/soc/codecs/cs35l45-i2c.c | 4 +-
+ sound/soc/codecs/cs4234.c | 4 +-
+ sound/soc/codecs/cs4265.c | 4 +-
+ sound/soc/codecs/cs4270.c | 4 +-
+ sound/soc/codecs/cs42l42.c | 4 +-
+ sound/soc/codecs/cs42l51-i2c.c | 4 +-
+ sound/soc/codecs/cs42l56.c | 3 +-
+ sound/soc/codecs/cs42xx8-i2c.c | 4 +-
+ sound/soc/codecs/cs43130.c | 4 +-
+ sound/soc/codecs/cs4349.c | 4 +-
+ sound/soc/codecs/cs53l30.c | 4 +-
+ sound/soc/codecs/cx2072x.c | 3 +-
+ sound/soc/codecs/max98090.c | 4 +-
+ sound/soc/codecs/max9860.c | 3 +-
+ sound/soc/codecs/max98927.c | 4 +-
+ sound/soc/codecs/mt6660.c | 3 +-
+ sound/soc/codecs/nau8825.c | 6 +-
+ sound/soc/codecs/pcm1789-i2c.c | 4 +-
+ sound/soc/codecs/pcm3168a-i2c.c | 4 +-
+ sound/soc/codecs/pcm512x-i2c.c | 3 +-
+ sound/soc/codecs/rt274.c | 4 +-
+ sound/soc/codecs/rt286.c | 4 +-
+ sound/soc/codecs/rt298.c | 4 +-
+ sound/soc/codecs/rt5616.c | 6 +-
+ sound/soc/codecs/rt5631.c | 6 +-
+ sound/soc/codecs/rt5645.c | 4 +-
+ sound/soc/codecs/rt5663.c | 4 +-
+ sound/soc/codecs/rt5670.c | 4 +-
+ sound/soc/codecs/rt5677.c | 4 +-
+ sound/soc/codecs/rt5682-i2c.c | 4 +-
+ sound/soc/codecs/rt5682s.c | 4 +-
+ sound/soc/codecs/rt9120.c | 3 +-
+ sound/soc/codecs/sgtl5000.c | 4 +-
+ sound/soc/codecs/sta350.c | 6 +-
+ sound/soc/codecs/tas2552.c | 3 +-
+ sound/soc/codecs/tas5086.c | 6 +-
+ sound/soc/codecs/tas571x.c | 4 +-
+ sound/soc/codecs/tas5805m.c | 3 +-
+ sound/soc/codecs/tas6424.c | 4 +-
+ sound/soc/codecs/tlv320adc3xxx.c | 3 +-
+ sound/soc/codecs/tlv320aic32x4-i2c.c | 4 +-
+ sound/soc/codecs/tlv320aic3x-i2c.c | 4 +-
+ sound/soc/codecs/tlv320dac33.c | 4 +-
+ sound/soc/codecs/wm1250-ev1.c | 4 +-
+ sound/soc/codecs/wm2200.c | 4 +-
+ sound/soc/codecs/wm5100.c | 4 +-
+ sound/soc/codecs/wm8804-i2c.c | 3 +-
+ sound/soc/codecs/wm8900.c | 6 +-
+ sound/soc/codecs/wm8903.c | 4 +-
+ sound/soc/codecs/wm8960.c | 6 +-
+ sound/soc/codecs/wm8962.c | 3 +-
+ sound/soc/codecs/wm8993.c | 4 +-
+ sound/soc/codecs/wm8996.c | 4 +-
+ sound/soc/codecs/wm9081.c | 6 +-
+ 632 files changed, 776 insertions(+), 1802 deletions(-)
+Merging i3c/i3c/next (568035b01cfb Linux 6.0-rc1)
+$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next
+Already up to date.
+Merging dmi/dmi-for-next (d2139dfca361 firmware: dmi: Use the proper accessor for the version field)
+$ 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 (e8a253862802 hwmon: (mr75203) skip reset-control deassert for SOCs that don't support it)
+$ 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
+Auto-merging MAINTAINERS
+Auto-merging drivers/hwmon/adc128d818.c
+Auto-merging drivers/hwmon/asb100.c
+Auto-merging drivers/hwmon/asc7621.c
+Auto-merging drivers/hwmon/dme1737.c
+Auto-merging drivers/hwmon/f75375s.c
+Auto-merging drivers/hwmon/fschmd.c
+Auto-merging drivers/hwmon/ftsteutates.c
+Auto-merging drivers/hwmon/jc42.c
+Auto-merging drivers/hwmon/tps23861.c
+Auto-merging drivers/hwmon/w83781d.c
+Auto-merging drivers/hwmon/w83791d.c
+Auto-merging drivers/hwmon/w83792d.c
+Auto-merging drivers/hwmon/w83793.c
+Auto-merging drivers/hwmon/w83795.c
+Auto-merging drivers/hwmon/w83l785ts.c
+Merge made by the 'ort' strategy.
+ .../bindings/hwmon/microchip,sparx5-temp.yaml | 4 +-
+ .../devicetree/bindings/hwmon/moortec,mr75203.yaml | 27 +-
+ Documentation/driver-api/driver-model/devres.rst | 1 -
+ Documentation/driver-api/pwm.rst | 3 +-
+ Documentation/hwmon/aquacomputer_d5next.rst | 37 +-
+ Documentation/hwmon/asus_wmi_ec_sensors.rst | 38 --
+ Documentation/hwmon/corsair-psu.rst | 5 +-
+ Documentation/hwmon/emc2305.rst | 37 ++
+ Documentation/hwmon/index.rst | 2 +-
+ Documentation/hwmon/max31790.rst | 1 +
+ MAINTAINERS | 11 +-
+ drivers/hwmon/Kconfig | 34 +-
+ drivers/hwmon/Makefile | 2 +-
+ drivers/hwmon/adc128d818.c | 2 +-
+ drivers/hwmon/adm1021.c | 2 +-
+ drivers/hwmon/adm1025.c | 2 +-
+ drivers/hwmon/adm1026.c | 2 +-
+ drivers/hwmon/adm1029.c | 2 +-
+ drivers/hwmon/adm1031.c | 2 +-
+ drivers/hwmon/adt7411.c | 2 +-
+ drivers/hwmon/adt7462.c | 2 +-
+ drivers/hwmon/adt7475.c | 2 +-
+ drivers/hwmon/amc6821.c | 2 +-
+ drivers/hwmon/aquacomputer_d5next.c | 179 +++++-
+ drivers/hwmon/asb100.c | 2 +-
+ drivers/hwmon/asc7621.c | 2 +-
+ drivers/hwmon/asus_wmi_ec_sensors.c | 622 --------------------
+ drivers/hwmon/corsair-psu.c | 29 +-
+ drivers/hwmon/dell-smm-hwmon.c | 14 +-
+ drivers/hwmon/dme1737.c | 2 +-
+ drivers/hwmon/emc1403.c | 12 +-
+ drivers/hwmon/emc2103.c | 2 +-
+ drivers/hwmon/emc2305.c | 623 +++++++++++++++++++++
+ drivers/hwmon/emc6w201.c | 2 +-
+ drivers/hwmon/f75375s.c | 2 +-
+ drivers/hwmon/fschmd.c | 2 +-
+ drivers/hwmon/ftsteutates.c | 2 +-
+ drivers/hwmon/gl518sm.c | 2 +-
+ drivers/hwmon/gl520sm.c | 2 +-
+ drivers/hwmon/iio_hwmon.c | 8 +-
+ drivers/hwmon/jc42.c | 2 +-
+ drivers/hwmon/lm63.c | 6 +-
+ drivers/hwmon/lm73.c | 2 +-
+ drivers/hwmon/lm75.c | 2 +-
+ drivers/hwmon/lm77.c | 2 +-
+ drivers/hwmon/lm78.c | 2 +-
+ drivers/hwmon/lm80.c | 2 +-
+ drivers/hwmon/lm83.c | 2 +-
+ drivers/hwmon/lm85.c | 2 +-
+ drivers/hwmon/lm87.c | 2 +-
+ drivers/hwmon/lm90.c | 2 +-
+ drivers/hwmon/lm92.c | 2 +-
+ drivers/hwmon/lm93.c | 2 +-
+ drivers/hwmon/lm95234.c | 2 +-
+ drivers/hwmon/lm95241.c | 2 +-
+ drivers/hwmon/lm95245.c | 2 +-
+ drivers/hwmon/max1619.c | 2 +-
+ drivers/hwmon/max1668.c | 2 +-
+ drivers/hwmon/max31730.c | 2 +-
+ drivers/hwmon/max31790.c | 38 +-
+ drivers/hwmon/max6639.c | 2 +-
+ drivers/hwmon/max6642.c | 2 +-
+ drivers/hwmon/mr75203.c | 11 +-
+ drivers/hwmon/nct7802.c | 2 +-
+ drivers/hwmon/nct7904.c | 2 +-
+ drivers/hwmon/pwm-fan.c | 2 +-
+ drivers/hwmon/smsc47m192.c | 2 +-
+ drivers/hwmon/sparx5-temp.c | 19 +-
+ drivers/hwmon/stts751.c | 2 +-
+ drivers/hwmon/thmc50.c | 2 +-
+ drivers/hwmon/tmp401.c | 2 +-
+ drivers/hwmon/tmp421.c | 2 +-
+ drivers/hwmon/tps23861.c | 93 ++-
+ drivers/hwmon/w83781d.c | 2 +-
+ drivers/hwmon/w83791d.c | 2 +-
+ drivers/hwmon/w83792d.c | 2 +-
+ drivers/hwmon/w83793.c | 2 +-
+ drivers/hwmon/w83795.c | 2 +-
+ drivers/hwmon/w83l785ts.c | 2 +-
+ drivers/hwmon/w83l786ng.c | 2 +-
+ drivers/pwm/core.c | 35 +-
+ include/linux/platform_data/emc2305.h | 22 +
+ include/linux/pwm.h | 20 -
+ 83 files changed, 1111 insertions(+), 932 deletions(-)
+ delete mode 100644 Documentation/hwmon/asus_wmi_ec_sensors.rst
+ create mode 100644 Documentation/hwmon/emc2305.rst
+ delete mode 100644 drivers/hwmon/asus_wmi_ec_sensors.c
+ create mode 100644 drivers/hwmon/emc2305.c
+ create mode 100644 include/linux/platform_data/emc2305.h
+$ git am -3 ../patches/0001-hwmon-emc2305-fix-up-for-i2c-Make-remove-callback-re.patch
+Applying: hwmon: (emc2305) fix up for "i2c: Make remove callback return void"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/hwmon/emc2305.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 482a3f533e97] Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
+ Date: Fri Sep 16 09:16:59 2022 +1000
+Merging jc_docs/docs-next (7ebeef22dcc2 Merge branch 'docs-mw' into docs-next)
+$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next
+Auto-merging Documentation/ABI/testing/sysfs-devices-system-cpu
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-bus-bcma | 2 +-
+ Documentation/ABI/testing/sysfs-bus-fcoe | 2 +-
+ Documentation/ABI/testing/sysfs-bus-iio-proximity | 2 +-
+ Documentation/ABI/testing/sysfs-devices-system-cpu | 2 +-
+ Documentation/ABI/testing/sysfs-power | 2 +-
+ Documentation/RCU/checklist.rst | 2 +-
+ Documentation/RCU/lockdep.rst | 2 +-
+ Documentation/admin-guide/README.rst | 91 +--
+ Documentation/admin-guide/kdump/vmcoreinfo.rst | 2 +-
+ Documentation/bpf/instruction-set.rst | 2 +-
+ Documentation/bpf/map_cgroup_storage.rst | 4 +-
+ Documentation/conf.py | 39 +-
+ Documentation/core-api/cpu_hotplug.rst | 2 +-
+ Documentation/core-api/irq/irq-domain.rst | 2 +-
+ Documentation/driver-api/isa.rst | 2 +-
+ Documentation/filesystems/caching/backend-api.rst | 2 +-
+ Documentation/filesystems/ext4/super.rst | 6 +-
+ .../filesystems/xfs-delayed-logging-design.rst | 12 +-
+ Documentation/locking/seqlock.rst | 2 +-
+ Documentation/process/magic-number.rst | 4 +-
+ Documentation/process/maintainer-pgp-guide.rst | 286 ++++-----
+ Documentation/scheduler/sched-design-CFS.rst | 2 +-
+ Documentation/trace/histogram.rst | 2 +-
+ Documentation/trace/timerlat-tracer.rst | 2 +-
+ .../translations/it_IT/process/magic-number.rst | 4 +-
+ Documentation/translations/zh_CN/IRQ.txt | 39 --
+ .../translations/zh_CN/driver-api/gpio/index.rst | 69 ++
+ .../zh_CN/{gpio.txt => driver-api/gpio/legacy.rst} | 184 ++++--
+ .../translations/zh_CN/driver-api/index.rst | 132 ++++
+ .../translations/zh_CN/driver-api/io_ordering.rst | 60 ++
+ Documentation/translations/zh_CN/index.rst | 2 +-
+ Documentation/translations/zh_CN/io_ordering.txt | 67 --
+ Documentation/translations/zh_CN/oops-tracing.txt | 212 ------
+ .../translations/zh_CN/process/email-clients.rst | 265 +++++---
+ .../translations/zh_CN/process/magic-number.rst | 4 +-
+ .../zh_CN/process/submit-checklist.rst | 84 +--
+ .../zh_CN/process/submitting-patches.rst | 714 ++++++++++-----------
+ .../zh_CN/scheduler/sched-design-CFS.rst | 2 +-
+ Documentation/translations/zh_TW/oops-tracing.txt | 212 ------
+ .../translations/zh_TW/process/magic-number.rst | 4 +-
+ Documentation/virt/kvm/x86/mmu.rst | 2 +-
+ include/uapi/linux/nbd.h | 3 +-
+ 42 files changed, 1177 insertions(+), 1358 deletions(-)
+ delete mode 100644 Documentation/translations/zh_CN/IRQ.txt
+ create mode 100644 Documentation/translations/zh_CN/driver-api/gpio/index.rst
+ rename Documentation/translations/zh_CN/{gpio.txt => driver-api/gpio/legacy.rst} (89%)
+ create mode 100644 Documentation/translations/zh_CN/driver-api/index.rst
+ create mode 100644 Documentation/translations/zh_CN/driver-api/io_ordering.rst
+ delete mode 100644 Documentation/translations/zh_CN/io_ordering.txt
+ delete mode 100644 Documentation/translations/zh_CN/oops-tracing.txt
+ delete mode 100644 Documentation/translations/zh_TW/oops-tracing.txt
+Merging v4l-dvb/master (fbb6c848dd89 media: destage Hantro VPU driver)
+$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master
+Auto-merging MAINTAINERS
+Auto-merging drivers/media/i2c/adv7511-v4l2.c
+Auto-merging drivers/media/i2c/adv7604.c
+Auto-merging drivers/media/i2c/adv7842.c
+Auto-merging drivers/media/i2c/tc358743.c
+Auto-merging drivers/media/usb/uvc/uvc_driver.c
+Merge made by the 'ort' strategy.
+ .../bindings/media/mediatek,mdp3-rdma.yaml | 95 ++
+ .../bindings/media/mediatek,mdp3-rsz.yaml | 77 +
+ .../bindings/media/mediatek,mdp3-wrot.yaml | 80 +
+ .../bindings/media/mediatek,vcodec-encoder.yaml | 1 +
+ .../media/mediatek,vcodec-subdev-decoder.yaml | 1 +
+ .../devicetree/bindings/media/nxp,dw100.yaml | 69 +
+ .../devicetree/bindings/media/renesas,vsp1.yaml | 53 +-
+ .../bindings/soc/mediatek/mediatek,ccorr.yaml | 68 +
+ .../bindings/soc/mediatek/mediatek,wdma.yaml | 81 +
+ .../driver-api/media/drivers/pxa_camera.rst | 2 +-
+ .../userspace-api/media/drivers/dw100.rst | 84 +
+ .../userspace-api/media/drivers/index.rst | 1 +
+ Documentation/userspace-api/media/v4l/async.rst | 9 -
+ .../userspace-api/media/v4l/dev-raw-vbi.rst | 2 +-
+ Documentation/userspace-api/media/v4l/dev-sdr.rst | 2 +-
+ .../userspace-api/media/v4l/dev-sliced-vbi.rst | 2 +-
+ .../userspace-api/media/v4l/hist-v4l2.rst | 2 +-
+ Documentation/userspace-api/media/v4l/io.rst | 4 +-
+ .../userspace-api/media/v4l/vidioc-dqevent.rst | 5 +
+ .../userspace-api/media/v4l/vidioc-querycap.rst | 3 -
+ .../userspace-api/media/videodev2.h.rst.exceptions | 1 +
+ MAINTAINERS | 24 +-
+ drivers/media/cec/platform/sti/stih-cec.c | 4 +-
+ drivers/media/common/Kconfig | 1 -
+ drivers/media/common/Makefile | 2 +-
+ drivers/media/common/videobuf2/videobuf2-core.c | 14 +-
+ drivers/media/common/videobuf2/videobuf2-dvb.c | 4 +-
+ drivers/media/common/videobuf2/videobuf2-v4l2.c | 17 +-
+ drivers/media/dvb-frontends/dib8000.c | 2 +-
+ drivers/media/dvb-frontends/drxk_hard.c | 2 +-
+ drivers/media/dvb-frontends/rtl2832_sdr.c | 2 +-
+ drivers/media/dvb-frontends/tda1002x.h | 2 +-
+ drivers/media/dvb-frontends/tda10048.c | 2 +-
+ drivers/media/i2c/adv7511-v4l2.c | 4 +-
+ drivers/media/i2c/adv7604.c | 4 +-
+ drivers/media/i2c/adv7842.c | 4 +-
+ drivers/media/i2c/cx25840/cx25840-ir.c | 2 +-
+ drivers/media/i2c/tc358743.c | 2 +
+ drivers/media/pci/Kconfig | 4 +-
+ drivers/media/pci/Makefile | 6 +-
+ drivers/media/pci/cx18/cx18-av-audio.c | 2 +-
+ drivers/media/pci/cx18/cx18-firmware.c | 2 +-
+ drivers/media/pci/cx23885/cx23885-core.c | 3 +
+ drivers/media/pci/cx23885/cx23888-ir.c | 2 +-
+ drivers/media/pci/cx88/cx88-dsp.c | 2 +-
+ drivers/media/pci/cx88/cx88-vbi.c | 9 +-
+ drivers/media/pci/cx88/cx88-video.c | 43 +-
+ drivers/media/pci/ivtv/ivtv-yuv.c | 2 +-
+ drivers/media/pci/ngene/ngene.h | 78 -
+ drivers/media/pci/saa7164/saa7164-core.c | 2 +-
+ drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 2 +-
+ drivers/{staging/media => media/pci}/zoran/Kconfig | 0
+ .../{staging/media => media/pci}/zoran/Makefile | 0
+ .../media => media/pci}/zoran/videocodec.c | 7 +-
+ .../media => media/pci}/zoran/videocodec.h | 190 +--
+ drivers/{staging/media => media/pci}/zoran/zoran.h | 30 +-
+ .../media => media/pci}/zoran/zoran_card.c | 56 +-
+ .../media => media/pci}/zoran/zoran_card.h | 9 +-
+ .../media => media/pci}/zoran/zoran_device.c | 37 +-
+ drivers/media/pci/zoran/zoran_device.h | 60 +
+ .../media => media/pci}/zoran/zoran_driver.c | 59 +-
+ .../{staging/media => media/pci}/zoran/zr36016.c | 142 +-
+ .../{staging/media => media/pci}/zoran/zr36016.h | 0
+ .../{staging/media => media/pci}/zoran/zr36050.c | 182 +--
+ .../{staging/media => media/pci}/zoran/zr36050.h | 0
+ .../{staging/media => media/pci}/zoran/zr36057.h | 130 +-
+ .../{staging/media => media/pci}/zoran/zr36060.c | 7 +-
+ .../{staging/media => media/pci}/zoran/zr36060.h | 86 +-
+ drivers/media/platform/Kconfig | 1 +
+ drivers/media/platform/Makefile | 1 +
+ drivers/media/platform/amlogic/meson-ge2d/ge2d.c | 1 -
+ drivers/media/platform/amphion/vdec.c | 16 +-
+ drivers/media/platform/amphion/venc.c | 2 +-
+ drivers/media/platform/amphion/vpu.h | 1 -
+ drivers/media/platform/amphion/vpu_core.c | 84 +-
+ drivers/media/platform/amphion/vpu_core.h | 1 +
+ drivers/media/platform/amphion/vpu_dbg.c | 9 +-
+ drivers/media/platform/amphion/vpu_malone.c | 2 +-
+ drivers/media/platform/intel/pxa_camera.c | 8 +-
+ drivers/media/platform/marvell/mcam-core.h | 2 +-
+ drivers/media/platform/mediatek/Kconfig | 1 +
+ drivers/media/platform/mediatek/Makefile | 1 +
+ .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 1 -
+ drivers/media/platform/mediatek/mdp3/Kconfig | 21 +
+ drivers/media/platform/mediatek/mdp3/Makefile | 6 +
+ .../media/platform/mediatek/mdp3/mdp_reg_ccorr.h | 19 +
+ .../media/platform/mediatek/mdp3/mdp_reg_rdma.h | 65 +
+ drivers/media/platform/mediatek/mdp3/mdp_reg_rsz.h | 39 +
+ .../media/platform/mediatek/mdp3/mdp_reg_wdma.h | 47 +
+ .../media/platform/mediatek/mdp3/mdp_reg_wrot.h | 55 +
+ drivers/media/platform/mediatek/mdp3/mtk-img-ipi.h | 290 ++++
+ .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c | 466 ++++++
+ .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.h | 43 +
+ .../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 1033 ++++++++++++
+ .../media/platform/mediatek/mdp3/mtk-mdp3-comp.h | 186 +++
+ .../media/platform/mediatek/mdp3/mtk-mdp3-core.c | 357 ++++
+ .../media/platform/mediatek/mdp3/mtk-mdp3-core.h | 94 ++
+ .../media/platform/mediatek/mdp3/mtk-mdp3-m2m.c | 724 +++++++++
+ .../media/platform/mediatek/mdp3/mtk-mdp3-m2m.h | 48 +
+ .../media/platform/mediatek/mdp3/mtk-mdp3-regs.c | 735 +++++++++
+ .../media/platform/mediatek/mdp3/mtk-mdp3-regs.h | 373 +++++
+ .../media/platform/mediatek/mdp3/mtk-mdp3-vpu.c | 313 ++++
+ .../media/platform/mediatek/mdp3/mtk-mdp3-vpu.h | 78 +
+ .../platform/mediatek/vcodec/mtk_vcodec_dec.c | 2 +
+ .../platform/mediatek/vcodec/mtk_vcodec_dec_drv.c | 4 +
+ .../platform/mediatek/vcodec/mtk_vcodec_drv.h | 6 +
+ .../platform/mediatek/vcodec/mtk_vcodec_enc.c | 19 +-
+ .../platform/mediatek/vcodec/mtk_vcodec_enc_drv.c | 22 +-
+ .../platform/mediatek/vcodec/venc/venc_h264_if.c | 200 ++-
+ .../media/platform/mediatek/vcodec/venc_ipi_msg.h | 24 +
+ .../media/platform/mediatek/vcodec/venc_vpu_if.c | 76 +-
+ drivers/media/platform/nxp/Kconfig | 13 +-
+ drivers/media/platform/nxp/Makefile | 2 +-
+ drivers/media/platform/nxp/dw100/Kconfig | 16 +
+ drivers/media/platform/nxp/dw100/Makefile | 3 +
+ drivers/media/platform/nxp/dw100/dw100.c | 1707 ++++++++++++++++++++
+ drivers/media/platform/nxp/dw100/dw100_regs.h | 117 ++
+ drivers/media/platform/renesas/vsp1/vsp1.h | 4 +
+ drivers/media/platform/renesas/vsp1/vsp1_drv.c | 101 +-
+ drivers/media/platform/renesas/vsp1/vsp1_lif.c | 12 +-
+ drivers/media/platform/renesas/vsp1/vsp1_regs.h | 6 +
+ drivers/media/platform/renesas/vsp1/vsp1_video.c | 2 +-
+ drivers/media/platform/rockchip/rga/rga.c | 2 +-
+ .../media/platform/samsung/exynos4-is/fimc-core.h | 2 +-
+ .../media/platform/samsung/exynos4-is/fimc-is.c | 1 +
+ drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c | 5 +-
+ .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 2 +-
+ drivers/media/platform/ti/am437x/am437x-vpfe.h | 2 +-
+ drivers/media/platform/ti/cal/cal-camerarx.c | 31 +-
+ drivers/media/platform/ti/cal/cal-video.c | 5 +-
+ drivers/media/platform/ti/cal/cal.c | 139 +-
+ drivers/media/platform/ti/cal/cal.h | 7 +-
+ drivers/media/platform/ti/davinci/Kconfig | 49 -
+ drivers/media/platform/ti/davinci/Makefile | 4 -
+ drivers/media/platform/ti/davinci/vpbe.c | 2 +-
+ drivers/media/platform/ti/davinci/vpif.h | 60 +-
+ drivers/media/platform/ti/davinci/vpif_capture.c | 6 +-
+ drivers/media/platform/ti/davinci/vpif_capture.h | 2 +-
+ drivers/media/platform/ti/davinci/vpif_display.c | 6 +-
+ drivers/media/platform/ti/davinci/vpif_display.h | 6 +-
+ drivers/media/platform/ti/omap/omap_voutlib.c | 2 +-
+ drivers/media/platform/ti/omap3isp/isp.c | 2 +-
+ drivers/media/platform/ti/omap3isp/ispvideo.c | 2 +-
+ .../hantro => media/platform/verisilicon}/Kconfig | 6 +-
+ .../hantro => media/platform/verisilicon}/Makefile | 0
+ .../hantro => media/platform/verisilicon}/hantro.h | 0
+ .../platform/verisilicon}/hantro_drv.c | 0
+ .../platform/verisilicon}/hantro_g1.c | 0
+ .../platform/verisilicon}/hantro_g1_h264_dec.c | 0
+ .../platform/verisilicon}/hantro_g1_mpeg2_dec.c | 0
+ .../platform/verisilicon}/hantro_g1_regs.h | 0
+ .../platform/verisilicon}/hantro_g1_vp8_dec.c | 0
+ .../platform/verisilicon}/hantro_g2.c | 0
+ .../platform/verisilicon}/hantro_g2_hevc_dec.c | 0
+ .../platform/verisilicon}/hantro_g2_regs.h | 0
+ .../platform/verisilicon}/hantro_g2_vp9_dec.c | 0
+ .../platform/verisilicon}/hantro_h1_jpeg_enc.c | 0
+ .../platform/verisilicon}/hantro_h1_regs.h | 0
+ .../platform/verisilicon}/hantro_h264.c | 0
+ .../platform/verisilicon}/hantro_hevc.c | 0
+ .../platform/verisilicon}/hantro_hw.h | 0
+ .../platform/verisilicon}/hantro_jpeg.c | 0
+ .../platform/verisilicon}/hantro_jpeg.h | 0
+ .../platform/verisilicon}/hantro_mpeg2.c | 0
+ .../platform/verisilicon}/hantro_postproc.c | 0
+ .../platform/verisilicon}/hantro_v4l2.c | 0
+ .../platform/verisilicon}/hantro_v4l2.h | 0
+ .../platform/verisilicon}/hantro_vp8.c | 0
+ .../platform/verisilicon}/hantro_vp9.c | 0
+ .../platform/verisilicon}/hantro_vp9.h | 0
+ .../platform/verisilicon}/imx8m_vpu_hw.c | 0
+ .../verisilicon}/rockchip_vpu2_hw_h264_dec.c | 0
+ .../verisilicon}/rockchip_vpu2_hw_jpeg_enc.c | 0
+ .../verisilicon}/rockchip_vpu2_hw_mpeg2_dec.c | 0
+ .../verisilicon}/rockchip_vpu2_hw_vp8_dec.c | 0
+ .../platform/verisilicon}/rockchip_vpu2_regs.h | 0
+ .../platform/verisilicon}/rockchip_vpu_hw.c | 0
+ .../platform/verisilicon}/sama5d4_vdec_hw.c | 0
+ .../platform/verisilicon}/sunxi_vpu_hw.c | 0
+ drivers/media/platform/xilinx/xilinx-csi2rxss.c | 1 +
+ drivers/media/platform/xilinx/xilinx-vip.c | 2 +
+ drivers/media/platform/xilinx/xilinx-vipp.c | 9 +-
+ drivers/media/test-drivers/vim2m.c | 2 +-
+ drivers/media/test-drivers/vivid/vivid-core.h | 5 +-
+ drivers/media/test-drivers/vivid/vivid-ctrls.c | 14 +
+ drivers/media/test-drivers/vivid/vivid-vid-cap.c | 4 +
+ drivers/media/usb/Kconfig | 3 -
+ drivers/media/usb/Makefile | 3 -
+ drivers/media/usb/airspy/airspy.c | 6 +-
+ drivers/media/usb/au0828/au0828-video.c | 4 +-
+ drivers/media/usb/cx231xx/cx231xx-vbi.c | 2 +-
+ drivers/media/usb/cx231xx/cx231xx-video.c | 2 +-
+ drivers/media/usb/dvb-usb/technisat-usb2.c | 2 +-
+ drivers/media/usb/em28xx/em28xx-video.c | 4 +-
+ drivers/media/usb/gspca/finepix.c | 2 +-
+ drivers/media/usb/msi2500/msi2500.c | 2 +-
+ drivers/media/usb/pvrusb2/pvrusb2-dvb.c | 2 +-
+ drivers/media/usb/uvc/uvc_ctrl.c | 117 +-
+ drivers/media/usb/uvc/uvc_driver.c | 17 +-
+ drivers/media/usb/uvc/uvc_video.c | 2 +-
+ drivers/media/v4l2-core/v4l2-ctrls-api.c | 62 +-
+ drivers/media/v4l2-core/v4l2-ctrls-core.c | 218 ++-
+ drivers/media/v4l2-core/v4l2-flash-led-class.c | 2 +-
+ drivers/media/v4l2-core/v4l2-ioctl.c | 2 +-
+ drivers/media/v4l2-core/v4l2-mem2mem.c | 6 +-
+ drivers/staging/media/Kconfig | 29 +-
+ drivers/staging/media/Makefile | 12 +-
+ drivers/staging/media/av7110/TODO | 3 -
+ .../usb => staging/media/deprecated}/cpia2/Kconfig | 5 +-
+ .../media/deprecated}/cpia2/Makefile | 0
+ drivers/staging/media/deprecated/cpia2/TODO | 6 +
+ .../usb => staging/media/deprecated}/cpia2/cpia2.h | 0
+ .../media/deprecated}/cpia2/cpia2_core.c | 0
+ .../media/deprecated}/cpia2/cpia2_registers.h | 0
+ .../media/deprecated}/cpia2/cpia2_usb.c | 0
+ .../media/deprecated}/cpia2/cpia2_v4l.c | 0
+ drivers/staging/media/deprecated/fsl-viu/Kconfig | 15 +
+ drivers/staging/media/deprecated/fsl-viu/Makefile | 2 +
+ drivers/staging/media/deprecated/fsl-viu/TODO | 7 +
+ .../media/deprecated/fsl-viu}/fsl-viu.c | 0
+ .../pci => staging/media/deprecated}/meye/Kconfig | 5 +-
+ .../pci => staging/media/deprecated}/meye/Makefile | 0
+ drivers/staging/media/deprecated/meye/TODO | 6 +
+ .../pci => staging/media/deprecated}/meye/meye.c | 0
+ .../pci => staging/media/deprecated}/meye/meye.h | 0
+ drivers/staging/media/deprecated/saa7146/Kconfig | 5 +
+ drivers/staging/media/deprecated/saa7146/Makefile | 2 +
+ .../media/{ => deprecated/saa7146}/av7110/Kconfig | 20 +-
+ .../media/{ => deprecated/saa7146}/av7110/Makefile | 3 +-
+ .../staging/media/deprecated/saa7146/av7110/TODO | 9 +
+ .../av7110/audio-bilingual-channel-select.rst | 0
+ .../saa7146}/av7110/audio-channel-select.rst | 0
+ .../saa7146}/av7110/audio-clear-buffer.rst | 0
+ .../saa7146}/av7110/audio-continue.rst | 0
+ .../saa7146}/av7110/audio-fclose.rst | 0
+ .../saa7146}/av7110/audio-fopen.rst | 0
+ .../saa7146}/av7110/audio-fwrite.rst | 0
+ .../saa7146}/av7110/audio-get-capabilities.rst | 0
+ .../saa7146}/av7110/audio-get-status.rst | 0
+ .../saa7146}/av7110/audio-pause.rst | 0
+ .../{ => deprecated/saa7146}/av7110/audio-play.rst | 0
+ .../saa7146}/av7110/audio-select-source.rst | 0
+ .../saa7146}/av7110/audio-set-av-sync.rst | 0
+ .../saa7146}/av7110/audio-set-bypass-mode.rst | 0
+ .../saa7146}/av7110/audio-set-id.rst | 0
+ .../saa7146}/av7110/audio-set-mixer.rst | 0
+ .../saa7146}/av7110/audio-set-mute.rst | 0
+ .../saa7146}/av7110/audio-set-streamtype.rst | 0
+ .../{ => deprecated/saa7146}/av7110/audio-stop.rst | 0
+ .../{ => deprecated/saa7146}/av7110/audio.rst | 0
+ .../saa7146}/av7110/audio_data_types.rst | 0
+ .../saa7146}/av7110/audio_function_calls.rst | 0
+ .../media/{ => deprecated/saa7146}/av7110/av7110.c | 0
+ .../media/{ => deprecated/saa7146}/av7110/av7110.h | 2 +-
+ .../{ => deprecated/saa7146}/av7110/av7110_av.c | 2 +-
+ .../{ => deprecated/saa7146}/av7110/av7110_av.h | 0
+ .../{ => deprecated/saa7146}/av7110/av7110_ca.c | 0
+ .../{ => deprecated/saa7146}/av7110/av7110_ca.h | 0
+ .../{ => deprecated/saa7146}/av7110/av7110_hw.c | 0
+ .../{ => deprecated/saa7146}/av7110/av7110_hw.h | 0
+ .../{ => deprecated/saa7146}/av7110/av7110_ipack.c | 0
+ .../{ => deprecated/saa7146}/av7110/av7110_ipack.h | 0
+ .../{ => deprecated/saa7146}/av7110/av7110_ir.c | 0
+ .../{ => deprecated/saa7146}/av7110/av7110_v4l.c | 0
+ .../{ => deprecated/saa7146}/av7110/budget-patch.c | 0
+ .../{ => deprecated/saa7146}/av7110/dvb_filter.c | 0
+ .../{ => deprecated/saa7146}/av7110/dvb_filter.h | 0
+ .../media/{ => deprecated/saa7146}/av7110/sp8870.c | 0
+ .../media/{ => deprecated/saa7146}/av7110/sp8870.h | 0
+ .../saa7146}/av7110/video-clear-buffer.rst | 0
+ .../saa7146}/av7110/video-command.rst | 0
+ .../saa7146}/av7110/video-continue.rst | 0
+ .../saa7146}/av7110/video-fast-forward.rst | 0
+ .../saa7146}/av7110/video-fclose.rst | 0
+ .../saa7146}/av7110/video-fopen.rst | 0
+ .../saa7146}/av7110/video-freeze.rst | 0
+ .../saa7146}/av7110/video-fwrite.rst | 0
+ .../saa7146}/av7110/video-get-capabilities.rst | 0
+ .../saa7146}/av7110/video-get-event.rst | 0
+ .../saa7146}/av7110/video-get-frame-count.rst | 0
+ .../saa7146}/av7110/video-get-pts.rst | 0
+ .../saa7146}/av7110/video-get-size.rst | 0
+ .../saa7146}/av7110/video-get-status.rst | 0
+ .../{ => deprecated/saa7146}/av7110/video-play.rst | 0
+ .../saa7146}/av7110/video-select-source.rst | 0
+ .../saa7146}/av7110/video-set-blank.rst | 0
+ .../saa7146}/av7110/video-set-display-format.rst | 0
+ .../saa7146}/av7110/video-set-format.rst | 0
+ .../saa7146}/av7110/video-set-streamtype.rst | 0
+ .../saa7146}/av7110/video-slowmotion.rst | 0
+ .../saa7146}/av7110/video-stillpicture.rst | 0
+ .../{ => deprecated/saa7146}/av7110/video-stop.rst | 0
+ .../saa7146}/av7110/video-try-command.rst | 0
+ .../{ => deprecated/saa7146}/av7110/video.rst | 0
+ .../saa7146}/av7110/video_function_calls.rst | 0
+ .../saa7146}/av7110/video_types.rst | 0
+ .../media/deprecated/saa7146/common}/Kconfig | 0
+ .../media/deprecated/saa7146/common}/Makefile | 0
+ .../media/deprecated/saa7146/common}/saa7146.h | 0
+ .../deprecated/saa7146/common}/saa7146_core.c | 2 +-
+ .../deprecated/saa7146/common}/saa7146_fops.c | 2 +-
+ .../media/deprecated/saa7146/common}/saa7146_hlp.c | 2 +-
+ .../media/deprecated/saa7146/common}/saa7146_i2c.c | 2 +-
+ .../media/deprecated/saa7146/common}/saa7146_vbi.c | 2 +-
+ .../deprecated/saa7146/common}/saa7146_video.c | 2 +-
+ .../media/deprecated/saa7146/common}/saa7146_vv.h | 2 +-
+ .../media/deprecated/saa7146}/saa7146/Kconfig | 15 +-
+ .../media/deprecated/saa7146}/saa7146/Makefile | 0
+ .../staging/media/deprecated/saa7146/saa7146/TODO | 7 +
+ .../deprecated/saa7146}/saa7146/hexium_gemini.c | 2 +-
+ .../deprecated/saa7146}/saa7146/hexium_orion.c | 2 +-
+ .../media/deprecated/saa7146}/saa7146/mxb.c | 2 +-
+ .../media/deprecated/saa7146}/ttpci/Kconfig | 17 +-
+ .../media/deprecated/saa7146}/ttpci/Makefile | 0
+ .../staging/media/deprecated/saa7146/ttpci/TODO | 7 +
+ .../media/deprecated/saa7146}/ttpci/budget-av.c | 2 +-
+ .../media/deprecated/saa7146}/ttpci/budget-ci.c | 0
+ .../media/deprecated/saa7146}/ttpci/budget-core.c | 0
+ .../media/deprecated/saa7146}/ttpci/budget.c | 0
+ .../media/deprecated/saa7146}/ttpci/budget.h | 2 +-
+ .../media/{ => deprecated}/stkwebcam/Kconfig | 0
+ .../media/{ => deprecated}/stkwebcam/Makefile | 0
+ .../staging/media/{ => deprecated}/stkwebcam/TODO | 0
+ .../media/{ => deprecated}/stkwebcam/stk-sensor.c | 0
+ .../media/{ => deprecated}/stkwebcam/stk-webcam.c | 0
+ .../media/{ => deprecated}/stkwebcam/stk-webcam.h | 0
+ .../media/deprecated}/tm6000/Kconfig | 5 +-
+ .../media/deprecated}/tm6000/Makefile | 0
+ drivers/staging/media/deprecated/tm6000/TODO | 7 +
+ .../media/deprecated}/tm6000/tm6000-alsa.c | 0
+ .../media/deprecated}/tm6000/tm6000-cards.c | 0
+ .../media/deprecated}/tm6000/tm6000-core.c | 0
+ .../media/deprecated}/tm6000/tm6000-dvb.c | 0
+ .../media/deprecated}/tm6000/tm6000-i2c.c | 0
+ .../media/deprecated}/tm6000/tm6000-input.c | 0
+ .../media/deprecated}/tm6000/tm6000-regs.h | 0
+ .../media/deprecated}/tm6000/tm6000-stds.c | 0
+ .../media/deprecated}/tm6000/tm6000-usb-isoc.h | 0
+ .../media/deprecated}/tm6000/tm6000-video.c | 2 -
+ .../media/deprecated}/tm6000/tm6000.h | 0
+ .../staging/media/deprecated/vpfe_capture/Kconfig | 58 +
+ .../staging/media/deprecated/vpfe_capture/Makefile | 4 +
+ drivers/staging/media/deprecated/vpfe_capture/TODO | 7 +
+ .../deprecated/vpfe_capture}/ccdc_hw_device.h | 0
+ .../media/deprecated/vpfe_capture}/dm355_ccdc.c | 2 +-
+ .../media/deprecated/vpfe_capture}/dm355_ccdc.h | 0
+ .../deprecated/vpfe_capture}/dm355_ccdc_regs.h | 0
+ .../media/deprecated/vpfe_capture}/dm644x_ccdc.c | 2 +-
+ .../media/deprecated/vpfe_capture}/dm644x_ccdc.h | 0
+ .../deprecated/vpfe_capture}/dm644x_ccdc_regs.h | 0
+ .../media/deprecated/vpfe_capture}/isif.c | 2 +-
+ .../staging/media/deprecated/vpfe_capture}/isif.h | 0
+ .../media/deprecated/vpfe_capture}/isif_regs.h | 0
+ .../media/deprecated/vpfe_capture}/vpfe_capture.c | 0
+ .../media/deprecated}/zr364xx/Kconfig | 7 +-
+ .../media/deprecated}/zr364xx/Makefile | 0
+ drivers/staging/media/deprecated/zr364xx/TODO | 7 +
+ .../media/deprecated}/zr364xx/zr364xx.c | 0
+ drivers/staging/media/hantro/TODO | 2 -
+ drivers/staging/media/imx/imx7-media-csi.c | 2 +-
+ drivers/staging/media/meson/vdec/vdec_hevc.c | 6 +-
+ drivers/staging/media/omap4iss/iss_video.c | 2 +-
+ drivers/staging/media/sunxi/cedrus/cedrus.c | 4 +-
+ drivers/staging/media/sunxi/cedrus/cedrus.h | 24 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 4 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 16 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 23 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c | 28 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_vp8.c | 43 +-
+ drivers/staging/media/zoran/TODO | 19 -
+ drivers/staging/media/zoran/zoran_device.h | 60 -
+ include/media/davinci/vpbe_display.h | 6 +-
+ include/media/v4l2-ctrls.h | 140 +-
+ include/media/v4l2-mem2mem.h | 12 +-
+ include/media/videobuf2-core.h | 16 +-
+ include/media/videobuf2-dvb.h | 2 +-
+ include/media/videobuf2-v4l2.h | 16 -
+ include/uapi/linux/dw100.h | 14 +
+ include/uapi/linux/v4l2-controls.h | 8 +-
+ include/uapi/linux/videodev2.h | 7 +-
+ 380 files changed, 9472 insertions(+), 1471 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/media/mediatek,mdp3-rdma.yaml
+ create mode 100644 Documentation/devicetree/bindings/media/mediatek,mdp3-rsz.yaml
+ create mode 100644 Documentation/devicetree/bindings/media/mediatek,mdp3-wrot.yaml
+ create mode 100644 Documentation/devicetree/bindings/media/nxp,dw100.yaml
+ create mode 100644 Documentation/devicetree/bindings/soc/mediatek/mediatek,ccorr.yaml
+ create mode 100644 Documentation/devicetree/bindings/soc/mediatek/mediatek,wdma.yaml
+ create mode 100644 Documentation/userspace-api/media/drivers/dw100.rst
+ delete mode 100644 Documentation/userspace-api/media/v4l/async.rst
+ rename drivers/{staging/media => media/pci}/zoran/Kconfig (100%)
+ rename drivers/{staging/media => media/pci}/zoran/Makefile (100%)
+ rename drivers/{staging/media => media/pci}/zoran/videocodec.c (97%)
+ rename drivers/{staging/media => media/pci}/zoran/videocodec.h (65%)
+ rename drivers/{staging/media => media/pci}/zoran/zoran.h (90%)
+ rename drivers/{staging/media => media/pci}/zoran/zoran_card.c (97%)
+ rename drivers/{staging/media => media/pci}/zoran/zoran_card.h (72%)
+ rename drivers/{staging/media => media/pci}/zoran/zoran_device.c (96%)
+ create mode 100644 drivers/media/pci/zoran/zoran_device.h
+ rename drivers/{staging/media => media/pci}/zoran/zoran_driver.c (94%)
+ rename drivers/{staging/media => media/pci}/zoran/zr36016.c (73%)
+ rename drivers/{staging/media => media/pci}/zoran/zr36016.h (100%)
+ rename drivers/{staging/media => media/pci}/zoran/zr36050.c (82%)
+ rename drivers/{staging/media => media/pci}/zoran/zr36050.h (100%)
+ rename drivers/{staging/media => media/pci}/zoran/zr36057.h (50%)
+ rename drivers/{staging/media => media/pci}/zoran/zr36060.c (99%)
+ rename drivers/{staging/media => media/pci}/zoran/zr36060.h (72%)
+ create mode 100644 drivers/media/platform/mediatek/mdp3/Kconfig
+ create mode 100644 drivers/media/platform/mediatek/mdp3/Makefile
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_ccorr.h
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_rdma.h
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_rsz.h
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_wdma.h
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mdp_reg_wrot.h
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-img-ipi.h
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.h
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.h
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-m2m.c
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-m2m.h
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-regs.c
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-regs.h
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-vpu.c
+ create mode 100644 drivers/media/platform/mediatek/mdp3/mtk-mdp3-vpu.h
+ create mode 100644 drivers/media/platform/nxp/dw100/Kconfig
+ create mode 100644 drivers/media/platform/nxp/dw100/Makefile
+ create mode 100644 drivers/media/platform/nxp/dw100/dw100.c
+ create mode 100644 drivers/media/platform/nxp/dw100/dw100_regs.h
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/Kconfig (91%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/Makefile (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro.h (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_drv.c (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1.c (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1_h264_dec.c (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1_mpeg2_dec.c (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1_regs.h (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g1_vp8_dec.c (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g2.c (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g2_hevc_dec.c (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g2_regs.h (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_g2_vp9_dec.c (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_h1_jpeg_enc.c (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_h1_regs.h (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_h264.c (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_hevc.c (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_hw.h (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_jpeg.c (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_jpeg.h (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_mpeg2.c (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_postproc.c (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_v4l2.c (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_v4l2.h (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_vp8.c (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_vp9.c (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/hantro_vp9.h (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/imx8m_vpu_hw.c (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_hw_h264_dec.c (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_hw_jpeg_enc.c (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_hw_mpeg2_dec.c (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_hw_vp8_dec.c (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu2_regs.h (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/rockchip_vpu_hw.c (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/sama5d4_vdec_hw.c (100%)
+ rename drivers/{staging/media/hantro => media/platform/verisilicon}/sunxi_vpu_hw.c (100%)
+ delete mode 100644 drivers/staging/media/av7110/TODO
+ rename drivers/{media/usb => staging/media/deprecated}/cpia2/Kconfig (66%)
+ rename drivers/{media/usb => staging/media/deprecated}/cpia2/Makefile (100%)
+ create mode 100644 drivers/staging/media/deprecated/cpia2/TODO
+ rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2.h (100%)
+ rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2_core.c (100%)
+ rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2_registers.h (100%)
+ rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2_usb.c (100%)
+ rename drivers/{media/usb => staging/media/deprecated}/cpia2/cpia2_v4l.c (100%)
+ create mode 100644 drivers/staging/media/deprecated/fsl-viu/Kconfig
+ create mode 100644 drivers/staging/media/deprecated/fsl-viu/Makefile
+ create mode 100644 drivers/staging/media/deprecated/fsl-viu/TODO
+ rename drivers/{media/platform/nxp => staging/media/deprecated/fsl-viu}/fsl-viu.c (100%)
+ rename drivers/{media/pci => staging/media/deprecated}/meye/Kconfig (73%)
+ rename drivers/{media/pci => staging/media/deprecated}/meye/Makefile (100%)
+ create mode 100644 drivers/staging/media/deprecated/meye/TODO
+ rename drivers/{media/pci => staging/media/deprecated}/meye/meye.c (100%)
+ rename drivers/{media/pci => staging/media/deprecated}/meye/meye.h (100%)
+ create mode 100644 drivers/staging/media/deprecated/saa7146/Kconfig
+ create mode 100644 drivers/staging/media/deprecated/saa7146/Makefile
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/Kconfig (82%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/Makefile (78%)
+ create mode 100644 drivers/staging/media/deprecated/saa7146/av7110/TODO
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-bilingual-channel-select.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-channel-select.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-clear-buffer.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-continue.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-fclose.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-fopen.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-fwrite.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-get-capabilities.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-get-status.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-pause.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-play.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-select-source.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-av-sync.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-bypass-mode.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-id.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-mixer.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-mute.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-set-streamtype.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio-stop.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio_data_types.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/audio_function_calls.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110.c (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110.h (99%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_av.c (99%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_av.h (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ca.c (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ca.h (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_hw.c (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_hw.h (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ipack.c (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ipack.h (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_ir.c (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/av7110_v4l.c (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/budget-patch.c (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/dvb_filter.c (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/dvb_filter.h (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/sp8870.c (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/sp8870.h (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-clear-buffer.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-command.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-continue.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-fast-forward.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-fclose.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-fopen.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-freeze.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-fwrite.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-capabilities.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-event.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-frame-count.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-pts.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-size.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-get-status.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-play.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-select-source.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-set-blank.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-set-display-format.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-set-format.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-set-streamtype.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-slowmotion.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-stillpicture.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-stop.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video-try-command.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video_function_calls.rst (100%)
+ rename drivers/staging/media/{ => deprecated/saa7146}/av7110/video_types.rst (100%)
+ rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/Kconfig (100%)
+ rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/Makefile (100%)
+ rename {include/media/drv-intf => drivers/staging/media/deprecated/saa7146/common}/saa7146.h (100%)
+ rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_core.c (99%)
+ rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_fops.c (99%)
+ rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_hlp.c (99%)
+ rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_i2c.c (99%)
+ rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_vbi.c (99%)
+ rename drivers/{media/common/saa7146 => staging/media/deprecated/saa7146/common}/saa7146_video.c (99%)
+ rename {include/media/drv-intf => drivers/staging/media/deprecated/saa7146/common}/saa7146_vv.h (99%)
+ rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/Kconfig (67%)
+ rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/Makefile (100%)
+ create mode 100644 drivers/staging/media/deprecated/saa7146/saa7146/TODO
+ rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/hexium_gemini.c (99%)
+ rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/hexium_orion.c (99%)
+ rename drivers/{media/pci => staging/media/deprecated/saa7146}/saa7146/mxb.c (99%)
+ rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/Kconfig (83%)
+ rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/Makefile (100%)
+ create mode 100644 drivers/staging/media/deprecated/saa7146/ttpci/TODO
+ rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget-av.c (99%)
+ rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget-ci.c (100%)
+ rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget-core.c (100%)
+ rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget.c (100%)
+ rename drivers/{media/pci => staging/media/deprecated/saa7146}/ttpci/budget.h (98%)
+ rename drivers/staging/media/{ => deprecated}/stkwebcam/Kconfig (100%)
+ rename drivers/staging/media/{ => deprecated}/stkwebcam/Makefile (100%)
+ rename drivers/staging/media/{ => deprecated}/stkwebcam/TODO (100%)
+ rename drivers/staging/media/{ => deprecated}/stkwebcam/stk-sensor.c (100%)
+ rename drivers/staging/media/{ => deprecated}/stkwebcam/stk-webcam.c (100%)
+ rename drivers/staging/media/{ => deprecated}/stkwebcam/stk-webcam.h (100%)
+ rename drivers/{media/usb => staging/media/deprecated}/tm6000/Kconfig (84%)
+ rename drivers/{media/usb => staging/media/deprecated}/tm6000/Makefile (100%)
+ create mode 100644 drivers/staging/media/deprecated/tm6000/TODO
+ rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-alsa.c (100%)
+ rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-cards.c (100%)
+ rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-core.c (100%)
+ rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-dvb.c (100%)
+ rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-i2c.c (100%)
+ rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-input.c (100%)
+ rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-regs.h (100%)
+ rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-stds.c (100%)
+ rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-usb-isoc.h (100%)
+ rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000-video.c (99%)
+ rename drivers/{media/usb => staging/media/deprecated}/tm6000/tm6000.h (100%)
+ create mode 100644 drivers/staging/media/deprecated/vpfe_capture/Kconfig
+ create mode 100644 drivers/staging/media/deprecated/vpfe_capture/Makefile
+ create mode 100644 drivers/staging/media/deprecated/vpfe_capture/TODO
+ rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/ccdc_hw_device.h (100%)
+ rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/dm355_ccdc.c (99%)
+ rename {include/media/davinci => drivers/staging/media/deprecated/vpfe_capture}/dm355_ccdc.h (100%)
+ rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/dm355_ccdc_regs.h (100%)
+ rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/dm644x_ccdc.c (99%)
+ rename {include/media/davinci => drivers/staging/media/deprecated/vpfe_capture}/dm644x_ccdc.h (100%)
+ rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/dm644x_ccdc_regs.h (100%)
+ rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/isif.c (99%)
+ rename {include/media/davinci => drivers/staging/media/deprecated/vpfe_capture}/isif.h (100%)
+ rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/isif_regs.h (100%)
+ rename drivers/{media/platform/ti/davinci => staging/media/deprecated/vpfe_capture}/vpfe_capture.c (100%)
+ rename drivers/{media/usb => staging/media/deprecated}/zr364xx/Kconfig (65%)
+ rename drivers/{media/usb => staging/media/deprecated}/zr364xx/Makefile (100%)
+ create mode 100644 drivers/staging/media/deprecated/zr364xx/TODO
+ rename drivers/{media/usb => staging/media/deprecated}/zr364xx/zr364xx.c (100%)
+ delete mode 100644 drivers/staging/media/hantro/TODO
+ delete mode 100644 drivers/staging/media/zoran/TODO
+ delete mode 100644 drivers/staging/media/zoran/zoran_device.h
+ create mode 100644 include/uapi/linux/dw100.h
+Merging v4l-dvb-next/master (f7ec3f62d773 media: remove reference to CONFIG_EMBEDDED in MEDIA_SUPPORT_FILTER)
+$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master
+Merge made by the 'ort' strategy.
+ drivers/media/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging pm/linux-next (2bc2aea001d3 Merge branch 'acpi-bus' into linux-next)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next
+Auto-merging drivers/base/arch_topology.c
+Auto-merging drivers/hv/vmbus_drv.c
+Auto-merging drivers/spi/spi.c
+Merge made by the 'ort' strategy.
+ Documentation/firmware-guide/acpi/enumeration.rst | 16 +-
+ Documentation/firmware-guide/acpi/osi.rst | 25 +-
+ drivers/acpi/acpi_amba.c | 5 +-
+ drivers/acpi/acpi_apd.c | 9 +-
+ drivers/acpi/acpi_lpss.c | 54 +-
+ drivers/acpi/acpi_platform.c | 22 +-
+ drivers/acpi/acpi_video.c | 18 +-
+ drivers/acpi/apei/bert.c | 3 +
+ drivers/acpi/bus.c | 37 +-
+ drivers/acpi/cppc_acpi.c | 3 +
+ drivers/acpi/device_pm.c | 38 +-
+ drivers/acpi/ec.c | 6 +-
+ drivers/acpi/internal.h | 6 +-
+ drivers/acpi/irq.c | 4 +-
+ drivers/acpi/osi.c | 24 -
+ drivers/acpi/power.c | 11 +-
+ drivers/acpi/processor_idle.c | 8 +-
+ drivers/acpi/property.c | 13 +-
+ drivers/acpi/resource.c | 39 +
+ drivers/acpi/sbs.c | 2 +-
+ drivers/acpi/sbshc.c | 2 +-
+ drivers/acpi/scan.c | 86 +-
+ drivers/acpi/utils.c | 6 +-
+ drivers/acpi/x86/apple.c | 1 +
+ drivers/ata/ahci_imx.c | 15 +-
+ drivers/base/arch_topology.c | 2 +-
+ drivers/base/power/wakeup.c | 2 +
+ drivers/cpufreq/amd-pstate.c | 41 +-
+ drivers/cpufreq/cppc_cpufreq.c | 2 +-
+ drivers/cpuidle/coupled.c | 2 +-
+ drivers/cpuidle/cpuidle-powernv.c | 4 +-
+ drivers/cpuidle/governor.c | 11 +-
+ drivers/hv/vmbus_drv.c | 3 +-
+ drivers/hwmon/acpi_power_meter.c | 2 +-
+ drivers/hwmon/hwmon.c | 14 +-
+ drivers/hwmon/pmbus/pmbus_core.c | 10 +-
+ drivers/hwmon/scpi-hwmon.c | 14 +-
+ drivers/idle/intel_idle.c | 2 +-
+ drivers/iio/adc/sun4i-gpadc-iio.c | 14 +-
+ drivers/input/touchscreen/sun4i-ts.c | 10 +-
+ drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 77 +-
+ drivers/perf/arm_dsu_pmu.c | 4 +-
+ drivers/perf/qcom_l3_pmu.c | 3 +-
+ drivers/powercap/intel_rapl_common.c | 1 +
+ drivers/regulator/max8973-regulator.c | 10 +-
+ drivers/spi/spi.c | 2 +-
+ drivers/thermal/amlogic_thermal.c | 16 +-
+ drivers/thermal/armada_thermal.c | 12 +-
+ drivers/thermal/broadcom/bcm2711_thermal.c | 14 +-
+ drivers/thermal/broadcom/bcm2835_thermal.c | 14 +-
+ drivers/thermal/broadcom/brcmstb_thermal.c | 20 +-
+ drivers/thermal/broadcom/ns-thermal.c | 50 +-
+ drivers/thermal/broadcom/sr-thermal.c | 16 +-
+ drivers/thermal/cpufreq_cooling.c | 12 +-
+ drivers/thermal/da9062-thermal.c | 5 +-
+ drivers/thermal/db8500_thermal.c | 8 +-
+ drivers/thermal/gov_bang_bang.c | 10 +-
+ drivers/thermal/gov_fair_share.c | 3 +-
+ drivers/thermal/gov_power_allocator.c | 20 +-
+ drivers/thermal/gov_step_wise.c | 10 +-
+ drivers/thermal/gov_user_space.c | 5 +-
+ drivers/thermal/hisi_thermal.c | 14 +-
+ drivers/thermal/imx8mm_thermal.c | 14 +-
+ drivers/thermal/imx_sc_thermal.c | 14 +-
+ .../intel/int340x_thermal/int3400_thermal.c | 5 +-
+ drivers/thermal/k3_bandgap.c | 12 +-
+ drivers/thermal/k3_j72xx_bandgap.c | 12 +-
+ drivers/thermal/max77620_thermal.c | 8 +-
+ drivers/thermal/mtk_thermal.c | 10 +-
+ drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 23 +-
+ drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 12 +-
+ drivers/thermal/qcom/tsens.c | 16 +-
+ drivers/thermal/qoriq_thermal.c | 12 +-
+ drivers/thermal/rcar_gen3_thermal.c | 16 +-
+ drivers/thermal/rcar_thermal.c | 13 +-
+ drivers/thermal/rockchip_thermal.c | 14 +-
+ drivers/thermal/rzg2l_thermal.c | 10 +-
+ drivers/thermal/samsung/exynos_tmu.c | 24 +-
+ drivers/thermal/sprd_thermal.c | 18 +-
+ drivers/thermal/st/stm_thermal.c | 18 +-
+ drivers/thermal/sun8i_thermal.c | 14 +-
+ drivers/thermal/tegra/soctherm.c | 21 +-
+ drivers/thermal/tegra/tegra-bpmp-thermal.c | 19 +-
+ drivers/thermal/tegra/tegra30-tsensor.c | 12 +-
+ drivers/thermal/thermal-generic-adc.c | 10 +-
+ drivers/thermal/thermal_core.c | 65 +-
+ drivers/thermal/thermal_core.h | 4 +-
+ drivers/thermal/thermal_helpers.c | 73 +-
+ drivers/thermal/thermal_hwmon.c | 2 +-
+ drivers/thermal/thermal_mmio.c | 19 +-
+ drivers/thermal/thermal_of.c | 1148 +++++++-------------
+ drivers/thermal/thermal_sysfs.c | 11 +-
+ drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 16 +-
+ drivers/thermal/uniphier_thermal.c | 10 +-
+ drivers/thunderbolt/acpi.c | 2 +-
+ include/acpi/acpi_bus.h | 15 +-
+ include/linux/acpi.h | 1 +
+ include/linux/suspend.h | 2 +-
+ include/linux/thermal.h | 85 +-
+ kernel/sched/cpufreq_schedutil.c | 30 +-
+ tools/power/acpi/tools/pfrut/pfrut.c | 2 +-
+ 101 files changed, 1117 insertions(+), 1607 deletions(-)
+Merging cpufreq-arm/cpufreq/arm/linux-next (ddf958f39741 cpufreq: tegra194: Remove the unneeded result variable)
+$ 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
+Merge made by the 'ort' strategy.
+ drivers/cpufreq/bmips-cpufreq.c | 10 ++++++++--
+ drivers/cpufreq/cpufreq-dt-platdev.c | 1 +
+ drivers/cpufreq/tegra194-cpufreq.c | 6 +-----
+ 3 files changed, 10 insertions(+), 7 deletions(-)
+Merging cpupower/cpupower (568035b01cfb Linux 6.0-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 (68831c5f94cb PM / devfreq: mtk-cci: Handle sram regulator probe deferral)
+$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next
+Merge made by the 'ort' strategy.
+ drivers/devfreq/mtk-cci-devfreq.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+Merging opp/opp/linux-next (c7e31e36d8a2 dt-bindings: opp: Add missing (unevaluated|additional)Properties on child nodes)
+$ 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
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/opp/opp-v2-kryo-cpu.yaml | 1 +
+ Documentation/devicetree/bindings/opp/opp-v2-qcom-level.yaml | 1 +
+ drivers/opp/core.c | 2 +-
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+Merging thermal/thermal/linux-next (64b269c00227 thermal/core: Add a check before calling set_trip_temp())
+$ 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 drivers/thermal/thermal_core.c
+Merge made by the 'ort' strategy.
+ drivers/thermal/Makefile | 2 +-
+ drivers/thermal/imx_sc_thermal.c | 68 +++++++++++++++++++---------------------
+ drivers/thermal/rcar_thermal.c | 2 +-
+ drivers/thermal/thermal_core.c | 2 +-
+ drivers/thermal/thermal_of.c | 44 --------------------------
+ drivers/thermal/thermal_sysfs.c | 8 +++--
+ include/linux/thermal.h | 10 ------
+ 7 files changed, 41 insertions(+), 95 deletions(-)
+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 (56171e0db23a fs: dlm: const void resource name parameter)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next
+Merge made by the 'ort' strategy.
+ drivers/md/md-cluster.c | 4 +-
+ fs/dlm/ast.c | 15 +++--
+ fs/dlm/ast.h | 1 -
+ fs/dlm/dlm_internal.h | 2 +-
+ fs/dlm/lock.c | 160 +++++++++++++++++++++++++++++----------------
+ fs/dlm/lock.h | 2 +-
+ fs/dlm/lockspace.c | 32 +++++++--
+ fs/dlm/lockspace.h | 13 ++++
+ fs/dlm/lowcomms.c | 4 ++
+ fs/dlm/user.c | 17 +++--
+ fs/gfs2/lock_dlm.c | 2 +-
+ fs/ocfs2/stack_user.c | 2 +-
+ include/linux/dlm.h | 5 +-
+ include/trace/events/dlm.h | 26 ++++----
+ include/uapi/linux/dlm.h | 1 -
+ 15 files changed, 189 insertions(+), 97 deletions(-)
+Merging rdma/for-next (db77d84cfe36 RDMA/rtrs-clt: Kill xchg_paths)
+$ 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/core/umem_odp.c
+Auto-merging drivers/infiniband/hw/hns/hns_roce_device.h
+Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.c
+Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.h
+Auto-merging drivers/infiniband/hw/hns/hns_roce_main.c
+Auto-merging drivers/infiniband/hw/hns/hns_roce_qp.c
+Auto-merging drivers/infiniband/hw/mlx5/mad.c
+Auto-merging drivers/infiniband/hw/mlx5/main.c
+Auto-merging drivers/infiniband/ulp/rtrs/rtrs-clt.c
+Auto-merging drivers/infiniband/ulp/rtrs/rtrs-srv.c
+Auto-merging drivers/infiniband/ulp/srp/ib_srp.c
+Auto-merging include/linux/mlx5/driver.h
+Merge made by the 'ort' strategy.
+ drivers/block/rnbd/rnbd-srv.c | 11 +-
+ drivers/infiniband/core/cm.c | 65 ++---
+ drivers/infiniband/core/cma_configfs.c | 2 +-
+ drivers/infiniband/core/device.c | 4 +-
+ drivers/infiniband/core/lag.c | 5 +-
+ drivers/infiniband/core/umem_odp.c | 2 -
+ drivers/infiniband/hw/bnxt_re/main.c | 2 +-
+ drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 6 +-
+ drivers/infiniband/hw/efa/efa_com_cmd.c | 5 +-
+ drivers/infiniband/hw/efa/efa_com_cmd.h | 3 +-
+ drivers/infiniband/hw/efa/efa_io_defs.h | 289 +++++++++++++++++++++
+ drivers/infiniband/hw/efa/efa_verbs.c | 11 +-
+ drivers/infiniband/hw/hfi1/file_ops.c | 2 +-
+ drivers/infiniband/hw/hfi1/verbs.c | 6 +-
+ drivers/infiniband/hw/hns/Makefile | 2 +-
+ drivers/infiniband/hw/hns/hns_roce_device.h | 18 +-
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 79 +++++-
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 6 +-
+ drivers/infiniband/hw/hns/hns_roce_hw_v2_dfx.c | 34 ---
+ drivers/infiniband/hw/hns/hns_roce_main.c | 11 +-
+ drivers/infiniband/hw/hns/hns_roce_qp.c | 3 -
+ drivers/infiniband/hw/hns/hns_roce_restrack.c | 220 ++++++++++++----
+ drivers/infiniband/hw/mlx5/devx.c | 2 +
+ drivers/infiniband/hw/mlx5/mad.c | 25 +-
+ drivers/infiniband/hw/mlx5/main.c | 6 +-
+ drivers/infiniband/hw/mlx5/mem.c | 2 +-
+ drivers/infiniband/hw/mlx5/mr.c | 2 -
+ drivers/infiniband/hw/mlx5/odp.c | 4 +-
+ drivers/infiniband/hw/mthca/mthca_cmd.c | 2 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +-
+ drivers/infiniband/hw/qib/qib_iba7322.c | 2 +-
+ drivers/infiniband/sw/rxe/rxe_mr.c | 1 -
+ drivers/infiniband/sw/rxe/rxe_qp.c | 16 +-
+ drivers/infiniband/sw/rxe/rxe_resp.c | 10 +-
+ drivers/infiniband/sw/rxe/rxe_task.c | 3 +-
+ drivers/infiniband/sw/rxe/rxe_task.h | 3 +-
+ drivers/infiniband/sw/rxe/rxe_verbs.c | 1 -
+ drivers/infiniband/sw/rxe/rxe_verbs.h | 1 -
+ drivers/infiniband/sw/siw/Kconfig | 5 +-
+ drivers/infiniband/ulp/ipoib/ipoib_cm.c | 4 +-
+ drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 4 +-
+ drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c | 4 +-
+ drivers/infiniband/ulp/rtrs/Makefile | 10 +-
+ drivers/infiniband/ulp/rtrs/rtrs-clt-trace.c | 15 ++
+ drivers/infiniband/ulp/rtrs/rtrs-clt-trace.h | 86 ++++++
+ drivers/infiniband/ulp/rtrs/rtrs-clt.c | 26 +-
+ drivers/infiniband/ulp/rtrs/rtrs-pri.h | 7 +-
+ drivers/infiniband/ulp/rtrs/rtrs-srv-trace.c | 16 ++
+ drivers/infiniband/ulp/rtrs/rtrs-srv-trace.h | 88 +++++++
+ drivers/infiniband/ulp/rtrs/rtrs-srv.c | 12 +-
+ drivers/infiniband/ulp/rtrs/rtrs-srv.h | 5 +
+ drivers/infiniband/ulp/rtrs/rtrs.c | 2 +-
+ drivers/infiniband/ulp/rtrs/rtrs.h | 3 +-
+ drivers/infiniband/ulp/srp/ib_srp.c | 50 ++--
+ drivers/infiniband/ulp/srp/ib_srp.h | 1 -
+ drivers/infiniband/ulp/srpt/ib_srpt.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/port.c | 23 --
+ include/linux/mlx5/driver.h | 2 -
+ include/rdma/ib_cm.h | 8 +-
+ include/rdma/rdma_vt.h | 2 +-
+ include/uapi/rdma/efa-abi.h | 4 +-
+ include/uapi/rdma/mlx5-abi.h | 1 +
+ 62 files changed, 945 insertions(+), 305 deletions(-)
+ create mode 100644 drivers/infiniband/hw/efa/efa_io_defs.h
+ delete mode 100644 drivers/infiniband/hw/hns/hns_roce_hw_v2_dfx.c
+ create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-clt-trace.c
+ create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-clt-trace.h
+ create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-srv-trace.c
+ create mode 100644 drivers/infiniband/ulp/rtrs/rtrs-srv-trace.h
+Merging net-next/master (8a26a9dee5e3 Merge branch 'net-ftgmac100-support-fixed-link')
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging MAINTAINERS
+Auto-merging drivers/net/dsa/microchip/ksz9477_i2c.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c
+Auto-merging drivers/net/ethernet/mellanox/mlxsw/i2c.c
+Auto-merging kernel/bpf/btf.c
+Auto-merging net/core/flow_dissector.c
+Auto-merging net/mptcp/protocol.c
+Auto-merging tools/testing/selftests/bpf/xskxceiver.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 4 -
+ Documentation/admin-guide/sysctl/net.rst | 19 +-
+ Documentation/bpf/kfuncs.rst | 15 +
+ .../devicetree/bindings/net/altera_tse.txt | 113 -
+ .../devicetree/bindings/net/altr,tse.yaml | 168 +
+ .../bindings/net/cortina,gemini-ethernet.yaml | 1 +
+ .../devicetree/bindings/net/dsa/arrow,xrs700x.yaml | 2 +
+ .../devicetree/bindings/net/dsa/brcm,b53.yaml | 2 +
+ .../devicetree/bindings/net/dsa/dsa-port.yaml | 17 +
+ .../bindings/net/dsa/hirschmann,hellcreek.yaml | 6 +
+ .../bindings/net/dsa/mediatek,mt7530.yaml | 649 +-
+ .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 4 +
+ .../bindings/net/dsa/renesas,rzn1-a5psw.yaml | 2 +
+ .../bindings/net/ethernet-controller.yaml | 1 +
+ .../devicetree/bindings/net/fsl,fman-dtsec.yaml | 145 +
+ Documentation/devicetree/bindings/net/fsl-fman.txt | 128 +-
+ .../bindings/net/microchip,sparx5-switch.yaml | 36 +-
+ .../devicetree/bindings/net/nxp,tja11xx.yaml | 17 +
+ .../devicetree/bindings/net/qca,ar803x.yaml | 8 +
+ .../devicetree/bindings/net/rockchip-dwmac.yaml | 7 +
+ .../devicetree/bindings/net/snps,dwmac.yaml | 1 +
+ .../bindings/net/sunplus,sp7021-emac.yaml | 2 +
+ .../devicetree/bindings/net/ti,cpsw-switch.yaml | 4 +
+ .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 19 +-
+ .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 1 +
+ .../devicetree/bindings/net/vertexcom-mse102x.yaml | 2 +-
+ .../bindings/net/wireless/microchip,wilc1000.yaml | 7 +-
+ .../bindings/net/wireless/silabs,wfx.yaml | 15 +-
+ .../bindings/net/wireless/ti,wlcore.yaml | 32 +-
+ Documentation/networking/bonding.rst | 2 +-
+ Documentation/networking/decnet.rst | 243 -
+ .../networking/device_drivers/ethernet/index.rst | 1 +
+ .../device_drivers/ethernet/wangxun/ngbe.rst | 14 +
+ Documentation/networking/devlink/ice.rst | 36 +
+ Documentation/networking/devlink/index.rst | 6 +-
+ Documentation/networking/index.rst | 1 -
+ Documentation/networking/phy.rst | 15 +
+ Documentation/userspace-api/index.rst | 1 +
+ Documentation/userspace-api/ioctl/ioctl-number.rst | 1 -
+ Documentation/userspace-api/netlink/index.rst | 12 +
+ Documentation/userspace-api/netlink/intro.rst | 646 +
+ MAINTAINERS | 18 +-
+ arch/arm/boot/dts/aspeed-bmc-facebook-elbert.dts | 18 +
+ arch/mips/configs/decstation_64_defconfig | 2 -
+ arch/mips/configs/decstation_defconfig | 2 -
+ arch/mips/configs/decstation_r4k_defconfig | 2 -
+ arch/mips/configs/gpr_defconfig | 2 -
+ arch/mips/configs/mtx1_defconfig | 2 -
+ arch/mips/configs/rm200_defconfig | 2 -
+ arch/mips/net/bpf_jit_comp32.c | 10 +-
+ arch/mips/net/bpf_jit_comp64.c | 10 +-
+ arch/powerpc/configs/ppc6xx_defconfig | 2 -
+ drivers/block/nbd.c | 1 +
+ drivers/isdn/capi/kcapi.c | 4 +-
+ drivers/net/Space.c | 2 +-
+ drivers/net/amt.c | 6 +-
+ drivers/net/bonding/bond_main.c | 2 +-
+ drivers/net/can/sja1000/peak_pcmcia.c | 2 +-
+ drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 +-
+ drivers/net/dsa/Kconfig | 6 +-
+ drivers/net/dsa/b53/b53_common.c | 2 +-
+ drivers/net/dsa/bcm_sf2.c | 130 +-
+ drivers/net/dsa/bcm_sf2_cfp.c | 2 +-
+ drivers/net/dsa/hirschmann/hellcreek.c | 2 +-
+ drivers/net/dsa/lan9303-core.c | 30 +-
+ drivers/net/dsa/lan9303_mdio.c | 1 +
+ drivers/net/dsa/microchip/ksz8.h | 4 +-
+ drivers/net/dsa/microchip/ksz8795.c | 111 +-
+ drivers/net/dsa/microchip/ksz9477.c | 85 +-
+ drivers/net/dsa/microchip/ksz9477.h | 4 +-
+ drivers/net/dsa/microchip/ksz9477_i2c.c | 4 +
+ drivers/net/dsa/microchip/ksz_common.c | 710 +-
+ drivers/net/dsa/microchip/ksz_common.h | 122 +-
+ drivers/net/dsa/microchip/ksz_spi.c | 13 +-
+ drivers/net/dsa/microchip/lan937x.h | 5 +-
+ drivers/net/dsa/microchip/lan937x_main.c | 376 +-
+ drivers/net/dsa/microchip/lan937x_reg.h | 12 +
+ drivers/net/dsa/mv88e6xxx/chip.c | 10 +-
+ drivers/net/dsa/mv88e6xxx/global2.h | 2 +-
+ drivers/net/dsa/mv88e6xxx/port.c | 19 +
+ drivers/net/dsa/ocelot/felix.c | 61 +
+ drivers/net/dsa/ocelot/felix_vsc9959.c | 509 +-
+ drivers/net/dsa/ocelot/seville_vsc9953.c | 376 +-
+ drivers/net/dummy.c | 2 +-
+ drivers/net/ethernet/3com/3c509.c | 2 +-
+ drivers/net/ethernet/3com/3c515.c | 2 +-
+ drivers/net/ethernet/3com/3c589_cs.c | 2 +-
+ drivers/net/ethernet/3com/3c59x.c | 6 +-
+ drivers/net/ethernet/3com/typhoon.c | 8 +-
+ drivers/net/ethernet/8390/ax88796.c | 6 +-
+ drivers/net/ethernet/8390/etherh.c | 6 +-
+ drivers/net/ethernet/adaptec/starfire.c | 4 +-
+ drivers/net/ethernet/aeroflex/greth.c | 4 +-
+ drivers/net/ethernet/agere/et131x.c | 4 +-
+ drivers/net/ethernet/alacritech/slicoss.c | 4 +-
+ drivers/net/ethernet/allwinner/sun4i-emac.c | 4 +-
+ drivers/net/ethernet/alteon/acenic.c | 4 +-
+ drivers/net/ethernet/altera/Kconfig | 2 +
+ drivers/net/ethernet/altera/altera_tse.h | 19 +-
+ drivers/net/ethernet/altera/altera_tse_ethtool.c | 23 +-
+ drivers/net/ethernet/altera/altera_tse_main.c | 453 +-
+ drivers/net/ethernet/amazon/ena/ena_ethtool.c | 4 +-
+ drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +-
+ drivers/net/ethernet/amd/amd8111e.c | 4 +-
+ drivers/net/ethernet/amd/au1000_eth.c | 2 +-
+ drivers/net/ethernet/amd/nmclan_cs.c | 2 +-
+ drivers/net/ethernet/amd/pcnet32.c | 4 +-
+ drivers/net/ethernet/amd/sunlance.c | 2 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 4 +-
+ .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 2 +-
+ drivers/net/ethernet/arc/emac_main.c | 2 +-
+ drivers/net/ethernet/atheros/ag71xx.c | 4 +-
+ drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c | 4 +-
+ drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c | 6 +-
+ drivers/net/ethernet/atheros/atlx/atl1.c | 4 +-
+ drivers/net/ethernet/atheros/atlx/atl2.c | 6 +-
+ drivers/net/ethernet/broadcom/b44.c | 6 +-
+ drivers/net/ethernet/broadcom/bcm4908_enet.c | 2 +-
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c | 4 +-
+ drivers/net/ethernet/broadcom/bcmsysport.c | 4 +-
+ drivers/net/ethernet/broadcom/bgmac.c | 6 +-
+ drivers/net/ethernet/broadcom/bnx2.c | 6 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 6 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 2 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 8 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 2 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +-
+ drivers/net/ethernet/broadcom/tg3.c | 6 +-
+ drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 6 +-
+ drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 2 +-
+ .../net/ethernet/cavium/thunder/nicvf_ethtool.c | 4 +-
+ drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 4 +-
+ drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 4 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 4 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 4 +-
+ .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 4 +-
+ .../chelsio/inline_crypto/chtls/chtls_main.c | 2 +-
+ drivers/net/ethernet/cirrus/ep93xx_eth.c | 2 +-
+ drivers/net/ethernet/cisco/enic/enic_ethtool.c | 6 +-
+ drivers/net/ethernet/davicom/dm9000.c | 30 +-
+ drivers/net/ethernet/dec/tulip/de2104x.c | 4 +-
+ drivers/net/ethernet/dec/tulip/dmfe.c | 4 +-
+ drivers/net/ethernet/dec/tulip/tulip_core.c | 4 +-
+ drivers/net/ethernet/dec/tulip/uli526x.c | 4 +-
+ drivers/net/ethernet/dec/tulip/winbond-840.c | 4 +-
+ drivers/net/ethernet/dlink/dl2k.c | 4 +-
+ drivers/net/ethernet/dlink/sundance.c | 4 +-
+ drivers/net/ethernet/dnet.c | 4 +-
+ drivers/net/ethernet/emulex/benet/be_cmds.c | 12 +-
+ drivers/net/ethernet/emulex/benet/be_ethtool.c | 6 +-
+ drivers/net/ethernet/engleder/tsnep.h | 1 +
+ drivers/net/ethernet/engleder/tsnep_hw.h | 3 +-
+ drivers/net/ethernet/engleder/tsnep_main.c | 115 +-
+ drivers/net/ethernet/faraday/ftgmac100.c | 28 +-
+ drivers/net/ethernet/faraday/ftmac100.c | 10 +-
+ drivers/net/ethernet/faraday/ftmac100.h | 12 +-
+ drivers/net/ethernet/fealnx.c | 4 +-
+ drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 59 +-
+ .../net/ethernet/freescale/dpaa/dpaa_eth_sysfs.c | 2 +-
+ drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 4 +-
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 2 +-
+ .../net/ethernet/freescale/enetc/enetc_ethtool.c | 4 +-
+ drivers/net/ethernet/freescale/fec.h | 4 +
+ drivers/net/ethernet/freescale/fec_main.c | 43 +-
+ drivers/net/ethernet/freescale/fec_ptp.c | 2 +-
+ drivers/net/ethernet/freescale/fman/fman.c | 31 +-
+ drivers/net/ethernet/freescale/fman/fman.h | 31 +-
+ drivers/net/ethernet/freescale/fman/fman_dtsec.c | 321 +-
+ drivers/net/ethernet/freescale/fman/fman_dtsec.h | 58 +-
+ drivers/net/ethernet/freescale/fman/fman_keygen.c | 29 +-
+ drivers/net/ethernet/freescale/fman/fman_keygen.h | 29 +-
+ drivers/net/ethernet/freescale/fman/fman_mac.h | 24 +-
+ drivers/net/ethernet/freescale/fman/fman_memac.c | 238 +-
+ drivers/net/ethernet/freescale/fman/fman_memac.h | 57 +-
+ drivers/net/ethernet/freescale/fman/fman_muram.c | 31 +-
+ drivers/net/ethernet/freescale/fman/fman_muram.h | 32 +-
+ drivers/net/ethernet/freescale/fman/fman_port.c | 29 +-
+ drivers/net/ethernet/freescale/fman/fman_port.h | 29 +-
+ drivers/net/ethernet/freescale/fman/fman_sp.c | 29 +-
+ drivers/net/ethernet/freescale/fman/fman_sp.h | 28 +-
+ drivers/net/ethernet/freescale/fman/fman_tgec.c | 164 +-
+ drivers/net/ethernet/freescale/fman/fman_tgec.h | 54 +-
+ drivers/net/ethernet/freescale/fman/mac.c | 497 +-
+ drivers/net/ethernet/freescale/fman/mac.h | 45 +-
+ .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +-
+ drivers/net/ethernet/freescale/gianfar_ethtool.c | 2 +-
+ drivers/net/ethernet/freescale/ucc_geth_ethtool.c | 4 +-
+ drivers/net/ethernet/freescale/xgmac_mdio.c | 2 +-
+ drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 4 +-
+ drivers/net/ethernet/fungible/funeth/funeth_main.c | 12 +-
+ drivers/net/ethernet/hisilicon/hip04_eth.c | 4 +-
+ drivers/net/ethernet/hisilicon/hns3/hnae3.h | 36 +-
+ .../hisilicon/hns3/hns3_common/hclge_comm_cmd.c | 14 +-
+ .../hisilicon/hns3/hns3_common/hclge_comm_cmd.h | 6 +
+ drivers/net/ethernet/hisilicon/hns3/hns3_dcbnl.c | 28 +
+ drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 13 +
+ drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 53 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 48 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 23 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 89 +
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 65 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 293 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 29 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 2 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 50 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 5 +
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 4 +-
+ drivers/net/ethernet/ibm/ehea/ehea_ethtool.c | 4 +-
+ drivers/net/ethernet/ibm/emac/core.c | 4 +-
+ drivers/net/ethernet/ibm/ibmveth.c | 4 +-
+ drivers/net/ethernet/intel/e100.c | 4 +-
+ drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 4 +-
+ drivers/net/ethernet/intel/e1000e/ethtool.c | 4 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 6 +-
+ drivers/net/ethernet/intel/i40e/i40e.h | 14 +
+ drivers/net/ethernet/intel/i40e/i40e_common.c | 3 +
+ drivers/net/ethernet/intel/i40e/i40e_devids.h | 4 +-
+ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 6 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 51 +-
+ drivers/net/ethernet/intel/i40e/i40e_ptp.c | 2 +-
+ drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 6 +-
+ drivers/net/ethernet/intel/iavf/iavf_main.c | 177 +-
+ drivers/net/ethernet/intel/ice/ice.h | 1 +
+ drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 60 +
+ drivers/net/ethernet/intel/ice/ice_base.c | 2 +-
+ drivers/net/ethernet/intel/ice/ice_common.c | 350 +-
+ drivers/net/ethernet/intel/ice/ice_common.h | 10 +
+ drivers/net/ethernet/intel/ice/ice_devlink.c | 288 +
+ drivers/net/ethernet/intel/ice/ice_ethtool.c | 23 +-
+ drivers/net/ethernet/intel/ice/ice_lag.c | 16 +-
+ drivers/net/ethernet/intel/ice/ice_lag.h | 2 +-
+ drivers/net/ethernet/intel/ice/ice_lib.c | 23 +
+ drivers/net/ethernet/intel/ice/ice_lib.h | 2 +
+ drivers/net/ethernet/intel/ice/ice_main.c | 252 +-
+ drivers/net/ethernet/intel/ice/ice_nvm.c | 13 +-
+ drivers/net/ethernet/intel/ice/ice_nvm.h | 2 +-
+ drivers/net/ethernet/intel/ice/ice_ptp.c | 857 +-
+ drivers/net/ethernet/intel/ice/ice_ptp.h | 13 +
+ drivers/net/ethernet/intel/ice/ice_sched.c | 4 +-
+ drivers/net/ethernet/intel/ice/ice_switch.c | 172 +-
+ drivers/net/ethernet/intel/ice/ice_tc_lib.c | 142 +-
+ drivers/net/ethernet/intel/ice/ice_tc_lib.h | 6 +
+ drivers/net/ethernet/intel/ice/ice_txrx.c | 4 +-
+ drivers/net/ethernet/intel/ice/ice_txrx.h | 3 +-
+ drivers/net/ethernet/intel/ice/ice_type.h | 4 +-
+ drivers/net/ethernet/intel/igb/igb_ethtool.c | 6 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
+ drivers/net/ethernet/intel/igbvf/ethtool.c | 4 +-
+ drivers/net/ethernet/intel/igc/igc_main.c | 128 +-
+ drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 4 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 10 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 3 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 56 +-
+ drivers/net/ethernet/intel/ixgbevf/ethtool.c | 4 +-
+ drivers/net/ethernet/jme.c | 6 +-
+ drivers/net/ethernet/korina.c | 6 +-
+ drivers/net/ethernet/lantiq_etop.c | 2 +-
+ drivers/net/ethernet/marvell/mv643xx_eth.c | 8 +-
+ drivers/net/ethernet/marvell/mvneta.c | 6 +-
+ drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 6 +-
+ drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 3 +-
+ .../ethernet/marvell/octeontx2/nic/otx2_common.c | 59 +-
+ .../ethernet/marvell/octeontx2/nic/otx2_common.h | 28 +-
+ .../ethernet/marvell/octeontx2/nic/otx2_dcbnl.c | 300 +
+ .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 8 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 54 +-
+ drivers/net/ethernet/marvell/prestera/Makefile | 2 +-
+ drivers/net/ethernet/marvell/prestera/prestera.h | 2 +
+ .../net/ethernet/marvell/prestera/prestera_acl.c | 43 +
+ .../net/ethernet/marvell/prestera/prestera_acl.h | 2 +
+ .../ethernet/marvell/prestera/prestera_ethtool.c | 4 +-
+ .../net/ethernet/marvell/prestera/prestera_flow.c | 12 +-
+ .../net/ethernet/marvell/prestera/prestera_flow.h | 5 +
+ .../ethernet/marvell/prestera/prestera_flower.c | 48 +
+ .../ethernet/marvell/prestera/prestera_flower.h | 2 +
+ .../net/ethernet/marvell/prestera/prestera_hw.c | 49 +-
+ .../net/ethernet/marvell/prestera/prestera_hw.h | 7 +-
+ .../net/ethernet/marvell/prestera/prestera_main.c | 41 +-
+ .../ethernet/marvell/prestera/prestera_matchall.c | 125 +
+ .../ethernet/marvell/prestera/prestera_matchall.h | 17 +
+ .../net/ethernet/marvell/prestera/prestera_span.c | 66 +-
+ .../net/ethernet/marvell/prestera/prestera_span.h | 12 +-
+ .../ethernet/marvell/prestera/prestera_switchdev.c | 8 +-
+ drivers/net/ethernet/marvell/pxa168_eth.c | 8 +-
+ drivers/net/ethernet/marvell/skge.c | 6 +-
+ drivers/net/ethernet/marvell/sky2.c | 6 +-
+ drivers/net/ethernet/mediatek/mtk_eth_soc.c | 16 +-
+ drivers/net/ethernet/mediatek/mtk_ppe.h | 11 -
+ drivers/net/ethernet/mediatek/mtk_star_emac.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx4/fw.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/icm.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx4/main.c | 3 +
+ drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 8 +
+ drivers/net/ethernet/mellanox/mlx5/core/Makefile | 3 +
+ drivers/net/ethernet/mellanox/mlx5/core/en.h | 8 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 158 +-
+ .../ethernet/mellanox/mlx5/core/en/fs_ethtool.h | 29 +
+ .../mellanox/mlx5/core/en/fs_tt_redirect.c | 188 +-
+ .../mellanox/mlx5/core/en/fs_tt_redirect.h | 13 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 44 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h | 6 +-
+ .../ethernet/mellanox/mlx5/core/en/tc/act/goto.c | 3 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/trap.c | 8 +-
+ .../mellanox/mlx5/core/en_accel/en_accel.h | 15 +
+ .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c | 111 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.h | 14 +-
+ .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 24 +-
+ .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 4 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/ktls.c | 8 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c | 2 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/macsec.c | 1332 +
+ .../ethernet/mellanox/mlx5/core/en_accel/macsec.h | 72 +
+ .../mellanox/mlx5/core/en_accel/macsec_fs.c | 1384 +
+ .../mellanox/mlx5/core/en_accel/macsec_fs.h | 47 +
+ .../mellanox/mlx5/core/en_accel/macsec_stats.c | 72 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 141 +-
+ .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 9 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 437 +-
+ .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 76 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 49 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 75 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 9 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 4 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 3 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 85 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 3 +-
+ .../ethernet/mellanox/mlx5/core/esw/indir_table.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 1 -
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 7 +-
+ .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 495 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 9 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 31 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fw.c | 7 +
+ .../ethernet/mellanox/mlx5/core/ipoib/ethtool.c | 3 +-
+ .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 25 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 1 +
+ drivers/net/ethernet/mellanox/mlxsw/cmd.h | 3 +
+ drivers/net/ethernet/mellanox/mlxsw/core.c | 135 +-
+ drivers/net/ethernet/mellanox/mlxsw/core.h | 18 +-
+ .../net/ethernet/mellanox/mlxsw/core_linecards.c | 96 +-
+ drivers/net/ethernet/mellanox/mlxsw/i2c.c | 87 +-
+ drivers/net/ethernet/mellanox/mlxsw/minimal.c | 379 +-
+ drivers/net/ethernet/mellanox/mlxsw/pci.c | 5 +
+ drivers/net/ethernet/mellanox/mlxsw/reg.h | 92 -
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 49 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 6 +-
+ drivers/net/ethernet/micrel/ks8851.h | 2 +-
+ drivers/net/ethernet/micrel/ks8851_common.c | 46 +-
+ drivers/net/ethernet/micrel/ks8851_spi.c | 5 +-
+ drivers/net/ethernet/micrel/ksz884x.c | 6 +-
+ drivers/net/ethernet/microchip/enc28j60.c | 6 +-
+ drivers/net/ethernet/microchip/encx24j600.c | 6 +-
+ drivers/net/ethernet/microchip/lan743x_ethtool.c | 4 +-
+ drivers/net/ethernet/microchip/lan743x_main.c | 64 +-
+ drivers/net/ethernet/microchip/lan743x_main.h | 10 +-
+ drivers/net/ethernet/microchip/lan966x/Kconfig | 1 +
+ drivers/net/ethernet/microchip/lan966x/Makefile | 2 +-
+ .../net/ethernet/microchip/lan966x/lan966x_fdb.c | 155 +-
+ .../net/ethernet/microchip/lan966x/lan966x_lag.c | 363 +
+ .../net/ethernet/microchip/lan966x/lan966x_mac.c | 104 +-
+ .../net/ethernet/microchip/lan966x/lan966x_main.c | 6 +-
+ .../net/ethernet/microchip/lan966x/lan966x_main.h | 39 +
+ .../ethernet/microchip/lan966x/lan966x_phylink.c | 6 +-
+ .../net/ethernet/microchip/lan966x/lan966x_port.c | 22 +-
+ .../net/ethernet/microchip/lan966x/lan966x_regs.h | 51 +
+ .../ethernet/microchip/lan966x/lan966x_switchdev.c | 138 +-
+ .../ethernet/microchip/sparx5/sparx5_mactable.c | 4 +-
+ .../net/ethernet/microchip/sparx5/sparx5_main.c | 4 +
+ .../net/ethernet/microchip/sparx5/sparx5_main.h | 19 +-
+ .../ethernet/microchip/sparx5/sparx5_switchdev.c | 271 +-
+ .../net/ethernet/microchip/sparx5/sparx5_vlan.c | 7 +
+ drivers/net/ethernet/moxa/moxart_ether.c | 4 +-
+ drivers/net/ethernet/mscc/Makefile | 11 +-
+ drivers/net/ethernet/mscc/ocelot.c | 790 +-
+ drivers/net/ethernet/mscc/ocelot.h | 12 +-
+ drivers/net/ethernet/mscc/ocelot_net.c | 88 +-
+ drivers/net/ethernet/mscc/ocelot_ptp.c | 481 +
+ drivers/net/ethernet/mscc/ocelot_stats.c | 458 +
+ drivers/net/ethernet/mscc/ocelot_vsc7514.c | 373 +-
+ drivers/net/ethernet/mscc/vsc7514_regs.c | 3 +-
+ drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 8 +-
+ drivers/net/ethernet/natsemi/natsemi.c | 6 +-
+ drivers/net/ethernet/natsemi/ns83820.c | 6 +-
+ drivers/net/ethernet/neterion/s2io.c | 6 +-
+ .../net/ethernet/netronome/nfp/flower/offload.c | 9 +-
+ drivers/net/ethernet/netronome/nfp/nfp_main.h | 5 +
+ .../net/ethernet/netronome/nfp/nfp_net_common.c | 9 +-
+ drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.c | 8 +
+ drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 11 +
+ .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 193 +-
+ drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 98 +-
+ drivers/net/ethernet/netronome/nfp/nfp_port.h | 2 +
+ drivers/net/ethernet/ni/nixge.c | 4 +-
+ drivers/net/ethernet/nvidia/forcedeth.c | 6 +-
+ drivers/net/ethernet/nxp/lpc_eth.c | 6 +-
+ .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 6 +-
+ drivers/net/ethernet/packetengines/hamachi.c | 6 +-
+ drivers/net/ethernet/packetengines/yellowfin.c | 6 +-
+ .../ethernet/qlogic/netxen/netxen_nic_ethtool.c | 6 +-
+ drivers/net/ethernet/qlogic/qed/qed_int.c | 2 +-
+ drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 4 +-
+ drivers/net/ethernet/qlogic/qede/qede_main.c | 2 +-
+ drivers/net/ethernet/qlogic/qla3xxx.c | 6 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 6 +-
+ drivers/net/ethernet/qualcomm/qca_debug.c | 8 +-
+ drivers/net/ethernet/rdc/r6040.c | 6 +-
+ drivers/net/ethernet/realtek/8139cp.c | 6 +-
+ drivers/net/ethernet/realtek/8139too.c | 6 +-
+ drivers/net/ethernet/realtek/r8169.h | 18 +-
+ drivers/net/ethernet/realtek/r8169_main.c | 218 +-
+ drivers/net/ethernet/realtek/r8169_phy_config.c | 133 -
+ drivers/net/ethernet/rocker/rocker_main.c | 4 +-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c | 4 +-
+ drivers/net/ethernet/sfc/efx.c | 14 +-
+ drivers/net/ethernet/sfc/efx_common.c | 2 +-
+ drivers/net/ethernet/sfc/ethtool_common.c | 6 +-
+ drivers/net/ethernet/sfc/falcon/efx.c | 4 +-
+ drivers/net/ethernet/sfc/falcon/ethtool.c | 8 +-
+ drivers/net/ethernet/sfc/falcon/falcon.c | 2 +-
+ drivers/net/ethernet/sfc/falcon/nic.c | 2 +-
+ drivers/net/ethernet/sfc/filter.h | 22 +
+ drivers/net/ethernet/sfc/mcdi_mon.c | 2 +-
+ drivers/net/ethernet/sfc/nic.c | 2 +-
+ drivers/net/ethernet/sfc/ptp.c | 128 +-
+ drivers/net/ethernet/sfc/siena/efx.c | 14 +-
+ drivers/net/ethernet/sfc/siena/efx_common.c | 2 +-
+ drivers/net/ethernet/sfc/siena/ethtool_common.c | 6 +-
+ drivers/net/ethernet/sfc/siena/mcdi_mon.c | 2 +-
+ drivers/net/ethernet/sfc/siena/nic.c | 2 +-
+ drivers/net/ethernet/sgi/ioc3-eth.c | 6 +-
+ drivers/net/ethernet/sis/sis190.c | 6 +-
+ drivers/net/ethernet/sis/sis900.c | 6 +-
+ drivers/net/ethernet/smsc/epic100.c | 6 +-
+ drivers/net/ethernet/smsc/smc911x.c | 6 +-
+ drivers/net/ethernet/smsc/smc91c92_cs.c | 4 +-
+ drivers/net/ethernet/smsc/smc91x.c | 6 +-
+ drivers/net/ethernet/smsc/smsc911x.c | 6 +-
+ drivers/net/ethernet/smsc/smsc9420.c | 6 +-
+ drivers/net/ethernet/socionext/netsec.c | 4 +-
+ drivers/net/ethernet/socionext/sni_ave.c | 4 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 1 -
+ drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 155 +
+ drivers/net/ethernet/stmicro/stmmac/dwmac100.h | 2 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 2 +-
+ .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 9 -
+ .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 8 -
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 1 -
+ .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 8 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 24 +-
+ drivers/net/ethernet/sun/cassini.c | 6 +-
+ drivers/net/ethernet/sun/ldmvsw.c | 4 +-
+ drivers/net/ethernet/sun/niu.c | 6 +-
+ drivers/net/ethernet/sun/sunbmac.c | 4 +-
+ drivers/net/ethernet/sun/sungem.c | 6 +-
+ drivers/net/ethernet/sun/sunhme.c | 6 +-
+ drivers/net/ethernet/sun/sunqe.c | 4 +-
+ drivers/net/ethernet/sun/sunvnet.c | 4 +-
+ drivers/net/ethernet/sunplus/spl2sw_driver.c | 3 +-
+ drivers/net/ethernet/synopsys/dwc-xlgmac-common.c | 4 +-
+ drivers/net/ethernet/synopsys/dwc-xlgmac-ethtool.c | 6 +-
+ drivers/net/ethernet/tehuti/tehuti.c | 8 +-
+ drivers/net/ethernet/ti/Kconfig | 1 +
+ drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 4 +-
+ drivers/net/ethernet/ti/am65-cpsw-nuss.c | 44 +-
+ drivers/net/ethernet/ti/am65-cpsw-nuss.h | 2 +
+ drivers/net/ethernet/ti/cpmac.c | 4 +-
+ drivers/net/ethernet/ti/cpsw.c | 6 +-
+ drivers/net/ethernet/ti/cpsw_new.c | 6 +-
+ drivers/net/ethernet/ti/davinci_emac.c | 4 +-
+ drivers/net/ethernet/ti/davinci_mdio.c | 242 +-
+ drivers/net/ethernet/ti/tlan.c | 6 +-
+ drivers/net/ethernet/toshiba/ps3_gelic_net.c | 4 +-
+ drivers/net/ethernet/toshiba/spider_net_ethtool.c | 8 +-
+ drivers/net/ethernet/toshiba/tc35815.c | 6 +-
+ drivers/net/ethernet/vertexcom/mse102x.c | 2 +-
+ drivers/net/ethernet/via/via-rhine.c | 4 +-
+ drivers/net/ethernet/via/via-velocity.c | 8 +-
+ drivers/net/ethernet/wangxun/Kconfig | 13 +
+ drivers/net/ethernet/wangxun/Makefile | 1 +
+ drivers/net/ethernet/wangxun/ngbe/Makefile | 9 +
+ drivers/net/ethernet/wangxun/ngbe/ngbe.h | 24 +
+ drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 170 +
+ drivers/net/ethernet/wangxun/ngbe/ngbe_type.h | 50 +
+ drivers/net/ethernet/wiznet/w5100.c | 6 +-
+ drivers/net/ethernet/wiznet/w5300.c | 6 +-
+ drivers/net/ethernet/xilinx/xilinx_axienet.h | 12 +
+ drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 41 +-
+ drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +-
+ drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +-
+ drivers/net/ethernet/xscale/ixp4xx_eth.c | 6 +-
+ drivers/net/fjes/fjes_ethtool.c | 6 +-
+ drivers/net/geneve.c | 13 +-
+ drivers/net/gtp.c | 1 +
+ drivers/net/hamradio/hdlcdrv.c | 2 +-
+ drivers/net/hyperv/netvsc_drv.c | 4 +-
+ drivers/net/ieee802154/mac802154_hwsim.c | 1 +
+ drivers/net/ipa/gsi.c | 66 +-
+ drivers/net/ipa/gsi.h | 16 +-
+ drivers/net/ipa/gsi_private.h | 8 +
+ drivers/net/ipa/gsi_trans.c | 163 +-
+ drivers/net/ipa/gsi_trans.h | 3 -
+ drivers/net/ipvlan/ipvlan_main.c | 4 +-
+ drivers/net/macsec.c | 55 +-
+ drivers/net/macvlan.c | 4 +-
+ drivers/net/net_failover.c | 4 +-
+ drivers/net/netconsole.c | 10 +-
+ drivers/net/netdevsim/dev.c | 20 +-
+ drivers/net/ntb_netdev.c | 6 +-
+ drivers/net/pcs/Kconfig | 6 +
+ drivers/net/pcs/Makefile | 1 +
+ drivers/net/pcs/pcs-altera-tse.c | 175 +
+ drivers/net/phy/adin.c | 2 +-
+ drivers/net/phy/at803x.c | 25 +
+ drivers/net/phy/bcm-phy-lib.c | 2 +-
+ drivers/net/phy/broadcom.c | 39 +
+ drivers/net/phy/marvell.c | 2 +-
+ drivers/net/phy/micrel.c | 2 +-
+ drivers/net/phy/mscc/mscc_main.c | 2 +-
+ drivers/net/phy/nxp-tja11xx.c | 83 +-
+ drivers/net/phy/phy-core.c | 53 +
+ drivers/net/phy/phy_device.c | 2 +-
+ drivers/net/phy/phylink.c | 9 +
+ drivers/net/phy/realtek.c | 44 +-
+ drivers/net/phy/sfp.c | 121 +-
+ drivers/net/phy/smsc.c | 30 +-
+ drivers/net/phy/spi_ks8995.c | 69 +-
+ drivers/net/rionet.c | 8 +-
+ drivers/net/team/team.c | 5 +-
+ drivers/net/thunderbolt.c | 62 +-
+ drivers/net/tun.c | 8 +-
+ drivers/net/usb/Kconfig | 2 +-
+ drivers/net/usb/aqc111.c | 2 +-
+ drivers/net/usb/asix.h | 3 +
+ drivers/net/usb/asix_common.c | 4 +-
+ drivers/net/usb/asix_devices.c | 142 +-
+ drivers/net/usb/catc.c | 4 +-
+ drivers/net/usb/pegasus.c | 2 +-
+ drivers/net/usb/r8152.c | 28 +-
+ drivers/net/usb/rtl8150.c | 4 +-
+ drivers/net/usb/sierra_net.c | 4 +-
+ drivers/net/usb/usbnet.c | 6 +-
+ drivers/net/veth.c | 4 +-
+ drivers/net/virtio_net.c | 6 +-
+ drivers/net/vmxnet3/vmxnet3_ethtool.c | 6 +-
+ drivers/net/vrf.c | 4 +-
+ drivers/net/vxlan/vxlan_core.c | 13 +-
+ drivers/net/wireguard/netlink.c | 1 +
+ drivers/net/wireless/ath/ath10k/core.c | 16 +
+ drivers/net/wireless/ath/ath10k/htc.c | 11 +-
+ drivers/net/wireless/ath/ath10k/hw.h | 2 +
+ drivers/net/wireless/ath/ath10k/mac.c | 54 +-
+ drivers/net/wireless/ath/ath6kl/cfg80211.c | 8 +-
+ drivers/net/wireless/ath/ath6kl/init.c | 2 +-
+ drivers/net/wireless/ath/ath9k/htc_hst.c | 43 +-
+ drivers/net/wireless/ath/carl9170/fw.c | 2 +-
+ drivers/net/wireless/ath/wil6210/cfg80211.c | 10 +-
+ drivers/net/wireless/ath/wil6210/main.c | 2 +-
+ drivers/net/wireless/ath/wil6210/netdev.c | 2 +-
+ drivers/net/wireless/ath/wil6210/wmi.c | 2 +-
+ drivers/net/wireless/atmel/atmel.c | 2 +-
+ drivers/net/wireless/broadcom/b43/leds.c | 2 +-
+ drivers/net/wireless/broadcom/b43legacy/leds.c | 2 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 3 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c | 23 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/common.c | 8 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/core.c | 12 +-
+ .../broadcom/brcm80211/brcmfmac/firmware.c | 2 +-
+ .../broadcom/brcm80211/brcmfmac/flowring.c | 5 +-
+ .../broadcom/brcm80211/brcmfmac/fwsignal.c | 18 +-
+ .../broadcom/brcm80211/brcmfmac/fwsignal.h | 3 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 25 +-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/pno.c | 12 +-
+ .../wireless/broadcom/brcm80211/brcmsmac/types.h | 2 +-
+ drivers/net/wireless/intel/ipw2x00/ipw2100.c | 6 +-
+ drivers/net/wireless/intel/ipw2x00/ipw2200.c | 6 +-
+ drivers/net/wireless/intel/iwlegacy/3945-mac.c | 2 +-
+ .../net/wireless/intersil/hostap/hostap_ioctl.c | 2 +-
+ drivers/net/wireless/mac80211_hwsim.c | 458 +-
+ drivers/net/wireless/marvell/libertas/cfg.c | 9 +-
+ drivers/net/wireless/marvell/libertas/ethtool.c | 4 +-
+ drivers/net/wireless/marvell/mwifiex/cfg80211.c | 10 +-
+ drivers/net/wireless/microchip/wilc1000/cfg80211.c | 22 +-
+ drivers/net/wireless/microchip/wilc1000/mon.c | 2 +-
+ drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 18 +-
+ drivers/net/wireless/quantenna/qtnfmac/commands.c | 2 +-
+ .../net/wireless/realtek/rtl818x/rtl8187/leds.c | 2 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 14 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 9 +-
+ drivers/net/wireless/realtek/rtw88/bf.c | 2 +-
+ drivers/net/wireless/realtek/rtw88/coex.c | 88 +-
+ drivers/net/wireless/realtek/rtw88/coex.h | 14 +-
+ drivers/net/wireless/realtek/rtw88/debug.c | 11 +-
+ drivers/net/wireless/realtek/rtw88/efuse.c | 4 +-
+ drivers/net/wireless/realtek/rtw88/fw.c | 95 +-
+ drivers/net/wireless/realtek/rtw88/fw.h | 21 +-
+ drivers/net/wireless/realtek/rtw88/mac.c | 18 +-
+ drivers/net/wireless/realtek/rtw88/mac80211.c | 14 +-
+ drivers/net/wireless/realtek/rtw88/main.c | 220 +-
+ drivers/net/wireless/realtek/rtw88/main.h | 31 +-
+ drivers/net/wireless/realtek/rtw88/pci.c | 20 +-
+ drivers/net/wireless/realtek/rtw88/phy.c | 65 +-
+ drivers/net/wireless/realtek/rtw88/phy.h | 2 +-
+ drivers/net/wireless/realtek/rtw88/ps.c | 7 +-
+ drivers/net/wireless/realtek/rtw88/regd.c | 2 +
+ drivers/net/wireless/realtek/rtw88/rtw8723d.c | 3 +-
+ drivers/net/wireless/realtek/rtw88/rtw8821c.c | 3 +-
+ drivers/net/wireless/realtek/rtw88/rtw8822b.c | 3 +-
+ drivers/net/wireless/realtek/rtw88/rtw8822c.c | 3 +-
+ drivers/net/wireless/realtek/rtw88/tx.c | 8 +-
+ drivers/net/wireless/realtek/rtw88/util.c | 4 +-
+ drivers/net/wireless/realtek/rtw89/Makefile | 1 +
+ drivers/net/wireless/realtek/rtw89/chan.c | 235 +
+ drivers/net/wireless/realtek/rtw89/chan.h | 64 +
+ drivers/net/wireless/realtek/rtw89/coex.c | 1122 +-
+ drivers/net/wireless/realtek/rtw89/coex.h | 6 +-
+ drivers/net/wireless/realtek/rtw89/core.c | 332 +-
+ drivers/net/wireless/realtek/rtw89/core.h | 418 +-
+ drivers/net/wireless/realtek/rtw89/debug.c | 31 +-
+ drivers/net/wireless/realtek/rtw89/fw.c | 251 +-
+ drivers/net/wireless/realtek/rtw89/fw.h | 109 +-
+ drivers/net/wireless/realtek/rtw89/mac.c | 79 +-
+ drivers/net/wireless/realtek/rtw89/mac.h | 1 +
+ drivers/net/wireless/realtek/rtw89/mac80211.c | 77 +-
+ drivers/net/wireless/realtek/rtw89/pci.c | 220 +-
+ drivers/net/wireless/realtek/rtw89/pci.h | 41 +-
+ drivers/net/wireless/realtek/rtw89/phy.c | 286 +-
+ drivers/net/wireless/realtek/rtw89/phy.h | 10 +-
+ drivers/net/wireless/realtek/rtw89/ps.c | 3 +-
+ drivers/net/wireless/realtek/rtw89/reg.h | 39 +-
+ drivers/net/wireless/realtek/rtw89/regd.c | 2 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852a.c | 150 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c | 77 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852c.c | 285 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c | 73 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.h | 2 +-
+ .../net/wireless/realtek/rtw89/rtw8852c_table.c | 36992 ++++++++++++++-----
+ drivers/net/wireless/realtek/rtw89/sar.c | 8 +-
+ drivers/net/wireless/realtek/rtw89/ser.c | 13 +-
+ drivers/net/wireless/rndis_wlan.c | 20 +-
+ drivers/net/wireless/silabs/wfx/main.c | 2 +-
+ drivers/net/wireless/wl3501_cs.c | 8 +-
+ drivers/of/base.c | 1 +
+ drivers/phy/microchip/lan966x_serdes.c | 3 +
+ drivers/soc/fsl/qbman/qman.c | 77 +-
+ drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 13 +-
+ drivers/staging/wlan-ng/cfg80211.c | 12 +-
+ drivers/target/target_core_user.c | 1 +
+ drivers/thermal/thermal_netlink.c | 1 +
+ drivers/thunderbolt/nhi.c | 49 +-
+ drivers/thunderbolt/tb.c | 8 +-
+ drivers/thunderbolt/tb.h | 2 +-
+ drivers/thunderbolt/usb4.c | 8 +-
+ drivers/thunderbolt/usb4_port.c | 2 +
+ drivers/vdpa/vdpa.c | 1 +
+ fs/cifs/netlink.c | 1 +
+ fs/dlm/netlink.c | 1 +
+ fs/ksmbd/transport_ipc.c | 1 +
+ include/linux/bpf-cgroup.h | 17 +
+ include/linux/bpf.h | 23 +
+ include/linux/bpf_mem_alloc.h | 28 +
+ include/linux/bpf_verifier.h | 11 +
+ include/linux/brcmphy.h | 1 +
+ include/linux/btf.h | 2 +
+ include/linux/compiler_attributes.h | 7 +
+ include/linux/etherdevice.h | 22 +
+ include/linux/filter.h | 3 +-
+ include/linux/genl_magic_func.h | 1 +
+ include/linux/ieee80211.h | 14 +-
+ include/linux/igmp.h | 4 +-
+ include/linux/mlx5/device.h | 4 +
+ include/linux/mlx5/fs.h | 12 +-
+ include/linux/mlx5/mlx5_ifc.h | 111 +-
+ include/linux/mlx5/qp.h | 1 +
+ include/linux/mroute.h | 6 +-
+ include/linux/mroute6.h | 4 +-
+ include/linux/netdevice.h | 42 +-
+ include/linux/netfilter.h | 5 -
+ include/linux/netfilter_defs.h | 8 -
+ include/linux/netlink.h | 24 +
+ include/linux/pcs-altera-tse.h | 17 +
+ include/linux/phy.h | 10 +
+ include/linux/skbuff.h | 7 +-
+ include/linux/sockptr.h | 5 +
+ include/linux/stmmac.h | 1 -
+ include/linux/thunderbolt.h | 2 +
+ include/linux/tnum.h | 20 +-
+ include/net/act_api.h | 1 +
+ include/net/af_vsock.h | 2 +
+ include/net/cfg80211.h | 43 +-
+ include/net/devlink.h | 20 +-
+ include/net/dn.h | 231 -
+ include/net/dn_dev.h | 200 -
+ include/net/dn_fib.h | 169 -
+ include/net/dn_neigh.h | 32 -
+ include/net/dn_nsp.h | 201 -
+ include/net/dn_route.h | 118 -
+ include/net/dsa.h | 4 +
+ include/net/dst_metadata.h | 10 +
+ include/net/genetlink.h | 10 +
+ include/net/gro.h | 33 +-
+ include/net/inet_connection_sock.h | 3 +
+ include/net/inet_hashtables.h | 80 +-
+ include/net/ip.h | 4 +
+ include/net/ipv6.h | 6 +-
+ include/net/ipv6_stubs.h | 4 +
+ include/net/mac80211.h | 9 +
+ include/net/macsec.h | 26 +-
+ include/net/netfilter/nf_conntrack_core.h | 6 -
+ include/net/netfilter/nf_nat_helper.h | 1 +
+ include/net/netlink.h | 13 +-
+ include/net/netns/netfilter.h | 3 -
+ include/net/nl802154.h | 6 +-
+ include/net/pkt_sched.h | 2 +-
+ include/net/red.h | 1 -
+ include/net/sch_generic.h | 8 -
+ include/net/sock.h | 23 +
+ include/net/tcp.h | 4 +
+ include/soc/fsl/qman.h | 9 +
+ include/soc/mscc/ocelot.h | 140 +-
+ include/uapi/linux/bpf.h | 116 +-
+ include/uapi/linux/dn.h | 149 -
+ include/uapi/linux/if_macsec.h | 2 +
+ include/uapi/linux/in.h | 20 +-
+ include/uapi/linux/netfilter.h | 2 +
+ include/uapi/linux/netfilter_decnet.h | 72 -
+ include/uapi/linux/netlink.h | 29 +-
+ include/uapi/linux/nl80211.h | 25 +-
+ include/uapi/linux/openvswitch.h | 3 +
+ kernel/bpf/Makefile | 5 +-
+ kernel/bpf/bpf_iter.c | 10 +
+ kernel/bpf/bpf_local_storage.c | 10 +-
+ kernel/bpf/bpf_lsm.c | 23 +-
+ kernel/bpf/bpf_task_storage.c | 8 +-
+ kernel/bpf/btf.c | 18 +-
+ kernel/bpf/cgroup.c | 157 +-
+ kernel/bpf/cgroup_iter.c | 282 +
+ kernel/bpf/core.c | 1 +
+ kernel/bpf/cpumap.c | 6 +-
+ kernel/bpf/devmap.c | 6 +-
+ kernel/bpf/hashtab.c | 174 +-
+ kernel/bpf/helpers.c | 80 +-
+ kernel/bpf/local_storage.c | 5 +-
+ kernel/bpf/lpm_trie.c | 4 +-
+ kernel/bpf/memalloc.c | 634 +
+ kernel/bpf/offload.c | 6 +-
+ kernel/bpf/queue_stack_maps.c | 2 -
+ kernel/bpf/ringbuf.c | 10 +-
+ kernel/bpf/syscall.c | 15 +-
+ kernel/bpf/trampoline.c | 8 +-
+ kernel/bpf/verifier.c | 253 +-
+ kernel/cgroup/cgroup.c | 5 -
+ kernel/cgroup/rstat.c | 48 +
+ kernel/taskstats.c | 1 +
+ lib/nlattr.c | 31 +-
+ net/8021q/vlan_core.c | 9 +-
+ net/8021q/vlan_dev.c | 6 +-
+ net/Kconfig | 2 -
+ net/Makefile | 1 -
+ net/ax25/af_ax25.c | 2 +-
+ net/batman-adv/netlink.c | 1 +
+ net/bpf/test_run.c | 5 +
+ net/bridge/br_device.c | 8 +-
+ net/bridge/br_if.c | 20 -
+ net/bridge/br_sysfs_if.c | 4 +-
+ net/bridge/netfilter/ebtables.c | 2 +-
+ net/caif/caif_dev.c | 2 +-
+ net/caif/caif_usb.c | 2 +-
+ net/caif/cfcnfg.c | 4 +-
+ net/caif/cfctrl.c | 2 +-
+ net/core/dev.c | 8 +-
+ net/core/devlink.c | 259 +-
+ net/core/drop_monitor.c | 3 +-
+ net/core/filter.c | 635 +-
+ net/core/flow_dissector.c | 16 +-
+ net/core/neighbour.c | 3 -
+ net/core/netclassid_cgroup.c | 2 +-
+ net/core/netpoll.c | 4 +-
+ net/core/rtnetlink.c | 6 +-
+ net/core/skbuff.c | 5 +-
+ net/core/sock.c | 134 +-
+ net/core/sock_map.c | 12 +-
+ net/core/sysctl_net_core.c | 1 -
+ net/dccp/ipv4.c | 25 +-
+ net/dccp/ipv6.c | 18 +
+ net/dccp/proto.c | 34 +-
+ net/decnet/Kconfig | 43 -
+ net/decnet/Makefile | 10 -
+ net/decnet/README | 8 -
+ net/decnet/af_decnet.c | 2404 --
+ net/decnet/dn_dev.c | 1433 -
+ net/decnet/dn_fib.c | 798 -
+ net/decnet/dn_neigh.c | 607 -
+ net/decnet/dn_nsp_in.c | 907 -
+ net/decnet/dn_nsp_out.c | 696 -
+ net/decnet/dn_route.c | 1922 -
+ net/decnet/dn_rules.c | 253 -
+ net/decnet/dn_table.c | 929 -
+ net/decnet/dn_timer.c | 104 -
+ net/decnet/netfilter/Kconfig | 17 -
+ net/decnet/netfilter/Makefile | 6 -
+ net/decnet/netfilter/dn_rtmsg.c | 158 -
+ net/decnet/sysctl_net_decnet.c | 362 -
+ net/dsa/dsa2.c | 92 +-
+ net/dsa/dsa_priv.h | 5 +-
+ net/dsa/master.c | 4 +-
+ net/dsa/port.c | 190 +-
+ net/dsa/slave.c | 125 +-
+ net/dsa/tag_8021q.c | 4 +-
+ net/ethernet/eth.c | 9 +-
+ net/ethtool/ioctl.c | 8 +-
+ net/ethtool/netlink.c | 4 +
+ net/ethtool/strset.c | 2 +-
+ net/hsr/hsr_netlink.c | 1 +
+ net/ieee802154/netlink.c | 1 +
+ net/ieee802154/nl802154.c | 1 +
+ net/ipv4/af_inet.c | 35 +-
+ net/ipv4/arp.c | 2 +-
+ net/ipv4/datagram.c | 2 +
+ net/ipv4/fou.c | 10 +-
+ net/ipv4/gre_offload.c | 9 +-
+ net/ipv4/igmp.c | 22 +-
+ net/ipv4/inet_connection_sock.c | 275 +-
+ net/ipv4/inet_hashtables.c | 268 +-
+ net/ipv4/ip_output.c | 5 +-
+ net/ipv4/ip_sockglue.c | 114 +-
+ net/ipv4/ipmr.c | 9 +-
+ net/ipv4/netfilter/nf_nat_h323.c | 60 +-
+ net/ipv4/tcp.c | 141 +-
+ net/ipv4/tcp_fastopen.c | 3 +-
+ net/ipv4/tcp_ipv4.c | 23 +-
+ net/ipv4/tcp_metrics.c | 1 +
+ net/ipv4/tcp_offload.c | 9 +-
+ net/ipv4/tcp_timer.c | 2 +-
+ net/ipv6/af_inet6.c | 2 +
+ net/ipv6/ila/ila_main.c | 1 +
+ net/ipv6/ioam6.c | 1 +
+ net/ipv6/ip6_gre.c | 2 +-
+ net/ipv6/ip6_offload.c | 9 +-
+ net/ipv6/ip6_output.c | 5 +-
+ net/ipv6/ip6_tunnel.c | 2 +-
+ net/ipv6/ip6_vti.c | 2 +-
+ net/ipv6/ip6mr.c | 10 +-
+ net/ipv6/ipv6_sockglue.c | 113 +-
+ net/ipv6/mcast.c | 8 +-
+ net/ipv6/seg6.c | 1 +
+ net/ipv6/sit.c | 2 +-
+ net/ipv6/tcp_ipv6.c | 43 +-
+ net/l2tp/l2tp_eth.c | 4 +-
+ net/l2tp/l2tp_netlink.c | 1 +
+ net/mac80211/Makefile | 1 +
+ net/mac80211/cfg.c | 136 +-
+ net/mac80211/eht.c | 4 +-
+ net/mac80211/ethtool.c | 10 +-
+ net/mac80211/ibss.c | 8 +-
+ net/mac80211/ieee80211_i.h | 26 +-
+ net/mac80211/iface.c | 318 +-
+ net/mac80211/key.c | 192 +-
+ net/mac80211/key.h | 13 +-
+ net/mac80211/link.c | 262 +
+ net/mac80211/main.c | 2 +
+ net/mac80211/mesh.c | 2 +-
+ net/mac80211/mlme.c | 123 +-
+ net/mac80211/rx.c | 200 +-
+ net/mac80211/scan.c | 2 +-
+ net/mac80211/sta_info.c | 9 +-
+ net/mac80211/tx.c | 65 +-
+ net/mac80211/util.c | 65 +-
+ net/mptcp/pm_netlink.c | 23 +-
+ net/mptcp/protocol.c | 13 +-
+ net/mptcp/protocol.h | 2 +
+ net/ncsi/ncsi-netlink.c | 1 +
+ net/netfilter/core.c | 10 -
+ net/netfilter/ipset/ip_set_core.c | 12 +-
+ net/netfilter/ipvs/ip_vs_ctl.c | 9 +-
+ net/netfilter/nf_conntrack_core.c | 6 -
+ net/netfilter/nf_conntrack_proto_tcp.c | 321 +-
+ net/netfilter/nf_log.c | 4 +-
+ net/netfilter/nf_nat_amanda.c | 14 +-
+ net/netfilter/nf_nat_ftp.c | 17 +-
+ net/netfilter/nf_nat_helper.c | 31 +
+ net/netfilter/nf_nat_irc.c | 16 +-
+ net/netfilter/nf_nat_sip.c | 14 +-
+ net/netfilter/nf_tables_api.c | 2 +-
+ net/netfilter/nfnetlink_hook.c | 7 -
+ net/netfilter/nft_osf.c | 2 +-
+ net/netfilter/nft_payload.c | 6 +-
+ net/netfilter/x_tables.c | 20 +-
+ net/netfilter/xt_RATEEST.c | 2 +-
+ net/netlabel/netlabel_calipso.c | 1 +
+ net/netlabel/netlabel_cipso_v4.c | 1 +
+ net/netlabel/netlabel_mgmt.c | 1 +
+ net/netlabel/netlabel_unlabeled.c | 1 +
+ net/netlink/af_netlink.c | 105 +-
+ net/netlink/genetlink.c | 8 +-
+ net/nfc/netlink.c | 1 +
+ net/openvswitch/conntrack.c | 1 +
+ net/openvswitch/datapath.c | 42 +-
+ net/openvswitch/flow_netlink.c | 2 +-
+ net/openvswitch/meter.c | 1 +
+ net/openvswitch/vport-internal_dev.c | 3 +-
+ net/openvswitch/vport.h | 2 +
+ net/packet/af_packet.c | 4 +-
+ net/psample/psample.c | 1 +
+ net/rds/message.c | 2 +-
+ net/sched/act_api.c | 33 +-
+ net/sched/act_bpf.c | 28 +-
+ net/sched/act_connmark.c | 28 +-
+ net/sched/act_csum.c | 28 +-
+ net/sched/act_ct.c | 32 +-
+ net/sched/act_ctinfo.c | 28 +-
+ net/sched/act_gact.c | 28 +-
+ net/sched/act_gate.c | 28 +-
+ net/sched/act_ife.c | 28 +-
+ net/sched/act_ipt.c | 61 +-
+ net/sched/act_mirred.c | 28 +-
+ net/sched/act_mpls.c | 28 +-
+ net/sched/act_nat.c | 28 +-
+ net/sched/act_pedit.c | 28 +-
+ net/sched/act_police.c | 28 +-
+ net/sched/act_sample.c | 28 +-
+ net/sched/act_simple.c | 28 +-
+ net/sched/act_skbedit.c | 28 +-
+ net/sched/act_skbmod.c | 28 +-
+ net/sched/act_tunnel_key.c | 28 +-
+ net/sched/act_vlan.c | 28 +-
+ net/sched/cls_api.c | 13 -
+ net/sched/cls_route.c | 4 +-
+ net/sched/sch_api.c | 24 +-
+ net/sched/sch_atm.c | 1 -
+ net/sched/sch_cake.c | 3 -
+ net/sched/sch_cbq.c | 1 -
+ net/sched/sch_choke.c | 4 -
+ net/sched/sch_codel.c | 3 -
+ net/sched/sch_drr.c | 2 -
+ net/sched/sch_dsmark.c | 2 -
+ net/sched/sch_etf.c | 6 -
+ net/sched/sch_ets.c | 7 -
+ net/sched/sch_fq.c | 3 -
+ net/sched/sch_fq_codel.c | 30 +-
+ net/sched/sch_fq_pie.c | 6 -
+ net/sched/sch_generic.c | 1 -
+ net/sched/sch_gred.c | 13 +-
+ net/sched/sch_hfsc.c | 4 +-
+ net/sched/sch_hhf.c | 3 -
+ net/sched/sch_htb.c | 40 +-
+ net/sched/sch_multiq.c | 1 -
+ net/sched/sch_netem.c | 3 -
+ net/sched/sch_pie.c | 3 -
+ net/sched/sch_plug.c | 3 -
+ net/sched/sch_prio.c | 4 +-
+ net/sched/sch_qfq.c | 2 -
+ net/sched/sch_red.c | 6 -
+ net/sched/sch_sfb.c | 2 -
+ net/sched/sch_skbprio.c | 3 -
+ net/sched/sch_taprio.c | 2 -
+ net/sched/sch_tbf.c | 2 -
+ net/sched/sch_teql.c | 3 +-
+ net/smc/smc_netlink.c | 3 +-
+ net/smc/smc_pnet.c | 3 +-
+ net/tipc/netlink.c | 1 +
+ net/tipc/netlink_compat.c | 1 +
+ net/unix/af_unix.c | 36 +-
+ net/vmw_vsock/af_vsock.c | 33 +-
+ net/vmw_vsock/hyperv_transport.c | 7 +
+ net/vmw_vsock/virtio_transport_common.c | 7 +-
+ net/vmw_vsock/vmci_transport_notify.c | 10 +-
+ net/vmw_vsock/vmci_transport_notify_qstate.c | 12 +-
+ net/wireless/core.c | 16 +
+ net/wireless/ibss.c | 2 +-
+ net/wireless/nl80211.c | 198 +-
+ net/wireless/rdev-ops.h | 58 +-
+ net/wireless/reg.c | 4 +
+ net/wireless/scan.c | 2 +-
+ net/wireless/sme.c | 5 +-
+ net/wireless/trace.h | 97 +-
+ net/wireless/util.c | 4 +-
+ net/wireless/wext-compat.c | 18 +-
+ samples/bpf/map_perf_test_kern.c | 44 +-
+ samples/bpf/map_perf_test_user.c | 2 +-
+ scripts/bpf_doc.py | 78 +-
+ tools/bpf/bpftool/btf_dumper.c | 2 +-
+ tools/bpf/bpftool/common.c | 15 +-
+ tools/bpf/bpftool/feature.c | 2 +-
+ tools/bpf/bpftool/link.c | 35 +
+ tools/bpf/bpftool/main.c | 10 +
+ tools/include/uapi/linux/bpf.h | 116 +-
+ tools/lib/bpf/bpf.c | 186 +-
+ tools/lib/bpf/bpf_helpers.h | 19 +-
+ tools/lib/bpf/bpf_tracing.h | 14 +-
+ tools/lib/bpf/btf.c | 2 -
+ tools/lib/bpf/btf.h | 1 -
+ tools/lib/bpf/libbpf.c | 104 +-
+ tools/lib/bpf/libbpf.h | 2 +
+ tools/lib/bpf/libbpf.map | 2 +
+ tools/lib/bpf/libbpf_internal.h | 3 +
+ tools/lib/bpf/libbpf_legacy.h | 2 +
+ tools/lib/bpf/libbpf_probes.c | 2 +-
+ tools/lib/bpf/netlink.c | 3 +-
+ tools/lib/bpf/skel_internal.h | 33 +-
+ tools/lib/bpf/usdt.bpf.h | 4 +-
+ tools/testing/selftests/bpf/DENYLIST.s390x | 6 +-
+ tools/testing/selftests/bpf/Makefile | 37 +-
+ tools/testing/selftests/bpf/README.rst | 8 +-
+ .../selftests/bpf/cgroup_getset_retval_hooks.h | 25 +
+ tools/testing/selftests/bpf/cgroup_helpers.c | 202 +-
+ tools/testing/selftests/bpf/cgroup_helpers.h | 19 +-
+ tools/testing/selftests/bpf/config | 2 +
+ tools/testing/selftests/bpf/get_cgroup_id_user.c | 2 +-
+ .../selftests/bpf/map_tests/task_storage_map.c | 122 +
+ .../selftests/bpf/prog_tests/attach_probe.c | 6 +-
+ .../testing/selftests/bpf/prog_tests/autoattach.c | 30 +
+ .../testing/selftests/bpf/prog_tests/bpf_cookie.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 60 +
+ .../testing/selftests/bpf/prog_tests/bpf_obj_id.c | 2 +-
+ .../selftests/bpf/prog_tests/bpf_verif_scale.c | 54 +-
+ tools/testing/selftests/bpf/prog_tests/btf.c | 4 +-
+ tools/testing/selftests/bpf/prog_tests/btf_dump.c | 10 +-
+ .../testing/selftests/bpf/prog_tests/btf_endian.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/cb_refs.c | 48 +
+ .../bpf/prog_tests/cgroup_getset_retval.c | 48 +
+ .../bpf/prog_tests/cgroup_hierarchical_stats.c | 357 +
+ .../testing/selftests/bpf/prog_tests/cgroup_iter.c | 224 +
+ .../selftests/bpf/prog_tests/connect_force_port.c | 2 +-
+ .../testing/selftests/bpf/prog_tests/core_reloc.c | 74 +-
+ tools/testing/selftests/bpf/prog_tests/dynptr.c | 3 +-
+ .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 44 +-
+ .../selftests/bpf/prog_tests/flow_dissector.c | 44 +-
+ .../bpf/prog_tests/flow_dissector_load_bytes.c | 2 +-
+ .../selftests/bpf/prog_tests/get_stack_raw_tp.c | 4 +-
+ .../testing/selftests/bpf/prog_tests/global_data.c | 2 +-
+ .../selftests/bpf/prog_tests/global_data_init.c | 2 +-
+ .../selftests/bpf/prog_tests/global_func_args.c | 2 +-
+ .../testing/selftests/bpf/prog_tests/htab_update.c | 126 +
+ tools/testing/selftests/bpf/prog_tests/kfree_skb.c | 2 +-
+ .../testing/selftests/bpf/prog_tests/kfunc_call.c | 36 +
+ tools/testing/selftests/bpf/prog_tests/l4lb_all.c | 4 +-
+ .../selftests/bpf/prog_tests/load_bytes_relative.c | 4 +-
+ tools/testing/selftests/bpf/prog_tests/map_lock.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/pinning.c | 4 +-
+ .../testing/selftests/bpf/prog_tests/pkt_access.c | 2 +-
+ .../selftests/bpf/prog_tests/pkt_md_access.c | 2 +-
+ .../testing/selftests/bpf/prog_tests/probe_user.c | 2 +-
+ .../selftests/bpf/prog_tests/queue_stack_map.c | 4 +-
+ .../testing/selftests/bpf/prog_tests/rdonly_maps.c | 2 +-
+ .../selftests/bpf/prog_tests/reference_tracking.c | 2 +-
+ .../selftests/bpf/prog_tests/resolve_btfids.c | 2 +-
+ .../selftests/bpf/prog_tests/select_reuseport.c | 4 +-
+ .../selftests/bpf/prog_tests/setget_sockopt.c | 125 +
+ tools/testing/selftests/bpf/prog_tests/sk_assign.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/skb_ctx.c | 2 +-
+ .../testing/selftests/bpf/prog_tests/skb_helpers.c | 2 +-
+ .../selftests/bpf/prog_tests/sockopt_inherit.c | 2 +-
+ .../selftests/bpf/prog_tests/sockopt_multi.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/spinlock.c | 2 +-
+ .../selftests/bpf/prog_tests/stacktrace_map.c | 2 +-
+ .../bpf/prog_tests/stacktrace_map_raw_tp.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/tailcalls.c | 36 +-
+ .../selftests/bpf/prog_tests/task_fd_query_rawtp.c | 2 +-
+ .../selftests/bpf/prog_tests/task_fd_query_tp.c | 2 +-
+ .../selftests/bpf/prog_tests/task_pt_regs.c | 2 +-
+ .../testing/selftests/bpf/prog_tests/tcp_estats.c | 2 +-
+ .../selftests/bpf/prog_tests/test_bprm_opts.c | 10 +-
+ .../selftests/bpf/prog_tests/test_global_funcs.c | 34 +-
+ .../selftests/bpf/prog_tests/test_local_storage.c | 10 +-
+ .../selftests/bpf/prog_tests/test_overhead.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/time_tai.c | 74 +
+ .../selftests/bpf/prog_tests/tp_attach_query.c | 2 +-
+ .../selftests/bpf/prog_tests/trampoline_count.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/xdp.c | 2 +-
+ .../selftests/bpf/prog_tests/xdp_adjust_frags.c | 2 +-
+ .../selftests/bpf/prog_tests/xdp_adjust_tail.c | 10 +-
+ .../testing/selftests/bpf/prog_tests/xdp_attach.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/xdp_info.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/xdp_perf.c | 2 +-
+ .../selftests/bpf/prog_tests/xdp_synproxy.c | 2 +-
+ tools/testing/selftests/bpf/progs/bind4_prog.c | 2 -
+ tools/testing/selftests/bpf/progs/bind6_prog.c | 2 -
+ tools/testing/selftests/bpf/progs/bpf_flow.c | 15 +
+ tools/testing/selftests/bpf/progs/bpf_iter.h | 7 +
+ .../testing/selftests/bpf/progs/bpf_tracing_net.h | 32 +-
+ tools/testing/selftests/bpf/progs/cb_refs.c | 116 +
+ .../bpf/progs/cgroup_getset_retval_hooks.c | 16 +
+ .../bpf/progs/cgroup_hierarchical_stats.c | 226 +
+ tools/testing/selftests/bpf/progs/cgroup_iter.c | 39 +
+ tools/testing/selftests/bpf/progs/connect4_prog.c | 5 +-
+ tools/testing/selftests/bpf/progs/dynptr_fail.c | 94 +-
+ tools/testing/selftests/bpf/progs/fexit_bpf2bpf.c | 8 +-
+ tools/testing/selftests/bpf/progs/htab_update.c | 29 +
+ .../selftests/bpf/progs/kfunc_call_destructive.c | 14 +
+ tools/testing/selftests/bpf/progs/lsm.c | 3 +-
+ .../bpf/progs/read_bpf_task_storage_busy.c | 39 +
+ tools/testing/selftests/bpf/progs/setget_sockopt.c | 395 +
+ .../selftests/bpf/progs/tailcall_bpf2bpf4.c | 2 +-
+ .../testing/selftests/bpf/progs/test_autoattach.c | 23 +
+ .../testing/selftests/bpf/progs/test_bpf_cookie.c | 4 +-
+ tools/testing/selftests/bpf/progs/test_bpf_nf.c | 21 +
+ .../selftests/bpf/progs/test_helper_restricted.c | 4 +-
+ tools/testing/selftests/bpf/progs/test_tc_dtime.c | 1 -
+ tools/testing/selftests/bpf/progs/test_time_tai.c | 24 +
+ .../testing/selftests/bpf/progs/test_tunnel_kern.c | 24 +-
+ tools/testing/selftests/bpf/progs/timer.c | 11 -
+ .../selftests/bpf/task_local_storage_helpers.h | 18 +
+ tools/testing/selftests/bpf/test_dev_cgroup.c | 2 +-
+ tools/testing/selftests/bpf/test_flow_dissector.sh | 8 +
+ tools/testing/selftests/bpf/test_lirc_mode2_user.c | 2 +-
+ tools/testing/selftests/bpf/test_maps.c | 48 +-
+ tools/testing/selftests/bpf/test_offload.py | 22 +-
+ tools/testing/selftests/bpf/test_skb_cgroup_id.sh | 2 +-
+ tools/testing/selftests/bpf/test_sock_addr.c | 16 +-
+ tools/testing/selftests/bpf/test_sockmap.c | 4 +-
+ tools/testing/selftests/bpf/test_sysctl.c | 6 +-
+ .../selftests/bpf/test_tcp_check_syncookie.sh | 2 +-
+ tools/testing/selftests/bpf/test_tcpnotify_user.c | 2 +-
+ tools/testing/selftests/bpf/test_xdp_redirect.sh | 8 +-
+ .../selftests/bpf/test_xdp_redirect_multi.sh | 2 +-
+ tools/testing/selftests/bpf/test_xdp_veth.sh | 8 +-
+ tools/testing/selftests/bpf/test_xsk.sh | 52 +-
+ tools/testing/selftests/bpf/vmtest.sh | 34 +-
+ tools/testing/selftests/bpf/xdp_redirect_multi.c | 2 +-
+ tools/testing/selftests/bpf/xdp_synproxy.c | 2 +-
+ tools/testing/selftests/bpf/xdping.c | 2 +-
+ tools/testing/selftests/bpf/xsk.c | 6 +-
+ tools/testing/selftests/bpf/xskxceiver.c | 560 +-
+ tools/testing/selftests/bpf/xskxceiver.h | 19 +-
+ tools/testing/selftests/drivers/net/dsa/Makefile | 3 +-
+ .../selftests/drivers/net/dsa/tc_actions.sh | 1 +
+ .../testing/selftests/drivers/net/dsa/tc_common.sh | 1 +
+ .../drivers/net/mlxsw/egress_vid_classification.sh | 273 +
+ .../drivers/net/mlxsw/ingress_rif_conf_1d.sh | 264 +
+ .../drivers/net/mlxsw/ingress_rif_conf_1q.sh | 264 +
+ .../drivers/net/mlxsw/ingress_rif_conf_vxlan.sh | 311 +
+ tools/testing/selftests/net/.gitignore | 3 +
+ tools/testing/selftests/net/Makefile | 6 +
+ tools/testing/selftests/net/bind_bhash.c | 144 +
+ tools/testing/selftests/net/bind_bhash.sh | 66 +
+ tools/testing/selftests/net/fcnal-test.sh | 30 +
+ tools/testing/selftests/net/l2_tos_ttl_inherit.sh | 390 +
+ tools/testing/selftests/net/mptcp/mptcp_join.sh | 10 +-
+ tools/testing/selftests/net/nettest.c | 16 +-
+ .../testing/selftests/net/sk_bind_sendto_listen.c | 80 +
+ tools/testing/selftests/net/sk_connect_zero_addr.c | 62 +
+ tools/testing/vsock/vsock_test.c | 108 +
+ 1151 files changed, 60503 insertions(+), 35257 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/net/altera_tse.txt
+ create mode 100644 Documentation/devicetree/bindings/net/altr,tse.yaml
+ create mode 100644 Documentation/devicetree/bindings/net/fsl,fman-dtsec.yaml
+ delete mode 100644 Documentation/networking/decnet.rst
+ create mode 100644 Documentation/networking/device_drivers/ethernet/wangxun/ngbe.rst
+ create mode 100644 Documentation/userspace-api/netlink/index.rst
+ create mode 100644 Documentation/userspace-api/netlink/intro.rst
+ create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_matchall.c
+ create mode 100644 drivers/net/ethernet/marvell/prestera/prestera_matchall.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/fs_ethtool.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_fs.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_fs.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_stats.c
+ create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_lag.c
+ create mode 100644 drivers/net/ethernet/mscc/ocelot_stats.c
+ create mode 100644 drivers/net/ethernet/wangxun/ngbe/Makefile
+ create mode 100644 drivers/net/ethernet/wangxun/ngbe/ngbe.h
+ create mode 100644 drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
+ create mode 100644 drivers/net/ethernet/wangxun/ngbe/ngbe_type.h
+ create mode 100644 drivers/net/pcs/pcs-altera-tse.c
+ create mode 100644 drivers/net/wireless/realtek/rtw89/chan.c
+ create mode 100644 drivers/net/wireless/realtek/rtw89/chan.h
+ create mode 100644 include/linux/bpf_mem_alloc.h
+ create mode 100644 include/linux/pcs-altera-tse.h
+ delete mode 100644 include/net/dn.h
+ delete mode 100644 include/net/dn_dev.h
+ delete mode 100644 include/net/dn_fib.h
+ delete mode 100644 include/net/dn_neigh.h
+ delete mode 100644 include/net/dn_nsp.h
+ delete mode 100644 include/net/dn_route.h
+ delete mode 100644 include/uapi/linux/dn.h
+ delete mode 100644 include/uapi/linux/netfilter_decnet.h
+ create mode 100644 kernel/bpf/cgroup_iter.c
+ create mode 100644 kernel/bpf/memalloc.c
+ delete mode 100644 net/decnet/Kconfig
+ delete mode 100644 net/decnet/Makefile
+ delete mode 100644 net/decnet/README
+ delete mode 100644 net/decnet/af_decnet.c
+ delete mode 100644 net/decnet/dn_dev.c
+ delete mode 100644 net/decnet/dn_fib.c
+ delete mode 100644 net/decnet/dn_neigh.c
+ delete mode 100644 net/decnet/dn_nsp_in.c
+ delete mode 100644 net/decnet/dn_nsp_out.c
+ delete mode 100644 net/decnet/dn_route.c
+ delete mode 100644 net/decnet/dn_rules.c
+ delete mode 100644 net/decnet/dn_table.c
+ delete mode 100644 net/decnet/dn_timer.c
+ delete mode 100644 net/decnet/netfilter/Kconfig
+ delete mode 100644 net/decnet/netfilter/Makefile
+ delete mode 100644 net/decnet/netfilter/dn_rtmsg.c
+ delete mode 100644 net/decnet/sysctl_net_decnet.c
+ create mode 100644 net/mac80211/link.c
+ create mode 100644 tools/testing/selftests/bpf/cgroup_getset_retval_hooks.h
+ create mode 100644 tools/testing/selftests/bpf/map_tests/task_storage_map.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/autoattach.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/cb_refs.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_hierarchical_stats.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_iter.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/htab_update.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/setget_sockopt.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/time_tai.c
+ create mode 100644 tools/testing/selftests/bpf/progs/cb_refs.c
+ create mode 100644 tools/testing/selftests/bpf/progs/cgroup_getset_retval_hooks.c
+ create mode 100644 tools/testing/selftests/bpf/progs/cgroup_hierarchical_stats.c
+ create mode 100644 tools/testing/selftests/bpf/progs/cgroup_iter.c
+ create mode 100644 tools/testing/selftests/bpf/progs/htab_update.c
+ create mode 100644 tools/testing/selftests/bpf/progs/kfunc_call_destructive.c
+ create mode 100644 tools/testing/selftests/bpf/progs/read_bpf_task_storage_busy.c
+ create mode 100644 tools/testing/selftests/bpf/progs/setget_sockopt.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_autoattach.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_time_tai.c
+ create mode 100644 tools/testing/selftests/bpf/task_local_storage_helpers.h
+ create mode 120000 tools/testing/selftests/drivers/net/dsa/tc_actions.sh
+ create mode 120000 tools/testing/selftests/drivers/net/dsa/tc_common.sh
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/egress_vid_classification.sh
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/ingress_rif_conf_1d.sh
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/ingress_rif_conf_1q.sh
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/ingress_rif_conf_vxlan.sh
+ create mode 100644 tools/testing/selftests/net/bind_bhash.c
+ create mode 100755 tools/testing/selftests/net/bind_bhash.sh
+ create mode 100755 tools/testing/selftests/net/l2_tos_ttl_inherit.sh
+ create mode 100644 tools/testing/selftests/net/sk_bind_sendto_listen.c
+ create mode 100644 tools/testing/selftests/net/sk_connect_zero_addr.c
+Merging bpf-next/for-next (47e34cb74d37 bpf: Add verifier check for BPF_PTR_POISON retval and arg)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next
+Auto-merging kernel/bpf/btf.c
+Auto-merging net/netfilter/nf_conntrack_core.c
+Merge made by the 'ort' strategy.
+ arch/arm64/net/bpf_jit_comp.c | 8 +-
+ arch/x86/net/bpf_jit_comp.c | 68 ++++--
+ include/linux/bpf.h | 95 ++++++--
+ include/linux/bpf_verifier.h | 24 ++
+ include/linux/btf.h | 10 +
+ include/linux/poison.h | 3 +
+ include/net/netfilter/nf_conntrack_bpf.h | 23 ++
+ include/uapi/linux/bpf.h | 9 +-
+ kernel/bpf/arraymap.c | 33 ++-
+ kernel/bpf/btf.c | 195 ++++++++++++++---
+ kernel/bpf/hashtab.c | 2 +
+ kernel/bpf/helpers.c | 6 +-
+ kernel/bpf/memalloc.c | 2 +-
+ kernel/bpf/percpu_freelist.c | 48 ++--
+ kernel/bpf/syscall.c | 5 +-
+ kernel/bpf/verifier.c | 242 ++++++++++-----------
+ net/bpf/test_run.c | 37 ++++
+ net/core/filter.c | 54 +++++
+ net/ipv4/bpf_tcp_ca.c | 2 +-
+ net/ipv4/ping.c | 15 ++
+ net/ipv6/ping.c | 16 ++
+ net/netfilter/nf_conntrack_bpf.c | 66 +++++-
+ net/netfilter/nf_conntrack_core.c | 1 +
+ tools/include/uapi/linux/bpf.h | 9 +-
+ tools/lib/bpf/bpf_helpers.h | 19 +-
+ tools/lib/bpf/bpf_tracing.h | 79 +++++++
+ tools/testing/selftests/bpf/DENYLIST.s390x | 1 +
+ tools/testing/selftests/bpf/Makefile | 5 +-
+ .../selftests/bpf/bpf_testmod/bpf_testmod.c | 48 ++++
+ tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 7 +-
+ .../selftests/bpf/prog_tests/btf_skc_cls_ingress.c | 20 --
+ .../selftests/bpf/prog_tests/connect_ping.c | 178 +++++++++++++++
+ .../testing/selftests/bpf/prog_tests/kfunc_call.c | 227 +++++++++++++++++--
+ .../selftests/bpf/prog_tests/tcp_hdr_options.c | 20 --
+ .../selftests/bpf/prog_tests/tracing_struct.c | 63 ++++++
+ tools/testing/selftests/bpf/progs/connect_ping.c | 53 +++++
+ .../testing/selftests/bpf/progs/kfunc_call_fail.c | 160 ++++++++++++++
+ .../testing/selftests/bpf/progs/kfunc_call_test.c | 71 ++++++
+ tools/testing/selftests/bpf/progs/test_bpf_nf.c | 16 +-
+ .../testing/selftests/bpf/progs/test_bpf_nf_fail.c | 14 ++
+ tools/testing/selftests/bpf/progs/timer.c | 4 +-
+ tools/testing/selftests/bpf/progs/tracing_struct.c | 120 ++++++++++
+ tools/testing/selftests/bpf/test_progs.c | 17 ++
+ tools/testing/selftests/bpf/test_progs.h | 1 +
+ 44 files changed, 1756 insertions(+), 340 deletions(-)
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/connect_ping.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/tracing_struct.c
+ create mode 100644 tools/testing/selftests/bpf/progs/connect_ping.c
+ create mode 100644 tools/testing/selftests/bpf/progs/kfunc_call_fail.c
+ create mode 100644 tools/testing/selftests/bpf/progs/tracing_struct.c
+Merging ipsec-next/master (50c448bbc198 Merge remote-tracking branch 'xfrm: start adding netlink extack support')
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master
+Auto-merging include/net/dst_metadata.h
+CONFLICT (content): Merge conflict in include/net/dst_metadata.h
+Auto-merging net/xfrm/xfrm_input.c
+Auto-merging net/xfrm/xfrm_policy.c
+Resolved 'include/net/dst_metadata.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 94fa17a8d11a] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git
+$ git diff -M --stat --summary HEAD^..
+ include/net/dst_metadata.h | 31 ++++++
+ include/net/xfrm.h | 11 +-
+ include/uapi/linux/if_link.h | 1 +
+ include/uapi/linux/lwtunnel.h | 10 ++
+ net/core/lwtunnel.c | 1 +
+ net/xfrm/xfrm_input.c | 7 +-
+ net/xfrm/xfrm_interface.c | 206 ++++++++++++++++++++++++++++++++----
+ net/xfrm/xfrm_policy.c | 25 +++--
+ net/xfrm/xfrm_user.c | 163 +++++++++++++++++-----------
+ tools/testing/selftests/net/ipsec.c | 104 ++++++++----------
+ 10 files changed, 403 insertions(+), 156 deletions(-)
+Merging mlx5-next/mlx5-next (4ced81c02b03 net/mlx5: Add IFC bits and enums for crypto key)
+$ 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 drivers/infiniband/hw/mlx5/mlx5_ib.h
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fw.c
+CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/fw.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 include/linux/mlx5/device.h
+CONFLICT (content): Merge conflict in include/linux/mlx5/device.h
+Auto-merging include/linux/mlx5/driver.h
+Auto-merging include/linux/mlx5/driver.h
+Auto-merging include/linux/mlx5/mlx5_ifc.h
+CONFLICT (content): Merge conflict in include/linux/mlx5/mlx5_ifc.h
+Auto-merging include/linux/mlx5/qp.h
+Resolved 'drivers/net/ethernet/mellanox/mlx5/core/fw.c' using previous resolution.
+Resolved 'drivers/net/ethernet/mellanox/mlx5/core/main.c' using previous resolution.
+Resolved 'include/linux/mlx5/device.h' using previous resolution.
+Resolved 'include/linux/mlx5/mlx5_ifc.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 192c6d49e42e] Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git
+$ git diff -M --stat --summary HEAD^..
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 12 +
+ .../net/ethernet/mellanox/mlx5/core/en/tc/meter.c | 6 +-
+ .../mellanox/mlx5/core/en_accel/common_utils.h | 32 ++
+ .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 5 -
+ .../ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c | 6 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 8 +-
+ .../mellanox/mlx5/core/en_accel/ktls_txrx.c | 36 +-
+ .../mellanox/mlx5/core/en_accel/ktls_utils.h | 17 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fw.c | 12 +
+ drivers/net/ethernet/mellanox/mlx5/core/health.c | 7 -
+ drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 91 +++++-
+ .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 139 ++++++--
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 35 ++
+ .../mellanox/mlx5/core/steering/dr_types.h | 14 -
+ .../ethernet/mellanox/mlx5/core/steering/fs_dr.h | 4 -
+ include/linux/mlx5/device.h | 79 ++++-
+ include/linux/mlx5/driver.h | 9 +-
+ include/linux/mlx5/fs_helpers.h | 48 ---
+ include/linux/mlx5/mlx5_ifc.h | 363 +++++++++++++++++++--
+ include/linux/mlx5/mlx5_ifc_fpga.h | 24 --
+ include/linux/mlx5/qp.h | 1 +
+ 21 files changed, 727 insertions(+), 221 deletions(-)
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/common_utils.h
+Merging netfilter-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master
+Already up to date.
+Merging ipvs-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/master
+Already up to date.
+Merging bluetooth/master (812e92b824c1 Bluetooth: RFCOMM: Fix possible deadlock on socket shutdown/release)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master
+Auto-merging net/bluetooth/hci_event.c
+Auto-merging net/bluetooth/hci_sync.c
+Auto-merging net/bluetooth/mgmt.c
+Merge made by the 'ort' strategy.
+ drivers/bluetooth/btintel.c | 20 +-
+ drivers/bluetooth/btusb.c | 38 +-
+ include/net/bluetooth/bluetooth.h | 1 +
+ include/net/bluetooth/hci.h | 4 +
+ include/net/bluetooth/hci_core.h | 17 +-
+ include/net/bluetooth/hci_sock.h | 2 -
+ include/net/bluetooth/hci_sync.h | 9 +-
+ include/net/bluetooth/mgmt.h | 52 ++
+ net/bluetooth/hci_conn.c | 162 +++-
+ net/bluetooth/hci_core.c | 15 +-
+ net/bluetooth/hci_event.c | 155 ++--
+ net/bluetooth/hci_request.c | 1650 ++++---------------------------------
+ net/bluetooth/hci_request.h | 53 --
+ net/bluetooth/hci_sock.c | 1 +
+ net/bluetooth/hci_sync.c | 459 ++++++++++-
+ net/bluetooth/mgmt.c | 612 +++++++++++++-
+ net/bluetooth/mgmt_util.c | 74 ++
+ net/bluetooth/mgmt_util.h | 18 +
+ net/bluetooth/rfcomm/sock.c | 3 +
+ 19 files changed, 1648 insertions(+), 1697 deletions(-)
+Merging wireless-next/for-next (d5350756c03c wifi: rtl8xxxu: Remove copy-paste leftover in gen2_update_rate_mask)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+Auto-merging drivers/net/wireless/mac80211_hwsim.c
+Auto-merging include/linux/ieee80211.h
+Auto-merging net/mac80211/mlme.c
+Auto-merging net/mac80211/rx.c
+Merge made by the 'ort' strategy.
+ drivers/bcma/driver_mips.c | 2 +-
+ drivers/net/wireless/ath/ath10k/mac.c | 6 +-
+ drivers/net/wireless/ath/ath11k/mac.c | 6 +-
+ drivers/net/wireless/ath/ath9k/channel.c | 2 +-
+ drivers/net/wireless/ath/ath9k/xmit.c | 2 +-
+ drivers/net/wireless/broadcom/b43/phy_n.c | 6 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 +
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c | 13 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 5 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/core.c | 3 +-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/dmi.c | 18 ++
+ .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 3 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 +
+ .../broadcom/brcm80211/include/brcm_hw_ids.h | 1 +
+ drivers/net/wireless/intel/ipw2x00/ipw2100.c | 4 +-
+ drivers/net/wireless/intel/iwlegacy/4965-rs.c | 2 +-
+ drivers/net/wireless/intel/iwlegacy/common.c | 8 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/agn.h | 2 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 22 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 6 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/sta.c | 10 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/ucode.c | 8 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 14 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 2 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 18 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 17 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 2 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 2 +-
+ drivers/net/wireless/intersil/p54/main.c | 2 +-
+ drivers/net/wireless/mac80211_hwsim.c | 87 +++++++-
+ drivers/net/wireless/marvell/libertas/cfg.c | 2 +-
+ drivers/net/wireless/marvell/libertas/main.c | 3 +-
+ .../net/wireless/marvell/mwifiex/11n_rxreorder.c | 2 +-
+ drivers/net/wireless/marvell/mwifiex/pcie.c | 2 +-
+ drivers/net/wireless/marvell/mwifiex/sta_event.c | 2 +-
+ drivers/net/wireless/marvell/mwifiex/usb.c | 12 +-
+ drivers/net/wireless/mediatek/mt76/mt7603/main.c | 2 +-
+ .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 6 +-
+ drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 2 +-
+ drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 8 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 2 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 21 +-
+ drivers/net/wireless/realtek/rtw88/fw.c | 6 +-
+ drivers/net/wireless/realtek/rtw89/core.c | 29 ++-
+ drivers/net/wireless/realtek/rtw89/core.h | 55 ++++-
+ drivers/net/wireless/realtek/rtw89/debug.c | 14 +-
+ drivers/net/wireless/realtek/rtw89/fw.c | 87 ++++++--
+ drivers/net/wireless/realtek/rtw89/fw.h | 51 +++--
+ drivers/net/wireless/realtek/rtw89/mac.c | 69 ++++--
+ drivers/net/wireless/realtek/rtw89/mac80211.c | 3 +-
+ drivers/net/wireless/realtek/rtw89/phy.c | 119 ++++++++---
+ drivers/net/wireless/realtek/rtw89/phy.h | 1 +
+ drivers/net/wireless/realtek/rtw89/reg.h | 62 +++++-
+ drivers/net/wireless/realtek/rtw89/rtw8852a.c | 35 ++-
+ drivers/net/wireless/realtek/rtw89/rtw8852c.c | 58 ++++-
+ drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c | 3 +-
+ drivers/net/wireless/rsi/rsi_91x_mac80211.c | 1 +
+ drivers/net/wireless/st/cw1200/sta.c | 4 +-
+ drivers/net/wireless/st/cw1200/txrx.c | 8 +-
+ drivers/net/wireless/ti/wl1251/main.c | 2 +-
+ drivers/net/wireless/ti/wl18xx/event.c | 8 +-
+ drivers/net/wireless/ti/wlcore/cmd.c | 4 +-
+ include/linux/mmc/sdio_ids.h | 1 +
+ include/net/mac80211.h | 189 ++++++++++++----
+ net/mac80211/chan.c | 6 +
+ net/mac80211/debugfs_netdev.c | 26 +++
+ net/mac80211/driver-ops.c | 172 +++++++++++++++
+ net/mac80211/driver-ops.h | 165 +++-----------
+ net/mac80211/he.c | 12 +-
+ net/mac80211/ht.c | 13 +-
+ net/mac80211/ieee80211_i.h | 4 +
+ net/mac80211/iface.c | 12 ++
+ net/mac80211/key.c | 42 ++++
+ net/mac80211/key.h | 3 +
+ net/mac80211/link.c | 237 +++++++++++++++++++--
+ net/mac80211/mlme.c | 113 +++++-----
+ net/mac80211/rc80211_minstrel_ht.c | 9 +-
+ net/mac80211/rx.c | 74 +++----
+ net/mac80211/sta_info.c | 100 ++++++++-
+ net/mac80211/sta_info.h | 3 +
+ net/mac80211/tx.c | 53 +++--
+ net/mac80211/util.c | 2 +-
+ net/mac80211/vht.c | 8 +-
+ 83 files changed, 1638 insertions(+), 565 deletions(-)
+Merging mtd/mtd/next (7ec4cdb32173 mtd: core: check partition before dereference)
+$ 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 (e16eceea863b mtd: rawnand: arasan: Fix clock rate in NV-DDR)
+$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next
+Already up to date.
+Merging spi-nor/spi-nor/next (f8cd9f632f44 mtd: spi-nor: fix spi_nor_spimem_setup_op() call in spi_nor_erase_{sector,chip}())
+$ 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 (96d3e6f05f5b crypto: nx - Remove the unneeded result variable)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/arm/configs/exynos_defconfig
+Auto-merging arch/arm/configs/milbeaut_m10v_defconfig
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Auto-merging arch/arm/configs/omap2plus_defconfig
+Auto-merging arch/arm/configs/pxa_defconfig
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm64/configs/defconfig
+Auto-merging lib/Makefile
+Merge made by the 'ort' strategy.
+ .../bindings/crypto/aspeed,ast2500-hace.yaml | 53 +
+ .../virt/kvm/x86/amd-memory-encryption.rst | 5 +-
+ MAINTAINERS | 7 +
+ arch/arm/Kconfig | 4 -
+ arch/arm/boot/dts/aspeed-g5.dtsi | 8 +
+ arch/arm/boot/dts/aspeed-g6.dtsi | 8 +
+ arch/arm/configs/exynos_defconfig | 1 -
+ arch/arm/configs/milbeaut_m10v_defconfig | 1 -
+ arch/arm/configs/multi_v7_defconfig | 1 -
+ arch/arm/configs/omap2plus_defconfig | 1 -
+ arch/arm/configs/pxa_defconfig | 1 -
+ arch/arm/crypto/Kconfig | 238 ++-
+ arch/arm64/Kconfig | 3 -
+ arch/arm64/configs/defconfig | 1 -
+ arch/arm64/crypto/Kconfig | 281 ++-
+ arch/mips/crypto/Kconfig | 74 +
+ arch/powerpc/crypto/Kconfig | 97 +
+ arch/s390/crypto/Kconfig | 135 ++
+ arch/sparc/crypto/Kconfig | 90 +
+ arch/x86/crypto/Kconfig | 466 ++++
+ arch/x86/crypto/sha512_ssse3_glue.c | 10 +
+ crypto/Kconfig | 2244 +++++++-------------
+ crypto/akcipher.c | 8 +
+ crypto/algapi.c | 71 -
+ crypto/api.c | 4 +-
+ crypto/drbg.c | 12 +-
+ crypto/essiv.c | 2 +-
+ crypto/tcrypt.c | 27 -
+ crypto/testmgr.c | 38 +-
+ drivers/char/hw_random/arm_smccc_trng.c | 4 +-
+ drivers/char/hw_random/core.c | 19 +-
+ drivers/char/hw_random/imx-rngc.c | 51 +-
+ drivers/crypto/Kconfig | 3 +-
+ drivers/crypto/Makefile | 1 +
+ drivers/crypto/allwinner/sun8i-ce/sun8i-ce-trng.c | 6 +-
+ drivers/crypto/amlogic/amlogic-gxl-cipher.c | 6 +-
+ drivers/crypto/aspeed/Kconfig | 49 +
+ drivers/crypto/aspeed/Makefile | 6 +
+ drivers/crypto/aspeed/aspeed-hace-crypto.c | 1133 ++++++++++
+ drivers/crypto/aspeed/aspeed-hace-hash.c | 1391 ++++++++++++
+ drivers/crypto/aspeed/aspeed-hace.c | 288 +++
+ drivers/crypto/aspeed/aspeed-hace.h | 298 +++
+ drivers/crypto/axis/artpec6_crypto.c | 4 +-
+ drivers/crypto/bcm/cipher.h | 2 +-
+ drivers/crypto/cavium/cpt/cpt_hw_types.h | 2 +-
+ drivers/crypto/ccp/ccp-dmaengine.c | 6 +-
+ drivers/crypto/ccp/sev-dev.c | 78 +-
+ drivers/crypto/ccree/cc_buffer_mgr.c | 2 +-
+ drivers/crypto/hisilicon/hpre/hpre_main.c | 8 +-
+ drivers/crypto/hisilicon/qm.c | 127 +-
+ drivers/crypto/hisilicon/zip/zip.h | 2 +-
+ drivers/crypto/hisilicon/zip/zip_crypto.c | 61 +-
+ drivers/crypto/hisilicon/zip/zip_main.c | 10 +-
+ drivers/crypto/keembay/Kconfig | 4 +-
+ drivers/crypto/marvell/octeontx/otx_cpt_hw_types.h | 2 +-
+ drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c | 6 +-
+ drivers/crypto/marvell/octeontx/otx_cptvf_mbox.c | 20 +-
+ .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 4 +-
+ drivers/crypto/n2_core.c | 2 +-
+ drivers/crypto/nx/nx-aes-ccm.c | 5 +-
+ drivers/crypto/qat/qat_common/adf_cfg.c | 6 +-
+ drivers/crypto/qat/qat_common/adf_ctl_drv.c | 2 +-
+ drivers/crypto/qat/qat_common/adf_gen4_hw_data.h | 2 +-
+ .../crypto/qat/qat_common/adf_transport_debug.c | 2 +-
+ drivers/crypto/qat/qat_common/icp_qat_uclo.h | 3 +-
+ drivers/crypto/qat/qat_common/qat_uclo.c | 56 +-
+ drivers/crypto/qce/aead.c | 4 +-
+ drivers/crypto/qce/sha.c | 8 +-
+ drivers/crypto/qce/skcipher.c | 8 +-
+ drivers/crypto/qcom-rng.c | 7 +-
+ drivers/crypto/sahara.c | 22 +-
+ drivers/net/Kconfig | 2 -
+ drivers/net/wireless/ath/ath9k/rng.c | 3 +-
+ include/dt-bindings/clock/aspeed-clock.h | 1 +
+ include/dt-bindings/clock/ast2600-clock.h | 1 +
+ include/linux/hw_random.h | 3 +
+ lib/Kconfig | 3 -
+ lib/Makefile | 1 -
+ lib/crypto/Kconfig | 7 +-
+ lib/crypto/Makefile | 3 +
+ lib/{ => crypto}/memneq.c | 7 +-
+ lib/crypto/utils.c | 88 +
+ 82 files changed, 5705 insertions(+), 2025 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/crypto/aspeed,ast2500-hace.yaml
+ create mode 100644 arch/mips/crypto/Kconfig
+ create mode 100644 arch/powerpc/crypto/Kconfig
+ create mode 100644 arch/s390/crypto/Kconfig
+ create mode 100644 arch/sparc/crypto/Kconfig
+ create mode 100644 arch/x86/crypto/Kconfig
+ create mode 100644 drivers/crypto/aspeed/Kconfig
+ create mode 100644 drivers/crypto/aspeed/Makefile
+ create mode 100644 drivers/crypto/aspeed/aspeed-hace-crypto.c
+ create mode 100644 drivers/crypto/aspeed/aspeed-hace-hash.c
+ create mode 100644 drivers/crypto/aspeed/aspeed-hace.c
+ create mode 100644 drivers/crypto/aspeed/aspeed-hace.h
+ rename lib/{ => crypto}/memneq.c (98%)
+ create mode 100644 lib/crypto/utils.c
+Merging drm/drm-next (d1e2d6b78ffc Merge tag 'drm-intel-next-2022-08-29' 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 MAINTAINERS
+Auto-merging drivers/dma-buf/udmabuf.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/soc21.c
+Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device.c
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
+Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c
+Auto-merging drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c
+Auto-merging drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c
+Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c
+Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h
+Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
+Auto-merging drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+Auto-merging drivers/gpu/drm/bridge/analogix/anx7625.c
+Auto-merging drivers/gpu/drm/bridge/chrontel-ch7033.c
+Auto-merging drivers/gpu/drm/bridge/ite-it6505.c
+Auto-merging drivers/gpu/drm/bridge/lontium-lt9611.c
+Auto-merging drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
+Auto-merging drivers/gpu/drm/bridge/tc358767.c
+Auto-merging drivers/gpu/drm/drm_edid.c
+Auto-merging drivers/gpu/drm/i915/display/icl_dsi.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/icl_dsi.c
+Auto-merging drivers/gpu/drm/i915/display/intel_backlight.c
+Auto-merging drivers/gpu/drm/i915/display/intel_bios.c
+Auto-merging drivers/gpu/drm/i915/display/intel_bw.c
+Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/display/intel_vdsc.c
+Auto-merging drivers/gpu/drm/i915/display/vlv_dsi.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/vlv_dsi.c
+Auto-merging drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_migrate.c
+Auto-merging drivers/gpu/drm/i915/gt/intel_rps.c
+Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+Auto-merging drivers/gpu/drm/i915/gvt/handlers.c
+Auto-merging drivers/gpu/drm/i915/i915_reg.h
+Auto-merging drivers/gpu/drm/i915/i915_vma.c
+Auto-merging drivers/gpu/drm/i915/intel_gvt_mmio_table.c
+Auto-merging drivers/gpu/drm/i915/intel_pm.c
+Auto-merging drivers/gpu/drm/meson/meson_plane.c
+Auto-merging drivers/gpu/drm/msm/msm_drv.c
+Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c
+Auto-merging drivers/gpu/drm/panel/panel-edp.c
+Auto-merging drivers/gpu/drm/radeon/radeon_device.c
+Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
+Auto-merging drivers/gpu/drm/ttm/ttm_bo_util.c
+Auto-merging drivers/gpu/drm/vc4/Kconfig
+Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/vc4/vc4_hdmi.c
+Auto-merging drivers/video/fbdev/aty/atyfb_base.c
+Auto-merging drivers/video/fbdev/aty/radeon_base.c
+Auto-merging drivers/video/fbdev/chipsfb.c
+Auto-merging drivers/video/fbdev/cirrusfb.c
+Auto-merging drivers/video/fbdev/cyber2000fb.c
+Auto-merging drivers/video/fbdev/geode/gx1fb_core.c
+Auto-merging drivers/video/fbdev/gxt4500.c
+Auto-merging drivers/video/fbdev/hyperv_fb.c
+Auto-merging drivers/video/fbdev/i740fb.c
+Auto-merging drivers/video/fbdev/matrox/matroxfb_base.c
+Auto-merging drivers/video/fbdev/pm2fb.c
+Auto-merging drivers/video/fbdev/s3fb.c
+Auto-merging drivers/video/fbdev/sis/sis_main.c
+Auto-merging drivers/video/fbdev/sstfb.c
+Auto-merging drivers/video/fbdev/sunxvr2500.c
+Auto-merging drivers/video/fbdev/sunxvr500.c
+Auto-merging drivers/video/fbdev/tdfxfb.c
+Auto-merging drivers/video/fbdev/tgafb.c
+Auto-merging drivers/video/fbdev/tridentfb.c
+Auto-merging include/drm/drm_connector.h
+Resolved 'drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c' using previous resolution.
+Resolved 'drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/display/icl_dsi.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/display/vlv_dsi.c' using previous resolution.
+Resolved 'drivers/gpu/drm/vc4/vc4_hdmi.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 5c38e84959c9] Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/display/bridge/chipone,icn6211.yaml | 9 +
+ .../bindings/display/bridge/chrontel,ch7033.yaml | 13 +
+ .../devicetree/bindings/display/ingenic,lcd.yaml | 2 +
+ .../bindings/display/mediatek/mediatek,dp.yaml | 116 +
+ .../bindings/display/panel/panel-simple.yaml | 2 +
+ .../bindings/display/panel/sitronix,st7701.yaml | 4 +
+ Documentation/gpu/amdgpu/apu-asic-info-table.csv | 8 +
+ Documentation/gpu/amdgpu/dgpu-asic-info-table.csv | 24 +
+ Documentation/gpu/amdgpu/display/dc-glossary.rst | 2 +-
+ Documentation/gpu/amdgpu/display/dcn-overview.rst | 59 +
+ .../gpu/amdgpu/display/dcn2_cm_drm_current.svg | 1370 +
+ .../gpu/amdgpu/display/dcn3_cm_drm_current.svg | 1529 +
+ .../gpu/amdgpu/display/display-manager.rst | 141 +
+ Documentation/gpu/amdgpu/display/index.rst | 1 +
+ Documentation/gpu/amdgpu/display/mpo-cursor.svg | 435 +
+ Documentation/gpu/amdgpu/display/mpo-overview.rst | 242 +
+ .../multi-display-hdcp-mpo-less-pipe-ex.svg | 220 +
+ .../gpu/amdgpu/display/multi-display-hdcp-mpo.svg | 171 +
+ .../gpu/amdgpu/display/pipeline_4k_no_split.svg | 958 +
+ .../gpu/amdgpu/display/pipeline_4k_split.svg | 1062 +
+ .../display/single-display-mpo-multi-video.svg | 339 +
+ .../gpu/amdgpu/display/single-display-mpo.svg | 266 +
+ Documentation/gpu/amdgpu/driver-misc.rst | 17 +
+ Documentation/gpu/amdgpu/thermal.rst | 18 +-
+ Documentation/gpu/drm-kms-helpers.rst | 8 +-
+ Documentation/gpu/drm-kms.rst | 2 +
+ Documentation/gpu/drm-mm.rst | 16 +-
+ Documentation/gpu/todo.rst | 36 -
+ Documentation/gpu/vkms.rst | 7 +-
+ MAINTAINERS | 5 +
+ drivers/dma-buf/sync_file.c | 8 +-
+ drivers/dma-buf/udmabuf.c | 9 +-
+ drivers/firmware/sysfb.c | 4 +
+ drivers/gpu/drm/Kconfig | 25 +-
+ drivers/gpu/drm/Makefile | 7 +-
+ drivers/gpu/drm/amd/amdgpu/Makefile | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 6 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 6 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 170 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 24 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 17 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 41 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 14 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfxhub.h | 3 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 26 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 38 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 3 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 3 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 32 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 21 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 3 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 48 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 13 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 57 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 5 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 68 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 3 +
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 62 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 108 +
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.c | 511 +
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.h | 29 +
+ drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 19 +-
+ drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 26 +-
+ drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 6 +
+ drivers/gpu/drm/amd/amdgpu/imu_v11_0_3.c | 144 +
+ drivers/gpu/drm/amd/amdgpu/imu_v11_0_3.h | 29 +
+ drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/mmsch_v4_0.h | 140 +
+ drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c | 44 +
+ drivers/gpu/drm/amd/amdgpu/nbio_v4_3.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c | 303 +
+ .../inc/dml_wrapper.h => amdgpu/sienna_cichlid.h} | 14 +-
+ drivers/gpu/drm/amd/amdgpu/soc21.c | 19 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 297 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 22 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 +
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 8 +
+ drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 9 +
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 5 -
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 128 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 46 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 109 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 172 +-
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 209 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 19 -
+ .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 46 +
+ .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 50 +-
+ .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 48 +-
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 77 +-
+ .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 38 +
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c | 38 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 65 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 -
+ drivers/gpu/drm/amd/display/dc/dc.h | 132 +-
+ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 50 +-
+ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 1 +
+ drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 148 +-
+ drivers/gpu/drm/amd/display/dc/dc_link.h | 13 +
+ drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 -
+ drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 12 +-
+ .../amd/display/dc/dce110/dce110_hw_sequencer.c | 21 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 5 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 9 +-
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 109 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 41 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 18 +
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 9 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 15 +-
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 9 +-
+ .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 1 -
+ .../drm/amd/display/dc/dcn314/dcn314_resource.c | 5 +-
+ .../drm/amd/display/dc/dcn315/dcn315_resource.c | 1 -
+ .../drm/amd/display/dc/dcn316/dcn316_resource.c | 1 -
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 33 +-
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h | 3 +
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 1 +
+ .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 667 +-
+ .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 1080 +
+ .../drm/amd/display/dc/dcn321/dcn321_resource.c | 648 +-
+ drivers/gpu/drm/amd/display/dc/dm_helpers.h | 11 +-
+ .../gpu/drm/amd/display/dc/dml/calcs/bw_fixed.c | 14 +-
+ .../gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c | 32 +-
+ .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 34 +-
+ .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 295 +-
+ .../gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c | 40 +-
+ .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 77 +-
+ .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 45 +-
+ .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 10 +-
+ .../dc/dml/dcn32/display_mode_vba_util_32.c | 9 +-
+ .../dc/dml/dcn32/display_mode_vba_util_32.h | 1 +
+ .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 13 +-
+ .../drm/amd/display/dc/dml/display_mode_structs.h | 36 +-
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 1 +
+ drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c | 1884 -
+ .../amd/display/dc/dml/dml_wrapper_translation.c | 284 -
+ drivers/gpu/drm/amd/display/dc/inc/core_types.h | 4 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 6 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 91 +-
+ .../drm/amd/display/dc/inc/hw/timing_generator.h | 14 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 7 +
+ drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 1 +
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 63 +-
+ .../drm/amd/display/include/link_service_types.h | 14 +-
+ .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 8 +
+ .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 10 +
+ .../drm/amd/include/asic_reg/gc/gc_11_0_3_offset.h | 12086 +++++
+ .../amd/include/asic_reg/gc/gc_11_0_3_sh_mask.h | 44640 +++++++++++++++++++
+ drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 45 +
+ drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 3 +
+ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 34 +
+ drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 22 +
+ .../amd/pm/swsmu/inc/pmfw_if/smu_v11_0_7_ppsmc.h | 4 +-
+ .../drm/amd/pm/swsmu/inc/pmfw_if/smu_v11_5_ppsmc.h | 5 +-
+ drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 6 +-
+ drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 1 +
+ .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 54 +
+ drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 76 +
+ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 15 +
+ drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 3 +
+ drivers/gpu/drm/arm/Kconfig | 4 +-
+ drivers/gpu/drm/arm/display/Kconfig | 2 +-
+ drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 3 +-
+ drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 5 +-
+ drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 2 +
+ .../drm/arm/display/komeda/komeda_framebuffer.c | 12 +-
+ drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 31 +-
+ drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 2 +
+ .../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +-
+ drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 1 -
+ drivers/gpu/drm/arm/hdlcd_crtc.c | 11 +-
+ drivers/gpu/drm/arm/hdlcd_drv.c | 77 +-
+ drivers/gpu/drm/arm/malidp_drv.c | 9 +-
+ drivers/gpu/drm/arm/malidp_mw.c | 8 +-
+ drivers/gpu/drm/arm/malidp_planes.c | 35 +-
+ drivers/gpu/drm/arm/malidp_regs.h | 2 +-
+ drivers/gpu/drm/armada/armada_crtc.c | 1 -
+ drivers/gpu/drm/armada/armada_gem.c | 6 +-
+ drivers/gpu/drm/armada/armada_overlay.c | 8 +-
+ drivers/gpu/drm/armada/armada_plane.c | 2 +-
+ drivers/gpu/drm/aspeed/Kconfig | 2 +-
+ drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 10 +-
+ drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 7 +-
+ drivers/gpu/drm/ast/ast_mode.c | 9 +-
+ drivers/gpu/drm/atmel-hlcdc/Kconfig | 2 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 6 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 9 +-
+ drivers/gpu/drm/bridge/adv7511/adv7511.h | 5 +-
+ drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 4 +-
+ drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 5 +-
+ drivers/gpu/drm/bridge/analogix/anx7625.c | 38 +-
+ drivers/gpu/drm/bridge/analogix/anx7625.h | 6 +
+ .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 3 +-
+ drivers/gpu/drm/bridge/chipone-icn6211.c | 48 +-
+ drivers/gpu/drm/bridge/chrontel-ch7033.c | 15 +-
+ drivers/gpu/drm/bridge/ite-it6505.c | 25 +-
+ drivers/gpu/drm/bridge/lontium-lt9611.c | 3 +-
+ .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 4 +-
+ drivers/gpu/drm/bridge/panel.c | 74 +
+ drivers/gpu/drm/bridge/parade-ps8640.c | 9 +-
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 13 +-
+ drivers/gpu/drm/bridge/tc358762.c | 4 +-
+ drivers/gpu/drm/bridge/tc358764.c | 4 +-
+ drivers/gpu/drm/bridge/tc358767.c | 90 +-
+ drivers/gpu/drm/bridge/ti-sn65dsi86.c | 119 +-
+ drivers/gpu/drm/display/drm_dp_helper.c | 34 +-
+ drivers/gpu/drm/display/drm_dp_mst_topology.c | 1149 +-
+ drivers/gpu/drm/drm_atomic_helper.c | 84 +-
+ drivers/gpu/drm/drm_auth.c | 4 +-
+ drivers/gpu/drm/drm_bridge.c | 4 +-
+ drivers/gpu/drm/drm_client.c | 4 +-
+ drivers/gpu/drm/drm_color_mgmt.c | 2 +-
+ drivers/gpu/drm/drm_connector.c | 135 +-
+ drivers/gpu/drm/drm_crtc.c | 94 +-
+ drivers/gpu/drm/drm_crtc_helper.c | 1 -
+ drivers/gpu/drm/drm_edid.c | 52 +-
+ drivers/gpu/drm/drm_encoder.c | 75 +-
+ .../{drm_fb_cma_helper.c => drm_fb_dma_helper.c} | 67 +-
+ drivers/gpu/drm/drm_fb_helper.c | 101 +-
+ drivers/gpu/drm/drm_file.c | 143 +-
+ drivers/gpu/drm/drm_format_helper.c | 593 +-
+ drivers/gpu/drm/drm_fourcc.c | 55 +-
+ drivers/gpu/drm/drm_framebuffer.c | 4 +-
+ .../{drm_gem_cma_helper.c => drm_gem_dma_helper.c} | 302 +-
+ drivers/gpu/drm/drm_gem_framebuffer_helper.c | 12 +-
+ drivers/gpu/drm/drm_gem_shmem_helper.c | 2 +-
+ drivers/gpu/drm/drm_gem_vram_helper.c | 6 +-
+ drivers/gpu/drm/drm_ioctl.c | 8 +-
+ drivers/gpu/drm/drm_mipi_dbi.c | 11 +-
+ drivers/gpu/drm/drm_mipi_dsi.c | 5 +-
+ drivers/gpu/drm/drm_mode_config.c | 7 +-
+ drivers/gpu/drm/drm_modeset_helper.c | 8 +-
+ drivers/gpu/drm/drm_plane_helper.c | 74 +-
+ drivers/gpu/drm/drm_simple_kms_helper.c | 5 +-
+ drivers/gpu/drm/exynos/exynos_drm_plane.c | 1 -
+ drivers/gpu/drm/fsl-dcu/Kconfig | 2 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 7 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c | 1 -
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 18 +-
+ drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +-
+ drivers/gpu/drm/gma500/oaktrail_crtc.c | 2 +-
+ drivers/gpu/drm/gma500/psb_intel_display.c | 2 -
+ drivers/gpu/drm/gma500/psb_intel_sdvo.c | 62 +-
+ drivers/gpu/drm/gud/gud_pipe.c | 34 +-
+ drivers/gpu/drm/hisilicon/kirin/Kconfig | 2 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 15 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 3 +-
+ drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 9 +-
+ drivers/gpu/drm/i915/display/g4x_dp.c | 4 +-
+ drivers/gpu/drm/i915/display/i9xx_plane.c | 5 +-
+ drivers/gpu/drm/i915/display/icl_dsi.c | 17 +-
+ drivers/gpu/drm/i915/display/intel_atomic.c | 1 -
+ drivers/gpu/drm/i915/display/intel_atomic_plane.c | 1 -
+ drivers/gpu/drm/i915/display/intel_audio.c | 96 +-
+ drivers/gpu/drm/i915/display/intel_backlight.c | 1 +
+ .../gpu/drm/i915/display/intel_backlight_regs.h | 124 +
+ drivers/gpu/drm/i915/display/intel_bios.c | 14 +-
+ drivers/gpu/drm/i915/display/intel_bw.c | 50 +-
+ drivers/gpu/drm/i915/display/intel_cdclk.c | 87 +-
+ drivers/gpu/drm/i915/display/intel_color.c | 34 +-
+ drivers/gpu/drm/i915/display/intel_crtc.c | 1 -
+ .../gpu/drm/i915/display/intel_crtc_state_dump.c | 9 +-
+ drivers/gpu/drm/i915/display/intel_cursor.c | 5 +-
+ drivers/gpu/drm/i915/display/intel_ddi.c | 46 +-
+ drivers/gpu/drm/i915/display/intel_display.c | 91 +-
+ drivers/gpu/drm/i915/display/intel_display.h | 6 +-
+ drivers/gpu/drm/i915/display/intel_display_core.h | 261 +
+ .../gpu/drm/i915/display/intel_display_debugfs.c | 55 +-
+ drivers/gpu/drm/i915/display/intel_display_power.c | 29 +-
+ .../drm/i915/display/intel_display_power_well.c | 19 +-
+ drivers/gpu/drm/i915/display/intel_display_types.h | 2 +-
+ drivers/gpu/drm/i915/display/intel_dmc.c | 142 +-
+ drivers/gpu/drm/i915/display/intel_dmc.h | 1 +
+ drivers/gpu/drm/i915/display/intel_dmc_regs.h | 2 +
+ drivers/gpu/drm/i915/display/intel_dp.c | 31 +-
+ drivers/gpu/drm/i915/display/intel_dp_aux.c | 2 +-
+ .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 15 +-
+ drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 1 +
+ drivers/gpu/drm/i915/display/intel_dp_mst.c | 97 +-
+ drivers/gpu/drm/i915/display/intel_dpll.c | 24 +-
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 112 +-
+ drivers/gpu/drm/i915/display/intel_dsi.h | 3 -
+ .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 14 +-
+ drivers/gpu/drm/i915/display/intel_fb.c | 18 +-
+ drivers/gpu/drm/i915/display/intel_fb_pin.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_fb_pin.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_fbc.c | 12 +-
+ drivers/gpu/drm/i915/display/intel_fbc.h | 1 +
+ drivers/gpu/drm/i915/display/intel_fbdev.c | 30 +-
+ drivers/gpu/drm/i915/display/intel_fdi.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_frontbuffer.c | 2 +
+ drivers/gpu/drm/i915/display/intel_frontbuffer.h | 18 +
+ drivers/gpu/drm/i915/display/intel_gmbus.c | 46 +-
+ drivers/gpu/drm/i915/display/intel_hdcp.c | 29 +-
+ drivers/gpu/drm/i915/display/intel_hdcp_regs.h | 270 +
+ drivers/gpu/drm/i915/display/intel_hdmi.c | 10 +
+ drivers/gpu/drm/i915/display/intel_hotplug.c | 116 +-
+ drivers/gpu/drm/i915/display/intel_lpe_audio.c | 47 +-
+ drivers/gpu/drm/i915/display/intel_modeset_setup.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_overlay.c | 12 +-
+ drivers/gpu/drm/i915/display/intel_pch_refclk.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_plane_initial.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_pps.c | 48 +-
+ drivers/gpu/drm/i915/display/intel_psr.c | 16 +-
+ drivers/gpu/drm/i915/display/intel_snps_phy.c | 1116 +
+ drivers/gpu/drm/i915/display/intel_sprite.c | 9 +-
+ drivers/gpu/drm/i915/display/intel_tc.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_vdsc.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_vrr.c | 14 +-
+ drivers/gpu/drm/i915/display/skl_universal_plane.c | 7 +-
+ drivers/gpu/drm/i915/display/vlv_dsi.c | 4 -
+ drivers/gpu/drm/i915/gem/i915_gem_domain.c | 4 +-
+ drivers/gpu/drm/i915/gem/i915_gem_mman.c | 16 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object.h | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_pages.c | 4 +-
+ drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 6 +-
+ drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 11 +-
+ drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 4 +-
+ drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 46 +-
+ drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.c | 7 +-
+ drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 18 +-
+ .../drm/i915/gem/selftests/i915_gem_client_blt.c | 2 +-
+ .../drm/i915/gem/selftests/i915_gem_coherency.c | 2 +-
+ .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 2 +-
+ drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 10 +-
+ .../gpu/drm/i915/gem/selftests/i915_gem_object.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_engine_cs.c | 4 +-
+ drivers/gpu/drm/i915/gt/intel_ggtt.c | 16 +-
+ drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_gt.c | 3 +-
+ drivers/gpu/drm/i915/gt/intel_gt_pm.h | 8 +
+ drivers/gpu/drm/i915/gt/intel_gt_regs.h | 13 +
+ drivers/gpu/drm/i915/gt/intel_gt_sysfs.c | 10 +-
+ drivers/gpu/drm/i915/gt/intel_gt_sysfs.h | 6 +
+ drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 34 +
+ drivers/gpu/drm/i915/gt/intel_gt_types.h | 9 +
+ drivers/gpu/drm/i915/gt/intel_lrc.c | 21 +
+ drivers/gpu/drm/i915/gt/intel_migrate.c | 37 +-
+ drivers/gpu/drm/i915/gt/intel_ppgtt.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_region_lmem.c | 17 +-
+ drivers/gpu/drm/i915/gt/intel_reset.c | 8 +-
+ drivers/gpu/drm/i915/gt/intel_rps.c | 12 +-
+ drivers/gpu/drm/i915/gt/intel_sseu.c | 5 +-
+ drivers/gpu/drm/i915/gt/intel_workarounds.c | 85 +-
+ drivers/gpu/drm/i915/gt/selftest_execlists.c | 16 +-
+ drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 12 +-
+ drivers/gpu/drm/i915/gt/selftest_slpc.c | 9 +
+ .../drm/i915/gt/uc/abi/guc_communication_ctb_abi.h | 8 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc.c | 70 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 10 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c | 113 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_capture.h | 1 -
+ drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 45 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 252 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_log.h | 42 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 4 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 98 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 51 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc.c | 8 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 462 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 39 +-
+ drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 8 +-
+ drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 40 +-
+ .../gpu/drm/i915/gt/uc/selftest_guc_hangcheck.c | 159 +
+ .../gpu/drm/i915/gt/uc/selftest_guc_multi_lrc.c | 10 +-
+ drivers/gpu/drm/i915/gvt/cfg_space.c | 5 +-
+ drivers/gpu/drm/i915/gvt/handlers.c | 4 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 61 +-
+ drivers/gpu/drm/i915/i915_driver.c | 23 +-
+ drivers/gpu/drm/i915/i915_drv.h | 291 +-
+ drivers/gpu/drm/i915/i915_gem.c | 11 +-
+ drivers/gpu/drm/i915/i915_getparam.c | 2 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 84 +-
+ drivers/gpu/drm/i915/i915_gpu_error.h | 21 +-
+ drivers/gpu/drm/i915/i915_irq.c | 94 +-
+ drivers/gpu/drm/i915/i915_pci.c | 267 +-
+ drivers/gpu/drm/i915/i915_pci.h | 6 +
+ drivers/gpu/drm/i915/i915_reg.h | 404 +-
+ drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 73 +
+ drivers/gpu/drm/i915/i915_utils.h | 4 -
+ drivers/gpu/drm/i915/i915_vma.c | 40 +-
+ drivers/gpu/drm/i915/i915_vma.h | 18 +-
+ drivers/gpu/drm/i915/i915_vma_resource.c | 4 +
+ drivers/gpu/drm/i915/i915_vma_types.h | 42 +-
+ drivers/gpu/drm/i915/intel_device_info.c | 71 +-
+ drivers/gpu/drm/i915/intel_device_info.h | 83 +-
+ drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 1 +
+ drivers/gpu/drm/i915/intel_mchbar_regs.h | 3 +
+ drivers/gpu/drm/i915/intel_pch.c | 9 +-
+ drivers/gpu/drm/i915/intel_pch.h | 4 +
+ drivers/gpu/drm/i915/intel_pci_config.h | 7 +
+ drivers/gpu/drm/i915/intel_pm.c | 351 +-
+ drivers/gpu/drm/i915/intel_uncore.c | 20 +-
+ drivers/gpu/drm/i915/pxp/intel_pxp.c | 15 +
+ drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 +-
+ .../gpu/drm/i915/selftests/i915_live_selftests.h | 1 +
+ drivers/gpu/drm/i915/selftests/i915_perf.c | 2 +-
+ drivers/gpu/drm/i915/selftests/i915_request.c | 4 +-
+ drivers/gpu/drm/i915/selftests/i915_vma.c | 70 +-
+ drivers/gpu/drm/i915/selftests/mock_gem_device.c | 8 +-
+ drivers/gpu/drm/imx/Kconfig | 2 +-
+ drivers/gpu/drm/imx/dcss/Kconfig | 2 +-
+ drivers/gpu/drm/imx/dcss/dcss-kms.c | 6 +-
+ drivers/gpu/drm/imx/dcss/dcss-plane.c | 18 +-
+ drivers/gpu/drm/imx/imx-drm-core.c | 10 +-
+ drivers/gpu/drm/imx/imx-drm.h | 2 +-
+ drivers/gpu/drm/imx/ipuv3-crtc.c | 3 +-
+ drivers/gpu/drm/imx/ipuv3-plane.c | 33 +-
+ drivers/gpu/drm/ingenic/Kconfig | 2 +-
+ drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 58 +-
+ drivers/gpu/drm/ingenic/ingenic-ipu.c | 17 +-
+ drivers/gpu/drm/kmb/Kconfig | 2 +-
+ drivers/gpu/drm/kmb/kmb_drv.c | 6 +-
+ drivers/gpu/drm/kmb/kmb_plane.c | 15 +-
+ drivers/gpu/drm/logicvc/Kconfig | 4 +-
+ drivers/gpu/drm/logicvc/logicvc_crtc.c | 2 +-
+ drivers/gpu/drm/logicvc/logicvc_drm.c | 10 +-
+ drivers/gpu/drm/logicvc/logicvc_interface.c | 2 +-
+ drivers/gpu/drm/logicvc/logicvc_layer.c | 11 +-
+ drivers/gpu/drm/logicvc/logicvc_mode.c | 3 +-
+ drivers/gpu/drm/mcde/Kconfig | 2 +-
+ drivers/gpu/drm/mcde/mcde_display.c | 8 +-
+ drivers/gpu/drm/mcde/mcde_drv.c | 10 +-
+ drivers/gpu/drm/mediatek/Kconfig | 11 +-
+ drivers/gpu/drm/mediatek/Makefile | 2 +
+ drivers/gpu/drm/mediatek/mtk_dp.c | 2661 ++
+ drivers/gpu/drm/mediatek/mtk_dp_reg.h | 356 +
+ drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 1 -
+ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +-
+ drivers/gpu/drm/mediatek/mtk_drm_gem.c | 4 +-
+ drivers/gpu/drm/mediatek/mtk_drm_plane.c | 9 +-
+ drivers/gpu/drm/meson/Kconfig | 2 +-
+ drivers/gpu/drm/meson/meson_drv.c | 10 +-
+ drivers/gpu/drm/meson/meson_overlay.c | 19 +-
+ drivers/gpu/drm/meson/meson_plane.c | 13 +-
+ drivers/gpu/drm/mgag200/Makefile | 4 +-
+ drivers/gpu/drm/mgag200/mgag200_bmc.c | 99 +
+ drivers/gpu/drm/mgag200/mgag200_drv.c | 21 +-
+ drivers/gpu/drm/mgag200/mgag200_drv.h | 208 +-
+ drivers/gpu/drm/mgag200/mgag200_g200.c | 254 +-
+ drivers/gpu/drm/mgag200/mgag200_g200eh.c | 277 +-
+ drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 181 +-
+ drivers/gpu/drm/mgag200/mgag200_g200er.c | 315 +-
+ drivers/gpu/drm/mgag200/mgag200_g200ev.c | 316 +-
+ drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 192 +-
+ drivers/gpu/drm/mgag200/mgag200_g200se.c | 431 +-
+ drivers/gpu/drm/mgag200/mgag200_g200wb.c | 326 +-
+ drivers/gpu/drm/mgag200/mgag200_mode.c | 726 +-
+ drivers/gpu/drm/mgag200/mgag200_pll.c | 997 -
+ drivers/gpu/drm/mgag200/mgag200_reg.h | 2 +-
+ drivers/gpu/drm/msm/msm_drv.c | 15 +-
+ drivers/gpu/drm/msm/msm_drv.h | 1 -
+ drivers/gpu/drm/mxsfb/Kconfig | 4 +-
+ drivers/gpu/drm/mxsfb/lcdif_drv.c | 27 +-
+ drivers/gpu/drm/mxsfb/lcdif_drv.h | 1 +
+ drivers/gpu/drm/mxsfb/lcdif_kms.c | 25 +-
+ drivers/gpu/drm/mxsfb/mxsfb_drv.c | 6 +-
+ drivers/gpu/drm/mxsfb/mxsfb_kms.c | 39 +-
+ drivers/gpu/drm/nouveau/dispnv04/crtc.c | 8 +-
+ drivers/gpu/drm/nouveau/dispnv50/base507c.c | 5 +-
+ drivers/gpu/drm/nouveau/dispnv50/curs507a.c | 5 +-
+ drivers/gpu/drm/nouveau/dispnv50/disp.c | 198 +-
+ drivers/gpu/drm/nouveau/dispnv50/disp.h | 2 +
+ drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 5 +-
+ drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 5 +-
+ drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c | 1 -
+ drivers/gpu/drm/nouveau/nouveau_bo.c | 13 +-
+ drivers/gpu/drm/nouveau/nouveau_connector.c | 21 +-
+ drivers/gpu/drm/nouveau/nouveau_connector.h | 3 +
+ drivers/gpu/drm/nouveau/nouveau_hwmon.c | 85 +-
+ drivers/gpu/drm/nouveau/nouveau_mem.c | 29 +
+ drivers/gpu/drm/nouveau/nouveau_mem.h | 6 +
+ drivers/gpu/drm/nouveau/nouveau_prime.c | 1 -
+ drivers/gpu/drm/nouveau/nouveau_ttm.c | 24 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/bios/pmu.c | 5 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/clk/gm20b.c | 2 +-
+ drivers/gpu/drm/omapdrm/omap_crtc.c | 1 -
+ drivers/gpu/drm/omapdrm/omap_overlay.c | 1 -
+ drivers/gpu/drm/omapdrm/omap_plane.c | 1 -
+ drivers/gpu/drm/panel/Kconfig | 4 +-
+ .../gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c | 4 +-
+ drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c | 4 +-
+ drivers/gpu/drm/panel/panel-boe-himax8279d.c | 4 +-
+ drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 4 +-
+ drivers/gpu/drm/panel/panel-dsi-cm.c | 4 +-
+ drivers/gpu/drm/panel/panel-ebbg-ft8719.c | 4 +-
+ drivers/gpu/drm/panel/panel-edp.c | 14 +-
+ drivers/gpu/drm/panel/panel-elida-kd35t133.c | 4 +-
+ drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c | 4 +-
+ .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 4 +-
+ drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 6 +-
+ drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 4 +-
+ drivers/gpu/drm/panel/panel-innolux-p079zca.c | 4 +-
+ drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c | 4 +-
+ drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 4 +-
+ drivers/gpu/drm/panel/panel-khadas-ts050.c | 4 +-
+ drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 4 +-
+ drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c | 4 +-
+ drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c | 4 +-
+ drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c | 4 +-
+ drivers/gpu/drm/panel/panel-novatek-nt35510.c | 9 +-
+ drivers/gpu/drm/panel/panel-novatek-nt35560.c | 4 +-
+ drivers/gpu/drm/panel/panel-novatek-nt35950.c | 4 +-
+ drivers/gpu/drm/panel/panel-novatek-nt36672a.c | 4 +-
+ drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 4 +-
+ drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 4 +-
+ .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 4 +-
+ drivers/gpu/drm/panel/panel-raydium-rm67191.c | 4 +-
+ drivers/gpu/drm/panel/panel-raydium-rm68200.c | 4 +-
+ drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 4 +-
+ drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 4 +-
+ drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 4 +-
+ drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 4 +-
+ drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c | 3 +-
+ .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 4 +-
+ drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 4 +-
+ drivers/gpu/drm/panel/panel-samsung-sofef00.c | 4 +-
+ drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 6 +-
+ drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 4 +-
+ drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c | 4 +-
+ drivers/gpu/drm/panel/panel-simple.c | 46 +-
+ drivers/gpu/drm/panel/panel-sitronix-st7701.c | 547 +-
+ drivers/gpu/drm/panel/panel-sitronix-st7703.c | 4 +-
+ .../gpu/drm/panel/panel-sony-tulip-truly-nt35521.c | 4 +-
+ drivers/gpu/drm/panel/panel-tdo-tl070wsh30.c | 4 +-
+ drivers/gpu/drm/panel/panel-truly-nt35597.c | 3 +-
+ drivers/gpu/drm/panel/panel-visionox-rm69299.c | 3 +-
+ drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c | 4 +-
+ drivers/gpu/drm/panfrost/Kconfig | 1 +
+ drivers/gpu/drm/panfrost/Makefile | 3 +-
+ drivers/gpu/drm/panfrost/panfrost_dump.c | 249 +
+ drivers/gpu/drm/panfrost/panfrost_dump.h | 12 +
+ drivers/gpu/drm/panfrost/panfrost_job.c | 3 +
+ drivers/gpu/drm/panfrost/panfrost_mmu.c | 44 +-
+ drivers/gpu/drm/panfrost/panfrost_regs.h | 42 +-
+ drivers/gpu/drm/pl111/Kconfig | 2 +-
+ drivers/gpu/drm/pl111/pl111_display.c | 8 +-
+ drivers/gpu/drm/pl111/pl111_drv.c | 9 +-
+ drivers/gpu/drm/pl111/pl111_versatile.c | 1 +
+ drivers/gpu/drm/qxl/qxl_display.c | 4 +-
+ drivers/gpu/drm/qxl/qxl_drv.c | 3 +-
+ drivers/gpu/drm/qxl/qxl_object.c | 2 +-
+ drivers/gpu/drm/radeon/Makefile | 2 +-
+ drivers/gpu/drm/radeon/atombios_crtc.c | 11 +-
+ drivers/gpu/drm/radeon/atombios_encoders.c | 59 -
+ drivers/gpu/drm/radeon/radeon_atombios.c | 2 -
+ drivers/gpu/drm/radeon/radeon_connectors.c | 61 +-
+ drivers/gpu/drm/radeon/radeon_device.c | 1 -
+ drivers/gpu/drm/radeon/radeon_display.c | 1 -
+ drivers/gpu/drm/radeon/radeon_dp_mst.c | 778 -
+ drivers/gpu/drm/radeon/radeon_drv.c | 4 -
+ drivers/gpu/drm/radeon/radeon_encoders.c | 14 +-
+ drivers/gpu/drm/radeon/radeon_irq_kms.c | 10 +-
+ drivers/gpu/drm/radeon/radeon_mode.h | 40 -
+ drivers/gpu/drm/radeon/radeon_object.c | 6 +-
+ drivers/gpu/drm/radeon/radeon_pm.c | 2 +-
+ drivers/gpu/drm/rcar-du/Kconfig | 2 +-
+ drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 4 +-
+ drivers/gpu/drm/rcar-du/rcar_du_drv.c | 5 +-
+ drivers/gpu/drm/rcar-du/rcar_du_kms.c | 37 +-
+ drivers/gpu/drm/rcar-du/rcar_du_plane.c | 15 +-
+ drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 9 +-
+ drivers/gpu/drm/rockchip/Kconfig | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 4 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 9 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 1 -
+ drivers/gpu/drm/scheduler/sched_main.c | 6 +-
+ drivers/gpu/drm/selftests/Makefile | 8 -
+ drivers/gpu/drm/selftests/drm_buddy_selftests.h | 15 -
+ drivers/gpu/drm/selftests/drm_cmdline_selftests.h | 68 -
+ drivers/gpu/drm/selftests/drm_mm_selftests.h | 28 -
+ drivers/gpu/drm/selftests/drm_modeset_selftests.h | 40 -
+ drivers/gpu/drm/selftests/drm_selftest.c | 109 -
+ drivers/gpu/drm/selftests/drm_selftest.h | 41 -
+ drivers/gpu/drm/selftests/test-drm_buddy.c | 994 -
+ .../gpu/drm/selftests/test-drm_cmdline_parser.c | 1141 -
+ drivers/gpu/drm/selftests/test-drm_damage_helper.c | 668 -
+ drivers/gpu/drm/selftests/test-drm_format.c | 280 -
+ .../gpu/drm/selftests/test-drm_modeset_common.c | 32 -
+ .../gpu/drm/selftests/test-drm_modeset_common.h | 52 -
+ drivers/gpu/drm/selftests/test-drm_rect.c | 223 -
+ drivers/gpu/drm/shmobile/Kconfig | 2 +-
+ drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 15 +-
+ drivers/gpu/drm/shmobile/shmob_drm_drv.c | 6 +-
+ drivers/gpu/drm/shmobile/shmob_drm_kms.c | 3 +-
+ drivers/gpu/drm/shmobile/shmob_drm_kms.h | 2 +-
+ drivers/gpu/drm/shmobile/shmob_drm_plane.c | 14 +-
+ drivers/gpu/drm/sis/sis_drv.c | 2 +-
+ drivers/gpu/drm/solomon/ssd130x-spi.c | 21 +-
+ drivers/gpu/drm/solomon/ssd130x.c | 268 +-
+ drivers/gpu/drm/solomon/ssd130x.h | 9 +-
+ drivers/gpu/drm/sprd/Kconfig | 2 +-
+ drivers/gpu/drm/sprd/sprd_dpu.c | 15 +-
+ drivers/gpu/drm/sprd/sprd_drm.c | 6 +-
+ drivers/gpu/drm/sti/Kconfig | 2 +-
+ drivers/gpu/drm/sti/sti_crtc.c | 1 -
+ drivers/gpu/drm/sti/sti_cursor.c | 14 +-
+ drivers/gpu/drm/sti/sti_drv.c | 7 +-
+ drivers/gpu/drm/sti/sti_gdp.c | 18 +-
+ drivers/gpu/drm/sti/sti_hqvdp.c | 18 +-
+ drivers/gpu/drm/sti/sti_plane.c | 3 +-
+ drivers/gpu/drm/sti/sti_plane.h | 1 -
+ drivers/gpu/drm/stm/Kconfig | 2 +-
+ drivers/gpu/drm/stm/drv.c | 11 +-
+ drivers/gpu/drm/stm/ltdc.c | 17 +-
+ drivers/gpu/drm/sun4i/Kconfig | 28 +-
+ drivers/gpu/drm/sun4i/sun4i_backend.c | 17 +-
+ drivers/gpu/drm/sun4i/sun4i_drv.c | 9 +-
+ drivers/gpu/drm/sun4i/sun4i_frontend.c | 26 +-
+ drivers/gpu/drm/sun4i/sun4i_layer.c | 1 -
+ drivers/gpu/drm/sun4i/sun4i_tv.c | 64 +-
+ drivers/gpu/drm/sun4i/sun8i_mixer.c | 4 +-
+ drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 27 +-
+ drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 27 +-
+ drivers/gpu/drm/tegra/dc.c | 1 -
+ drivers/gpu/drm/tegra/fb.c | 2 +-
+ drivers/gpu/drm/tegra/plane.c | 1 -
+ drivers/gpu/drm/tests/Makefile | 4 +-
+ drivers/gpu/drm/tests/drm_buddy_test.c | 756 +
+ drivers/gpu/drm/tests/drm_cmdline_parser_test.c | 991 +
+ drivers/gpu/drm/tests/drm_damage_helper_test.c | 634 +
+ .../drm_dp_mst_helper_test.c} | 89 +-
+ drivers/gpu/drm/tests/drm_format_helper_test.c | 178 +-
+ drivers/gpu/drm/tests/drm_format_test.c | 299 +
+ .../drm_framebuffer_test.c} | 77 +-
+ .../test-drm_mm.c => tests/drm_mm_test.c} | 1248 +-
+ .../drm_plane_helper_test.c} | 155 +-
+ drivers/gpu/drm/tests/drm_rect_test.c | 214 +
+ drivers/gpu/drm/tidss/Kconfig | 2 +-
+ drivers/gpu/drm/tidss/tidss_crtc.c | 4 +-
+ drivers/gpu/drm/tidss/tidss_dispc.c | 28 +-
+ drivers/gpu/drm/tidss/tidss_drv.c | 6 +-
+ drivers/gpu/drm/tidss/tidss_kms.c | 1 -
+ drivers/gpu/drm/tidss/tidss_plane.c | 1 -
+ drivers/gpu/drm/tilcdc/Kconfig | 2 +-
+ drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 10 +-
+ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 6 +-
+ drivers/gpu/drm/tilcdc/tilcdc_plane.c | 1 -
+ drivers/gpu/drm/tiny/Kconfig | 22 +-
+ drivers/gpu/drm/tiny/arcpgu.c | 14 +-
+ drivers/gpu/drm/tiny/bochs.c | 14 +-
+ drivers/gpu/drm/tiny/cirrus.c | 19 +-
+ drivers/gpu/drm/tiny/hx8357d.c | 6 +-
+ drivers/gpu/drm/tiny/ili9163.c | 6 +-
+ drivers/gpu/drm/tiny/ili9225.c | 12 +-
+ drivers/gpu/drm/tiny/ili9341.c | 6 +-
+ drivers/gpu/drm/tiny/ili9486.c | 6 +-
+ drivers/gpu/drm/tiny/mi0283qt.c | 6 +-
+ drivers/gpu/drm/tiny/panel-mipi-dbi.c | 6 +-
+ drivers/gpu/drm/tiny/repaper.c | 16 +-
+ drivers/gpu/drm/tiny/simpledrm.c | 565 +-
+ drivers/gpu/drm/tiny/st7586.c | 17 +-
+ drivers/gpu/drm/tiny/st7735r.c | 6 +-
+ drivers/gpu/drm/ttm/ttm_bo.c | 172 +-
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 7 +-
+ drivers/gpu/drm/ttm/ttm_range_manager.c | 33 +
+ drivers/gpu/drm/ttm/ttm_resource.c | 64 +-
+ drivers/gpu/drm/tve200/Kconfig | 2 +-
+ drivers/gpu/drm/tve200/tve200_display.c | 12 +-
+ drivers/gpu/drm/tve200/tve200_drv.c | 10 +-
+ drivers/gpu/drm/udl/udl_drv.h | 14 +-
+ drivers/gpu/drm/udl/udl_main.c | 125 +-
+ drivers/gpu/drm/udl/udl_modeset.c | 4 +
+ drivers/gpu/drm/udl/udl_transfer.c | 3 +-
+ drivers/gpu/drm/v3d/v3d_drv.c | 1 -
+ drivers/gpu/drm/v3d/v3d_gem.c | 4 +-
+ drivers/gpu/drm/v3d/v3d_perfmon.c | 2 +-
+ drivers/gpu/drm/vboxvideo/vbox_mode.c | 12 +-
+ drivers/gpu/drm/vc4/Kconfig | 2 +-
+ drivers/gpu/drm/vc4/vc4_bo.c | 79 +-
+ drivers/gpu/drm/vc4/vc4_crtc.c | 149 +-
+ drivers/gpu/drm/vc4/vc4_debugfs.c | 72 +-
+ drivers/gpu/drm/vc4/vc4_dpi.c | 131 +-
+ drivers/gpu/drm/vc4/vc4_drv.c | 28 +-
+ drivers/gpu/drm/vc4/vc4_drv.h | 65 +-
+ drivers/gpu/drm/vc4/vc4_dsi.c | 131 +-
+ drivers/gpu/drm/vc4/vc4_gem.c | 22 +-
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 676 +-
+ drivers/gpu/drm/vc4/vc4_hdmi.h | 3 +-
+ drivers/gpu/drm/vc4/vc4_hvs.c | 145 +-
+ drivers/gpu/drm/vc4/vc4_irq.c | 4 +-
+ drivers/gpu/drm/vc4/vc4_kms.c | 1 -
+ drivers/gpu/drm/vc4/vc4_perfmon.c | 1 +
+ drivers/gpu/drm/vc4/vc4_plane.c | 71 +-
+ drivers/gpu/drm/vc4/vc4_render_cl.c | 40 +-
+ drivers/gpu/drm/vc4/vc4_txp.c | 63 +-
+ drivers/gpu/drm/vc4/vc4_v3d.c | 73 +-
+ drivers/gpu/drm/vc4/vc4_validate.c | 28 +-
+ drivers/gpu/drm/vc4/vc4_validate_shaders.c | 2 +-
+ drivers/gpu/drm/vc4/vc4_vec.c | 273 +-
+ drivers/gpu/drm/via/Makefile | 2 +-
+ drivers/gpu/drm/via/via_3d_reg.h | 349 +-
+ drivers/gpu/drm/via/via_dma.c | 744 -
+ drivers/gpu/drm/via/via_dmablit.c | 807 -
+ drivers/gpu/drm/via/via_dmablit.h | 140 -
+ drivers/gpu/drm/via/via_dri1.c | 3630 ++
+ drivers/gpu/drm/via/via_drv.c | 124 -
+ drivers/gpu/drm/via/via_drv.h | 229 -
+ drivers/gpu/drm/via/via_irq.c | 388 -
+ drivers/gpu/drm/via/via_map.c | 132 -
+ drivers/gpu/drm/via/via_mm.c | 241 -
+ drivers/gpu/drm/via/via_verifier.c | 1110 -
+ drivers/gpu/drm/via/via_verifier.h | 62 -
+ drivers/gpu/drm/via/via_video.c | 94 -
+ drivers/gpu/drm/virtio/virtgpu_display.c | 2 +
+ drivers/gpu/drm/virtio/virtgpu_drv.c | 53 +-
+ drivers/gpu/drm/virtio/virtgpu_drv.h | 5 +-
+ drivers/gpu/drm/virtio/virtgpu_gem.c | 4 +-
+ drivers/gpu/drm/virtio/virtgpu_ioctl.c | 2 +-
+ drivers/gpu/drm/virtio/virtgpu_kms.c | 23 +-
+ drivers/gpu/drm/virtio/virtgpu_object.c | 65 +-
+ drivers/gpu/drm/virtio/virtgpu_plane.c | 40 +-
+ drivers/gpu/drm/virtio/virtgpu_vq.c | 21 +-
+ drivers/gpu/drm/vkms/Makefile | 1 +
+ drivers/gpu/drm/vkms/vkms_composer.c | 314 +-
+ drivers/gpu/drm/vkms/vkms_drv.h | 33 +-
+ drivers/gpu/drm/vkms/vkms_formats.c | 286 +
+ drivers/gpu/drm/vkms/vkms_formats.h | 12 +
+ drivers/gpu/drm/vkms/vkms_plane.c | 55 +-
+ drivers/gpu/drm/vkms/vkms_writeback.c | 39 +-
+ .../gpu/drm/vmwgfx/device_include/vm_basic_types.h | 2 +-
+ drivers/gpu/drm/vmwgfx/ttm_object.h | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 14 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 8 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 13 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 11 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 1 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 8 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 3 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_simple_resource.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 1 -
+ drivers/gpu/drm/xlnx/Kconfig | 2 +-
+ drivers/gpu/drm/xlnx/zynqmp_disp.c | 13 +-
+ drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 8 +-
+ drivers/staging/sm750fb/sm750.c | 15 +-
+ drivers/video/aperture.c | 69 +-
+ drivers/video/fbdev/arkfb.c | 5 +
+ drivers/video/fbdev/asiliantfb.c | 5 +
+ drivers/video/fbdev/aty/aty128fb.c | 57 +-
+ drivers/video/fbdev/aty/atyfb_base.c | 7 +-
+ drivers/video/fbdev/aty/radeon_base.c | 83 +-
+ drivers/video/fbdev/carminefb.c | 5 +
+ drivers/video/fbdev/chipsfb.c | 13 +-
+ drivers/video/fbdev/cirrusfb.c | 5 +
+ drivers/video/fbdev/core/fbmem.c | 219 +-
+ drivers/video/fbdev/cyber2000fb.c | 5 +
+ drivers/video/fbdev/geode/gx1fb_core.c | 5 +
+ drivers/video/fbdev/geode/gxfb_core.c | 5 +
+ drivers/video/fbdev/geode/lxfb_core.c | 5 +
+ drivers/video/fbdev/gxt4500.c | 5 +
+ drivers/video/fbdev/hyperv_fb.c | 6 +-
+ drivers/video/fbdev/i740fb.c | 5 +
+ drivers/video/fbdev/i810/i810_main.c | 315 +-
+ drivers/video/fbdev/imsttfb.c | 36 +-
+ drivers/video/fbdev/intelfb/intelfbdrv.c | 5 +
+ drivers/video/fbdev/kyro/fbdev.c | 5 +
+ drivers/video/fbdev/matrox/matroxfb_base.c | 5 +
+ drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 5 +
+ drivers/video/fbdev/neofb.c | 41 +-
+ drivers/video/fbdev/nvidia/nvidia.c | 7 +-
+ drivers/video/fbdev/pm2fb.c | 5 +
+ drivers/video/fbdev/pm3fb.c | 5 +
+ drivers/video/fbdev/pvr2fb.c | 5 +
+ drivers/video/fbdev/riva/fbdev.c | 67 +-
+ drivers/video/fbdev/s3fb.c | 5 +
+ drivers/video/fbdev/savage/savagefb_driver.c | 5 +
+ drivers/video/fbdev/sis/sis_main.c | 5 +
+ drivers/video/fbdev/skeletonfb.c | 210 +-
+ drivers/video/fbdev/sm712fb.c | 5 +
+ drivers/video/fbdev/sstfb.c | 43 +-
+ drivers/video/fbdev/sunxvr2500.c | 5 +
+ drivers/video/fbdev/sunxvr500.c | 5 +
+ drivers/video/fbdev/tdfxfb.c | 5 +
+ drivers/video/fbdev/tgafb.c | 17 +-
+ drivers/video/fbdev/tridentfb.c | 5 +
+ drivers/video/fbdev/vermilion/vermilion.c | 7 +-
+ drivers/video/fbdev/vga16fb.c | 191 +-
+ drivers/video/fbdev/via/via-core.c | 5 +
+ drivers/video/fbdev/vt8623fb.c | 5 +
+ drivers/video/hdmi.c | 82 +-
+ include/drm/display/drm_dp.h | 3 +
+ include/drm/display/drm_dp_helper.h | 2 +
+ include/drm/display/drm_dp_mst_helper.h | 237 +-
+ include/drm/drm_atomic_helper.h | 12 +
+ include/drm/drm_bridge.h | 12 +
+ include/drm/drm_connector.h | 26 +
+ include/drm/drm_crtc.h | 9 +
+ include/drm/drm_encoder.h | 6 +
+ .../{drm_fb_cma_helper.h => drm_fb_dma_helper.h} | 10 +-
+ include/drm/drm_file.h | 9 -
+ include/drm/drm_format_helper.h | 56 +-
+ include/drm/drm_fourcc.h | 4 +
+ include/drm/drm_framebuffer.h | 8 +-
+ include/drm/drm_gem.h | 2 +-
+ .../{drm_gem_cma_helper.h => drm_gem_dma_helper.h} | 158 +-
+ include/drm/drm_gem_shmem_helper.h | 2 +-
+ include/drm/drm_mipi_dsi.h | 2 +-
+ include/drm/drm_plane_helper.h | 29 +-
+ include/drm/gpu_scheduler.h | 9 +-
+ include/drm/i915_pciids.h | 1 +
+ include/drm/ttm/ttm_bo_api.h | 93 +-
+ include/drm/ttm/ttm_bo_driver.h | 2 +-
+ include/drm/ttm/ttm_resource.h | 40 +
+ include/linux/dma-resv.h | 16 +-
+ include/linux/fb.h | 10 -
+ include/linux/hdmi.h | 7 +-
+ include/linux/iosys-map.h | 15 +-
+ include/uapi/drm/drm_fourcc.h | 34 +-
+ include/uapi/drm/drm_mode.h | 8 +-
+ include/uapi/drm/panfrost_drm.h | 47 +
+ include/video/vga.h | 20 +-
+ 834 files changed, 95945 insertions(+), 23353 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml
+ create mode 100644 Documentation/gpu/amdgpu/apu-asic-info-table.csv
+ create mode 100644 Documentation/gpu/amdgpu/dgpu-asic-info-table.csv
+ create mode 100644 Documentation/gpu/amdgpu/display/dcn2_cm_drm_current.svg
+ create mode 100644 Documentation/gpu/amdgpu/display/dcn3_cm_drm_current.svg
+ create mode 100644 Documentation/gpu/amdgpu/display/mpo-cursor.svg
+ create mode 100644 Documentation/gpu/amdgpu/display/mpo-overview.rst
+ create mode 100644 Documentation/gpu/amdgpu/display/multi-display-hdcp-mpo-less-pipe-ex.svg
+ create mode 100644 Documentation/gpu/amdgpu/display/multi-display-hdcp-mpo.svg
+ create mode 100644 Documentation/gpu/amdgpu/display/pipeline_4k_no_split.svg
+ create mode 100644 Documentation/gpu/amdgpu/display/pipeline_4k_split.svg
+ create mode 100644 Documentation/gpu/amdgpu/display/single-display-mpo-multi-video.svg
+ create mode 100644 Documentation/gpu/amdgpu/display/single-display-mpo.svg
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/imu_v11_0_3.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/imu_v11_0_3.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/mmsch_v4_0.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c
+ rename drivers/gpu/drm/amd/{display/dc/inc/dml_wrapper.h => amdgpu/sienna_cichlid.h} (81%)
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/dml/dml_wrapper_translation.c
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_0_3_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_0_3_sh_mask.h
+ rename drivers/gpu/drm/{drm_fb_cma_helper.c => drm_fb_dma_helper.c} (60%)
+ rename drivers/gpu/drm/{drm_gem_cma_helper.c => drm_gem_dma_helper.c} (61%)
+ create mode 100644 drivers/gpu/drm/i915/display/intel_backlight_regs.h
+ create mode 100644 drivers/gpu/drm/i915/display/intel_display_core.h
+ create mode 100644 drivers/gpu/drm/i915/display/intel_hdcp_regs.h
+ create mode 100644 drivers/gpu/drm/i915/gt/uc/selftest_guc_hangcheck.c
+ create mode 100644 drivers/gpu/drm/mediatek/mtk_dp.c
+ create mode 100644 drivers/gpu/drm/mediatek/mtk_dp_reg.h
+ create mode 100644 drivers/gpu/drm/mgag200/mgag200_bmc.c
+ delete mode 100644 drivers/gpu/drm/mgag200/mgag200_pll.c
+ create mode 100644 drivers/gpu/drm/panfrost/panfrost_dump.c
+ create mode 100644 drivers/gpu/drm/panfrost/panfrost_dump.h
+ delete mode 100644 drivers/gpu/drm/radeon/radeon_dp_mst.c
+ delete mode 100644 drivers/gpu/drm/selftests/Makefile
+ delete mode 100644 drivers/gpu/drm/selftests/drm_buddy_selftests.h
+ delete mode 100644 drivers/gpu/drm/selftests/drm_cmdline_selftests.h
+ delete mode 100644 drivers/gpu/drm/selftests/drm_mm_selftests.h
+ delete mode 100644 drivers/gpu/drm/selftests/drm_modeset_selftests.h
+ delete mode 100644 drivers/gpu/drm/selftests/drm_selftest.c
+ delete mode 100644 drivers/gpu/drm/selftests/drm_selftest.h
+ delete mode 100644 drivers/gpu/drm/selftests/test-drm_buddy.c
+ delete mode 100644 drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
+ delete mode 100644 drivers/gpu/drm/selftests/test-drm_damage_helper.c
+ delete mode 100644 drivers/gpu/drm/selftests/test-drm_format.c
+ delete mode 100644 drivers/gpu/drm/selftests/test-drm_modeset_common.c
+ delete mode 100644 drivers/gpu/drm/selftests/test-drm_modeset_common.h
+ delete mode 100644 drivers/gpu/drm/selftests/test-drm_rect.c
+ create mode 100644 drivers/gpu/drm/tests/drm_buddy_test.c
+ create mode 100644 drivers/gpu/drm/tests/drm_cmdline_parser_test.c
+ create mode 100644 drivers/gpu/drm/tests/drm_damage_helper_test.c
+ rename drivers/gpu/drm/{selftests/test-drm_dp_mst_helper.c => tests/drm_dp_mst_helper_test.c} (72%)
+ create mode 100644 drivers/gpu/drm/tests/drm_format_test.c
+ rename drivers/gpu/drm/{selftests/test-drm_framebuffer.c => tests/drm_framebuffer_test.c} (86%)
+ rename drivers/gpu/drm/{selftests/test-drm_mm.c => tests/drm_mm_test.c} (55%)
+ rename drivers/gpu/drm/{selftests/test-drm_plane_helper.c => tests/drm_plane_helper_test.c} (51%)
+ create mode 100644 drivers/gpu/drm/tests/drm_rect_test.c
+ delete mode 100644 drivers/gpu/drm/via/via_dma.c
+ delete mode 100644 drivers/gpu/drm/via/via_dmablit.c
+ delete mode 100644 drivers/gpu/drm/via/via_dmablit.h
+ create mode 100644 drivers/gpu/drm/via/via_dri1.c
+ delete mode 100644 drivers/gpu/drm/via/via_drv.c
+ delete mode 100644 drivers/gpu/drm/via/via_drv.h
+ delete mode 100644 drivers/gpu/drm/via/via_irq.c
+ delete mode 100644 drivers/gpu/drm/via/via_map.c
+ delete mode 100644 drivers/gpu/drm/via/via_mm.c
+ delete mode 100644 drivers/gpu/drm/via/via_verifier.c
+ delete mode 100644 drivers/gpu/drm/via/via_verifier.h
+ delete mode 100644 drivers/gpu/drm/via/via_video.c
+ create mode 100644 drivers/gpu/drm/vkms/vkms_formats.c
+ create mode 100644 drivers/gpu/drm/vkms/vkms_formats.h
+ rename include/drm/{drm_fb_cma_helper.h => drm_fb_dma_helper.h} (56%)
+ rename include/drm/{drm_gem_cma_helper.h => drm_gem_dma_helper.h} (53%)
+Merging drm-misc/for-linux-next (98a65e6d498c drm/rockchip: remove vop_writel from vop1 driver)
+$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/acpi/acpi_video.c
+Auto-merging drivers/gpu/drm/bridge/ite-it6505.c
+Auto-merging drivers/gpu/drm/i915/display/intel_backlight.c
+Auto-merging drivers/gpu/drm/i915/display/intel_display.c
+Auto-merging drivers/platform/x86/acer-wmi.c
+Auto-merging drivers/platform/x86/asus-wmi.c
+Merge made by the 'ort' strategy.
+ .../bindings/display/bridge/chrontel,ch7033.yaml | 13 -
+ .../display/rockchip/dw_mipi_dsi_rockchip.txt | 1 +
+ Documentation/gpu/todo.rst | 68 ++++
+ MAINTAINERS | 1 +
+ drivers/acpi/Kconfig | 1 +
+ drivers/acpi/acpi_video.c | 64 ++-
+ drivers/acpi/video_detect.c | 428 ++++++++++++---------
+ drivers/gpu/drm/Kconfig | 14 +
+ drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 14 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 +
+ .../gpu/drm/amd/pm/powerplay/inc/hardwaremanager.h | 2 -
+ drivers/gpu/drm/bridge/ite-it6505.c | 2 +-
+ drivers/gpu/drm/bridge/ti-sn65dsi86.c | 28 --
+ drivers/gpu/drm/display/drm_scdc_helper.c | 13 +
+ drivers/gpu/drm/drm_aperture.c | 10 +-
+ drivers/gpu/drm/drm_damage_helper.c | 11 +-
+ drivers/gpu/drm/drm_format_helper.c | 108 ++++++
+ drivers/gpu/drm/drm_mipi_dbi.c | 38 +-
+ drivers/gpu/drm/drm_probe_helper.c | 64 +++
+ drivers/gpu/drm/gma500/Kconfig | 2 +
+ drivers/gpu/drm/gma500/psb_intel_drv.h | 5 -
+ drivers/gpu/drm/i915/Kconfig | 2 +
+ drivers/gpu/drm/i915/display/intel_acpi.c | 27 ++
+ drivers/gpu/drm/i915/display/intel_acpi.h | 3 +
+ drivers/gpu/drm/i915/display/intel_backlight.c | 7 +
+ drivers/gpu/drm/i915/display/intel_display.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_acpi.c | 10 +
+ drivers/gpu/drm/nouveau/nouveau_acpi.h | 4 +
+ drivers/gpu/drm/nouveau/nouveau_backlight.c | 13 +
+ drivers/gpu/drm/omapdrm/dss/dispc.c | 2 +-
+ drivers/gpu/drm/omapdrm/dss/dss.c | 3 +
+ drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 4 +-
+ drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 1 +
+ drivers/gpu/drm/radeon/atombios_encoders.c | 7 +
+ drivers/gpu/drm/radeon/r600_cs.c | 2 -
+ drivers/gpu/drm/radeon/radeon.h | 3 -
+ drivers/gpu/drm/radeon/radeon_encoders.c | 11 +-
+ drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 7 +
+ drivers/gpu/drm/radeon/radeon_mode.h | 1 -
+ drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 51 ++-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 113 ++++--
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 2 +
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 24 +-
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.h | 1 +
+ drivers/gpu/drm/tests/drm_buddy_test.c | 84 ++--
+ drivers/gpu/drm/tests/drm_cmdline_parser_test.c | 156 ++++----
+ drivers/gpu/drm/tests/drm_damage_helper_test.c | 89 +++--
+ drivers/gpu/drm/tests/drm_dp_mst_helper_test.c | 8 +-
+ drivers/gpu/drm/tests/drm_format_helper_test.c | 8 +-
+ drivers/gpu/drm/tests/drm_format_test.c | 324 +++++++++-------
+ drivers/gpu/drm/tests/drm_framebuffer_test.c | 53 +--
+ drivers/gpu/drm/tests/drm_mm_test.c | 155 ++++----
+ drivers/gpu/drm/tests/drm_plane_helper_test.c | 4 +-
+ drivers/gpu/drm/tests/drm_rect_test.c | 16 +-
+ drivers/gpu/drm/tidss/tidss_kms.c | 2 +-
+ drivers/gpu/drm/tiny/hx8357d.c | 1 +
+ drivers/gpu/drm/tiny/ili9163.c | 1 +
+ drivers/gpu/drm/tiny/ili9341.c | 1 +
+ drivers/gpu/drm/tiny/ili9486.c | 1 +
+ drivers/gpu/drm/tiny/mi0283qt.c | 1 +
+ drivers/gpu/drm/tiny/panel-mipi-dbi.c | 1 +
+ drivers/gpu/drm/tiny/repaper.c | 26 +-
+ drivers/gpu/drm/tiny/simpledrm.c | 96 +----
+ drivers/gpu/drm/tiny/st7735r.c | 1 +
+ drivers/gpu/drm/udl/udl_drv.c | 19 +-
+ drivers/gpu/drm/udl/udl_drv.h | 13 +-
+ drivers/gpu/drm/udl/udl_main.c | 93 +++--
+ drivers/gpu/drm/udl/udl_modeset.c | 53 +--
+ drivers/gpu/drm/udl/udl_transfer.c | 45 +--
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 305 ++++++++++-----
+ drivers/gpu/drm/vc4/vc4_hdmi.h | 12 +-
+ drivers/gpu/drm/vkms/vkms_plane.c | 3 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 -
+ drivers/platform/x86/Kconfig | 1 +
+ drivers/platform/x86/acer-wmi.c | 66 ----
+ drivers/platform/x86/apple-gmux.c | 3 -
+ drivers/platform/x86/asus-nb-wmi.c | 21 -
+ drivers/platform/x86/asus-wmi.c | 13 -
+ drivers/platform/x86/asus-wmi.h | 2 -
+ drivers/platform/x86/eeepc-wmi.c | 25 +-
+ drivers/platform/x86/nvidia-wmi-ec-backlight.c | 82 +---
+ drivers/platform/x86/samsung-laptop.c | 87 -----
+ drivers/platform/x86/toshiba_acpi.c | 16 -
+ include/acpi/video.h | 9 +-
+ include/drm/drm_format_helper.h | 11 +-
+ include/drm/drm_mipi_dbi.h | 2 +
+ include/drm/drm_modes.h | 35 +-
+ include/drm/drm_probe_helper.h | 9 +-
+ .../platform_data/x86/nvidia-wmi-ec-backlight.h | 76 ++++
+ 89 files changed, 1810 insertions(+), 1416 deletions(-)
+ create mode 100644 include/linux/platform_data/x86/nvidia-wmi-ec-backlight.h
+Merging amdgpu/drm-next (dacd2d2d9d80 drm/amd/display: fix boolconv.cocci warning)
+$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 30 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 1349 +++++++++---------
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 36 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 17 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 17 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 7 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 10 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 37 +-
+ drivers/gpu/drm/amd/amdgpu/imu_v11_0_3.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 9 +
+ drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 7 +
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 5 +
+ drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 25 -
+ drivers/gpu/drm/amd/amdgpu/soc21.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/umc_v8_10.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 4 +
+ drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 4 +
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 6 +
+ drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 3 +
+ drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 57 +-
+ .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 7 +
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 22 -
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 2 -
+ drivers/gpu/drm/amd/display/Kconfig | 2 -
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 22 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 -
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 20 +
+ .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 2 +
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 25 +-
+ .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 4 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c | 16 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/dc.h | 4 +-
+ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 89 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 2 +-
+ .../amd/display/dc/dce110/dce110_hw_sequencer.c | 13 -
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 7 +-
+ .../gpu/drm/amd/display/dc/dcn20/dcn20_mmhubbub.c | 3 +-
+ .../gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.h | 8 -
+ .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 4 +-
+ .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c | 6 +-
+ .../display/dc/dcn314/dcn314_dio_stream_encoder.c | 5 +-
+ .../gpu/drm/amd/display/dc/dcn314/dcn314_optc.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 8 +-
+ .../amd/display/dc/dcn32/dcn32_dio_link_encoder.c | 4 +-
+ .../display/dc/dcn32/dcn32_dio_stream_encoder.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dpp.c | 2 +-
+ .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c | 8 +-
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.c | 24 +-
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 56 +-
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h | 4 +
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 1 +
+ .../gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.c | 2 +-
+ .../gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.h | 10 -
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.c | 6 +-
+ drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 6 +-
+ .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 40 +-
+ .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 236 ++--
+ .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 62 +-
+ .../drm/amd/display/dc/dcn321/dcn321_resource.c | 37 +-
+ drivers/gpu/drm/amd/display/dc/dml/Makefile | 3 +
+ .../drm/amd/display/dc/dml/calcs/dcn_calc_auto.c | 22 +-
+ .../drm/amd/display/dc/dml/calcs/dcn_calc_math.c | 16 +-
+ .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 10 +-
+ .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 6 +-
+ .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 10 +-
+ .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 426 ++----
+ .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 5 +-
+ .../display/dc/dml/dcn314/display_mode_vba_314.c | 19 +-
+ .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 260 ++--
+ .../dc/dml/dcn32/display_mode_vba_util_32.c | 360 +++--
+ .../dc/dml/dcn32/display_mode_vba_util_32.h | 51 +-
+ .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 12 +
+ .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 1 +
+ .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 10 +-
+ .../gpu/drm/amd/display/dc/dml/dml_inline_defs.h | 9 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 1 +
+ drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 5 +
+ .../drm/amd/display/modules/color/color_gamma.c | 4 +
+ .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 100 ++
+ .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 1459 +++++++++++++++++++-
+ drivers/gpu/drm/amd/include/kgd_pp_interface.h | 58 +
+ .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 11 +
+ drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 160 ++-
+ drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 3 +
+ drivers/gpu/drm/radeon/ci_dpm.c | 6 +-
+ drivers/gpu/drm/radeon/radeon_drv.c | 5 +-
+ 102 files changed, 3599 insertions(+), 1911 deletions(-)
+Merging drm-intel/for-linux-next (21f0b7dabf9c drm/i915: Fix return type of mode_valid function hook)
+$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next
+Auto-merging drivers/gpu/drm/i915/display/intel_backlight.c
+Auto-merging drivers/gpu/drm/i915/display/intel_bios.c
+Auto-merging drivers/gpu/drm/i915/display/intel_display.c
+Auto-merging drivers/gpu/drm/i915/display/intel_display.c
+Auto-merging drivers/gpu/drm/i915/display/intel_display.h
+Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h
+Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/display/intel_dp_link_training.c
+Auto-merging drivers/gpu/drm/i915/display/intel_fbdev.c
+Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c
+Auto-merging drivers/gpu/drm/i915/display/skl_universal_plane.c
+Auto-merging drivers/gpu/drm/i915/i915_debugfs.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/i915/i915_irq.c
+Auto-merging drivers/gpu/drm/i915/i915_pci.c
+Auto-merging drivers/gpu/drm/i915/i915_reg.h
+Auto-merging drivers/gpu/drm/i915/intel_device_info.h
+Auto-merging drivers/gpu/drm/i915/intel_pm.c
+Resolved 'drivers/gpu/drm/i915/i915_drv.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master b729cb72b66f] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel
+$ git diff -M --stat --summary HEAD^..
+ drivers/gpu/drm/i915/Makefile | 3 +-
+ drivers/gpu/drm/i915/display/hsw_ips.c | 2 +-
+ drivers/gpu/drm/i915/display/i9xx_plane.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_atomic.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_atomic_plane.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_audio.c | 6 +-
+ drivers/gpu/drm/i915/display/intel_backlight.c | 41 +-
+ drivers/gpu/drm/i915/display/intel_bios.c | 361 +-
+ drivers/gpu/drm/i915/display/intel_bios.h | 1 +
+ drivers/gpu/drm/i915/display/intel_bw.c | 88 +-
+ drivers/gpu/drm/i915/display/intel_cdclk.c | 206 +-
+ drivers/gpu/drm/i915/display/intel_cdclk.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_color.c | 1 +
+ drivers/gpu/drm/i915/display/intel_connector.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_crt.c | 13 +-
+ drivers/gpu/drm/i915/display/intel_cursor.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_ddi.c | 25 +-
+ drivers/gpu/drm/i915/display/intel_display.c | 290 +-
+ drivers/gpu/drm/i915/display/intel_display.h | 2 +-
+ drivers/gpu/drm/i915/display/intel_display_core.h | 157 +
+ .../gpu/drm/i915/display/intel_display_debugfs.c | 92 +-
+ drivers/gpu/drm/i915/display/intel_display_power.c | 124 +-
+ .../gpu/drm/i915/display/intel_display_power_map.c | 119 +-
+ .../drm/i915/display/intel_display_power_well.c | 110 +-
+ .../drm/i915/display/intel_display_power_well.h | 16 +-
+ drivers/gpu/drm/i915/display/intel_display_types.h | 3 +-
+ drivers/gpu/drm/i915/display/intel_dp.c | 90 +-
+ drivers/gpu/drm/i915/display/intel_dp_aux.c | 55 +-
+ .../gpu/drm/i915/display/intel_dp_link_training.c | 83 +-
+ drivers/gpu/drm/i915/display/intel_dp_mst.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_dpio_phy.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_dpll.c | 87 +-
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 224 +-
+ drivers/gpu/drm/i915/display/intel_dsb.c | 30 +
+ drivers/gpu/drm/i915/display/intel_dsb.h | 28 -
+ drivers/gpu/drm/i915/display/intel_dsi.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_dvo_dev.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_fbc.c | 6 +-
+ drivers/gpu/drm/i915/display/intel_fbdev.c | 12 +-
+ drivers/gpu/drm/i915/display/intel_fdi.c | 12 +-
+ drivers/gpu/drm/i915/display/intel_frontbuffer.c | 54 +-
+ drivers/gpu/drm/i915/display/intel_gmbus.c | 290 +-
+ drivers/gpu/drm/i915/display/intel_gmbus.h | 1 +
+ drivers/gpu/drm/i915/display/intel_gmbus_regs.h | 81 +
+ drivers/gpu/drm/i915/display/intel_hdcp.c | 134 +-
+ drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_lvds.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_modeset_setup.c | 13 +-
+ .../gpu/drm/i915/display/intel_modeset_verify.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_opregion.c | 42 +-
+ drivers/gpu/drm/i915/display/intel_overlay.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_panel.c | 45 +-
+ drivers/gpu/drm/i915/display/intel_panel.h | 3 +
+ drivers/gpu/drm/i915/display/intel_pch_refclk.c | 14 +-
+ drivers/gpu/drm/i915/display/intel_pch_refclk.h | 1 +
+ drivers/gpu/drm/i915/display/intel_pps.c | 3 +-
+ drivers/gpu/drm/i915/display/intel_psr.c | 27 +-
+ drivers/gpu/drm/i915/display/intel_quirks.c | 22 +-
+ drivers/gpu/drm/i915/display/intel_quirks.h | 14 +-
+ drivers/gpu/drm/i915/display/intel_sdvo.c | 18 +-
+ drivers/gpu/drm/i915/display/intel_tv.c | 23 +-
+ drivers/gpu/drm/i915/display/intel_vbt_defs.h | 346 +-
+ drivers/gpu/drm/i915/display/skl_universal_plane.c | 4 +-
+ drivers/gpu/drm/i915/display/skl_watermark.c | 3562 ++++++++++++++++++
+ drivers/gpu/drm/i915/display/skl_watermark.h | 80 +
+ drivers/gpu/drm/i915/display/vlv_dsi.c | 23 +-
+ drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 141 +-
+ drivers/gpu/drm/i915/display/vlv_dsi_regs.h | 188 +-
+ drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 4 +-
+ drivers/gpu/drm/i915/gvt/edid.c | 3 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 2 +-
+ drivers/gpu/drm/i915/i915_driver.c | 19 +-
+ drivers/gpu/drm/i915/i915_drv.h | 245 +-
+ drivers/gpu/drm/i915/i915_gem.c | 39 +-
+ drivers/gpu/drm/i915/i915_gem.h | 43 +
+ drivers/gpu/drm/i915/i915_irq.c | 2 +-
+ drivers/gpu/drm/i915/i915_pci.c | 38 +-
+ drivers/gpu/drm/i915/i915_perf.c | 3 +-
+ drivers/gpu/drm/i915/i915_reg.h | 151 +-
+ drivers/gpu/drm/i915/i915_sw_fence.c | 2 -
+ drivers/gpu/drm/i915/i915_sw_fence.h | 6 +-
+ drivers/gpu/drm/i915/intel_device_info.c | 28 +-
+ drivers/gpu/drm/i915/intel_device_info.h | 15 +-
+ drivers/gpu/drm/i915/intel_dram.c | 41 +-
+ drivers/gpu/drm/i915/intel_pm.c | 3822 +-------------------
+ drivers/gpu/drm/i915/intel_pm.h | 65 +-
+ drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 +-
+ 87 files changed, 6365 insertions(+), 5641 deletions(-)
+ create mode 100644 drivers/gpu/drm/i915/display/intel_gmbus_regs.h
+ create mode 100644 drivers/gpu/drm/i915/display/skl_watermark.c
+ create mode 100644 drivers/gpu/drm/i915/display/skl_watermark.h
+$ git am -3 ../patches/0001-drm-i915-fix-up-for-drm-i915-Rename-ggtt_view-as-gtt.patch
+Applying: drm/i915: fix up for "drm/i915: Rename ggtt_view as gtt_view"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/gpu/drm/i915/i915_gem.h
+$ git add -A .
+$ git commit -v -a --amend
+[master 77bf98352455] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel
+ Date: Fri Sep 16 10:01:29 2022 +1000
+Merging drm-tegra/for-next (4d74f5f6b0be drm/tegra: Convert to using is_hdmi from display info)
+$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next
+Auto-merging drivers/gpu/drm/tegra/dc.c
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/tegra/dc.c | 4 +++-
+ drivers/gpu/drm/tegra/hdmi.c | 9 +--------
+ drivers/gpu/drm/tegra/submit.c | 11 +++--------
+ drivers/gpu/drm/tegra/uapi.c | 2 +-
+ drivers/gpu/host1x/context.c | 5 +++++
+ include/linux/host1x.h | 1 +
+ 6 files changed, 14 insertions(+), 18 deletions(-)
+Merging drm-msm/msm-next (d6463fd4e975 drm/msm/a6xx: Handle GMU prepare-slumber hfi failure)
+$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next
+Auto-merging drivers/gpu/drm/drm_gem.c
+Auto-merging drivers/gpu/drm/msm/msm_drv.c
+Auto-merging drivers/gpu/drm/msm/msm_drv.h
+Auto-merging include/drm/drm_gem.h
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/drm_gem.c | 170 +++++++++++++++++++++++++++++++
+ drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 2 +-
+ drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 2 +-
+ drivers/gpu/drm/msm/adreno/a6xx.xml.h | 4 +
+ drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 83 +++++++++------
+ drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 45 ++++++++-
+ drivers/gpu/drm/msm/msm_debugfs.c | 8 ++
+ drivers/gpu/drm/msm/msm_drv.c | 33 ++++--
+ drivers/gpu/drm/msm/msm_drv.h | 77 ++++++++++----
+ drivers/gpu/drm/msm/msm_gem.c | 179 ++++++++++++---------------------
+ drivers/gpu/drm/msm/msm_gem.h | 123 +++-------------------
+ drivers/gpu/drm/msm/msm_gem_prime.c | 4 +-
+ drivers/gpu/drm/msm/msm_gem_shrinker.c | 164 ++++++++++++++----------------
+ drivers/gpu/drm/msm/msm_gem_submit.c | 78 ++++++--------
+ drivers/gpu/drm/msm/msm_gpu.c | 24 +++--
+ drivers/gpu/drm/msm/msm_gpu.h | 14 +--
+ drivers/gpu/drm/msm/msm_gpu_trace.h | 36 ++++---
+ drivers/gpu/drm/msm/msm_iommu.c | 101 ++++++++++++++++---
+ drivers/gpu/drm/msm/msm_ringbuffer.c | 4 -
+ drivers/gpu/drm/msm/msm_submitqueue.c | 1 +
+ include/drm/drm_gem.h | 55 ++++++++++
+ 21 files changed, 724 insertions(+), 483 deletions(-)
+Merging drm-msm-lumag/msm-next-lumag (6678f4743572 Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu', 'msm-next-lumag-dp', 'msm-next-lumag-dsi' and 'msm-next-lumag-hdmi' into msm-next-lumag)
+$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag
+Auto-merging drivers/gpu/drm/msm/msm_drv.c
+Auto-merging drivers/gpu/drm/msm/msm_drv.h
+Auto-merging drivers/gpu/drm/msm/msm_gem.h
+CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_gem.h
+Auto-merging include/drm/drm_mipi_dsi.h
+Resolved 'drivers/gpu/drm/msm/msm_gem.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 0eb63f421681] Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/display/msm/dp-controller.yaml | 47 +++-
+ .../bindings/display/msm/dpu-msm8998.yaml | 4 +
+ .../bindings/display/msm/dpu-qcm2290.yaml | 3 +
+ .../bindings/display/msm/dpu-sc7180.yaml | 3 +
+ .../bindings/display/msm/dpu-sc7280.yaml | 3 +
+ .../bindings/display/msm/dpu-sdm845.yaml | 4 +
+ .../devicetree/bindings/display/msm/gmu.yaml | 166 ++++++++++--
+ .../devicetree/bindings/display/msm/gpu.yaml | 3 +-
+ .../devicetree/bindings/display/msm/mdp4.yaml | 2 +-
+ .../devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml | 15 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 50 ++--
+ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 1 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 31 ++-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 2 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 9 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 78 +++---
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 35 ++-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c | 74 ++---
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h | 4 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 6 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 3 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 4 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 27 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 94 +------
+ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 22 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 65 +++--
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 9 +-
+ drivers/gpu/drm/msm/dp/dp_catalog.c | 2 +-
+ drivers/gpu/drm/msm/dp/dp_ctrl.c | 148 ++++------
+ drivers/gpu/drm/msm/dp/dp_ctrl.h | 1 -
+ drivers/gpu/drm/msm/dp/dp_link.c | 5 +-
+ drivers/gpu/drm/msm/dsi/dsi.c | 37 +--
+ drivers/gpu/drm/msm/dsi/dsi.h | 31 +--
+ drivers/gpu/drm/msm/dsi/dsi_cfg.c | 172 ++++++------
+ drivers/gpu/drm/msm/dsi/dsi_cfg.h | 3 +-
+ drivers/gpu/drm/msm/dsi/dsi_host.c | 299 ++++++---------------
+ drivers/gpu/drm/msm/dsi/dsi_manager.c | 288 +++-----------------
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 160 +++--------
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 5 +-
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 185 ++++++-------
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 87 +++---
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 14 +-
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 145 +++++-----
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 102 ++++---
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 188 +++++++------
+ drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c | 25 +-
+ drivers/gpu/drm/msm/msm_drv.h | 11 +-
+ drivers/gpu/drm/msm/msm_io_utils.c | 22 ++
+ include/drm/drm_mipi_dsi.h | 2 +
+ include/drm/drm_panel.h | 7 -
+ 51 files changed, 1112 insertions(+), 1593 deletions(-)
+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 (332f847212e4 drm/etnaviv: reap idle mapping if it doesn't match the softpin address)
+$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/etnaviv/etnaviv_gem.c | 8 ++++++--
+ drivers/gpu/drm/etnaviv/etnaviv_gem.h | 1 +
+ drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 6 ++++++
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 18 +++++++++++++++++-
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 2 +-
+ drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 23 +++++++++++++++--------
+ drivers/gpu/drm/etnaviv/etnaviv_mmu.h | 1 +
+ drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +-
+ 8 files changed, 48 insertions(+), 13 deletions(-)
+Merging fbdev/for-next (1c23f9e627a7 Linux 6.0-rc2)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next
+Already up to date.
+Merging regmap/for-next (694cf81e9000 Merge remote-tracking branch 'regmap/for-6.1' into regmap-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next
+Merge made by the 'ort' strategy.
+ arch/hexagon/include/asm/io.h | 25 +++
+ drivers/base/regmap/regmap-mmio.c | 287 ++++++++++++++++++++++++++++------
+ drivers/base/regmap/regmap-spi-avmm.c | 14 +-
+ drivers/base/regmap/regmap.c | 167 +++++++++++++++++---
+ drivers/base/regmap/trace.h | 61 ++++++--
+ include/linux/regmap.h | 11 ++
+ include/linux/swab.h | 25 +++
+ 7 files changed, 488 insertions(+), 102 deletions(-)
+Merging sound/for-next (39efc9c8a973 ALSA: usb-audio: Fix last interface check for registration)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next
+Auto-merging sound/pci/hda/patch_hdmi.c
+Merge made by the 'ort' strategy.
+ .../sound/kernel-api/writing-an-alsa-driver.rst | 21 +-
+ include/sound/hda_codec.h | 2 -
+ include/sound/hda_register.h | 20 +-
+ include/sound/hdaudio.h | 7 +
+ include/sound/hdaudio_ext.h | 9 -
+ include/sound/memalloc.h | 3 -
+ sound/core/memalloc.c | 113 +++----
+ sound/core/memalloc_local.h | 4 -
+ sound/drivers/dummy.c | 42 ++-
+ sound/drivers/vx/vx_pcm.c | 3 +-
+ sound/hda/ext/hdac_ext_bus.c | 53 ----
+ sound/hda/ext/hdac_ext_controller.c | 16 +-
+ sound/hda/hdac_stream.c | 26 +-
+ sound/oss/dmasound/dmasound.h | 3 -
+ sound/pci/asihpi/hpifunc.c | 1 -
+ sound/pci/hda/cs35l41_hda.c | 57 +---
+ sound/pci/hda/hda_beep.c | 15 +-
+ sound/pci/hda/hda_beep.h | 1 +
+ sound/pci/hda/hda_codec.c | 49 ++-
+ sound/pci/hda/hda_intel.c | 21 +-
+ sound/pci/hda/hda_sysfs.c | 2 -
+ sound/pci/hda/patch_hdmi.c | 16 +-
+ sound/pci/hda/patch_sigmatel.c | 25 +-
+ sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | 3 +-
+ sound/soc/codecs/hdac_hda.c | 26 +-
+ sound/soc/codecs/hdac_hda.h | 2 +-
+ sound/soc/intel/atom/sst-mfld-platform-pcm.c | 7 +-
+ sound/soc/intel/boards/hda_dsp_common.c | 2 +-
+ sound/soc/intel/boards/skl_hda_dsp_generic.c | 2 +-
+ sound/soc/intel/skylake/skl.c | 55 +++-
+ sound/soc/sof/intel/hda-codec.c | 55 +++-
+ sound/usb/card.c | 32 +-
+ sound/usb/line6/driver.h | 2 -
+ sound/usb/pcm.c | 40 +--
+ sound/usb/quirks-table.h | 76 +++++
+ sound/usb/quirks.c | 344 ++++++++++++++++++---
+ sound/usb/quirks.h | 2 -
+ sound/usb/stream.c | 6 -
+ sound/usb/usbaudio.h | 1 +
+ 39 files changed, 695 insertions(+), 469 deletions(-)
+Merging sound-asoc/for-next (5287d5b77fc2 Merge remote-tracking branch 'asoc/for-6.1' into asoc-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next
+Auto-merging MAINTAINERS
+Auto-merging sound/soc/codecs/ak4458.c
+Auto-merging sound/soc/codecs/cs42l42.c
+Auto-merging sound/soc/codecs/cs43130.c
+Auto-merging sound/soc/codecs/nau8825.c
+Auto-merging sound/soc/intel/skylake/skl.c
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/dsp/fsl,dsp.yaml | 1 +
+ .../devicetree/bindings/soc/qcom/qcom,apr.yaml | 112 +-
+ .../devicetree/bindings/sound/adi,max98396.yaml | 34 +
+ .../bindings/sound/amlogic,gx-sound-card.yaml | 2 +
+ .../devicetree/bindings/sound/apple,mca.yaml | 131 +++
+ .../bindings/sound/audio-graph-port.yaml | 19 +-
+ .../devicetree/bindings/sound/audio-graph.yaml | 9 +-
+ .../devicetree/bindings/sound/dai-params.yaml | 40 +
+ .../devicetree/bindings/sound/everest,es8326.yaml | 116 ++
+ .../devicetree/bindings/sound/fsl,sai.yaml | 216 ++++
+ .../devicetree/bindings/sound/fsl-sai.txt | 95 --
+ .../bindings/sound/google,sc7180-trogdor.yaml | 4 +
+ .../devicetree/bindings/sound/imx-audio-card.yaml | 2 +
+ .../sound/mt8186-mt6366-da7219-max98357.yaml | 10 +
+ .../sound/mt8186-mt6366-rt1019-rt5682s.yaml | 10 +
+ .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 4 +
+ .../devicetree/bindings/sound/nau8825.txt | 3 +
+ .../bindings/sound/qcom,q6adm-routing.yaml | 52 +
+ .../devicetree/bindings/sound/qcom,q6adm.txt | 39 -
+ .../devicetree/bindings/sound/qcom,q6afe.txt | 20 -
+ .../devicetree/bindings/sound/qcom,q6apm-dai.yaml | 21 +-
+ .../devicetree/bindings/sound/qcom,q6asm-dais.yaml | 112 ++
+ .../devicetree/bindings/sound/qcom,q6asm.txt | 70 --
+ .../devicetree/bindings/sound/qcom,q6core.txt | 21 -
+ .../bindings/sound/qcom,q6dsp-lpass-clocks.yaml | 36 +-
+ .../bindings/sound/qcom,q6dsp-lpass-ports.yaml | 64 +-
+ .../devicetree/bindings/sound/qcom,sm8250.yaml | 6 +
+ .../devicetree/bindings/sound/renesas,rsnd.yaml | 14 +-
+ .../bindings/sound/samsung,aries-wm8994.yaml | 2 +
+ .../bindings/sound/samsung,midas-audio.yaml | 2 +
+ .../devicetree/bindings/sound/samsung,snow.yaml | 2 +
+ .../devicetree/bindings/sound/st,stm32-sai.yaml | 1 +
+ .../devicetree/bindings/sound/ti,src4xxx.yaml | 48 +
+ .../bindings/spi/mediatek,spi-mtk-nor.yaml | 5 +-
+ MAINTAINERS | 8 +
+ drivers/soundwire/bus.c | 32 +
+ drivers/soundwire/cadence_master.c | 8 +
+ drivers/soundwire/cadence_master.h | 2 +
+ drivers/soundwire/intel.c | 1 +
+ include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h | 18 +
+ include/linux/soundwire/sdw.h | 5 +
+ include/linux/string_helpers.h | 2 +
+ include/sound/acp62_chip_offset_byte.h | 444 ++++++++
+ include/sound/simple_card_utils.h | 1 +
+ include/sound/soc-acpi-intel-match.h | 3 +-
+ include/sound/soc.h | 20 +-
+ include/sound/sof.h | 2 +
+ include/sound/sof/ipc4/header.h | 5 +
+ lib/string_helpers.c | 44 +
+ sound/soc/Kconfig | 1 +
+ sound/soc/Makefile | 1 +
+ sound/soc/amd/Kconfig | 23 +-
+ sound/soc/amd/Makefile | 1 +
+ sound/soc/amd/acp/acp-i2s.c | 80 +-
+ sound/soc/amd/acp/acp-pci.c | 17 +-
+ sound/soc/amd/acp/acp-platform.c | 44 +-
+ sound/soc/amd/acp/amd.h | 22 +-
+ sound/soc/amd/ps/Makefile | 9 +
+ sound/soc/amd/ps/acp62.h | 98 ++
+ sound/soc/amd/ps/pci-ps.c | 351 ++++++
+ sound/soc/amd/ps/ps-mach.c | 79 ++
+ sound/soc/amd/ps/ps-pdm-dma.c | 452 ++++++++
+ sound/soc/apple/Kconfig | 8 +
+ sound/soc/apple/Makefile | 3 +
+ sound/soc/apple/mca.c | 1180 ++++++++++++++++++++
+ sound/soc/atmel/atmel_ssc_dai.c | 5 +-
+ sound/soc/atmel/sam9g20_wm8731.c | 2 +-
+ sound/soc/bcm/bcm2835-i2s.c | 11 +-
+ sound/soc/codecs/Kconfig | 28 +-
+ sound/soc/codecs/Makefile | 6 +
+ sound/soc/codecs/ak4458.c | 57 +-
+ sound/soc/codecs/cs42l42.c | 32 +-
+ sound/soc/codecs/cs42l42.h | 13 +-
+ sound/soc/codecs/cs43130.c | 11 +-
+ sound/soc/codecs/es8316.c | 22 +
+ sound/soc/codecs/es8326.c | 905 +++++++++++++++
+ sound/soc/codecs/es8326.h | 182 +++
+ sound/soc/codecs/hdmi-codec.c | 14 +-
+ sound/soc/codecs/max98088.c | 7 +-
+ sound/soc/codecs/max98373-sdw.c | 2 +
+ sound/soc/codecs/max98390.c | 17 +-
+ sound/soc/codecs/max98396.c | 102 ++
+ sound/soc/codecs/max98396.h | 14 +
+ sound/soc/codecs/mt6359-accdet.c | 6 +-
+ sound/soc/codecs/nau8825.c | 6 +
+ sound/soc/codecs/nau8825.h | 3 +
+ sound/soc/codecs/rt1308-sdw.c | 2 +
+ sound/soc/codecs/rt1316-sdw.c | 2 +
+ sound/soc/codecs/rt5682-sdw.c | 2 +
+ sound/soc/codecs/rt700-sdw.c | 2 +
+ sound/soc/codecs/rt711-sdca-sdw.c | 2 +
+ sound/soc/codecs/rt715-sdca-sdw.c | 2 +
+ sound/soc/codecs/rt715-sdw.c | 2 +
+ sound/soc/codecs/sigmadsp.c | 4 +-
+ sound/soc/codecs/src4xxx-i2c.c | 47 +
+ sound/soc/codecs/src4xxx.c | 518 +++++++++
+ sound/soc/codecs/src4xxx.h | 113 ++
+ sound/soc/codecs/sti-sas.c | 10 +-
+ sound/soc/codecs/tas2562.c | 94 +-
+ sound/soc/codecs/tas2764.c | 181 ++-
+ sound/soc/codecs/tas2764.h | 23 +
+ sound/soc/codecs/tlv320adcx140.c | 59 +
+ sound/soc/codecs/tlv320adcx140.h | 3 +-
+ sound/soc/codecs/tlv320aic26.c | 2 +-
+ sound/soc/codecs/uda134x.c | 2 +-
+ sound/soc/codecs/wcd-mbhc-v2.c | 2 +-
+ sound/soc/codecs/wcd9335.c | 14 +-
+ sound/soc/codecs/wcd938x.c | 1 -
+ sound/soc/codecs/wm_adsp.c | 4 +-
+ sound/soc/fsl/eukrea-tlv320.c | 8 +-
+ sound/soc/fsl/fsl_asrc.c | 29 +-
+ sound/soc/fsl/fsl_sai.c | 55 +-
+ sound/soc/fsl/fsl_sai.h | 3 +
+ sound/soc/fsl/fsl_utils.c | 2 +-
+ sound/soc/fsl/imx-rpmsg.c | 29 +
+ sound/soc/generic/simple-card-utils.c | 62 +-
+ sound/soc/intel/Kconfig | 2 +-
+ sound/soc/intel/atom/sst/sst.c | 8 +-
+ sound/soc/intel/boards/Makefile | 8 +-
+ sound/soc/intel/boards/sof_cirrus_common.c | 92 +-
+ sound/soc/intel/catpt/device.c | 33 +-
+ sound/soc/intel/catpt/sysfs.c | 6 +-
+ sound/soc/intel/common/Makefile | 2 +-
+ .../intel/common/soc-acpi-intel-hsw-bdw-match.c | 15 -
+ sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 51 +
+ sound/soc/intel/skylake/skl-nhlt.c | 2 +-
+ sound/soc/mediatek/mt8183/mt8183-afe-common.h | 3 +
+ sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 33 +
+ sound/soc/mediatek/mt8183/mt8183-dai-i2s.c | 45 +-
+ .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 33 +
+ sound/soc/mediatek/mt8186/mt8186-afe-common.h | 3 +
+ sound/soc/mediatek/mt8186/mt8186-afe-pcm.c | 3 +
+ sound/soc/mediatek/mt8186/mt8186-dai-i2s.c | 58 +-
+ .../mt8186/mt8186-mt6366-da7219-max98357.c | 188 +++-
+ .../mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 188 +++-
+ sound/soc/mediatek/mt8192/mt8192-afe-common.h | 3 +
+ sound/soc/mediatek/mt8192/mt8192-dai-i2s.c | 49 +-
+ .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 9 +
+ sound/soc/mediatek/mt8195/mt8195-mt6359.c | 6 +
+ sound/soc/qcom/qdsp6/q6prm-clocks.c | 9 +
+ sound/soc/qcom/qdsp6/q6prm.h | 19 +
+ sound/soc/rockchip/rockchip_i2s.c | 41 +-
+ sound/soc/samsung/aries_wm8994.c | 8 +-
+ sound/soc/sh/rcar/ctu.c | 6 +-
+ sound/soc/sh/rcar/dvc.c | 6 +-
+ sound/soc/sh/rcar/mix.c | 6 +-
+ sound/soc/sh/rcar/src.c | 5 +-
+ sound/soc/sh/rcar/ssi.c | 4 +-
+ sound/soc/soc-ac97.c | 8 +-
+ sound/soc/soc-core.c | 2 +-
+ sound/soc/soc-dai.c | 2 +-
+ sound/soc/soc-dapm.c | 63 +-
+ sound/soc/soc-pcm.c | 117 +-
+ sound/soc/soc-utils-test.c | 46 +
+ sound/soc/soc-utils.c | 23 +-
+ sound/soc/sof/Makefile | 3 +-
+ sound/soc/sof/compress.c | 98 +-
+ sound/soc/sof/imx/Kconfig | 9 +
+ sound/soc/sof/imx/Makefile | 2 +
+ sound/soc/sof/imx/imx8ulp.c | 515 +++++++++
+ sound/soc/sof/intel/apl.c | 2 +
+ sound/soc/sof/intel/cnl.c | 2 +
+ sound/soc/sof/intel/hda-dsp.c | 7 +-
+ sound/soc/sof/intel/hda-loader.c | 10 +-
+ sound/soc/sof/intel/hda.h | 6 -
+ sound/soc/sof/intel/icl.c | 30 +-
+ sound/soc/sof/intel/mtl.c | 2 +
+ sound/soc/sof/intel/pci-tgl.c | 62 +-
+ sound/soc/sof/intel/tgl.c | 2 +
+ sound/soc/sof/ipc4-loader.c | 13 +
+ sound/soc/sof/ipc4-mtrace.c | 643 +++++++++++
+ sound/soc/sof/ipc4-priv.h | 18 +-
+ sound/soc/sof/ipc4.c | 22 +-
+ sound/soc/sof/mediatek/mt8186/mt8186.c | 58 +-
+ sound/soc/sof/mediatek/mt8195/mt8195.c | 32 +-
+ sound/soc/sof/pcm.c | 8 +-
+ sound/soc/sof/sof-audio.c | 30 +
+ sound/soc/sof/sof-client-probes.c | 104 +-
+ sound/soc/sof/sof-of-dev.h | 7 +
+ sound/soc/sof/sof-priv.h | 7 +
+ sound/soc/sunxi/sun4i-codec.c | 2 +-
+ sound/soc/ti/omap-mcbsp-st.c | 6 +-
+ sound/soc/ti/omap-mcbsp.c | 10 +-
+ 183 files changed, 8763 insertions(+), 1163 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/apple,mca.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/dai-params.yaml
+ create mode 100755 Documentation/devicetree/bindings/sound/everest,es8326.yaml
+ create mode 100644 Documentation/devicetree/bindings/sound/fsl,sai.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/fsl-sai.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6adm-routing.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/qcom,q6adm.txt
+ delete mode 100644 Documentation/devicetree/bindings/sound/qcom,q6afe.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6asm-dais.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/qcom,q6asm.txt
+ delete mode 100644 Documentation/devicetree/bindings/sound/qcom,q6core.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/ti,src4xxx.yaml
+ create mode 100644 include/sound/acp62_chip_offset_byte.h
+ create mode 100644 sound/soc/amd/ps/Makefile
+ create mode 100644 sound/soc/amd/ps/acp62.h
+ create mode 100644 sound/soc/amd/ps/pci-ps.c
+ create mode 100644 sound/soc/amd/ps/ps-mach.c
+ create mode 100644 sound/soc/amd/ps/ps-pdm-dma.c
+ create mode 100644 sound/soc/apple/Kconfig
+ create mode 100644 sound/soc/apple/Makefile
+ create mode 100644 sound/soc/apple/mca.c
+ create mode 100755 sound/soc/codecs/es8326.c
+ create mode 100755 sound/soc/codecs/es8326.h
+ create mode 100644 sound/soc/codecs/src4xxx-i2c.c
+ create mode 100644 sound/soc/codecs/src4xxx.c
+ create mode 100644 sound/soc/codecs/src4xxx.h
+ create mode 100644 sound/soc/intel/common/soc-acpi-intel-rpl-match.c
+ create mode 100644 sound/soc/sof/imx/imx8ulp.c
+ create mode 100644 sound/soc/sof/ipc4-mtrace.c
+Merging modules/modules-next (77d6354bd422 module/decompress: generate sysfs string at compile time)
+$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next
+Merge made by the 'ort' strategy.
+ kernel/module/decompress.c | 2 +-
+ kernel/module/tracking.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 69 insertions(+), 1 deletion(-)
+Merging input/next (7984b4354207 Input: synaptics - enable InterTouch for the ThinkPad P1 G3)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/input/adc-joystick.yaml | 5 +
+ .../devicetree/bindings/input/adi,adp5588.yaml | 111 ++++
+ .../devicetree/bindings/input/ibm,op-panel.yaml | 50 ++
+ .../bindings/input/mediatek,mt6779-keypad.yaml | 8 +-
+ .../bindings/input/touchscreen/colibri-vf50-ts.txt | 16 +-
+ .../bindings/input/touchscreen/stmpe.txt | 3 +-
+ MAINTAINERS | 15 +-
+ drivers/gpio/Kconfig | 14 -
+ drivers/gpio/Makefile | 1 -
+ drivers/gpio/gpio-adp5588.c | 446 -------------
+ drivers/input/joystick/adc-joystick.c | 65 +-
+ drivers/input/joystick/xpad.c | 298 +++++++--
+ drivers/input/keyboard/Kconfig | 5 +-
+ drivers/input/keyboard/adp5588-keys.c | 726 ++++++++++++++-------
+ drivers/input/keyboard/applespi.c | 2 +-
+ drivers/input/keyboard/atkbd.c | 16 +-
+ drivers/input/keyboard/clps711x-keypad.c | 13 +-
+ drivers/input/keyboard/lkkbd.c | 8 +-
+ drivers/input/keyboard/matrix_keypad.c | 6 +-
+ drivers/input/keyboard/mt6779-keypad.c | 45 +-
+ drivers/input/keyboard/mtk-pmic-keys.c | 21 +
+ drivers/input/keyboard/tc3589x-keypad.c | 2 +-
+ drivers/input/misc/Kconfig | 27 +
+ drivers/input/misc/Makefile | 2 +
+ drivers/input/misc/ibm-panel.c | 199 ++++++
+ drivers/input/misc/iqs7222.c | 16 +-
+ drivers/input/misc/keyspan_remote.c | 2 +-
+ drivers/input/misc/rt5120-pwrkey.c | 120 ++++
+ drivers/input/mouse/elan_i2c_core.c | 7 +-
+ drivers/input/mouse/hgpk.c | 4 +-
+ drivers/input/mouse/psmouse-base.c | 22 +-
+ drivers/input/mouse/synaptics.c | 5 +-
+ drivers/input/mouse/synaptics_usb.c | 2 +-
+ drivers/input/mouse/vsxxxaa.c | 4 +-
+ drivers/input/rmi4/rmi_f03.c | 2 +-
+ drivers/input/rmi4/rmi_f54.c | 8 +-
+ drivers/input/serio/altera_ps2.c | 4 +-
+ drivers/input/serio/ambakmi.c | 4 +-
+ drivers/input/serio/ams_delta_serio.c | 4 +-
+ drivers/input/serio/apbps2.c | 2 +-
+ drivers/input/serio/ct82c710.c | 2 +-
+ drivers/input/serio/gscps2.c | 2 +-
+ drivers/input/serio/hyperv-keyboard.c | 4 +-
+ drivers/input/serio/i8042-x86ia64io.h | 6 +-
+ drivers/input/serio/i8042.c | 14 +-
+ drivers/input/serio/olpc_apsp.c | 8 +-
+ drivers/input/serio/parkbd.c | 2 +-
+ drivers/input/serio/pcips2.c | 4 +-
+ drivers/input/serio/ps2-gpio.c | 4 +-
+ drivers/input/serio/ps2mult.c | 2 +-
+ drivers/input/serio/q40kbd.c | 4 +-
+ drivers/input/serio/rpckbd.c | 4 +-
+ drivers/input/serio/sa1111ps2.c | 4 +-
+ drivers/input/serio/serport.c | 2 +-
+ drivers/input/serio/sun4i-ps2.c | 4 +-
+ drivers/input/tablet/acecad.c | 2 +-
+ drivers/input/tablet/aiptek.c | 20 +-
+ drivers/input/tablet/hanwang.c | 2 +-
+ drivers/input/tablet/pegasus_notetaker.c | 2 +-
+ drivers/input/touchscreen/Kconfig | 2 +-
+ drivers/input/touchscreen/atmel_mxt_ts.c | 8 +-
+ drivers/input/touchscreen/edt-ft5x06.c | 12 +-
+ drivers/input/touchscreen/sur40.c | 6 +-
+ drivers/input/touchscreen/usbtouchscreen.c | 2 +-
+ drivers/input/touchscreen/wacom_w8001.c | 6 +-
+ include/linux/bma150.h | 4 +-
+ include/linux/gameport.h | 2 +-
+ include/linux/platform_data/adp5588.h | 171 -----
+ 68 files changed, 1501 insertions(+), 1114 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/adi,adp5588.yaml
+ create mode 100644 Documentation/devicetree/bindings/input/ibm,op-panel.yaml
+ delete mode 100644 drivers/gpio/gpio-adp5588.c
+ create mode 100644 drivers/input/misc/ibm-panel.c
+ create mode 100644 drivers/input/misc/rt5120-pwrkey.c
+ delete mode 100644 include/linux/platform_data/adp5588.h
+Merging block/for-next (52f3156bd209 Merge branch 'for-6.1/block' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next
+Auto-merging drivers/block/nbd.c
+Auto-merging drivers/block/rnbd/rnbd-srv.c
+Auto-merging include/linux/fs.h
+Merge made by the 'ort' strategy.
+ block/bfq-cgroup.c | 5 -
+ block/bfq-iosched.c | 14 +-
+ block/bfq-iosched.h | 18 +-
+ block/bfq-wf2q.c | 9 +-
+ block/bio.c | 5 +-
+ block/blk-core.c | 10 +-
+ block/blk-map.c | 52 ++++--
+ block/blk-mq-cpumap.c | 4 +-
+ block/blk-mq-pci.c | 7 +-
+ block/blk-mq-rdma.c | 6 +-
+ block/blk-mq-tag.c | 2 +-
+ block/blk-mq-virtio.c | 7 +-
+ block/blk-mq.c | 15 +-
+ block/blk-throttle.c | 248 +++++++++++++++++---------
+ block/blk-throttle.h | 11 +-
+ block/opal_proto.h | 5 +
+ block/sed-opal.c | 89 +++++++--
+ drivers/block/drbd/drbd_int.h | 1 -
+ drivers/block/nbd.c | 6 +-
+ drivers/block/null_blk/main.c | 8 +-
+ drivers/block/rnbd/Makefile | 5 +-
+ drivers/block/rnbd/rnbd-clt.c | 8 +-
+ drivers/block/rnbd/rnbd-srv-dev.c | 1 -
+ drivers/block/rnbd/rnbd-srv-trace.c | 17 ++
+ drivers/block/rnbd/rnbd-srv-trace.h | 207 +++++++++++++++++++++
+ drivers/block/rnbd/rnbd-srv.c | 31 ++--
+ drivers/block/virtio_blk.c | 4 +-
+ drivers/nvme/host/core.c | 1 +
+ drivers/nvme/host/fc.c | 3 +-
+ drivers/nvme/host/ioctl.c | 77 +++++++-
+ drivers/nvme/host/multipath.c | 1 +
+ drivers/nvme/host/nvme.h | 4 +
+ drivers/nvme/host/pci.c | 4 +-
+ drivers/nvme/host/rdma.c | 4 +-
+ drivers/nvme/host/tcp.c | 4 +-
+ drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 5 +-
+ drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 5 +-
+ drivers/scsi/megaraid/megaraid_sas_base.c | 6 +-
+ drivers/scsi/mpi3mr/mpi3mr_os.c | 5 +-
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 5 +-
+ drivers/scsi/pm8001/pm8001_init.c | 2 +-
+ drivers/scsi/qla2xxx/qla_nvme.c | 6 +-
+ drivers/scsi/qla2xxx/qla_os.c | 10 +-
+ drivers/scsi/scsi_debug.c | 7 +-
+ drivers/scsi/scsi_lib.c | 4 +-
+ drivers/scsi/smartpqi/smartpqi_init.c | 6 +-
+ drivers/scsi/virtio_scsi.c | 4 +-
+ drivers/ufs/core/ufshcd.c | 9 +-
+ fs/eventfd.c | 10 +-
+ include/linux/bio.h | 2 +-
+ include/linux/blk-mq-pci.h | 4 +-
+ include/linux/blk-mq-rdma.h | 2 +-
+ include/linux/blk-mq-virtio.h | 2 +-
+ include/linux/blk-mq.h | 13 +-
+ include/linux/blk_types.h | 2 +-
+ include/linux/eventfd.h | 2 +-
+ include/linux/fs.h | 2 +
+ include/linux/io_uring.h | 8 +-
+ include/linux/io_uring_types.h | 4 +
+ include/linux/sbitmap.h | 3 +-
+ include/linux/sched.h | 2 +-
+ include/linux/sed-opal.h | 1 +
+ include/scsi/scsi_host.h | 2 +-
+ include/trace/events/io_uring.h | 29 +++
+ include/uapi/linux/io_uring.h | 7 +
+ include/uapi/linux/sed-opal.h | 13 ++
+ io_uring/cancel.c | 2 +-
+ io_uring/fdinfo.c | 48 +++--
+ io_uring/io_uring.c | 287 ++++++++++++++++++++++++------
+ io_uring/io_uring.h | 42 ++++-
+ io_uring/kbuf.h | 12 --
+ io_uring/net.c | 84 +++++----
+ io_uring/opdef.c | 3 +
+ io_uring/rsrc.c | 2 +-
+ io_uring/rw.c | 148 +++++++--------
+ io_uring/timeout.c | 13 +-
+ io_uring/timeout.h | 2 +-
+ io_uring/uring_cmd.c | 11 +-
+ lib/sbitmap.c | 107 +++++++----
+ 79 files changed, 1286 insertions(+), 550 deletions(-)
+ create mode 100644 drivers/block/rnbd/rnbd-srv-trace.c
+ create mode 100644 drivers/block/rnbd/rnbd-srv-trace.h
+Merging device-mapper/for-next (c8e2f5c3682d dm verity: enable WQ_HIGHPRI on verify_wq)
+$ 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-ioctl.c | 117 +++++++++++++++++++++++----------------
+ drivers/md/dm-raid.c | 2 +-
+ drivers/md/dm-rq.c | 4 +-
+ drivers/md/dm-stats.c | 2 +-
+ drivers/md/dm-table.c | 125 ++++++++++++++++++++++--------------------
+ drivers/md/dm-verity-target.c | 18 +++---
+ drivers/md/dm.c | 8 +--
+ include/linux/device-mapper.h | 3 +-
+ include/uapi/linux/dm-ioctl.h | 14 ++++-
+ 9 files changed, 166 insertions(+), 127 deletions(-)
+Merging libata/for-next (e9892dce44f2 ata: pata_macio: Remove unneeded word in comments)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next
+Auto-merging include/linux/libata.h
+Merge made by the 'ort' strategy.
+ drivers/ata/ahci.c | 5 +---
+ drivers/ata/libata-core.c | 61 ++++++++++++++++++++++-------------------------
+ drivers/ata/libata-sata.c | 6 ++---
+ drivers/ata/libata-scsi.c | 7 +++---
+ drivers/ata/libata.h | 7 +++---
+ drivers/ata/pata_macio.c | 3 +--
+ include/linux/libata.h | 2 +-
+ 7 files changed, 41 insertions(+), 50 deletions(-)
+Merging pcmcia/pcmcia-next (2ef4bb24ff39 pcmcia: Use platform_get_irq() to get the interrupt)
+$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next
+Already up to date.
+Merging mmc/next (627a78b2dec6 mmc: Merge branch fixes into next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/mmc/cdns,sdhci.yaml | 1 -
+ .../devicetree/bindings/mmc/mmc-controller.yaml | 13 +++-
+ .../devicetree/bindings/mmc/mmc-spi-slot.yaml | 2 -
+ Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 1 +
+ .../devicetree/bindings/mmc/renesas,sdhi.yaml | 3 +
+ .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 1 +
+ .../devicetree/bindings/mmc/sdhci-am654.yaml | 3 +
+ .../devicetree/bindings/mmc/sdhci-msm.yaml | 5 ++
+ MAINTAINERS | 4 +-
+ drivers/mmc/core/host.c | 2 +-
+ drivers/mmc/core/sdio.c | 4 +-
+ drivers/mmc/core/sdio_irq.c | 4 +-
+ drivers/mmc/host/au1xmmc.c | 3 +-
+ drivers/mmc/host/jz4740_mmc.c | 4 +-
+ drivers/mmc/host/meson-gx-mmc.c | 84 +++++++++++++++++-----
+ drivers/mmc/host/meson-mx-sdhc-mmc.c | 4 +-
+ drivers/mmc/host/sdhci-pci-o2micro.c | 7 +-
+ drivers/mmc/host/sdhci_am654.c | 5 +-
+ include/linux/mmc/host.h | 2 +-
+ 19 files changed, 108 insertions(+), 44 deletions(-)
+Merging mfd/for-mfd-next (e00e66be677a dt-bindings: mfd: sprd: Add bindings for ums512 global registers)
+$ 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/cirrus,lochnagar.yaml
+Auto-merging Documentation/devicetree/bindings/mfd/syscon.yaml
+Auto-merging Documentation/devicetree/bindings/power/mediatek,power-controller.yaml
+Auto-merging MAINTAINERS
+Auto-merging drivers/hwmon/Kconfig
+CONFLICT (modify/delete): drivers/mfd/intel_soc_pmic_core.c deleted in mfd/for-mfd-next and modified in HEAD. Version HEAD of drivers/mfd/intel_soc_pmic_core.c left in tree.
+Auto-merging drivers/mfd/lp8788.c
+Auto-merging drivers/mfd/rk808.c
+Auto-merging drivers/mfd/twl-core.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/mfd/intel_soc_pmic_core.c
+rm 'drivers/mfd/intel_soc_pmic_core.c'
+$ git commit --no-edit -v -a
+[master f1da79835963] Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/mfd/allwinner,sun6i-a31-prcm.yaml | 40 +++
+ .../bindings/mfd/allwinner,sun8i-a23-prcm.yaml | 10 +
+ .../bindings/mfd/aspeed,ast2x00-scu.yaml | 110 +++++++
+ .../devicetree/bindings/mfd/aspeed-scu.txt | 48 ---
+ .../devicetree/bindings/mfd/cirrus,lochnagar.yaml | 5 +
+ .../devicetree/bindings/mfd/dlg,da9063.yaml | 7 +-
+ .../devicetree/bindings/mfd/gateworks-gsc.yaml | 5 +-
+ .../devicetree/bindings/mfd/maxim,max14577.yaml | 1 +
+ .../devicetree/bindings/mfd/maxim,max77843.yaml | 1 +
+ .../devicetree/bindings/mfd/mediatek,mt6370.yaml | 280 ++++++++++++++++
+ .../bindings/mfd/mediatek,mt8195-scpsys.yaml | 67 ++++
+ .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 114 ++++++-
+ .../devicetree/bindings/mfd/richtek,rt5120.yaml | 178 +++++++++++
+ .../devicetree/bindings/mfd/rockchip,rk817.yaml | 52 +++
+ .../devicetree/bindings/mfd/silergy,sy7636a.yaml | 1 +
+ .../bindings/mfd/sprd,ums512-glbreg.yaml | 71 +++++
+ .../devicetree/bindings/mfd/st,stm32-lptimer.yaml | 4 +
+ .../devicetree/bindings/mfd/st,stm32-timers.yaml | 3 +
+ .../devicetree/bindings/mfd/st,stmfx.yaml | 1 +
+ .../devicetree/bindings/mfd/stericsson,ab8500.yaml | 22 ++
+ Documentation/devicetree/bindings/mfd/syscon.yaml | 17 +-
+ .../devicetree/bindings/mfd/ti,tps65086.yaml | 1 +
+ .../devicetree/bindings/mfd/x-powers,axp152.yaml | 4 +
+ .../bindings/power/mediatek,power-controller.yaml | 2 +-
+ MAINTAINERS | 1 -
+ arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi | 2 +-
+ arch/arm/boot/dts/tegra30-apalis.dtsi | 2 +-
+ arch/arm/boot/dts/tegra30-colibri.dtsi | 2 +-
+ arch/arm/mach-omap1/board-htcherald.c | 9 -
+ drivers/hwmon/Kconfig | 1 +
+ drivers/mfd/Kconfig | 44 ++-
+ drivers/mfd/Makefile | 12 +-
+ drivers/mfd/fsl-imx25-tsadc.c | 34 +-
+ drivers/mfd/htc-i2cpld.c | 61 ++--
+ drivers/mfd/intel-lpss-pci.c | 141 ++++++---
+ drivers/mfd/intel-m10-bmc.c | 1 +
+ drivers/mfd/intel_soc_pmic_chtdc_ti.c | 8 +-
+ drivers/mfd/intel_soc_pmic_core.c | 158 ----------
+ drivers/mfd/intel_soc_pmic_core.h | 25 --
+ drivers/mfd/intel_soc_pmic_crc.c | 141 ++++++++-
+ drivers/mfd/lp8788-irq.c | 3 +
+ drivers/mfd/lp8788.c | 12 +-
+ drivers/mfd/lpc_ich.c | 2 +-
+ drivers/mfd/mfd-core.c | 9 +-
+ drivers/mfd/mt6370.c | 312 ++++++++++++++++++
+ drivers/mfd/mt6370.h | 99 ++++++
+ drivers/mfd/qcom-spmi-pmic.c | 1 +
+ drivers/mfd/rk808.c | 16 +-
+ drivers/mfd/rt5120.c | 124 ++++++++
+ drivers/mfd/stmpe.c | 49 ++-
+ drivers/mfd/twl-core.c | 2 +-
+ drivers/regulator/Kconfig | 1 +
+ drivers/video/backlight/Kconfig | 13 +
+ drivers/video/backlight/Makefile | 1 +
+ drivers/video/backlight/mt6370-backlight.c | 351 +++++++++++++++++++++
+ include/dt-bindings/iio/adc/mediatek,mt6370_adc.h | 18 ++
+ include/linux/htcpld.h | 2 -
+ include/linux/mfd/rk808.h | 91 ++++++
+ 58 files changed, 2391 insertions(+), 401 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mfd/aspeed,ast2x00-scu.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mfd/aspeed-scu.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/mediatek,mt6370.yaml
+ create mode 100644 Documentation/devicetree/bindings/mfd/mediatek,mt8195-scpsys.yaml
+ create mode 100644 Documentation/devicetree/bindings/mfd/richtek,rt5120.yaml
+ create mode 100644 Documentation/devicetree/bindings/mfd/sprd,ums512-glbreg.yaml
+ delete mode 100644 drivers/mfd/intel_soc_pmic_core.c
+ delete mode 100644 drivers/mfd/intel_soc_pmic_core.h
+ create mode 100644 drivers/mfd/mt6370.c
+ create mode 100644 drivers/mfd/mt6370.h
+ create mode 100644 drivers/mfd/rt5120.c
+ create mode 100644 drivers/video/backlight/mt6370-backlight.c
+ create mode 100644 include/dt-bindings/iio/adc/mediatek,mt6370_adc.h
+$ git am -3 ../patches/0001-mfd-fix-up-for-i2c-Make-remove-callback-return-void.patch
+Applying: mfd: fix up for "i2c: Make remove callback return void"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/mfd/intel_soc_pmic_crc.c
+$ git add -A .
+$ git commit -v -a --amend
+[master a6569c4cb801] Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
+ Date: Fri Sep 16 11:11:14 2022 +1000
+Merging backlight/for-backlight-next (e7647de058cb video: backlight: mt6370: Add MediaTek MT6370 support)
+$ 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
+Merge made by the 'ort' strategy.
+ .../leds/backlight/mediatek,mt6370-backlight.yaml | 121 +++++++++++++++++++++
+ 1 file changed, 121 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/leds/backlight/mediatek,mt6370-backlight.yaml
+Merging battery/for-next (55cafd4ba42c power: supply: bq25890: Fix enum conversion in bq25890_power_supply_set_property())
+$ 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
+Auto-merging drivers/power/supply/bq25890_charger.c
+Auto-merging drivers/power/supply/cw2015_battery.c
+CONFLICT (content): Merge conflict in drivers/power/supply/cw2015_battery.c
+Resolved 'drivers/power/supply/cw2015_battery.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 4cdc91871544] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/power/reset/qcom,pon.yaml | 50 ++++++++++++++++--
+ drivers/power/reset/qcom-pon.c | 1 +
+ drivers/power/supply/adp5061.c | 9 ++--
+ drivers/power/supply/bq25890_charger.c | 30 +++++++++++
+ drivers/power/supply/bq27xxx_battery.c | 60 +++++++++++-----------
+ drivers/power/supply/cpcap-charger.c | 2 +-
+ drivers/power/supply/cw2015_battery.c | 13 ++---
+ drivers/power/supply/power_supply_sysfs.c | 2 +-
+ drivers/power/supply/tps65217_charger.c | 2 +-
+ include/linux/power_supply.h | 48 ++++++++++++++---
+ 10 files changed, 161 insertions(+), 56 deletions(-)
+Merging regulator/for-next (663ec13e89b4 Merge remote-tracking branch 'regulator/for-6.1' 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
+Auto-merging Documentation/driver-api/driver-model/devres.rst
+Auto-merging MAINTAINERS
+Auto-merging drivers/regulator/Kconfig
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/regulator/dlg,da9121.yaml | 1 +
+ .../bindings/regulator/maxim,max77802.yaml | 1 +
+ .../bindings/regulator/maxim,max8997.yaml | 1 +
+ .../regulator/mediatek,mt6331-regulator.yaml | 273 +++++++++++
+ .../regulator/mediatek,mt6332-regulator.yaml | 112 +++++
+ .../bindings/regulator/mt6315-regulator.yaml | 1 +
+ .../bindings/regulator/qcom,rpmh-regulator.yaml | 4 +
+ .../bindings/regulator/qcom,smd-rpm-regulator.yaml | 26 +-
+ .../bindings/regulator/qcom,spmi-regulator.yaml | 32 ++
+ .../bindings/regulator/qcom-labibb-regulator.yaml | 16 +
+ .../regulator/richtek,rt4801-regulator.yaml | 1 +
+ .../bindings/regulator/rohm,bd71815-regulator.yaml | 1 +
+ .../devicetree/bindings/regulator/ti,tps65219.yaml | 173 +++++++
+ Documentation/driver-api/driver-model/devres.rst | 11 +
+ MAINTAINERS | 1 +
+ drivers/regulator/Kconfig | 27 ++
+ drivers/regulator/Makefile | 3 +
+ drivers/regulator/bd71815-regulator.c | 7 +-
+ drivers/regulator/bd9576-regulator.c | 17 +-
+ drivers/regulator/core.c | 98 ++--
+ drivers/regulator/devres.c | 164 +++++++
+ drivers/regulator/max597x-regulator.c | 5 +-
+ drivers/regulator/mt6331-regulator.c | 507 +++++++++++++++++++++
+ drivers/regulator/mt6332-regulator.c | 422 +++++++++++++++++
+ drivers/regulator/qcom-rpmh-regulator.c | 17 +-
+ drivers/regulator/qcom_rpm-regulator.c | 24 +-
+ drivers/regulator/qcom_smd-regulator.c | 400 +++++++++-------
+ drivers/regulator/qcom_spmi-regulator.c | 378 +++++++++++----
+ drivers/regulator/tps65219-regulator.c | 413 +++++++++++++++++
+ include/linux/regulator/consumer.h | 27 ++
+ include/linux/regulator/mt6331-regulator.h | 46 ++
+ include/linux/regulator/mt6332-regulator.h | 27 ++
+ 32 files changed, 2880 insertions(+), 356 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/regulator/mediatek,mt6331-regulator.yaml
+ create mode 100644 Documentation/devicetree/bindings/regulator/mediatek,mt6332-regulator.yaml
+ create mode 100644 Documentation/devicetree/bindings/regulator/ti,tps65219.yaml
+ create mode 100644 drivers/regulator/mt6331-regulator.c
+ create mode 100644 drivers/regulator/mt6332-regulator.c
+ create mode 100644 drivers/regulator/tps65219-regulator.c
+ create mode 100644 include/linux/regulator/mt6331-regulator.h
+ create mode 100644 include/linux/regulator/mt6332-regulator.h
+Merging security/next (1e7d8bcbe37d lockdown: ratelimit denial messages)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next
+Auto-merging fs/userfaultfd.c
+Auto-merging include/linux/lsm_hook_defs.h
+Auto-merging include/linux/lsm_hooks.h
+Auto-merging include/linux/security.h
+Auto-merging kernel/bpf/bpf_lsm.c
+Auto-merging security/security.c
+Auto-merging security/selinux/hooks.c
+Auto-merging security/selinux/include/classmap.h
+CONFLICT (content): Merge conflict in security/selinux/include/classmap.h
+Resolved 'security/selinux/include/classmap.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master bef8891af8b3] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git
+$ git diff -M --stat --summary HEAD^..
+ fs/userfaultfd.c | 4 +-
+ include/linux/lsm_hook_defs.h | 1 +
+ include/linux/lsm_hooks.h | 4 +
+ include/linux/security.h | 6 ++
+ kernel/bpf/bpf_lsm.c | 1 +
+ kernel/user_namespace.c | 5 +
+ security/lockdown/lockdown.c | 2 +-
+ security/lsm_audit.c | 14 +--
+ security/security.c | 5 +
+ security/selinux/hooks.c | 9 ++
+ security/selinux/include/classmap.h | 2 +
+ .../selftests/bpf/prog_tests/deny_namespace.c | 102 +++++++++++++++++++++
+ .../selftests/bpf/progs/test_deny_namespace.c | 33 +++++++
+ 13 files changed, 172 insertions(+), 16 deletions(-)
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/deny_namespace.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_deny_namespace.c
+Merging apparmor/apparmor-next (79eb2711c919 apparmor: correct config reference to intended one)
+$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next
+Already up to date.
+Merging integrity/next-integrity (5926586f291b ima: fix blocking of security.ima xattrs of unsupported algorithms)
+$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity
+Merge made by the 'ort' strategy.
+ security/integrity/ima/ima_appraise.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
+$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next
+Already up to date.
+Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest)
+$ 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 (09b71adab095 selinux: remove the unneeded result variable)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next
+Auto-merging security/selinux/hooks.c
+Merge made by the 'ort' strategy.
+ security/selinux/hooks.c | 24 +++++++++---------------
+ security/selinux/selinuxfs.c | 15 ++++++---------
+ security/selinux/ss/context.h | 17 +++++++++--------
+ security/selinux/ss/ebitmap.c | 21 +++++++++++----------
+ security/selinux/ss/ebitmap.h | 18 +++++++++---------
+ security/selinux/ss/mls_types.h | 4 ++--
+ 6 files changed, 46 insertions(+), 53 deletions(-)
+Merging smack/next (f393b3fd2a4b smack: cleanup obsolete mount option flags)
+$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next
+Auto-merging security/smack/smack_lsm.c
+Merge made by the 'ort' strategy.
+ security/smack/smack.h | 9 ---------
+ security/smack/smack_lsm.c | 20 +++++++++++++++++---
+ 2 files changed, 17 insertions(+), 12 deletions(-)
+Merging tomoyo/master (841b171b4534 locking/lockdep: add debug_show_all_lock_holders())
+$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master
+Merge made by the 'ort' strategy.
+ include/linux/debug_locks.h | 5 +++++
+ kernel/hung_task.c | 2 +-
+ kernel/locking/lockdep.c | 32 ++++++++++++++++++++++++++++++++
+ 3 files changed, 38 insertions(+), 1 deletion(-)
+Merging tpmdd/next (863ed94c589f tpm: Add check for Failure mode for TPM2 modules)
+$ 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 (b90cb1053190 Linux 6.0-rc3)
+$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master
+Already up to date.
+Merging iommu/next (d154e4a92f79 Merge branches 'iommu/fixes', 'arm/omap', 'virtio', 'x86/amd' and 'core' into next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging MAINTAINERS
+Auto-merging arch/arm64/Kconfig
+Auto-merging drivers/irqchip/irq-gic-v3-its.c
+Auto-merging drivers/vfio/vfio_iommu_type1.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 2 +
+ MAINTAINERS | 2 +-
+ arch/arm64/Kconfig | 1 -
+ arch/arm64/mm/dma-mapping.c | 2 +-
+ drivers/acpi/viot.c | 1 -
+ drivers/gpu/drm/exynos/exynos_drm_dma.c | 1 -
+ drivers/iommu/Kconfig | 3 +-
+ drivers/iommu/amd/Kconfig | 1 -
+ drivers/iommu/amd/Makefile | 2 +-
+ drivers/iommu/amd/amd_iommu.h | 1 -
+ drivers/iommu/amd/amd_iommu_types.h | 8 +-
+ drivers/iommu/amd/init.c | 45 ++-
+ drivers/iommu/amd/io_pgtable.c | 76 +++--
+ drivers/iommu/amd/io_pgtable_v2.c | 415 ++++++++++++++++++++++++
+ drivers/iommu/amd/iommu.c | 146 +++++----
+ drivers/iommu/apple-dart.c | 33 +-
+ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 62 +---
+ drivers/iommu/arm/arm-smmu/arm-smmu.c | 97 +-----
+ drivers/iommu/arm/arm-smmu/qcom_iommu.c | 6 +-
+ drivers/iommu/dma-iommu.c | 18 +-
+ drivers/iommu/dma-iommu.h | 42 +++
+ drivers/iommu/exynos-iommu.c | 9 -
+ drivers/iommu/fsl_pamu_domain.c | 6 +-
+ drivers/iommu/intel/Kconfig | 1 -
+ drivers/iommu/intel/iommu.c | 8 +-
+ drivers/iommu/io-pgtable-arm.c | 8 +-
+ drivers/iommu/io-pgtable.c | 1 +
+ drivers/iommu/iommu.c | 154 ++++-----
+ drivers/iommu/iova.c | 13 +-
+ drivers/iommu/ipmmu-vmsa.c | 35 +-
+ drivers/iommu/msm_iommu.c | 2 -
+ drivers/iommu/mtk_iommu.c | 24 +-
+ drivers/iommu/mtk_iommu_v1.c | 13 +-
+ drivers/iommu/omap-iommu-debug.c | 6 +-
+ drivers/iommu/omap-iommu.c | 6 -
+ drivers/iommu/rockchip-iommu.c | 2 -
+ drivers/iommu/s390-iommu.c | 15 +-
+ drivers/iommu/sprd-iommu.c | 5 -
+ drivers/iommu/sun50i-iommu.c | 2 -
+ drivers/iommu/tegra-smmu.c | 29 +-
+ drivers/iommu/virtio-iommu.c | 32 +-
+ drivers/irqchip/irq-gic-v2m.c | 2 +-
+ drivers/irqchip/irq-gic-v3-its.c | 2 +-
+ drivers/irqchip/irq-gic-v3-mbi.c | 2 +-
+ drivers/irqchip/irq-ls-scfg-msi.c | 2 +-
+ drivers/vfio/vfio_iommu_type1.c | 1 -
+ include/linux/dma-iommu.h | 93 ------
+ include/linux/io-pgtable.h | 2 +
+ include/linux/iommu.h | 47 ++-
+ 49 files changed, 813 insertions(+), 673 deletions(-)
+ create mode 100644 drivers/iommu/amd/io_pgtable_v2.c
+ create mode 100644 drivers/iommu/dma-iommu.h
+ delete mode 100644 include/linux/dma-iommu.h
+Merging audit/next (934f70d9d498 audit: remove selinux_audit_rule_update() declaration)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next
+Auto-merging kernel/auditsc.c
+Merge made by the 'ort' strategy.
+ kernel/audit.c | 8 +++-----
+ kernel/audit.h | 4 +---
+ kernel/auditsc.c | 10 +++++-----
+ 3 files changed, 9 insertions(+), 13 deletions(-)
+Merging devicetree/for-next (a607a850ba1f dt-bindings: nvmem: u-boot,env: add basic NVMEM cells)
+$ 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/arm/amlogic.yaml
+Auto-merging Documentation/devicetree/bindings/arm/atmel-at91.yaml
+Auto-merging Documentation/devicetree/bindings/arm/fsl.yaml
+Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml
+Auto-merging Documentation/devicetree/bindings/arm/renesas.yaml
+Auto-merging Documentation/devicetree/bindings/arm/rockchip.yaml
+Auto-merging Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml
+Auto-merging Documentation/devicetree/bindings/display/msm/gpu.yaml
+Auto-merging Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml
+Auto-merging Documentation/devicetree/bindings/input/mediatek,mt6779-keypad.yaml
+Auto-merging Documentation/devicetree/bindings/interconnect/fsl,imx8m-noc.yaml
+Auto-merging Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
+Auto-merging Documentation/devicetree/bindings/memory-controllers/fsl/imx8m-ddrc.yaml
+Auto-merging Documentation/devicetree/bindings/mfd/allwinner,sun6i-a31-prcm.yaml
+Auto-merging Documentation/devicetree/bindings/mfd/allwinner,sun8i-a23-prcm.yaml
+Auto-merging Documentation/devicetree/bindings/mfd/khadas,mcu.yaml
+Auto-merging Documentation/devicetree/bindings/mfd/syscon.yaml
+Auto-merging Documentation/devicetree/bindings/mfd/x-powers,axp152.yaml
+Auto-merging Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml
+Auto-merging Documentation/devicetree/bindings/net/snps,dwmac.yaml
+Auto-merging Documentation/devicetree/bindings/net/sunplus,sp7021-emac.yaml
+Auto-merging Documentation/devicetree/bindings/net/ti,cpsw-switch.yaml
+Auto-merging Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
+Auto-merging Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml
+Auto-merging Documentation/devicetree/bindings/net/vertexcom-mse102x.yaml
+Auto-merging Documentation/devicetree/bindings/pci/microchip,pcie-host.yaml
+Auto-merging Documentation/devicetree/bindings/sound/adi,max98396.yaml
+Auto-merging Documentation/devicetree/bindings/sound/audio-graph.yaml
+Auto-merging Documentation/devicetree/bindings/sound/renesas,rsnd.yaml
+Auto-merging Documentation/devicetree/bindings/usb/mediatek,mtu3.yaml
+Auto-merging MAINTAINERS
+Auto-merging drivers/of/base.c
+Auto-merging drivers/of/fdt.c
+Auto-merging drivers/of/unittest.c
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/actions.yaml | 2 +-
+ Documentation/devicetree/bindings/arm/airoha.yaml | 2 +-
+ Documentation/devicetree/bindings/arm/altera.yaml | 2 +-
+ .../devicetree/bindings/arm/amazon,al.yaml | 2 +-
+ Documentation/devicetree/bindings/arm/amlogic.yaml | 2 +-
+ Documentation/devicetree/bindings/arm/apple.yaml | 2 +-
+ .../devicetree/bindings/arm/arm,cci-400.yaml | 2 +-
+ .../devicetree/bindings/arm/arm,corstone1000.yaml | 2 +-
+ .../devicetree/bindings/arm/arm,integrator.yaml | 2 +-
+ .../devicetree/bindings/arm/arm,realview.yaml | 2 +-
+ .../bindings/arm/arm,versatile-sysreg.yaml | 35 +++++
+ .../devicetree/bindings/arm/arm,versatile.yaml | 2 +-
+ .../devicetree/bindings/arm/arm,vexpress-juno.yaml | 2 +-
+ .../devicetree/bindings/arm/atmel-at91.yaml | 2 +-
+ Documentation/devicetree/bindings/arm/axxia.yaml | 2 +-
+ Documentation/devicetree/bindings/arm/bitmain.yaml | 2 +-
+ Documentation/devicetree/bindings/arm/calxeda.yaml | 2 +-
+ .../devicetree/bindings/arm/digicolor.yaml | 2 +-
+ Documentation/devicetree/bindings/arm/fsl.yaml | 2 +-
+ .../devicetree/bindings/arm/intel,keembay.yaml | 2 +-
+ .../devicetree/bindings/arm/intel,socfpga.yaml | 2 +-
+ .../devicetree/bindings/arm/intel-ixp4xx.yaml | 2 +-
+ .../devicetree/bindings/arm/mediatek.yaml | 2 +-
+ .../devicetree/bindings/arm/microchip,sparx5.yaml | 2 +-
+ Documentation/devicetree/bindings/arm/moxart.yaml | 2 +-
+ .../bindings/arm/nvidia,tegra194-ccplex.yaml | 2 +-
+ Documentation/devicetree/bindings/arm/psci.yaml | 11 +-
+ Documentation/devicetree/bindings/arm/qcom.yaml | 2 +-
+ Documentation/devicetree/bindings/arm/rda.yaml | 2 +-
+ Documentation/devicetree/bindings/arm/realtek.yaml | 2 +-
+ Documentation/devicetree/bindings/arm/renesas.yaml | 2 +-
+ .../devicetree/bindings/arm/rockchip.yaml | 2 +-
+ .../socionext/socionext,uniphier-system-cache.yaml | 1 -
+ Documentation/devicetree/bindings/arm/spear.yaml | 2 +-
+ Documentation/devicetree/bindings/arm/sti.yaml | 2 +-
+ Documentation/devicetree/bindings/arm/sunxi.yaml | 2 +-
+ Documentation/devicetree/bindings/arm/tegra.yaml | 2 +-
+ Documentation/devicetree/bindings/arm/tesla.yaml | 2 +-
+ Documentation/devicetree/bindings/arm/toshiba.yaml | 2 +-
+ Documentation/devicetree/bindings/arm/ux500.yaml | 2 +-
+ .../devicetree/bindings/arm/versatile-sysreg.txt | 10 --
+ Documentation/devicetree/bindings/arm/vt8500.yaml | 2 +-
+ Documentation/devicetree/bindings/arm/xilinx.yaml | 2 +-
+ .../devicetree/bindings/ata/brcm,sata-brcm.yaml | 1 -
+ .../bindings/ata/cortina,gemini-sata-bridge.yaml | 2 -
+ .../devicetree/bindings/ata/sata_highbank.yaml | 1 -
+ .../bindings/bus/allwinner,sun50i-a64-de2.yaml | 2 +-
+ .../bindings/bus/allwinner,sun8i-a23-rsb.yaml | 2 +-
+ Documentation/devicetree/bindings/bus/palmbus.yaml | 2 +-
+ .../bindings/clock/airoha,en7523-scu.yaml | 2 +-
+ .../clock/allwinner,sun4i-a10-ahb-clk.yaml | 2 +-
+ .../clock/allwinner,sun4i-a10-apb0-clk.yaml | 2 +-
+ .../clock/allwinner,sun4i-a10-apb1-clk.yaml | 2 +-
+ .../clock/allwinner,sun4i-a10-axi-clk.yaml | 2 +-
+ .../bindings/clock/allwinner,sun4i-a10-ccu.yaml | 2 +-
+ .../clock/allwinner,sun4i-a10-cpu-clk.yaml | 2 +-
+ .../clock/allwinner,sun4i-a10-display-clk.yaml | 2 +-
+ .../clock/allwinner,sun4i-a10-gates-clk.yaml | 2 +-
+ .../clock/allwinner,sun4i-a10-mbus-clk.yaml | 2 +-
+ .../clock/allwinner,sun4i-a10-mmc-clk.yaml | 2 +-
+ .../clock/allwinner,sun4i-a10-mod0-clk.yaml | 2 +-
+ .../clock/allwinner,sun4i-a10-mod1-clk.yaml | 2 +-
+ .../clock/allwinner,sun4i-a10-osc-clk.yaml | 2 +-
+ .../clock/allwinner,sun4i-a10-pll1-clk.yaml | 2 +-
+ .../clock/allwinner,sun4i-a10-pll3-clk.yaml | 2 +-
+ .../clock/allwinner,sun4i-a10-pll5-clk.yaml | 2 +-
+ .../clock/allwinner,sun4i-a10-pll6-clk.yaml | 2 +-
+ .../clock/allwinner,sun4i-a10-tcon-ch0-clk.yaml | 2 +-
+ .../clock/allwinner,sun4i-a10-usb-clk.yaml | 2 +-
+ .../bindings/clock/allwinner,sun4i-a10-ve-clk.yaml | 2 +-
+ .../clock/allwinner,sun5i-a13-ahb-clk.yaml | 2 +-
+ .../clock/allwinner,sun6i-a31-pll6-clk.yaml | 2 +-
+ .../clock/allwinner,sun7i-a20-gmac-clk.yaml | 2 +-
+ .../clock/allwinner,sun7i-a20-out-clk.yaml | 2 +-
+ .../clock/allwinner,sun8i-a83t-de2-clk.yaml | 2 +-
+ .../clock/allwinner,sun8i-h3-bus-gates-clk.yaml | 2 +-
+ .../clock/allwinner,sun9i-a80-ahb-clk.yaml | 2 +-
+ .../clock/allwinner,sun9i-a80-apb0-clk.yaml | 2 +-
+ .../clock/allwinner,sun9i-a80-cpus-clk.yaml | 2 +-
+ .../clock/allwinner,sun9i-a80-de-clks.yaml | 2 +-
+ .../bindings/clock/allwinner,sun9i-a80-gt-clk.yaml | 2 +-
+ .../clock/allwinner,sun9i-a80-mmc-config-clk.yaml | 2 +-
+ .../clock/allwinner,sun9i-a80-pll4-clk.yaml | 2 +-
+ .../clock/allwinner,sun9i-a80-usb-clks.yaml | 2 +-
+ .../clock/allwinner,sun9i-a80-usb-mod-clk.yaml | 2 +-
+ .../clock/allwinner,sun9i-a80-usb-phy-clk.yaml | 2 +-
+ .../bindings/clock/amlogic,meson8-ddr-clkc.yaml | 2 +-
+ .../bindings/clock/brcm,bcm2711-dvp.yaml | 2 +-
+ .../devicetree/bindings/clock/canaan,k210-clk.yaml | 2 +-
+ .../bindings/clock/mediatek,mt7621-sysc.yaml | 2 +-
+ .../bindings/clock/sprd,sc9863a-clk.yaml | 2 +-
+ .../bindings/clock/toshiba,tmpv770x-pipllct.yaml | 2 +-
+ .../bindings/clock/toshiba,tmpv770x-pismu.yaml | 2 +-
+ .../crypto/allwinner,sun4i-a10-crypto.yaml | 2 +-
+ .../bindings/crypto/intel,keembay-ocs-aes.yaml | 2 +-
+ .../bindings/crypto/intel,keembay-ocs-ecc.yaml | 2 +-
+ .../bindings/crypto/intel,keembay-ocs-hcu.yaml | 2 +-
+ .../bindings/crypto/samsung-slimsss.yaml | 1 -
+ .../devicetree/bindings/crypto/ti,sa2ul.yaml | 13 --
+ .../bindings/crypto/xlnx,zynqmp-aes.yaml | 2 +-
+ .../allwinner,sun4i-a10-display-backend.yaml | 2 +-
+ .../allwinner,sun4i-a10-display-engine.yaml | 2 +-
+ .../allwinner,sun4i-a10-display-frontend.yaml | 2 +-
+ .../bindings/display/allwinner,sun4i-a10-hdmi.yaml | 2 +-
+ .../bindings/display/allwinner,sun4i-a10-tcon.yaml | 2 +-
+ .../display/allwinner,sun4i-a10-tv-encoder.yaml | 2 +-
+ .../bindings/display/allwinner,sun6i-a31-drc.yaml | 2 +-
+ .../display/allwinner,sun6i-a31-mipi-dsi.yaml | 2 +-
+ .../display/allwinner,sun8i-a83t-de2-mixer.yaml | 2 +-
+ .../display/allwinner,sun8i-a83t-dw-hdmi.yaml | 2 +-
+ .../display/allwinner,sun8i-a83t-hdmi-phy.yaml | 2 +-
+ .../display/allwinner,sun8i-r40-tcon-top.yaml | 2 +-
+ .../bindings/display/allwinner,sun9i-a80-deu.yaml | 2 +-
+ .../devicetree/bindings/display/arm,komeda.yaml | 1 +
+ .../bindings/display/brcm,bcm2711-hdmi.yaml | 2 +-
+ .../bindings/display/bridge/adi,adv7511.yaml | 14 +-
+ .../bindings/display/bridge/adi,adv7533.yaml | 14 +-
+ .../bindings/display/bridge/fsl,ldb.yaml | 1 -
+ .../bindings/display/bridge/lvds-codec.yaml | 1 +
+ .../bindings/display/bridge/synopsys,dw-hdmi.yaml | 1 -
+ .../bindings/display/ilitek,ili9486.yaml | 2 +-
+ .../bindings/display/msm/dsi-controller-main.yaml | 2 -
+ .../bindings/display/msm/dsi-phy-10nm.yaml | 2 -
+ .../devicetree/bindings/display/msm/gpu.yaml | 1 +
+ .../display/panel/arm,versatile-tft-panel.yaml | 3 -
+ .../display/samsung/samsung,exynos5433-decon.yaml | 2 -
+ .../display/samsung/samsung,exynos5433-mic.yaml | 1 -
+ .../display/samsung/samsung,exynos7-decon.yaml | 2 +-
+ .../bindings/display/samsung/samsung,fimd.yaml | 2 +-
+ .../bindings/display/simple-framebuffer.yaml | 2 +-
+ .../bindings/display/sitronix,st7735r.yaml | 2 +-
+ .../display/tegra/nvidia,tegra20-gr3d.yaml | 1 -
+ .../bindings/display/tegra/nvidia,tegra20-mpe.yaml | 2 -
+ .../bindings/dma/allwinner,sun4i-a10-dma.yaml | 2 +-
+ .../bindings/dma/allwinner,sun50i-a64-dma.yaml | 2 +-
+ .../bindings/dma/allwinner,sun6i-a31-dma.yaml | 2 +-
+ .../bindings/dma/nvidia,tegra186-gpc-dma.yaml | 2 +-
+ .../bindings/fpga/xilinx-zynq-fpga-mgr.yaml | 2 +-
+ .../bindings/fpga/xlnx,zynqmp-pcap-fpga.yaml | 2 +-
+ .../devicetree/bindings/gnss/brcm,bcm4751.yaml | 2 +-
+ .../devicetree/bindings/gnss/mediatek.yaml | 2 +-
+ .../devicetree/bindings/gnss/sirfstar.yaml | 2 +-
+ .../devicetree/bindings/gnss/u-blox,neo-6m.yaml | 2 +-
+ .../devicetree/bindings/gpio/gpio-zynq.yaml | 2 +-
+ .../bindings/gpio/microchip,mpfs-gpio.yaml | 2 +-
+ .../bindings/gpio/x-powers,axp209-gpio.yaml | 2 +-
+ .../devicetree/bindings/gpu/arm,mali-midgard.yaml | 3 +-
+ .../devicetree/bindings/gpu/arm,mali-utgard.yaml | 3 +-
+ .../bindings/hwmon/adi,axi-fan-control.yaml | 2 +-
+ .../devicetree/bindings/hwmon/iio-hwmon.yaml | 2 +-
+ .../bindings/i2c/allwinner,sun6i-a31-p2wi.yaml | 2 +-
+ .../devicetree/bindings/i2c/aspeed,i2c.yaml | 2 +-
+ .../devicetree/bindings/i2c/cdns,i2c-r1p10.yaml | 2 +-
+ .../bindings/i2c/marvell,mv64xxx-i2c.yaml | 2 +-
+ .../devicetree/bindings/i2c/microchip,corei2c.yaml | 2 +-
+ .../bindings/i2c/nuvoton,npcm7xx-i2c.yaml | 2 +-
+ .../bindings/i2c/xlnx,xps-iic-2.00.a.yaml | 2 +-
+ .../devicetree/bindings/i3c/mipi-i3c-hci.yaml | 2 +-
+ .../input/allwinner,sun4i-a10-lradc-keys.yaml | 2 +-
+ .../devicetree/bindings/input/imx-keypad.yaml | 2 +-
+ .../bindings/input/mediatek,mt6779-keypad.yaml | 2 +-
+ .../bindings/input/regulator-haptic.yaml | 2 +-
+ .../bindings/input/sprd,sc27xx-vibrator.yaml | 2 +-
+ .../bindings/interconnect/fsl,imx8m-noc.yaml | 3 +-
+ .../bindings/interconnect/mediatek,cci.yaml | 3 +-
+ .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 3 +-
+ .../allwinner,sun4i-a10-ic.yaml | 2 +-
+ .../allwinner,sun6i-a31-r-intc.yaml | 2 +-
+ .../allwinner,sun7i-a20-sc-nmi.yaml | 2 +-
+ .../bindings/interrupt-controller/arm,gic-v3.yaml | 1 -
+ .../bindings/interrupt-controller/arm,gic.yaml | 4 +-
+ .../interrupt-controller/idt,32434-pic.yaml | 2 +-
+ .../bindings/interrupt-controller/qcom,pdc.txt | 78 -----------
+ .../bindings/interrupt-controller/qcom,pdc.yaml | 87 +++++++++++++
+ .../interrupt-controller/st,stm32-exti.yaml | 2 +-
+ .../bindings/iommu/allwinner,sun50i-h6-iommu.yaml | 2 +-
+ .../bindings/leds/backlight/qcom-wled.yaml | 9 +-
+ .../devicetree/bindings/media/allegro,al5e.yaml | 2 +-
+ .../bindings/media/allwinner,sun4i-a10-csi.yaml | 2 +-
+ .../bindings/media/allwinner,sun4i-a10-ir.yaml | 2 +-
+ .../media/allwinner,sun4i-a10-video-engine.yaml | 2 +-
+ .../bindings/media/allwinner,sun6i-a31-csi.yaml | 2 +-
+ .../media/allwinner,sun6i-a31-mipi-csi2.yaml | 2 +-
+ .../media/allwinner,sun8i-a83t-de2-rotate.yaml | 2 +-
+ .../media/allwinner,sun8i-a83t-mipi-csi2.yaml | 2 +-
+ .../media/allwinner,sun8i-h3-deinterlace.yaml | 2 +-
+ .../bindings/media/mediatek-jpeg-decoder.yaml | 2 +-
+ .../bindings/media/mediatek-jpeg-encoder.yaml | 2 +-
+ .../bindings/media/microchip,csi2dc.yaml | 2 +
+ .../devicetree/bindings/media/nxp,imx8-jpeg.yaml | 2 +-
+ .../bindings/media/qcom,msm8916-venus.yaml | 1 +
+ .../bindings/media/qcom,msm8996-venus.yaml | 1 +
+ .../bindings/media/qcom,sc7180-venus.yaml | 1 +
+ .../bindings/media/qcom,sc7280-venus.yaml | 1 +
+ .../bindings/media/qcom,sdm660-venus.yaml | 1 +
+ .../bindings/media/qcom,sdm845-venus-v2.yaml | 1 +
+ .../bindings/media/qcom,sdm845-venus.yaml | 1 +
+ .../bindings/media/qcom,sm8250-venus.yaml | 1 +
+ Documentation/devicetree/bindings/media/rc.yaml | 2 +-
+ .../devicetree/bindings/media/rockchip,vdec.yaml | 2 +-
+ .../devicetree/bindings/media/ti,cal.yaml | 2 +-
+ .../devicetree/bindings/media/ti,vpe.yaml | 2 +-
+ .../memory-controllers/fsl/imx8m-ddrc.yaml | 3 +-
+ .../bindings/mfd/allwinner,sun4i-a10-ts.yaml | 2 +-
+ .../bindings/mfd/allwinner,sun6i-a31-prcm.yaml | 2 +-
+ .../bindings/mfd/allwinner,sun8i-a23-prcm.yaml | 2 +-
+ .../bindings/mfd/brcm,bcm6318-gpio-sysctl.yaml | 2 +-
+ .../bindings/mfd/brcm,bcm63268-gpio-sysctl.yaml | 2 +-
+ .../bindings/mfd/brcm,bcm6328-gpio-sysctl.yaml | 2 +-
+ .../bindings/mfd/brcm,bcm6358-gpio-sysctl.yaml | 2 +-
+ .../bindings/mfd/brcm,bcm6362-gpio-sysctl.yaml | 2 +-
+ .../bindings/mfd/brcm,bcm6368-gpio-sysctl.yaml | 2 +-
+ .../bindings/mfd/canaan,k210-sysctl.yaml | 2 +-
+ .../devicetree/bindings/mfd/khadas,mcu.yaml | 2 +-
+ Documentation/devicetree/bindings/mfd/syscon.yaml | 2 +-
+ .../bindings/mfd/ti,j721e-system-controller.yaml | 2 +-
+ .../devicetree/bindings/mfd/x-powers,ac100.yaml | 2 +-
+ .../devicetree/bindings/mfd/x-powers,axp152.yaml | 2 +-
+ Documentation/devicetree/bindings/mips/ralink.yaml | 2 +-
+ .../devicetree/bindings/mips/realtek-rtl.yaml | 2 +-
+ .../devicetree/bindings/misc/qcom,fastrpc.txt | 88 -------------
+ .../devicetree/bindings/misc/qcom,fastrpc.yaml | 144 +++++++++++++++++++++
+ .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 2 +-
+ .../bindings/mmc/amlogic,meson-mx-sdhc.yaml | 2 +-
+ .../devicetree/bindings/mmc/mmc-card.yaml | 2 +-
+ .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 2 +-
+ .../bindings/mtd/allwinner,sun4i-a10-nand.yaml | 2 +-
+ .../bindings/mtd/arasan,nand-controller.yaml | 2 +-
+ .../bindings/mtd/arm,pl353-nand-r2p1.yaml | 2 +-
+ .../devicetree/bindings/mtd/intel,lgm-nand.yaml | 2 +-
+ Documentation/devicetree/bindings/mtd/mtd.yaml | 2 +-
+ .../bindings/mtd/mxicy,nand-ecc-engine.yaml | 2 +-
+ .../devicetree/bindings/mtd/renesas-nandc.yaml | 2 +-
+ .../devicetree/bindings/mtd/spi-nand.yaml | 2 +-
+ .../bindings/net/allwinner,sun4i-a10-emac.yaml | 2 +-
+ .../bindings/net/allwinner,sun4i-a10-mdio.yaml | 2 +-
+ .../bindings/net/allwinner,sun7i-a20-gmac.yaml | 2 +-
+ .../bindings/net/allwinner,sun8i-a83t-emac.yaml | 2 +-
+ .../devicetree/bindings/net/brcm,amac.yaml | 2 +-
+ .../devicetree/bindings/net/intel,dwmac-plat.yaml | 2 +-
+ .../devicetree/bindings/net/nxp,dwmac-imx.yaml | 2 +-
+ .../devicetree/bindings/net/qcom,ipq4019-mdio.yaml | 2 +-
+ .../devicetree/bindings/net/realtek-bluetooth.yaml | 2 +-
+ .../devicetree/bindings/net/snps,dwmac.yaml | 2 +-
+ .../bindings/net/sunplus,sp7021-emac.yaml | 2 +-
+ .../devicetree/bindings/net/ti,cpsw-switch.yaml | 2 +-
+ .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 2 +-
+ .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 2 +-
+ .../devicetree/bindings/net/vertexcom-mse102x.yaml | 2 +-
+ .../bindings/nvmem/allwinner,sun4i-a10-sid.yaml | 2 +-
+ .../devicetree/bindings/nvmem/imx-iim.yaml | 2 +-
+ .../devicetree/bindings/nvmem/imx-ocotp.yaml | 2 +-
+ .../devicetree/bindings/nvmem/nintendo-otp.yaml | 2 +-
+ .../devicetree/bindings/nvmem/nvmem-consumer.yaml | 2 +-
+ Documentation/devicetree/bindings/nvmem/nvmem.yaml | 2 +-
+ .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 2 +
+ .../devicetree/bindings/nvmem/rockchip-efuse.yaml | 2 +-
+ .../devicetree/bindings/nvmem/u-boot,env.yaml | 13 ++
+ .../opp/allwinner,sun50i-h6-operating-points.yaml | 2 +-
+ .../devicetree/bindings/pci/brcm,stb-pcie.yaml | 2 +-
+ .../bindings/pci/microchip,pcie-host.yaml | 2 +-
+ .../bindings/pci/samsung,exynos-pcie.yaml | 2 +-
+ .../bindings/pci/toshiba,visconti-pcie.yaml | 2 +-
+ .../devicetree/bindings/peci/peci-aspeed.yaml | 2 +-
+ .../devicetree/bindings/peci/peci-controller.yaml | 2 +-
+ .../bindings/phy/allwinner,sun4i-a10-usb-phy.yaml | 2 +-
+ .../bindings/phy/allwinner,sun50i-a64-usb-phy.yaml | 2 +-
+ .../bindings/phy/allwinner,sun50i-h6-usb-phy.yaml | 2 +-
+ .../bindings/phy/allwinner,sun5i-a13-usb-phy.yaml | 2 +-
+ .../phy/allwinner,sun6i-a31-mipi-dphy.yaml | 2 +-
+ .../bindings/phy/allwinner,sun6i-a31-usb-phy.yaml | 2 +-
+ .../bindings/phy/allwinner,sun8i-a23-usb-phy.yaml | 2 +-
+ .../bindings/phy/allwinner,sun8i-a83t-usb-phy.yaml | 2 +-
+ .../bindings/phy/allwinner,sun8i-h3-usb-phy.yaml | 2 +-
+ .../bindings/phy/allwinner,sun8i-r40-usb-phy.yaml | 2 +-
+ .../bindings/phy/allwinner,sun8i-v3s-usb-phy.yaml | 2 +-
+ .../bindings/phy/allwinner,sun9i-a80-usb-phy.yaml | 2 +-
+ .../devicetree/bindings/phy/cdns,dphy-rx.yaml | 2 +-
+ .../devicetree/bindings/phy/cdns,dphy.yaml | 2 +-
+ .../devicetree/bindings/phy/fsl,imx8-pcie-phy.yaml | 2 +-
+ .../bindings/phy/hisilicon,hi3660-usb3.yaml | 22 +---
+ .../bindings/phy/hisilicon,hi3670-usb3.yaml | 26 ++--
+ .../bindings/phy/intel,lgm-emmc-phy.yaml | 2 +-
+ .../devicetree/bindings/phy/intel,lgm-usb-phy.yaml | 2 +-
+ .../bindings/phy/lantiq,vrx200-pcie-phy.yaml | 2 +-
+ .../bindings/phy/mediatek,mt7621-pci-phy.yaml | 2 +-
+ .../devicetree/bindings/phy/mediatek,tphy.yaml | 2 +-
+ .../devicetree/bindings/phy/mediatek,xsphy.yaml | 2 +-
+ .../bindings/phy/phy-rockchip-naneng-combphy.yaml | 2 +-
+ .../bindings/phy/rockchip-inno-csi-dphy.yaml | 2 +-
+ .../bindings/phy/rockchip-mipi-dphy-rx0.yaml | 2 +-
+ .../bindings/phy/samsung,exynos-pcie-phy.yaml | 2 +-
+ .../devicetree/bindings/phy/samsung,ufs-phy.yaml | 2 +-
+ .../devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml | 2 +-
+ .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 2 +-
+ .../bindings/pinctrl/canaan,k210-fpioa.yaml | 2 +-
+ .../bindings/pinctrl/intel,pinctrl-keembay.yaml | 2 +-
+ .../bindings/pinctrl/intel,pinctrl-thunderbay.yaml | 2 +-
+ .../bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml | 2 +-
+ .../bindings/pinctrl/mediatek,mt6779-pinctrl.yaml | 2 +-
+ .../bindings/pinctrl/mediatek,mt6797-pinctrl.yaml | 2 +-
+ .../bindings/pinctrl/mediatek,mt7622-pinctrl.yaml | 2 +-
+ .../bindings/pinctrl/mediatek,mt7986-pinctrl.yaml | 2 +-
+ .../bindings/pinctrl/mediatek,mt8183-pinctrl.yaml | 2 +-
+ .../bindings/pinctrl/starfive,jh7100-pinctrl.yaml | 2 +-
+ .../bindings/pinctrl/sunplus,sp7021-pinctrl.yaml | 2 +-
+ .../bindings/power/domain-idle-state.yaml | 10 ++
+ .../devicetree/bindings/power/fsl,imx-gpc.yaml | 14 ++
+ .../devicetree/bindings/power/fsl,imx-gpcv2.yaml | 14 ++
+ .../devicetree/bindings/ptp/ptp-idt82p33.yaml | 2 +-
+ .../devicetree/bindings/ptp/ptp-idtcm.yaml | 2 +-
+ .../bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 2 +-
+ .../devicetree/bindings/pwm/intel,keembay-pwm.yaml | 2 +-
+ .../devicetree/bindings/pwm/mediatek,pwm-disp.yaml | 2 +-
+ .../bindings/regulator/silergy,sy8106a.yaml | 2 +-
+ .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 1 +
+ .../bindings/remoteproc/qcom,glink-edge.yaml | 8 +-
+ .../bindings/remoteproc/qcom,pil-info.yaml | 2 +-
+ .../bindings/remoteproc/qcom,sc7180-mss-pil.yaml | 1 +
+ .../bindings/remoteproc/qcom,sc7280-mss-pil.yaml | 1 +
+ .../bindings/remoteproc/qcom,sc7280-wpss-pil.yaml | 1 +
+ .../bindings/remoteproc/qcom,smd-edge.yaml | 34 ++++-
+ .../bindings/reserved-memory/google,open-dice.yaml | 2 +-
+ .../bindings/reserved-memory/memory-region.yaml | 2 +-
+ .../reserved-memory/nvidia,tegra210-emc-table.yaml | 2 +-
+ .../bindings/reserved-memory/reserved-memory.yaml | 2 +-
+ .../reset/allwinner,sun6i-a31-clock-reset.yaml | 2 +-
+ .../devicetree/bindings/reset/canaan,k210-rst.yaml | 2 +-
+ .../bindings/reset/starfive,jh7100-reset.yaml | 2 +-
+ .../devicetree/bindings/riscv/microchip.yaml | 2 +-
+ .../devicetree/bindings/rng/omap_rng.yaml | 11 --
+ .../bindings/rtc/allwinner,sun4i-a10-rtc.yaml | 2 +-
+ .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 2 +-
+ .../bindings/rtc/atmel,at91rm9200-rtc.yaml | 2 +-
+ .../bindings/rtc/atmel,at91sam9260-rtt.yaml | 2 +-
+ .../bindings/rtc/microchip,mfps-rtc.yaml | 2 +-
+ .../bindings/rtc/microcrystal,rv3032.yaml | 2 +-
+ .../devicetree/bindings/rtc/mstar,msc313-rtc.yaml | 2 +-
+ .../devicetree/bindings/serial/cdns,uart.yaml | 2 +-
+ .../bindings/serial/sunplus,sp7021-uart.yaml | 2 +-
+ .../bindings/serio/allwinner,sun4i-a10-ps2.yaml | 2 +-
+ .../devicetree/bindings/soc/qcom/qcom,smd.yaml | 29 +----
+ .../devicetree/bindings/sound/adi,max98396.yaml | 2 +-
+ .../devicetree/bindings/sound/ak4375.yaml | 2 +-
+ .../devicetree/bindings/sound/ak4613.yaml | 2 +-
+ .../devicetree/bindings/sound/ak4642.yaml | 2 +-
+ .../bindings/sound/allwinner,sun4i-a10-codec.yaml | 2 +-
+ .../bindings/sound/allwinner,sun4i-a10-i2s.yaml | 2 +-
+ .../bindings/sound/allwinner,sun4i-a10-spdif.yaml | 2 +-
+ .../sound/allwinner,sun50i-a64-codec-analog.yaml | 2 +-
+ .../sound/allwinner,sun8i-a23-codec-analog.yaml | 2 +-
+ .../bindings/sound/allwinner,sun8i-a33-codec.yaml | 2 +-
+ .../bindings/sound/audio-graph-card.yaml | 2 +-
+ .../bindings/sound/audio-graph-card2.yaml | 2 +-
+ .../devicetree/bindings/sound/audio-graph.yaml | 2 +-
+ .../bindings/sound/intel,keembay-i2s.yaml | 2 +-
+ .../devicetree/bindings/sound/linux,bt-sco.yaml | 2 +-
+ .../devicetree/bindings/sound/linux,spdif-dit.yaml | 2 +-
+ .../devicetree/bindings/sound/mchp,spdifrx.yaml | 2 +-
+ .../devicetree/bindings/sound/mchp,spdiftx.yaml | 2 +-
+ .../devicetree/bindings/sound/mt6359.yaml | 2 +-
+ .../bindings/sound/nvidia,tegra186-asrc.yaml | 2 +-
+ .../bindings/sound/nvidia,tegra186-dspk.yaml | 2 +-
+ .../bindings/sound/nvidia,tegra210-admaif.yaml | 2 +-
+ .../bindings/sound/nvidia,tegra210-adx.yaml | 2 +-
+ .../bindings/sound/nvidia,tegra210-ahub.yaml | 2 +-
+ .../bindings/sound/nvidia,tegra210-amx.yaml | 2 +-
+ .../bindings/sound/nvidia,tegra210-dmic.yaml | 2 +-
+ .../bindings/sound/nvidia,tegra210-i2s.yaml | 2 +-
+ .../bindings/sound/nvidia,tegra210-mixer.yaml | 2 +-
+ .../bindings/sound/nvidia,tegra210-mvc.yaml | 2 +-
+ .../bindings/sound/nvidia,tegra210-sfc.yaml | 2 +-
+ .../devicetree/bindings/sound/renesas,rsnd.yaml | 2 +-
+ .../bindings/sound/simple-audio-amplifier.yaml | 2 +-
+ .../devicetree/bindings/sound/simple-card.yaml | 2 +-
+ .../devicetree/bindings/sound/sound-dai.yaml | 2 +-
+ .../devicetree/bindings/sound/test-component.yaml | 2 +-
+ .../devicetree/bindings/sound/wlf,wm8940.yaml | 2 +-
+ .../devicetree/bindings/sound/wlf,wm8978.yaml | 2 +-
+ .../bindings/spi/allwinner,sun4i-a10-spi.yaml | 2 +-
+ .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 2 +-
+ .../devicetree/bindings/spi/mxicy,mx25f0a-spi.yaml | 2 +-
+ .../devicetree/bindings/spi/spi-cadence.yaml | 2 +-
+ .../devicetree/bindings/spi/spi-xilinx.yaml | 2 +-
+ .../devicetree/bindings/spi/spi-zynqmp-qspi.yaml | 2 +-
+ .../bindings/spmi/mtk,spmi-mtk-pmif.yaml | 2 +-
+ .../sram/allwinner,sun4i-a10-system-control.yaml | 2 +-
+ .../bindings/thermal/allwinner,sun8i-a83t-ths.yaml | 2 +-
+ .../bindings/timer/allwinner,sun4i-a10-timer.yaml | 2 +-
+ .../timer/allwinner,sun5i-a13-hstimer.yaml | 2 +-
+ .../bindings/timer/arm,arch_timer_mmio.yaml | 1 +
+ .../devicetree/bindings/timer/ingenic,tcu.yaml | 4 +
+ .../bindings/timer/mstar,msc313e-timer.yaml | 2 +-
+ .../bindings/timer/rockchip,rk-timer.yaml | 2 +-
+ .../devicetree/bindings/timer/xlnx,xps-timer.yaml | 2 +-
+ .../bindings/timestamp/hte-consumer.yaml | 2 +-
+ .../bindings/ufs/samsung,exynos-ufs.yaml | 2 +-
+ .../bindings/usb/allwinner,sun4i-a10-musb.yaml | 2 +-
+ .../devicetree/bindings/usb/brcm,bcm7445-ehci.yaml | 2 +-
+ .../devicetree/bindings/usb/brcm,usb-pinmap.yaml | 2 +-
+ .../devicetree/bindings/usb/generic-ehci.yaml | 2 +-
+ .../devicetree/bindings/usb/generic-ohci.yaml | 2 +-
+ .../devicetree/bindings/usb/generic-xhci.yaml | 2 +-
+ .../devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 2 +-
+ .../devicetree/bindings/usb/mediatek,mtu3.yaml | 2 +-
+ .../devicetree/bindings/usb/mediatek,musb.yaml | 2 +-
+ .../bindings/usb/microchip,mpfs-musb.yaml | 2 +-
+ .../devicetree/bindings/usb/smsc,usb3503.yaml | 2 +-
+ Documentation/devicetree/bindings/usb/usb-drd.yaml | 2 +-
+ Documentation/devicetree/bindings/usb/usb-hcd.yaml | 2 +-
+ .../devicetree/bindings/usb/usb-xhci.yaml | 2 +-
+ Documentation/devicetree/bindings/usb/usb.yaml | 2 +-
+ Documentation/devicetree/bindings/w1/w1-gpio.yaml | 2 +-
+ .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 2 +-
+ .../bindings/watchdog/mstar,msc313e-wdt.yaml | 2 +-
+ MAINTAINERS | 2 +-
+ drivers/of/base.c | 2 +-
+ drivers/of/fdt.c | 8 +-
+ drivers/of/irq.c | 3 +
+ drivers/of/unittest.c | 5 +-
+ include/dt-bindings/leds/common.h | 7 +-
+ 421 files changed, 806 insertions(+), 679 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/arm,versatile-sysreg.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/versatile-sysreg.txt
+ delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/misc/qcom,fastrpc.txt
+ create mode 100644 Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml
+Merging dt-krzk/for-next (a70369e1b7f6 ARM: dts: sunplus: sp7021: drop incorrect spi-max-frequency)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next
+Merge made by the 'ort' strategy.
+ arch/arm/boot/dts/am335x-evm.dts | 2 +-
+ arch/arm/boot/dts/am335x-evmsk.dts | 2 +-
+ arch/arm/boot/dts/sunplus-sp7021.dtsi | 3 ---
+ 3 files changed, 2 insertions(+), 5 deletions(-)
+Merging mailbox/mailbox-for-next (8a8dc2b9596e mailbox: imx: clear pending interrupts)
+$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next
+Already up to date.
+Merging spi/for-next (7f9c088f08cb Merge remote-tracking branch 'spi/for-6.1' into spi-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/spi/spi.c
+Merge made by the 'ort' strategy.
+ .../display/panel/kingdisplay,kd035g6-54nt.yaml | 2 +
+ .../display/panel/leadtek,ltk035c5444t.yaml | 2 +
+ .../bindings/display/panel/samsung,s6e63m0.yaml | 4 +
+ .../bindings/spi/microchip,mpfs-spi.yaml | 15 +-
+ .../devicetree/bindings/spi/nuvoton,npcm-pspi.txt | 3 +-
+ .../spi/nvidia,tegra210-quad-peripheral-props.yaml | 3 +-
+ .../devicetree/bindings/spi/renesas,sh-msiof.yaml | 13 +-
+ .../devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 1 -
+ .../devicetree/bindings/spi/spi-controller.yaml | 5 +
+ .../devicetree/bindings/spi/spi-fsl-lpspi.yaml | 14 +-
+ .../bindings/spi/spi-peripheral-props.yaml | 5 -
+ .../devicetree/bindings/spi/spi-rockchip.yaml | 5 +
+ MAINTAINERS | 1 +
+ drivers/spi/Kconfig | 9 +
+ drivers/spi/Makefile | 1 +
+ drivers/spi/spi-amd.c | 183 +++++--
+ drivers/spi/spi-dw-core.c | 2 +-
+ drivers/spi/spi-fsl-lpspi.c | 7 +-
+ drivers/spi/spi-fsl-spi.c | 157 ++----
+ drivers/spi/spi-intel.c | 164 +++++-
+ drivers/spi/spi-meson-spicc.c | 6 +-
+ drivers/spi/spi-microchip-core-qspi.c | 600 +++++++++++++++++++++
+ drivers/spi/spi-microchip-core.c | 4 +-
+ drivers/spi/spi-mpc52xx.c | 3 +-
+ drivers/spi/spi-mt7621.c | 42 +-
+ drivers/spi/spi-npcm-pspi.c | 1 +
+ drivers/spi/spi-nxp-fspi.c | 8 +-
+ drivers/spi/spi-pxa2xx.c | 4 +-
+ drivers/spi/spi-qup.c | 21 +-
+ drivers/spi/spi-s3c64xx.c | 4 +-
+ drivers/spi/spi-sh-msiof.c | 1 +
+ drivers/spi/spi-stm32-qspi.c | 125 ++++-
+ drivers/spi/spi.c | 18 +-
+ include/linux/spi/spi.h | 2 +
+ 34 files changed, 1170 insertions(+), 265 deletions(-)
+ create mode 100644 drivers/spi/spi-microchip-core-qspi.c
+Merging tip/master (82eedfedea44 Merge branch into tip/master: 'x86/timers')
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging Documentation/driver-api/driver-model/devres.rst
+Auto-merging arch/x86/kernel/cpu/sgx/encl.c
+Auto-merging drivers/base/core.c
+Auto-merging fs/cifs/transport.c
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/suspend.h
+Auto-merging kernel/cgroup/cgroup.c
+Auto-merging kernel/hung_task.c
+Auto-merging mm/khugepaged.c
+Auto-merging net/unix/af_unix.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/cgroup-v2.rst | 23 +
+ Documentation/admin-guide/kernel-parameters.txt | 4 +
+ Documentation/admin-guide/tainted-kernels.rst | 6 +
+ Documentation/driver-api/driver-model/devres.rst | 1 -
+ Documentation/x86/microcode.rst | 116 +++-
+ arch/powerpc/kernel/hw_breakpoint.c | 53 +-
+ arch/powerpc/perf/core-book3s.c | 10 +-
+ arch/sh/include/asm/hw_breakpoint.h | 5 +-
+ arch/x86/Kconfig | 9 +-
+ arch/x86/boot/bitops.h | 4 +-
+ arch/x86/configs/i386_defconfig | 6 +-
+ arch/x86/configs/x86_64_defconfig | 5 +-
+ arch/x86/events/Makefile | 2 +-
+ arch/x86/events/amd/Makefile | 2 +-
+ arch/x86/events/amd/brs.c | 69 ++-
+ arch/x86/events/amd/core.c | 210 ++++---
+ arch/x86/events/amd/lbr.c | 435 ++++++++++++++
+ arch/x86/events/core.c | 61 +-
+ arch/x86/events/intel/core.c | 137 +++--
+ arch/x86/events/intel/ds.c | 48 +-
+ arch/x86/events/intel/lbr.c | 273 ---------
+ arch/x86/events/intel/p4.c | 37 +-
+ arch/x86/events/perf_event.h | 132 ++++-
+ arch/x86/events/perf_event_flags.h | 22 +
+ arch/x86/events/utils.c | 247 ++++++++
+ arch/x86/include/asm/acrn.h | 14 +
+ arch/x86/include/asm/cpu.h | 2 +
+ arch/x86/include/asm/cpufeatures.h | 2 +-
+ arch/x86/include/asm/hw_breakpoint.h | 5 +-
+ arch/x86/include/asm/intel-family.h | 3 +
+ arch/x86/include/asm/mc146818rtc.h | 2 +-
+ arch/x86/include/asm/microcode.h | 3 -
+ arch/x86/include/asm/msr-index.h | 18 +
+ arch/x86/include/asm/perf_event.h | 3 +-
+ arch/x86/include/asm/qspinlock_paravirt.h | 13 +-
+ arch/x86/include/asm/uaccess.h | 16 +-
+ arch/x86/include/asm/uaccess_64.h | 45 ++
+ arch/x86/kernel/amd_gart_64.c | 2 +-
+ arch/x86/kernel/aperture_64.c | 2 +-
+ arch/x86/kernel/apic/apic.c | 44 +-
+ arch/x86/kernel/cpu/acrn.c | 3 +
+ arch/x86/kernel/cpu/mce/apei.c | 13 +-
+ arch/x86/kernel/cpu/microcode/amd.c | 7 -
+ arch/x86/kernel/cpu/microcode/core.c | 5 +-
+ arch/x86/kernel/cpu/microcode/intel.c | 17 -
+ arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 12 +-
+ arch/x86/kernel/cpu/scattered.c | 1 +
+ arch/x86/kernel/cpu/sgx/encl.c | 26 +-
+ arch/x86/kernel/cpu/sgx/encl.h | 2 -
+ arch/x86/kernel/cpu/sgx/main.c | 15 +-
+ arch/x86/kernel/early_printk.c | 14 +-
+ arch/x86/kernel/rtc.c | 63 +-
+ arch/x86/kernel/x86_init.c | 2 +-
+ arch/x86/kvm/vmx/nested.c | 2 +-
+ arch/x86/lib/clear_page_64.S | 138 +++++
+ arch/x86/lib/usercopy_64.c | 40 --
+ arch/x86/mm/fault.c | 10 +
+ arch/x86/mm/pat/set_memory.c | 36 +-
+ arch/x86/platform/efi/efi.c | 2 +-
+ drivers/acpi/x86/s2idle.c | 12 +-
+ drivers/android/binder.c | 4 +-
+ drivers/base/class.c | 2 +-
+ drivers/base/core.c | 2 +-
+ drivers/base/dd.c | 2 +-
+ drivers/base/devres.c | 4 +-
+ drivers/media/pci/pt3/pt3.c | 4 +-
+ drivers/perf/arm_spe_pmu.c | 4 +-
+ drivers/powercap/idle_inject.c | 2 +-
+ drivers/ras/cec.c | 8 +
+ drivers/scsi/scsi_transport_spi.c | 7 +-
+ fs/cifs/inode.c | 4 +-
+ fs/cifs/transport.c | 5 +-
+ fs/coredump.c | 7 +-
+ fs/kernfs/dir.c | 102 ++--
+ fs/kernfs/file.c | 151 +++--
+ fs/kernfs/kernfs-internal.h | 1 +
+ fs/nfs/file.c | 3 +-
+ fs/nfs/inode.c | 12 +-
+ fs/nfs/nfs3proc.c | 3 +-
+ fs/nfs/nfs4proc.c | 14 +-
+ fs/nfs/nfs4state.c | 3 +-
+ fs/nfs/pnfs.c | 4 +-
+ fs/xfs/xfs_trans_ail.c | 8 +-
+ include/linux/cgroup-defs.h | 3 +
+ include/linux/cgroup.h | 6 +-
+ include/linux/completion.h | 1 +
+ include/linux/freezer.h | 245 +-------
+ include/linux/hw_breakpoint.h | 4 +-
+ include/linux/io.h | 2 -
+ include/linux/kernfs.h | 3 +
+ include/linux/pci_ids.h | 3 +
+ include/linux/percpu-rwsem.h | 6 +
+ include/linux/perf/arm_pmu.h | 9 +-
+ include/linux/perf_event.h | 66 ++-
+ include/linux/psi.h | 12 +-
+ include/linux/psi_types.h | 31 +-
+ include/linux/sched.h | 50 +-
+ include/linux/sunrpc/sched.h | 7 +-
+ include/linux/suspend.h | 8 +-
+ include/linux/umh.h | 9 +-
+ include/linux/wait.h | 40 +-
+ include/uapi/linux/perf_event.h | 49 +-
+ init/do_mounts_initrd.c | 10 +-
+ kernel/cgroup/cgroup.c | 126 +++-
+ kernel/cgroup/legacy_freezer.c | 23 +-
+ kernel/events/Makefile | 1 +
+ kernel/events/core.c | 50 +-
+ kernel/events/hw_breakpoint.c | 638 ++++++++++++++++-----
+ kernel/events/hw_breakpoint_test.c | 333 +++++++++++
+ kernel/exit.c | 4 +-
+ kernel/fork.c | 5 +-
+ kernel/freezer.c | 133 +++--
+ kernel/futex/waitwake.c | 8 +-
+ kernel/hung_task.c | 4 +-
+ kernel/locking/percpu-rwsem.c | 6 +
+ kernel/locking/qrwlock.c | 4 +-
+ kernel/locking/qspinlock.c | 2 +-
+ kernel/locking/qspinlock_paravirt.h | 4 +-
+ kernel/locking/spinlock.c | 56 +-
+ kernel/power/hibernate.c | 35 +-
+ kernel/power/main.c | 18 +-
+ kernel/power/process.c | 10 +-
+ kernel/power/suspend.c | 12 +-
+ kernel/power/user.c | 24 +-
+ kernel/ptrace.c | 2 +-
+ kernel/sched/autogroup.c | 3 +-
+ kernel/sched/completion.c | 12 +
+ kernel/sched/core.c | 96 +---
+ kernel/sched/core_sched.c | 4 +-
+ kernel/sched/cpudeadline.c | 2 +-
+ kernel/sched/cpupri.c | 2 +-
+ kernel/sched/deadline.c | 115 ++--
+ kernel/sched/fair.c | 200 ++++---
+ kernel/sched/psi.c | 280 ++++++---
+ kernel/sched/rt.c | 18 +-
+ kernel/sched/sched.h | 59 +-
+ kernel/sched/stats.h | 6 +
+ kernel/sched/stop_task.c | 11 +-
+ kernel/signal.c | 14 +-
+ kernel/time/hrtimer.c | 4 +-
+ kernel/umh.c | 18 +-
+ lib/Kconfig.debug | 10 +
+ lib/devres.c | 15 -
+ mm/khugepaged.c | 4 +-
+ net/sunrpc/sched.c | 12 +-
+ net/unix/af_unix.c | 8 +-
+ tools/objtool/check.c | 8 +-
+ .../functional/futex_requeue_pi_signal_restart.c | 2 +-
+ 148 files changed, 3916 insertions(+), 1916 deletions(-)
+ create mode 100644 arch/x86/events/amd/lbr.c
+ create mode 100644 arch/x86/events/perf_event_flags.h
+ create mode 100644 arch/x86/events/utils.c
+ create mode 100644 kernel/events/hw_breakpoint_test.c
+Merging clockevents/timers/drivers/next (c19e18637d89 clocksource/drivers/sun4i: Remove unnecessary (void*) conversions)
+$ 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.
+Merging edac/edac-for-next (cd687f34d565 Merge branch 'edac-misc' into edac-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
+Merge made by the 'ort' strategy.
+ arch/x86/include/asm/mce.h | 1 +
+ drivers/edac/edac_mc.c | 1 -
+ drivers/edac/edac_module.h | 4 --
+ drivers/edac/i10nm_base.c | 134 +++++++++++++++++++++++++++++++++++++++++++-
+ drivers/edac/ie31200_edac.c | 28 ++++++---
+ drivers/edac/skx_base.c | 9 ++-
+ drivers/edac/skx_common.c | 21 ++++---
+ drivers/edac/skx_common.h | 6 ++
+ drivers/edac/wq.c | 1 -
+ include/linux/edac.h | 30 +++++-----
+ 10 files changed, 192 insertions(+), 43 deletions(-)
+Merging irqchip/irq/irqchip-next (2bd1753e8c43 Merge branch irq/misc-5.20 into irq/irqchip-next)
+$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next
+Already up to date.
+Merging ftrace/for-next (07a451dae367 Merge branch 'trace/for-next-core' into trace/for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/for-next
+Merge made by the 'ort' strategy.
+Merging rcu/rcu/next (7139c19d2ea1 rcu: Synchronize ->qsmaskinitnext in rcu_boost_kthread_setaffinity())
+$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next
+Auto-merging Documentation/RCU/checklist.rst
+Auto-merging MAINTAINERS
+Auto-merging kernel/sched/core.c
+Merge made by the 'ort' strategy.
+ Documentation/RCU/checklist.rst | 15 +-
+ Documentation/RCU/rcu_dereference.rst | 14 +-
+ Documentation/RCU/whatisRCU.rst | 47 +-
+ .../litmus-tests/locking/DCL-broken.litmus | 55 ++
+ .../litmus-tests/locking/DCL-fixed.litmus | 56 ++
+ .../litmus-tests/locking/RM-broken.litmus | 42 ++
+ Documentation/litmus-tests/locking/RM-fixed.litmus | 42 ++
+ Documentation/memory-barriers.txt | 177 ++---
+ MAINTAINERS | 1 +
+ include/linux/rcupdate.h | 42 +-
+ include/linux/rcutiny.h | 50 ++
+ include/linux/rcutree.h | 40 ++
+ include/linux/srcutiny.h | 10 +-
+ kernel/rcu/rcutorture.c | 331 +++++++--
+ kernel/rcu/srcutiny.c | 14 +-
+ kernel/rcu/tasks.h | 5 +-
+ kernel/rcu/tiny.c | 27 +-
+ kernel/rcu/tree.c | 332 ++++++---
+ kernel/rcu/tree_exp.h | 57 +-
+ kernel/rcu/tree_nocb.h | 10 +-
+ kernel/rcu/tree_plugin.h | 31 +-
+ kernel/rcu/tree_stall.h | 5 +-
+ kernel/sched/core.c | 14 +
+ kernel/smp.c | 3 +-
+ tools/include/nolibc/arch-riscv.h | 2 +-
+ tools/include/nolibc/sys.h | 4 +-
+ tools/memory-model/Documentation/explanation.txt | 7 +-
+ tools/memory-model/Documentation/litmus-tests.txt | 37 +-
+ tools/memory-model/Documentation/locking.txt | 320 +++++++++
+ tools/memory-model/linux-kernel.bell | 16 +-
+ tools/memory-model/litmus-tests/.gitignore | 2 +-
+ tools/memory-model/scripts/README | 16 +-
+ tools/memory-model/scripts/checkalllitmus.sh | 29 +-
+ tools/memory-model/scripts/checkghlitmus.sh | 11 +-
+ tools/memory-model/scripts/checklitmus.sh | 25 +-
+ tools/memory-model/scripts/checklitmushist.sh | 2 +-
+ tools/memory-model/scripts/checktheselitmus.sh | 43 ++
+ tools/memory-model/scripts/cmplitmushist.sh | 49 +-
+ tools/memory-model/scripts/hwfnseg.sh | 20 +
+ tools/memory-model/scripts/initlitmushist.sh | 2 +-
+ tools/memory-model/scripts/judgelitmus.sh | 120 +++-
+ tools/memory-model/scripts/newlitmushist.sh | 4 +-
+ tools/memory-model/scripts/parseargs.sh | 21 +-
+ tools/memory-model/scripts/runlitmus.sh | 80 +++
+ tools/memory-model/scripts/runlitmushist.sh | 29 +-
+ tools/memory-model/scripts/simpletest.sh | 35 +
+ tools/testing/selftests/nolibc/.gitignore | 4 +
+ tools/testing/selftests/nolibc/Makefile | 135 ++++
+ tools/testing/selftests/nolibc/nolibc-test.c | 757 +++++++++++++++++++++
+ .../testing/selftests/rcutorture/bin/config2csv.sh | 3 +-
+ .../selftests/rcutorture/bin/config_override.sh | 3 +-
+ .../selftests/rcutorture/bin/configcheck.sh | 3 +-
+ .../testing/selftests/rcutorture/bin/configinit.sh | 3 +-
+ .../testing/selftests/rcutorture/bin/kvm-again.sh | 49 +-
+ .../selftests/rcutorture/bin/kvm-assign-cpus.sh | 3 +-
+ .../testing/selftests/rcutorture/bin/kvm-build.sh | 3 +-
+ .../selftests/rcutorture/bin/kvm-end-run-stats.sh | 3 +-
+ .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +-
+ .../testing/selftests/rcutorture/bin/kvm-remote.sh | 13 +-
+ .../rcutorture/bin/kvm-test-1-run-batch.sh | 3 +-
+ .../rcutorture/bin/kvm-test-1-run-qemu.sh | 5 +-
+ .../selftests/rcutorture/bin/kvm-test-1-run.sh | 3 +-
+ .../selftests/rcutorture/bin/kvm-transform.sh | 68 +-
+ tools/testing/selftests/rcutorture/bin/kvm.sh | 3 +-
+ .../selftests/rcutorture/bin/parse-build.sh | 3 +-
+ tools/testing/selftests/rcutorture/bin/torture.sh | 143 +++-
+ 66 files changed, 3049 insertions(+), 454 deletions(-)
+ create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus
+ create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus
+ create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus
+ create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus
+ create mode 100644 tools/memory-model/Documentation/locking.txt
+ create mode 100755 tools/memory-model/scripts/checktheselitmus.sh
+ create mode 100755 tools/memory-model/scripts/hwfnseg.sh
+ create mode 100755 tools/memory-model/scripts/runlitmus.sh
+ create mode 100755 tools/memory-model/scripts/simpletest.sh
+ create mode 100644 tools/testing/selftests/nolibc/.gitignore
+ create mode 100644 tools/testing/selftests/nolibc/Makefile
+ create mode 100644 tools/testing/selftests/nolibc/nolibc-test.c
+Merging kvm/next (372d07084593 KVM: selftests: Fix ambiguous mov in KVM_ASM_SAFE())
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next
+Already up to date.
+Merging kvm-arm/next (0982c8d859f8 Merge branch kvm-arm64/nvhe-stacktrace 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 (f5ecfee94493 KVM: s390: resetting the Topology-Change-Report)
+$ 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 (e9ea0b30ada0 xen/grants: prevent integer overflow in gnttab_dma_alloc_pages())
+$ 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 (a111daf0c53a Linux 5.19-rc3)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next
+Already up to date.
+Merging workqueues/for-next (c0feea594e05 workqueue: don't skip lockdep work dependency in cancel_work_sync())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next
+Merge made by the 'ort' strategy.
+ kernel/workqueue.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+Merging drivers-x86/for-next (76fba1221e30 Merge tag 'backlight-detect-refactor-1' into review-hans)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/gpio/Kconfig
+Auto-merging drivers/platform/surface/surface3_power.c
+Auto-merging drivers/platform/x86/asus-wmi.c
+Auto-merging drivers/platform/x86/pmc_atom.c
+Auto-merging drivers/platform/x86/thinkpad_acpi.c
+Auto-merging include/linux/platform_data/x86/pmc_atom.h
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-platform-asus-wmi | 41 ++
+ MAINTAINERS | 6 +
+ drivers/gpio/Kconfig | 3 +-
+ drivers/gpio/gpio-f7188x.c | 275 ++++++----
+ drivers/leds/simple/simatic-ipc-leds-gpio.c | 42 +-
+ drivers/platform/surface/surface3_power.c | 2 +-
+ drivers/platform/x86/amd/Kconfig | 2 +
+ drivers/platform/x86/amd/Makefile | 1 +
+ drivers/platform/x86/amd/pmf/Kconfig | 16 +
+ drivers/platform/x86/amd/pmf/Makefile | 9 +
+ drivers/platform/x86/amd/pmf/acpi.c | 288 ++++++++++
+ drivers/platform/x86/amd/pmf/auto-mode.c | 305 ++++++++++
+ drivers/platform/x86/amd/pmf/core.c | 388 +++++++++++++
+ drivers/platform/x86/amd/pmf/pmf.h | 327 +++++++++++
+ drivers/platform/x86/amd/pmf/sps.c | 146 +++++
+ drivers/platform/x86/asus-nb-wmi.c | 38 +-
+ drivers/platform/x86/asus-wmi.c | 611 +++++++++++++--------
+ drivers/platform/x86/asus-wmi.h | 10 +-
+ drivers/platform/x86/dell/dell-wmi-base.c | 3 +
+ drivers/platform/x86/dell/dell-wmi-privacy.c | 12 +-
+ drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 2 +-
+ drivers/platform/x86/intel/chtwc_int33fe.c | 8 +-
+ drivers/platform/x86/msi-laptop.c | 96 ++--
+ drivers/platform/x86/pmc_atom.c | 42 +-
+ drivers/platform/x86/simatic-ipc.c | 10 +-
+ drivers/platform/x86/thinkpad_acpi.c | 4 +-
+ drivers/platform/x86/toshiba_acpi.c | 5 +-
+ drivers/platform/x86/wmi.c | 49 +-
+ include/linux/platform_data/x86/asus-wmi.h | 11 +
+ include/linux/platform_data/x86/pmc_atom.h | 4 +-
+ include/linux/platform_data/x86/simatic-ipc-base.h | 1 +
+ include/linux/platform_data/x86/simatic-ipc.h | 2 +
+ 32 files changed, 2267 insertions(+), 492 deletions(-)
+ create mode 100644 drivers/platform/x86/amd/pmf/Kconfig
+ create mode 100644 drivers/platform/x86/amd/pmf/Makefile
+ create mode 100644 drivers/platform/x86/amd/pmf/acpi.c
+ create mode 100644 drivers/platform/x86/amd/pmf/auto-mode.c
+ create mode 100644 drivers/platform/x86/amd/pmf/core.c
+ create mode 100644 drivers/platform/x86/amd/pmf/pmf.h
+ create mode 100644 drivers/platform/x86/amd/pmf/sps.c
+Merging chrome-platform/for-next (348a2e8c93d3 platform/chrome: cros_ec_typec: Register partner PDOs)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/debugfs-cros-ec | 22 ++
+ MAINTAINERS | 1 +
+ drivers/platform/chrome/Kconfig | 11 +
+ drivers/platform/chrome/Makefile | 1 +
+ drivers/platform/chrome/chromeos_laptop.c | 24 +-
+ drivers/platform/chrome/cros_ec.c | 3 +-
+ drivers/platform/chrome/cros_ec_chardev.c | 3 +
+ drivers/platform/chrome/cros_ec_debugfs.c | 3 +
+ drivers/platform/chrome/cros_ec_proto.c | 32 +++
+ drivers/platform/chrome/cros_ec_typec.c | 110 ++++++++-
+ drivers/platform/chrome/cros_typec_switch.c | 321 +++++++++++++++++++++++++
+ include/linux/platform_data/cros_ec_commands.h | 18 ++
+ include/linux/platform_data/cros_ec_proto.h | 1 +
+ 13 files changed, 529 insertions(+), 21 deletions(-)
+ create mode 100644 drivers/platform/chrome/cros_typec_switch.c
+Merging hsi/for-next (551e325bbd3f HSI: omap_ssi_port: Fix dma_map_sg error check)
+$ 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/cmt_speech.c | 2 +-
+ drivers/hsi/clients/ssi_protocol.c | 1 -
+ drivers/hsi/controllers/omap_ssi_core.c | 1 +
+ drivers/hsi/controllers/omap_ssi_port.c | 8 ++++----
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+Merging leds/for-next (568035b01cfb Linux 6.0-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next
+Already up to date.
+Merging ipmi/for-next (ba5829c6543f ipmi:ipmb: Fix a vague comment and a typo)
+$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next
+Auto-merging drivers/char/ipmi/ipmi_ipmb.c
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/ipmi/npcm7xx-kcs-bmc.txt | 5 +++--
+ drivers/char/ipmi/Kconfig | 6 +++---
+ drivers/char/ipmi/ipmi_ipmb.c | 4 ++--
+ drivers/char/ipmi/ipmi_msghandler.c | 2 +-
+ 4 files changed, 9 insertions(+), 8 deletions(-)
+Merging driver-core/driver-core-next (a791dc135325 Merge 6.0-rc5 into driver-core-next)
+$ 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 MAINTAINERS
+Auto-merging drivers/base/dd.c
+Auto-merging include/linux/cgroup.h
+Auto-merging kernel/cgroup/cgroup.c
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/Makefile
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/dynamic-debug-howto.rst | 246 +++++------
+ .../process/code-of-conduct-interpretation.rst | 2 +-
+ Documentation/process/stable-kernel-rules.rst | 6 +
+ MAINTAINERS | 2 +
+ drivers/base/base.h | 2 -
+ include/asm-generic/vmlinux.lds.h | 3 +
+ include/linux/dynamic_debug.h | 176 ++++++--
+ kernel/module/internal.h | 4 +-
+ kernel/module/main.c | 20 +-
+ lib/Kconfig.debug | 10 +
+ lib/Makefile | 1 +
+ lib/dynamic_debug.c | 450 +++++++++++++++++----
+ lib/test_dynamic_debug.c | 165 ++++++++
+ 13 files changed, 855 insertions(+), 232 deletions(-)
+ create mode 100644 lib/test_dynamic_debug.c
+Merging usb/usb-next (7eb2bf871454 usb: misc: usb3503: call clk_disable_unprepare in the error handling)
+$ 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 drivers/usb/dwc3/core.c
+Auto-merging drivers/usb/misc/usb3503.c
+Auto-merging drivers/usb/typec/tcpm/fusb302.c
+Auto-merging drivers/usb/typec/tcpm/tcpci.c
+Auto-merging drivers/usb/typec/tcpm/tcpci_rt1711h.c
+Auto-merging drivers/usb/typec/ucsi/ucsi_stm32g0.c
+Merge made by the 'ort' strategy.
+ .../ABI/testing/sysfs-platform-chipidea-usb2 | 6 +-
+ .../devicetree/bindings/phy/mxs-usb-phy.txt | 4 +-
+ .../devicetree/bindings/usb/analogix,anx7411.yaml | 2 +
+ .../devicetree/bindings/usb/aspeed,usb-vhub.yaml | 2 +
+ .../bindings/usb/mediatek,mt6370-tcpc.yaml | 36 ++++
+ .../devicetree/bindings/usb/npcm7xx-usb.txt | 4 +-
+ .../devicetree/bindings/usb/renesas,usb3-peri.yaml | 99 ++++++++--
+ .../devicetree/bindings/usb/richtek,rt1711h.yaml | 100 ++++++++++
+ .../devicetree/bindings/usb/st,stusb160x.yaml | 12 +-
+ .../devicetree/bindings/usb/willsemi,wusb3801.yaml | 1 +
+ Documentation/usb/usbip_protocol.rst | 13 +-
+ arch/arm/mach-s3c/mach-gta02.c | 10 +-
+ arch/arm/mach-s3c/mach-h1940.c | 13 +-
+ arch/arm/mach-s3c/mach-jive.c | 10 +-
+ arch/arm/mach-s3c/mach-mini2440.c | 9 +-
+ arch/arm/mach-s3c/mach-n30.c | 13 +-
+ arch/arm/mach-s3c/mach-rx1950.c | 13 +-
+ arch/arm/mach-s3c/mach-smdk2413.c | 12 +-
+ drivers/phy/tegra/xusb-tegra186.c | 19 +-
+ drivers/phy/tegra/xusb.c | 22 ++-
+ drivers/phy/tegra/xusb.h | 4 +-
+ drivers/usb/atm/usbatm.c | 2 +-
+ drivers/usb/chipidea/Kconfig | 10 +-
+ drivers/usb/chipidea/ci_hdrc_usb2.c | 1 +
+ drivers/usb/chipidea/host.c | 7 +
+ drivers/usb/chipidea/otg_fsm.c | 7 +
+ drivers/usb/common/debug.c | 96 ++++++----
+ drivers/usb/common/usb-conn-gpio.c | 6 +-
+ drivers/usb/core/devio.c | 2 +-
+ drivers/usb/core/hcd-pci.c | 7 +-
+ drivers/usb/core/hcd.c | 11 +-
+ drivers/usb/dwc3/core.c | 4 -
+ drivers/usb/dwc3/core.h | 1 +
+ drivers/usb/dwc3/debug.h | 4 +-
+ drivers/usb/dwc3/dwc3-qcom.c | 18 +-
+ drivers/usb/dwc3/ep0.c | 11 +-
+ drivers/usb/dwc3/gadget.c | 58 ++++--
+ drivers/usb/dwc3/trace.h | 3 +-
+ drivers/usb/gadget/function/f_fs.c | 6 +-
+ drivers/usb/gadget/function/f_mass_storage.c | 11 +-
+ drivers/usb/gadget/function/f_ncm.c | 60 +++---
+ drivers/usb/gadget/function/f_uvc.c | 6 +-
+ drivers/usb/gadget/function/rndis.c | 4 +-
+ drivers/usb/gadget/function/u_ether.c | 8 +-
+ drivers/usb/gadget/function/uvc.h | 1 +
+ drivers/usb/gadget/function/uvc_v4l2.c | 8 +-
+ drivers/usb/gadget/function/uvc_video.c | 9 +-
+ drivers/usb/gadget/udc/at91_udc.c | 10 +-
+ drivers/usb/gadget/udc/net2272.c | 4 +-
+ drivers/usb/gadget/udc/omap_udc.c | 2 +-
+ drivers/usb/gadget/udc/renesas_usb3.c | 131 ++++++++++---
+ drivers/usb/gadget/udc/s3c2410_udc.c | 78 ++++----
+ drivers/usb/gadget/udc/s3c2410_udc.h | 3 +
+ drivers/usb/gadget/udc/tegra-xudc.c | 6 +-
+ drivers/usb/host/Kconfig | 8 +-
+ drivers/usb/host/ehci-atmel.c | 3 -
+ drivers/usb/host/ehci-exynos.c | 2 -
+ drivers/usb/host/ehci-fsl.c | 2 -
+ drivers/usb/host/ehci-hcd.c | 1 -
+ drivers/usb/host/ehci-npcm7xx.c | 53 ------
+ drivers/usb/host/ehci-omap.c | 2 -
+ drivers/usb/host/ehci-orion.c | 4 -
+ drivers/usb/host/ehci-pci.c | 4 +-
+ drivers/usb/host/ehci-platform.c | 4 -
+ drivers/usb/host/ehci-q.c | 4 +-
+ drivers/usb/host/ehci-spear.c | 4 -
+ drivers/usb/host/ehci-st.c | 4 -
+ drivers/usb/host/fhci-hcd.c | 63 ++-----
+ drivers/usb/host/fhci-hub.c | 15 +-
+ drivers/usb/host/fhci.h | 4 +-
+ drivers/usb/host/fotg210-hcd.c | 1 -
+ drivers/usb/host/ohci-at91.c | 3 -
+ drivers/usb/host/ohci-da8xx.c | 1 -
+ drivers/usb/host/ohci-exynos.c | 2 -
+ drivers/usb/host/ohci-hcd.c | 1 -
+ drivers/usb/host/ohci-nxp.c | 2 -
+ drivers/usb/host/ohci-omap.c | 2 -
+ drivers/usb/host/ohci-pci.c | 4 +-
+ drivers/usb/host/ohci-platform.c | 32 +++-
+ drivers/usb/host/ohci-pxa27x.c | 4 -
+ drivers/usb/host/ohci-s3c2410.c | 3 -
+ drivers/usb/host/ohci-spear.c | 3 -
+ drivers/usb/host/ohci-st.c | 4 -
+ drivers/usb/host/u132-hcd.c | 1 -
+ drivers/usb/host/uhci-hcd.c | 2 -
+ drivers/usb/host/uhci-pci.c | 2 +-
+ drivers/usb/host/xhci-pci.c | 2 +-
+ drivers/usb/host/xhci-plat.c | 18 +-
+ drivers/usb/host/xhci.c | 2 +-
+ drivers/usb/host/xhci.h | 2 +-
+ drivers/usb/misc/usb251xb.c | 6 +-
+ drivers/usb/misc/usb3503.c | 25 ++-
+ drivers/usb/misc/uss720.c | 8 +-
+ drivers/usb/phy/phy-mxs-usb.c | 4 +-
+ drivers/usb/phy/phy-tegra-usb.c | 14 +-
+ drivers/usb/storage/onetouch.c | 2 +-
+ drivers/usb/typec/tcpm/Kconfig | 11 ++
+ drivers/usb/typec/tcpm/Makefile | 1 +
+ drivers/usb/typec/tcpm/fusb302.c | 2 +-
+ drivers/usb/typec/tcpm/tcpci.c | 22 ---
+ drivers/usb/typec/tcpm/tcpci_mt6370.c | 207 +++++++++++++++++++++
+ drivers/usb/typec/tcpm/tcpci_rt1711h.c | 150 +++++++++++++--
+ drivers/usb/typec/ucsi/ucsi_stm32g0.c | 2 +-
+ drivers/usb/usbip/stub_main.c | 2 +-
+ drivers/usb/usbip/stub_rx.c | 4 +-
+ drivers/usb/usbip/usbip_common.c | 91 ++++++++-
+ include/linux/phy/tegra/xusb.h | 4 +-
+ include/linux/platform_data/usb-s3c2410_udc.h | 6 -
+ include/linux/usb/chipidea.h | 1 +
+ include/linux/usb/hcd.h | 1 -
+ include/linux/usb/tcpci.h | 22 +++
+ include/uapi/linux/usbip.h | 26 +++
+ 112 files changed, 1342 insertions(+), 536 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/usb/mediatek,mt6370-tcpc.yaml
+ create mode 100644 Documentation/devicetree/bindings/usb/richtek,rt1711h.yaml
+ create mode 100644 drivers/usb/typec/tcpm/tcpci_mt6370.c
+Merging thunderbolt/next (387a42cfcf92 thunderbolt: Fix spelling mistake "simultaneusly" -> "simultaneously")
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next
+Auto-merging drivers/thunderbolt/Kconfig
+Auto-merging drivers/thunderbolt/icm.c
+Auto-merging drivers/thunderbolt/nhi.c
+Auto-merging drivers/thunderbolt/nhi.h
+Auto-merging drivers/thunderbolt/switch.c
+Auto-merging drivers/thunderbolt/tb.c
+Auto-merging drivers/thunderbolt/tb.h
+Auto-merging drivers/thunderbolt/usb4.c
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-bus-thunderbolt | 4 +-
+ drivers/thunderbolt/Kconfig | 10 +
+ drivers/thunderbolt/debugfs.c | 836 ++++++++++++++++++++++++
+ drivers/thunderbolt/icm.c | 3 +
+ drivers/thunderbolt/nhi.c | 7 +
+ drivers/thunderbolt/nhi.h | 3 +
+ drivers/thunderbolt/nvm.c | 385 ++++++++++-
+ drivers/thunderbolt/retimer.c | 105 ++-
+ drivers/thunderbolt/sb_regs.h | 58 ++
+ drivers/thunderbolt/switch.c | 397 ++++++-----
+ drivers/thunderbolt/tb.c | 33 +-
+ drivers/thunderbolt/tb.h | 55 +-
+ drivers/thunderbolt/tb_regs.h | 2 +
+ drivers/thunderbolt/usb4.c | 120 ++++
+ drivers/thunderbolt/xdomain.c | 9 +-
+ 15 files changed, 1723 insertions(+), 304 deletions(-)
+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 (cfebcd53e65e USB: serial: ftdi_sio: add support for HP and HA devices)
+$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next
+Merge made by the 'ort' strategy.
+ drivers/usb/serial/ftdi_sio.c | 338 +++++++++++++++++++-------------------
+ drivers/usb/serial/ftdi_sio.h | 22 +--
+ drivers/usb/serial/ftdi_sio_ids.h | 7 +
+ 3 files changed, 185 insertions(+), 182 deletions(-)
+Merging tty/tty-next (ccf3a570410a termios: kill uapi termios.h that are identical to generic one)
+$ 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/devicetree/bindings/serial/samsung_uart.yaml
+Auto-merging arch/alpha/kernel/Makefile
+Auto-merging arch/sparc/kernel/Makefile
+Auto-merging drivers/tty/serial/21285.c
+Auto-merging drivers/tty/serial/Kconfig
+Auto-merging drivers/tty/serial/max310x.c
+Auto-merging drivers/tty/serial/sc16is7xx.c
+Auto-merging drivers/tty/serial/serial-tegra.c
+Auto-merging drivers/tty/serial/tegra-tcu.c
+Auto-merging drivers/usb/serial/ftdi_sio.c
+Auto-merging include/linux/serial_core.h
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/serial/mediatek,uart.yaml | 1 +
+ .../devicetree/bindings/serial/pl011.yaml | 6 +
+ .../devicetree/bindings/serial/renesas,scif.yaml | 2 +-
+ .../devicetree/bindings/serial/samsung_uart.yaml | 4 +-
+ arch/alpha/include/asm/termios.h | 87 ------------
+ arch/alpha/kernel/Makefile | 2 +-
+ arch/alpha/kernel/termios.c | 56 ++++++++
+ arch/arm/mach-ep93xx/core.c | 1 +
+ arch/arm/mach-versatile/integrator_ap.c | 1 +
+ arch/ia64/include/asm/termios.h | 58 --------
+ arch/ia64/include/uapi/asm/termios.h | 51 -------
+ arch/loongarch/include/asm/Kbuild | 1 -
+ arch/mips/include/asm/termios.h | 105 ---------------
+ arch/parisc/include/asm/termios.h | 52 --------
+ arch/parisc/include/uapi/asm/termios.h | 44 ------
+ arch/powerpc/include/asm/termios.h | 18 ---
+ arch/s390/include/asm/termios.h | 26 ----
+ arch/s390/include/uapi/asm/termios.h | 50 -------
+ arch/sparc/include/asm/termios.h | 147 ---------------------
+ arch/sparc/kernel/Makefile | 4 +-
+ arch/sparc/kernel/termios.c | 115 ++++++++++++++++
+ drivers/char/pcmcia/synclink_cs.c | 3 +-
+ drivers/ipack/devices/ipoctal.c | 2 +-
+ drivers/mmc/core/sdio_uart.c | 4 +-
+ drivers/net/usb/hso.c | 3 +-
+ drivers/net/wwan/wwan_core.c | 1 +
+ drivers/s390/char/tty3270.c | 2 +-
+ drivers/staging/fwserial/fwserial.c | 3 +-
+ drivers/staging/greybus/uart.c | 2 +-
+ drivers/tty/amiserial.c | 6 +-
+ drivers/tty/hvc/hvcs.c | 3 +-
+ drivers/tty/moxa.c | 9 +-
+ drivers/tty/mxser.c | 8 +-
+ drivers/tty/n_gsm.c | 3 +-
+ drivers/tty/n_hdlc.c | 1 -
+ drivers/tty/n_tty.c | 2 +-
+ drivers/tty/pty.c | 2 +-
+ drivers/tty/serial/21285.c | 2 +-
+ drivers/tty/serial/8250/8250_bcm7271.c | 2 +-
+ drivers/tty/serial/8250/8250_dma.c | 3 +-
+ drivers/tty/serial/8250/8250_dw.c | 2 +-
+ drivers/tty/serial/8250/8250_dwlib.c | 3 +-
+ drivers/tty/serial/8250/8250_dwlib.h | 2 +-
+ drivers/tty/serial/8250/8250_fintek.c | 2 +-
+ drivers/tty/serial/8250/8250_lpss.c | 2 +-
+ drivers/tty/serial/8250/8250_men_mcb.c | 1 -
+ drivers/tty/serial/8250/8250_mid.c | 5 +-
+ drivers/tty/serial/8250/8250_mtk.c | 2 +-
+ drivers/tty/serial/8250/8250_omap.c | 2 +-
+ drivers/tty/serial/8250/8250_port.c | 32 +++--
+ drivers/tty/serial/Kconfig | 2 +-
+ drivers/tty/serial/altera_jtaguart.c | 4 +-
+ drivers/tty/serial/altera_uart.c | 2 +-
+ drivers/tty/serial/amba-pl010.c | 2 +-
+ drivers/tty/serial/amba-pl011.c | 20 ++-
+ drivers/tty/serial/apbuart.c | 2 +-
+ drivers/tty/serial/ar933x_uart.c | 2 +-
+ drivers/tty/serial/arc_uart.c | 2 +-
+ drivers/tty/serial/atmel_serial.c | 5 +-
+ drivers/tty/serial/bcm63xx_uart.c | 5 +-
+ drivers/tty/serial/clps711x.c | 2 +-
+ drivers/tty/serial/cpm_uart/cpm_uart_core.c | 33 ++---
+ drivers/tty/serial/digicolor-usart.c | 2 +-
+ drivers/tty/serial/dz.c | 11 +-
+ drivers/tty/serial/earlycon.c | 6 +-
+ drivers/tty/serial/fsl_linflexuart.c | 2 +-
+ drivers/tty/serial/fsl_lpuart.c | 15 +--
+ drivers/tty/serial/icom.c | 5 +-
+ drivers/tty/serial/imx.c | 2 +-
+ drivers/tty/serial/ip22zilog.c | 2 +-
+ drivers/tty/serial/jsm/jsm_tty.c | 4 +-
+ drivers/tty/serial/lantiq.c | 4 +-
+ drivers/tty/serial/liteuart.c | 2 +-
+ drivers/tty/serial/lpc32xx_hs.c | 2 +-
+ drivers/tty/serial/max3100.c | 2 +-
+ drivers/tty/serial/max310x.c | 2 +-
+ drivers/tty/serial/mcf.c | 2 +-
+ drivers/tty/serial/men_z135_uart.c | 4 +-
+ drivers/tty/serial/meson_uart.c | 31 +----
+ drivers/tty/serial/milbeaut_usio.c | 3 +-
+ drivers/tty/serial/mpc52xx_uart.c | 12 +-
+ drivers/tty/serial/mps2-uart.c | 2 +-
+ drivers/tty/serial/msm_serial.c | 2 +-
+ drivers/tty/serial/mux.c | 2 +-
+ drivers/tty/serial/mvebu-uart.c | 2 +-
+ drivers/tty/serial/mxs-auart.c | 2 +-
+ drivers/tty/serial/omap-serial.c | 2 +-
+ drivers/tty/serial/owl-uart.c | 2 +-
+ drivers/tty/serial/pch_uart.c | 7 +-
+ drivers/tty/serial/pic32_uart.c | 52 ++------
+ drivers/tty/serial/pmac_zilog.c | 4 +-
+ drivers/tty/serial/pxa.c | 2 +-
+ drivers/tty/serial/qcom_geni_serial.c | 8 +-
+ drivers/tty/serial/rda-uart.c | 2 +-
+ drivers/tty/serial/rp2.c | 5 +-
+ drivers/tty/serial/sa1100.c | 2 +-
+ drivers/tty/serial/samsung_tty.c | 2 +-
+ drivers/tty/serial/sb1250-duart.c | 2 +-
+ drivers/tty/serial/sc16is7xx.c | 2 +-
+ drivers/tty/serial/sccnxp.c | 3 +-
+ drivers/tty/serial/serial-tegra.c | 15 +--
+ drivers/tty/serial/serial_core.c | 10 +-
+ drivers/tty/serial/serial_txx9.c | 2 +-
+ drivers/tty/serial/sh-sci.c | 8 +-
+ drivers/tty/serial/sifive.c | 2 +-
+ drivers/tty/serial/sprd_serial.c | 5 +-
+ drivers/tty/serial/st-asc.c | 2 +-
+ drivers/tty/serial/stm32-usart.c | 2 +-
+ drivers/tty/serial/sunhv.c | 2 +-
+ drivers/tty/serial/sunplus-uart.c | 2 +-
+ drivers/tty/serial/sunsab.c | 22 ++-
+ drivers/tty/serial/sunsu.c | 8 +-
+ drivers/tty/serial/sunzilog.c | 8 +-
+ drivers/tty/serial/tegra-tcu.c | 2 +-
+ drivers/tty/serial/timbuart.c | 4 +-
+ drivers/tty/serial/uartlite.c | 5 +-
+ drivers/tty/serial/ucc_uart.c | 18 +--
+ drivers/tty/serial/vt8500_serial.c | 2 +-
+ drivers/tty/serial/xilinx_uartps.c | 62 ++++++++-
+ drivers/tty/serial/zs.c | 2 +-
+ drivers/tty/synclink_gt.c | 3 +-
+ drivers/tty/tty.h | 2 +-
+ drivers/tty/tty_baudrate.c | 26 ++--
+ drivers/tty/tty_io.c | 2 +-
+ drivers/tty/tty_ioctl.c | 79 ++++++++++-
+ drivers/tty/vcc.c | 1 +
+ drivers/tty/vt/vt.c | 11 +-
+ drivers/usb/class/cdc-acm.c | 4 +-
+ drivers/usb/serial/ark3116.c | 2 +-
+ drivers/usb/serial/belkin_sa.c | 6 +-
+ drivers/usb/serial/ch341.c | 5 +-
+ drivers/usb/serial/cp210x.c | 13 +-
+ drivers/usb/serial/cypress_m8.c | 6 +-
+ drivers/usb/serial/digi_acceleport.c | 6 +-
+ drivers/usb/serial/f81232.c | 3 +-
+ drivers/usb/serial/f81534.c | 4 +-
+ drivers/usb/serial/ftdi_sio.c | 6 +-
+ drivers/usb/serial/io_edgeport.c | 7 +-
+ drivers/usb/serial/io_ti.c | 8 +-
+ drivers/usb/serial/ir-usb.c | 6 +-
+ drivers/usb/serial/iuu_phoenix.c | 3 +-
+ drivers/usb/serial/keyspan.c | 3 +-
+ drivers/usb/serial/keyspan_pda.c | 3 +-
+ drivers/usb/serial/kl5kusb105.c | 5 +-
+ drivers/usb/serial/kobil_sct.c | 6 +-
+ drivers/usb/serial/mct_u232.c | 5 +-
+ drivers/usb/serial/mos7720.c | 5 +-
+ drivers/usb/serial/mos7840.c | 5 +-
+ drivers/usb/serial/mxuport.c | 4 +-
+ drivers/usb/serial/oti6858.c | 6 +-
+ drivers/usb/serial/pl2303.c | 3 +-
+ drivers/usb/serial/quatech2.c | 4 +-
+ drivers/usb/serial/spcp8x5.c | 3 +-
+ drivers/usb/serial/ssu100.c | 4 +-
+ drivers/usb/serial/ti_usb_3410_5052.c | 6 +-
+ drivers/usb/serial/upd78f0730.c | 4 +-
+ drivers/usb/serial/usb-serial.c | 3 +-
+ drivers/usb/serial/whiteheat.c | 6 +-
+ drivers/usb/serial/xr_serial.c | 20 +--
+ include/asm-generic/termios-base.h | 78 -----------
+ include/asm-generic/termios.h | 108 ---------------
+ include/linux/serdev.h | 1 +
+ include/linux/serial_8250.h | 4 +-
+ include/linux/serial_core.h | 6 +-
+ include/linux/termios_internal.h | 49 +++++++
+ include/linux/tty.h | 4 +-
+ include/linux/tty_driver.h | 5 +-
+ include/linux/tty_ldisc.h | 4 +-
+ include/linux/usb/serial.h | 4 +-
+ include/linux/vt_kern.h | 1 -
+ kernel/panic.c | 3 -
+ lib/bust_spinlocks.c | 3 -
+ net/bluetooth/rfcomm/tty.c | 3 +-
+ 173 files changed, 748 insertions(+), 1250 deletions(-)
+ delete mode 100644 arch/alpha/include/asm/termios.h
+ create mode 100644 arch/alpha/kernel/termios.c
+ delete mode 100644 arch/ia64/include/asm/termios.h
+ delete mode 100644 arch/ia64/include/uapi/asm/termios.h
+ delete mode 100644 arch/mips/include/asm/termios.h
+ delete mode 100644 arch/parisc/include/asm/termios.h
+ delete mode 100644 arch/parisc/include/uapi/asm/termios.h
+ delete mode 100644 arch/powerpc/include/asm/termios.h
+ delete mode 100644 arch/s390/include/asm/termios.h
+ delete mode 100644 arch/s390/include/uapi/asm/termios.h
+ delete mode 100644 arch/sparc/include/asm/termios.h
+ create mode 100644 arch/sparc/kernel/termios.c
+ delete mode 100644 include/asm-generic/termios-base.h
+ delete mode 100644 include/asm-generic/termios.h
+ create mode 100644 include/linux/termios_internal.h
+Merging char-misc/char-misc-next (ceecbbddbf54 comedi: convert sysfs snprintf to sysfs_emit)
+$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/misc/eeprom/eeprom.c
+Auto-merging drivers/misc/eeprom/idt_89hpesx.c
+Auto-merging drivers/misc/ics932s401.c
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 32 +-
+ drivers/accessibility/speakup/speakup_dummy.c | 4 +
+ drivers/accessibility/speakup/speakup_soft.c | 32 +-
+ drivers/accessibility/speakup/spk_types.h | 2 +-
+ drivers/accessibility/speakup/varhandlers.c | 12 +-
+ drivers/android/binder_alloc.c | 55 +--
+ drivers/android/binder_alloc.h | 12 +-
+ drivers/android/binderfs.c | 31 +-
+ drivers/comedi/comedi_fops.c | 8 +-
+ drivers/ipack/ipack.c | 5 +-
+ drivers/misc/Kconfig | 1 +
+ drivers/misc/Makefile | 3 +-
+ drivers/misc/altera-stapl/altera.c | 8 +-
+ drivers/misc/bcm-vk/bcm_vk_dev.c | 8 +-
+ drivers/misc/eeprom/eeprom.c | 2 +-
+ drivers/misc/eeprom/idt_89hpesx.c | 2 +-
+ drivers/misc/fastrpc.c | 2 +-
+ drivers/misc/ics932s401.c | 2 +-
+ drivers/misc/mchp_pci1xxxx/Kconfig | 13 +
+ drivers/misc/mchp_pci1xxxx/Makefile | 1 +
+ drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.c | 167 +++++++++
+ drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.h | 28 ++
+ drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c | 428 ++++++++++++++++++++++++
+ drivers/misc/mei/bus-fixup.c | 2 +-
+ drivers/misc/ocxl/file.c | 2 +
+ drivers/misc/pci_endpoint_test.c | 34 +-
+ drivers/misc/vmw_vmci/vmci_queue_pair.c | 16 +-
+ drivers/misc/xilinx_sdfec.c | 3 +-
+ drivers/parport/parport_pc.c | 4 +
+ drivers/uio/uio_dfl.c | 2 +
+ drivers/virt/vboxguest/vboxguest_core.c | 2 +-
+ drivers/virt/vboxguest/vboxguest_linux.c | 16 +-
+ 32 files changed, 821 insertions(+), 118 deletions(-)
+ create mode 100644 drivers/misc/mchp_pci1xxxx/Kconfig
+ create mode 100644 drivers/misc/mchp_pci1xxxx/Makefile
+ create mode 100644 drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.c
+ create mode 100644 drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.h
+ create mode 100644 drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c
+Merging coresight/next (5fc1531dd771 hwtracing: hisi_ptt: Fix up for "iommu/dma: Make header private")
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next
+Auto-merging MAINTAINERS
+Auto-merging arch/arm64/include/asm/sysreg.h
+Auto-merging drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+Merge made by the 'ort' strategy.
+ .../ABI/testing/sysfs-bus-coresight-devices-etm4x | 8 +
+ Documentation/ABI/testing/sysfs-devices-hisi_ptt | 61 ++
+ .../bindings/arm/arm,coresight-catu.yaml | 3 +
+ .../devicetree/bindings/arm/arm,coresight-cti.yaml | 3 +
+ .../bindings/arm/arm,coresight-dynamic-funnel.yaml | 3 +
+ .../arm/arm,coresight-dynamic-replicator.yaml | 3 +
+ .../bindings/arm/arm,coresight-etb10.yaml | 3 +
+ .../devicetree/bindings/arm/arm,coresight-etm.yaml | 3 +
+ .../bindings/arm/arm,coresight-static-funnel.yaml | 3 +
+ .../arm/arm,coresight-static-replicator.yaml | 3 +
+ .../devicetree/bindings/arm/arm,coresight-stm.yaml | 3 +
+ .../devicetree/bindings/arm/arm,coresight-tmc.yaml | 6 +
+ .../bindings/arm/arm,coresight-tpiu.yaml | 3 +
+ .../bindings/arm/arm,embedded-trace-extension.yaml | 3 +
+ .../trace/coresight/coresight-cpu-debug.rst | 3 +-
+ .../trace/coresight/coresight-etm4x-reference.rst | 14 +
+ Documentation/trace/hisi-ptt.rst | 298 ++++++
+ Documentation/trace/index.rst | 1 +
+ MAINTAINERS | 8 +
+ arch/arm64/include/asm/sysreg.h | 1 +
+ drivers/Makefile | 1 +
+ drivers/hwtracing/Kconfig | 2 +
+ drivers/hwtracing/coresight/Kconfig | 4 +-
+ drivers/hwtracing/coresight/coresight-catu.c | 27 +-
+ drivers/hwtracing/coresight/coresight-catu.h | 8 +-
+ drivers/hwtracing/coresight/coresight-core.c | 28 +
+ drivers/hwtracing/coresight/coresight-cti-sysfs.c | 213 ++--
+ drivers/hwtracing/coresight/coresight-etb10.c | 28 +-
+ .../hwtracing/coresight/coresight-etm3x-sysfs.c | 34 +-
+ .../hwtracing/coresight/coresight-etm4x-sysfs.c | 29 +
+ drivers/hwtracing/coresight/coresight-priv.h | 74 +-
+ drivers/hwtracing/coresight/coresight-replicator.c | 10 +-
+ drivers/hwtracing/coresight/coresight-stm.c | 40 +-
+ drivers/hwtracing/coresight/coresight-tmc-core.c | 48 +-
+ drivers/hwtracing/coresight/coresight-tmc.h | 4 +-
+ drivers/hwtracing/ptt/Kconfig | 12 +
+ drivers/hwtracing/ptt/Makefile | 2 +
+ drivers/hwtracing/ptt/hisi_ptt.c | 1046 ++++++++++++++++++++
+ drivers/hwtracing/ptt/hisi_ptt.h | 200 ++++
+ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 21 +
+ include/linux/coresight.h | 23 +
+ 41 files changed, 1974 insertions(+), 313 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-devices-hisi_ptt
+ create mode 100644 Documentation/trace/hisi-ptt.rst
+ create mode 100644 drivers/hwtracing/ptt/Kconfig
+ create mode 100644 drivers/hwtracing/ptt/Makefile
+ create mode 100644 drivers/hwtracing/ptt/hisi_ptt.c
+ create mode 100644 drivers/hwtracing/ptt/hisi_ptt.h
+Merging fpga/for-next (562d0bf2cab8 fpga: m10bmc-sec: d5005 bmc secure update driver)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next
+Merge made by the 'ort' strategy.
+ .../bindings/fpga/microchip,mpf-spi-fpga-mgr.yaml | 7 ++++---
+ drivers/fpga/dfl-pci.c | 18 ++++++++++++++++++
+ drivers/fpga/dfl.c | 2 +-
+ drivers/fpga/intel-m10-bmc-sec-update.c | 3 +++
+ drivers/fpga/microchip-spi.c | 1 +
+ 5 files changed, 27 insertions(+), 4 deletions(-)
+Merging icc/icc-next (aff72c797ff0 Merge branch 'icc-ignore-return-val' into icc-next)
+$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next
+Merge made by the 'ort' strategy.
+ drivers/interconnect/core.c | 10 +++-------
+ drivers/interconnect/imx/imx.c | 4 ++--
+ drivers/interconnect/imx/imx.h | 2 +-
+ drivers/interconnect/imx/imx8mm.c | 4 +++-
+ drivers/interconnect/imx/imx8mn.c | 4 +++-
+ drivers/interconnect/imx/imx8mp.c | 4 +++-
+ drivers/interconnect/imx/imx8mq.c | 4 +++-
+ drivers/interconnect/qcom/icc-rpm.c | 4 +++-
+ drivers/interconnect/qcom/icc-rpmh.c | 4 +++-
+ drivers/interconnect/qcom/msm8974.c | 4 +++-
+ drivers/interconnect/qcom/osm-l3.c | 4 +++-
+ drivers/interconnect/qcom/sm8450.c | 4 +++-
+ include/linux/interconnect-provider.h | 5 ++---
+ 13 files changed, 35 insertions(+), 22 deletions(-)
+Merging iio/togreg (2f61ff827296 iio: pressure: icp10100: Switch from UNIVERSAL to DEFINE_RUNTIME_DEV_PM_OPS().)
+$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging MAINTAINERS
+Auto-merging drivers/iio/accel/kxcjk-1013.c
+Auto-merging drivers/iio/magnetometer/hmc5843_i2c.c
+Auto-merging drivers/iio/magnetometer/yamaha-yas530.c
+Auto-merging drivers/iio/temperature/mlx90632.c
+Auto-merging drivers/thermal/qcom/qcom-spmi-adc-tm5.c
+Auto-merging include/linux/string_helpers.h
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-bus-iio | 101 +-
+ Documentation/ABI/testing/sysfs-bus-iio-cdc-ad7746 | 11 +
+ .../bindings/iio/accel/adi,adis16201.yaml | 7 +-
+ .../bindings/iio/accel/adi,adis16240.yaml | 7 +-
+ .../devicetree/bindings/iio/accel/adi,adxl313.yaml | 7 +-
+ .../devicetree/bindings/iio/accel/adi,adxl345.yaml | 7 +-
+ .../devicetree/bindings/iio/accel/adi,adxl355.yaml | 7 +-
+ .../devicetree/bindings/iio/accel/adi,adxl367.yaml | 7 +-
+ .../devicetree/bindings/iio/accel/adi,adxl372.yaml | 7 +-
+ .../bindings/iio/accel/bosch,bma220.yaml | 7 +-
+ .../bindings/iio/accel/bosch,bma255.yaml | 5 +-
+ .../bindings/iio/accel/bosch,bmi088.yaml | 7 +-
+ .../devicetree/bindings/iio/accel/fsl,mma7455.yaml | 7 +-
+ .../bindings/iio/accel/kionix,kxsd9.yaml | 7 +-
+ .../bindings/iio/accel/memsensing,msa311.yaml | 53 +
+ .../bindings/iio/accel/murata,sca3300.yaml | 5 +-
+ .../bindings/iio/accel/nxp,fxls8962af.yaml | 7 +-
+ .../devicetree/bindings/iio/adc/adi,ad7124.yaml | 7 +-
+ .../devicetree/bindings/iio/adc/adi,ad7192.yaml | 7 +-
+ .../devicetree/bindings/iio/adc/adi,ad7280a.yaml | 7 +-
+ .../devicetree/bindings/iio/adc/adi,ad7292.yaml | 7 +-
+ .../devicetree/bindings/iio/adc/adi,ad7298.yaml | 6 +-
+ .../devicetree/bindings/iio/adc/adi,ad7476.yaml | 8 +-
+ .../devicetree/bindings/iio/adc/adi,ad7606.yaml | 7 +-
+ .../devicetree/bindings/iio/adc/adi,ad7768-1.yaml | 7 +-
+ .../devicetree/bindings/iio/adc/adi,ad7923.yaml | 8 +-
+ .../devicetree/bindings/iio/adc/adi,ad7949.yaml | 7 +-
+ .../devicetree/bindings/iio/adc/holt,hi8435.yaml | 7 +-
+ .../devicetree/bindings/iio/adc/lltc,ltc2496.yaml | 8 +-
+ .../devicetree/bindings/iio/adc/maxim,max1027.yaml | 5 +-
+ .../bindings/iio/adc/maxim,max11100.yaml | 7 +-
+ .../devicetree/bindings/iio/adc/maxim,max1118.yaml | 26 +-
+ .../bindings/iio/adc/maxim,max11205.yaml | 69 +
+ .../devicetree/bindings/iio/adc/maxim,max1241.yaml | 7 +-
+ .../bindings/iio/adc/microchip,mcp3201.yaml | 6 +-
+ .../bindings/iio/adc/microchip,mcp3911.yaml | 5 +-
+ .../bindings/iio/adc/qcom,spmi-vadc.yaml | 1 +
+ .../bindings/iio/adc/richtek,rtq6056.yaml | 56 +
+ .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 2 +
+ .../devicetree/bindings/iio/adc/st,stmpe-adc.yaml | 3 +-
+ .../devicetree/bindings/iio/adc/ti,adc0832.yaml | 7 +-
+ .../devicetree/bindings/iio/adc/ti,adc084s021.yaml | 7 +-
+ .../devicetree/bindings/iio/adc/ti,adc108s102.yaml | 6 +-
+ .../devicetree/bindings/iio/adc/ti,adc12138.yaml | 7 +-
+ .../devicetree/bindings/iio/adc/ti,adc128s052.yaml | 7 +-
+ .../devicetree/bindings/iio/adc/ti,adc161s626.yaml | 7 +-
+ .../devicetree/bindings/iio/adc/ti,ads1015.yaml | 1 +
+ .../devicetree/bindings/iio/adc/ti,ads124s08.yaml | 7 +-
+ .../devicetree/bindings/iio/adc/ti,ads131e08.yaml | 9 +-
+ .../devicetree/bindings/iio/adc/ti,ads8344.yaml | 7 +-
+ .../devicetree/bindings/iio/adc/ti,ads8688.yaml | 7 +-
+ .../devicetree/bindings/iio/adc/ti,am3359-adc.yaml | 11 +-
+ .../devicetree/bindings/iio/adc/ti,tlc4541.yaml | 7 +-
+ .../devicetree/bindings/iio/adc/ti,tsc2046.yaml | 8 +-
+ .../bindings/iio/adc/xlnx,zynqmp-ams.yaml | 1 +
+ .../bindings/iio/addac/adi,ad74413r.yaml | 1 +
+ .../bindings/iio/amplifiers/adi,ada4250.yaml | 7 +-
+ .../devicetree/bindings/iio/dac/adi,ad3552r.yaml | 1 +
+ .../devicetree/bindings/iio/dac/adi,ad5064.yaml | 7 +-
+ .../devicetree/bindings/iio/dac/adi,ad5360.yaml | 7 +-
+ .../devicetree/bindings/iio/dac/adi,ad5380.yaml | 9 +-
+ .../devicetree/bindings/iio/dac/adi,ad5421.yaml | 7 +-
+ .../devicetree/bindings/iio/dac/adi,ad5449.yaml | 7 +-
+ .../devicetree/bindings/iio/dac/adi,ad5624r.yaml | 9 +-
+ .../devicetree/bindings/iio/dac/adi,ad5686.yaml | 9 +-
+ .../devicetree/bindings/iio/dac/adi,ad5755.yaml | 9 +-
+ .../devicetree/bindings/iio/dac/adi,ad5758.yaml | 4 +-
+ .../devicetree/bindings/iio/dac/adi,ad5761.yaml | 7 +-
+ .../devicetree/bindings/iio/dac/adi,ad5764.yaml | 7 +-
+ .../devicetree/bindings/iio/dac/adi,ad5770r.yaml | 11 +-
+ .../devicetree/bindings/iio/dac/adi,ad5791.yaml | 9 +-
+ .../devicetree/bindings/iio/dac/adi,ad8801.yaml | 7 +-
+ .../devicetree/bindings/iio/dac/adi,ltc2688.yaml | 1 +
+ .../bindings/iio/dac/microchip,mcp4922.yaml | 9 +-
+ .../devicetree/bindings/iio/dac/ti,dac082s085.yaml | 9 +-
+ .../devicetree/bindings/iio/dac/ti,dac7311.yaml | 7 +-
+ .../devicetree/bindings/iio/dac/ti,dac7612.yaml | 7 +-
+ .../devicetree/bindings/iio/frequency/adf4371.yaml | 7 +-
+ .../devicetree/bindings/iio/health/ti,afe4403.yaml | 9 +-
+ .../devicetree/bindings/iio/imu/adi,adis16460.yaml | 7 +-
+ .../devicetree/bindings/iio/imu/adi,adis16480.yaml | 9 +-
+ .../devicetree/bindings/iio/imu/bosch,bmi160.yaml | 7 +-
+ .../bindings/iio/imu/invensense,icm42600.yaml | 6 +-
+ .../bindings/iio/imu/invensense,mpu6050.yaml | 5 +-
+ .../devicetree/bindings/iio/imu/nxp,fxos8700.yaml | 7 +-
+ .../devicetree/bindings/iio/imu/st,lsm6dsx.yaml | 9 +-
+ .../bindings/iio/light/liteon,ltrf216a.yaml | 49 +
+ .../iio/potentiometer/microchip,mcp41010.yaml | 9 +-
+ .../iio/potentiometer/microchip,mcp4131.yaml | 9 +-
+ .../bindings/iio/pressure/asc,dlhl60d.yaml | 2 +-
+ .../bindings/iio/samsung,sensorhub-rinato.yaml | 9 +-
+ .../bindings/iio/temperature/maxim,max31855k.yaml | 4 +-
+ .../bindings/iio/temperature/maxim,max31856.yaml | 6 +-
+ .../bindings/iio/temperature/maxim,max31865.yaml | 6 +-
+ .../bindings/iio/temperature/melexis,mlx90632.yaml | 4 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ MAINTAINERS | 40 +-
+ drivers/iio/accel/Kconfig | 13 +
+ drivers/iio/accel/Makefile | 2 +
+ drivers/iio/accel/adxl345_core.c | 7 +-
+ drivers/iio/accel/bma400.h | 14 +
+ drivers/iio/accel/bma400_core.c | 343 ++++-
+ drivers/iio/accel/kxcjk-1013.c | 2 +-
+ drivers/iio/accel/msa311.c | 1321 ++++++++++++++++++++
+ drivers/iio/adc/Kconfig | 45 +-
+ drivers/iio/adc/Makefile | 3 +-
+ drivers/iio/adc/ab8500-gpadc.c | 27 +-
+ drivers/iio/adc/ad7124.c | 15 +-
+ drivers/iio/adc/ad7768-1.c | 17 +-
+ drivers/iio/adc/ad9467.c | 17 +-
+ drivers/iio/adc/at91-sama5d2_adc.c | 714 +++++++++--
+ drivers/iio/adc/imx8qxp-adc.c | 8 +-
+ drivers/iio/adc/ingenic-adc.c | 23 +-
+ drivers/iio/adc/lpc18xx_adc.c | 18 +-
+ drivers/iio/adc/max11205.c | 183 +++
+ drivers/iio/adc/max1363.c | 6 -
+ drivers/iio/adc/mt6360-adc.c | 2 +-
+ drivers/iio/adc/qcom-pm8xxx-xoadc.c | 58 +-
+ drivers/iio/adc/qcom-spmi-adc5.c | 73 +-
+ drivers/iio/adc/qcom-spmi-vadc.c | 44 +-
+ drivers/iio/adc/rtq6056.c | 661 ++++++++++
+ drivers/iio/adc/stm32-adc.c | 128 +-
+ drivers/iio/adc/ti-ads131e08.c | 19 +-
+ drivers/iio/adc/ti-tsc2046.c | 69 +-
+ drivers/iio/adc/xilinx-ams.c | 15 +-
+ drivers/iio/adc/xilinx-xadc-core.c | 18 +-
+ drivers/iio/addac/Kconfig | 16 +
+ drivers/iio/addac/Makefile | 1 +
+ drivers/iio/{adc => addac}/stx104.c | 0
+ drivers/iio/cdc/Kconfig | 10 +
+ drivers/iio/cdc/Makefile | 1 +
+ drivers/{staging => }/iio/cdc/ad7746.c | 441 ++++---
+ drivers/iio/common/scmi_sensors/scmi_iio.c | 8 +-
+ drivers/iio/common/st_sensors/st_sensors_core.c | 2 +-
+ drivers/iio/frequency/adf4371.c | 17 +-
+ drivers/iio/frequency/admv1014.c | 3 +-
+ drivers/iio/frequency/adrf6780.c | 16 +-
+ drivers/iio/imu/adis16475.c | 15 +-
+ drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 4 +-
+ drivers/iio/industrialio-buffer.c | 5 +-
+ drivers/iio/industrialio-core.c | 19 +-
+ drivers/iio/industrialio-event.c | 14 +-
+ drivers/iio/industrialio-trigger.c | 1 +
+ drivers/iio/inkern.c | 272 ++--
+ drivers/iio/light/Kconfig | 11 +
+ drivers/iio/light/Makefile | 1 +
+ drivers/iio/light/ltrf216a.c | 550 ++++++++
+ drivers/iio/magnetometer/Kconfig | 4 +-
+ drivers/iio/magnetometer/hmc5843.h | 13 +-
+ drivers/iio/magnetometer/hmc5843_core.c | 8 +-
+ drivers/iio/magnetometer/hmc5843_i2c.c | 2 +-
+ drivers/iio/magnetometer/hmc5843_spi.c | 14 +-
+ drivers/iio/magnetometer/yamaha-yas530.c | 855 ++++++++++---
+ drivers/iio/pressure/dlhl60d.c | 5 +-
+ drivers/iio/pressure/icp10100.c | 10 +-
+ drivers/iio/temperature/mlx90632.c | 61 +-
+ drivers/iio/test/iio-test-rescale.c | 4 +-
+ drivers/staging/iio/Kconfig | 1 -
+ drivers/staging/iio/Makefile | 1 -
+ drivers/staging/iio/cdc/Kconfig | 17 -
+ drivers/staging/iio/cdc/Makefile | 6 -
+ drivers/staging/iio/frequency/ad9832.c | 4 +-
+ drivers/staging/iio/frequency/ad9834.c | 2 +-
+ drivers/staging/iio/meter/ade7854.h | 2 +-
+ drivers/staging/iio/resolver/ad2s1210.c | 4 +-
+ drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 3 +-
+ include/dt-bindings/iio/adc/at91-sama5d2_adc.h | 3 +
+ include/linux/iio/consumer.h | 28 +-
+ include/linux/iio/iio-opaque.h | 2 +
+ include/linux/iio/iio.h | 8 +-
+ include/linux/iio/types.h | 3 +
+ include/linux/string_helpers.h | 5 +
+ include/linux/units.h | 3 +
+ include/uapi/linux/iio/types.h | 3 +
+ tools/iio/iio_event_monitor.c | 8 +-
+ 175 files changed, 5989 insertions(+), 1350 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-cdc-ad7746
+ create mode 100644 Documentation/devicetree/bindings/iio/accel/memsensing,msa311.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/maxim,max11205.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/richtek,rtq6056.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/light/liteon,ltrf216a.yaml
+ create mode 100644 drivers/iio/accel/msa311.c
+ create mode 100644 drivers/iio/adc/max11205.c
+ create mode 100644 drivers/iio/adc/rtq6056.c
+ rename drivers/iio/{adc => addac}/stx104.c (100%)
+ rename drivers/{staging => }/iio/cdc/ad7746.c (66%)
+ create mode 100644 drivers/iio/light/ltrf216a.c
+ delete mode 100644 drivers/staging/iio/cdc/Kconfig
+ delete mode 100644 drivers/staging/iio/cdc/Makefile
+Merging phy-next/next (af96579dc317 phy: ti: gmii-sel: Add support for CPSW5G GMII SEL in J7200)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next
+Auto-merging Documentation/devicetree/bindings/mfd/ti,j721e-system-controller.yaml
+Auto-merging Documentation/devicetree/bindings/phy/cdns,dphy-rx.yaml
+Auto-merging Documentation/devicetree/bindings/phy/cdns,dphy.yaml
+Auto-merging Documentation/devicetree/bindings/phy/rockchip-inno-csi-dphy.yaml
+Auto-merging Documentation/devicetree/bindings/phy/samsung,ufs-phy.yaml
+Auto-merging MAINTAINERS
+Auto-merging drivers/phy/microchip/lan966x_serdes.c
+Auto-merging drivers/phy/tegra/xusb.c
+Merge made by the 'ort' strategy.
+ .../bindings/mfd/ti,j721e-system-controller.yaml | 6 +
+ .../bindings/phy/brcm,cygnus-pcie-phy.yaml | 1 +
+ .../devicetree/bindings/phy/cdns,dphy-rx.yaml | 2 +-
+ .../devicetree/bindings/phy/cdns,dphy.yaml | 2 +-
+ .../bindings/phy/mscc,vsc7514-serdes.yaml | 56 +++
+ .../devicetree/bindings/phy/phy-ocelot-serdes.txt | 43 --
+ .../bindings/phy/phy-rockchip-inno-usb2.yaml | 1 +
+ .../devicetree/bindings/phy/phy-stm32-usbphyc.yaml | 2 +
+ .../devicetree/bindings/phy/qcom,edp-phy.yaml | 2 +
+ .../bindings/phy/qcom,msm8996-qmp-pcie-phy.yaml | 189 ++++++++
+ .../devicetree/bindings/phy/qcom,qmp-pcie-phy.yaml | 296 ++++++++++++
+ .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 502 ---------------------
+ .../devicetree/bindings/phy/qcom,qmp-ufs-phy.yaml | 239 ++++++++++
+ .../devicetree/bindings/phy/qcom,qmp-usb-phy.yaml | 401 ++++++++++++++++
+ .../bindings/phy/qcom,qmp-usb3-dp-phy.yaml | 25 +-
+ .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 89 ++++
+ .../bindings/phy/rockchip,pcie3-phy.yaml | 80 ++++
+ .../bindings/phy/rockchip-inno-csi-dphy.yaml | 1 +
+ .../devicetree/bindings/phy/samsung,ufs-phy.yaml | 47 +-
+ .../bindings/phy/sunplus,sp7021-usb2-phy.yaml | 73 +++
+ .../devicetree/bindings/phy/ti,phy-gmii-sel.yaml | 27 +-
+ .../devicetree/bindings/phy/ti,phy-j721e-wiz.yaml | 27 +-
+ MAINTAINERS | 10 +
+ drivers/phy/Kconfig | 1 +
+ drivers/phy/Makefile | 1 +
+ drivers/phy/allwinner/phy-sun4i-usb.c | 2 +-
+ drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c | 32 +-
+ drivers/phy/microchip/lan966x_serdes.c | 99 +++-
+ drivers/phy/microchip/lan966x_serdes_regs.h | 42 ++
+ drivers/phy/qualcomm/phy-qcom-edp.c | 221 ++++++++-
+ drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 477 ++++++++++++++++++--
+ drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 8 +-
+ drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 149 +++---
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-v5.h | 13 +
+ .../qualcomm/phy-qcom-qmp-qserdes-txrx-v5_5nm.h | 333 ++++++++++++++
+ drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 1 -
+ drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 142 +++++-
+ drivers/phy/qualcomm/phy-qcom-qmp.h | 1 +
+ drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 255 ++++++++++-
+ drivers/phy/rockchip/Kconfig | 9 +
+ drivers/phy/rockchip/Makefile | 1 +
+ drivers/phy/rockchip/phy-rockchip-inno-csidphy.c | 24 +
+ drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 10 +-
+ drivers/phy/rockchip/phy-rockchip-snps-pcie3.c | 319 +++++++++++++
+ drivers/phy/sunplus/Kconfig | 12 +
+ drivers/phy/sunplus/Makefile | 2 +
+ drivers/phy/sunplus/phy-sunplus-usb2.c | 296 ++++++++++++
+ drivers/phy/tegra/xusb.c | 2 +-
+ drivers/phy/ti/phy-gmii-sel.c | 47 +-
+ drivers/phy/ti/phy-j721e-wiz.c | 230 +++++++++-
+ include/dt-bindings/phy/phy.h | 1 +
+ include/linux/phy/pcie.h | 12 +
+ 52 files changed, 4072 insertions(+), 791 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/phy/mscc,vsc7514-serdes.yaml
+ delete mode 100644 Documentation/devicetree/bindings/phy/phy-ocelot-serdes.txt
+ create mode 100644 Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-pcie-phy.yaml
+ create mode 100644 Documentation/devicetree/bindings/phy/qcom,qmp-pcie-phy.yaml
+ delete mode 100644 Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml
+ create mode 100644 Documentation/devicetree/bindings/phy/qcom,qmp-ufs-phy.yaml
+ create mode 100644 Documentation/devicetree/bindings/phy/qcom,qmp-usb-phy.yaml
+ create mode 100644 Documentation/devicetree/bindings/phy/rockchip,pcie3-phy.yaml
+ create mode 100644 Documentation/devicetree/bindings/phy/sunplus,sp7021-usb2-phy.yaml
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v5_5nm.h
+ create mode 100644 drivers/phy/rockchip/phy-rockchip-snps-pcie3.c
+ create mode 100644 drivers/phy/sunplus/Kconfig
+ create mode 100644 drivers/phy/sunplus/Makefile
+ create mode 100644 drivers/phy/sunplus/phy-sunplus-usb2.c
+ create mode 100644 include/linux/phy/pcie.h
+Merging soundwire/next (279e46bc2986 soundwire: intel: cleanup WakeEnable and WakeStatus)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next
+Auto-merging drivers/soundwire/bus.c
+Auto-merging drivers/soundwire/intel.c
+Auto-merging drivers/soundwire/qcom.c
+Auto-merging include/linux/soundwire/sdw.h
+Merge made by the 'ort' strategy.
+ drivers/soundwire/bus.c | 46 ++++++++++++++++-----------
+ drivers/soundwire/dmi-quirks.c | 27 ++++++++++++++++
+ drivers/soundwire/intel.c | 23 ++++++++------
+ drivers/soundwire/intel_init.c | 2 +-
+ drivers/soundwire/qcom.c | 5 ++-
+ include/linux/soundwire/sdw.h | 4 +++
+ include/linux/soundwire/sdw_intel.h | 63 ++++++++++++++++++++++---------------
+ 7 files changed, 113 insertions(+), 57 deletions(-)
+Merging extcon/extcon-next (822a6200734c extcon: usbc-tusb320: Add USB TYPE-C support)
+$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next
+Merge made by the 'ort' strategy.
+ drivers/extcon/Kconfig | 2 +-
+ drivers/extcon/extcon-usbc-tusb320.c | 230 +++++++++++++++++++++++++++++++----
+ 2 files changed, 204 insertions(+), 28 deletions(-)
+Merging gnss/gnss-next (c0c725d7350e gnss: replace ida_simple API)
+$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next
+Merge made by the 'ort' strategy.
+ drivers/gnss/core.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging vfio/next (f39856aacb07 vfio/mlx5: Set the driver DMA logging callbacks)
+$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next
+Merge made by the 'ort' strategy.
+ drivers/vfio/Kconfig | 1 +
+ drivers/vfio/Makefile | 6 +-
+ drivers/vfio/fsl-mc/vfio_fsl_mc.c | 4 +-
+ drivers/vfio/iova_bitmap.c | 422 +++++++++
+ drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 20 +-
+ drivers/vfio/pci/mlx5/cmd.c | 995 +++++++++++++++++++++-
+ drivers/vfio/pci/mlx5/cmd.h | 63 +-
+ drivers/vfio/pci/mlx5/main.c | 9 +-
+ drivers/vfio/pci/vfio_pci.c | 2 +-
+ drivers/vfio/pci/vfio_pci_config.c | 4 +-
+ drivers/vfio/pci/vfio_pci_core.c | 1082 +++++++++++++++---------
+ drivers/vfio/pci/vfio_pci_igd.c | 8 +-
+ drivers/vfio/pci/vfio_pci_intrs.c | 34 +-
+ drivers/vfio/pci/vfio_pci_priv.h | 104 +++
+ drivers/vfio/pci/vfio_pci_rdwr.c | 6 +-
+ drivers/vfio/pci/vfio_pci_zdev.c | 2 +-
+ drivers/vfio/vfio_main.c | 397 +++++++--
+ include/linux/iova_bitmap.h | 26 +
+ include/linux/vfio.h | 28 +-
+ include/linux/vfio_pci_core.h | 143 +---
+ include/uapi/linux/vfio.h | 142 ++++
+ 21 files changed, 2822 insertions(+), 676 deletions(-)
+ create mode 100644 drivers/vfio/iova_bitmap.c
+ create mode 100644 drivers/vfio/pci/vfio_pci_priv.h
+ create mode 100644 include/linux/iova_bitmap.h
+Merging staging/staging-next (9634b371b66a staging: wlan-ng: remove unused p80211wext_handler_def declaration)
+$ 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 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+Auto-merging drivers/staging/sm750fb/sm750.c
+Merge made by the 'ort' strategy.
+ drivers/staging/greybus/audio_helper.c | 11 -
+ drivers/staging/pi433/rf69.c | 2 +-
+ drivers/staging/r8188eu/Makefile | 5 -
+ drivers/staging/r8188eu/core/rtw_ap.c | 42 ++++
+ drivers/staging/r8188eu/core/rtw_cmd.c | 75 +++++--
+ drivers/staging/r8188eu/core/rtw_fw.c | 2 +-
+ drivers/staging/r8188eu/core/rtw_ioctl_set.c | 13 +-
+ drivers/staging/r8188eu/core/rtw_led.c | 116 ++++------
+ drivers/staging/r8188eu/core/rtw_mlme.c | 152 +++++++++++--
+ drivers/staging/r8188eu/core/rtw_mlme_ext.c | 83 +++++--
+ drivers/staging/r8188eu/core/rtw_p2p.c | 19 +-
+ drivers/staging/r8188eu/core/rtw_pwrctrl.c | 2 +-
+ drivers/staging/r8188eu/core/rtw_recv.c | 199 ++++++++++++++++-
+ drivers/staging/r8188eu/core/rtw_sta_mgt.c | 27 ++-
+ drivers/staging/r8188eu/core/rtw_wlan_util.c | 45 +---
+ drivers/staging/r8188eu/core/rtw_xmit.c | 237 +++++++++++++++++---
+ drivers/staging/r8188eu/hal/hal_com.c | 173 ---------------
+ drivers/staging/r8188eu/hal/odm_HWConfig.c | 5 -
+ drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 1 -
+ drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 40 ++--
+ drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 30 +--
+ drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 2 +-
+ drivers/staging/r8188eu/hal/rtl8188e_xmit.c | 22 --
+ drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 91 --------
+ drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 4 +-
+ drivers/staging/r8188eu/hal/usb_halinit.c | 203 ++++++++---------
+ drivers/staging/r8188eu/hal/usb_ops_linux.c | 14 ++
+ drivers/staging/r8188eu/include/drv_types.h | 7 +-
+ drivers/staging/r8188eu/include/hal_com.h | 4 -
+ drivers/staging/r8188eu/include/hal_intf.h | 5 +-
+ drivers/staging/r8188eu/include/ioctl_cfg80211.h | 89 --------
+ drivers/staging/r8188eu/include/mlme_osdep.h | 19 --
+ drivers/staging/r8188eu/include/odm_HWConfig.h | 1 -
+ drivers/staging/r8188eu/include/recv_osdep.h | 7 -
+ drivers/staging/r8188eu/include/rtl8188e_hal.h | 10 +-
+ drivers/staging/r8188eu/include/rtl8188e_recv.h | 2 -
+ drivers/staging/r8188eu/include/rtl8188e_spec.h | 12 +-
+ drivers/staging/r8188eu/include/rtl8188e_xmit.h | 8 -
+ drivers/staging/r8188eu/include/rtw_ap.h | 2 -
+ drivers/staging/r8188eu/include/rtw_cmd.h | 4 +-
+ drivers/staging/r8188eu/include/rtw_mlme.h | 20 +-
+ drivers/staging/r8188eu/include/rtw_mlme_ext.h | 4 -
+ drivers/staging/r8188eu/include/rtw_xmit.h | 16 +-
+ drivers/staging/r8188eu/include/wlan_bssdef.h | 4 -
+ drivers/staging/r8188eu/include/xmit_osdep.h | 49 -----
+ drivers/staging/r8188eu/os_dep/ioctl_linux.c | 16 +-
+ drivers/staging/r8188eu/os_dep/mlme_linux.c | 205 ------------------
+ drivers/staging/r8188eu/os_dep/os_intfs.c | 15 +-
+ drivers/staging/r8188eu/os_dep/osdep_service.c | 10 +-
+ drivers/staging/r8188eu/os_dep/recv_linux.c | 165 --------------
+ drivers/staging/r8188eu/os_dep/usb_intf.c | 58 ++---
+ drivers/staging/r8188eu/os_dep/xmit_linux.c | 237 --------------------
+ drivers/staging/rtl8192e/Kconfig | 12 +-
+ drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 -
+ drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 6 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 252 +++++-----------------
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 12 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 10 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 22 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 52 ++---
+ drivers/staging/rtl8192e/rtllib.h | 2 +-
+ drivers/staging/rtl8192e/rtllib_softmac.c | 2 +-
+ drivers/staging/rtl8192e/rtllib_tx.c | 4 +-
+ drivers/staging/rtl8192u/Makefile | 1 +
+ drivers/staging/rtl8192u/r8192U.h | 9 +
+ drivers/staging/rtl8192u/r8192U_core.c | 226 ++++---------------
+ drivers/staging/rtl8192u/r8192U_debugfs.c | 188 ++++++++++++++++
+ drivers/staging/rtl8712/xmit_linux.c | 18 +-
+ drivers/staging/rtl8712/xmit_osdep.h | 2 +-
+ drivers/staging/rtl8723bs/Makefile | 2 -
+ drivers/staging/rtl8723bs/core/rtw_cmd.c | 84 --------
+ drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 17 --
+ drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +-
+ drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 21 --
+ drivers/staging/rtl8723bs/core/rtw_odm.c | 195 -----------------
+ drivers/staging/rtl8723bs/hal/hal_btcoex.c | 5 -
+ drivers/staging/rtl8723bs/hal/hal_com.c | 119 ----------
+ drivers/staging/rtl8723bs/hal/hal_intf.c | 5 -
+ drivers/staging/rtl8723bs/hal/odm.h | 2 -
+ drivers/staging/rtl8723bs/hal/odm_DIG.c | 57 -----
+ drivers/staging/rtl8723bs/hal/odm_DIG.h | 2 -
+ drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c | 130 -----------
+ drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h | 39 ----
+ drivers/staging/rtl8723bs/hal/odm_precomp.h | 1 -
+ drivers/staging/rtl8723bs/include/drv_types.h | 3 -
+ drivers/staging/rtl8723bs/include/hal_btcoex.h | 1 -
+ drivers/staging/rtl8723bs/include/hal_com.h | 9 -
+ drivers/staging/rtl8723bs/include/hal_intf.h | 2 -
+ drivers/staging/rtl8723bs/include/ieee80211.h | 1 -
+ drivers/staging/rtl8723bs/include/rtw_cmd.h | 3 -
+ drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 1 -
+ drivers/staging/rtl8723bs/include/rtw_odm.h | 28 ---
+ drivers/staging/rtl8723bs/include/xmit_osdep.h | 4 +-
+ drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 3 +-
+ drivers/staging/rtl8723bs/os_dep/osdep_service.c | 50 -----
+ drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 17 +-
+ drivers/staging/sm750fb/sm750.c | 12 +-
+ drivers/staging/vme_user/vme_tsi148.c | 70 +++---
+ drivers/staging/vt6655/baseband.c | 2 +-
+ drivers/staging/vt6655/card.c | 30 +--
+ drivers/staging/vt6655/channel.c | 4 +-
+ drivers/staging/vt6655/device_main.c | 98 ++++++---
+ drivers/staging/vt6655/mac.c | 141 +++++-------
+ drivers/staging/vt6655/mac.h | 124 +----------
+ drivers/staging/wlan-ng/p80211netdev.h | 2 -
+ 105 files changed, 1580 insertions(+), 3109 deletions(-)
+ delete mode 100644 drivers/staging/r8188eu/hal/rtl8188e_xmit.c
+ delete mode 100644 drivers/staging/r8188eu/hal/rtl8188eu_recv.c
+ delete mode 100644 drivers/staging/r8188eu/include/ioctl_cfg80211.h
+ delete mode 100644 drivers/staging/r8188eu/include/mlme_osdep.h
+ delete mode 100644 drivers/staging/r8188eu/include/xmit_osdep.h
+ delete mode 100644 drivers/staging/r8188eu/os_dep/mlme_linux.c
+ delete mode 100644 drivers/staging/r8188eu/os_dep/recv_linux.c
+ delete mode 100644 drivers/staging/r8188eu/os_dep/xmit_linux.c
+ create mode 100644 drivers/staging/rtl8192u/r8192U_debugfs.c
+ delete mode 100644 drivers/staging/rtl8723bs/core/rtw_odm.c
+ delete mode 100644 drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c
+ delete mode 100644 drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h
+ delete mode 100644 drivers/staging/rtl8723bs/include/rtw_odm.h
+Merging counter-next/counter-next (a12224997bec counter: Move symbols into COUNTER namespace)
+$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/counter/104-quad-8.c
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 2 +-
+ drivers/counter/104-quad-8.c | 1 +
+ drivers/counter/counter-chrdev.c | 2 +-
+ drivers/counter/counter-core.c | 14 +++++++-------
+ drivers/counter/ftm-quaddec.c | 1 +
+ drivers/counter/intel-qep.c | 1 +
+ drivers/counter/interrupt-cnt.c | 1 +
+ drivers/counter/microchip-tcb-capture.c | 1 +
+ drivers/counter/stm32-lptimer-cnt.c | 1 +
+ drivers/counter/stm32-timer-cnt.c | 1 +
+ drivers/counter/ti-eqep.c | 1 +
+ 11 files changed, 17 insertions(+), 9 deletions(-)
+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 (84dd3b2b95ef dmaengine: dw-axi-dmac: Drop obsolete dependency on COMPILE_TEST)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ Documentation/arm/index.rst | 1 +
+ .../arm/stm32/stm32-dma-mdma-chaining.rst | 415 +++++++++++++
+ .../devicetree/bindings/dma/arm,pl330.yaml | 6 +
+ .../devicetree/bindings/dma/mediatek,uart-dma.yaml | 1 +
+ .../devicetree/bindings/dma/qcom,gpi.yaml | 1 +
+ MAINTAINERS | 1 +
+ drivers/dma/Kconfig | 2 +-
+ drivers/dma/at_xdmac.c | 5 +-
+ drivers/dma/hisi_dma.c | 650 ++++++++++++++++++---
+ drivers/dma/hsu/hsu.c | 8 +
+ drivers/dma/hsu/hsu.h | 12 +-
+ drivers/dma/hsu/pci.c | 47 +-
+ drivers/dma/idxd/irq.c | 2 -
+ drivers/dma/pl330.c | 4 -
+ drivers/dma/qcom/gpi.c | 1 +
+ drivers/dma/sf-pdma/sf-pdma.c | 8 +-
+ drivers/dma/stm32-dma.c | 136 +++--
+ drivers/dma/stm32-dmamux.c | 12 +-
+ drivers/dma/stm32-mdma.c | 70 ++-
+ drivers/dma/ti/k3-udma.c | 25 +-
+ include/linux/dma/hsu.h | 6 +-
+ include/linux/platform_data/dma-hsu.h | 2 +-
+ 22 files changed, 1198 insertions(+), 217 deletions(-)
+ create mode 100644 Documentation/arm/stm32/stm32-dma-mdma-chaining.rst
+Merging cgroup/for-next (a2675ab75dff Merge branch 'for-6.1' 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
+Auto-merging Documentation/admin-guide/cgroup-v2.rst
+Auto-merging MAINTAINERS
+Auto-merging include/linux/cgroup-defs.h
+Auto-merging include/linux/cgroup.h
+Auto-merging kernel/cgroup/cgroup.c
+CONFLICT (content): Merge conflict in kernel/cgroup/cgroup.c
+Resolved 'kernel/cgroup/cgroup.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master b4fc3b4a0c34] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/cgroup-v2.rst | 156 +++--
+ MAINTAINERS | 1 +
+ block/blk-cgroup-fc-appid.c | 4 +-
+ include/linux/cgroup-defs.h | 18 +-
+ include/linux/cgroup.h | 13 +-
+ kernel/cgroup/cgroup-internal.h | 2 +
+ kernel/cgroup/cgroup-v1.c | 6 +-
+ kernel/cgroup/cgroup.c | 129 ++--
+ kernel/cgroup/cpuset.c | 815 ++++++++++++++--------
+ kernel/cgroup/pids.c | 37 +-
+ mm/memcontrol.c | 4 +-
+ net/netfilter/nft_socket.c | 9 +-
+ tools/perf/util/bpf_skel/bperf_cgroup.bpf.c | 2 +-
+ tools/testing/selftests/cgroup/.gitignore | 1 +
+ tools/testing/selftests/cgroup/Makefile | 5 +-
+ tools/testing/selftests/cgroup/test_cpuset_prs.sh | 674 ++++++++++++++++++
+ tools/testing/selftests/cgroup/wait_inotify.c | 87 +++
+ 17 files changed, 1533 insertions(+), 430 deletions(-)
+ create mode 100755 tools/testing/selftests/cgroup/test_cpuset_prs.sh
+ create mode 100644 tools/testing/selftests/cgroup/wait_inotify.c
+$ git am -3 ../patches/0001-sched-psi-fix-up-for-cgroup-Remove-CFTYPE_PRESSURE.patch
+Applying: sched/psi: fix up for "cgroup: Remove CFTYPE_PRESSURE"
+$ git reset HEAD^
+Unstaged changes after reset:
+M kernel/cgroup/cgroup.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 1aa71b4ba218] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
+ Date: Fri Sep 16 13:40:47 2022 +1000
+Merging scsi/for-next (002e36fc62e9 Merge branch 'fixes' 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 drivers/scsi/megaraid/megaraid_sas_base.c
+Auto-merging drivers/scsi/mpi3mr/mpi3mr_os.c
+Auto-merging drivers/scsi/mpt3sas/mpt3sas_scsih.c
+Auto-merging drivers/scsi/qla2xxx/qla_os.c
+Auto-merging drivers/ufs/core/ufshcd.c
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-driver-ufs | 9 +
+ Documentation/scsi/ChangeLog.lpfc | 2 +-
+ drivers/message/fusion/mptctl.c | 6 +-
+ drivers/scsi/hpsa.c | 12 +-
+ drivers/scsi/initio.c | 2 +-
+ drivers/scsi/lpfc/lpfc.h | 27 +-
+ drivers/scsi/lpfc/lpfc_attr.c | 344 +--
+ drivers/scsi/lpfc/lpfc_bsg.c | 5 +-
+ drivers/scsi/lpfc/lpfc_crtn.h | 8 +
+ drivers/scsi/lpfc/lpfc_ct.c | 7 +-
+ drivers/scsi/lpfc/lpfc_debugfs.c | 59 +-
+ drivers/scsi/lpfc/lpfc_debugfs.h | 4 +-
+ drivers/scsi/lpfc/lpfc_disc.h | 3 +-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 18 -
+ drivers/scsi/lpfc/lpfc_hw4.h | 4 +
+ drivers/scsi/lpfc/lpfc_init.c | 83 +-
+ drivers/scsi/lpfc/lpfc_mem.c | 11 +-
+ drivers/scsi/lpfc/lpfc_scsi.c | 59 -
+ drivers/scsi/lpfc/lpfc_scsi.h | 6 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 200 +-
+ drivers/scsi/lpfc/lpfc_version.h | 2 +-
+ drivers/scsi/lpfc/lpfc_vport.c | 71 -
+ drivers/scsi/lpfc/lpfc_vport.h | 6 +-
+ drivers/scsi/megaraid/megaraid_sas_base.c | 24 +-
+ drivers/scsi/megaraid/megaraid_sas_fp.c | 6 +-
+ drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 +-
+ drivers/scsi/megaraid/megaraid_sas_fusion.h | 12 +-
+ drivers/scsi/mpi3mr/Makefile | 1 +
+ drivers/scsi/mpi3mr/mpi3mr.h | 240 +-
+ drivers/scsi/mpi3mr/mpi3mr_debug.h | 27 +
+ drivers/scsi/mpi3mr/mpi3mr_fw.c | 892 +++++++-
+ drivers/scsi/mpi3mr/mpi3mr_os.c | 444 +++-
+ drivers/scsi/mpi3mr/mpi3mr_transport.c | 3283 +++++++++++++++++++++++++++
+ drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 1 +
+ drivers/scsi/mpt3sas/mpt3sas_base.c | 194 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.h | 39 +-
+ drivers/scsi/mpt3sas/mpt3sas_config.c | 124 +
+ drivers/scsi/mpt3sas/mpt3sas_ctl.c | 12 +
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 21 +-
+ drivers/scsi/qla2xxx/qla_bsg.c | 8 +-
+ drivers/scsi/qla2xxx/qla_bsg.h | 3 +-
+ drivers/scsi/qla2xxx/qla_dbg.c | 50 +-
+ drivers/scsi/qla2xxx/qla_dbg.h | 43 +
+ drivers/scsi/qla2xxx/qla_def.h | 7 +
+ drivers/scsi/qla2xxx/qla_dfs.c | 93 +
+ drivers/scsi/qla2xxx/qla_fw.h | 3 +
+ drivers/scsi/qla2xxx/qla_gbl.h | 3 +-
+ drivers/scsi/qla2xxx/qla_init.c | 8 +-
+ drivers/scsi/qla2xxx/qla_isr.c | 22 +-
+ drivers/scsi/qla2xxx/qla_os.c | 49 +-
+ drivers/scsi/qla2xxx/qla_target.c | 73 +-
+ drivers/scsi/qla2xxx/qla_target.h | 4 -
+ drivers/scsi/qla2xxx/qla_version.h | 4 +-
+ drivers/scsi/st.c | 3 +-
+ drivers/target/target_core_pscsi.c | 2 +-
+ drivers/ufs/core/ufs-sysfs.c | 50 +-
+ drivers/ufs/core/ufshcd-priv.h | 6 +
+ drivers/ufs/core/ufshcd.c | 95 +-
+ drivers/ufs/host/ufs-mediatek-trace.h | 27 +-
+ drivers/ufs/host/ufs-mediatek.c | 205 +-
+ drivers/ufs/host/ufs-mediatek.h | 7 +
+ drivers/ufs/host/ufs-qcom.c | 2 +-
+ include/ufs/ufshcd.h | 26 +-
+ 63 files changed, 6119 insertions(+), 944 deletions(-)
+ create mode 100644 drivers/scsi/mpi3mr/mpi3mr_transport.c
+Merging scsi-mkp/for-next (7f615c1b5986 scsi: scsi_transport_fc: Use %u for dev_loss_tmo)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next
+Auto-merging drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+Auto-merging drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+Auto-merging drivers/scsi/lpfc/lpfc_init.c
+Auto-merging drivers/scsi/lpfc/lpfc_scsi.c
+Auto-merging drivers/scsi/qla2xxx/qla_os.c
+Auto-merging drivers/scsi/scsi_lib.c
+Auto-merging drivers/scsi/scsi_priv.h
+Auto-merging drivers/scsi/storvsc_drv.c
+Auto-merging drivers/scsi/virtio_scsi.c
+Auto-merging drivers/xen/xen-scsiback.c
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-driver-ufs | 37 +
+ drivers/scsi/3w-9xxx.c | 2 +-
+ drivers/scsi/aic7xxx/aic79xx_osm.c | 2 +-
+ drivers/scsi/csiostor/csio_scsi.c | 10 +-
+ drivers/scsi/cxlflash/main.c | 2 +-
+ drivers/scsi/esas2r/atioctl.h | 1 +
+ drivers/scsi/esas2r/esas2r_ioctl.c | 3 +-
+ drivers/scsi/hisi_sas/hisi_sas.h | 1 +
+ drivers/scsi/hisi_sas/hisi_sas_main.c | 37 +-
+ drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 4 +-
+ drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 7 +-
+ drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 14 +-
+ drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 2 +-
+ drivers/scsi/lpfc/lpfc.h | 10 +-
+ drivers/scsi/lpfc/lpfc_crtn.h | 2 +
+ drivers/scsi/lpfc/lpfc_ct.c | 1085 ++++++++++------------------
+ drivers/scsi/lpfc/lpfc_debugfs.c | 2 +-
+ drivers/scsi/lpfc/lpfc_disc.h | 1 -
+ drivers/scsi/lpfc/lpfc_els.c | 234 +++---
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 23 +-
+ drivers/scsi/lpfc/lpfc_hw.h | 59 +-
+ drivers/scsi/lpfc/lpfc_hw4.h | 30 +-
+ drivers/scsi/lpfc/lpfc_init.c | 353 +++++----
+ drivers/scsi/lpfc/lpfc_logmsg.h | 2 +-
+ drivers/scsi/lpfc/lpfc_scsi.c | 27 +
+ drivers/scsi/lpfc/lpfc_sli.c | 73 +-
+ drivers/scsi/lpfc/lpfc_sli4.h | 4 +-
+ drivers/scsi/lpfc/lpfc_version.h | 2 +-
+ drivers/scsi/lpfc/lpfc_vmid.c | 4 +-
+ drivers/scsi/megaraid/megaraid_mbox.c | 4 +-
+ drivers/scsi/mpi3mr/mpi3mr_transport.c | 64 +-
+ drivers/scsi/qla2xxx/qla_edif.c | 2 +-
+ drivers/scsi/qla2xxx/qla_gbl.h | 12 -
+ drivers/scsi/qla2xxx/qla_os.c | 2 +-
+ drivers/scsi/qla2xxx/qla_target.h | 2 -
+ drivers/scsi/qlogicpti.c | 3 +-
+ drivers/scsi/scsi_error.c | 17 +-
+ drivers/scsi/scsi_lib.c | 46 +-
+ drivers/scsi/scsi_priv.h | 11 +
+ drivers/scsi/scsi_transport_fc.c | 2 +-
+ drivers/scsi/storvsc_drv.c | 2 +-
+ drivers/scsi/virtio_scsi.c | 4 +-
+ drivers/scsi/xen-scsifront.c | 8 -
+ drivers/target/target_core_alua.c | 3 +
+ drivers/target/target_core_internal.h | 2 -
+ drivers/target/target_core_spc.c | 6 +
+ drivers/ufs/core/ufs-sysfs.c | 35 +
+ drivers/usb/storage/uas.c | 2 +-
+ drivers/xen/xen-scsiback.c | 12 -
+ include/scsi/scsi_status.h | 12 +-
+ 50 files changed, 1146 insertions(+), 1138 deletions(-)
+Merging vhost/linux-next (8f113a4ad40d virtio: drop vp_legacy_set_queue_size)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next
+Merge made by the 'ort' strategy.
+ drivers/bluetooth/virtio_bt.c | 19 +++++++++++++++++--
+ include/linux/virtio_pci_legacy.h | 2 --
+ 2 files changed, 17 insertions(+), 4 deletions(-)
+Merging rpmsg/for-next (5a3a3b45c357 Merge branches 'rpmsg-next', 'rproc-next' and 'hwspinlock-next' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next
+Merge made by the 'ort' strategy.
+ .../bindings/hwlock/qcom-hwspinlock.yaml | 25 ++++++++-----
+ drivers/hwspinlock/qcom_hwspinlock.c | 42 ++++++++++++++++------
+ drivers/remoteproc/imx_dsp_rproc.c | 4 +--
+ drivers/remoteproc/imx_rproc.c | 14 +++-----
+ drivers/rpmsg/rpmsg_char.c | 5 +--
+ 5 files changed, 57 insertions(+), 33 deletions(-)
+Merging gpio/for-next (e73f0f0ee754 Linux 5.14-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next
+Already up to date.
+Merging gpio-brgl/gpio/for-next (d9e7f0e32051 gpiolib: of: factor out conversion from OF flags)
+$ 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 Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging drivers/counter/104-quad-8.c
+Auto-merging drivers/gpio/Kconfig
+Auto-merging drivers/gpio/Makefile
+Auto-merging drivers/gpio/gpio-104-dio-48e.c
+Auto-merging drivers/gpio/gpio-104-idi-48.c
+Auto-merging drivers/gpio/gpio-104-idio-16.c
+Auto-merging drivers/gpio/gpio-mt7621.c
+Auto-merging drivers/gpio/gpio-pca953x.c
+Auto-merging drivers/gpio/gpio-ws16c48.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/firmware/fsl,scu.yaml | 5 +
+ .../bindings/gpio/fairchild,74hc595.yaml | 7 +-
+ .../bindings/gpio/fsl,imx8qxp-sc-gpio.yaml | 39 +++++
+ .../devicetree/bindings/gpio/gpio-pca95xx.yaml | 99 +++++------
+ .../devicetree/bindings/gpio/gpio-stmpe.txt | 3 +-
+ .../devicetree/bindings/gpio/gpio-xilinx.txt | 48 ------
+ .../bindings/gpio/microchip,mpfs-gpio.yaml | 18 ++
+ .../bindings/gpio/renesas,rcar-gpio.yaml | 1 +
+ .../devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml | 154 +++++++++++++++++
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ drivers/counter/104-quad-8.c | 5 +-
+ drivers/gpio/Kconfig | 4 +
+ drivers/gpio/Makefile | 1 +
+ drivers/gpio/gpio-104-dio-48e.c | 5 +-
+ drivers/gpio/gpio-104-idi-48.c | 5 +-
+ drivers/gpio/gpio-104-idio-16.c | 5 +-
+ drivers/gpio/gpio-exar.c | 40 ++++-
+ drivers/gpio/gpio-imx-scu.c | 139 ++++++++++++++++
+ drivers/gpio/gpio-mt7621.c | 7 +-
+ drivers/gpio/gpio-pca953x.c | 177 +++++++++++++++-----
+ drivers/gpio/gpio-rockchip.c | 21 +--
+ drivers/gpio/gpio-ucb1400.c | 1 +
+ drivers/gpio/gpio-ws16c48.c | 5 +-
+ drivers/gpio/gpiolib-of.c | 183 ++++++++-------------
+ drivers/gpio/gpiolib.c | 132 +++++++--------
+ include/linux/gpio/consumer.h | 13 --
+ include/linux/isa.h | 52 ++++--
+ include/linux/ucb1400.h | 2 +-
+ 28 files changed, 802 insertions(+), 371 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/gpio/fsl,imx8qxp-sc-gpio.yaml
+ delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-xilinx.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml
+ create mode 100644 drivers/gpio/gpio-imx-scu.c
+Merging gpio-intel/for-next (0ea76c401f92 gpiolib: acpi: Add a quirk for Asus UM325UAZ)
+$ 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
+Merge made by the 'ort' strategy.
+ drivers/gpio/gpiolib-acpi.c | 38 ++++++++++++++++++++++++++++++++++----
+ 1 file changed, 34 insertions(+), 4 deletions(-)
+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 (04fa696fc49c Merge branch 'devel' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next
+Auto-merging Documentation/devicetree/bindings/pinctrl/intel,pinctrl-keembay.yaml
+Auto-merging Documentation/devicetree/bindings/pinctrl/intel,pinctrl-thunderbay.yaml
+Auto-merging Documentation/devicetree/bindings/pinctrl/mediatek,mt6779-pinctrl.yaml
+Auto-merging Documentation/devicetree/bindings/pinctrl/mediatek,mt7986-pinctrl.yaml
+Auto-merging Documentation/devicetree/bindings/pinctrl/qcom,sc7280-pinctrl.yaml
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/mach-at91/pm.c
+Auto-merging drivers/gpio/gpio-rockchip.c
+Merge made by the 'ort' strategy.
+ .../bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 6 +
+ .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 4 +
+ .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 6 +
+ .../bindings/pinctrl/brcm,bcm4908-pinctrl.yaml | 1 +
+ .../bindings/pinctrl/cypress,cy8c95x0.yaml | 134 ++
+ .../bindings/pinctrl/intel,pinctrl-keembay.yaml | 1 +
+ .../bindings/pinctrl/intel,pinctrl-thunderbay.yaml | 1 +
+ .../bindings/pinctrl/marvell,ac5-pinctrl.yaml | 1 +
+ .../bindings/pinctrl/mediatek,mt6779-pinctrl.yaml | 2 +
+ .../bindings/pinctrl/mediatek,mt7986-pinctrl.yaml | 48 +-
+ .../bindings/pinctrl/mediatek,mt8188-pinctrl.yaml | 226 ++
+ .../bindings/pinctrl/nuvoton,wpcm450-pinctrl.yaml | 1 +
+ .../bindings/pinctrl/pinctrl-mt8186.yaml | 14 +-
+ .../bindings/pinctrl/qcom,sc7280-pinctrl.yaml | 55 +-
+ .../bindings/pinctrl/qcom,sc8180x-pinctrl.yaml | 79 +-
+ .../pinctrl/qcom,sc8280xp-lpass-lpi-pinctrl.yaml | 133 ++
+ .../bindings/pinctrl/qcom,sc8280xp-pinctrl.yaml | 73 +-
+ .../bindings/pinctrl/qcom,sm6115-pinctrl.yaml | 96 +-
+ .../bindings/pinctrl/qcom,sm6125-pinctrl.yaml | 61 +-
+ .../bindings/pinctrl/qcom,sm6350-pinctrl.yaml | 73 +-
+ .../bindings/pinctrl/qcom,sm6375-tlmm.yaml | 73 +-
+ .../bindings/pinctrl/qcom,sm8250-pinctrl.yaml | 41 +-
+ .../bindings/pinctrl/qcom,sm8350-pinctrl.yaml | 73 +-
+ .../pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml | 135 ++
+ .../bindings/pinctrl/qcom,sm8450-pinctrl.yaml | 82 +-
+ .../bindings/pinctrl/renesas,rza1-ports.yaml | 1 +
+ .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 2 +-
+ .../bindings/pinctrl/rockchip,pinctrl.yaml | 1 +
+ .../bindings/pinctrl/samsung,pinctrl-pins-cfg.yaml | 1 -
+ .../bindings/pinctrl/samsung,pinctrl.yaml | 66 +-
+ .../bindings/pinctrl/st,stm32-pinctrl.yaml | 3 +
+ .../bindings/pinctrl/toshiba,visconti-pinctrl.yaml | 1 +
+ MAINTAINERS | 6 +
+ arch/arm/mach-at91/pm.c | 15 -
+ drivers/gpio/gpio-rockchip.c | 4 +-
+ drivers/pinctrl/Kconfig | 19 +
+ drivers/pinctrl/Makefile | 1 +
+ drivers/pinctrl/aspeed/pinctrl-aspeed.c | 11 +-
+ drivers/pinctrl/bcm/pinctrl-bcm6318.c | 121 +-
+ drivers/pinctrl/bcm/pinctrl-bcm63268.c | 139 +-
+ drivers/pinctrl/bcm/pinctrl-bcm6328.c | 85 +-
+ drivers/pinctrl/bcm/pinctrl-bcm6358.c | 20 +-
+ drivers/pinctrl/bcm/pinctrl-bcm6362.c | 121 +-
+ drivers/pinctrl/bcm/pinctrl-bcm6368.c | 91 +-
+ drivers/pinctrl/bcm/pinctrl-bcm63xx.h | 2 +
+ drivers/pinctrl/berlin/berlin.c | 2 +-
+ drivers/pinctrl/freescale/Kconfig | 12 +-
+ drivers/pinctrl/mediatek/Kconfig | 12 +
+ drivers/pinctrl/mediatek/Makefile | 1 +
+ drivers/pinctrl/mediatek/pinctrl-mt8188.c | 1673 +++++++++++++++
+ drivers/pinctrl/mediatek/pinctrl-mtk-mt8188.h | 2259 ++++++++++++++++++++
+ drivers/pinctrl/meson/pinctrl-meson.c | 7 +-
+ drivers/pinctrl/meson/pinctrl-meson.h | 4 +-
+ drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 26 +-
+ drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c | 295 ++-
+ drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c | 29 +-
+ drivers/pinctrl/nomadik/pinctrl-nomadik.c | 26 +-
+ drivers/pinctrl/nomadik/pinctrl-nomadik.h | 16 +-
+ drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 8 +-
+ drivers/pinctrl/pinctrl-amd.c | 32 +-
+ drivers/pinctrl/pinctrl-at91.c | 105 +-
+ drivers/pinctrl/pinctrl-cy8c95x0.c | 1413 ++++++++++++
+ drivers/pinctrl/pinctrl-ingenic.c | 31 +-
+ drivers/pinctrl/pinctrl-mcp23s08.c | 3 -
+ drivers/pinctrl/pinctrl-microchip-sgpio.c | 5 +-
+ drivers/pinctrl/pinctrl-ocelot.c | 113 +-
+ drivers/pinctrl/pinctrl-pistachio.c | 27 +-
+ drivers/pinctrl/pinctrl-rockchip.c | 333 ++-
+ drivers/pinctrl/pinctrl-rockchip.h | 1 +
+ drivers/pinctrl/qcom/Kconfig | 18 +
+ drivers/pinctrl/qcom/Makefile | 2 +
+ drivers/pinctrl/qcom/pinctrl-sc8180x.c | 10 +-
+ drivers/pinctrl/qcom/pinctrl-sc8280xp-lpass-lpi.c | 207 ++
+ drivers/pinctrl/qcom/pinctrl-sm8450-lpass-lpi.c | 240 +++
+ drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 38 +-
+ drivers/pinctrl/samsung/pinctrl-samsung.c | 8 +-
+ drivers/pinctrl/sunxi/pinctrl-sun50i-a100-r.c | 2 +-
+ .../dt-bindings/pinctrl/mediatek,mt8188-pinfunc.h | 1280 +++++++++++
+ include/dt-bindings/pinctrl/samsung.h | 7 +
+ include/soc/at91/pm.h | 16 -
+ 80 files changed, 9324 insertions(+), 1066 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/cypress,cy8c95x0.yaml
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,mt8188-pinctrl.yaml
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sc8280xp-lpass-lpi-pinctrl.yaml
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml
+ create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt8188.c
+ create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt8188.h
+ create mode 100644 drivers/pinctrl/pinctrl-cy8c95x0.c
+ create mode 100644 drivers/pinctrl/qcom/pinctrl-sc8280xp-lpass-lpi.c
+ create mode 100644 drivers/pinctrl/qcom/pinctrl-sm8450-lpass-lpi.c
+ create mode 100644 include/dt-bindings/pinctrl/mediatek,mt8188-pinfunc.h
+ delete mode 100644 include/soc/at91/pm.h
+Merging pinctrl-intel/for-next (568035b01cfb Linux 6.0-rc1)
+$ 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 (96355be8f0a2 dt-bindings: pinctrl: renesas: Document RZ/Five SoC)
+$ 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 (9d9292576810 dt-bindings: pinctrl: samsung: deprecate header with register constants)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next
+Already up to date.
+Merging pwm/for-next (8933d30c5f46 pwm: lpc18xx: Fix period handling)
+$ 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
+Already up to date.
+Merging userns/for-next (a0b88362d2c7 Merge of ucount-rlimits-cleanups-for-v5.19, interrupting_kthread_stop-for-v5.20, signal-for-v5.20, and retire_mq_sysctls-for-v5.19 for testing in linux-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next
+Auto-merging fs/coredump.c
+Auto-merging fs/exec.c
+Auto-merging fs/proc/array.c
+Auto-merging ipc/mqueue.c
+Auto-merging kernel/exit.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/signal.c
+Auto-merging kernel/user_namespace.c
+Merge made by the 'ort' strategy.
+ fs/coredump.c | 2 +-
+ fs/exec.c | 2 +-
+ fs/proc/array.c | 2 +-
+ include/linux/sched/signal.h | 1 +
+ include/linux/user_namespace.h | 35 ++++++++++++++++++++++-------------
+ ipc/mqueue.c | 1 +
+ kernel/exit.c | 20 +++++++++++++++++++-
+ kernel/fork.c | 14 ++++++++------
+ kernel/kthread.c | 1 +
+ kernel/signal.c | 3 ++-
+ kernel/sys.c | 2 +-
+ kernel/ucount.c | 34 +++++++++++++++-------------------
+ kernel/user_namespace.c | 10 +++++-----
+ 13 files changed, 78 insertions(+), 49 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 (2626cd3b3126 docs:kselftest: fix kselftest_module.h path of example module)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next
+Auto-merging MAINTAINERS
+Auto-merging drivers/cpufreq/amd-pstate.c
+CONFLICT (content): Merge conflict in drivers/cpufreq/amd-pstate.c
+Auto-merging tools/testing/selftests/Makefile
+Resolved 'drivers/cpufreq/amd-pstate.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 0772770c5734] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/pm/amd-pstate.rst | 76 ++++++
+ Documentation/dev-tools/kselftest.rst | 2 +-
+ MAINTAINERS | 1 +
+ drivers/cpufreq/Kconfig.x86 | 15 ++
+ drivers/cpufreq/Makefile | 1 +
+ drivers/cpufreq/amd-pstate-ut.c | 293 +++++++++++++++++++++
+ drivers/cpufreq/amd-pstate.c | 60 +----
+ include/linux/amd-pstate.h | 77 ++++++
+ tools/testing/selftests/Makefile | 1 +
+ tools/testing/selftests/amd-pstate/Makefile | 9 +
+ .../testing/selftests/amd-pstate/amd-pstate-ut.sh | 56 ++++
+ tools/testing/selftests/amd-pstate/config | 1 +
+ tools/testing/selftests/cpu-hotplug/Makefile | 2 +-
+ tools/testing/selftests/cpu-hotplug/config | 1 -
+ .../selftests/cpu-hotplug/cpu-on-off-test.sh | 140 +++-------
+ tools/testing/selftests/vm/Makefile | 2 +-
+ tools/testing/selftests/vm/gup_test.c | 2 +-
+ tools/testing/selftests/vm/hmm-tests.c | 4 +-
+ tools/testing/selftests/vm/ksm_tests.c | 2 +-
+ 19 files changed, 574 insertions(+), 171 deletions(-)
+ create mode 100644 drivers/cpufreq/amd-pstate-ut.c
+ create mode 100644 include/linux/amd-pstate.h
+ create mode 100644 tools/testing/selftests/amd-pstate/Makefile
+ create mode 100755 tools/testing/selftests/amd-pstate/amd-pstate-ut.sh
+ create mode 100644 tools/testing/selftests/amd-pstate/config
+ delete mode 100644 tools/testing/selftests/cpu-hotplug/config
+Merging livepatching/for-next (3ea7cd6069be Merge branch 'for-6.1/fixes' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next
+Merge made by the 'ort' strategy.
+ kernel/livepatch/core.c | 2 +-
+ kernel/livepatch/transition.c | 18 ++++++++++++++++--
+ 2 files changed, 17 insertions(+), 3 deletions(-)
+Merging rtc/rtc-next (509451ac03eb rtc: gamecube: Always reset HW_SRNPROT after read)
+$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next
+Merge made by the 'ort' strategy.
+ drivers/rtc/rtc-gamecube.c | 11 +++++------
+ drivers/rtc/rtc-mpfs.c | 7 +++----
+ drivers/rtc/rtc-ti-k3.c | 34 +++++++++++++++-------------------
+ 3 files changed, 23 insertions(+), 29 deletions(-)
+Merging nvdimm/libnvdimm-for-next (53fc59511fc4 nvdimm/namespace: drop unneeded temporary variable in size_store())
+$ 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 drivers/nvdimm/namespace_devs.c
+Merge made by the 'ort' strategy.
+ drivers/nvdimm/namespace_devs.c | 22 +++++++---------------
+ 1 file changed, 7 insertions(+), 15 deletions(-)
+Merging at24/at24/for-next (568035b01cfb Linux 6.0-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 (568035b01cfb Linux 6.0-rc1)
+$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next
+Already up to date.
+Merging seccomp/for-next/seccomp (4e92863862d1 Merge branch 'for-linus/seccomp' into for-next/seccomp)
+$ 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
+Auto-merging kernel/fork.c
+Merge made by the 'ort' strategy.
+ kernel/fork.c | 17 +++++++++++------
+ tools/testing/selftests/seccomp/seccomp_bpf.c | 6 ++++--
+ 2 files changed, 15 insertions(+), 8 deletions(-)
+Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
+$ git merge -m Merge branch 'for-next' of https://github.com/daniel-walker/cisco-linux.git cisco/for-next
+Already up to date.
+Merging fsi/next (04823dd2af87 fsi: master-ast-cf: Fix missing of_node_put in fsi_master_acf_probe)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next
+Auto-merging drivers/hwmon/occ/p9_sbe.c
+Merge made by the 'ort' strategy.
+ drivers/fsi/fsi-core.c | 8 ++++----
+ drivers/fsi/fsi-master-ast-cf.c | 2 ++
+ drivers/fsi/fsi-master.h | 2 +-
+ drivers/fsi/fsi-occ.c | 25 ++++++++++++++++++++-----
+ drivers/fsi/fsi-sbefifo.c | 15 +++++++++------
+ drivers/hwmon/occ/p9_sbe.c | 15 ++++++++++-----
+ 6 files changed, 46 insertions(+), 21 deletions(-)
+Merging slimbus/for-next (3f9400e61107 slimbus: qcom-ngd: simplify error paths with dev_err_probe)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next
+Merge made by the 'ort' strategy.
+ drivers/slimbus/Kconfig | 3 ++-
+ drivers/slimbus/qcom-ngd-ctrl.c | 23 +++++++++++++++--------
+ 2 files changed, 17 insertions(+), 9 deletions(-)
+Merging nvmem/for-next (2ea556524fbf dt-bindings: nvmem: Add SoC compatible for sm6115)
+$ 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 Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Auto-merging arch/arm/configs/qcom_defconfig
+Auto-merging arch/arm64/configs/defconfig
+Auto-merging drivers/soc/mediatek/Kconfig
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/nvmem/mediatek,efuse.yaml | 1 +
+ .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 1 +
+ MAINTAINERS | 1 +
+ arch/arm/configs/multi_v7_defconfig | 6 +-
+ arch/arm/configs/qcom_defconfig | 2 +-
+ arch/arm64/configs/defconfig | 10 +-
+ arch/mips/configs/ci20_defconfig | 2 +-
+ drivers/cpufreq/Kconfig.arm | 2 +-
+ drivers/mtd/mtdcore.c | 28 ++
+ drivers/nvmem/Kconfig | 305 +++++++++++----------
+ drivers/nvmem/Makefile | 118 ++++----
+ drivers/nvmem/brcm_nvram.c | 2 +-
+ drivers/nvmem/core.c | 27 +-
+ drivers/nvmem/u-boot-env.c | 218 +++++++++++++++
+ drivers/soc/mediatek/Kconfig | 2 +-
+ drivers/thermal/qcom/Kconfig | 2 +-
+ include/linux/mtd/mtd.h | 1 +
+ 17 files changed, 499 insertions(+), 229 deletions(-)
+ create mode 100644 drivers/nvmem/u-boot-env.c
+Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was allocated)
+$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main
+Merge made by the 'ort' strategy.
+ lib/idr.c | 14 ++++----------
+ 1 file changed, 4 insertions(+), 10 deletions(-)
+Merging hyperv/hyperv-next (d180e0a1be6c Drivers: hv: Create debugfs file with hyper-v balloon usage information)
+$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next
+Already up to date.
+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 (568035b01cfb Linux 6.0-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 (568035b01cfb Linux 6.0-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 (568035b01cfb Linux 6.0-rc1)
+$ 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 (5db00d7d0d4d bus: mhi: host: always print detected modem name)
+$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next
+Merge made by the 'ort' strategy.
+ drivers/bus/mhi/host/pci_generic.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging memblock/for-next (42c3ba865818 memblock_tests: move variable declarations to single block)
+$ 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/tests/alloc_api.c | 223 ++++---
+ tools/testing/memblock/tests/alloc_helpers_api.c | 52 +-
+ tools/testing/memblock/tests/alloc_nid_api.c | 354 +++++------
+ tools/testing/memblock/tests/basic_api.c | 767 +++++++++++++++++++++++
+ tools/testing/memblock/tests/common.c | 11 +-
+ tools/testing/memblock/tests/common.h | 64 +-
+ 6 files changed, 1143 insertions(+), 328 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 cxl/next (1cd8a2537eb0 cxl/hdm: Fix skip allocations vs multiple pmem allocations)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next
+Already up to date.
+Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller)
+$ git merge -m Merge branch 'folio-iomap' of git://git.infradead.org/users/willy/linux.git folio-iomap/folio-iomap
+Already up to date.
+Merging zstd/zstd-next (88a309465b3f lib: zstd: clean up double word in comment.)
+$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next
+Already up to date.
+Merging efi/next (4bf232988200 Merge tag 'efi-loongarch-for-v6.1' into efi/next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next
+Auto-merging arch/loongarch/Kconfig
+Auto-merging arch/loongarch/Makefile
+Auto-merging arch/loongarch/kernel/vmlinux.lds.S
+Auto-merging drivers/firmware/efi/libstub/Makefile
+Merge made by the 'ort' strategy.
+ arch/loongarch/Kconfig | 9 +++
+ arch/loongarch/Makefile | 13 ++--
+ arch/loongarch/boot/Makefile | 8 ++-
+ arch/loongarch/include/asm/efi.h | 11 ++-
+ arch/loongarch/kernel/efi-header.S | 99 +++++++++++++++++++++++++++
+ arch/loongarch/kernel/efi.c | 3 +
+ arch/loongarch/kernel/head.S | 20 ++++++
+ arch/loongarch/kernel/image-vars.h | 30 ++++++++
+ arch/loongarch/kernel/setup.c | 11 +--
+ arch/loongarch/kernel/vmlinux.lds.S | 1 +
+ arch/x86/platform/efi/efi_64.c | 18 +++--
+ arch/x86/platform/efi/efi_thunk_64.S | 13 +++-
+ drivers/firmware/efi/Kconfig | 4 +-
+ drivers/firmware/efi/libstub/Makefile | 10 +++
+ drivers/firmware/efi/libstub/efi-stub.c | 20 ++++--
+ drivers/firmware/efi/libstub/loongarch-stub.c | 60 ++++++++++++++++
+ include/linux/pe.h | 2 +
+ 17 files changed, 298 insertions(+), 34 deletions(-)
+ create mode 100644 arch/loongarch/kernel/efi-header.S
+ create mode 100644 arch/loongarch/kernel/image-vars.h
+ create mode 100644 drivers/firmware/efi/libstub/loongarch-stub.c
+Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next
+Merge made by the 'ort' strategy.
+ fs/unicode/mkutf8data.c | 38 ++++++++++++++++++++++++--------------
+ 1 file changed, 24 insertions(+), 14 deletions(-)
+Merging slab/for-next (0e5d069dcc0c Merge branch 'slab/for-6.1/slub_validation_locking' 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
+Merge made by the 'ort' strategy.
+ include/linux/slab.h | 144 +++------
+ include/trace/events/kmem.h | 74 ++---
+ mm/kfence/report.c | 1 +
+ mm/slab.c | 305 +++++--------------
+ mm/slab.h | 10 +
+ mm/slab_common.c | 199 ++++++++++--
+ mm/slob.c | 31 +-
+ mm/slub.c | 721 ++++++++++++++++++--------------------------
+ 8 files changed, 623 insertions(+), 862 deletions(-)
+Merging random/master (b931eaf6ef5c random: restore O_NONBLOCK support)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master
+Merge made by the 'ort' strategy.
+ drivers/char/mem.c | 4 ++--
+ drivers/char/random.c | 5 +++++
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+Merging landlock/next (4908e7a3045c Merge branch 'landlock-next-truncate' into landlock-next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next
+Merge made by the 'ort' strategy.
+ Documentation/userspace-api/landlock.rst | 54 +++++-
+ include/uapi/linux/landlock.h | 17 +-
+ samples/landlock/sandboxer.c | 23 ++-
+ security/landlock/fs.c | 9 +-
+ security/landlock/limits.h | 2 +-
+ security/landlock/syscalls.c | 2 +-
+ tools/testing/selftests/landlock/Makefile | 19 +-
+ tools/testing/selftests/landlock/base_test.c | 2 +-
+ tools/testing/selftests/landlock/fs_test.c | 254 ++++++++++++++++++++++++++-
+ tools/testing/selftests/lib.mk | 4 +
+ 10 files changed, 348 insertions(+), 38 deletions(-)
+Merging rust/rust-next (07a3263c2554 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 Documentation/doc-guide/kernel-doc.rst
+Auto-merging Documentation/index.rst
+Auto-merging Documentation/kbuild/makefiles.rst
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Auto-merging Makefile
+CONFLICT (content): Merge conflict in Makefile
+Auto-merging arch/Kconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/x86/Makefile
+Auto-merging init/Kconfig
+Auto-merging kernel/kallsyms.c
+Auto-merging kernel/livepatch/core.c
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/vsprintf.c
+Auto-merging scripts/Kconfig.include
+Auto-merging scripts/Makefile.build
+Auto-merging scripts/Makefile.lib
+Auto-merging scripts/Makefile.modfinal
+Auto-merging scripts/checkpatch.pl
+Auto-merging tools/lib/perf/include/perf/event.h
+Resolved 'MAINTAINERS' using previous resolution.
+Resolved 'Makefile' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 3b4a972b2d72] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git
+$ git diff -M --stat --summary HEAD^..
+ .gitignore | 6 +
+ .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 | 19 +
+ Documentation/rust/coding-guidelines.rst | 216 ++
+ Documentation/rust/general-information.rst | 79 +
+ Documentation/rust/index.rst | 22 +
+ Documentation/rust/quick-start.rst | 232 ++
+ MAINTAINERS | 18 +
+ Makefile | 171 +-
+ arch/Kconfig | 6 +
+ arch/x86/Kconfig | 1 +
+ arch/x86/Makefile | 10 +
+ include/linux/compiler_types.h | 6 +-
+ include/linux/kallsyms.h | 2 +-
+ init/Kconfig | 52 +-
+ kernel/configs/rust.config | 1 +
+ kernel/kallsyms.c | 26 +-
+ kernel/livepatch/core.c | 4 +-
+ lib/Kconfig.debug | 34 +
+ lib/vsprintf.c | 13 +
+ rust/.gitignore | 8 +
+ rust/Makefile | 381 ++++
+ rust/alloc/README.md | 33 +
+ rust/alloc/alloc.rs | 440 ++++
+ rust/alloc/borrow.rs | 498 ++++
+ rust/alloc/boxed.rs | 2028 +++++++++++++++++
+ rust/alloc/collections/mod.rs | 156 ++
+ rust/alloc/lib.rs | 244 ++
+ rust/alloc/raw_vec.rs | 527 +++++
+ rust/alloc/slice.rs | 1204 ++++++++++
+ rust/alloc/vec/drain.rs | 186 ++
+ rust/alloc/vec/drain_filter.rs | 145 ++
+ rust/alloc/vec/into_iter.rs | 366 +++
+ rust/alloc/vec/is_zero.rs | 120 +
+ rust/alloc/vec/mod.rs | 3140 ++++++++++++++++++++++++++
+ rust/alloc/vec/partial_eq.rs | 49 +
+ rust/bindgen_parameters | 21 +
+ rust/bindings/bindings_helper.h | 13 +
+ rust/bindings/lib.rs | 53 +
+ rust/compiler_builtins.rs | 63 +
+ rust/exports.c | 21 +
+ rust/helpers.c | 51 +
+ rust/kernel/allocator.rs | 64 +
+ rust/kernel/error.rs | 59 +
+ rust/kernel/lib.rs | 78 +
+ rust/kernel/prelude.rs | 20 +
+ rust/kernel/print.rs | 198 ++
+ rust/kernel/str.rs | 72 +
+ rust/macros/helpers.rs | 51 +
+ rust/macros/lib.rs | 72 +
+ rust/macros/module.rs | 282 +++
+ samples/Kconfig | 2 +
+ samples/Makefile | 1 +
+ samples/rust/Kconfig | 30 +
+ samples/rust/Makefile | 5 +
+ 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_minimal.rs | 38 +
+ 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 | 12 +-
+ scripts/decode_stacktrace.sh | 14 +
+ scripts/generate_rust_analyzer.py | 135 ++
+ scripts/generate_rust_target.rs | 182 ++
+ scripts/is_rust_module.sh | 16 +
+ scripts/kallsyms.c | 47 +-
+ scripts/kconfig/confdata.c | 75 +
+ scripts/min-tool-version.sh | 6 +
+ scripts/rust_is_available.sh | 160 ++
+ scripts/rust_is_available_bindgen_libclang.h | 2 +
+ tools/include/linux/kallsyms.h | 2 +-
+ tools/lib/perf/include/perf/event.h | 2 +-
+ tools/lib/symbol/kallsyms.h | 2 +-
+ 89 files changed, 12553 insertions(+), 51 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 kernel/configs/rust.config
+ 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/lib.rs
+ create mode 100644 rust/alloc/raw_vec.rs
+ create mode 100644 rust/alloc/slice.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/bindgen_parameters
+ create mode 100644 rust/bindings/bindings_helper.h
+ create mode 100644 rust/bindings/lib.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/error.rs
+ create mode 100644 rust/kernel/lib.rs
+ create mode 100644 rust/kernel/prelude.rs
+ create mode 100644 rust/kernel/print.rs
+ create mode 100644 rust/kernel/str.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_minimal.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 100755 scripts/rust_is_available.sh
+ create mode 100644 scripts/rust_is_available_bindgen_libclang.h
+$ git am -3 ../patches/0001-rust-fix-up-for-kbuild-move-core-y-and-drivers-y-to-.patch
+Applying: rust: fix up for "kbuild: move core-y and drivers-y to ./Kbuild"
+$ git reset HEAD^
+Unstaged changes after reset:
+M Kbuild
+$ git add -A .
+$ git commit -v -a --amend
+[master cade0868c972] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git
+ Date: Fri Sep 16 14:53:26 2022 +1000
+Merging sysctl/sysctl-next (c06a17fe056b kernel/sysctl-test: use SYSCTL_{ZERO/ONE_HUNDRED} instead of i_{zero/one_hundred})
+$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next
+Merge made by the 'ort' strategy.
+ fs/proc/proc_sysctl.c | 9 +--------
+ kernel/sysctl-test.c | 43 ++++++++++++++++++++-----------------------
+ kernel/sysctl.c | 22 ++++++++++++----------
+ 3 files changed, 33 insertions(+), 41 deletions(-)
+Merging folio/for-next (03b33c09ea22 fs: remove the NULL get_block case in mpage_writepages)
+$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next
+Auto-merging block/fops.c
+Auto-merging block/partitions/core.c
+Auto-merging drivers/misc/vmw_balloon.c
+Auto-merging drivers/virtio/virtio_balloon.c
+Auto-merging fs/aio.c
+Auto-merging fs/btrfs/disk-io.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/buffer.c
+Auto-merging fs/ext2/inode.c
+Auto-merging fs/ext2/super.c
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/f2fs/checkpoint.c
+Auto-merging fs/f2fs/data.c
+Auto-merging fs/f2fs/f2fs.h
+Auto-merging fs/f2fs/node.c
+Auto-merging fs/gfs2/aops.c
+Auto-merging fs/gfs2/lops.c
+Auto-merging fs/hugetlbfs/inode.c
+Auto-merging fs/iomap/buffered-io.c
+Auto-merging fs/mpage.c
+Auto-merging fs/nfs/file.c
+Auto-merging fs/nfs/internal.h
+Auto-merging fs/nfs/write.c
+Auto-merging fs/ntfs/aops.c
+Auto-merging fs/ntfs3/inode.c
+Auto-merging fs/ocfs2/aops.c
+Auto-merging fs/squashfs/file.c
+Auto-merging fs/zonefs/super.c
+Auto-merging include/linux/buffer_head.h
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/iomap.h
+Auto-merging include/linux/migrate.h
+Auto-merging include/linux/page-flags.h
+Auto-merging include/linux/pagemap.h
+Auto-merging mm/compaction.c
+Auto-merging mm/ksm.c
+Auto-merging mm/migrate.c
+Auto-merging mm/migrate_device.c
+Auto-merging mm/secretmem.c
+Auto-merging mm/shmem.c
+Auto-merging mm/swap_state.c
+Auto-merging mm/util.c
+Auto-merging mm/zsmalloc.c
+Merge made by the 'ort' strategy.
+ fs/btrfs/disk-io.c | 19 ++++++++-----------
+ 1 file changed, 8 insertions(+), 11 deletions(-)
+Merging execve/for-next/execve (33a2d6bc3480 Revert "fs/exec: allow to unshare a time namespace on vfork+exec")
+$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve
+Auto-merging fs/exec.c
+Auto-merging kernel/fork.c
+Merge made by the 'ort' strategy.
+ fs/exec.c | 7 ---
+ kernel/fork.c | 5 +-
+ kernel/nsproxy.c | 3 +-
+ tools/testing/selftests/timens/Makefile | 2 +-
+ tools/testing/selftests/timens/vfork_exec.c | 90 -----------------------------
+ 5 files changed, 3 insertions(+), 104 deletions(-)
+ delete mode 100644 tools/testing/selftests/timens/vfork_exec.c
+Merging bitmap/bitmap-for-next (b9be19eef355 drivers/base: Fix unsigned comparison to -1 in CPUMAP_FILE_MAX_BYTES)
+$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next
+Merge made by the 'ort' strategy.
+ include/linux/cpumask.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+Merging hte/for-next (568035b01cfb Linux 6.0-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next
+Already up to date.
+Merging kspp/for-next/kspp (06c1c49d0cd1 fortify: Adjust KUnit test for modular build)
+$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp
+Auto-merging MAINTAINERS
+Auto-merging drivers/md/dm-verity-target.c
+Auto-merging include/linux/overflow.h
+Auto-merging lib/Kconfig.debug
+CONFLICT (content): Merge conflict in lib/Kconfig.debug
+Auto-merging lib/Makefile
+Resolved 'lib/Kconfig.debug' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master a55540565acc] Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/process/deprecated.rst | 11 +-
+ MAINTAINERS | 1 +
+ arch/sh/include/asm/sections.h | 2 +-
+ arch/sh/kernel/machvec.c | 10 +-
+ arch/um/Kconfig | 1 +
+ arch/um/os-Linux/user_syms.c | 1 +
+ drivers/md/dm-verity-loadpin.c | 8 ++
+ drivers/md/dm-verity-target.c | 16 +++
+ drivers/md/dm-verity.h | 1 +
+ drivers/misc/lkdtm/fortify.c | 96 ++++++++++++++---
+ include/linux/fortify-string.h | 132 +++++++++++++++++++++---
+ include/linux/overflow.h | 72 +++++++------
+ include/linux/string.h | 43 ++++++++
+ lib/Kconfig.debug | 21 ++++
+ lib/Makefile | 2 +
+ lib/fortify_kunit.c | 76 ++++++++++++++
+ lib/is_signed_type_kunit.c | 53 ++++++++++
+ lib/memcpy_kunit.c | 59 ++++++++++-
+ lib/overflow_kunit.c | 177 ++++++++++++++++++++++----------
+ security/loadpin/Kconfig | 7 +-
+ security/loadpin/loadpin.c | 16 ++-
+ tools/testing/selftests/lkdtm/tests.txt | 8 +-
+ 22 files changed, 678 insertions(+), 135 deletions(-)
+ create mode 100644 lib/fortify_kunit.c
+ create mode 100644 lib/is_signed_type_kunit.c
+Merging kspp-gustavo/for-next/kspp (0811296c55b7 exportfs: Replace zero-length array with DECLARE_FLEX_ARRAY() helper)
+$ 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 include/linux/memremap.h
+Merge made by the 'ort' strategy.
+ drivers/net/can/usb/etas_es58x/es58x_core.h | 2 +-
+ include/linux/exportfs.h | 2 +-
+ include/linux/memremap.h | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+Merging mm-stable/mm-stable (088b8aa537c2 mm: fix PageAnonExclusive clearing racing with concurrent RCU GUP-fast)
+$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/arm/configs/imx_v6_v7_defconfig
+Auto-merging arch/arm/configs/milbeaut_m10v_defconfig
+Auto-merging arch/arm/configs/oxnas_v6_defconfig
+Auto-merging arch/arm/configs/pxa_defconfig
+Auto-merging arch/arm/configs/sama7_defconfig
+Auto-merging arch/arm/configs/sp7021_defconfig
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/loongarch/Kconfig
+Auto-merging arch/m68k/Kconfig.cpu
+Auto-merging arch/mips/Kconfig
+Auto-merging fs/btrfs/compression.c
+Auto-merging fs/btrfs/extent_io.c
+Auto-merging fs/btrfs/tests/extent-io-tests.c
+Auto-merging fs/ntfs3/inode.c
+Auto-merging fs/reiserfs/super.c
+Auto-merging fs/userfaultfd.c
+Auto-merging include/linux/buffer_head.h
+Auto-merging include/linux/hugetlb.h
+Auto-merging include/linux/rmap.h
+Auto-merging include/linux/slab.h
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/sched/debug.c
+Auto-merging kernel/sched/fair.c
+Auto-merging kernel/sched/sched.h
+Auto-merging kernel/sysctl.c
+Auto-merging mm/damon/dbgfs.c
+Auto-merging mm/gup.c
+Auto-merging mm/huge_memory.c
+Auto-merging mm/hugetlb.c
+Auto-merging mm/khugepaged.c
+Auto-merging mm/madvise.c
+Auto-merging mm/memcontrol.c
+Auto-merging mm/memory-failure.c
+Auto-merging mm/memory.c
+Auto-merging mm/migrate_device.c
+Auto-merging mm/page_alloc.c
+Auto-merging mm/pagewalk.c
+Auto-merging mm/rmap.c
+Auto-merging mm/slub.c
+Auto-merging mm/vmscan.c
+Auto-merging tools/testing/selftests/vm/Makefile
+Auto-merging tools/testing/selftests/vm/hmm-tests.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 8 +
+ Documentation/admin-guide/mm/cma_debugfs.rst | 10 +-
+ Documentation/admin-guide/mm/userfaultfd.rst | 41 +-
+ Documentation/admin-guide/sysctl/kernel.rst | 11 +
+ Documentation/admin-guide/sysctl/vm.rst | 3 +
+ Documentation/mm/page_owner.rst | 5 +
+ arch/alpha/include/uapi/asm/mman.h | 2 +
+ arch/arc/Kconfig | 2 +-
+ arch/arm/Kconfig | 2 +-
+ arch/arm/configs/imx_v6_v7_defconfig | 2 +-
+ arch/arm/configs/milbeaut_m10v_defconfig | 2 +-
+ arch/arm/configs/oxnas_v6_defconfig | 2 +-
+ arch/arm/configs/pxa_defconfig | 2 +-
+ arch/arm/configs/sama7_defconfig | 2 +-
+ arch/arm/configs/sp7021_defconfig | 2 +-
+ arch/arm64/Kconfig | 2 +-
+ arch/csky/Kconfig | 2 +-
+ arch/ia64/Kconfig | 2 +-
+ arch/ia64/include/asm/sparsemem.h | 6 +-
+ arch/loongarch/Kconfig | 2 +-
+ arch/m68k/Kconfig.cpu | 2 +-
+ arch/mips/Kconfig | 2 +-
+ arch/mips/include/uapi/asm/mman.h | 2 +
+ arch/nios2/Kconfig | 2 +-
+ arch/parisc/include/uapi/asm/mman.h | 2 +
+ arch/powerpc/Kconfig | 2 +-
+ arch/powerpc/configs/85xx/ge_imp3a_defconfig | 2 +-
+ arch/powerpc/configs/fsl-emb-nonhw.config | 2 +-
+ arch/s390/mm/hugetlbpage.c | 10 -
+ arch/sh/configs/ecovec24_defconfig | 2 +-
+ arch/sh/mm/Kconfig | 2 +-
+ arch/sparc/Kconfig | 2 +-
+ arch/xtensa/Kconfig | 2 +-
+ arch/xtensa/include/uapi/asm/mman.h | 2 +
+ drivers/base/memory.c | 6 -
+ drivers/block/zram/zram_drv.c | 27 +-
+ fs/Kconfig | 1 +
+ fs/btrfs/compression.c | 31 +-
+ fs/btrfs/extent_io.c | 33 +-
+ fs/btrfs/subpage.c | 2 +-
+ fs/btrfs/tests/extent-io-tests.c | 32 +-
+ fs/buffer.c | 154 ++---
+ fs/ext2/balloc.c | 7 +-
+ fs/gfs2/meta_io.c | 7 +-
+ fs/gfs2/quota.c | 8 +-
+ fs/isofs/compress.c | 2 +-
+ fs/jbd2/journal.c | 15 +-
+ fs/jbd2/recovery.c | 16 +-
+ fs/nilfs2/page.c | 45 +-
+ fs/ntfs3/inode.c | 7 +-
+ fs/ocfs2/aops.c | 2 +-
+ fs/ocfs2/super.c | 4 +-
+ fs/proc/task_mmu.c | 2 +-
+ fs/ramfs/file-nommu.c | 50 +-
+ fs/reiserfs/journal.c | 11 +-
+ fs/reiserfs/stree.c | 4 +-
+ fs/reiserfs/super.c | 4 +-
+ fs/udf/dir.c | 2 +-
+ fs/udf/directory.c | 2 +-
+ fs/udf/inode.c | 8 +-
+ fs/ufs/balloc.c | 12 +-
+ fs/userfaultfd.c | 71 ++-
+ include/linux/buffer_head.h | 48 +-
+ include/linux/gfp.h | 3 +
+ include/linux/huge_mm.h | 23 +-
+ include/linux/hugetlb.h | 4 -
+ include/linux/hugetlb_cgroup.h | 19 +-
+ include/linux/memcontrol.h | 7 +-
+ include/linux/memory_hotplug.h | 22 +-
+ include/linux/mempolicy.h | 13 +-
+ include/linux/mm.h | 35 +-
+ include/linux/mmzone.h | 28 +-
+ include/linux/page_counter.h | 35 +-
+ include/linux/page_ext.h | 24 +-
+ include/linux/page_idle.h | 34 +-
+ include/linux/pagemap.h | 4 +-
+ include/linux/pagewalk.h | 10 +-
+ include/linux/pgtable.h | 9 +-
+ include/linux/rmap.h | 66 +-
+ include/linux/sched/sysctl.h | 1 +
+ include/linux/slab.h | 6 +
+ include/trace/events/huge_memory.h | 1 +
+ include/uapi/asm-generic/mman-common.h | 2 +
+ include/uapi/linux/userfaultfd.h | 4 +
+ init/main.c | 6 +-
+ kernel/sched/core.c | 14 +
+ kernel/sched/debug.c | 1 +
+ kernel/sched/fair.c | 164 +++++
+ kernel/sched/sched.h | 1 +
+ kernel/sysctl.c | 8 +
+ mm/Kconfig | 8 +-
+ mm/backing-dev.c | 6 +-
+ mm/cma_debug.c | 5 +-
+ mm/compaction.c | 14 +-
+ mm/damon/core-test.h | 6 +-
+ mm/damon/core.c | 21 +-
+ mm/damon/dbgfs.c | 2 +-
+ mm/damon/ops-common.c | 46 +-
+ mm/damon/paddr.c | 5 +-
+ mm/damon/vaddr.c | 31 +-
+ mm/filemap.c | 87 +--
+ mm/gup.c | 215 ++++---
+ mm/huge_memory.c | 69 ++-
+ mm/hugetlb.c | 137 +++--
+ mm/hugetlb_cgroup.c | 27 +-
+ mm/hugetlb_vmemmap.c | 10 +-
+ mm/internal.h | 2 +-
+ mm/kfence/core.c | 7 +
+ mm/khugepaged.c | 763 ++++++++++++++----------
+ mm/kmemleak.c | 21 +-
+ mm/ksm.c | 11 +
+ mm/madvise.c | 9 +-
+ mm/memcontrol.c | 11 +-
+ mm/memory-failure.c | 80 +--
+ mm/memory.c | 15 +-
+ mm/memory_hotplug.c | 5 +-
+ mm/mempolicy.c | 6 +-
+ mm/memremap.c | 2 +-
+ mm/migrate.c | 22 +-
+ mm/migrate_device.c | 13 +-
+ mm/mmap.c | 3 +
+ mm/mprotect.c | 8 +-
+ mm/page_alloc.c | 39 +-
+ mm/page_counter.c | 15 +-
+ mm/page_ext.c | 117 +++-
+ mm/page_io.c | 9 +-
+ mm/page_owner.c | 97 ++-
+ mm/page_table_check.c | 10 +-
+ mm/pagewalk.c | 10 +-
+ mm/rmap.c | 26 +-
+ mm/slub.c | 26 +
+ mm/swap.h | 4 +-
+ mm/util.c | 4 +-
+ mm/vmalloc.c | 15 +-
+ mm/vmscan.c | 45 +-
+ mm/vmstat.c | 1 +
+ mm/zsmalloc.c | 14 +-
+ mm/zswap.c | 2 +-
+ tools/include/uapi/asm-generic/mman-common.h | 2 +
+ tools/testing/selftests/vm/.gitignore | 1 -
+ tools/testing/selftests/vm/Makefile | 21 +-
+ tools/testing/selftests/vm/check_config.sh | 31 -
+ tools/testing/selftests/vm/hmm-tests.c | 108 ++--
+ tools/testing/selftests/vm/khugepaged.c | 563 +++++++++--------
+ tools/testing/selftests/vm/run_vmtests.sh | 15 +-
+ tools/testing/selftests/vm/userfaultfd.c | 76 ++-
+ tools/vm/page_owner_sort.c | 7 +-
+ 147 files changed, 2603 insertions(+), 1625 deletions(-)
+ delete mode 100644 tools/testing/selftests/vm/check_config.sh
+Merging mm-nonmm-stable/mm-nonmm-stable (b81475117547 latencytop: use the last element of latency_record of system)
+$ 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 Documentation/admin-guide/sysctl/kernel.rst
+Auto-merging arch/arm64/include/asm/processor.h
+Auto-merging arch/mips/configs/ci20_defconfig
+Auto-merging arch/powerpc/include/asm/processor.h
+Auto-merging arch/s390/include/asm/processor.h
+Auto-merging arch/xtensa/include/asm/processor.h
+Auto-merging fs/buffer.c
+Auto-merging fs/isofs/compress.c
+Auto-merging fs/ocfs2/super.c
+Auto-merging init/main.c
+Auto-merging kernel/exit.c
+Auto-merging scripts/checkpatch.pl
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/sysctl/kernel.rst | 5 ++
+ arch/alpha/configs/defconfig | 2 +-
+ arch/alpha/include/asm/processor.h | 2 -
+ arch/alpha/kernel/process.c | 5 --
+ arch/alpha/kernel/setup.c | 4 +-
+ arch/arc/configs/tb10x_defconfig | 2 +-
+ arch/arc/include/asm/processor.h | 3 -
+ arch/arm/include/asm/processor.h | 3 -
+ arch/arm/kernel/process.c | 4 -
+ arch/arm64/include/asm/processor.h | 3 -
+ arch/arm64/kernel/process.c | 4 -
+ arch/csky/include/asm/processor.h | 5 --
+ arch/hexagon/include/asm/processor.h | 4 -
+ arch/hexagon/kernel/process.c | 7 --
+ arch/ia64/include/asm/processor.h | 7 --
+ arch/ia64/kernel/setup.c | 2 +-
+ arch/ia64/kernel/sys_ia64.c | 26 ++++++
+ arch/ia64/kernel/syscalls/syscall.tbl | 2 +-
+ arch/loongarch/include/asm/processor.h | 3 -
+ arch/m68k/include/asm/processor.h | 5 --
+ arch/microblaze/configs/mmu_defconfig | 2 +-
+ arch/microblaze/include/asm/processor.h | 5 --
+ arch/mips/configs/bcm47xx_defconfig | 2 +-
+ arch/mips/configs/cavium_octeon_defconfig | 2 +-
+ arch/mips/configs/ci20_defconfig | 2 +-
+ arch/mips/configs/cu1000-neo_defconfig | 2 +-
+ arch/mips/configs/cu1830-neo_defconfig | 2 +-
+ arch/mips/configs/generic_defconfig | 2 +-
+ arch/mips/configs/omega2p_defconfig | 2 +-
+ arch/mips/configs/qi_lb60_defconfig | 2 +-
+ arch/mips/configs/vocore2_defconfig | 2 +-
+ arch/mips/include/asm/processor.h | 3 -
+ arch/nios2/configs/10m50_defconfig | 2 +-
+ arch/nios2/configs/3c120_defconfig | 2 +-
+ arch/nios2/include/asm/processor.h | 5 --
+ arch/openrisc/include/asm/processor.h | 1 -
+ arch/openrisc/kernel/process.c | 4 -
+ arch/parisc/include/asm/processor.h | 3 -
+ arch/parisc/kernel/process.c | 4 -
+ arch/powerpc/include/asm/processor.h | 1 -
+ arch/powerpc/kernel/process.c | 5 --
+ arch/riscv/include/asm/processor.h | 5 --
+ arch/s390/include/asm/processor.h | 3 -
+ arch/sh/configs/apsh4a3a_defconfig | 2 +-
+ arch/sh/configs/apsh4ad0a_defconfig | 2 +-
+ arch/sh/configs/edosk7760_defconfig | 2 +-
+ arch/sh/configs/magicpanelr2_defconfig | 2 +-
+ arch/sh/configs/polaris_defconfig | 2 +-
+ arch/sh/configs/r7780mp_defconfig | 2 +-
+ arch/sh/configs/r7785rp_defconfig | 2 +-
+ arch/sh/configs/rsk7203_defconfig | 2 +-
+ arch/sh/configs/sdk7780_defconfig | 2 +-
+ arch/sh/configs/se7712_defconfig | 2 +-
+ arch/sh/configs/se7721_defconfig | 2 +-
+ arch/sh/configs/sh2007_defconfig | 2 +-
+ arch/sh/configs/sh7757lcr_defconfig | 2 +-
+ arch/sh/configs/sh7785lcr_32bit_defconfig | 2 +-
+ arch/sh/configs/urquell_defconfig | 2 +-
+ arch/sh/include/asm/processor_32.h | 3 -
+ arch/sh/kernel/process_32.c | 5 --
+ arch/sparc/include/asm/processor_32.h | 3 -
+ arch/sparc/include/asm/processor_64.h | 3 -
+ arch/um/configs/i386_defconfig | 2 +-
+ arch/um/configs/x86_64_defconfig | 2 +-
+ arch/um/include/asm/processor-generic.h | 4 -
+ arch/x86/include/asm/processor.h | 3 -
+ arch/xtensa/configs/audio_kc705_defconfig | 2 +-
+ arch/xtensa/configs/cadence_csp_defconfig | 2 +-
+ arch/xtensa/configs/generic_kc705_defconfig | 2 +-
+ arch/xtensa/configs/nommu_kc705_defconfig | 2 +-
+ arch/xtensa/configs/smp_lx200_defconfig | 2 +-
+ arch/xtensa/configs/virt_defconfig | 2 +-
+ arch/xtensa/configs/xip_kc705_defconfig | 2 +-
+ arch/xtensa/include/asm/processor.h | 3 -
+ fs/aio.c | 9 +--
+ fs/buffer.c | 14 ++--
+ fs/eventpoll.c | 2 +-
+ fs/hfs/bnode.c | 32 +++-----
+ fs/hfs/btree.c | 29 ++++---
+ fs/hfsplus/bitmap.c | 20 ++---
+ fs/hfsplus/bnode.c | 105 +++++++++++-------------
+ fs/hfsplus/btree.c | 27 ++++---
+ fs/isofs/compress.c | 20 ++---
+ fs/ntfs/attrib.c | 28 ++++++-
+ fs/ntfs/inode.c | 7 ++
+ fs/ocfs2/stackglue.c | 4 +-
+ fs/ocfs2/super.c | 2 +-
+ fs/qnx6/inode.c | 6 +-
+ fs/reiserfs/procfs.c | 4 +-
+ include/asm-generic/unaligned.h | 2 +-
+ include/linux/bitops.h | 11 +--
+ include/linux/iversion.h | 32 +++-----
+ include/linux/kexec.h | 2 +-
+ include/linux/sched/task.h | 3 +
+ init/do_mounts.c | 4 +-
+ init/initramfs.c | 2 +-
+ init/main.c | 4 +-
+ ipc/util.c | 53 +++++++-----
+ kernel/exit.c | 4 +
+ kernel/fail_function.c | 26 +++---
+ kernel/kexec.c | 11 +--
+ kernel/kexec_core.c | 36 +++++----
+ kernel/kexec_file.c | 4 +-
+ kernel/kexec_internal.h | 15 +++-
+ kernel/ksysfs.c | 7 +-
+ kernel/latencytop.c | 4 +-
+ kernel/profile.c | 32 ++++----
+ kernel/smpboot.c | 15 ++--
+ kernel/task_work.c | 16 ++--
+ kernel/utsname_sysctl.c | 7 ++
+ lib/cmdline.c | 2 +-
+ lib/earlycpio.c | 2 +-
+ lib/llist.c | 12 +--
+ scripts/checkpatch.pl | 8 +-
+ scripts/decodecode | 120 ++++++++++++++++++++++++----
+ tools/testing/selftests/proc/proc-pid-vm.c | 56 ++++---------
+ 116 files changed, 521 insertions(+), 511 deletions(-)
+Merging mm/mm-everything (fbb5623fcdd8 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/mm/damon/usage.rst
+Auto-merging Documentation/admin-guide/sysctl/kernel.rst
+Auto-merging MAINTAINERS
+Auto-merging Makefile
+Auto-merging arch/Kconfig
+Auto-merging arch/arm64/kernel/vdso.c
+Auto-merging arch/powerpc/kernel/vdso.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/x86/include/asm/uaccess.h
+Auto-merging arch/x86/kernel/Makefile
+Auto-merging arch/x86/mm/fault.c
+Auto-merging block/bio.c
+Auto-merging block/blk-core.c
+Auto-merging block/blk-map.c
+CONFLICT (content): Merge conflict in block/blk-map.c
+Auto-merging crypto/Kconfig
+CONFLICT (content): Merge conflict in crypto/Kconfig
+Auto-merging drivers/firmware/efi/libstub/Makefile
+Auto-merging drivers/iommu/tegra-smmu.c
+Auto-merging drivers/net/Kconfig
+Auto-merging fs/btrfs/compression.c
+Auto-merging fs/buffer.c
+Auto-merging fs/coredump.c
+Auto-merging fs/exec.c
+CONFLICT (content): Merge conflict in fs/exec.c
+Auto-merging fs/isofs/compress.c
+Auto-merging fs/namei.c
+Auto-merging fs/ocfs2/super.c
+Auto-merging fs/posix_acl.c
+Auto-merging fs/proc/base.c
+Auto-merging fs/userfaultfd.c
+Auto-merging include/linux/blk_types.h
+Auto-merging include/linux/cgroup.h
+Auto-merging include/linux/compiler_types.h
+Auto-merging include/linux/fortify-string.h
+Auto-merging include/linux/hugetlb.h
+Auto-merging include/linux/rmap.h
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/slab.h
+Auto-merging init/main.c
+Auto-merging ipc/mqueue.c
+Auto-merging kernel/bpf/core.c
+Auto-merging kernel/cgroup/cgroup-internal.h
+Auto-merging kernel/dma/mapping.c
+Auto-merging kernel/events/core.c
+Auto-merging kernel/exit.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/sched/fair.c
+Auto-merging kernel/sched/psi.c
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/Makefile
+Auto-merging mm/damon/dbgfs.c
+Auto-merging mm/gup.c
+Auto-merging mm/huge_memory.c
+Auto-merging mm/hugetlb.c
+Auto-merging mm/khugepaged.c
+Auto-merging mm/madvise.c
+Auto-merging mm/memcontrol.c
+Auto-merging mm/memory-failure.c
+Auto-merging mm/memory-failure.c
+Auto-merging mm/memory.c
+Auto-merging mm/migrate_device.c
+Auto-merging mm/page_alloc.c
+Auto-merging mm/page_alloc.c
+Auto-merging mm/page_isolation.c
+Auto-merging mm/pagewalk.c
+Auto-merging mm/rmap.c
+Auto-merging mm/slab.h
+Auto-merging mm/slub.c
+CONFLICT (content): Merge conflict in mm/slub.c
+Auto-merging mm/vmscan.c
+Auto-merging mm/vmscan.c
+CONFLICT (content): Merge conflict in mm/vmscan.c
+Auto-merging scripts/Makefile.debug
+Auto-merging scripts/Makefile.lib
+Auto-merging tools/objtool/check.c
+Auto-merging tools/testing/selftests/vm/Makefile
+Auto-merging tools/testing/selftests/vm/hmm-tests.c
+CONFLICT (content): Merge conflict in tools/testing/selftests/vm/hmm-tests.c
+Resolved 'block/blk-map.c' using previous resolution.
+Resolved 'crypto/Kconfig' using previous resolution.
+Resolved 'fs/exec.c' using previous resolution.
+Resolved 'mm/slub.c' using previous resolution.
+Resolved 'mm/vmscan.c' using previous resolution.
+Resolved 'tools/testing/selftests/vm/hmm-tests.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 2e25e80d50bb] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
+$ git diff -M --stat --summary HEAD^..
+ .../ABI/testing/sysfs-kernel-mm-memory-tiers | 35 +
+ Documentation/accounting/delay-accounting.rst | 2 +-
+ Documentation/admin-guide/mm/damon/index.rst | 6 +-
+ Documentation/admin-guide/mm/damon/start.rst | 13 +-
+ Documentation/admin-guide/mm/damon/usage.rst | 5 +
+ Documentation/admin-guide/mm/index.rst | 1 +
+ Documentation/admin-guide/mm/ksm.rst | 36 +
+ Documentation/admin-guide/mm/multigen_lru.rst | 156 +
+ Documentation/admin-guide/mm/transhuge.rst | 7 +-
+ Documentation/admin-guide/sysctl/kernel.rst | 1 +
+ Documentation/core-api/index.rst | 1 +
+ Documentation/core-api/maple_tree.rst | 217 +
+ Documentation/dev-tools/index.rst | 1 +
+ Documentation/dev-tools/kasan.rst | 17 +-
+ Documentation/dev-tools/kmsan.rst | 427 +
+ Documentation/mm/balance.rst | 2 +-
+ Documentation/mm/index.rst | 1 +
+ Documentation/mm/ksm.rst | 2 +-
+ Documentation/mm/multigen_lru.rst | 159 +
+ MAINTAINERS | 26 +-
+ Makefile | 1 +
+ arch/Kconfig | 8 +
+ arch/arm64/include/asm/pgtable.h | 15 +-
+ arch/arm64/kernel/elfcore.c | 16 +-
+ arch/arm64/kernel/vdso.c | 3 +-
+ arch/arm64/mm/hugetlbpage.c | 2 +-
+ arch/parisc/kernel/cache.c | 9 +-
+ arch/powerpc/kernel/vdso.c | 6 +-
+ arch/powerpc/mm/book3s32/tlb.c | 11 +-
+ arch/powerpc/mm/book3s64/subpage_prot.c | 13 +-
+ arch/riscv/kernel/vdso.c | 3 +-
+ arch/s390/kernel/vdso.c | 3 +-
+ arch/s390/lib/uaccess.c | 3 +-
+ arch/s390/mm/gmap.c | 6 +-
+ arch/um/kernel/tlb.c | 14 +-
+ arch/x86/Kconfig | 10 +-
+ arch/x86/boot/Makefile | 1 +
+ arch/x86/boot/compressed/Makefile | 1 +
+ arch/x86/entry/vdso/Makefile | 3 +
+ arch/x86/entry/vdso/vma.c | 9 +-
+ arch/x86/include/asm/checksum.h | 16 +-
+ arch/x86/include/asm/kmsan.h | 55 +
+ arch/x86/include/asm/page_64.h | 7 +
+ arch/x86/include/asm/pgtable-3level.h | 8 +-
+ arch/x86/include/asm/pgtable.h | 9 +-
+ arch/x86/include/asm/pgtable_64_types.h | 47 +-
+ arch/x86/include/asm/sparsemem.h | 2 +
+ arch/x86/include/asm/string_64.h | 23 +-
+ arch/x86/include/asm/uaccess.h | 22 +-
+ arch/x86/kernel/Makefile | 2 +
+ arch/x86/kernel/cpu/Makefile | 1 +
+ arch/x86/kernel/dumpstack.c | 6 +
+ arch/x86/kernel/process_64.c | 1 +
+ arch/x86/kernel/tboot.c | 2 +-
+ arch/x86/kernel/unwind_frame.c | 11 +
+ arch/x86/lib/Makefile | 2 +
+ arch/x86/lib/iomem.c | 5 +
+ arch/x86/mm/Makefile | 2 +
+ arch/x86/mm/fault.c | 23 +-
+ arch/x86/mm/init.c | 2 +-
+ arch/x86/mm/init_64.c | 2 +-
+ arch/x86/mm/ioremap.c | 3 +
+ arch/x86/mm/pgtable.c | 5 +-
+ arch/x86/realmode/rm/Makefile | 1 +
+ arch/xtensa/kernel/syscall.c | 18 +-
+ block/Kconfig | 24 +
+ block/bio.c | 37 +-
+ block/blk-core.c | 17 -
+ block/blk-map.c | 8 +-
+ block/blk.h | 7 +
+ drivers/base/node.c | 141 +-
+ drivers/block/zram/zram_drv.c | 21 +-
+ drivers/block/zram/zram_drv.h | 15 +-
+ drivers/dax/kmem.c | 42 +-
+ drivers/firmware/efi/efi.c | 2 +-
+ drivers/firmware/efi/libstub/Makefile | 1 +
+ drivers/firmware/google/gsmi.c | 9 +
+ drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 14 +-
+ drivers/input/serio/libps2.c | 5 +-
+ drivers/iommu/tegra-smmu.c | 4 +-
+ drivers/misc/cxl/fault.c | 45 +-
+ drivers/net/Kconfig | 1 +
+ drivers/nvdimm/nd.h | 2 +-
+ drivers/nvdimm/pfn_devs.c | 2 +-
+ drivers/tee/optee/call.c | 18 +-
+ drivers/usb/core/urb.c | 2 +
+ drivers/virtio/virtio_ring.c | 10 +-
+ drivers/xen/privcmd.c | 2 +-
+ fs/btrfs/compression.c | 14 +-
+ fs/buffer.c | 4 +-
+ fs/coredump.c | 39 +-
+ fs/direct-io.c | 42 +-
+ fs/erofs/zdata.c | 13 +-
+ fs/exec.c | 15 +-
+ fs/fuse/dev.c | 14 +-
+ fs/fuse/file.c | 32 +-
+ fs/fuse/fuse_i.h | 1 +
+ fs/hugetlbfs/inode.c | 300 +-
+ fs/iomap/direct-io.c | 2 +-
+ fs/libfs.c | 53 +-
+ fs/namei.c | 2 +-
+ fs/nfs/direct.c | 22 +-
+ fs/ocfs2/namei.c | 49 +-
+ fs/ocfs2/namei.h | 2 +
+ fs/ocfs2/ocfs2_fs.h | 8 +-
+ fs/ocfs2/refcounttree.c | 17 +-
+ fs/ocfs2/suballoc.h | 2 +-
+ fs/ocfs2/xattr.c | 12 +-
+ fs/ocfs2/xattr.h | 1 +
+ fs/posix_acl.c | 3 +
+ fs/proc/Kconfig | 1 +
+ fs/proc/base.c | 20 +-
+ fs/proc/internal.h | 2 +-
+ fs/proc/task_mmu.c | 94 +-
+ fs/proc/task_nommu.c | 45 +-
+ fs/userfaultfd.c | 62 +-
+ include/asm-generic/cacheflush.h | 14 +-
+ include/linux/blk_types.h | 1 -
+ include/linux/bvec.h | 37 +
+ include/linux/cache.h | 13 +
+ include/linux/cgroup.h | 15 +-
+ include/linux/compiler-clang.h | 23 +
+ include/linux/compiler-gcc.h | 6 +
+ include/linux/compiler_types.h | 3 +-
+ include/linux/coredump.h | 1 +
+ include/linux/damon.h | 83 +-
+ include/linux/delayacct.h | 16 +-
+ include/linux/fortify-string.h | 2 +
+ include/linux/gfp_types.h | 12 +-
+ include/linux/highmem.h | 3 +
+ include/linux/huge_mm.h | 5 +
+ include/linux/hugetlb.h | 59 +-
+ include/linux/init.h | 2 +-
+ include/linux/instrumented.h | 59 +-
+ include/linux/ipc_namespace.h | 5 +-
+ include/linux/iversion.h | 46 +-
+ include/linux/kasan.h | 55 +-
+ include/linux/khugepaged.h | 13 +-
+ include/linux/kmsan-checks.h | 83 +
+ include/linux/kmsan.h | 330 +
+ include/linux/kmsan_types.h | 35 +
+ include/linux/ksm.h | 3 -
+ include/linux/maple_tree.h | 685 +
+ include/linux/memcontrol.h | 90 +-
+ include/linux/memory-tiers.h | 102 +
+ include/linux/migrate.h | 15 -
+ include/linux/mm.h | 127 +-
+ include/linux/mm_inline.h | 231 +-
+ include/linux/mm_types.h | 174 +-
+ include/linux/mm_types_task.h | 12 -
+ include/linux/mmzone.h | 241 +-
+ include/linux/node.h | 29 +-
+ include/linux/nodemask.h | 16 +-
+ include/linux/oom.h | 11 -
+ include/linux/page-flags-layout.h | 16 +-
+ include/linux/page-flags.h | 4 +-
+ include/linux/page_counter.h | 13 +-
+ include/linux/pageblock-flags.h | 4 +
+ include/linux/pagemap.h | 12 +-
+ include/linux/percpu_counter.h | 32 +
+ include/linux/pgtable.h | 17 +-
+ include/linux/rmap.h | 7 +-
+ include/linux/sched.h | 14 +-
+ include/linux/sched/coredump.h | 7 +-
+ include/linux/shmem_fs.h | 16 +-
+ include/linux/slab.h | 2 +-
+ include/linux/stackdepot.h | 8 +
+ include/linux/swap.h | 39 +-
+ include/linux/swapfile.h | 7 +-
+ include/linux/swapops.h | 150 +-
+ include/linux/uaccess.h | 19 +-
+ include/linux/uio.h | 4 +
+ include/linux/userfaultfd_k.h | 7 +-
+ include/linux/vm_event_item.h | 4 -
+ include/linux/vmacache.h | 28 -
+ include/linux/vmstat.h | 6 -
+ include/linux/writeback.h | 8 -
+ include/trace/events/huge_memory.h | 36 +
+ include/trace/events/maple_tree.h | 123 +
+ include/trace/events/mmap.h | 73 +
+ include/trace/events/mmflags.h | 1 -
+ include/uapi/asm-generic/hugetlb_encode.h | 26 +-
+ init/main.c | 30 +-
+ ipc/mqueue.c | 3 +-
+ ipc/msg.c | 44 +-
+ ipc/namespace.c | 5 +-
+ ipc/shm.c | 21 +-
+ ipc/util.h | 4 +-
+ kernel/Makefile | 1 +
+ kernel/acct.c | 11 +-
+ kernel/bounds.c | 7 +
+ kernel/bpf/core.c | 2 +-
+ kernel/bpf/task_iter.c | 10 +-
+ kernel/cgroup/cgroup-internal.h | 1 -
+ kernel/debug/debug_core.c | 12 -
+ kernel/delayacct.c | 13 +-
+ kernel/dma/mapping.c | 10 +-
+ kernel/entry/common.c | 5 +
+ kernel/events/core.c | 3 +-
+ kernel/events/uprobes.c | 39 +-
+ kernel/exit.c | 3 +
+ kernel/fork.c | 80 +-
+ kernel/kcov.c | 7 +
+ kernel/locking/Makefile | 3 +-
+ kernel/relay.c | 5 +-
+ kernel/sched/core.c | 1 +
+ kernel/sched/fair.c | 11 +-
+ kernel/sched/psi.c | 2 +
+ lib/Kconfig.debug | 39 +-
+ lib/Kconfig.kasan | 8 -
+ lib/Kconfig.kmsan | 62 +
+ lib/Makefile | 10 +-
+ lib/debugobjects.c | 10 +
+ lib/fault-inject.c | 30 +-
+ lib/iomap.c | 44 +
+ lib/iov_iter.c | 95 +-
+ lib/maple_tree.c | 7130 ++++
+ lib/show_mem.c | 4 +-
+ lib/stackdepot.c | 29 +-
+ lib/string.c | 8 +
+ lib/test_hmm.c | 13 +-
+ lib/test_maple_tree.c | 38307 +++++++++++++++++++
+ lib/test_printf.c | 8 +-
+ lib/usercopy.c | 3 +-
+ mm/Kconfig | 26 +
+ mm/Makefile | 4 +-
+ mm/compaction.c | 11 +-
+ mm/damon/Kconfig | 3 +
+ mm/damon/core-test.h | 23 +
+ mm/damon/core.c | 222 +-
+ mm/damon/dbgfs.c | 42 +-
+ mm/damon/lru_sort.c | 373 +-
+ mm/damon/modules-common.h | 46 +
+ mm/damon/ops-common.c | 4 +-
+ mm/damon/paddr.c | 34 +-
+ mm/damon/reclaim.c | 276 +-
+ mm/damon/sysfs.c | 100 +-
+ mm/damon/vaddr-test.h | 36 +-
+ mm/damon/vaddr.c | 69 +-
+ mm/debug.c | 14 +-
+ mm/filemap.c | 44 +-
+ mm/folio-compat.c | 6 +
+ mm/gup.c | 83 +-
+ mm/hmm.c | 2 +-
+ mm/huge_memory.c | 138 +-
+ mm/hugetlb.c | 476 +-
+ mm/hwpoison-inject.c | 4 +-
+ mm/init-mm.c | 4 +-
+ mm/internal.h | 45 +-
+ mm/kasan/Makefile | 8 +
+ mm/kasan/common.c | 177 +-
+ mm/kasan/generic.c | 154 +-
+ mm/kasan/hw_tags.c | 39 +-
+ mm/kasan/kasan.h | 171 +-
+ lib/test_kasan.c => mm/kasan/kasan_test.c | 26 +-
+ .../kasan/kasan_test_module.c | 2 +-
+ mm/kasan/report.c | 138 +-
+ mm/kasan/report_generic.c | 46 +-
+ mm/kasan/report_tags.c | 123 +-
+ mm/kasan/sw_tags.c | 5 +-
+ mm/kasan/tags.c | 141 +-
+ mm/kfence/core.c | 15 +-
+ mm/khugepaged.c | 447 +-
+ mm/kmsan/Makefile | 28 +
+ mm/kmsan/core.c | 450 +
+ mm/kmsan/hooks.c | 384 +
+ mm/kmsan/init.c | 235 +
+ mm/kmsan/instrumentation.c | 307 +
+ mm/kmsan/kmsan.h | 209 +
+ mm/kmsan/kmsan_test.c | 581 +
+ mm/kmsan/report.c | 219 +
+ mm/kmsan/shadow.c | 294 +
+ mm/ksm.c | 364 +-
+ mm/madvise.c | 51 +-
+ mm/memblock.c | 6 +-
+ mm/memcontrol.c | 210 +-
+ mm/memory-failure.c | 46 +-
+ mm/memory-tiers.c | 777 +
+ mm/memory.c | 259 +-
+ mm/memory_hotplug.c | 6 +-
+ mm/mempolicy.c | 60 +-
+ mm/migrate.c | 635 +-
+ mm/migrate_device.c | 6 +
+ mm/mlock.c | 37 +-
+ mm/mm_init.c | 6 +-
+ mm/mm_slot.h | 55 +
+ mm/mmap.c | 2257 +-
+ mm/mmzone.c | 2 +
+ mm/mprotect.c | 9 +-
+ mm/mremap.c | 41 +-
+ mm/msync.c | 2 +-
+ mm/nommu.c | 260 +-
+ mm/oom_kill.c | 35 +-
+ mm/page_alloc.c | 107 +-
+ mm/page_io.c | 36 +-
+ mm/page_isolation.c | 17 +-
+ mm/page_owner.c | 6 +-
+ mm/page_vma_mapped.c | 6 +-
+ mm/pagewalk.c | 2 +-
+ mm/readahead.c | 22 +-
+ mm/rmap.c | 158 +-
+ mm/rodata_test.c | 8 +-
+ mm/secretmem.c | 2 +-
+ mm/shmem.c | 428 +-
+ mm/shuffle.c | 21 +-
+ mm/slab.h | 1 +
+ mm/slub.c | 15 +
+ mm/swap.c | 79 +-
+ mm/swap.h | 14 +-
+ mm/swap_slots.c | 2 +-
+ mm/swap_state.c | 111 +-
+ mm/swapfile.c | 178 +-
+ mm/truncate.c | 2 +-
+ mm/userfaultfd.c | 28 +-
+ mm/util.c | 32 -
+ mm/vmacache.c | 117 -
+ mm/vmalloc.c | 20 +-
+ mm/vmscan.c | 3495 +-
+ mm/vmstat.c | 8 -
+ mm/workingset.c | 110 +-
+ mm/zsmalloc.c | 8 +-
+ scripts/Makefile.debug | 12 +-
+ scripts/Makefile.kmsan | 8 +
+ scripts/Makefile.lib | 9 +
+ security/Kconfig.hardening | 4 +
+ tools/include/asm-generic/hugetlb_encode.h | 26 +-
+ tools/include/linux/slab.h | 4 +
+ tools/objtool/check.c | 20 +
+ tools/perf/builtin-kmem.c | 1 -
+ tools/testing/memblock/linux/mmzone.h | 2 +
+ tools/testing/radix-tree/.gitignore | 2 +
+ tools/testing/radix-tree/Makefile | 9 +-
+ tools/testing/radix-tree/generated/autoconf.h | 1 +
+ tools/testing/radix-tree/linux.c | 160 +-
+ tools/testing/radix-tree/linux/kernel.h | 1 +
+ tools/testing/radix-tree/linux/lockdep.h | 2 +
+ tools/testing/radix-tree/linux/maple_tree.h | 7 +
+ tools/testing/radix-tree/maple.c | 59 +
+ tools/testing/radix-tree/trace/events/maple_tree.h | 5 +
+ tools/testing/selftests/damon/Makefile | 1 +
+ .../damon/debugfs_duplicate_context_creation.sh | 27 +
+ tools/testing/selftests/vm/Makefile | 3 +
+ tools/testing/selftests/vm/hmm-tests.c | 144 +
+ tools/testing/selftests/vm/khugepaged.c | 906 +-
+ tools/testing/selftests/vm/mremap_test.c | 49 +-
+ tools/testing/selftests/vm/soft-dirty.c | 2 +-
+ tools/testing/selftests/vm/split_huge_page_test.c | 12 +-
+ tools/testing/selftests/vm/test_hmm.sh | 10 -
+ tools/testing/selftests/vm/userfaultfd.c | 171 +-
+ tools/testing/selftests/vm/vm_util.c | 58 +-
+ tools/testing/selftests/vm/vm_util.h | 7 +-
+ 351 files changed, 63903 insertions(+), 6560 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers
+ create mode 100644 Documentation/admin-guide/mm/multigen_lru.rst
+ create mode 100644 Documentation/core-api/maple_tree.rst
+ create mode 100644 Documentation/dev-tools/kmsan.rst
+ create mode 100644 Documentation/mm/multigen_lru.rst
+ create mode 100644 arch/x86/include/asm/kmsan.h
+ create mode 100644 include/linux/kmsan-checks.h
+ create mode 100644 include/linux/kmsan.h
+ create mode 100644 include/linux/kmsan_types.h
+ create mode 100644 include/linux/maple_tree.h
+ create mode 100644 include/linux/memory-tiers.h
+ delete mode 100644 include/linux/vmacache.h
+ create mode 100644 include/trace/events/maple_tree.h
+ create mode 100644 lib/Kconfig.kmsan
+ create mode 100644 lib/maple_tree.c
+ create mode 100644 lib/test_maple_tree.c
+ create mode 100644 mm/damon/modules-common.h
+ rename lib/test_kasan.c => mm/kasan/kasan_test.c (98%)
+ rename lib/test_kasan_module.c => mm/kasan/kasan_test_module.c (99%)
+ create mode 100644 mm/kmsan/Makefile
+ create mode 100644 mm/kmsan/core.c
+ create mode 100644 mm/kmsan/hooks.c
+ create mode 100644 mm/kmsan/init.c
+ create mode 100644 mm/kmsan/instrumentation.c
+ create mode 100644 mm/kmsan/kmsan.h
+ create mode 100644 mm/kmsan/kmsan_test.c
+ create mode 100644 mm/kmsan/report.c
+ create mode 100644 mm/kmsan/shadow.c
+ create mode 100644 mm/memory-tiers.c
+ create mode 100644 mm/mm_slot.h
+ delete mode 100644 mm/vmacache.c
+ create mode 100644 scripts/Makefile.kmsan
+ create mode 100644 tools/testing/radix-tree/linux/maple_tree.h
+ create mode 100644 tools/testing/radix-tree/maple.c
+ create mode 100644 tools/testing/radix-tree/trace/events/maple_tree.h
+ create mode 100644 tools/testing/selftests/damon/debugfs_duplicate_context_creation.sh
+$ git am -3 ../patches/0001-mm-slab-fix-up-for-mm-kmsan-call-KMSAN-hooks-from-SL.patch
+Applying: mm/slab: fix up for "mm: kmsan: call KMSAN hooks from SLUB code"
+$ git reset HEAD^
+Unstaged changes after reset:
+M mm/slab_common.c
+$ git add -A .
+$ git commit -v -a --amend
+[master f4d235aa13a4] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
+ Date: Fri Sep 16 15:50:41 2022 +1000
+$ git am -3 ../patches/0001-crypto-Kconfig-fix-up-for-crypto-kmsan-disable-accel.patch
+Applying: crypto: Kconfig: fix up for "crypto: kmsan: disable accelerated configs under KMSAN"
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/x86/crypto/Kconfig
+M crypto/Kconfig
+$ git add -A .
+$ git commit -v -a --amend
+[master 23adf9fee715] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
+ Date: Fri Sep 16 15:50:41 2022 +1000
+$ git am -3 ../patches/0001-Revert-drm-msm-gem-Evict-active-GEM-objects-when-nec.patch
+Applying: Revert "drm/msm/gem: Evict active GEM objects when necessary"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/gpu/drm/msm/msm_gem_shrinker.c
+M drivers/gpu/drm/msm/msm_gpu_trace.h
+$ git add -A .
+$ git commit -v -a --amend
+[master 4c2b451fd0cb] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
+ Date: Fri Sep 16 15:50:41 2022 +1000
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 0000000000000..2e2e4cef002e2
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20220916