diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-03-04 20:45:16 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-03-04 20:45:16 +1100 |
| commit | 6d284ba80c0c485bcaa7bdf67f232d572640edc4 (patch) | |
| tree | be5718fe9d79370319bf671bb8ece015c86dea0a | |
| parent | fc67bc48c14f89b6961e4d06d729fe1792cc55e9 (diff) | |
Add linux-next specific files for 20220304next-20220304
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 347 | ||||
| -rw-r--r-- | Next/Trees | 349 | ||||
| -rw-r--r-- | Next/merge.log | 14432 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 15129 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..bdfbbd43d20c --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,347 @@ +Name SHA1 +---- ---- +origin b08968f196d498b19e9d0841d76a03862258f2d8 +fixes d06c942efea40e1701ade200477a7449008d9f24 +kbuild-current 754e0b0e35608ed5206d6a67a791563c631cec07 +arc-current e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +arm-current 7b83299e5b9385943a857d59e15cba270df20d7e +arm64-fixes 4f6de676d94ee8ddfc2e7e7cd935fc7cb2feff3a +arm-soc-fixes a0e897d1b36793fe0ab899f2fe93dff25c82f418 +drivers-memory-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +tee-fixes 6d8df1f9e8aed0cf370753a2b60a79e8ffec9ae9 +m68k-current 1a0ae068bf6b6f4233b1f31bf48bcbc47b111ef2 +powerpc-fixes fe663df7825811358531dc2e8a52d9eaa5e3515e +s390-fixes c194dad21025dfd043210912653baab823bdff67 +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net b949c21fc23ecaccef89582f251e6281cad1f81e +bpf 18b1ab7aa76bde181bdb1ab19a87fa9523c32f21 +ipsec 4ff2980b6bd2aa6b4ded3ce3b7c0ccfab29980af +netfilter f8e9bd34cedd89b93b1167aa32ab8ecd6c2ccf4a +ipvs 277f2bb14361790a70e4b3c649e794b75a91a597 +wireless e6e91ec966db5af4f059cfbac1af06560404b317 +rdma-fixes 7e57714cd0ad2d5bb90e50b5096a0e671dec1ef3 +sound-current 0aa6b294b312d9710804679abd2c0c8ca52cc2bc +sound-asoc-fixes b7fb0ae09009d076964afe4c1a2bde1ee2bd88a9 +regmap-fixes d04ad245d67a3991dfea5e108e4c452c2ab39bac +regulator-fixes 48fdc1fa4d937b687a32736ff945b5b29230b73b +spi-fixes a7c76d3f0787a76fb0af2b83a38712964c116859 +pci-current 3f1271b54edcc692da5a3663f2aa2a64781f9bc3 +driver-core.current 7e57714cd0ad2d5bb90e50b5096a0e671dec1ef3 +tty.current 7e57714cd0ad2d5bb90e50b5096a0e671dec1ef3 +usb.current 7e57714cd0ad2d5bb90e50b5096a0e671dec1ef3 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes cfc4442c642d568014474b6718ccf65dc7ca6099 +usb-chipidea-fixes f130d08a8d79fd419c339d95eb28ddff72a73f52 +phy 9a8406ba1a9a2965c27e0db1d7753471d12ee9ff +staging.current 342e7c6ea58200e45bcaa9bdd8402a5531c4777e +iio-fixes 123d838c4e7deedebe29cc63c1098db1a810f1f8 +counter-fixes 4a14311a3b935b62b33e665a97ecaaf2f078228a +char-misc.current 7e57714cd0ad2d5bb90e50b5096a0e671dec1ef3 +soundwire-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +thunderbolt-fixes 7e57714cd0ad2d5bb90e50b5096a0e671dec1ef3 +input-current 04b7762e37c95d9b965d16bb0e18dbd1fa2e2861 +crypto-current c6ce9c5831cae515d375a01b97ae1778689acf19 +vfio-fixes 8704e89349080bd640d1755c46d8cdc359a89748 +kselftest-fixes 6fec1ab67f8d60704cc7de64abcfd389ab131542 +modules-fixes a8e8f851e8299703a005cf23dfb9ec854a2611e5 +dmaengine-fixes cfb92440ee71adcc2105b0890bb01ac3cddb8507 +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes 7cf1de957a980d96d8b9c9e481c8bb1ad53fd99b +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes d40f0b133b44dc8ae2935d935add304496a19044 +reset-fixes 92c959bae2e54ba1e2540ba5f813f7752bd76be1 +mips-fixes 5d8965704fe5662e2e4a7e4424a2cbe53e182670 +at91-fixes 26077968f8389a68fdb38af3f2c2289ddc95e8ca +omap-fixes 8840f5460a23759403f1f2860429dcbcc2f04a65 +kvm-fixes 9ee83635d872812f3920209c606c6ea9e412ffcc +kvms390-fixes 0e9ff65f455dfd0a8aea5e7843678ab6fe097e21 +hwmon-fixes 686d303ee6301261b422ea51e64833d7909a2c36 +nvdimm-fixes 3dd60fb9d95db9c78fec86ba4df20852a7b974ba +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes 6e60f6a7ae9535f5aee96308302aa3944bbd9616 +vfs-fixes 9d2231c5d74e13b2a0546fee6737ee4446017903 +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes 21d90aaee8d5c2a097ef41f1430d97661233ecc6 +samsung-krzk-fixes 442b0c08db7e35980bed6af091877f4dda72ffca +pinctrl-samsung-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +devicetree-fixes 0c0822bcb73f154d96ee648644ec5a8628e3b864 +scsi-fixes 10af115646171afc0217177d6eae92917b785897 +drm-fixes e7c470a4b543375d50d88a4c5abd4b9e0f5adcea +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 08783aa7693f55619859f4f63f384abf17cb58c5 +mmc-fixes f0d2f15362f02444c5d7ffd5a5eb03e4aa54b685 +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +hyperv-fixes ffc58bc4af9365d4eea72526bb3cf6a83615c673 +soc-fsl-fixes a222fd8541394b36b13c89d1698d9530afd59a9c +risc-v-fixes 22e2100b1b07d6f5acc71cc1acb53f680c677d77 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +spdx d8152cfe2f21d6930c680311b03b169899c8d2a0 +gpio-brgl-fixes ae42f9288846353982e2eab181fb41e7fd8bf60f +gpio-intel-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +pinctrl-intel-fixes 6f66db29e2415cbe8759c48584f9cae19b3c2651 +erofs-fixes 24331050a3e6afcd4451409831dd9ae8085a42f6 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 92a68053c3468705e2c7c752c9a3f256304a35a6 +ubifs-fixes c3c07fc25f37c157fde041b3a0c3dfcb1590cbce +memblock-fixes c94afc46cae7ad41b2ad6a99368147879f4b0e56 +cel-fixes c306d737691ef84305d4ed0d302c63db2932f0bb +irqchip-fixes 1d4df649cbb4b26d19bea38ecff4b65b10a1bbca +renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609 +perf-current 13e741b834538a225512912608f0182079fc64e2 +efi-fixes 9feaf8b387ee0ece9c1d7add308776b502a35d0c +zstd-fixes 88a309465b3f05a100c3b81966982c0f9f5d23a6 +drm-misc-fixes 62929726ef0ec72cbbe9440c5d125d4278b99894 +kbuild d4c858643263cfde13f7d937eaff95c2ed87cdf1 +perf 56dce868198cd01b023e05d72bbbba7c87cc384d +compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69 +dma-mapping 80e4390981618e290616dbd06ea190d4576f219d +asm-generic 9f15ac318b836c881f9e3cc0cdbc7497033a6336 +arc 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +arm d5b493b066ca45416e4621c983dc25030d275782 +arm64 fe500628a0975c756980c638effd0878e960d78c +arm-perf 602c873eb52e5717057eb0971258c8eb7440c4a5 +arm-soc 1c9566edd537c5f15672fea1cb3f9f5fd7d5211f +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 39369380e729cff4d711c720199b258bbcb6c217 +aspeed d9540eeaa3d15d8295895fc39e7fb90937623923 +at91 f4de6d853a03ef2d0505549a80d4be34814b5f5f +drivers-memory c27983bbc75bf784484a80a56d0a434844e8b860 +imx-mxs 45550ada88f0253bef38041f2c1d80f6e69bb0ed +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek 6ceb6a96db4e1309ff072cc5dea95e49ec9fe691 +mvebu 89756932b780c9f98d58e804881d0a83b260771a +omap f9ecc209330a4837393f7b87f6f95970542b90c6 +qcom 22139a9091fd260a543e170c1113aee41b038c6b +raspberrypi c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca +renesas dff7b84b4d2a5df4fb98714257adbb539807d7b9 +reset 89e7a6698fdd6d0cccf5bab11abc51f813944cd8 +rockchip f03511c4f2b5a661adafc9827b0d4985e87aff4e +samsung-krzk b2d5c4016a34d769e8ec00db7c53b9a7d8312e07 +scmi 210b966b7e2f873a5dfe631c2f36dbe93094b2ea +stm32 74fa56279651956f7ce6a75a85156585f91e7e5e +sunxi f25c47c6762920840785b5038611bca7c023a745 +tee 3e53bb2bd87bb6cb8887a1bf4d0c026dc8fe39bb +tegra 6d746e1eb2f6f7e872c78604c899039f1a41dacd +ti 183a6f5c6e1ea03c5a0bf0d9d304e6a73b806e04 +xilinx 3a14f0e614082821ef65de7e1fb39e74c2ee4ee3 +clk 7da5e77a1b5fc58c78f0e16ebf1068febda799a0 +clk-imx e2049ad63a24a91eaa1f44819c09c71ad78e281c +clk-renesas 73421f2a48e6bd1d1024a09aedbc9c662cb88e77 +clk-samsung 45bd8166a1d821eb8fada3092514a7c8543f537c +csky a0793fdad9a11a32bc6d21317c93c83f4aa82ebc +h8300 1ec10274d436fbe77b821fbdf095b45d0888e46d +m68k 0d52a01a266ba21840c7cb02e1de39c503759dda +m68knommu 244e6c2d4e4de4ea5f055ca2a57755fd1105a570 +microblaze fcc619621df50f63b641b18536f908b05d6782a4 +mips 4a0a1436053b17e50b7c88858fb0824326641793 +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 862cf8d5fd98ed8ea8989726ed5da53761a9ed76 +parisc-hd d21d3f34cf6e7cfabd8ba2e1d2c42356e6fcb554 +powerpc 8219d31effa7be5dbc7ff915d7970672e028c701 +soc-fsl 1ce93cb102e7fcf5d1849044d23ce92b5a71040a +risc-v d56201d9440de302c8cb017761946e585f6cb74f +s390 5225811009e5ac286a3e7d993b9ff0497380ceaa +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml db0dd9cee82270e032123169ceff659eced5115d +xtensa 8a900dc390daecbfd0025bd4f12a11d2ed911fb7 +pidfd d52c14f5f9b326049c8b454e3a54d41d9d81063b +fscrypt cdaa1b1941f667814300799ddb74f3079517cd5a +fscache 2522c1b16116325f69670076d0c82024fbcc4e8d +afs 26291c54e111ff6ba87a164d85d4a4e134b7315c +btrfs f717a6052f383d3ea57229970e0d2a18e963413a +ceph ad5255c1ea9c64b350efe732c90e63063b2bbbe0 +cifs 3de268c4de06c17a4b6140571e6cd8d80836cc31 +configfs 84ec758fb2daa236026506868c8796b0500c047d +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs 22ba5e99b96f1c0dbdfa4f4e1d9751b4c8348541 +exfat dd81e1c7d5fb126e5fbc5c9e334d7b3ec29a16a0 +ext3 487606687984c6aa8b371cf9a23b78874450a1d3 +ext4 cc5095747edfb054ca2068d01af20be3fcc3634f +f2fs 680af5b824a52faa819167628665804a14f0e0df +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse c086df4902573e2f06c6a2a83452c13a8bc603f5 +gfs2 b2963932346f0631c5145f656a22d4237f0956fa +jfs c48a14dca2cb57527dde6b960adbe69953935f10 +ksmbd 1a927cda94ac5e6783f243d4b3cd772b1c552ced +nfs 6c984083ec2453dfd3fcf98f392f34500c73e3f2 +nfs-anna d19e0183a88306acda07f4a01fedeeffe2a2a06b +nfsd bf27a962851b31e434783f8f4e32096914764e63 +ntfs3 52e00ea6b26e45fb8159e3b57cdde8d3f9bdd8e9 +orangefs 40a74870b2d1d3d44e13b3b73c6571dd34f5614d +overlayfs 94fd19752b28aa66c98e7991734af91dfc529f8f +ubifs aa39cc675799bc92da153af9a13d6f969c348e82 +v9fs 22e424feb6658c5d6789e45121830357809c59cb +xfs b97cca3ba9098522e5a1c3388764ead42640c1a5 +zonefs 95b115332a835fb0cbd36dfabacf1c57d915e705 +iomap ebb7fb1557b1d03b906b668aa2164b51e6b7d19a +djw-vfs 2d86293c70750e4331e9616aded33ab6b47c299d +file-locks 80d8e4d3f3133d2ce8ac83db6806b7bf62e3a1e1 +vfs 124f75f864f38327e3e7e182e6b6da5105e2bade +printk c5f75d490fc2dd706898c005a05a933b39e880d3 +pci b3c57902bef6a4da58cb0465e858f797a5885c1a +pstore 023bbde3db41078780f5d57e5354212f974c4bca +hid cde4b57a1c5185fad2b4939fc6c84fc0fdafcf19 +i2c 867dfe1041a03147f964aca22a8177293e30adbe +i3c 13462ba1815db5a96891293a9cfaa2451f7bd623 +dmi f97a2103f1a75ca70f23deadb4d96a16c4d85e7d +hwmon-staging 007e433cf0373334a2bef1b0c9831647184906ba +jc_docs 247097e2bbff4201b85eee8de4f31b4065877f67 +v4l-dvb 2b891d3980f6c255459d0e1c29ce2152ec7cf678 +v4l-dvb-next 2881ca629984b949ec9ac2e8ba1e64a2f0b66e8b +pm 7c2ca3c76b25e3d304c689a75025f4ba28746543 +cpufreq-arm 72951a77c00fb23275c8164aeee409c06b6f197c +cpupower 8382dce5e4835c045f33b8958a5f559d212cdd11 +devfreq 26291c54e111ff6ba87a164d85d4a4e134b7315c +opp f48a0c475c2aec8f2274703e1dc7be503f40f7cc +thermal cef4b473c499a76a1e5a12f280fa0379b8c3e0e1 +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm feae43f8aa88309224b27bbe3a59fcb9aefab6f5 +rdma a80501b89152adb29adc7ab943d75c7345f9a3fb +net-next 80901bff812984624918d9d03f9286e3245ee9a5 +bpf-next 7df5072cc05fd1aab5823bbc465d033cd292fca8 +ipsec-next 2ecda181682e9ed66dfbd5f8445c5d5a35b984d3 +mlx5-next 45fee8edb4b333af79efad7a99de51718ebda94b +netfilter-next c828414ac935bd3df96a8f7028d9d06a3db441e8 +ipvs-next c828414ac935bd3df96a8f7028d9d06a3db441e8 +bluetooth 8c9fa1be6896314a67fdf87ee160551a892d6d51 +wireless-next e715f10f3d055939b4cdfcd282ddf13d1dbab7fc +mtd 2365f91c861cbfeef7141c69842848c7b2d3c2db +nand ffb16c1c42670356c579926aabdac0ac7bbc16d8 +spi-nor 3c552889e431cf5c9680bb7de1c5d16bcc90b033 +crypto 280ee3c3aaa8158e69db5453d8ffd11fce49979c +drm 38a15ad9488e21cad8f42d3befca20f91e5b2874 +drm-misc 07f380da3ebd8d84fc866ccf83d93c667fcaaeaa +amdgpu efa8692773c96d85dd24fdb76e49ff9056f963a1 +drm-intel 6b4e414ce8dab7042a002f861b7bcae50a1e2b6d +drm-tegra b53c24f69199b88671293de503f1f999a762f4f9 +drm-msm 8661f450626f9a992a27401f798f63a727b41b73 +imx-drm 20fbfc81e390180db738c414c1b7ac85d31e24b3 +etnaviv cdd156955f946beaa5f3a00d8ccf90e5a197becc +fbdev 4f01d09b2bbfbcb47b3eb305560a7f4857a32260 +regmap 2d2329787ba2e70eae330f1cecd61a9576fe65de +sound e52b78f890675132989aaa298e1e1077b6bf9325 +sound-asoc 6984974883ca46c2b39fc49f236df02a61b37649 +modules 719fce7539cd3e186598e2aed36325fe892150cf +input dfafa56029576c52a393b61dcba7a3a43fd2b6c0 +block e2f4ede7e71124f9fd8a0ccade673d96d04d9f74 +device-mapper 168678d765d3659fddffe80a70668488066a9569 +libata 4dd4d3deb5026ee7356e23ce2607637ff313bb80 +pcmcia 3928cf08334ed895a31458cbebd8d4ec6d84c080 +mmc 1f311c94aabdb419c28e3147bcc8ab89269f1a7e +mfd 7a69f34ab44d16b82ce993b5a5ee8a60a5ba6d81 +backlight ec961cf3241153e0f27d850f1bf0f172e7d27a21 +battery ffb983d315197a623acf23b41526372534395fd6 +regulator 29bfeed6be0c0ee1fce3a634499d051ab87c208e +security 047843bdb3160e8fb225f3752616ac7257033fe4 +apparmor c2489617b3b9a546789ca00940b205d61c518c81 +integrity cd3bc044af483422cc81a93f23c78c20c978b17c +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5 +selinux cdbec3ede0b8cb318c36f5cc945b9360329cbd25 +smack a5cd1ab7ab679d252a6d2f483eee7d45ebf2040c +tomoyo b9c20da356db1b398c1162f9d5059b381724dc8b +tpmdd c9e54f38976a1c0ec69c0a6208b3fd55fceb01d1 +watchdog cfb92440ee71adcc2105b0890bb01ac3cddb8507 +iommu a9b491f6d6de0cc3287be6cdf9855eafd4f8b461 +audit 272ceeaea355214b301530e262a0df8600bfca95 +devicetree dca669354e6ff494222dfc461bed1087264f3755 +mailbox 869b6ca39c08c5b10eeb29d4b3c4bc433bf8ba5e +spi a3d3c11c04240ef00907ad3f66c7219ed2949f75 +tip a66320f041601309f1885bcb52e27e0c2f72079b +clockevents b22a1c270f533e30bc5d5d4cab6199a2cbb07b07 +edac 9e32472d8b3fe0ded8000bdd3bf11b267092178c +irqchip 1a68edc0dc1fdca2e1fa93e84cd7f8468a00cb3f +ftrace 864ea0e10cc90416a01b46f0d47a6f26dc020820 +rcu 1498a74770d7ec2f6b62083cbd671c2ca7ca7549 +kvm 4dfc4ec2b7f5a3a27d166ac42cf8a583fa2d3284 +kvm-arm 0054348a2011b3714b2ea863ebfcb3f9fc6c3c8e +kvms390 ee6a569d3bf64c9676eee3eecb861fb01cc11311 +xen-tip f66edf684edcb85c1db0b0aa8cf1a9392ba68a9d +percpu 4e1f82dce05b644d6886d5b3656446d8ec50db20 +workqueues bc35f7ef96284b8c963991357a9278a6beafca54 +drivers-x86 cb18448bbf1c845aecaa09b04cfdcceb070d9236 +chrome-platform b579f139e47037cf98808ccf7511a6deb02f3b18 +hsi e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +leds e26557a0aa68acfb705b51947b7c756401a1ab71 +ipmi f4676c8ec39689c6370bd58f4266c5c613de2a28 +driver-core 4a248f85b3dd8e010ff8335755c927130e9b0764 +usb ca9400ef7f6793288db95ca658dede6e71e777d6 +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial c4b9c570965f75d0d55e639747f1e5ccdad2fae0 +usb-chipidea-next 78665f57c3faa09f123c4818101526e43ae9b6a4 +tty 47b95e8ab731511b7ed7924ec3ec922e14737e4e +char-misc 3dd9a926ec2308e49445f22abef149fc64e9332e +extcon b26c5f03a64538d8897851458ed49af39001a869 +gnss 26291c54e111ff6ba87a164d85d4a4e134b7315c +phy-next c6455af548991ed22c89528f998fd965c052fb2e +soundwire 266fa94673d325f489f74d0a9a12024a7f1ee49c +thunderbolt 7f7b571becf3731dfa9aa50bed420e0c988e511d +vfio f8a665b1594799fb25fa9cd6a623469707c69c16 +staging b25c7dc13fb8842e8634bd846a7a96f2176f0244 +iio 0bf126163c3e7e6d722622073046aed567a5551e +mux 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +icc 52c85167e41341c2cbc2570f4bb6bc6cd8f8bc6e +dmaengine ea7c8f598c323f6ebaf9ddae01fb2a981fe8c56a +cgroup 88ea791b5665730a864088be384d4f4f6833e63b +scsi f6de306274ab69a8d60ed5490a88bef4a3aba850 +scsi-mkp f2ddbbea7780f0af46944ccd494f7eded8e214a4 +vhost fae0bd40fab0881169991942c5ab11c5464178c3 +rpmsg dbba77c2f01b4c428a97c4657e8cf02359c3250a +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl 37db988c362932b7cbd5e104d23cd4b99012cf02 +gpio-intel a1ce76e89907a69713f729ff21db1efa00f3bb47 +gpio-sim 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +pinctrl 842366d7cb68321b33920f859d0772fc16bc8a33 +pinctrl-intel d25478e1d8f9bf9344cf61a9c02fae88d9930f55 +pinctrl-renesas babe298e9caaa3d723f9721647eeac22309941d8 +pinctrl-samsung 3652dc070bad335d6feb31402bb4ab1ad58d5cb6 +pwm ed14d36498c8d15be098df4af9ca324f96e9de74 +userns 0ac983f512033cb7b5e210c9589768ad25b1e36b +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest f6d344cd5fa6a15e1ec2da350470b35a3f55f74c +livepatching b44a7f076ce1dac5b7a495f1902db0c5c4ee99d5 +coresight b54f53bc11a584713f79a704c70c488489f524b8 +rtc 73ce05302007eece23a6acb7dc124c92a2209087 +nvdimm 2166a9974902d277cc03f15027d72c4d6ab2a256 +at24 e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +ntb d2bda1500aa8a4d2060dab521d3b05e3b918517b +seccomp eed09ad261822a7bdc441ed192c6f444375e5527 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +fsi f2af60bb7ce2fa5397f401cbf65725d9c87329a4 +slimbus e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +nvmem bdf79b27260ba474ce076e451911b0f552285a7b +xarray 22f56b8e890d4e2835951b437bb6eeebfd1cb18b +hyperv 1d7286729aa616772be334eb908e11f527e1e291 +auxdisplay 9ed331f8a0fb674f4f06edf05a1687bf755af27b +kgdb b77dbc86d60459b42ab375e4e23172e7245f2854 +hmm 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +fpga 21f0a239ecab4b6765269af78904512358beb802 +kunit e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +cfi e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +kunit-next 5debe5bfa02c4c8922bd2d0f82c9c3a70bec8944 +trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b +mhi 0d02ea60ea13a97b153433028d56ef572b062f19 +memblock f30b002ccfee8c60c8feb590e145c0b5e8fa4c67 +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +cxl e6e17cc6ed751072513fe16cb595ac09f6821a43 +folio-iomap 4d7bd0eb72e5831ddb1288786a96448b48440825 +zstd 88a309465b3f05a100c3b81966982c0f9f5d23a6 +efi 2baa81c83f6f3a927cfbbbd707b669d039302625 +unicode 5298d4bfe80f6ae6ae2777bcd1357b0022d98573 +slab d3d59937afdff2c5fc66a2b3ab134dbd805cb25e +random 8497f1bb8d745718bc8f2c80334dfcd03ff7dc68 +landlock a691b98583000247f9aef62d1190f49725ea2f0b +rust 847245fe812e178d9cdabcec70ebf9d02fb383e1 +sysctl fc12aa67daba87a5ac43a9d3ae80be2e666e2ef9 +folio 0488343ba3dd6eb00b96708ee29c97aa68a00f21 +execve 9e1a3ce0a952450a1163cc93ab1df6d4fa8c8155 +kspp 1b01a23d9a48993f7c520c23cca488b58b0729ae +kspp-gustavo 91adfbb14c00b9b4dcd4c9c680c653dd3a8a1919 +akpm-current f5e25674814323a8218de72fb2a6de7aabc22138 +akpm a43902460ff47a3aea8c7b01119cb7db647103e6 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..ab4e9d786552 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,349 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless git git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#main +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#for-usb-fixes +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-fixes git https://gitlab.com/vilhelmgray/counter.git#fixes-togreg +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-linus +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/fixes +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +integrity-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +cel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-rc +irqchip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-fixes +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/urgent +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +perf git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/core +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git://git.libc.org/linux-sh#for-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-next +ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next git git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#main +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#for-usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +vfio git git://github.com/awilliam/linux-vfio.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +mux git https://gitlab.com/peda-linux/mux.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/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 +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +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 +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +counters git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#counters +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 +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 +akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..23807917d7d9 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,14432 @@ +$ date -R +Fri, 04 Mar 2022 08:53:56 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 69% (6825/9845)
Updating files: 70% (6892/9845)
Updating files: 71% (6990/9845)
Updating files: 72% (7089/9845)
Updating files: 73% (7187/9845)
Updating files: 74% (7286/9845)
Updating files: 75% (7384/9845)
Updating files: 76% (7483/9845)
Updating files: 77% (7581/9845)
Updating files: 78% (7680/9845)
Updating files: 79% (7778/9845)
Updating files: 80% (7876/9845)
Updating files: 81% (7975/9845)
Updating files: 82% (8073/9845)
Updating files: 83% (8172/9845)
Updating files: 84% (8270/9845)
Updating files: 85% (8369/9845)
Updating files: 86% (8467/9845)
Updating files: 87% (8566/9845)
Updating files: 88% (8664/9845)
Updating files: 89% (8763/9845)
Updating files: 90% (8861/9845)
Updating files: 91% (8959/9845)
Updating files: 92% (9058/9845)
Updating files: 93% (9156/9845)
Updating files: 94% (9255/9845)
Updating files: 95% (9353/9845)
Updating files: 96% (9452/9845)
Updating files: 97% (9550/9845)
Updating files: 98% (9649/9845)
Updating files: 99% (9747/9845)
Updating files: 100% (9845/9845)
Updating files: 100% (9845/9845), done. +HEAD is now at 92ebf5f91b4d Merge tag 'erofs-for-5.17-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs +Merging origin/master (b08968f196d4 cachefiles: Fix incorrect length to fallocate()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 92ebf5f91b4d..b08968f196d4 +Fast-forward (no commit created; -m option ignored) + arch/arm/kernel/kgdb.c | 36 +++- + arch/arm/mm/mmu.c | 2 + + arch/mips/kernel/setup.c | 2 +- + arch/mips/kernel/smp.c | 6 +- + arch/mips/ralink/mt7621.c | 36 ++-- + drivers/atm/firestream.c | 2 + + drivers/auxdisplay/lcd2s.c | 24 ++- + drivers/net/arcnet/com20020-pci.c | 3 + + drivers/net/can/rcar/rcar_canfd.c | 6 +- + drivers/net/can/usb/etas_es58x/es58x_core.c | 9 +- + drivers/net/can/usb/etas_es58x/es58x_core.h | 8 +- + drivers/net/can/usb/gs_usb.c | 10 +- + drivers/net/ethernet/broadcom/bnx2.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 2 + + drivers/net/ethernet/ibm/ibmvnic.c | 183 +++++++++++++++++---- + drivers/net/ethernet/ibm/ibmvnic.h | 1 + + drivers/net/ethernet/intel/e1000e/hw.h | 1 + + drivers/net/ethernet/intel/e1000e/ich8lan.c | 8 +- + drivers/net/ethernet/intel/e1000e/ich8lan.h | 1 + + drivers/net/ethernet/intel/e1000e/netdev.c | 26 +++ + drivers/net/ethernet/intel/iavf/iavf.h | 6 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 159 ++++++++++++------ + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 24 +-- + drivers/net/ethernet/intel/igc/igc_phy.c | 4 - + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 6 +- + .../net/ethernet/microchip/sparx5/sparx5_main.h | 2 + + .../net/ethernet/microchip/sparx5/sparx5_vlan.c | 20 +-- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 6 +- + drivers/net/ethernet/sfc/mcdi.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 34 +++- + drivers/net/ipa/Kconfig | 2 + + drivers/net/wireless/intel/Makefile | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 11 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 1 - + .../net/wireless/intel/iwlwifi/mvm/vendor-cmd.c | 5 +- + drivers/net/xen-netfront.c | 39 +++-- + drivers/ptp/ptp_ocp.c | 25 ++- + fs/cachefiles/interface.c | 2 +- + include/linux/netfilter_netdev.h | 4 + + include/linux/rfkill.h | 5 + + include/net/bluetooth/bluetooth.h | 3 +- + include/net/bluetooth/hci_core.h | 8 + + include/net/ndisc.h | 4 +- + include/net/netfilter/nf_flow_table.h | 6 +- + include/net/netfilter/nf_queue.h | 2 +- + include/net/xfrm.h | 6 +- + include/uapi/linux/xfrm.h | 6 + + kernel/user_namespace.c | 14 +- + lib/Kconfig | 1 - + net/batman-adv/hard-interface.c | 29 +++- + net/bluetooth/hci_core.c | 1 + + net/bluetooth/hci_sync.c | 30 +++- + net/bluetooth/mgmt.c | 99 +++++++---- + net/bluetooth/mgmt_util.c | 3 +- + net/core/skbuff.c | 2 +- + net/core/skmsg.c | 2 +- + net/dcb/dcbnl.c | 44 +++++ + net/dsa/dsa2.c | 2 +- + net/ipv4/esp4.c | 2 +- + net/ipv4/tcp.c | 10 +- + net/ipv6/addrconf.c | 8 +- + net/ipv6/esp6.c | 2 +- + net/ipv6/ip6_output.c | 11 +- + net/ipv6/mcast.c | 32 ++-- + net/key/af_key.c | 2 +- + net/mac80211/agg-tx.c | 10 +- + net/mac80211/ieee80211_i.h | 2 +- + net/mac80211/mlme.c | 16 +- + net/mac80211/rx.c | 14 +- + net/mptcp/protocol.c | 18 +- + net/netfilter/core.c | 5 +- + net/netfilter/nf_flow_table_offload.c | 6 +- + net/netfilter/nf_queue.c | 36 +++- + net/netfilter/nf_tables_api.c | 4 +- + net/netfilter/nfnetlink_queue.c | 12 +- + net/sched/act_ct.c | 13 +- + net/smc/af_smc.c | 14 +- + net/smc/smc_core.c | 5 +- + net/wireless/Makefile | 2 +- + net/wireless/nl80211.c | 15 +- + net/xfrm/xfrm_device.c | 6 +- + net/xfrm/xfrm_interface.c | 2 +- + net/xfrm/xfrm_policy.c | 14 +- + net/xfrm/xfrm_state.c | 29 ++-- + net/xfrm/xfrm_user.c | 6 +- + .../drivers/net/mlxsw/spectrum/resource_scale.sh | 2 +- + .../selftests/drivers/net/mlxsw/tc_police_scale.sh | 3 +- + tools/testing/selftests/net/mptcp/mptcp_connect.sh | 4 +- + tools/testing/selftests/netfilter/.gitignore | 1 + + tools/testing/selftests/netfilter/Makefile | 2 +- + tools/testing/selftests/netfilter/connect_close.c | 136 +++++++++++++++ + tools/testing/selftests/netfilter/nft_queue.sh | 19 +++ + 93 files changed, 1069 insertions(+), 385 deletions(-) + create mode 100644 tools/testing/selftests/netfilter/connect_close.c +Merging fixes/fixes (d06c942efea4 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Already up to date. +Merging kbuild-current/fixes (754e0b0e3560 Linux 5.17-rc4) +$ 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 (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (7b83299e5b93 ARM: 9182/1: mmu: fix returns from early_param() and __setup() functions) +$ 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 (4f6de676d94e arm64: Correct wrong label in macro __init_el2_gicv3) +$ 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 (a0e897d1b367 arm64: dts: armada-3720-turris-mox: Add missing ethernet0 alias) +$ 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. + Documentation/devicetree/bindings/arm/qcom.yaml | 6 ----- + arch/arm/boot/dts/bcm2711.dtsi | 1 + + arch/arm/mach-mstar/Kconfig | 1 + + .../boot/dts/marvell/armada-3720-turris-mox.dts | 1 + + .../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 2 ++ + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 5 ++++ + arch/arm64/boot/dts/qcom/sm8350.dtsi | 28 ++++++++++++++++++---- + arch/arm64/boot/dts/qcom/sm8450.dtsi | 8 ++++--- + drivers/soc/mediatek/mt8192-mmsys.h | 3 ++- + 9 files changed, 40 insertions(+), 15 deletions(-) +Merging drivers-memory-fixes/fixes (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging tee-fixes/fixes (6d8df1f9e8ae Merge tag 'optee-fix2-for-v5.17' into fixes) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Auto-merging drivers/tee/optee/ffa_abi.c +Auto-merging drivers/tee/optee/smc_abi.c +Merge made by the 'ort' strategy. +Merging m68k-current/for-linus (1a0ae068bf6b m68k: defconfig: Update defconfigs for v5.16-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 (fe663df78258 powerpc/lib/sstep: fix 'ptesync' build error) +$ 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 (c194dad21025 s390/extable: fix exception table sorting) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Merge made by the 'ort' strategy. + arch/s390/include/asm/extable.h | 9 +++++++-- + arch/s390/include/asm/ftrace.h | 10 ++++++---- + arch/s390/include/asm/ptrace.h | 2 ++ + arch/s390/kernel/ftrace.c | 37 ++++++++++++++++++++++++++++++++++++- + arch/s390/kernel/mcount.S | 9 +++++++++ + arch/s390/kernel/setup.c | 2 ++ + 6 files changed, 62 insertions(+), 7 deletions(-) +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 (b949c21fc23e Merge tag 'net-5.17-rc7' of 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/netdev/net.git net/master +Already up to date. +Merging bpf/master (18b1ab7aa76b xsk: Fix race at socket teardown) +$ 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 - + net/xdp/xsk.c | 69 +++++++++++++++++++++++++++++++++++++++++++---------------- + 2 files changed, 50 insertions(+), 20 deletions(-) +Merging ipsec/master (4ff2980b6bd2 xfrm: fix tunnel model fragmentation behavior) +$ 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/ipv6/xfrm6_output.c | 16 ++++++++++++++++ + net/xfrm/xfrm_interface.c | 5 ++++- + 2 files changed, 20 insertions(+), 1 deletion(-) +Merging netfilter/master (f8e9bd34cedd Merge branch 'smc-fix') +$ 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 (277f2bb14361 ibmvnic: schedule failover only if vioctl fails) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master +Already up to date. +Merging wireless/main (e6e91ec966db iwlwifi: mvm: return value for request_ownership) +$ git merge -m Merge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/main +Already up to date. +Merging rdma-fixes/for-rc (7e57714cd0ad Linux 5.17-rc6) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (0aa6b294b312 ALSA: intel_hdmi: Fix reference to PCM buffer address) +$ 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/soc/codecs/cs4265.c | 3 +-- + sound/soc/soc-ops.c | 4 ++-- + sound/x86/intel_hdmi_audio.c | 2 +- + 3 files changed, 4 insertions(+), 5 deletions(-) +Merging sound-asoc-fixes/for-linus (b7fb0ae09009 ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + sound/soc/amd/vangogh/acp5x-i2s.c | 26 ++++++-------------- + sound/soc/amd/vangogh/acp5x-mach.c | 23 +++++++++++++++++- + sound/soc/amd/vangogh/acp5x.h | 29 +++++++++++++++++++++++ + sound/soc/amd/vangogh/pci-acp5x.c | 4 ++++ + sound/soc/codecs/lpass-rx-macro.c | 12 ++++++---- + sound/soc/codecs/lpass-va-macro.c | 4 ++-- + sound/soc/codecs/nau8821.c | 1 + + sound/soc/codecs/rt5682s.c | 26 +++++++------------- + sound/soc/codecs/rt5682s.h | 1 - + sound/soc/codecs/tlv320adc3xxx.c | 12 ++++++---- + sound/soc/codecs/wcd934x.c | 11 +++++---- + sound/soc/codecs/wcd938x.c | 10 ++++---- + sound/soc/intel/common/soc-acpi-intel-byt-match.c | 2 +- + sound/soc/sof/intel/hda-loader.c | 11 +++++---- + 14 files changed, 109 insertions(+), 63 deletions(-) +Merging regmap-fixes/for-linus (d04ad245d67a regmap-irq: Update interrupt clear register for proper reset) +$ 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 (48fdc1fa4d93 Merge remote-tracking branch 'regulator/for-5.16' into regulator-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Auto-merging Documentation/devicetree/bindings/regulator/samsung,s5m8767.yaml +Auto-merging include/linux/regulator/driver.h +Merge made by the 'ort' strategy. +Merging spi-fixes/for-linus (a7c76d3f0787 Merge remote-tracking branch 'spi/for-5.16' into spi-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Auto-merging drivers/spi/spi-uniphier.c +Merge made by the 'ort' strategy. +Merging pci-current/for-linus (3f1271b54edc PCI: Mark all AMD Navi10 and Navi14 GPU ATS as broken) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (7e57714cd0ad Linux 5.17-rc6) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (7e57714cd0ad Linux 5.17-rc6) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (7e57714cd0ad Linux 5.17-rc6) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (cfc4442c642d USB: serial: option: add Telit LE910R1 compositions) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/for-usb-fixes (f130d08a8d79 usb: chipidea: ci_hdrc_imx: Also search for 'phys' phandle) +$ git merge -m Merge branch 'for-usb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git usb-chipidea-fixes/for-usb-fixes +Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c +CONFLICT (content): Merge conflict in drivers/usb/chipidea/ci_hdrc_imx.c +Resolved 'drivers/usb/chipidea/ci_hdrc_imx.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2ffb806ecb2f] Merge branch 'for-usb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git +$ git diff -M --stat --summary HEAD^.. +Merging phy/fixes (9a8406ba1a9a phy: dphy: Correct clk_pre parameter) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (342e7c6ea582 staging: rtl8723bs: Improve the comment explaining the locking rules) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Merge made by the 'ort' strategy. + drivers/staging/gdm724x/gdm_lte.c | 5 +++-- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 7 +++++-- + drivers/staging/rtl8723bs/core/rtw_recv.c | 10 +++++++--- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 22 ++++++++++------------ + drivers/staging/rtl8723bs/core/rtw_xmit.c | 16 +++++++++------- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 2 ++ + drivers/staging/rtl8723bs/include/rtw_mlme.h | 8 ++++++-- + 7 files changed, 42 insertions(+), 28 deletions(-) +Merging iio-fixes/fixes-togreg (123d838c4e7d iio: adc: xilinx-ams: Fix single channel switching sequence) +$ 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. + .../devicetree/bindings/iio/adc/xlnx,zynqmp-ams.yaml | 8 ++++++++ + drivers/iio/accel/mma8452.c | 4 ++-- + drivers/iio/adc/aspeed_adc.c | 4 +++- + drivers/iio/adc/xilinx-ams.c | 15 +++++++++++---- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 4 ++-- + 5 files changed, 26 insertions(+), 9 deletions(-) +Merging counter-fixes/fixes-togreg (4a14311a3b93 counter: Stop using dev_get_drvdata() to get the counter device) +$ git merge -m Merge branch 'fixes-togreg' of https://gitlab.com/vilhelmgray/counter.git counter-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/counter/counter-sysfs.c | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) +Merging char-misc.current/char-misc-linus (7e57714cd0ad Linux 5.17-rc6) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (7e57714cd0ad Linux 5.17-rc6) +$ 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 (04b7762e37c9 Input: elan_i2c - fix regulator enable count imbalance after suspend/resume) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Merge made by the 'ort' strategy. + drivers/input/keyboard/Kconfig | 2 +- + drivers/input/mouse/elan_i2c_core.c | 64 +++++++++++++------------------------ + drivers/input/touchscreen/goodix.c | 34 ++++++++++---------- + 3 files changed, 41 insertions(+), 59 deletions(-) +Merging crypto-current/master (c6ce9c5831ca crypto: api - Move cryptomgr soft dependency into algapi) +$ 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 (8704e8934908 vfio/pci: Fix OpRegion read) +$ 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 (6fec1ab67f8d selftests/ftrace: Do not trace do_softirq because of PREEMPT_RT) +$ 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 (a8e8f851e829 module: fix building with sysfs disabled) +$ 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 (cfb92440ee71 Linux 5.17-rc5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (7cf1de957a98 mtd: rawnand: omap2: Actually prevent invalid configuration and build error) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Merge made by the 'ort' strategy. + drivers/mtd/nand/raw/Kconfig | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +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 (d40f0b133b44 media: meson-ir-tx: remove incorrect doc comment) +$ 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/platform/rockchip/rga/rga.c | 2 +- + drivers/media/rc/meson-ir-tx.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging reset-fixes/reset/fixes (92c959bae2e5 reset: renesas: Fix Runtime PM usage) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (5d8965704fe5 MIPS: ralink: mt7621: use bitwise NOT instead of logical) +$ 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 (26077968f838 dt-bindings: ARM: at91: update maintainers entry) +$ 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 (8840f5460a23 ARM: dts: Use 32KiHz oscillator on devkit8000) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (9ee83635d872 KVM: x86: Yield to IPI target vCPU only if it is busy) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Merge made by the 'ort' strategy. + arch/x86/kernel/kvm.c | 4 +++- + arch/x86/kernel/kvmclock.c | 3 +++ + 2 files changed, 6 insertions(+), 1 deletion(-) +Merging kvms390-fixes/master (0e9ff65f455d KVM: s390: preserve deliverable_mask in __airqs_kick_single_vcpu) +$ 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 (686d303ee630 hwmon: (pmbus) Add mutex to regulator ops) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + drivers/hwmon/pmbus/pmbus_core.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (3dd60fb9d95d nvdimm/pmem: stop using q_usage_count as external pgmap refcount) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (6e60f6a7ae95 Merge branch 'misc-5.17' 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/file.c +Auto-merging fs/btrfs/ioctl.c +Merge made by the 'ort' strategy. +Merging vfs-fixes/fixes (9d2231c5d74e lib/iov_iter: initialize "flags" in new pipe_buffer) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge -m Merge branch 'i3c/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (21d90aaee8d5 surface: surface3_power: Fix battery readings on batteries without a serial number) +$ 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 (442b0c08db7e soc: samsung: Fix typo in CONFIG_EXYNOS_USI description) +$ 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 (e783362eb54c Linux 5.17-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 (0c0822bcb73f dt-bindings: update Roger Quadros email) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (10af11564617 scsi: ufs: core: Fix divide by zero in ufshcd_map_queues()) +$ 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 (e7c470a4b543 Merge tag 'exynos-drm-fixes-v5.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 12 +++--------- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 6 ++++-- + drivers/gpu/drm/exynos/exynos_drm_fimc.c | 13 +++++-------- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 13 ++++--------- + drivers/gpu/drm/exynos/exynos_drm_gsc.c | 10 +++------- + drivers/gpu/drm/exynos/exynos_mixer.c | 14 ++++++-------- + 6 files changed, 25 insertions(+), 43 deletions(-) +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 (08783aa7693f drm/i915: s/JSP2/ICP2/ PCH) +$ 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/gt/uc/intel_guc_slpc.c | 2 +- + drivers/gpu/drm/i915/intel_pch.c | 2 +- + drivers/gpu/drm/i915/intel_pch.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging mmc-fixes/fixes (f0d2f15362f0 mmc: meson: Fix usage of meson_mmc_post_req()) +$ 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/meson-gx-mmc.c | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) +Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Auto-merging drivers/rtc/rtc-cmos.c +Merge made by the 'ort' strategy. +Merging gnss-fixes/gnss-linus (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (ffc58bc4af93 Drivers: hv: utils: Make use of the helper macro LIST_HEAD()) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (a222fd854139 soc: fsl: qe: Check of ioremap return value) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (22e2100b1b07 riscv: fix oops caused by irqsoff latency tracer) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (8bb7eca972ad Linux 5.15) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (d8152cfe2f21 Merge tag 'pci-v5.17-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci) +$ 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 (ae42f9288846 gpio: Return EPROBE_DEFER if gc->to_irq is NULL) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (e783362eb54c Linux 5.17-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 (6f66db29e241 pinctrl: tigerlake: Revert "Add Alder Lake-M ACPI ID") +$ 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 (24331050a3e6 erofs: fix small compressed files inlining) +$ 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 (92a68053c346 Documentation: KUnit: Fix usage bug) +$ 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 +Merge made by the 'ort' strategy. + drivers/mtd/ubi/build.c | 9 +- + drivers/mtd/ubi/fastmap.c | 28 ++++-- + drivers/mtd/ubi/vmt.c | 8 +- + fs/ubifs/dir.c | 235 ++++++++++++++++++++++++++++------------------ + fs/ubifs/file.c | 14 +-- + fs/ubifs/io.c | 34 ++++++- + fs/ubifs/ioctl.c | 2 +- + fs/ubifs/journal.c | 52 ++++++++-- + fs/ubifs/ubifs.h | 2 +- + 9 files changed, 246 insertions(+), 138 deletions(-) +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 (c306d737691e NFSD: Deprecate NFS_OFFSET_MAX) +$ 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 (1d4df649cbb4 irqchip/sifive-plic: Add missing thead,c900-plic match string) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Already up to date. +Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging perf-current/perf/urgent (13e741b83453 perf script: Fix error when printing 'weight' field) +$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent +Already up to date. +Merging efi-fixes/urgent (9feaf8b387ee efi: fix return value of __setup handlers) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Merge made by the 'ort' strategy. + drivers/firmware/efi/apple-properties.c | 2 +- + drivers/firmware/efi/efi.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Merge made by the 'ort' strategy. + include/linux/zstd_lib.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (62929726ef0e drm/vrr: Set VRR capable prop only if it is attached to connector) +$ 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/arm/Kconfig | 1 + + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 5 +++-- + drivers/gpu/drm/drm_connector.c | 3 +++ + 3 files changed, 7 insertions(+), 2 deletions(-) +Merging kbuild/for-next (d4c858643263 kallsyms: ignore all local labels prefixed by '.L') +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Auto-merging Makefile +Merge made by the 'ort' strategy. + Documentation/kbuild/kbuild.rst | 11 +++++++++++ + Documentation/kbuild/makefiles.rst | 2 ++ + Makefile | 18 ++++++++++-------- + arch/microblaze/boot/Makefile | 2 +- + arch/microblaze/boot/dts/Makefile | 2 +- + fs/unicode/Makefile | 2 +- + init/Kconfig | 8 ++++---- + scripts/Makefile.build | 3 +-- + scripts/Makefile.clean | 2 +- + scripts/Makefile.lib | 16 ++++++---------- + scripts/kallsyms.c | 2 +- + scripts/kconfig/confdata.c | 27 +++++++++++++++------------ + tools/bpf/bpftool/Makefile | 4 ++-- + tools/build/Makefile | 2 +- + tools/counter/Makefile | 2 +- + tools/gpio/Makefile | 2 +- + tools/hv/Makefile | 2 +- + tools/iio/Makefile | 2 +- + tools/lib/api/Makefile | 2 +- + tools/lib/bpf/Makefile | 2 +- + tools/lib/perf/Makefile | 2 +- + tools/lib/subcmd/Makefile | 2 +- + tools/objtool/Makefile | 2 +- + tools/pci/Makefile | 2 +- + tools/perf/Makefile.perf | 4 ++-- + tools/power/x86/intel-speed-select/Makefile | 2 +- + tools/scripts/utilities.mak | 2 +- + tools/spi/Makefile | 6 +++--- + tools/tracing/rtla/Makefile | 2 +- + tools/usb/Makefile | 2 +- + usr/Makefile | 4 ++-- + usr/include/Makefile | 3 +++ + 32 files changed, 81 insertions(+), 65 deletions(-) +Merging perf/perf/core (56dce868198c libperf: Add API for allocating new thread map array) +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Auto-merging tools/perf/builtin-script.c +Auto-merging tools/perf/util/data.c +Merge made by the 'ort' strategy. + tools/include/linux/coresight-pmu.h | 2 + + tools/lib/api/fd/array.c | 17 + + tools/lib/api/fd/array.h | 1 + + tools/lib/perf/Documentation/libperf.txt | 7 +- + tools/lib/perf/include/perf/threadmap.h | 7 +- + tools/lib/perf/libperf.map | 1 + + tools/lib/perf/tests/test-threadmap.c | 41 + + tools/lib/perf/threadmap.c | 36 +- + tools/perf/Documentation/itrace.txt | 2 + + tools/perf/Documentation/perf-intel-pt.txt | 104 +- + tools/perf/Documentation/perf-lock.txt | 4 + + tools/perf/Documentation/perf-record.txt | 34 + + tools/perf/Documentation/perf-script.txt | 13 +- + tools/perf/arch/arm/util/cs-etm.c | 3 + + tools/perf/arch/arm64/util/arm-spe.c | 2 +- + .../arch/x86/tests/intel-pt-pkt-decoder-test.c | 17 +- + tools/perf/arch/x86/util/event.c | 2 +- + tools/perf/arch/x86/util/intel-pt.c | 7 + + tools/perf/builtin-annotate.c | 14 +- + tools/perf/builtin-c2c.c | 4 +- + tools/perf/builtin-data.c | 7 + + tools/perf/builtin-inject.c | 15 +- + tools/perf/builtin-kvm.c | 2 +- + tools/perf/builtin-lock.c | 155 +- + tools/perf/builtin-probe.c | 2 +- + tools/perf/builtin-record.c | 1166 ++++- + tools/perf/builtin-report.c | 10 +- + tools/perf/builtin-script.c | 78 +- + tools/perf/builtin-top.c | 10 +- + tools/perf/builtin-trace.c | 2 +- + tools/perf/pmu-events/arch/x86/bonnell/cache.json | 748 ++-- + .../arch/x86/bonnell/floating-point.json | 274 +- + .../perf/pmu-events/arch/x86/bonnell/frontend.json | 96 +- + tools/perf/pmu-events/arch/x86/bonnell/memory.json | 152 +- + tools/perf/pmu-events/arch/x86/bonnell/other.json | 452 +- + .../perf/pmu-events/arch/x86/bonnell/pipeline.json | 402 +- + .../arch/x86/bonnell/virtual-memory.json | 126 +- + .../pmu-events/arch/x86/broadwell/bdw-metrics.json | 353 +- + .../perf/pmu-events/arch/x86/broadwell/cache.json | 4713 ++++++++++---------- + .../arch/x86/broadwell/floating-point.json | 235 +- + .../pmu-events/arch/x86/broadwell/frontend.json | 361 +- + .../perf/pmu-events/arch/x86/broadwell/memory.json | 4312 +++++++++--------- + .../perf/pmu-events/arch/x86/broadwell/other.json | 42 +- + .../pmu-events/arch/x86/broadwell/pipeline.json | 1903 ++++---- + .../arch/x86/broadwell/virtual-memory.json | 412 +- + .../arch/x86/broadwellde/bdwde-metrics.json | 407 +- + .../pmu-events/arch/x86/broadwellde/cache.json | 1122 ++--- + .../arch/x86/broadwellde/floating-point.json | 222 +- + .../pmu-events/arch/x86/broadwellde/frontend.json | 335 +- + .../pmu-events/arch/x86/broadwellde/memory.json | 608 +-- + .../pmu-events/arch/x86/broadwellde/other.json | 28 +- + .../pmu-events/arch/x86/broadwellde/pipeline.json | 1892 ++++---- + .../arch/x86/broadwellde/virtual-memory.json | 394 +- + .../arch/x86/broadwellx/bdx-metrics.json | 351 +- + .../perf/pmu-events/arch/x86/broadwellx/cache.json | 1300 +++--- + .../arch/x86/broadwellx/floating-point.json | 224 +- + .../pmu-events/arch/x86/broadwellx/frontend.json | 335 +- + .../pmu-events/arch/x86/broadwellx/memory.json | 974 ++-- + .../perf/pmu-events/arch/x86/broadwellx/other.json | 28 +- + .../pmu-events/arch/x86/broadwellx/pipeline.json | 1891 ++++---- + .../arch/x86/broadwellx/virtual-memory.json | 394 +- + .../pmu-events/arch/x86/cascadelakex/cache.json | 967 ++-- + .../arch/x86/cascadelakex/clx-metrics.json | 469 +- + .../arch/x86/cascadelakex/floating-point.json | 50 +- + .../pmu-events/arch/x86/cascadelakex/frontend.json | 18 +- + .../pmu-events/arch/x86/cascadelakex/memory.json | 1008 ++--- + .../pmu-events/arch/x86/cascadelakex/other.json | 952 ++-- + .../pmu-events/arch/x86/cascadelakex/pipeline.json | 11 + + .../arch/x86/cascadelakex/uncore-other.json | 23 + + tools/perf/pmu-events/arch/x86/goldmont/cache.json | 1466 +++--- + .../arch/x86/goldmont/floating-point.json | 33 + + .../pmu-events/arch/x86/goldmont/frontend.json | 78 +- + .../perf/pmu-events/arch/x86/goldmont/memory.json | 38 +- + tools/perf/pmu-events/arch/x86/goldmont/other.json | 92 +- + .../pmu-events/arch/x86/goldmont/pipeline.json | 538 +-- + .../arch/x86/goldmont/virtual-memory.json | 94 +- + .../pmu-events/arch/x86/goldmontplus/cache.json | 1730 ++++--- + .../arch/x86/goldmontplus/floating-point.json | 38 + + .../pmu-events/arch/x86/goldmontplus/frontend.json | 88 +- + .../pmu-events/arch/x86/goldmontplus/memory.json | 44 +- + .../pmu-events/arch/x86/goldmontplus/other.json | 106 +- + .../pmu-events/arch/x86/goldmontplus/pipeline.json | 616 ++- + .../arch/x86/goldmontplus/virtual-memory.json | 214 +- + tools/perf/pmu-events/arch/x86/haswell/cache.json | 1446 +++--- + .../arch/x86/haswell/floating-point.json | 129 +- + .../perf/pmu-events/arch/x86/haswell/frontend.json | 362 +- + .../pmu-events/arch/x86/haswell/hsw-metrics.json | 265 +- + tools/perf/pmu-events/arch/x86/haswell/memory.json | 1004 ++--- + tools/perf/pmu-events/arch/x86/haswell/other.json | 40 +- + .../perf/pmu-events/arch/x86/haswell/pipeline.json | 1796 ++++---- + .../pmu-events/arch/x86/haswell/uncore-cache.json | 252 ++ + .../pmu-events/arch/x86/haswell/uncore-other.json | 69 + + tools/perf/pmu-events/arch/x86/haswell/uncore.json | 374 -- + .../arch/x86/haswell/virtual-memory.json | 552 +-- + tools/perf/pmu-events/arch/x86/haswellx/cache.json | 1434 +++--- + .../arch/x86/haswellx/floating-point.json | 116 +- + .../pmu-events/arch/x86/haswellx/frontend.json | 336 +- + .../pmu-events/arch/x86/haswellx/hsx-metrics.json | 263 +- + .../perf/pmu-events/arch/x86/haswellx/memory.json | 1070 ++--- + tools/perf/pmu-events/arch/x86/haswellx/other.json | 28 +- + .../pmu-events/arch/x86/haswellx/pipeline.json | 1763 ++++---- + .../arch/x86/haswellx/virtual-memory.json | 512 +-- + tools/perf/pmu-events/arch/x86/icelake/cache.json | 658 +-- + .../arch/x86/icelake/floating-point.json | 69 +- + .../perf/pmu-events/arch/x86/icelake/frontend.json | 449 +- + .../pmu-events/arch/x86/icelake/icl-metrics.json | 338 +- + tools/perf/pmu-events/arch/x86/icelake/memory.json | 591 ++- + tools/perf/pmu-events/arch/x86/icelake/other.json | 630 +-- + .../perf/pmu-events/arch/x86/icelake/pipeline.json | 1081 ++--- + .../arch/x86/icelake/virtual-memory.json | 178 +- + tools/perf/pmu-events/arch/x86/icelakex/cache.json | 851 ++-- + .../arch/x86/icelakex/floating-point.json | 51 +- + .../pmu-events/arch/x86/icelakex/frontend.json | 501 ++- + .../pmu-events/arch/x86/icelakex/icx-metrics.json | 304 +- + .../perf/pmu-events/arch/x86/icelakex/memory.json | 601 ++- + tools/perf/pmu-events/arch/x86/icelakex/other.json | 794 +++- + .../pmu-events/arch/x86/icelakex/pipeline.json | 1112 ++--- + .../pmu-events/arch/x86/icelakex/uncore-other.json | 61 +- + .../arch/x86/icelakex/virtual-memory.json | 150 +- + .../perf/pmu-events/arch/x86/ivybridge/cache.json | 1446 +++--- + .../arch/x86/ivybridge/floating-point.json | 212 +- + .../pmu-events/arch/x86/ivybridge/frontend.json | 386 +- + .../pmu-events/arch/x86/ivybridge/ivb-metrics.json | 287 +- + .../perf/pmu-events/arch/x86/ivybridge/memory.json | 290 +- + .../perf/pmu-events/arch/x86/ivybridge/other.json | 42 +- + .../pmu-events/arch/x86/ivybridge/pipeline.json | 1769 ++++---- + .../arch/x86/ivybridge/uncore-cache.json | 252 ++ + .../arch/x86/ivybridge/uncore-other.json | 91 + + .../perf/pmu-events/arch/x86/ivybridge/uncore.json | 314 -- + .../arch/x86/ivybridge/virtual-memory.json | 208 +- + tools/perf/pmu-events/arch/x86/ivytown/cache.json | 1594 +++---- + .../arch/x86/ivytown/floating-point.json | 212 +- + .../perf/pmu-events/arch/x86/ivytown/frontend.json | 386 +- + .../pmu-events/arch/x86/ivytown/ivt-metrics.json | 277 +- + tools/perf/pmu-events/arch/x86/ivytown/memory.json | 562 +-- + tools/perf/pmu-events/arch/x86/ivytown/other.json | 42 +- + .../perf/pmu-events/arch/x86/ivytown/pipeline.json | 1769 ++++---- + .../arch/x86/ivytown/virtual-memory.json | 232 +- + tools/perf/pmu-events/arch/x86/jaketown/cache.json | 1582 ++++--- + .../arch/x86/jaketown/floating-point.json | 160 +- + .../pmu-events/arch/x86/jaketown/frontend.json | 363 +- + .../pmu-events/arch/x86/jaketown/jkt-metrics.json | 140 +- + .../perf/pmu-events/arch/x86/jaketown/memory.json | 478 +- + tools/perf/pmu-events/arch/x86/jaketown/other.json | 58 +- + .../pmu-events/arch/x86/jaketown/pipeline.json | 1556 ++++--- + .../arch/x86/jaketown/virtual-memory.json | 178 +- + .../pmu-events/arch/x86/knightslanding/cache.json | 2602 ++++++----- + .../arch/x86/knightslanding/floating-point.json | 29 + + .../arch/x86/knightslanding/frontend.json | 48 +- + .../pmu-events/arch/x86/knightslanding/memory.json | 1226 ++--- + .../arch/x86/knightslanding/pipeline.json | 465 +- + .../arch/x86/knightslanding/virtual-memory.json | 68 +- + .../perf/pmu-events/arch/x86/nehalemep/cache.json | 3062 ++++++------- + .../arch/x86/nehalemep/floating-point.json | 180 +- + .../pmu-events/arch/x86/nehalemep/frontend.json | 18 +- + .../perf/pmu-events/arch/x86/nehalemep/memory.json | 670 +-- + .../perf/pmu-events/arch/x86/nehalemep/other.json | 156 +- + .../pmu-events/arch/x86/nehalemep/pipeline.json | 764 ++-- + .../arch/x86/nehalemep/virtual-memory.json | 90 +- + .../pmu-events/arch/x86/sandybridge/cache.json | 2298 +++++----- + .../arch/x86/sandybridge/floating-point.json | 172 +- + .../pmu-events/arch/x86/sandybridge/frontend.json | 365 +- + .../pmu-events/arch/x86/sandybridge/memory.json | 520 +-- + .../pmu-events/arch/x86/sandybridge/other.json | 66 +- + .../pmu-events/arch/x86/sandybridge/pipeline.json | 1634 ++++--- + .../arch/x86/sandybridge/snb-metrics.json | 150 +- + .../arch/x86/sandybridge/uncore-cache.json | 252 ++ + .../arch/x86/sandybridge/uncore-other.json | 91 + + .../pmu-events/arch/x86/sandybridge/uncore.json | 314 -- + .../arch/x86/sandybridge/virtual-memory.json | 160 +- + .../perf/pmu-events/arch/x86/silvermont/cache.json | 940 ++-- + .../arch/x86/silvermont/floating-point.json | 11 + + .../pmu-events/arch/x86/silvermont/frontend.json | 75 +- + .../pmu-events/arch/x86/silvermont/memory.json | 8 +- + .../perf/pmu-events/arch/x86/silvermont/other.json | 20 +- + .../pmu-events/arch/x86/silvermont/pipeline.json | 422 +- + .../arch/x86/silvermont/virtual-memory.json | 76 +- + tools/perf/pmu-events/arch/x86/skylake/cache.json | 2611 +++++------ + .../arch/x86/skylake/floating-point.json | 48 +- + .../perf/pmu-events/arch/x86/skylake/frontend.json | 578 +-- + tools/perf/pmu-events/arch/x86/skylake/memory.json | 1566 +++---- + tools/perf/pmu-events/arch/x86/skylake/other.json | 46 +- + .../perf/pmu-events/arch/x86/skylake/pipeline.json | 1083 ++--- + .../pmu-events/arch/x86/skylake/skl-metrics.json | 497 ++- + .../arch/x86/skylake/virtual-memory.json | 274 +- + tools/perf/pmu-events/arch/x86/skylakex/cache.json | 111 +- + .../arch/x86/skylakex/floating-point.json | 24 +- + .../pmu-events/arch/x86/skylakex/frontend.json | 18 +- + .../perf/pmu-events/arch/x86/skylakex/memory.json | 96 +- + .../pmu-events/arch/x86/skylakex/pipeline.json | 11 + + .../pmu-events/arch/x86/skylakex/skx-metrics.json | 461 +- + .../pmu-events/arch/x86/skylakex/uncore-other.json | 23 + + .../perf/pmu-events/arch/x86/tigerlake/cache.json | 44 +- + .../arch/x86/tigerlake/floating-point.json | 11 +- + .../pmu-events/arch/x86/tigerlake/frontend.json | 17 +- + .../pmu-events/arch/x86/tigerlake/pipeline.json | 37 +- + tools/perf/pmu-events/arch/x86/tremontx/cache.json | 282 +- + .../arch/x86/tremontx/floating-point.json | 24 + + .../pmu-events/arch/x86/tremontx/frontend.json | 97 +- + .../perf/pmu-events/arch/x86/tremontx/memory.json | 449 +- + tools/perf/pmu-events/arch/x86/tremontx/other.json | 1786 +++++++- + .../pmu-events/arch/x86/tremontx/pipeline.json | 341 +- + .../arch/x86/tremontx/uncore-memory.json | 156 +- + .../pmu-events/arch/x86/tremontx/uncore-other.json | 2045 ++++++++- + .../arch/x86/tremontx/virtual-memory.json | 320 +- + .../pmu-events/arch/x86/westmereep-dp/cache.json | 2734 ++++++------ + .../arch/x86/westmereep-dp/floating-point.json | 180 +- + .../arch/x86/westmereep-dp/frontend.json | 18 +- + .../pmu-events/arch/x86/westmereep-dp/memory.json | 686 +-- + .../pmu-events/arch/x86/westmereep-dp/other.json | 238 +- + .../arch/x86/westmereep-dp/pipeline.json | 780 ++-- + .../arch/x86/westmereep-dp/virtual-memory.json | 138 +- + .../pmu-events/arch/x86/westmereep-sp/cache.json | 3142 ++++++------- + .../arch/x86/westmereep-sp/floating-point.json | 180 +- + .../arch/x86/westmereep-sp/frontend.json | 18 +- + .../pmu-events/arch/x86/westmereep-sp/memory.json | 670 +-- + .../pmu-events/arch/x86/westmereep-sp/other.json | 238 +- + .../arch/x86/westmereep-sp/pipeline.json | 780 ++-- + .../arch/x86/westmereep-sp/virtual-memory.json | 120 +- + .../perf/pmu-events/arch/x86/westmereex/cache.json | 3142 ++++++------- + .../arch/x86/westmereex/floating-point.json | 180 +- + .../pmu-events/arch/x86/westmereex/frontend.json | 18 +- + .../pmu-events/arch/x86/westmereex/memory.json | 676 +-- + .../perf/pmu-events/arch/x86/westmereex/other.json | 238 +- + .../pmu-events/arch/x86/westmereex/pipeline.json | 784 ++-- + .../arch/x86/westmereex/virtual-memory.json | 138 +- + tools/perf/scripts/python/export-to-postgresql.py | 17 +- + tools/perf/scripts/python/export-to-sqlite.py | 19 +- + tools/perf/scripts/python/intel-pt-events.py | 55 +- + tools/perf/tests/bpf.c | 14 +- + tools/perf/tests/cpumap.c | 12 +- + tools/perf/tests/maps.c | 20 +- + tools/perf/tests/pmu-events.c | 32 +- + tools/perf/tests/shell/stat_all_metrics.sh | 10 +- + tools/perf/tests/vmlinux-kallsyms.c | 8 +- + tools/perf/util/Build | 1 + + tools/perf/util/annotate.c | 10 + + tools/perf/util/auxtrace.c | 4 + + tools/perf/util/auxtrace.h | 4 + + tools/perf/util/bpf-event.c | 15 +- + tools/perf/util/bpf-loader.c | 98 +- + tools/perf/util/build-id.c | 4 +- + tools/perf/util/callchain.c | 2 +- + tools/perf/util/data.c | 8 +- + tools/perf/util/dso.c | 15 +- + tools/perf/util/dsos.c | 13 + + tools/perf/util/event.c | 6 +- + tools/perf/util/event.h | 45 +- + tools/perf/util/evlist.c | 16 + + tools/perf/util/evlist.h | 1 + + tools/perf/util/hist.c | 2 + + tools/perf/util/hist.h | 2 + + .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 245 +- + .../perf/util/intel-pt-decoder/intel-pt-decoder.h | 21 + + .../util/intel-pt-decoder/intel-pt-pkt-decoder.c | 47 +- + .../util/intel-pt-decoder/intel-pt-pkt-decoder.h | 3 + + tools/perf/util/intel-pt.c | 164 +- + tools/perf/util/jitdump.c | 10 +- + tools/perf/util/machine.c | 38 +- + tools/perf/util/machine.h | 8 +- + tools/perf/util/map.c | 436 +- + tools/perf/util/map.h | 26 +- + tools/perf/util/maps.c | 403 ++ + tools/perf/util/maps.h | 2 - + tools/perf/util/mmap.c | 10 + + tools/perf/util/mmap.h | 3 + + tools/perf/util/namespaces.c | 50 +- + tools/perf/util/namespaces.h | 10 +- + tools/perf/util/ordered-events.c | 3 +- + tools/perf/util/ordered-events.h | 3 +- + tools/perf/util/pmu.c | 14 +- + tools/perf/util/probe-event.c | 2 +- + tools/perf/util/record.h | 2 + + .../util/scripting-engines/trace-event-python.c | 3 +- + tools/perf/util/session.c | 208 +- + tools/perf/util/session.h | 3 +- + tools/perf/util/sort.c | 128 + + tools/perf/util/sort.h | 2 + + tools/perf/util/symbol.c | 18 +- + tools/perf/util/tool.h | 3 +- + tools/perf/util/top.h | 5 +- + tools/perf/util/util.c | 31 + + tools/perf/util/util.h | 2 + + 283 files changed, 64640 insertions(+), 53442 deletions(-) + create mode 100644 tools/perf/pmu-events/arch/x86/goldmont/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/goldmontplus/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswell/uncore-cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswell/uncore-other.json + delete mode 100644 tools/perf/pmu-events/arch/x86/haswell/uncore.json + create mode 100644 tools/perf/pmu-events/arch/x86/ivybridge/uncore-cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/ivybridge/uncore-other.json + delete mode 100644 tools/perf/pmu-events/arch/x86/ivybridge/uncore.json + create mode 100644 tools/perf/pmu-events/arch/x86/knightslanding/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/sandybridge/uncore-cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/sandybridge/uncore-other.json + delete mode 100644 tools/perf/pmu-events/arch/x86/sandybridge/uncore.json + create mode 100644 tools/perf/pmu-events/arch/x86/silvermont/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/tremontx/floating-point.json + create mode 100644 tools/perf/util/maps.c +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 (80e439098161 dma-debug: fix return value of __setup handlers) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/Kconfig +Auto-merging kernel/dma/swiotlb.c +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + arch/alpha/include/asm/floppy.h | 7 ++-- + arch/alpha/kernel/pci_iommu.c | 12 +++---- + arch/arm/Kconfig | 2 +- + arch/sparc/kernel/ioport.c | 2 +- + arch/xtensa/Kconfig | 2 +- + drivers/char/agp/intel-gtt.c | 26 +++++++------- + drivers/iommu/dma-iommu.c | 14 +++----- + drivers/rapidio/devices/tsi721.c | 8 ++--- + kernel/dma/Kconfig | 7 +--- + kernel/dma/Makefile | 2 +- + kernel/dma/debug.c | 4 +-- + kernel/dma/direct.c | 18 ++++------ + kernel/dma/swiotlb.c | 76 +++++++++++++--------------------------- + samples/v4l/v4l2-pci-skeleton.c | 2 +- + 15 files changed, 72 insertions(+), 112 deletions(-) +Merging asm-generic/master (9f15ac318b83 nds32: Remove the architecture) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Auto-merging MAINTAINERS +Auto-merging arch/parisc/include/asm/uaccess.h +Auto-merging arch/powerpc/lib/sstep.c +Auto-merging arch/xtensa/Kconfig +Auto-merging kernel/events/core.c +Auto-merging usr/include/Makefile +Merge made by the 'ort' strategy. + .../interrupt-controller/andestech,ativic32.txt | 19 - + .../devicetree/bindings/nds32/andestech-boards | 40 - + Documentation/devicetree/bindings/nds32/atl2c.txt | 28 - + Documentation/devicetree/bindings/nds32/cpus.txt | 38 - + .../devicetree/bindings/perf/nds32v3-pmu.txt | 17 - + .../bindings/timer/andestech,atcpit100-timer.txt | 33 - + .../features/core/cBPF-JIT/arch-support.txt | 1 - + .../features/core/eBPF-JIT/arch-support.txt | 1 - + .../core/generic-idle-thread/arch-support.txt | 1 - + .../features/core/jump-labels/arch-support.txt | 1 - + .../core/thread-info-in-task/arch-support.txt | 1 - + .../features/core/tracehook/arch-support.txt | 1 - + .../features/debug/KASAN/arch-support.txt | 1 - + .../debug/debug-vm-pgtable/arch-support.txt | 1 - + .../debug/gcov-profile-all/arch-support.txt | 1 - + Documentation/features/debug/kcov/arch-support.txt | 1 - + Documentation/features/debug/kgdb/arch-support.txt | 1 - + .../features/debug/kmemleak/arch-support.txt | 1 - + .../debug/kprobes-on-ftrace/arch-support.txt | 1 - + .../features/debug/kprobes/arch-support.txt | 1 - + .../features/debug/kretprobes/arch-support.txt | 1 - + .../features/debug/optprobes/arch-support.txt | 1 - + .../features/debug/stackprotector/arch-support.txt | 1 - + .../features/debug/uprobes/arch-support.txt | 1 - + .../debug/user-ret-profiler/arch-support.txt | 1 - + .../features/io/dma-contiguous/arch-support.txt | 1 - + .../locking/cmpxchg-local/arch-support.txt | 1 - + .../features/locking/lockdep/arch-support.txt | 1 - + .../locking/queued-rwlocks/arch-support.txt | 1 - + .../locking/queued-spinlocks/arch-support.txt | 1 - + .../features/perf/kprobes-event/arch-support.txt | 1 - + .../features/perf/perf-regs/arch-support.txt | 1 - + .../features/perf/perf-stackdump/arch-support.txt | 1 - + .../sched/membarrier-sync-core/arch-support.txt | 1 - + .../features/sched/numa-balancing/arch-support.txt | 1 - + .../seccomp/seccomp-filter/arch-support.txt | 1 - + .../time/arch-tick-broadcast/arch-support.txt | 1 - + .../features/time/clockevents/arch-support.txt | 1 - + .../time/context-tracking/arch-support.txt | 1 - + .../features/time/irq-time-acct/arch-support.txt | 1 - + .../features/time/virt-cpuacct/arch-support.txt | 1 - + .../features/vm/ELF-ASLR/arch-support.txt | 1 - + .../features/vm/PG_uncached/arch-support.txt | 1 - + Documentation/features/vm/THP/arch-support.txt | 1 - + Documentation/features/vm/TLB/arch-support.txt | 1 - + .../features/vm/huge-vmap/arch-support.txt | 1 - + .../features/vm/ioremap_prot/arch-support.txt | 1 - + .../features/vm/pte_special/arch-support.txt | 1 - + MAINTAINERS | 12 - + arch/Kconfig | 10 +- + arch/alpha/Kconfig | 1 - + arch/alpha/include/asm/processor.h | 4 - + arch/alpha/include/asm/thread_info.h | 2 - + arch/alpha/include/asm/uaccess.h | 53 +- + arch/alpha/include/uapi/asm/signal.h | 2 +- + arch/arc/Kconfig | 1 - + arch/arc/include/asm/segment.h | 20 - + arch/arc/include/asm/thread_info.h | 3 - + arch/arc/include/asm/uaccess.h | 30 - + arch/arc/kernel/process.c | 2 +- + arch/arm/include/asm/uaccess.h | 22 +- + arch/arm/include/uapi/asm/signal.h | 2 +- + arch/arm/kernel/swp_emulate.c | 2 +- + arch/arm/kernel/traps.c | 2 +- + arch/arm/lib/uaccess_with_memcpy.c | 10 - + arch/arm64/include/asm/uaccess.h | 29 +- + arch/arm64/kernel/traps.c | 2 +- + arch/csky/Kconfig | 1 - + arch/csky/include/asm/processor.h | 2 - + arch/csky/include/asm/segment.h | 10 - + arch/csky/include/asm/thread_info.h | 2 - + arch/csky/include/asm/uaccess.h | 12 - + arch/csky/kernel/asm-offsets.c | 1 - + arch/csky/kernel/perf_callchain.c | 2 +- + arch/csky/kernel/signal.c | 2 +- + arch/h8300/Kconfig | 1 - + arch/h8300/include/asm/processor.h | 1 - + arch/h8300/include/asm/segment.h | 40 - + arch/h8300/include/asm/thread_info.h | 3 - + arch/h8300/include/uapi/asm/signal.h | 2 +- + arch/h8300/kernel/entry.S | 1 - + arch/h8300/kernel/head_ram.S | 1 - + arch/h8300/mm/init.c | 6 - + arch/h8300/mm/memory.c | 1 - + arch/hexagon/Kconfig | 1 - + arch/hexagon/include/asm/thread_info.h | 6 - + arch/hexagon/include/asm/uaccess.h | 25 - + arch/hexagon/kernel/process.c | 1 - + arch/ia64/Kconfig | 1 - + arch/ia64/include/asm/processor.h | 4 - + arch/ia64/include/asm/thread_info.h | 2 - + arch/ia64/include/asm/uaccess.h | 26 +- + arch/ia64/include/uapi/asm/signal.h | 2 +- + arch/ia64/kernel/unaligned.c | 60 +- + arch/m68k/Kconfig.cpu | 1 + + arch/m68k/include/asm/uaccess.h | 14 +- + arch/m68k/include/uapi/asm/signal.h | 2 +- + arch/microblaze/Kconfig | 1 - + arch/microblaze/include/asm/thread_info.h | 6 - + arch/microblaze/include/asm/uaccess.h | 61 +- + arch/microblaze/kernel/asm-offsets.c | 1 - + arch/microblaze/kernel/process.c | 1 - + arch/mips/include/asm/uaccess.h | 49 +- + arch/mips/include/uapi/asm/shmbuf.h | 7 +- + arch/mips/include/uapi/asm/signal.h | 2 +- + arch/mips/kernel/unaligned.c | 17 + + arch/nds32/Kbuild | 4 - + arch/nds32/Kconfig | 102 -- + arch/nds32/Kconfig.cpu | 218 --- + arch/nds32/Kconfig.debug | 2 - + arch/nds32/Makefile | 63 - + arch/nds32/boot/.gitignore | 2 - + arch/nds32/boot/Makefile | 16 - + arch/nds32/boot/dts/Makefile | 2 - + arch/nds32/boot/dts/ae3xx.dts | 90 -- + arch/nds32/configs/defconfig | 104 -- + arch/nds32/include/asm/Kbuild | 8 - + arch/nds32/include/asm/assembler.h | 39 - + arch/nds32/include/asm/barrier.h | 15 - + arch/nds32/include/asm/bitfield.h | 985 ------------- + arch/nds32/include/asm/cache.h | 12 - + arch/nds32/include/asm/cache_info.h | 13 - + arch/nds32/include/asm/cacheflush.h | 53 - + arch/nds32/include/asm/current.h | 12 - + arch/nds32/include/asm/delay.h | 39 - + arch/nds32/include/asm/elf.h | 180 --- + arch/nds32/include/asm/fixmap.h | 29 - + arch/nds32/include/asm/fpu.h | 126 -- + arch/nds32/include/asm/fpuemu.h | 44 - + arch/nds32/include/asm/ftrace.h | 46 - + arch/nds32/include/asm/futex.h | 101 -- + arch/nds32/include/asm/highmem.h | 65 - + arch/nds32/include/asm/io.h | 84 -- + arch/nds32/include/asm/irqflags.h | 41 - + arch/nds32/include/asm/l2_cache.h | 137 -- + arch/nds32/include/asm/linkage.h | 11 - + arch/nds32/include/asm/memory.h | 91 -- + arch/nds32/include/asm/mmu.h | 12 - + arch/nds32/include/asm/mmu_context.h | 62 - + arch/nds32/include/asm/nds32.h | 82 -- + arch/nds32/include/asm/nds32_fpu_inst.h | 109 -- + arch/nds32/include/asm/page.h | 64 - + arch/nds32/include/asm/perf_event.h | 16 - + arch/nds32/include/asm/pgalloc.h | 62 - + arch/nds32/include/asm/pgtable.h | 377 ----- + arch/nds32/include/asm/pmu.h | 386 ----- + arch/nds32/include/asm/proc-fns.h | 44 - + arch/nds32/include/asm/processor.h | 104 -- + arch/nds32/include/asm/ptrace.h | 77 - + arch/nds32/include/asm/sfp-machine.h | 158 --- + arch/nds32/include/asm/shmparam.h | 19 - + arch/nds32/include/asm/stacktrace.h | 39 - + arch/nds32/include/asm/string.h | 17 - + arch/nds32/include/asm/suspend.h | 11 - + arch/nds32/include/asm/swab.h | 35 - + arch/nds32/include/asm/syscall.h | 142 -- + arch/nds32/include/asm/syscalls.h | 14 - + arch/nds32/include/asm/thread_info.h | 76 - + arch/nds32/include/asm/tlb.h | 11 - + arch/nds32/include/asm/tlbflush.h | 46 - + arch/nds32/include/asm/uaccess.h | 286 ---- + arch/nds32/include/asm/unistd.h | 6 - + arch/nds32/include/asm/vdso.h | 24 - + arch/nds32/include/asm/vdso_datapage.h | 37 - + arch/nds32/include/asm/vdso_timer_info.h | 14 - + arch/nds32/include/asm/vermagic.h | 9 - + arch/nds32/include/asm/vmalloc.h | 4 - + arch/nds32/include/uapi/asm/Kbuild | 2 - + arch/nds32/include/uapi/asm/auxvec.h | 19 - + arch/nds32/include/uapi/asm/byteorder.h | 13 - + arch/nds32/include/uapi/asm/cachectl.h | 14 - + arch/nds32/include/uapi/asm/fp_udfiex_crtl.h | 16 - + arch/nds32/include/uapi/asm/param.h | 11 - + arch/nds32/include/uapi/asm/ptrace.h | 25 - + arch/nds32/include/uapi/asm/sigcontext.h | 84 -- + arch/nds32/include/uapi/asm/unistd.h | 16 - + arch/nds32/kernel/.gitignore | 2 - + arch/nds32/kernel/Makefile | 33 - + arch/nds32/kernel/asm-offsets.c | 28 - + arch/nds32/kernel/atl2c.c | 65 - + arch/nds32/kernel/cacheinfo.c | 49 - + arch/nds32/kernel/devtree.c | 19 - + arch/nds32/kernel/dma.c | 82 -- + arch/nds32/kernel/ex-entry.S | 177 --- + arch/nds32/kernel/ex-exit.S | 193 --- + arch/nds32/kernel/ex-scall.S | 100 -- + arch/nds32/kernel/fpu.c | 266 ---- + arch/nds32/kernel/ftrace.c | 278 ---- + arch/nds32/kernel/head.S | 197 --- + arch/nds32/kernel/irq.c | 9 - + arch/nds32/kernel/module.c | 278 ---- + arch/nds32/kernel/nds32_ksyms.c | 25 - + arch/nds32/kernel/perf_event_cpu.c | 1500 -------------------- + arch/nds32/kernel/pm.c | 80 -- + arch/nds32/kernel/process.c | 257 ---- + arch/nds32/kernel/ptrace.c | 118 -- + arch/nds32/kernel/setup.c | 369 ----- + arch/nds32/kernel/signal.c | 384 ----- + arch/nds32/kernel/sleep.S | 131 -- + arch/nds32/kernel/stacktrace.c | 53 - + arch/nds32/kernel/sys_nds32.c | 84 -- + arch/nds32/kernel/syscall_table.c | 17 - + arch/nds32/kernel/time.c | 11 - + arch/nds32/kernel/traps.c | 354 ----- + arch/nds32/kernel/vdso.c | 231 --- + arch/nds32/kernel/vdso/.gitignore | 2 - + arch/nds32/kernel/vdso/Makefile | 79 -- + arch/nds32/kernel/vdso/datapage.S | 21 - + arch/nds32/kernel/vdso/gen_vdso_offsets.sh | 15 - + arch/nds32/kernel/vdso/gettimeofday.c | 269 ---- + arch/nds32/kernel/vdso/note.S | 11 - + arch/nds32/kernel/vdso/sigreturn.S | 19 - + arch/nds32/kernel/vdso/vdso.S | 18 - + arch/nds32/kernel/vdso/vdso.lds.S | 75 - + arch/nds32/kernel/vmlinux.lds.S | 70 - + arch/nds32/lib/Makefile | 4 - + arch/nds32/lib/clear_user.S | 42 - + arch/nds32/lib/copy_from_user.S | 45 - + arch/nds32/lib/copy_page.S | 40 - + arch/nds32/lib/copy_template.S | 69 - + arch/nds32/lib/copy_to_user.S | 45 - + arch/nds32/lib/memcpy.S | 30 - + arch/nds32/lib/memmove.S | 70 - + arch/nds32/lib/memset.S | 33 - + arch/nds32/lib/memzero.S | 18 - + arch/nds32/math-emu/Makefile | 10 - + arch/nds32/math-emu/faddd.c | 24 - + arch/nds32/math-emu/fadds.c | 24 - + arch/nds32/math-emu/fcmpd.c | 24 - + arch/nds32/math-emu/fcmps.c | 24 - + arch/nds32/math-emu/fd2s.c | 22 - + arch/nds32/math-emu/fd2si.c | 30 - + arch/nds32/math-emu/fd2siz.c | 30 - + arch/nds32/math-emu/fd2ui.c | 30 - + arch/nds32/math-emu/fd2uiz.c | 30 - + arch/nds32/math-emu/fdivd.c | 27 - + arch/nds32/math-emu/fdivs.c | 26 - + arch/nds32/math-emu/fmuld.c | 23 - + arch/nds32/math-emu/fmuls.c | 23 - + arch/nds32/math-emu/fnegd.c | 21 - + arch/nds32/math-emu/fnegs.c | 21 - + arch/nds32/math-emu/fpuemu.c | 406 ------ + arch/nds32/math-emu/fs2d.c | 23 - + arch/nds32/math-emu/fs2si.c | 29 - + arch/nds32/math-emu/fs2siz.c | 29 - + arch/nds32/math-emu/fs2ui.c | 29 - + arch/nds32/math-emu/fs2uiz.c | 30 - + arch/nds32/math-emu/fsi2d.c | 22 - + arch/nds32/math-emu/fsi2s.c | 22 - + arch/nds32/math-emu/fsqrtd.c | 21 - + arch/nds32/math-emu/fsqrts.c | 21 - + arch/nds32/math-emu/fsubd.c | 27 - + arch/nds32/math-emu/fsubs.c | 27 - + arch/nds32/math-emu/fui2d.c | 22 - + arch/nds32/math-emu/fui2s.c | 22 - + arch/nds32/mm/Makefile | 10 - + arch/nds32/mm/alignment.c | 578 -------- + arch/nds32/mm/cacheflush.c | 338 ----- + arch/nds32/mm/extable.c | 16 - + arch/nds32/mm/fault.c | 396 ------ + arch/nds32/mm/init.c | 263 ---- + arch/nds32/mm/mm-nds32.c | 96 -- + arch/nds32/mm/mmap.c | 73 - + arch/nds32/mm/proc.c | 536 ------- + arch/nds32/mm/tlb.c | 50 - + arch/nios2/Kconfig | 1 - + arch/nios2/include/asm/thread_info.h | 9 - + arch/nios2/include/asm/uaccess.h | 105 +- + arch/nios2/kernel/signal.c | 20 +- + arch/openrisc/Kconfig | 1 - + arch/openrisc/include/asm/thread_info.h | 7 - + arch/openrisc/include/asm/uaccess.h | 42 +- + arch/parisc/Kconfig | 1 + + arch/parisc/include/asm/futex.h | 6 - + arch/parisc/include/asm/uaccess.h | 13 +- + arch/parisc/include/uapi/asm/shmbuf.h | 2 + + arch/parisc/include/uapi/asm/signal.h | 2 +- + arch/parisc/kernel/signal.c | 4 +- + arch/parisc/lib/memcpy.c | 2 +- + arch/powerpc/include/asm/uaccess.h | 13 +- + arch/powerpc/include/uapi/asm/shmbuf.h | 5 +- + arch/powerpc/include/uapi/asm/signal.h | 2 +- + arch/powerpc/lib/sstep.c | 4 +- + arch/riscv/include/asm/uaccess.h | 33 +- + arch/riscv/kernel/perf_callchain.c | 4 +- + arch/s390/Kconfig | 1 + + arch/s390/include/asm/uaccess.h | 16 +- + arch/s390/include/uapi/asm/signal.h | 2 +- + arch/sh/Kconfig | 1 - + arch/sh/include/asm/processor.h | 1 - + arch/sh/include/asm/segment.h | 33 - + arch/sh/include/asm/thread_info.h | 2 - + arch/sh/include/asm/uaccess.h | 24 +- + arch/sh/kernel/io_trapped.c | 9 +- + arch/sh/kernel/process_32.c | 2 - + arch/sh/kernel/traps_32.c | 30 +- + arch/sparc/Kconfig | 2 +- + arch/sparc/include/asm/processor_32.h | 6 - + arch/sparc/include/asm/processor_64.h | 4 - + arch/sparc/include/asm/switch_to_64.h | 4 +- + arch/sparc/include/asm/thread_info_64.h | 4 +- + arch/sparc/include/asm/uaccess.h | 3 - + arch/sparc/include/asm/uaccess_32.h | 31 +- + arch/sparc/include/asm/uaccess_64.h | 106 +- + arch/sparc/include/uapi/asm/shmbuf.h | 5 +- + arch/sparc/include/uapi/asm/signal.h | 3 +- + arch/sparc/kernel/process_32.c | 2 - + arch/sparc/kernel/process_64.c | 12 - + arch/sparc/kernel/signal_32.c | 2 +- + arch/sparc/kernel/traps_64.c | 2 - + arch/sparc/lib/NGmemcpy.S | 3 +- + arch/sparc/mm/init_64.c | 7 +- + arch/um/include/asm/uaccess.h | 7 +- + arch/x86/events/core.c | 2 +- + arch/x86/include/asm/uaccess.h | 35 +- + arch/x86/include/uapi/asm/shmbuf.h | 6 +- + arch/x86/include/uapi/asm/signal.h | 2 +- + arch/x86/kernel/dumpstack.c | 6 - + arch/x86/kernel/stacktrace.c | 2 +- + arch/x86/lib/usercopy.c | 2 +- + arch/xtensa/Kconfig | 1 - + arch/xtensa/include/asm/asm-uaccess.h | 71 - + arch/xtensa/include/asm/processor.h | 7 - + arch/xtensa/include/asm/thread_info.h | 3 - + arch/xtensa/include/asm/uaccess.h | 26 +- + arch/xtensa/include/uapi/asm/shmbuf.h | 5 +- + arch/xtensa/include/uapi/asm/signal.h | 2 +- + arch/xtensa/kernel/asm-offsets.c | 3 - + drivers/clocksource/Kconfig | 9 - + drivers/clocksource/timer-atcpit100.c | 266 ---- + drivers/hid/uhid.c | 2 +- + drivers/irqchip/Makefile | 1 - + drivers/irqchip/irq-ativic32.c | 156 -- + drivers/net/ethernet/faraday/Kconfig | 12 +- + drivers/scsi/sg.c | 5 - + drivers/video/console/Kconfig | 2 +- + fs/exec.c | 6 - + include/asm-generic/access_ok.h | 48 + + include/asm-generic/uaccess.h | 46 +- + include/linux/syscalls.h | 4 - + include/linux/uaccess.h | 59 +- + include/rdma/ib.h | 2 +- + include/uapi/asm-generic/shmbuf.h | 4 +- + include/uapi/asm-generic/signal.h | 2 +- + include/uapi/linux/android/binder.h | 4 +- + include/uapi/linux/fsmap.h | 2 +- + include/uapi/linux/kexec.h | 4 +- + include/uapi/linux/reiserfs_xattr.h | 2 +- + kernel/events/callchain.c | 4 - + kernel/events/core.c | 3 - + kernel/exit.c | 14 - + kernel/kthread.c | 5 - + kernel/stacktrace.c | 3 - + kernel/trace/bpf_trace.c | 4 - + lib/strncpy_from_user.c | 2 +- + lib/strnlen_user.c | 2 +- + lib/test_lockup.c | 11 +- + mm/maccess.c | 119 -- + mm/memory.c | 8 - + net/bpfilter/bpfilter_kern.c | 2 +- + scripts/recordmcount.pl | 3 - + tools/include/asm/barrier.h | 2 - + tools/perf/arch/nds32/Build | 1 - + tools/perf/arch/nds32/util/Build | 1 - + tools/perf/arch/nds32/util/header.c | 29 - + tools/testing/selftests/vDSO/vdso_config.h | 4 - + usr/include/Makefile | 8 - + 367 files changed, 436 insertions(+), 17119 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/andestech,ativic32.txt + delete mode 100644 Documentation/devicetree/bindings/nds32/andestech-boards + delete mode 100644 Documentation/devicetree/bindings/nds32/atl2c.txt + delete mode 100644 Documentation/devicetree/bindings/nds32/cpus.txt + delete mode 100644 Documentation/devicetree/bindings/perf/nds32v3-pmu.txt + delete mode 100644 Documentation/devicetree/bindings/timer/andestech,atcpit100-timer.txt + delete mode 100644 arch/arc/include/asm/segment.h + delete mode 100644 arch/csky/include/asm/segment.h + delete mode 100644 arch/h8300/include/asm/segment.h + delete mode 100644 arch/nds32/Kbuild + delete mode 100644 arch/nds32/Kconfig + delete mode 100644 arch/nds32/Kconfig.cpu + delete mode 100644 arch/nds32/Kconfig.debug + delete mode 100644 arch/nds32/Makefile + delete mode 100644 arch/nds32/boot/.gitignore + delete mode 100644 arch/nds32/boot/Makefile + delete mode 100644 arch/nds32/boot/dts/Makefile + delete mode 100644 arch/nds32/boot/dts/ae3xx.dts + delete mode 100644 arch/nds32/configs/defconfig + delete mode 100644 arch/nds32/include/asm/Kbuild + delete mode 100644 arch/nds32/include/asm/assembler.h + delete mode 100644 arch/nds32/include/asm/barrier.h + delete mode 100644 arch/nds32/include/asm/bitfield.h + delete mode 100644 arch/nds32/include/asm/cache.h + delete mode 100644 arch/nds32/include/asm/cache_info.h + delete mode 100644 arch/nds32/include/asm/cacheflush.h + delete mode 100644 arch/nds32/include/asm/current.h + delete mode 100644 arch/nds32/include/asm/delay.h + delete mode 100644 arch/nds32/include/asm/elf.h + delete mode 100644 arch/nds32/include/asm/fixmap.h + delete mode 100644 arch/nds32/include/asm/fpu.h + delete mode 100644 arch/nds32/include/asm/fpuemu.h + delete mode 100644 arch/nds32/include/asm/ftrace.h + delete mode 100644 arch/nds32/include/asm/futex.h + delete mode 100644 arch/nds32/include/asm/highmem.h + delete mode 100644 arch/nds32/include/asm/io.h + delete mode 100644 arch/nds32/include/asm/irqflags.h + delete mode 100644 arch/nds32/include/asm/l2_cache.h + delete mode 100644 arch/nds32/include/asm/linkage.h + delete mode 100644 arch/nds32/include/asm/memory.h + delete mode 100644 arch/nds32/include/asm/mmu.h + delete mode 100644 arch/nds32/include/asm/mmu_context.h + delete mode 100644 arch/nds32/include/asm/nds32.h + delete mode 100644 arch/nds32/include/asm/nds32_fpu_inst.h + delete mode 100644 arch/nds32/include/asm/page.h + delete mode 100644 arch/nds32/include/asm/perf_event.h + delete mode 100644 arch/nds32/include/asm/pgalloc.h + delete mode 100644 arch/nds32/include/asm/pgtable.h + delete mode 100644 arch/nds32/include/asm/pmu.h + delete mode 100644 arch/nds32/include/asm/proc-fns.h + delete mode 100644 arch/nds32/include/asm/processor.h + delete mode 100644 arch/nds32/include/asm/ptrace.h + delete mode 100644 arch/nds32/include/asm/sfp-machine.h + delete mode 100644 arch/nds32/include/asm/shmparam.h + delete mode 100644 arch/nds32/include/asm/stacktrace.h + delete mode 100644 arch/nds32/include/asm/string.h + delete mode 100644 arch/nds32/include/asm/suspend.h + delete mode 100644 arch/nds32/include/asm/swab.h + delete mode 100644 arch/nds32/include/asm/syscall.h + delete mode 100644 arch/nds32/include/asm/syscalls.h + delete mode 100644 arch/nds32/include/asm/thread_info.h + delete mode 100644 arch/nds32/include/asm/tlb.h + delete mode 100644 arch/nds32/include/asm/tlbflush.h + delete mode 100644 arch/nds32/include/asm/uaccess.h + delete mode 100644 arch/nds32/include/asm/unistd.h + delete mode 100644 arch/nds32/include/asm/vdso.h + delete mode 100644 arch/nds32/include/asm/vdso_datapage.h + delete mode 100644 arch/nds32/include/asm/vdso_timer_info.h + delete mode 100644 arch/nds32/include/asm/vermagic.h + delete mode 100644 arch/nds32/include/asm/vmalloc.h + delete mode 100644 arch/nds32/include/uapi/asm/Kbuild + delete mode 100644 arch/nds32/include/uapi/asm/auxvec.h + delete mode 100644 arch/nds32/include/uapi/asm/byteorder.h + delete mode 100644 arch/nds32/include/uapi/asm/cachectl.h + delete mode 100644 arch/nds32/include/uapi/asm/fp_udfiex_crtl.h + delete mode 100644 arch/nds32/include/uapi/asm/param.h + delete mode 100644 arch/nds32/include/uapi/asm/ptrace.h + delete mode 100644 arch/nds32/include/uapi/asm/sigcontext.h + delete mode 100644 arch/nds32/include/uapi/asm/unistd.h + delete mode 100644 arch/nds32/kernel/.gitignore + delete mode 100644 arch/nds32/kernel/Makefile + delete mode 100644 arch/nds32/kernel/asm-offsets.c + delete mode 100644 arch/nds32/kernel/atl2c.c + delete mode 100644 arch/nds32/kernel/cacheinfo.c + delete mode 100644 arch/nds32/kernel/devtree.c + delete mode 100644 arch/nds32/kernel/dma.c + delete mode 100644 arch/nds32/kernel/ex-entry.S + delete mode 100644 arch/nds32/kernel/ex-exit.S + delete mode 100644 arch/nds32/kernel/ex-scall.S + delete mode 100644 arch/nds32/kernel/fpu.c + delete mode 100644 arch/nds32/kernel/ftrace.c + delete mode 100644 arch/nds32/kernel/head.S + delete mode 100644 arch/nds32/kernel/irq.c + delete mode 100644 arch/nds32/kernel/module.c + delete mode 100644 arch/nds32/kernel/nds32_ksyms.c + delete mode 100644 arch/nds32/kernel/perf_event_cpu.c + delete mode 100644 arch/nds32/kernel/pm.c + delete mode 100644 arch/nds32/kernel/process.c + delete mode 100644 arch/nds32/kernel/ptrace.c + delete mode 100644 arch/nds32/kernel/setup.c + delete mode 100644 arch/nds32/kernel/signal.c + delete mode 100644 arch/nds32/kernel/sleep.S + delete mode 100644 arch/nds32/kernel/stacktrace.c + delete mode 100644 arch/nds32/kernel/sys_nds32.c + delete mode 100644 arch/nds32/kernel/syscall_table.c + delete mode 100644 arch/nds32/kernel/time.c + delete mode 100644 arch/nds32/kernel/traps.c + delete mode 100644 arch/nds32/kernel/vdso.c + delete mode 100644 arch/nds32/kernel/vdso/.gitignore + delete mode 100644 arch/nds32/kernel/vdso/Makefile + delete mode 100644 arch/nds32/kernel/vdso/datapage.S + delete mode 100755 arch/nds32/kernel/vdso/gen_vdso_offsets.sh + delete mode 100644 arch/nds32/kernel/vdso/gettimeofday.c + delete mode 100644 arch/nds32/kernel/vdso/note.S + delete mode 100644 arch/nds32/kernel/vdso/sigreturn.S + delete mode 100644 arch/nds32/kernel/vdso/vdso.S + delete mode 100644 arch/nds32/kernel/vdso/vdso.lds.S + delete mode 100644 arch/nds32/kernel/vmlinux.lds.S + delete mode 100644 arch/nds32/lib/Makefile + delete mode 100644 arch/nds32/lib/clear_user.S + delete mode 100644 arch/nds32/lib/copy_from_user.S + delete mode 100644 arch/nds32/lib/copy_page.S + delete mode 100644 arch/nds32/lib/copy_template.S + delete mode 100644 arch/nds32/lib/copy_to_user.S + delete mode 100644 arch/nds32/lib/memcpy.S + delete mode 100644 arch/nds32/lib/memmove.S + delete mode 100644 arch/nds32/lib/memset.S + delete mode 100644 arch/nds32/lib/memzero.S + delete mode 100644 arch/nds32/math-emu/Makefile + delete mode 100644 arch/nds32/math-emu/faddd.c + delete mode 100644 arch/nds32/math-emu/fadds.c + delete mode 100644 arch/nds32/math-emu/fcmpd.c + delete mode 100644 arch/nds32/math-emu/fcmps.c + delete mode 100644 arch/nds32/math-emu/fd2s.c + delete mode 100644 arch/nds32/math-emu/fd2si.c + delete mode 100644 arch/nds32/math-emu/fd2siz.c + delete mode 100644 arch/nds32/math-emu/fd2ui.c + delete mode 100644 arch/nds32/math-emu/fd2uiz.c + delete mode 100644 arch/nds32/math-emu/fdivd.c + delete mode 100644 arch/nds32/math-emu/fdivs.c + delete mode 100644 arch/nds32/math-emu/fmuld.c + delete mode 100644 arch/nds32/math-emu/fmuls.c + delete mode 100644 arch/nds32/math-emu/fnegd.c + delete mode 100644 arch/nds32/math-emu/fnegs.c + delete mode 100644 arch/nds32/math-emu/fpuemu.c + delete mode 100644 arch/nds32/math-emu/fs2d.c + delete mode 100644 arch/nds32/math-emu/fs2si.c + delete mode 100644 arch/nds32/math-emu/fs2siz.c + delete mode 100644 arch/nds32/math-emu/fs2ui.c + delete mode 100644 arch/nds32/math-emu/fs2uiz.c + delete mode 100644 arch/nds32/math-emu/fsi2d.c + delete mode 100644 arch/nds32/math-emu/fsi2s.c + delete mode 100644 arch/nds32/math-emu/fsqrtd.c + delete mode 100644 arch/nds32/math-emu/fsqrts.c + delete mode 100644 arch/nds32/math-emu/fsubd.c + delete mode 100644 arch/nds32/math-emu/fsubs.c + delete mode 100644 arch/nds32/math-emu/fui2d.c + delete mode 100644 arch/nds32/math-emu/fui2s.c + delete mode 100644 arch/nds32/mm/Makefile + delete mode 100644 arch/nds32/mm/alignment.c + delete mode 100644 arch/nds32/mm/cacheflush.c + delete mode 100644 arch/nds32/mm/extable.c + delete mode 100644 arch/nds32/mm/fault.c + delete mode 100644 arch/nds32/mm/init.c + delete mode 100644 arch/nds32/mm/mm-nds32.c + delete mode 100644 arch/nds32/mm/mmap.c + delete mode 100644 arch/nds32/mm/proc.c + delete mode 100644 arch/nds32/mm/tlb.c + delete mode 100644 arch/sh/include/asm/segment.h + delete mode 100644 drivers/clocksource/timer-atcpit100.c + delete mode 100644 drivers/irqchip/irq-ativic32.c + create mode 100644 include/asm-generic/access_ok.h + delete mode 100644 tools/perf/arch/nds32/Build + delete mode 100644 tools/perf/arch/nds32/util/Build + delete mode 100644 tools/perf/arch/nds32/util/header.c +Merging arc/for-next (6880fa6c5660 Linux 5.15-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 (d5b493b066ca Merge branch 'devel-stable' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/kernel/traps.c +Auto-merging lib/Kconfig +Merge made by the 'ort' strategy. + arch/arm/Kconfig | 45 +++-- + arch/arm/Kconfig.debug | 2 +- + arch/arm/Makefile | 9 + + arch/arm/boot/compressed/Makefile | 6 +- + arch/arm/boot/compressed/misc.c | 7 - + arch/arm/include/asm/assembler.h | 204 ++++++++++++++++---- + arch/arm/include/asm/cacheflush.h | 12 +- + arch/arm/include/asm/current.h | 46 +++-- + arch/arm/include/asm/elf.h | 3 + + arch/arm/include/asm/entry-macro-multi.S | 40 ---- + arch/arm/include/asm/ftrace.h | 20 +- + arch/arm/include/asm/hardware/entry-macro-iomd.S | 131 ------------- + arch/arm/include/asm/insn.h | 17 ++ + arch/arm/include/asm/irq.h | 1 - + arch/arm/include/asm/mach/arch.h | 2 - + arch/arm/include/asm/mmu.h | 2 +- + arch/arm/include/asm/mmu_context.h | 22 ++- + arch/arm/include/asm/page.h | 3 + + arch/arm/include/asm/percpu.h | 35 +++- + arch/arm/include/asm/smp.h | 5 - + arch/arm/include/asm/stacktrace.h | 15 ++ + arch/arm/include/asm/switch_to.h | 3 +- + arch/arm/include/asm/thread_info.h | 35 +--- + arch/arm/include/asm/tls.h | 31 ++- + arch/arm/include/asm/v7m.h | 3 +- + arch/arm/kernel/Makefile | 6 +- + arch/arm/kernel/asm-offsets.c | 3 - + arch/arm/kernel/entry-armv.S | 208 +++++++++++++++++---- + arch/arm/kernel/entry-common.S | 16 +- + arch/arm/kernel/entry-ftrace.S | 128 +++++++------ + arch/arm/kernel/entry-header.S | 47 ++++- + arch/arm/kernel/entry-v7m.S | 39 ++-- + arch/arm/kernel/ftrace.c | 62 +++++- + arch/arm/kernel/head-common.S | 4 +- + arch/arm/kernel/head.S | 7 + + arch/arm/kernel/irq.c | 61 ++++-- + arch/arm/kernel/module.c | 90 +++++++++ + arch/arm/kernel/process.c | 7 +- + arch/arm/kernel/setup.c | 8 +- + arch/arm/kernel/sleep.S | 13 ++ + arch/arm/kernel/smp.c | 11 +- + arch/arm/kernel/traps.c | 96 +++++++++- + arch/arm/kernel/unwind.c | 57 ++++-- + arch/arm/kernel/vmlinux.lds.S | 4 +- + arch/arm/lib/backtrace-clang.S | 14 +- + arch/arm/lib/backtrace.S | 8 + + arch/arm/lib/call_with_stack.S | 33 +++- + arch/arm/lib/copy_from_user.S | 13 +- + arch/arm/lib/copy_template.S | 67 +++---- + arch/arm/lib/copy_to_user.S | 13 +- + arch/arm/lib/memcpy.S | 13 +- + arch/arm/lib/memmove.S | 60 ++---- + arch/arm/lib/memset.S | 7 +- + arch/arm/mach-bcm/Makefile | 1 + + arch/arm/mach-exynos/mcpm-exynos.c | 6 +- + arch/arm/mach-footbridge/common.c | 87 +++++++++ + .../arm/mach-footbridge/include/mach/entry-macro.S | 107 ----------- + arch/arm/mach-iop32x/cp6.c | 10 +- + arch/arm/mach-iop32x/include/mach/entry-macro.S | 31 --- + arch/arm/mach-iop32x/include/mach/irqs.h | 2 +- + arch/arm/mach-iop32x/iop3xx.h | 1 + + arch/arm/mach-iop32x/irq.c | 29 ++- + arch/arm/mach-iop32x/irqs.h | 60 +++--- + arch/arm/mach-rpc/fiq.S | 5 +- + arch/arm/mach-rpc/include/mach/entry-macro.S | 13 -- + arch/arm/mach-rpc/irq.c | 95 ++++++++++ + arch/arm/mm/Kconfig | 1 + + arch/arm/mm/cache-v7.S | 40 ++-- + arch/arm/mm/context.c | 3 +- + arch/arm/mm/init.c | 43 +---- + arch/arm/mm/ioremap.c | 18 +- + arch/arm/probes/kprobes/actions-common.c | 8 +- + arch/arm/probes/kprobes/actions-thumb.c | 16 +- + arch/arm/vdso/Makefile | 2 +- + drivers/amba/bus.c | 73 +------- + drivers/dma/pl330.c | 4 +- + drivers/irqchip/Kconfig | 1 + + drivers/irqchip/irq-nvic.c | 22 +-- + include/linux/amba/bus.h | 21 --- + 79 files changed, 1476 insertions(+), 1017 deletions(-) + delete mode 100644 arch/arm/include/asm/entry-macro-multi.S + delete mode 100644 arch/arm/include/asm/hardware/entry-macro-iomd.S + delete mode 100644 arch/arm/mach-footbridge/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-iop32x/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-rpc/include/mach/entry-macro.S +Merging arm64/for-next/core (fe500628a097 Merge branch 'for-next/fpsimd' 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/ia64/Kconfig +Merge made by the 'ort' strategy. + Documentation/arm64/booting.rst | 10 +- + Documentation/arm64/elf_hwcaps.rst | 5 + + Documentation/arm64/memory-tagging-extension.rst | 49 ++++- + Documentation/asm-annotations.rst | 11 +- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/archrandom.h | 45 +++- + arch/arm64/include/asm/asm_pointer_auth.h | 3 + + arch/arm64/include/asm/cpufeature.h | 2 + + arch/arm64/include/asm/debug-monitors.h | 12 -- + arch/arm64/include/asm/hwcap.h | 1 + + arch/arm64/include/asm/insn-def.h | 14 ++ + arch/arm64/include/asm/insn.h | 80 ++++++- + arch/arm64/include/asm/kvm_arm.h | 4 +- + arch/arm64/include/asm/kvm_hyp.h | 1 + + arch/arm64/include/asm/linkage.h | 24 --- + arch/arm64/include/asm/lse.h | 6 +- + arch/arm64/include/asm/module.lds.h | 6 +- + arch/arm64/include/asm/mte-def.h | 1 + + arch/arm64/include/asm/mte.h | 22 ++ + arch/arm64/include/asm/pgtable-hwdef.h | 2 + + arch/arm64/include/asm/processor.h | 1 + + arch/arm64/include/asm/sysreg.h | 20 +- + arch/arm64/include/uapi/asm/hwcap.h | 1 + + arch/arm64/kernel/Makefile | 1 + + arch/arm64/kernel/cpufeature.c | 238 +++++++++++++-------- + arch/arm64/kernel/cpuinfo.c | 1 + + arch/arm64/kernel/elfcore.c | 134 ++++++++++++ + arch/arm64/kernel/entry-common.c | 3 + + arch/arm64/kernel/entry.S | 9 +- + arch/arm64/kernel/idreg-override.c | 16 +- + arch/arm64/kernel/mte.c | 29 ++- + arch/arm64/kernel/process.c | 5 +- + arch/arm64/kvm/arm.c | 1 + + arch/arm64/kvm/hyp/include/hyp/switch.h | 4 +- + arch/arm64/kvm/hyp/include/nvhe/fixed_config.h | 5 + + arch/arm64/kvm/hyp/nvhe/cache.S | 5 +- + arch/arm64/kvm/hyp/nvhe/sys_regs.c | 14 ++ + arch/arm64/kvm/hyp/vhe/switch.c | 6 +- + arch/arm64/kvm/sys_regs.c | 5 + + arch/arm64/lib/clear_page.S | 5 +- + arch/arm64/lib/copy_page.S | 5 +- + arch/arm64/lib/insn.c | 187 ++++++++++++++-- + arch/arm64/lib/memchr.S | 5 +- + arch/arm64/lib/memcmp.S | 6 +- + arch/arm64/lib/memcpy.S | 21 +- + arch/arm64/lib/memset.S | 12 +- + arch/arm64/lib/mte.S | 4 +- + arch/arm64/lib/strchr.S | 6 +- + arch/arm64/lib/strcmp.S | 6 +- + arch/arm64/lib/strlen.S | 6 +- + arch/arm64/lib/strncmp.S | 6 +- + arch/arm64/lib/strnlen.S | 6 +- + arch/arm64/lib/strrchr.S | 5 +- + arch/arm64/mm/cache.S | 35 +-- + arch/arm64/mm/hugetlbpage.c | 38 ++-- + arch/arm64/mm/mmu.c | 9 + + arch/arm64/mm/mteswap.c | 2 +- + arch/arm64/mm/proc.S | 2 +- + arch/arm64/net/bpf_jit.h | 11 +- + arch/arm64/tools/cpucaps | 6 +- + arch/ia64/Kconfig | 1 + + arch/x86/boot/compressed/head_32.S | 3 +- + arch/x86/boot/compressed/head_64.S | 3 +- + arch/x86/crypto/aesni-intel_asm.S | 4 +- + arch/x86/lib/memcpy_64.S | 10 +- + arch/x86/lib/memmove_64.S | 4 +- + arch/x86/lib/memset_64.S | 6 +- + arch/x86/um/Kconfig | 1 + + drivers/perf/Kconfig | 2 +- + drivers/perf/arm-cci.c | 2 +- + drivers/perf/arm-ccn.c | 10 +- + drivers/perf/arm-cmn.c | 2 +- + drivers/perf/arm_pmu.c | 4 +- + drivers/perf/hisilicon/hisi_uncore_pmu.c | 2 +- + drivers/perf/marvell_cn10k_tad_pmu.c | 2 + + drivers/perf/thunderx2_pmu.c | 6 +- + drivers/perf/xgene_pmu.c | 8 +- + fs/Kconfig.binfmt | 3 + + include/linux/elfcore.h | 4 +- + include/linux/kasan-enabled.h | 33 +++ + include/linux/kasan.h | 23 +- + include/linux/linkage.h | 67 +++--- + include/uapi/linux/elf.h | 3 + + include/uapi/linux/prctl.h | 4 +- + tools/arch/x86/lib/memcpy_64.S | 10 +- + tools/arch/x86/lib/memset_64.S | 6 +- + tools/perf/util/include/linux/linkage.h | 52 +++-- + tools/testing/selftests/arm64/abi/syscall-abi.c | 1 - + tools/testing/selftests/arm64/fp/sve-ptrace.c | 2 - + .../selftests/arm64/mte/check_gcr_el1_cswitch.c | 11 - + tools/testing/selftests/arm64/mte/check_user_mem.c | 193 ++++++++++++++--- + .../testing/selftests/arm64/signal/test_signals.h | 1 + + .../selftests/arm64/signal/test_signals_utils.c | 34 ++- + .../selftests/arm64/signal/test_signals_utils.h | 2 + + 94 files changed, 1243 insertions(+), 456 deletions(-) + create mode 100644 arch/arm64/kernel/elfcore.c + create mode 100644 include/linux/kasan-enabled.h +Merging arm-perf/for-next/perf (602c873eb52e perf: Replace acpi_bus_get_device()) +$ 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 (1c9566edd537 Revert "soc: mediatek: mmsys: add mmsys reset control for MT8186") +$ 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 MAINTAINERS +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging arch/arm/Makefile +Resolved 'arch/arm/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5c1b44242c64] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/airoha.yaml | 28 + + Documentation/devicetree/bindings/arm/altera.yaml | 46 +- + Documentation/devicetree/bindings/arm/amlogic.yaml | 12 + + .../devicetree/bindings/arm/atmel-at91.yaml | 9 + + Documentation/devicetree/bindings/arm/cpus.yaml | 1 + + Documentation/devicetree/bindings/arm/fsl.yaml | 24 + + .../devicetree/bindings/arm/intel,socfpga.yaml | 26 + + .../devicetree/bindings/arm/mediatek.yaml | 4 + + .../bindings/arm/mediatek/mediatek,mmsys.yaml | 1 + + .../devicetree/bindings/arm/msm/qcom,llcc.yaml | 2 + + .../devicetree/bindings/arm/mstar/mstar.yaml | 4 + + .../devicetree/bindings/arm/npcm/nuvoton,gcr.yaml | 48 + + Documentation/devicetree/bindings/arm/qcom.yaml | 23 +- + Documentation/devicetree/bindings/arm/renesas.yaml | 9 + + .../devicetree/bindings/arm/rockchip.yaml | 13 + + .../bindings/arm/samsung/samsung-boards.yaml | 2 + + .../devicetree/bindings/arm/stm32/stm32.yaml | 6 + + Documentation/devicetree/bindings/arm/sunxi.yaml | 5 + + Documentation/devicetree/bindings/arm/tesla.yaml | 27 + + Documentation/devicetree/bindings/arm/ti/k3.yaml | 6 + + .../devicetree/bindings/clock/intc_stratix10.txt | 20 - + .../devicetree/bindings/clock/intel,stratix10.yaml | 35 + + .../bindings/clock/mstar,msc313-cpupll.yaml | 45 + + .../devicetree/bindings/clock/tesla,fsd-clock.yaml | 198 +++ + .../devicetree/bindings/firmware/arm,scmi.yaml | 75 + + .../ddr/jedec,lpddr2-timings.yaml | 135 ++ + .../memory-controllers/ddr/jedec,lpddr2.yaml | 23 +- + .../ddr/jedec,lpddr3-timings.yaml | 157 ++ + .../memory-controllers/ddr/jedec,lpddr3.yaml | 263 +++ + .../memory-controllers/ddr/lpddr2-timings.txt | 52 - + .../memory-controllers/ddr/lpddr3-timings.txt | 58 - + .../bindings/memory-controllers/ddr/lpddr3.txt | 107 -- + .../bindings/memory-controllers/fsl/fsl,ifc.yaml | 113 ++ + .../bindings/memory-controllers/fsl/ifc.txt | 82 - + .../memory-controllers/mediatek,smi-common.yaml | 32 +- + .../memory-controllers/mediatek,smi-larb.yaml | 19 +- + .../memory-controllers/samsung,exynos5422-dmc.yaml | 3 +- + .../devicetree/bindings/phy/qcom,usb-hs-phy.txt | 1 + + .../pinctrl/samsung,pinctrl-gpio-bank.yaml | 52 + + .../bindings/pinctrl/samsung,pinctrl-pins-cfg.yaml | 81 + + .../pinctrl/samsung,pinctrl-wakeup-interrupt.yaml | 106 ++ + .../bindings/pinctrl/samsung,pinctrl.yaml | 392 +++++ + .../bindings/pinctrl/samsung-pinctrl.txt | 383 ---- + .../devicetree/bindings/power/fsl,imx-gpcv2.yaml | 2 + + .../bindings/power/mediatek,power-controller.yaml | 3 + + .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 + + .../bindings/power/renesas,rzg2l-sysc.yaml | 7 +- + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 16 + + .../bindings/soc/imx/fsl,imx8mp-hsio-blk-ctrl.yaml | 78 + + .../bindings/soc/imx/fsl,imx8mq-vpu-blk-ctrl.yaml | 71 + + .../devicetree/bindings/soc/mediatek/pwrap.txt | 1 + + .../devicetree/bindings/soc/rockchip/grf.yaml | 1 + + .../bindings/soc/samsung/exynos-usi.yaml | 20 +- + .../bindings/sound/nvidia,tegra30-hda.yaml | 3 + + .../bindings/timer/mediatek,mtk-timer.txt | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 18 + + .../devicetree/bindings/watchdog/mtk-wdt.txt | 1 + + MAINTAINERS | 25 +- + arch/arm/Kconfig | 23 +- + arch/arm/Makefile | 1 + + arch/arm/arm-soc-for-next-contents.txt | 166 ++ + arch/arm/boot/dts/Makefile | 18 +- + arch/arm/boot/dts/am335x-pdu001.dts | 2 +- + .../boot/dts/am335x-sancloud-bbe-extended-wifi.dts | 113 ++ + arch/arm/boot/dts/armada-370-c200-v2.dts | 388 +++++ + arch/arm/boot/dts/armada-385-turris-omnia.dts | 3 + + arch/arm/boot/dts/armada-385.dtsi | 52 +- + arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts | 26 +- + arch/arm/boot/dts/aspeed-bmc-asrock-romed8hm3.dts | 259 +++ + .../arm/boot/dts/aspeed-bmc-facebook-bletchley.dts | 320 ++-- + arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 11 +- + arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 33 +- + arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 12 +- + arch/arm/boot/dts/aspeed-bmc-quanta-s6q.dts | 610 +++++++ + arch/arm/boot/dts/at91-sama7g5ek.dts | 32 +- + arch/arm/boot/dts/en7523-evb.dts | 35 + + arch/arm/boot/dts/en7523.dtsi | 138 ++ + arch/arm/boot/dts/exynos3250-artik5.dtsi | 10 +- + arch/arm/boot/dts/exynos3250-monk.dts | 2 +- + arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 165 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 2 +- + arch/arm/boot/dts/exynos3250.dtsi | 4 +- + arch/arm/boot/dts/exynos4.dtsi | 6 +- + arch/arm/boot/dts/exynos4210-i9100.dts | 30 +- + arch/arm/boot/dts/exynos4210-origen.dts | 2 +- + arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 226 +-- + arch/arm/boot/dts/exynos4210-smdkv310.dts | 4 +- + arch/arm/boot/dts/exynos4210-trats.dts | 6 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 14 +- + arch/arm/boot/dts/exynos4210.dtsi | 2 - + arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 4 +- + arch/arm/boot/dts/exynos4412-itop-elite.dts | 2 +- + arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 2 +- + arch/arm/boot/dts/exynos4412-midas.dtsi | 30 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 8 +- + arch/arm/boot/dts/exynos4412-odroidx.dts | 2 +- + arch/arm/boot/dts/exynos4412-origen.dts | 4 +- + arch/arm/boot/dts/exynos4412-p4note.dtsi | 78 +- + arch/arm/boot/dts/exynos4412-pinctrl.dtsi | 252 +-- + arch/arm/boot/dts/exynos4412-smdk4412.dts | 4 +- + arch/arm/boot/dts/exynos4412.dtsi | 2 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 7 +- + arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 222 +-- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 10 +- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 27 +- + arch/arm/boot/dts/exynos5250-snow-rev5.dts | 2 +- + arch/arm/boot/dts/exynos5250-snow.dts | 2 +- + arch/arm/boot/dts/exynos5250-spring.dts | 25 +- + arch/arm/boot/dts/exynos5250.dtsi | 19 +- + arch/arm/boot/dts/exynos5260-pinctrl.dtsi | 148 +- + arch/arm/boot/dts/exynos5260-xyref5260.dts | 23 +- + arch/arm/boot/dts/exynos5260.dtsi | 128 ++ + arch/arm/boot/dts/exynos5410-odroidxu.dts | 34 +- + arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 170 +- + arch/arm/boot/dts/exynos5410-smdk5410.dts | 27 +- + arch/arm/boot/dts/exynos5410.dtsi | 4 +- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 12 +- + arch/arm/boot/dts/exynos5420-chagall-wifi.dts | 75 + + .../arm/boot/dts/exynos5420-galaxy-tab-common.dtsi | 691 ++++++++ + arch/arm/boot/dts/exynos5420-klimt-wifi.dts | 75 + + arch/arm/boot/dts/exynos5420-peach-pit.dts | 99 +- + arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 194 +-- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 19 +- + arch/arm/boot/dts/exynos5420.dtsi | 26 +- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 4 +- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 6 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 99 +- + arch/arm/boot/dts/imx28-tx28.dts | 2 +- + arch/arm/boot/dts/imx28.dtsi | 2 + + arch/arm/boot/dts/imx51-ts4800.dts | 2 +- + arch/arm/boot/dts/imx53-m53menlo.dts | 29 +- + arch/arm/boot/dts/imx53-tx53.dtsi | 2 +- + arch/arm/boot/dts/imx6dl-plym2m.dts | 131 +- + arch/arm/boot/dts/imx6dl-prtvt7.dts | 203 ++- + arch/arm/boot/dts/imx6dl-victgo.dts | 121 +- + arch/arm/boot/dts/imx6q-tbs2910.dts | 2 +- + arch/arm/boot/dts/imx6qdl-dhcom-pdk2.dtsi | 3 + + arch/arm/boot/dts/imx6qdl-mba6.dtsi | 16 +- + arch/arm/boot/dts/imx6qdl-mba6a.dtsi | 6 - + arch/arm/boot/dts/imx6qdl-mba6b.dtsi | 11 +- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 13 + + arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi | 10 + + arch/arm/boot/dts/imx6qdl-tqma6.dtsi | 14 + + arch/arm/boot/dts/imx6qdl-tqma6a.dtsi | 7 +- + arch/arm/boot/dts/imx6qdl-tqma6b.dtsi | 7 +- + arch/arm/boot/dts/imx6qdl-tx6-mb7.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-vicut1.dtsi | 12 +- + arch/arm/boot/dts/imx6qp-sabresd.dts | 6 +- + arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 74 + + arch/arm/boot/dts/imx6ul-tx6ul-mainboard.dts | 2 +- + arch/arm/boot/dts/imx7-colibri-aster.dtsi | 2 +- + arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 2 +- + arch/arm/boot/dts/imx7-colibri.dtsi | 4 +- + arch/arm/boot/dts/imx7-mba7.dtsi | 2 +- + arch/arm/boot/dts/imx7d-nitrogen7.dts | 2 +- + arch/arm/boot/dts/imx7d-pico-hobbit.dts | 4 +- + arch/arm/boot/dts/imx7d-pico-pi.dts | 4 +- + arch/arm/boot/dts/imx7d-sdb.dts | 4 +- + arch/arm/boot/dts/imx7d.dtsi | 86 +- + arch/arm/boot/dts/imx7s-warp.dts | 4 +- + arch/arm/boot/dts/imxrt1050-pinfunc.h | 993 +++++++++++ + arch/arm/boot/dts/intel-ixp42x-gateway-7001.dts | 3 +- + ...g302v2.dts => intel-ixp42x-netgear-wg302v1.dts} | 29 +- + arch/arm/boot/dts/intel-ixp42x.dtsi | 2 +- + arch/arm/boot/dts/iwg20d-q7-common.dtsi | 2 +- + arch/arm/boot/dts/kirkwood-c200-v1.dts | 310 ++++ + arch/arm/boot/dts/lan966x-pcb8291.dts | 64 + + arch/arm/boot/dts/lan966x.dtsi | 237 +++ + arch/arm/boot/dts/logicpd-torpedo-35xx-devkit.dts | 8 + + arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 9 + + arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 41 +- + arch/arm/boot/dts/mstar-infinity.dtsi | 34 + + .../boot/dts/mstar-infinity2m-ssd201-som2d01.dtsi | 20 + + ...tar-infinity2m-ssd202d-100ask-dongshanpione.dts | 25 + + .../dts/mstar-infinity2m-ssd202d-miyoo-mini.dts | 25 + + ...y2m-ssd202d-wirelesstag-ido-sbc2d06-v1b-22w.dts | 23 + + ...infinity2m-ssd202d-wirelesstag-ido-som2d01.dtsi | 28 + + arch/arm/boot/dts/mstar-infinity2m-ssd20xd.dtsi | 5 + + arch/arm/boot/dts/mstar-infinity2m.dtsi | 17 + + arch/arm/boot/dts/mstar-infinity3.dtsi | 58 + + arch/arm/boot/dts/mstar-v7.dtsi | 9 + + arch/arm/boot/dts/mt6582-prestigio-pmt5008-3g.dts | 43 + + arch/arm/boot/dts/mt6582.dtsi | 128 ++ + .../dts/nuvoton-wpcm450-supermicro-x9sci-ln4f.dts | 43 + + arch/arm/boot/dts/nuvoton-wpcm450.dtsi | 384 +++++ + arch/arm/boot/dts/openbmc-flash-layout-64.dtsi | 2 +- + arch/arm/boot/dts/openbmc-flash-layout.dtsi | 2 +- + arch/arm/boot/dts/ox810se-wd-mbwe.dts | 4 + + arch/arm/boot/dts/ox810se.dtsi | 18 + + arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts | 132 +- + arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 6 +- + arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 3 +- + arch/arm/boot/dts/qcom-apq8064.dtsi | 19 +- + arch/arm/boot/dts/qcom-ipq4019.dtsi | 4 +- + arch/arm/boot/dts/qcom-mdm9615.dtsi | 3 +- + arch/arm/boot/dts/qcom-msm8226.dtsi | 125 ++ + arch/arm/boot/dts/qcom-msm8660.dtsi | 3 +- + arch/arm/boot/dts/qcom-msm8960-cdp.dts | 2 +- + arch/arm/boot/dts/qcom-msm8960.dtsi | 30 +- + arch/arm/boot/dts/qcom-pm8226.dtsi | 43 + + arch/arm/boot/dts/qcom-sdx55.dtsi | 4 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +- + arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts | 4 +- + arch/arm/boot/dts/r8a7742-iwg21d-q7.dts | 4 +- + arch/arm/boot/dts/r8a7742-iwg21m.dtsi | 2 +- + arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 2 +- + arch/arm/boot/dts/r9a06g032-rzn1d400-db.dts | 5 + + arch/arm/boot/dts/r9a06g032.dtsi | 27 + + arch/arm/boot/dts/rk3288.dtsi | 1 - + arch/arm/boot/dts/s3c2416-pinctrl.dtsi | 60 +- + arch/arm/boot/dts/s3c6410-mini6410.dts | 4 +- + arch/arm/boot/dts/s3c64xx-pinctrl.dtsi | 210 +-- + arch/arm/boot/dts/s3c64xx.dtsi | 16 +- + arch/arm/boot/dts/s5pv210-aquila.dts | 2 +- + arch/arm/boot/dts/s5pv210-aries.dtsi | 40 +- + arch/arm/boot/dts/s5pv210-fascinate4g.dts | 12 +- + arch/arm/boot/dts/s5pv210-galaxys.dts | 16 +- + arch/arm/boot/dts/s5pv210-pinctrl.dtsi | 226 +-- + arch/arm/boot/dts/sam9x60.dtsi | 10 +- + arch/arm/boot/dts/sama5d2.dtsi | 11 +- + arch/arm/boot/dts/sama5d3.dtsi | 6 +- + arch/arm/boot/dts/sama5d4.dtsi | 9 +- + arch/arm/boot/dts/sama7g5.dtsi | 169 +- + arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts | 2 +- + arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 2 +- + arch/arm/boot/dts/socfpga_arria5_socdk.dts | 4 +- + arch/arm/boot/dts/socfpga_cyclone5_chameleon96.dts | 2 +- + .../arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dts | 2 +- + arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 2 +- + arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 2 +- + arch/arm/boot/dts/socfpga_cyclone5_sodia.dts | 2 +- + arch/arm/boot/dts/ste-ab8500.dtsi | 39 +- + arch/arm/boot/dts/ste-ab8505.dtsi | 34 +- + arch/arm/boot/dts/ste-href-ab8500.dtsi | 2 +- + arch/arm/boot/dts/ste-href.dtsi | 25 +- + arch/arm/boot/dts/ste-snowball.dts | 27 +- + arch/arm/boot/dts/ste-ux500-samsung-codina.dts | 22 +- + arch/arm/boot/dts/ste-ux500-samsung-gavini.dts | 22 +- + arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 22 +- + arch/arm/boot/dts/ste-ux500-samsung-janice.dts | 24 +- + arch/arm/boot/dts/ste-ux500-samsung-kyle.dts | 22 +- + arch/arm/boot/dts/ste-ux500-samsung-skomer.dts | 22 +- + arch/arm/boot/dts/stih407-clock.dtsi | 101 +- + arch/arm/boot/dts/stih407-family.dtsi | 262 ++- + arch/arm/boot/dts/stih410-b2120.dts | 16 +- + arch/arm/boot/dts/stih410-b2260.dts | 30 +- + arch/arm/boot/dts/stih410-clock.dtsi | 100 +- + arch/arm/boot/dts/stih410.dtsi | 52 +- + arch/arm/boot/dts/stih418-b2199.dts | 22 +- + arch/arm/boot/dts/stih418-clock.dtsi | 101 +- + arch/arm/boot/dts/stih418.dtsi | 38 +- + arch/arm/boot/dts/stihxxx-b2120.dtsi | 22 +- + arch/arm/boot/dts/stm32429i-eval.dts | 12 + + arch/arm/boot/dts/stm32746g-eval.dts | 12 + + arch/arm/boot/dts/stm32f429-disco.dts | 12 + + arch/arm/boot/dts/stm32f429.dtsi | 57 +- + arch/arm/boot/dts/stm32f469-disco.dts | 16 + + arch/arm/boot/dts/stm32f746-disco.dts | 12 + + arch/arm/boot/dts/stm32f746.dtsi | 47 - + arch/arm/boot/dts/stm32f769-disco.dts | 12 + + arch/arm/boot/dts/stm32mp13-pinctrl.dtsi | 81 +- + arch/arm/boot/dts/stm32mp131.dtsi | 89 +- + arch/arm/boot/dts/stm32mp135f-dk.dts | 7 +- + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 94 +- + arch/arm/boot/dts/stm32mp151.dtsi | 37 +- + arch/arm/boot/dts/stm32mp153.dtsi | 7 + + .../dts/stm32mp157a-icore-stm32mp1-ctouch2.dts | 2 + + .../dts/stm32mp157a-icore-stm32mp1-edimm2.2.dts | 2 + + arch/arm/boot/dts/stm32mp157a-iot-box.dts | 2 + + ...m32mp157a-microgea-stm32mp1-microdev2.0-of7.dts | 4 + + .../stm32mp157a-microgea-stm32mp1-microdev2.0.dts | 4 + + arch/arm/boot/dts/stm32mp157a-stinger96.dtsi | 6 + + arch/arm/boot/dts/stm32mp157c-ed1.dts | 2 + + arch/arm/boot/dts/stm32mp157c-emsbc-argon.dts | 53 + + arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi | 552 ++++++ + arch/arm/boot/dts/stm32mp157c-lxa-mc1.dts | 2 + + arch/arm/boot/dts/stm32mp157c-odyssey.dts | 2 + + arch/arm/boot/dts/stm32mp15xx-dhcom-drc02.dtsi | 4 + + arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi | 4 + + arch/arm/boot/dts/stm32mp15xx-dhcom-picoitx.dtsi | 4 + + arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 3 +- + arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 6 + + arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 56 + + arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 4 + + arch/arm/boot/dts/sun7i-a20-haoyu-marsboard.dts | 182 ++ + arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts | 28 + + arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts | 4 + + arch/arm/boot/dts/sun8i-h3.dtsi | 2 +- + arch/arm/boot/dts/sun8i-v3s.dtsi | 22 +- + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 18 + + arch/arm/boot/dts/tegra20-asus-tf101.dts | 12 +- + arch/arm/boot/dts/tegra20-colibri.dtsi | 2 +- + arch/arm/boot/dts/tegra20-paz00.dts | 6 +- + arch/arm/boot/dts/tegra20-tamonten.dtsi | 6 +- + arch/arm/boot/dts/tegra30-asus-tf700t.dts | 2 +- + .../boot/dts/tegra30-asus-transformer-common.dtsi | 2 + + arch/arm/boot/dts/tegra30-colibri.dtsi | 2 +- + arch/arm/boot/dts/tegra30-ouya.dts | 2 +- + arch/arm/boot/dts/tegra30-pegatron-chagall.dts | 2 + + arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 2 +- + arch/arm/common/Kconfig | 2 +- + arch/arm/common/sa1111.c | 64 - + arch/arm/configs/imxrt_defconfig | 35 + + arch/arm/configs/multi_v7_defconfig | 62 +- + arch/arm/configs/pxa_defconfig | 3 - + arch/arm/configs/sama7_defconfig | 29 +- + arch/arm/configs/shmobile_defconfig | 4 + + arch/arm/mach-airoha/Makefile | 2 + + arch/arm/mach-airoha/airoha.c | 16 + + arch/arm/mach-at91/Kconfig | 1 + + arch/arm/mach-at91/pm.c | 27 +- + arch/arm/mach-at91/pm_suspend.S | 4 +- + arch/arm/mach-dove/irq.c | 6 +- + arch/arm/mach-exynos/firmware.c | 4 +- + arch/arm/mach-imx/Kconfig | 7 + + arch/arm/mach-imx/Makefile | 2 + + arch/arm/mach-imx/mach-imxrt.c | 19 + + arch/arm/mach-ixp4xx/Kconfig | 57 - + arch/arm/mach-ixp4xx/Makefile | 19 +- + arch/arm/mach-ixp4xx/common-pci.c | 451 ----- + arch/arm/mach-ixp4xx/common.c | 448 ----- + arch/arm/mach-ixp4xx/gateway7001-pci.c | 61 - + arch/arm/mach-ixp4xx/gateway7001-setup.c | 113 -- + arch/arm/mach-ixp4xx/goramo_mlr.c | 532 ------ + arch/arm/mach-ixp4xx/include/mach/hardware.h | 32 - + arch/arm/mach-ixp4xx/include/mach/io.h | 545 ------ + arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h | 303 ---- + arch/arm/mach-ixp4xx/include/mach/platform.h | 102 -- + arch/arm/mach-ixp4xx/include/mach/udc.h | 8 - + arch/arm/mach-ixp4xx/include/mach/uncompress.h | 4 +- + arch/arm/mach-ixp4xx/irqs.h | 64 - + arch/arm/mach-mmp/sram.c | 22 +- + arch/arm/mach-mstar/Kconfig | 1 + + arch/arm/mach-mv78xx0/irq.c | 3 +- + arch/arm/mach-orion5x/irq.c | 2 +- + arch/arm/mach-pxa/Kconfig | 10 - + arch/arm/mach-pxa/Makefile | 2 - + arch/arm/mach-pxa/include/mach/uncompress.h | 5 +- + arch/arm/mach-pxa/stargate2.c | 1030 ----------- + arch/arm/mach-qcom/platsmp.c | 3 +- + arch/arm/plat-orion/gpio.c | 8 +- + arch/arm/plat-orion/include/plat/orion-gpio.h | 3 +- + arch/arm64/Kconfig.platforms | 6 + + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 23 +- + .../boot/dts/altera/socfpga_stratix10_socdk.dts | 3 +- + .../dts/altera/socfpga_stratix10_socdk_nand.dts | 3 +- + arch/arm64/boot/dts/amlogic/Makefile | 7 + + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 43 + + .../dts/amlogic/meson-gxl-s905d-vero4k-plus.dts | 117 ++ + .../boot/dts/amlogic/meson-s4-s805x2-aq222.dts | 30 + + arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 99 ++ + .../boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts | 129 ++ + .../boot/dts/amlogic/meson-sm1-a95xf3-air.dts | 108 ++ + arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi | 300 ++++ + arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts | 145 ++ + .../boot/dts/amlogic/meson-sm1-x96-air-gbit.dts | 133 ++ + arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts | 112 ++ + arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 27 + + arch/arm64/boot/dts/arm/Makefile | 2 +- + arch/arm64/boot/dts/arm/juno-r1-scmi.dts | 23 + + arch/arm64/boot/dts/arm/juno-r2-scmi.dts | 23 + + arch/arm64/boot/dts/arm/juno-scmi.dts | 9 + + arch/arm64/boot/dts/arm/juno-scmi.dtsi | 199 +++ + arch/arm64/boot/dts/exynos/Makefile | 8 +- + arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 211 +-- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 276 +-- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 7 +- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 11 +- + arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 176 +- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 44 +- + .../boot/dts/exynos/exynos7885-jackpotlte.dts | 92 + + arch/arm64/boot/dts/exynos/exynos7885-pinctrl.dtsi | 855 +++++++++ + arch/arm64/boot/dts/exynos/exynos7885.dtsi | 423 +++++ + arch/arm64/boot/dts/exynos/exynos850-e850-96.dts | 195 +++ + arch/arm64/boot/dts/exynos/exynos850-pinctrl.dtsi | 663 +++++++ + arch/arm64/boot/dts/exynos/exynos850.dtsi | 701 ++++++++ + .../boot/dts/exynos/exynosautov9-pinctrl.dtsi | 50 +- + arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 2 +- + arch/arm64/boot/dts/freescale/Makefile | 55 +- + .../boot/dts/freescale/fsl-ls1028a-qds-13bb.dts | 146 +- + .../boot/dts/freescale/fsl-ls1028a-qds-65bb.dts | 138 +- + .../boot/dts/freescale/fsl-ls1028a-qds-7777.dts | 99 +- + .../boot/dts/freescale/fsl-ls1028a-qds-85bb.dts | 134 +- + .../boot/dts/freescale/fsl-ls1028a-qds-899b.dts | 86 +- + .../boot/dts/freescale/fsl-ls1028a-qds-9999.dts | 97 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 24 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 11 + + arch/arm64/boot/dts/freescale/imx8-ss-lsio.dtsi | 16 + + .../dts/freescale/imx8mm-beacon-baseboard.dtsi | 57 + + .../boot/dts/freescale/imx8mm-emcon-avari.dts | 23 + + .../boot/dts/freescale/imx8mm-emcon-avari.dtsi | 139 ++ + arch/arm64/boot/dts/freescale/imx8mm-emcon.dtsi | 627 +++++++ + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 55 + + arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h | 7 +- + arch/arm64/boot/dts/freescale/imx8mm-prt8mm.dts | 304 ++++ + .../boot/dts/freescale/imx8mm-tqma8mqml-mba8mx.dts | 19 + + .../arm64/boot/dts/freescale/imx8mm-tqma8mqml.dtsi | 5 + + .../boot/dts/freescale/imx8mm-venice-gw71xx.dtsi | 49 + + .../freescale/imx8mm-venice-gw72xx-0x-imx219.dts | 93 + + .../imx8mm-venice-gw72xx-0x-rs232-rts.dts | 53 + + .../freescale/imx8mm-venice-gw72xx-0x-rs422.dts | 61 + + .../freescale/imx8mm-venice-gw72xx-0x-rs485.dts | 61 + + .../boot/dts/freescale/imx8mm-venice-gw72xx.dtsi | 78 + + .../freescale/imx8mm-venice-gw73xx-0x-imx219.dts | 93 + + .../imx8mm-venice-gw73xx-0x-rs232-rts.dts | 53 + + .../freescale/imx8mm-venice-gw73xx-0x-rs422.dts | 61 + + .../freescale/imx8mm-venice-gw73xx-0x-rs485.dts | 61 + + .../boot/dts/freescale/imx8mm-venice-gw73xx.dtsi | 78 + + .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 59 + + .../boot/dts/freescale/imx8mm-venice-gw7902.dts | 89 +- + .../boot/dts/freescale/imx8mm-venice-gw7903.dts | 836 +++++++++ + .../boot/dts/freescale/imx8mm-verdin-dahlia.dtsi | 150 ++ + .../boot/dts/freescale/imx8mm-verdin-dev.dtsi | 67 + + .../dts/freescale/imx8mm-verdin-nonwifi-dahlia.dts | 18 + + .../dts/freescale/imx8mm-verdin-nonwifi-dev.dts | 18 + + .../boot/dts/freescale/imx8mm-verdin-nonwifi.dtsi | 75 + + .../dts/freescale/imx8mm-verdin-wifi-dahlia.dts | 18 + + .../boot/dts/freescale/imx8mm-verdin-wifi-dev.dts | 18 + + .../boot/dts/freescale/imx8mm-verdin-wifi.dtsi | 94 + + arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 1264 ++++++++++++++ + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 68 +- + .../boot/dts/freescale/imx8mn-venice-gw7902.dts | 51 +- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 104 ++ + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 50 + + .../boot/dts/freescale/imx8mp-phycore-som.dtsi | 39 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 1 + + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 39 + + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 1 + + .../boot/dts/freescale/imx8mq-mnt-reform2.dts | 144 +- + arch/arm64/boot/dts/freescale/imx8mq-tqma8mq.dtsi | 4 - + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 64 +- + arch/arm64/boot/dts/freescale/imx8qm-ss-conn.dtsi | 4 + + arch/arm64/boot/dts/freescale/imx8qm-ss-lsio.dtsi | 8 + + arch/arm64/boot/dts/freescale/imx8qm.dtsi | 18 +- + arch/arm64/boot/dts/freescale/imx8qxp-ss-adma.dtsi | 8 +- + arch/arm64/boot/dts/freescale/imx8qxp-ss-lsio.dtsi | 8 + + arch/arm64/boot/dts/freescale/mba8mx.dtsi | 6 + + arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 4 +- + arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts | 7 +- + .../boot/dts/intel/socfpga_agilex_socdk_nand.dts | 1 + + arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts | 1 + + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 1 + + arch/arm64/boot/dts/mediatek/mt6358.dtsi | 12 + + arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 3 +- + arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 68 +- + arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 3 +- + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 12 + + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 299 +++- + arch/arm64/boot/dts/nvidia/Makefile | 11 + + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 46 +- + .../arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi | 25 + + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 54 +- + .../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 1824 ++++++++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 1010 +++++++++++ + arch/arm64/boot/dts/qcom/Makefile | 12 +- + arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 12 +- + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 13 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 35 +- + .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 23 + + arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 6 +- + arch/arm64/boot/dts/qcom/msm8953.dtsi | 1326 ++++++++++++++ + .../boot/dts/qcom/msm8992-lg-bullhead-rev-10.dts | 14 + + .../boot/dts/qcom/msm8992-lg-bullhead-rev-101.dts | 14 + + ...llhead-rev-101.dts => msm8992-lg-bullhead.dtsi} | 2 - + ...v-101.dts => msm8994-huawei-angler-rev-101.dts} | 0 + arch/arm64/boot/dts/qcom/msm8994.dtsi | 7 +- + arch/arm64/boot/dts/qcom/msm8996-mtp.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 34 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 56 +- + arch/arm64/boot/dts/qcom/pm6150l.dtsi | 10 + + arch/arm64/boot/dts/qcom/pm8953.dtsi | 90 + + arch/arm64/boot/dts/qcom/pms405.dtsi | 4 +- + arch/arm64/boot/dts/qcom/qcs404.dtsi | 4 +- + .../arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 16 + + .../boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 16 + + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 126 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 2 + + arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 97 ++ + arch/arm64/boot/dts/qcom/sc7280-crd.dts | 12 + + .../dts/qcom/sc7280-herobrine-herobrine-r0.dts | 1352 +++++++++++++++ + .../dts/qcom/sc7280-herobrine-herobrine-r1.dts | 313 ++++ + arch/arm64/boot/dts/qcom/sc7280-herobrine.dts | 14 - + arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 1105 +++--------- + arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dts | 20 + + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 215 +-- + arch/arm64/boot/dts/qcom/sc7280-idp2.dts | 4 + + arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 547 ++++++ + arch/arm64/boot/dts/qcom/sc7280.dtsi | 815 ++++++++- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts | 183 ++ + arch/arm64/boot/dts/qcom/sdm632.dtsi | 81 + + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 7 +- + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 19 +- + .../boot/dts/qcom/sdm845-oneplus-enchilada.dts | 12 + + arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts | 12 + + arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 736 ++++++++ + arch/arm64/boot/dts/qcom/sdm845.dtsi | 115 +- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 33 +- + arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 748 ++++++++ + arch/arm64/boot/dts/qcom/sm6125.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 9 + + .../boot/dts/qcom/sm8150-microsoft-surface-duo.dts | 20 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 154 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 132 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 20 +- + arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 405 +++++ + arch/arm64/boot/dts/qcom/sm8450-qrd.dts | 20 + + arch/arm64/boot/dts/qcom/sm8450.dtsi | 417 ++++- + arch/arm64/boot/dts/renesas/Makefile | 3 + + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 9 +- + .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 3 +- + arch/arm64/boot/dts/renesas/gmsl-cameras.dtsi | 332 ++++ + arch/arm64/boot/dts/renesas/hihope-common.dtsi | 2 +- + .../boot/dts/renesas/hihope-rzg2-ex-lvds.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 14 +- + .../boot/dts/renesas/r8a774b1-beacon-rzg2n-kit.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 4 +- + .../boot/dts/renesas/r8a774c0-ek874-idk-2121wr.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 10 +- + .../boot/dts/renesas/r8a774e1-beacon-rzg2h-kit.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 26 +- + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 26 +- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 43 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 26 +- + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 102 ++ + arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 191 ++ + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 24 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 24 +- + .../boot/dts/renesas/r8a779a0-falcon-csi-dsi.dtsi | 229 +++ + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 35 +- + .../boot/dts/renesas/r8a779f0-spider-cpu.dtsi | 28 + + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 86 + + arch/arm64/boot/dts/renesas/r9a07g044c1.dtsi | 32 + + arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts | 91 + + arch/arm64/boot/dts/renesas/r9a07g044c2.dtsi | 20 + + arch/arm64/boot/dts/renesas/r9a07g044l2-smarc.dts | 2 + + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 491 ++++++ + arch/arm64/boot/dts/renesas/r9a07g054l1.dtsi | 25 + + arch/arm64/boot/dts/renesas/r9a07g054l2-smarc.dts | 26 + + arch/arm64/boot/dts/renesas/r9a07g054l2.dtsi | 13 + + arch/arm64/boot/dts/renesas/rz-smarc-common.dtsi | 207 +++ + .../boot/dts/renesas/rzg2l-smarc-pinfunction.dtsi | 137 ++ + arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi | 2 +- + arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 322 +--- + .../boot/dts/renesas/rzg2lc-smarc-pinfunction.dtsi | 94 + + arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi | 222 +++ + arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi | 77 + + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 141 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 20 +- + arch/arm64/boot/dts/rockchip/Makefile | 3 + + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 7 +- + .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 2 +- + .../boot/dts/rockchip/rk3399-khadas-edge.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 2 +- + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 11 + + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 2 +- + .../boot/dts/rockchip/rk3566-pinenote-v1.1.dts | 18 + + .../boot/dts/rockchip/rk3566-pinenote-v1.2.dts | 18 + + arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi | 639 +++++++ + arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 136 ++ + arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 457 +++++ + arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 205 ++- + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 210 +++ + arch/arm64/boot/dts/tesla/Makefile | 3 + + arch/arm64/boot/dts/tesla/fsd-evb.dts | 39 + + arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi | 335 ++++ + arch/arm64/boot/dts/tesla/fsd.dtsi | 731 ++++++++ + arch/arm64/boot/dts/ti/Makefile | 2 + + arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 267 +++ + arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi | 36 + + arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi | 41 + + arch/arm64/boot/dts/ti/k3-am62.dtsi | 105 ++ + arch/arm64/boot/dts/ti/k3-am625-sk.dts | 206 +++ + arch/arm64/boot/dts/ti/k3-am625.dtsi | 103 ++ + arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 23 +- + arch/arm64/boot/dts/ti/k3-am64.dtsi | 4 + + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 4 +- + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 4 +- + arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 2 - + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 5 +- + arch/arm64/boot/dts/ti/k3-am65.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 8 +- + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 5 +- + arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-j7200.dtsi | 1 + + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 4 +- + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 5 +- + arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 2 - + arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-j721e.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 5 +- + arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-j721s2.dtsi | 1 + + arch/arm64/configs/defconfig | 147 +- + drivers/bus/imx-weim.c | 135 +- + drivers/char/hw_random/optee-rng.c | 6 +- + drivers/clk/clk-scmi.c | 71 +- + drivers/clk/samsung/Kconfig | 9 + + drivers/clk/samsung/Makefile | 1 + + drivers/clk/samsung/clk-fsd.c | 1803 +++++++++++++++++++ + drivers/clk/samsung/clk-pll.c | 1 + + drivers/clk/samsung/clk-pll.h | 1 + + drivers/cpuidle/cpuidle-qcom-spm.c | 28 +- + drivers/crypto/ixp4xx_crypto.c | 1 - + drivers/firmware/arm_scmi/Kconfig | 56 + + drivers/firmware/arm_scmi/Makefile | 8 + + drivers/firmware/arm_scmi/clock.c | 34 +- + drivers/firmware/arm_scmi/common.h | 26 +- + drivers/firmware/arm_scmi/driver.c | 234 ++- + drivers/firmware/arm_scmi/mailbox.c | 3 +- + drivers/firmware/arm_scmi/optee.c | 567 ++++++ + drivers/firmware/arm_scmi/smc.c | 98 +- + drivers/firmware/arm_scmi/virtio.c | 613 +++++-- + drivers/firmware/imx/rm.c | 45 + + drivers/firmware/imx/scu-pd.c | 4 + + drivers/firmware/qcom_scm.c | 215 +-- + drivers/firmware/qcom_scm.h | 7 + + drivers/firmware/ti_sci.c | 2 +- + drivers/memory/brcmstb_dpfe.c | 2 +- + drivers/memory/fsl_ifc.c | 9 + + drivers/memory/mtk-smi.c | 57 +- + drivers/memory/of_memory.c | 29 +- + drivers/memory/tegra/Kconfig | 1 + + drivers/memory/tegra/tegra20-emc.c | 2 +- + drivers/memory/tegra/tegra210-emc-core.c | 2 +- + drivers/memory/tegra/tegra30-emc.c | 131 +- + drivers/net/ethernet/xscale/Kconfig | 4 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 85 +- + drivers/net/ethernet/xscale/ptp_ixp46x.c | 1 - + drivers/net/wan/Kconfig | 3 +- + drivers/net/wan/ixp4xx_hss.c | 39 +- + drivers/pcmcia/Kconfig | 2 +- + drivers/pcmcia/Makefile | 1 - + drivers/pcmcia/pxa2xx_stargate2.c | 137 -- + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 2 - + drivers/pinctrl/samsung/pinctrl-exynos.c | 4 + + drivers/pinctrl/samsung/pinctrl-samsung.c | 87 +- + drivers/remoteproc/qcom_q6v5_mss.c | 7 +- + drivers/remoteproc/qcom_q6v5_pas.c | 36 +- + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/imx/imx8m-blk-ctrl.c | 66 + + drivers/soc/imx/soc-imx.c | 3 - + drivers/soc/ixp4xx/Kconfig | 1 + + drivers/soc/ixp4xx/ixp4xx-npe.c | 33 +- + drivers/soc/mediatek/mt8167-pm-domains.h | 16 +- + drivers/soc/mediatek/mt8173-pm-domains.h | 22 +- + drivers/soc/mediatek/mt8183-pm-domains.h | 32 +- + drivers/soc/mediatek/mt8186-mmsys.h | 113 ++ + drivers/soc/mediatek/mt8186-pm-domains.h | 344 ++++ + drivers/soc/mediatek/mt8192-pm-domains.h | 44 +- + drivers/soc/mediatek/mt8195-pm-domains.h | 613 +++++++ + drivers/soc/mediatek/mtk-infracfg.c | 19 + + drivers/soc/mediatek/mtk-mmsys.c | 11 + + drivers/soc/mediatek/mtk-mutex.c | 45 + + drivers/soc/mediatek/mtk-pm-domains.c | 17 +- + drivers/soc/mediatek/mtk-pm-domains.h | 8 +- + drivers/soc/mediatek/mtk-pmic-wrap.c | 71 + + drivers/soc/microchip/Kconfig | 10 + + drivers/soc/microchip/Makefile | 1 + + drivers/soc/microchip/mpfs-sys-controller.c | 193 +++ + drivers/soc/qcom/apr.c | 1 - + drivers/soc/qcom/llcc-qcom.c | 107 +- + drivers/soc/qcom/mdt_loader.c | 232 ++- + drivers/soc/qcom/ocmem.c | 1 + + drivers/soc/qcom/qcom_aoss.c | 8 +- + drivers/soc/qcom/rpmpd.c | 20 + + drivers/soc/qcom/socinfo.c | 12 + + drivers/soc/renesas/Kconfig | 12 + + drivers/soc/renesas/renesas-soc.c | 68 +- + drivers/soc/tegra/fuse/fuse-tegra.c | 24 +- + drivers/soc/tegra/pmc.c | 16 +- + drivers/soc/ti/k3-ringacc.c | 15 +- + drivers/soc/ti/k3-socinfo.c | 1 + + drivers/soc/ti/smartreflex.c | 13 +- + drivers/soc/ti/wkup_m3_ipc.c | 4 +- + drivers/tee/amdtee/call.c | 2 +- + drivers/tee/amdtee/shm_pool.c | 55 +- + drivers/tee/optee/Kconfig | 8 - + drivers/tee/optee/call.c | 2 +- + drivers/tee/optee/core.c | 21 +- + drivers/tee/optee/device.c | 5 +- + drivers/tee/optee/ffa_abi.c | 63 +- + drivers/tee/optee/optee_private.h | 7 +- + drivers/tee/optee/smc_abi.c | 125 +- + drivers/tee/tee_core.c | 5 +- + drivers/tee/tee_private.h | 15 +- + drivers/tee/tee_shm.c | 320 ++-- + drivers/tee/tee_shm_pool.c | 162 +- + drivers/usb/core/hcd.c | 17 +- + drivers/usb/host/ohci-sa1111.c | 25 + + include/dt-bindings/clock/fsd-clk.h | 150 ++ + include/dt-bindings/clock/r9a06g032-sysctrl.h | 1 + + include/dt-bindings/clock/r9a07g054-cpg.h | 229 +++ + include/dt-bindings/clock/tegra234-clock.h | 135 +- + include/dt-bindings/memory/tegra234-mc.h | 75 + + include/dt-bindings/pinctrl/k3.h | 3 + + include/dt-bindings/power/imx8mp-power.h | 35 + + include/dt-bindings/power/imx8mq-power.h | 3 + + include/dt-bindings/power/mt8186-power.h | 32 + + include/dt-bindings/power/mt8195-power.h | 46 + + include/dt-bindings/power/qcom-rpmpd.h | 5 + + include/dt-bindings/power/tegra234-powergate.h | 22 + + include/dt-bindings/reset/tegra234-reset.h | 45 +- + include/linux/clk/at91_pmc.h | 4 + + include/linux/firmware/imx/svc/rm.h | 5 + + include/linux/platform_data/eth_ixp4xx.h | 21 - + include/linux/platform_data/wan_ixp4xx_hss.h | 17 - + include/linux/qcom_scm.h | 16 +- + include/linux/scmi_protocol.h | 15 + + include/linux/soc/ixp4xx/cpu.h | 26 +- + include/linux/soc/ixp4xx/npe.h | 2 + + include/linux/soc/mediatek/infracfg.h | 133 ++ + include/linux/soc/qcom/llcc-qcom.h | 9 +- + include/linux/soc/qcom/mdt_loader.h | 17 +- + include/linux/soc/ti/ti_sci_protocol.h | 2 +- + include/linux/tee_drv.h | 138 +- + include/soc/at91/sama7-ddr.h | 15 +- + include/soc/microchip/mpfs.h | 4 +- + include/soc/tegra/bpmp-abi.h | 2 +- + include/trace/events/scmi.h | 28 + + kernel/dma/mapping.c | 2 - + security/keys/trusted-keys/trusted_tee.c | 23 +- + sound/soc/pxa/Kconfig | 9 - + sound/soc/pxa/Makefile | 2 - + sound/soc/pxa/imote2.c | 99 -- + 735 files changed, 48403 insertions(+), 11210 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/airoha.yaml + create mode 100644 Documentation/devicetree/bindings/arm/intel,socfpga.yaml + create mode 100644 Documentation/devicetree/bindings/arm/npcm/nuvoton,gcr.yaml + create mode 100644 Documentation/devicetree/bindings/arm/tesla.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/intc_stratix10.txt + create mode 100644 Documentation/devicetree/bindings/clock/intel,stratix10.yaml + create mode 100644 Documentation/devicetree/bindings/clock/mstar,msc313-cpupll.yaml + create mode 100644 Documentation/devicetree/bindings/clock/tesla,fsd-clock.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr2-timings.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr3-timings.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr3.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/lpddr2-timings.txt + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/lpddr3-timings.txt + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/lpddr3.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/fsl,ifc.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/samsung,pinctrl-gpio-bank.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/samsung,pinctrl-pins-cfg.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/samsung,pinctrl-wakeup-interrupt.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/samsung,pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/soc/imx/fsl,imx8mp-hsio-blk-ctrl.yaml + create mode 100644 Documentation/devicetree/bindings/soc/imx/fsl,imx8mq-vpu-blk-ctrl.yaml + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am335x-sancloud-bbe-extended-wifi.dts + create mode 100644 arch/arm/boot/dts/armada-370-c200-v2.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-asrock-romed8hm3.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-quanta-s6q.dts + create mode 100644 arch/arm/boot/dts/en7523-evb.dts + create mode 100644 arch/arm/boot/dts/en7523.dtsi + create mode 100644 arch/arm/boot/dts/exynos5420-chagall-wifi.dts + create mode 100644 arch/arm/boot/dts/exynos5420-galaxy-tab-common.dtsi + create mode 100644 arch/arm/boot/dts/exynos5420-klimt-wifi.dts + create mode 100644 arch/arm/boot/dts/imxrt1050-pinfunc.h + rename arch/arm/boot/dts/{intel-ixp42x-netgear-wg302v2.dts => intel-ixp42x-netgear-wg302v1.dts} (77%) + create mode 100644 arch/arm/boot/dts/kirkwood-c200-v1.dts + create mode 100644 arch/arm/boot/dts/lan966x-pcb8291.dts + create mode 100644 arch/arm/boot/dts/lan966x.dtsi + create mode 100644 arch/arm/boot/dts/mstar-infinity2m-ssd201-som2d01.dtsi + create mode 100644 arch/arm/boot/dts/mstar-infinity2m-ssd202d-100ask-dongshanpione.dts + create mode 100644 arch/arm/boot/dts/mstar-infinity2m-ssd202d-miyoo-mini.dts + create mode 100644 arch/arm/boot/dts/mstar-infinity2m-ssd202d-wirelesstag-ido-sbc2d06-v1b-22w.dts + create mode 100644 arch/arm/boot/dts/mstar-infinity2m-ssd202d-wirelesstag-ido-som2d01.dtsi + create mode 100644 arch/arm/boot/dts/mt6582-prestigio-pmt5008-3g.dts + create mode 100644 arch/arm/boot/dts/mt6582.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp157c-emsbc-argon.dts + create mode 100644 arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi + create mode 100644 arch/arm/boot/dts/sun7i-a20-haoyu-marsboard.dts + create mode 100644 arch/arm/configs/imxrt_defconfig + create mode 100644 arch/arm/mach-airoha/Makefile + create mode 100644 arch/arm/mach-airoha/airoha.c + create mode 100644 arch/arm/mach-imx/mach-imxrt.c + delete mode 100644 arch/arm/mach-ixp4xx/common-pci.c + delete mode 100644 arch/arm/mach-ixp4xx/common.c + delete mode 100644 arch/arm/mach-ixp4xx/gateway7001-pci.c + delete mode 100644 arch/arm/mach-ixp4xx/gateway7001-setup.c + delete mode 100644 arch/arm/mach-ixp4xx/goramo_mlr.c + delete mode 100644 arch/arm/mach-ixp4xx/include/mach/hardware.h + delete mode 100644 arch/arm/mach-ixp4xx/include/mach/io.h + delete mode 100644 arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h + delete mode 100644 arch/arm/mach-ixp4xx/include/mach/platform.h + delete mode 100644 arch/arm/mach-ixp4xx/include/mach/udc.h + delete mode 100644 arch/arm/mach-ixp4xx/irqs.h + delete mode 100644 arch/arm/mach-pxa/stargate2.c + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-s4.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts + create mode 100644 arch/arm64/boot/dts/arm/juno-r1-scmi.dts + create mode 100644 arch/arm64/boot/dts/arm/juno-r2-scmi.dts + create mode 100644 arch/arm64/boot/dts/arm/juno-scmi.dts + create mode 100644 arch/arm64/boot/dts/arm/juno-scmi.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos7885-jackpotlte.dts + create mode 100644 arch/arm64/boot/dts/exynos/exynos7885-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos7885.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos850-e850-96.dts + create mode 100644 arch/arm64/boot/dts/exynos/exynos850-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos850.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-emcon-avari.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-emcon-avari.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-emcon.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-prt8mm.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx-0x-imx219.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx-0x-rs232-rts.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx-0x-rs422.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx-0x-rs485.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-imx219.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs422.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs485.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw7903.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-verdin-dahlia.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-verdin-dev.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-verdin-nonwifi-dahlia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-verdin-nonwifi-dev.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-verdin-nonwifi.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-verdin-wifi-dahlia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-verdin-wifi-dev.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-verdin-wifi.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8953.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8992-lg-bullhead-rev-10.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8992-lg-bullhead-rev-101.dts + rename arch/arm64/boot/dts/qcom/{msm8992-bullhead-rev-101.dts => msm8992-lg-bullhead.dtsi} (98%) + rename arch/arm64/boot/dts/qcom/{msm8994-angler-rev-101.dts => msm8994-huawei-angler-rev-101.dts} (100%) + create mode 100644 arch/arm64/boot/dts/qcom/pm8953.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm632.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8450-hdk.dts + create mode 100644 arch/arm64/boot/dts/renesas/gmsl-cameras.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044c1.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044c2.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g054.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g054l1.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g054l2-smarc.dts + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g054l2.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rz-smarc-common.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg2l-smarc-pinfunction.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg2lc-smarc-pinfunction.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-pinenote-v1.1.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-pinenote-v1.2.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts + create mode 100644 arch/arm64/boot/dts/tesla/Makefile + create mode 100644 arch/arm64/boot/dts/tesla/fsd-evb.dts + create mode 100644 arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/tesla/fsd.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am62-main.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am62.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am625-sk.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am625.dtsi + create mode 100644 drivers/clk/samsung/clk-fsd.c + create mode 100644 drivers/firmware/arm_scmi/optee.c + delete mode 100644 drivers/pcmcia/pxa2xx_stargate2.c + create mode 100644 drivers/soc/mediatek/mt8186-mmsys.h + create mode 100644 drivers/soc/mediatek/mt8186-pm-domains.h + create mode 100644 drivers/soc/mediatek/mt8195-pm-domains.h + create mode 100644 drivers/soc/microchip/Kconfig + create mode 100644 drivers/soc/microchip/Makefile + create mode 100644 drivers/soc/microchip/mpfs-sys-controller.c + create mode 100644 include/dt-bindings/clock/fsd-clk.h + create mode 100644 include/dt-bindings/clock/r9a07g054-cpg.h + create mode 100644 include/dt-bindings/power/imx8mp-power.h + create mode 100644 include/dt-bindings/power/mt8186-power.h + create mode 100644 include/dt-bindings/power/mt8195-power.h + create mode 100644 include/dt-bindings/power/tegra234-powergate.h + delete mode 100644 include/linux/platform_data/eth_ixp4xx.h + delete mode 100644 include/linux/platform_data/wan_ixp4xx_hss.h + delete mode 100644 sound/soc/pxa/imote2.c +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 (39369380e729 Merge branch 'v5.18/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 +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'ort' strategy. +Merging aspeed/for-next (d9540eeaa3d1 Merge branches 'nuvoton-dt-for-v5.18' and 'dt-for-v5.18' into for-next) +$ 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 | 18 ++++++++++++++++++ + arch/arm/boot/dts/aspeed-g4.dtsi | 6 ++++++ + arch/arm/boot/dts/aspeed-g5.dtsi | 7 +++++++ + arch/arm/boot/dts/aspeed-g6.dtsi | 19 +++++++++++++++++++ + 4 files changed, 50 insertions(+) +Merging at91/at91-next (f4de6d853a03 Merge branch 'at91-soc' 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 +Merge made by the 'ort' strategy. +Merging drivers-memory/for-next (c27983bbc75b Merge branch 'mem-ctrl-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Auto-merging drivers/memory/mtk-smi.c +Merge made by the 'ort' strategy. +Merging imx-mxs/for-next (45550ada88f0 Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Merge made by the 'ort' strategy. +Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git keystone/next +Merge made by the 'ort' strategy. +Merging mediatek/for-next (6ceb6a96db4e Merge branch 'v5.17-fixes' 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 +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. + drivers/soc/mediatek/mt8183-mmsys.h | 2 ++ + drivers/soc/mediatek/mt8186-mmsys.h | 2 ++ + drivers/soc/mediatek/mtk-mmsys.c | 7 +++++-- + drivers/soc/mediatek/mtk-mmsys.h | 3 +-- + 4 files changed, 10 insertions(+), 4 deletions(-) +Merging mvebu/for-next (89756932b780 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Merge made by the 'ort' strategy. +Merging omap/for-next (f9ecc209330a Merge branch 'omap-for-v5.18/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. +Merging qcom/for-next (22139a9091fd Merge branches 'arm64-defconfig-for-5.18', 'arm64-for-5.18', 'clk-for-5.18', 'defconfig-for-5.18', 'drivers-for-5.18', 'dts-for-5.18', 'arm64-fixes-for-5.17' and 'dts-fixes-for-5.17' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging arch/arm/configs/multi_v7_defconfig +CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +Auto-merging arch/arm64/boot/dts/qcom/sm8350.dtsi +Auto-merging arch/arm64/boot/dts/qcom/sm8450.dtsi +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Resolved 'arch/arm64/configs/defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5d05d62a54a7] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/clock/qcom,camcc.txt | 18 - + .../devicetree/bindings/clock/qcom,mmcc.yaml | 1 + + .../bindings/clock/qcom,qcm2290-dispcc.yaml | 87 ++ + .../bindings/clock/qcom,sdm845-camcc.yaml | 65 ++ + arch/arm64/configs/defconfig | 10 + + drivers/clk/qcom/Kconfig | 9 + + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/camcc-sc7180.c | 221 +++-- + drivers/clk/qcom/camcc-sdm845.c | 323 +++---- + drivers/clk/qcom/dispcc-qcm2290.c | 555 ++++++++++++ + drivers/clk/qcom/gcc-ipq8074.c | 21 +- + drivers/clk/qcom/gcc-msm8996.c | 971 +++++++++++++-------- + drivers/clk/qcom/gpucc-sdm660.c | 21 +- + drivers/clk/qcom/mmcc-msm8974.c | 206 ++++- + drivers/clk/qcom/videocc-sc7180.c | 8 +- + include/dt-bindings/clock/qcom,dispcc-qcm2290.h | 34 + + 16 files changed, 1847 insertions(+), 704 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,camcc.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,qcm2290-dispcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sdm845-camcc.yaml + create mode 100644 drivers/clk/qcom/dispcc-qcm2290.c + create mode 100644 include/dt-bindings/clock/qcom,dispcc-qcm2290.h +Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git raspberrypi/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/bcm2711-rpi-400.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging renesas/next (dff7b84b4d2a Merge branch 'renesas-arm-dt-for-v5.18' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. +Merging reset/reset/next (89e7a6698fdd reset: uniphier-glue: Use devm_add_action_or_reset()) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Auto-merging drivers/reset/reset-rzg2l-usbphy-ctrl.c +Merge made by the 'ort' strategy. + .../bindings/reset/hisilicon,hi3660-reset.yaml | 5 ++ + drivers/reset/reset-rzg2l-usbphy-ctrl.c | 4 +- + drivers/reset/reset-uniphier-glue.c | 75 ++++++++++------------ + 3 files changed, 42 insertions(+), 42 deletions(-) +Merging rockchip/for-next (f03511c4f2b5 Merge branch 'v5.18-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/arm/boot/dts/rk3288.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts +Auto-merging arch/arm64/boot/dts/rockchip/rk356x.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/rockchip/rk356x.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk356x.dtsi +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/rockchip/rk3568.dtsi | 21 ++++++++++++++ + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 47 ++++++++++++++++++++++++++++++++ + drivers/clk/rockchip/clk-rk3568.c | 20 ++++++++------ + drivers/clk/rockchip/clk.c | 3 ++ + 4 files changed, 83 insertions(+), 8 deletions(-) +Merging samsung-krzk/for-next (b2d5c4016a34 Merge branch 'for-v5.18/dt-cleanup' 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 +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/exynos4210-universal_c210.dts +Auto-merging arch/arm/boot/dts/exynos4412-p4note.dtsi +Auto-merging arch/arm/boot/dts/exynos5250-arndale.dts +Auto-merging arch/arm/boot/dts/exynos5250-smdk5250.dts +Auto-merging arch/arm/boot/dts/exynos5250-snow-common.dtsi +Auto-merging arch/arm/boot/dts/exynos5250-spring.dts +Auto-merging arch/arm/boot/dts/exynos5260-xyref5260.dts +Auto-merging arch/arm/boot/dts/exynos5410-odroidxu.dts +Auto-merging arch/arm/boot/dts/exynos5410-smdk5410.dts +Auto-merging arch/arm/boot/dts/exynos5420-arndale-octa.dts +Auto-merging arch/arm/boot/dts/exynos5420-peach-pit.dts +Auto-merging arch/arm/boot/dts/exynos5420-smdk5420.dts +Auto-merging arch/arm/boot/dts/exynos5422-odroid-core.dtsi +Auto-merging arch/arm/boot/dts/exynos5800-peach-pi.dts +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm64/boot/dts/arm/juno-base.dtsi +Auto-merging arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi +Auto-merging arch/arm64/boot/dts/exynos/exynos7-espresso.dts +Merge made by the 'ort' strategy. + arch/arm/configs/exynos_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm64/boot/dts/arm/juno-base.dtsi | 2 +- + arch/arm64/boot/dts/lg/lg1312.dtsi | 3 ++- + arch/arm64/boot/dts/lg/lg1313.dtsi | 3 ++- + arch/arm64/boot/dts/tesla/fsd.dtsi | 23 +++++++++++++++++++++++ + 6 files changed, 30 insertions(+), 3 deletions(-) +Merging scmi/for-linux-next (210b966b7e2f Merge tag 'scmi-updates-5.18' 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 +Auto-merging drivers/firmware/arm_scmi/driver.c +Merge made by the 'ort' strategy. +Merging stm32/stm32-next (74fa56279651 ARM: dts: stm32: Switch DWMAC RMII clock to MCO2 on DHCOM) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 49 ++++++++++++++++++++++++++++ + arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 22 ++++++++++--- + 2 files changed, 67 insertions(+), 4 deletions(-) +Merging sunxi/sunxi/for-next (f25c47c67629 Merge branch 'sunxi/dt-for-5.18' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. +Merging tee/next (3e53bb2bd87b Merge branch 'tee_shm_vmalloc_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/optee/ffa_abi.c +Auto-merging drivers/tee/optee/smc_abi.c +Merge made by the 'ort' strategy. + drivers/tee/optee/call.c | 2 +- + drivers/tee/tee_shm.c | 35 +++++++++++++++++++++++++---------- + 2 files changed, 26 insertions(+), 11 deletions(-) +Merging tegra/for-next (6d746e1eb2f6 Merge branch for-5.18/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. + drivers/memory/tegra/Makefile | 2 + + drivers/memory/tegra/mc.c | 3 ++ + drivers/memory/tegra/mc.h | 7 ++- + drivers/memory/tegra/tegra186-emc.c | 3 ++ + drivers/memory/tegra/tegra234.c | 101 ++++++++++++++++++++++++++++++++++++ + 5 files changed, 115 insertions(+), 1 deletion(-) + create mode 100644 drivers/memory/tegra/tegra234.c +Merging ti/ti-next (183a6f5c6e1e Merge branches 'ti-k3-dts-next' and 'ti-drivers-soc-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Merge made by the 'ort' strategy. +Merging xilinx/for-next (3a14f0e61408 arm64: zynqmp: Rename dma to dma-controller) +$ 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/arm64/boot/dts/xilinx/zynqmp.dtsi | 76 ++++++++++++++-------------------- + 1 file changed, 32 insertions(+), 44 deletions(-) +Merging clk/clk-next (7da5e77a1b5f 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 +Merge made by the 'ort' strategy. + .../bindings/clock/cirrus,cs2000-cp.yaml | 91 ++++ + .../devicetree/bindings/clock/cs2000-cp.txt | 22 - + .../devicetree/bindings/clock/microchip,mpfs.yaml | 58 +++ + .../bindings/clock/renesas,rzg2l-cpg.yaml | 14 +- + drivers/clk/.kunitconfig | 3 + + drivers/clk/Kconfig | 11 + + drivers/clk/Makefile | 1 + + drivers/clk/at91/sama5d2.c | 4 +- + drivers/clk/at91/sama7g5.c | 8 +- + drivers/clk/clk-cs2000-cp.c | 240 +++++++---- + drivers/clk/clk-gate_test.c | 464 +++++++++++++++++++++ + drivers/clk/clk-si5341.c | 24 +- + drivers/clk/clk-stm32mp1.c | 46 +- + drivers/clk/mediatek/clk-apmixed.c | 2 +- + drivers/clk/mediatek/clk-cpumux.c | 69 ++- + drivers/clk/mediatek/clk-cpumux.h | 13 +- + drivers/clk/mediatek/clk-gate.c | 148 ++++++- + drivers/clk/mediatek/clk-gate.h | 59 +-- + drivers/clk/mediatek/clk-mt2701.c | 5 +- + drivers/clk/mediatek/clk-mt2712.c | 3 +- + drivers/clk/mediatek/clk-mt6765.c | 3 +- + drivers/clk/mediatek/clk-mt6779.c | 3 +- + drivers/clk/mediatek/clk-mt6797.c | 3 +- + drivers/clk/mediatek/clk-mt7622.c | 5 +- + drivers/clk/mediatek/clk-mt7629.c | 5 +- + drivers/clk/mediatek/clk-mt7986-apmixed.c | 4 +- + drivers/clk/mediatek/clk-mt8135.c | 3 +- + drivers/clk/mediatek/clk-mt8167.c | 3 +- + drivers/clk/mediatek/clk-mt8173.c | 5 +- + drivers/clk/mediatek/clk-mt8183.c | 3 +- + drivers/clk/mediatek/clk-mt8192.c | 39 +- + drivers/clk/mediatek/clk-mt8195-apmixedsys.c | 30 +- + drivers/clk/mediatek/clk-mt8195-apusys_pll.c | 25 +- + drivers/clk/mediatek/clk-mt8195-cam.c | 1 + + drivers/clk/mediatek/clk-mt8195-ccu.c | 1 + + drivers/clk/mediatek/clk-mt8195-img.c | 1 + + drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c | 1 + + drivers/clk/mediatek/clk-mt8195-infra_ao.c | 1 + + drivers/clk/mediatek/clk-mt8195-ipe.c | 1 + + drivers/clk/mediatek/clk-mt8195-mfg.c | 1 + + drivers/clk/mediatek/clk-mt8195-peri_ao.c | 1 + + drivers/clk/mediatek/clk-mt8195-scp_adsp.c | 1 + + drivers/clk/mediatek/clk-mt8195-topckgen.c | 69 ++- + drivers/clk/mediatek/clk-mt8195-vdec.c | 1 + + drivers/clk/mediatek/clk-mt8195-vdo0.c | 20 +- + drivers/clk/mediatek/clk-mt8195-vdo1.c | 20 +- + drivers/clk/mediatek/clk-mt8195-venc.c | 1 + + drivers/clk/mediatek/clk-mt8195-vpp0.c | 1 + + drivers/clk/mediatek/clk-mt8195-vpp1.c | 1 + + drivers/clk/mediatek/clk-mt8195-wpe.c | 1 + + drivers/clk/mediatek/clk-mt8516.c | 3 +- + drivers/clk/mediatek/clk-mtk.c | 304 ++++++++++---- + drivers/clk/mediatek/clk-mtk.h | 105 ++--- + drivers/clk/mediatek/clk-mux.c | 89 +++- + drivers/clk/mediatek/clk-mux.h | 17 +- + drivers/clk/mediatek/clk-pll.c | 100 ++++- + drivers/clk/mediatek/clk-pll.h | 57 +++ + drivers/clk/mediatek/reset.c | 3 +- + drivers/clk/mvebu/armada-37xx-periph.c | 3 +- + drivers/clk/qcom/dispcc-sc7180.c | 5 +- + drivers/clk/qcom/dispcc-sc7280.c | 5 +- + drivers/clk/qcom/dispcc-sm8250.c | 5 +- + drivers/clk/qcom/gdsc.c | 26 +- + drivers/clk/qcom/gdsc.h | 8 +- + drivers/clk/renesas/Kconfig | 7 +- + drivers/clk/renesas/Makefile | 1 + + drivers/clk/renesas/r8a77990-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a77995-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a779f0-cpg-mssr.c | 2 + + drivers/clk/renesas/r9a07g044-cpg.c | 426 ++++++++++--------- + drivers/clk/renesas/rzg2l-cpg.c | 6 + + drivers/clk/renesas/rzg2l-cpg.h | 1 + + drivers/clk/zynqmp/clk-gate-zynqmp.c | 12 +- + drivers/clk/zynqmp/clk-mux-zynqmp.c | 8 +- + drivers/clk/zynqmp/divider.c | 12 +- + drivers/clk/zynqmp/pll.c | 32 +- + include/dt-bindings/clock/at91.h | 2 + + include/dt-bindings/clock/cirrus,cs2000-cp.h | 14 + + include/dt-bindings/clock/microchip,mpfs-clock.h | 45 ++ + 80 files changed, 2176 insertions(+), 664 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/cirrus,cs2000-cp.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/cs2000-cp.txt + create mode 100644 Documentation/devicetree/bindings/clock/microchip,mpfs.yaml + create mode 100644 drivers/clk/.kunitconfig + create mode 100644 drivers/clk/clk-gate_test.c + create mode 100644 drivers/clk/mediatek/clk-pll.h + create mode 100644 include/dt-bindings/clock/cirrus,cs2000-cp.h + create mode 100644 include/dt-bindings/clock/microchip,mpfs-clock.h +Merging clk-imx/for-next (e2049ad63a24 clk: imx: add i.MX93 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. + .../devicetree/bindings/arm/freescale/fsl,scu.txt | 1 + + .../devicetree/bindings/clock/imx93-clock.yaml | 62 ++++ + .../devicetree/bindings/clock/imxrt1050-clock.yaml | 67 ++++ + drivers/clk/imx/Kconfig | 13 + + drivers/clk/imx/Makefile | 8 +- + drivers/clk/imx/clk-composite-93.c | 93 ++++++ + drivers/clk/imx/clk-fracn-gppll.c | 323 +++++++++++++++++++ + drivers/clk/imx/clk-imx7d.c | 1 - + drivers/clk/imx/clk-imx8dxl-rsrc.c | 66 ++++ + drivers/clk/imx/clk-imx8mp.c | 1 + + drivers/clk/imx/clk-imx8qxp-lpcg.c | 2 +- + drivers/clk/imx/clk-imx8qxp.c | 1 + + drivers/clk/imx/clk-imx93.c | 341 +++++++++++++++++++++ + drivers/clk/imx/clk-imxrt1050.c | 168 ++++++++++ + drivers/clk/imx/clk-scu.h | 1 + + drivers/clk/imx/clk.h | 30 ++ + include/dt-bindings/clock/imx93-clock.h | 201 ++++++++++++ + include/dt-bindings/clock/imxrt1050-clock.h | 72 +++++ + 18 files changed, 1448 insertions(+), 3 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/imx93-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/imxrt1050-clock.yaml + create mode 100644 drivers/clk/imx/clk-composite-93.c + create mode 100644 drivers/clk/imx/clk-fracn-gppll.c + create mode 100644 drivers/clk/imx/clk-imx8dxl-rsrc.c + create mode 100644 drivers/clk/imx/clk-imx93.c + create mode 100644 drivers/clk/imx/clk-imxrt1050.c + create mode 100644 include/dt-bindings/clock/imx93-clock.h + create mode 100644 include/dt-bindings/clock/imxrt1050-clock.h +Merging clk-renesas/renesas-clk (73421f2a48e6 clk: renesas: r8a779f0: Add PFC clock) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Merge made by the 'ort' strategy. + drivers/clk/renesas/r8a779f0-cpg-mssr.c | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) +Merging clk-samsung/for-next (45bd8166a1d8 clk: samsung: Add initial Exynos7885 clock driver) +$ 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 (a0793fdad9a1 csky: fix typo of fpu config macro) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging h8300/h8300-next (1ec10274d436 h8300: don't implement set_fs) +$ git merge -m Merge branch 'h8300-next' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git h8300/h8300-next +Auto-merging arch/h8300/Kconfig.cpu +Auto-merging arch/h8300/include/asm/processor.h +Auto-merging arch/h8300/kernel/setup.c +Auto-merging arch/h8300/mm/init.c +CONFLICT (modify/delete): arch/h8300/mm/memory.c deleted in h8300/h8300-next and modified in HEAD. Version HEAD of arch/h8300/mm/memory.c left in tree. +Auto-merging drivers/net/ethernet/smsc/Kconfig +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/tty/serial/sh-sci.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/h8300/mm/memory.c +rm 'arch/h8300/mm/memory.c' +$ git commit --no-edit -v -a +[master dc906d6a35bf] Merge branch 'h8300-next' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/h8300/Kconfig.cpu | 4 ++ + arch/h8300/boot/dts/edosk2674.dts | 10 ++++- + arch/h8300/boot/dts/h8300h_sim.dts | 2 +- + arch/h8300/boot/dts/h8s_sim.dts | 2 +- + arch/h8300/configs/edosk2674_defconfig | 10 ++--- + arch/h8300/configs/h8300h-sim_defconfig | 8 +--- + arch/h8300/configs/h8s-sim_defconfig | 8 +--- + arch/h8300/kernel/setup.c | 2 +- + arch/h8300/lib/memset.S | 17 +++++---- + arch/h8300/mm/Makefile | 2 +- + arch/h8300/mm/memory.c | 52 ------------------------- + drivers/clocksource/h8300_timer8.c | 20 +++++----- + drivers/irqchip/irq-renesas-h8300h.c | 19 +++++++++- + drivers/irqchip/irq-renesas-h8s.c | 67 +++++++++++++++++++++++++-------- + drivers/net/ethernet/smsc/Kconfig | 1 - + drivers/net/ethernet/smsc/smc91x.c | 10 +++++ + drivers/tty/serial/sh-sci.c | 5 +-- + 17 files changed, 124 insertions(+), 115 deletions(-) + delete mode 100644 arch/h8300/mm/memory.c +Merging m68k/for-next (0d52a01a266b m68k: defconfig: Disable fbdev on Sun3/3x) +$ 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/amiga/config.c | 1 + + arch/m68k/apollo/config.c | 1 + + arch/m68k/atari/config.c | 1 + + arch/m68k/bvme6000/config.c | 1 + + arch/m68k/configs/amiga_defconfig | 6 ++---- + arch/m68k/configs/apollo_defconfig | 6 ++---- + arch/m68k/configs/atari_defconfig | 5 +---- + arch/m68k/configs/bvme6000_defconfig | 5 +---- + arch/m68k/configs/hp300_defconfig | 6 ++---- + arch/m68k/configs/mac_defconfig | 5 +---- + arch/m68k/configs/multi_defconfig | 6 ++---- + arch/m68k/configs/mvme147_defconfig | 5 +---- + arch/m68k/configs/mvme16x_defconfig | 5 +---- + arch/m68k/configs/q40_defconfig | 5 +---- + arch/m68k/configs/sun3_defconfig | 8 +------- + arch/m68k/configs/sun3x_defconfig | 8 +------- + arch/m68k/hp300/config.c | 1 + + arch/m68k/include/asm/config.h | 33 +++++++++++++++++++++++++++++++++ + arch/m68k/kernel/setup_mm.c | 23 +---------------------- + arch/m68k/mac/config.c | 1 + + arch/m68k/mm/fault.c | 2 -- + arch/m68k/mvme147/config.c | 1 + + arch/m68k/mvme16x/config.c | 1 + + arch/m68k/q40/config.c | 1 + + 24 files changed, 59 insertions(+), 78 deletions(-) + create mode 100644 arch/m68k/include/asm/config.h +Merging m68knommu/for-next (244e6c2d4e4d m68k: m5441x: remove erroneous clock disable) +$ 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/dragen2.c | 1 + + arch/m68k/68000/screen.h | 2 ++ + arch/m68k/68000/ucsimm.c | 9 ++++----- + arch/m68k/coldfire/m5441x.c | 1 - + 4 files changed, 7 insertions(+), 6 deletions(-) +Merging microblaze/next (fcc619621df5 microblaze/PCI: Remove pci_phys_mem_access_prot() dead code) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Merge made by the 'ort' strategy. + arch/microblaze/include/asm/pci.h | 4 ---- + arch/microblaze/kernel/signal.c | 2 +- + arch/microblaze/pci/pci-common.c | 49 --------------------------------------- + arch/microblaze/pci/xilinx_pci.c | 2 +- + 4 files changed, 2 insertions(+), 55 deletions(-) +Merging mips/mips-next (4a0a1436053b mips: ralink: fix a refcount leak in ill_acc_of_setup()) +$ 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/Kbuild.platforms | 1 - + arch/mips/Kconfig | 68 +++- + arch/mips/Makefile | 1 - + arch/mips/ath25/ar2315.c | 2 +- + arch/mips/ath25/ar5312.c | 2 +- + arch/mips/ath79/early_printk.c | 1 + + arch/mips/ath79/setup.c | 6 + + arch/mips/boot/compressed/Makefile | 1 + + arch/mips/cavium-octeon/octeon-irq.c | 10 +- + arch/mips/configs/jmr3927_defconfig | 50 --- + arch/mips/configs/malta_defconfig | 1 + + arch/mips/include/asm/cpu-features.h | 3 - + arch/mips/include/asm/cpu-type.h | 6 - + arch/mips/include/asm/cpu.h | 6 - + arch/mips/include/asm/futex.h | 1 - + arch/mips/include/asm/isadep.h | 2 +- + .../include/asm/mach-ath25/cpu-feature-overrides.h | 1 - + arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 1 + + .../include/asm/mach-ath79/cpu-feature-overrides.h | 1 - + .../asm/mach-au1x00/cpu-feature-overrides.h | 1 - + .../asm/mach-bcm47xx/cpu-feature-overrides.h | 1 - + .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 1 - + .../asm/mach-cobalt/cpu-feature-overrides.h | 1 - + .../include/asm/mach-dec/cpu-feature-overrides.h | 1 - + .../asm/mach-ingenic/cpu-feature-overrides.h | 1 - + .../include/asm/mach-ip27/cpu-feature-overrides.h | 1 - + .../include/asm/mach-ip30/cpu-feature-overrides.h | 1 - + .../asm/mach-lantiq/falcon/cpu-feature-overrides.h | 1 - + .../asm/mach-loongson2ef/cpu-feature-overrides.h | 1 - + .../asm/mach-loongson64/cpu-feature-overrides.h | 1 - + .../asm/mach-ralink/mt7620/cpu-feature-overrides.h | 1 - + .../asm/mach-ralink/mt7621/cpu-feature-overrides.h | 1 - + .../asm/mach-ralink/rt288x/cpu-feature-overrides.h | 1 - + .../asm/mach-ralink/rt305x/cpu-feature-overrides.h | 1 - + .../asm/mach-ralink/rt3883/cpu-feature-overrides.h | 1 - + .../asm/mach-rc32434/cpu-feature-overrides.h | 1 - + arch/mips/include/asm/mach-tx39xx/ioremap.h | 25 -- + arch/mips/include/asm/mach-tx39xx/mangle-port.h | 24 -- + arch/mips/include/asm/mach-tx39xx/spaces.h | 17 - + arch/mips/include/asm/mipsmtregs.h | 1 - + arch/mips/include/asm/mipsregs.h | 1 - + arch/mips/include/asm/stackframe.h | 6 +- + arch/mips/include/asm/thread_info.h | 2 + + arch/mips/include/asm/txx9/boards.h | 3 - + arch/mips/include/asm/txx9/jmr3927.h | 179 --------- + arch/mips/include/asm/txx9/tx3927.h | 341 ----------------- + arch/mips/include/asm/txx9irq.h | 4 - + arch/mips/include/asm/txx9tmr.h | 4 - + arch/mips/include/asm/vermagic.h | 2 - + arch/mips/include/asm/war.h | 73 ---- + arch/mips/kernel/Makefile | 1 - + arch/mips/kernel/cpu-probe.c | 23 -- + arch/mips/kernel/cpu-r3k-probe.c | 22 -- + arch/mips/kernel/elf.c | 16 +- + arch/mips/kernel/entry.S | 3 +- + arch/mips/kernel/genex.S | 5 +- + arch/mips/kernel/idle.c | 10 - + arch/mips/kernel/irq.c | 3 +- + arch/mips/kernel/irq_txx9.c | 13 - + arch/mips/kernel/proc.c | 2 - + arch/mips/kernel/process.c | 2 +- + arch/mips/kernel/r4k-bugs64.c | 9 +- + arch/mips/kernel/scall32-o32.S | 1 - + arch/mips/kernel/scall64-n64.S | 1 - + arch/mips/kernel/signal.c | 1 - + arch/mips/kernel/signal_n32.c | 1 - + arch/mips/lib/Makefile | 1 - + arch/mips/lib/delay.c | 1 - + arch/mips/lib/r3k_dump_tlb.c | 4 - + arch/mips/lib/uncached.c | 4 +- + arch/mips/loongson2ef/Platform | 3 +- + arch/mips/loongson64/Platform | 24 +- + arch/mips/mm/Makefile | 1 - + arch/mips/mm/c-octeon.c | 1 - + arch/mips/mm/c-r4k.c | 1 - + arch/mips/mm/c-tx39.c | 414 --------------------- + arch/mips/mm/cache.c | 5 - + arch/mips/mm/page.c | 5 +- + arch/mips/mm/tlb-r3k.c | 40 +- + arch/mips/mm/tlbex.c | 1 - + arch/mips/pci/Makefile | 2 - + arch/mips/pci/fixup-jmr3927.c | 79 ---- + arch/mips/pci/ops-tx3927.c | 231 ------------ + arch/mips/pci/pci-ar2315.c | 2 +- + arch/mips/ralink/ill_acc.c | 1 + + arch/mips/sibyte/common/sb_tbprof.c | 6 +- + arch/mips/txx9/Kconfig | 18 - + arch/mips/txx9/Makefile | 6 - + arch/mips/txx9/Platform | 3 - + arch/mips/txx9/generic/Makefile | 1 - + arch/mips/txx9/generic/irq_tx3927.c | 25 -- + arch/mips/txx9/generic/setup.c | 55 --- + arch/mips/txx9/generic/setup_tx3927.c | 136 ------- + arch/mips/txx9/jmr3927/Makefile | 6 - + arch/mips/txx9/jmr3927/irq.c | 128 ------- + arch/mips/txx9/jmr3927/prom.c | 52 --- + arch/mips/txx9/jmr3927/setup.c | 223 ----------- + arch/mips/vdso/Makefile | 3 + + drivers/dma/Kconfig | 2 +- + drivers/watchdog/Kconfig | 2 +- + 100 files changed, 112 insertions(+), 2350 deletions(-) + delete mode 100644 arch/mips/configs/jmr3927_defconfig + delete mode 100644 arch/mips/include/asm/mach-tx39xx/ioremap.h + delete mode 100644 arch/mips/include/asm/mach-tx39xx/mangle-port.h + delete mode 100644 arch/mips/include/asm/mach-tx39xx/spaces.h + delete mode 100644 arch/mips/include/asm/txx9/jmr3927.h + delete mode 100644 arch/mips/include/asm/txx9/tx3927.h + delete mode 100644 arch/mips/include/asm/war.h + delete mode 100644 arch/mips/mm/c-tx39.c + delete mode 100644 arch/mips/pci/fixup-jmr3927.c + delete mode 100644 arch/mips/pci/ops-tx3927.c + delete mode 100644 arch/mips/txx9/generic/irq_tx3927.c + delete mode 100644 arch/mips/txx9/generic/setup_tx3927.c + delete mode 100644 arch/mips/txx9/jmr3927/Makefile + delete mode 100644 arch/mips/txx9/jmr3927/irq.c + delete mode 100644 arch/mips/txx9/jmr3927/prom.c + delete mode 100644 arch/mips/txx9/jmr3927/setup.c +Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git nios2/for-next +Already up to date. +Merging openrisc/for-next (862cf8d5fd98 openrisc/boot: Remove unnecessary initialisation in memcpy().) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Merge made by the 'ort' strategy. + arch/openrisc/lib/memcpy.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging parisc-hd/for-next (d21d3f34cf6e parisc/unaligned: Enhance user-space visible output) +$ 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 +Auto-merging arch/parisc/Kconfig +Auto-merging arch/parisc/include/asm/uaccess.h +Auto-merging arch/parisc/kernel/signal.c +Auto-merging arch/parisc/lib/memcpy.c +CONFLICT (content): Merge conflict in arch/parisc/lib/memcpy.c +Resolved 'arch/parisc/lib/memcpy.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 65ee974aaff7] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git +$ git diff -M --stat --summary HEAD^.. + arch/parisc/Kconfig | 13 +- + arch/parisc/Makefile | 37 +++- + arch/parisc/include/asm/assembly.h | 6 + + arch/parisc/include/asm/cache.h | 11 +- + arch/parisc/include/asm/current.h | 8 +- + arch/parisc/include/asm/elf.h | 15 ++ + arch/parisc/include/asm/mmu.h | 6 +- + arch/parisc/include/asm/mmu_context.h | 16 +- + arch/parisc/include/asm/pgtable.h | 11 +- + arch/parisc/include/asm/processor.h | 2 +- + arch/parisc/include/asm/rt_sigframe.h | 10 +- + arch/parisc/include/asm/special_insns.h | 4 +- + arch/parisc/include/asm/tlbflush.h | 2 +- + arch/parisc/include/asm/uaccess.h | 28 +-- + arch/parisc/include/asm/unistd.h | 4 - + arch/parisc/include/asm/vdso.h | 24 +++ + arch/parisc/include/uapi/asm/auxvec.h | 8 + + arch/parisc/kernel/Makefile | 5 + + arch/parisc/kernel/asm-offsets.c | 9 + + arch/parisc/kernel/cache.c | 18 +- + arch/parisc/kernel/pci-dma.c | 4 +- + arch/parisc/kernel/signal.c | 225 +++++++++++----------- + arch/parisc/kernel/signal32.h | 19 +- + arch/parisc/kernel/unaligned.c | 257 ++++++++++---------------- + arch/parisc/kernel/vdso.c | 122 ++++++++++++ + arch/parisc/kernel/vdso32/Makefile | 53 ++++++ + arch/parisc/kernel/vdso32/gen_vdso_offsets.sh | 15 ++ + arch/parisc/kernel/vdso32/note.S | 26 +++ + arch/parisc/kernel/vdso32/restart_syscall.S | 32 ++++ + arch/parisc/kernel/vdso32/sigtramp.S | 195 +++++++++++++++++++ + arch/parisc/kernel/vdso32/vdso32.lds.S | 111 +++++++++++ + arch/parisc/kernel/vdso32/vdso32_wrapper.S | 14 ++ + arch/parisc/kernel/vdso64/Makefile | 48 +++++ + arch/parisc/kernel/vdso64/gen_vdso_offsets.sh | 15 ++ + arch/parisc/kernel/vdso64/note.S | 2 + + arch/parisc/kernel/vdso64/restart_syscall.S | 3 + + arch/parisc/kernel/vdso64/sigtramp.S | 166 +++++++++++++++++ + arch/parisc/kernel/vdso64/vdso64.lds.S | 109 +++++++++++ + arch/parisc/kernel/vdso64/vdso64_wrapper.S | 14 ++ + arch/parisc/lib/memcpy.c | 16 +- + drivers/video/fbdev/stifb.c | 45 ++++- + 41 files changed, 1333 insertions(+), 395 deletions(-) + create mode 100644 arch/parisc/include/asm/vdso.h + create mode 100644 arch/parisc/include/uapi/asm/auxvec.h + create mode 100644 arch/parisc/kernel/vdso.c + create mode 100644 arch/parisc/kernel/vdso32/Makefile + create mode 100755 arch/parisc/kernel/vdso32/gen_vdso_offsets.sh + create mode 100644 arch/parisc/kernel/vdso32/note.S + create mode 100644 arch/parisc/kernel/vdso32/restart_syscall.S + create mode 100644 arch/parisc/kernel/vdso32/sigtramp.S + create mode 100644 arch/parisc/kernel/vdso32/vdso32.lds.S + create mode 100644 arch/parisc/kernel/vdso32/vdso32_wrapper.S + create mode 100644 arch/parisc/kernel/vdso64/Makefile + create mode 100755 arch/parisc/kernel/vdso64/gen_vdso_offsets.sh + create mode 100644 arch/parisc/kernel/vdso64/note.S + create mode 100644 arch/parisc/kernel/vdso64/restart_syscall.S + create mode 100644 arch/parisc/kernel/vdso64/sigtramp.S + create mode 100644 arch/parisc/kernel/vdso64/vdso64.lds.S + create mode 100644 arch/parisc/kernel/vdso64/vdso64_wrapper.S +Merging powerpc/next (8219d31effa7 powerpc/lib/sstep: Fix build errors with newer binutils) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Auto-merging arch/powerpc/include/asm/uaccess.h +Auto-merging arch/powerpc/kernel/head_book3s_32.S +Auto-merging arch/powerpc/lib/sstep.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-papr-pmem | 12 + + arch/powerpc/Kconfig | 9 +- + arch/powerpc/Makefile | 6 +- + arch/powerpc/boot/.gitignore | 1 + + arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts | 30 ++ + arch/powerpc/boot/dts/fsl/t1040rdb.dts | 8 +- + arch/powerpc/boot/dts/fsl/t104xrdb.dtsi | 4 +- + arch/powerpc/boot/dts/xpedite5200.dts | 2 +- + arch/powerpc/boot/dts/xpedite5200_xmon.dts | 2 +- + arch/powerpc/include/asm/asm-compat.h | 2 + + arch/powerpc/include/asm/book3s/32/pgtable.h | 37 +- + arch/powerpc/include/asm/bug.h | 13 +- + arch/powerpc/include/asm/epapr_hcalls.h | 2 +- + arch/powerpc/include/asm/ftrace.h | 63 ++-- + arch/powerpc/include/asm/hugetlb.h | 5 +- + arch/powerpc/include/asm/interrupt.h | 34 +- + arch/powerpc/include/asm/io.h | 40 +- + arch/powerpc/include/asm/livepatch.h | 12 +- + arch/powerpc/include/asm/machdep.h | 20 - + arch/powerpc/include/asm/nmi.h | 2 +- + arch/powerpc/include/asm/nohash/32/pgtable.h | 3 - + arch/powerpc/include/asm/nohash/64/pgtable.h | 3 - + arch/powerpc/include/asm/pmac_feature.h | 12 + + arch/powerpc/include/asm/ppc_asm.h | 11 - + arch/powerpc/include/asm/rtas.h | 1 - + arch/powerpc/include/asm/set_memory.h | 12 +- + arch/powerpc/include/asm/thread_info.h | 2 +- + arch/powerpc/include/asm/uaccess.h | 3 + + arch/powerpc/include/asm/vdso/gettimeofday.h | 69 +--- + arch/powerpc/include/uapi/asm/papr_pdsm.h | 18 + + arch/powerpc/kernel/Makefile | 6 +- + arch/powerpc/kernel/asm-offsets.c | 2 +- + arch/powerpc/kernel/fadump.c | 13 +- + arch/powerpc/kernel/head_40x.S | 18 +- + arch/powerpc/kernel/head_44x.S | 4 +- + arch/powerpc/kernel/head_8xx.S | 4 +- + arch/powerpc/kernel/head_book3s_32.S | 21 +- + arch/powerpc/kernel/head_fsl_booke.S | 6 +- + arch/powerpc/kernel/module_32.c | 44 ++- + arch/powerpc/kernel/module_64.c | 14 +- + arch/powerpc/kernel/prom.c | 15 +- + arch/powerpc/kernel/ptrace/ptrace-view.c | 2 +- + arch/powerpc/kernel/rtas.c | 6 + + arch/powerpc/kernel/security.c | 15 + + arch/powerpc/kernel/setup-common.c | 4 +- + arch/powerpc/kernel/trace/Makefile | 6 +- + arch/powerpc/kernel/trace/ftrace.c | 39 +- + arch/powerpc/kernel/trace/ftrace_32.S | 187 ---------- + .../kernel/trace/{ftrace_64.S => ftrace_low.S} | 14 + + .../{ftrace_64_mprofile.S => ftrace_mprofile.S} | 172 ++++----- + arch/powerpc/kernel/{vdso64 => vdso}/.gitignore | 2 + + arch/powerpc/kernel/vdso/Makefile | 103 ++++++ + arch/powerpc/kernel/{vdso32 => vdso}/cacheflush.S | 4 +- + arch/powerpc/kernel/{vdso32 => vdso}/datapage.S | 10 +- + .../gen_vdso32_offsets.sh} | 0 + .../gen_vdso64_offsets.sh} | 0 + arch/powerpc/kernel/{vdso32 => vdso}/getcpu.S | 4 +- + .../powerpc/kernel/{vdso32 => vdso}/gettimeofday.S | 54 ++- + arch/powerpc/kernel/{vdso32 => vdso}/note.S | 0 + .../{vdso32/sigtramp.S => vdso/sigtramp32.S} | 0 + .../{vdso64/sigtramp.S => vdso/sigtramp64.S} | 0 + arch/powerpc/kernel/{vdso32 => vdso}/vdso32.lds.S | 0 + arch/powerpc/kernel/{vdso64 => vdso}/vdso64.lds.S | 0 + .../kernel/{vdso32 => vdso}/vgettimeofday.c | 23 +- + arch/powerpc/kernel/vdso32/.gitignore | 3 - + arch/powerpc/kernel/vdso32/Makefile | 73 ---- + arch/powerpc/kernel/vdso32_wrapper.S | 2 +- + arch/powerpc/kernel/vdso64/Makefile | 56 --- + arch/powerpc/kernel/vdso64/cacheflush.S | 75 ---- + arch/powerpc/kernel/vdso64/datapage.S | 59 --- + arch/powerpc/kernel/vdso64/getcpu.S | 33 -- + arch/powerpc/kernel/vdso64/gettimeofday.S | 58 --- + arch/powerpc/kernel/vdso64/note.S | 1 - + arch/powerpc/kernel/vdso64/vgettimeofday.c | 29 -- + arch/powerpc/kernel/vdso64_wrapper.S | 2 +- + arch/powerpc/kexec/core.c | 15 +- + arch/powerpc/lib/checksum_32.S | 3 - + arch/powerpc/lib/copy_32.S | 3 - + arch/powerpc/lib/sstep.c | 30 +- + arch/powerpc/mm/book3s64/hash_utils.c | 54 +-- + arch/powerpc/mm/book3s64/hugetlbpage.c | 2 +- + arch/powerpc/mm/hugetlbpage.c | 5 +- + arch/powerpc/mm/init_64.c | 4 + + arch/powerpc/mm/kasan/kasan_init_32.c | 3 +- + arch/powerpc/mm/numa.c | 4 +- + arch/powerpc/mm/pageattr.c | 71 +--- + arch/powerpc/mm/pgtable_32.c | 27 +- + arch/powerpc/mm/ptdump/hashpagetable.c | 5 +- + arch/powerpc/net/bpf_jit.h | 3 - + arch/powerpc/net/bpf_jit_comp32.c | 14 +- + arch/powerpc/perf/callchain.h | 9 +- + arch/powerpc/perf/callchain_64.c | 27 -- + arch/powerpc/perf/imc-pmu.c | 6 +- + arch/powerpc/perf/perf_regs.c | 8 +- + arch/powerpc/platforms/85xx/corenet_generic.c | 2 +- + arch/powerpc/platforms/85xx/qemu_e500.c | 5 + + arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 6 - + arch/powerpc/platforms/cell/spufs/sched.c | 3 +- + arch/powerpc/platforms/powermac/pmac.h | 2 + + arch/powerpc/platforms/powernv/rng.c | 6 +- + arch/powerpc/platforms/pseries/lparcfg.c | 87 +++++ + arch/powerpc/platforms/pseries/mobility.c | 2 +- + arch/powerpc/platforms/pseries/papr_scm.c | 90 ++++- + arch/powerpc/sysdev/mpic.c | 4 +- + arch/powerpc/sysdev/xive/common.c | 2 +- + arch/powerpc/sysdev/xive/spapr.c | 36 +- + drivers/macintosh/macio_asic.c | 2 +- + drivers/macintosh/via-cuda.c | 1 + + drivers/pci/hotplug/rpadlpar_core.c | 1 + + kernel/livepatch/core.c | 4 +- + sound/ppc/pmac.h | 1 + + .../testing/selftests/powerpc/copyloops/.gitignore | 1 + + tools/testing/selftests/powerpc/copyloops/Makefile | 9 +- + .../selftests/powerpc/copyloops/asm/ppc_asm.h | 1 + + tools/testing/selftests/powerpc/copyloops/mem_64.S | 1 + + .../selftests/powerpc/copyloops/memcpy_stubs.S | 8 + + .../selftests/powerpc/copyloops/memmove_validate.c | 58 +++ + tools/testing/selftests/powerpc/include/reg.h | 4 + + tools/testing/selftests/powerpc/pmu/Makefile | 11 +- + tools/testing/selftests/powerpc/pmu/event.c | 19 +- + tools/testing/selftests/powerpc/pmu/event.h | 6 + + .../powerpc/pmu/sampling_tests/.gitignore | 11 + + .../selftests/powerpc/pmu/sampling_tests/Makefile | 12 + + .../selftests/powerpc/pmu/sampling_tests/misc.c | 412 +++++++++++++++++++++ + .../selftests/powerpc/pmu/sampling_tests/misc.h | 227 ++++++++++++ + .../pmu/sampling_tests/mmcr0_cc56run_test.c | 59 +++ + .../pmu/sampling_tests/mmcr0_exceptionbits_test.c | 59 +++ + .../pmu/sampling_tests/mmcr0_fc56_pmc1ce_test.c | 59 +++ + .../pmu/sampling_tests/mmcr0_fc56_pmc56_test.c | 58 +++ + .../pmu/sampling_tests/mmcr0_pmccext_test.c | 59 +++ + .../powerpc/pmu/sampling_tests/mmcr0_pmcjce_test.c | 58 +++ + .../powerpc/pmu/sampling_tests/mmcr1_comb_test.c | 66 ++++ + .../pmu/sampling_tests/mmcr2_fcs_fch_test.c | 85 +++++ + .../powerpc/pmu/sampling_tests/mmcr2_l2l3_test.c | 74 ++++ + .../powerpc/pmu/sampling_tests/mmcr3_src_test.c | 67 ++++ + .../mmcra_thresh_marked_sample_test.c | 80 ++++ + .../selftests/powerpc/security/spectre_v2.c | 2 - + 137 files changed, 2468 insertions(+), 1206 deletions(-) + create mode 100644 arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts + delete mode 100644 arch/powerpc/kernel/trace/ftrace_32.S + rename arch/powerpc/kernel/trace/{ftrace_64.S => ftrace_low.S} (85%) + rename arch/powerpc/kernel/trace/{ftrace_64_mprofile.S => ftrace_mprofile.S} (74%) + rename arch/powerpc/kernel/{vdso64 => vdso}/.gitignore (72%) + create mode 100644 arch/powerpc/kernel/vdso/Makefile + rename arch/powerpc/kernel/{vdso32 => vdso}/cacheflush.S (95%) + rename arch/powerpc/kernel/{vdso32 => vdso}/datapage.S (91%) + rename arch/powerpc/kernel/{vdso32/gen_vdso_offsets.sh => vdso/gen_vdso32_offsets.sh} (100%) + rename arch/powerpc/kernel/{vdso64/gen_vdso_offsets.sh => vdso/gen_vdso64_offsets.sh} (100%) + rename arch/powerpc/kernel/{vdso32 => vdso}/getcpu.S (95%) + rename arch/powerpc/kernel/{vdso32 => vdso}/gettimeofday.S (60%) + rename arch/powerpc/kernel/{vdso32 => vdso}/note.S (100%) + rename arch/powerpc/kernel/{vdso32/sigtramp.S => vdso/sigtramp32.S} (100%) + rename arch/powerpc/kernel/{vdso64/sigtramp.S => vdso/sigtramp64.S} (100%) + rename arch/powerpc/kernel/{vdso32 => vdso}/vdso32.lds.S (100%) + rename arch/powerpc/kernel/{vdso64 => vdso}/vdso64.lds.S (100%) + rename arch/powerpc/kernel/{vdso32 => vdso}/vgettimeofday.c (70%) + delete mode 100644 arch/powerpc/kernel/vdso32/.gitignore + delete mode 100644 arch/powerpc/kernel/vdso32/Makefile + delete mode 100644 arch/powerpc/kernel/vdso64/Makefile + delete mode 100644 arch/powerpc/kernel/vdso64/cacheflush.S + delete mode 100644 arch/powerpc/kernel/vdso64/datapage.S + delete mode 100644 arch/powerpc/kernel/vdso64/getcpu.S + delete mode 100644 arch/powerpc/kernel/vdso64/gettimeofday.S + delete mode 100644 arch/powerpc/kernel/vdso64/note.S + delete mode 100644 arch/powerpc/kernel/vdso64/vgettimeofday.c + create mode 120000 tools/testing/selftests/powerpc/copyloops/mem_64.S + create mode 100644 tools/testing/selftests/powerpc/copyloops/memcpy_stubs.S + create mode 100644 tools/testing/selftests/powerpc/copyloops/memmove_validate.c + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/.gitignore + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/Makefile + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/misc.c + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/misc.h + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcr0_cc56run_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcr0_exceptionbits_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcr0_fc56_pmc1ce_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcr0_fc56_pmc56_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcr0_pmccext_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcr0_pmcjce_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcr1_comb_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcr2_fcs_fch_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcr2_l2l3_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcr3_src_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_thresh_marked_sample_test.c +Merging soc-fsl/next (1ce93cb102e7 soc: fsl: qe: Check of ioremap return value) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging risc-v/for-next (d56201d9440d riscv: defconfig: enable hugetlbfs option) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging arch/riscv/mm/init.c +Merge made by the 'ort' strategy. + arch/riscv/Kconfig | 4 +- + arch/riscv/configs/defconfig | 1 + + arch/riscv/configs/rv32_defconfig | 1 + + arch/riscv/include/asm/csr.h | 1 + + arch/riscv/include/asm/fixmap.h | 1 + + arch/riscv/include/asm/page.h | 1 + + arch/riscv/include/asm/pgalloc.h | 49 +++++++++++ + arch/riscv/include/asm/pgtable-64.h | 106 ++++++++++++++++++++++- + arch/riscv/include/asm/pgtable.h | 6 +- + arch/riscv/kernel/cpu.c | 4 +- + arch/riscv/mm/init.c | 168 +++++++++++++++++++++++++++++++----- + arch/riscv/mm/kasan_init.c | 155 ++++++++++++++++++++++++++++++--- + 12 files changed, 454 insertions(+), 43 deletions(-) +Merging s390/for-next (5225811009e5 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 MAINTAINERS +Auto-merging arch/s390/Kconfig +Auto-merging arch/s390/include/asm/uaccess.h +Auto-merging arch/s390/kvm/kvm-s390.c +Merge made by the 'ort' strategy. + MAINTAINERS | 4 +- + arch/s390/Kconfig | 16 +-- + arch/s390/Makefile | 9 +- + arch/s390/boot/head.S | 1 - + arch/s390/include/asm/crw.h | 1 - + arch/s390/include/asm/hugetlb.h | 4 +- + arch/s390/include/asm/nmi.h | 1 - + arch/s390/include/asm/os_info.h | 2 +- + arch/s390/include/asm/page.h | 30 ++++- + arch/s390/include/asm/pgalloc.h | 8 +- + arch/s390/include/asm/pgtable.h | 217 ++++++++++++++++++------------ + arch/s390/include/asm/processor.h | 2 +- + arch/s390/include/asm/sclp.h | 1 - + arch/s390/include/asm/smp.h | 1 - + arch/s390/include/asm/stacktrace.h | 10 +- + arch/s390/include/asm/uaccess.h | 2 +- + arch/s390/kernel/asm-offsets.c | 2 + + arch/s390/kernel/base.S | 3 +- + arch/s390/kernel/cache.c | 1 - + arch/s390/kernel/crash_dump.c | 58 ++++---- + arch/s390/kernel/early.c | 1 - + arch/s390/kernel/entry.S | 2 - + arch/s390/kernel/ftrace.c | 46 ++++--- + arch/s390/kernel/head64.S | 1 - + arch/s390/kernel/ipl.c | 1 - + arch/s390/kernel/lgr.c | 3 +- + arch/s390/kernel/machine_kexec.c | 1 - + arch/s390/kernel/mcount.S | 22 +-- + arch/s390/kernel/nmi.c | 1 - + arch/s390/kernel/os_info.c | 12 +- + arch/s390/kernel/ptrace.c | 164 +++++++++++------------ + arch/s390/kernel/relocate_kernel.S | 3 +- + arch/s390/kernel/smp.c | 9 +- + arch/s390/kernel/stacktrace.c | 1 - + arch/s390/kernel/topology.c | 1 - + arch/s390/kvm/kvm-s390.c | 1 - + arch/s390/lib/delay.c | 1 - + arch/s390/lib/test_unwind.c | 219 +++++++++++++++++++----------- + arch/s390/mm/gmap.c | 20 +-- + arch/s390/mm/hugetlbpage.c | 36 ++--- + arch/s390/mm/kasan_init.c | 8 +- + arch/s390/mm/maccess.c | 23 ++-- + arch/s390/mm/pageattr.c | 33 ++--- + arch/s390/mm/pgalloc.c | 8 +- + arch/s390/mm/pgtable.c | 44 +++--- + arch/s390/mm/vmem.c | 11 +- + arch/s390/net/bpf_jit_comp.c | 1 - + drivers/s390/char/sclp_cmd.c | 3 +- + drivers/s390/char/sclp_config.c | 1 - + drivers/s390/char/sclp_sdias.c | 2 +- + drivers/s390/char/zcore.c | 3 +- + drivers/s390/cio/crw.c | 1 - + drivers/s390/crypto/ap_bus.c | 238 +++++++++++++++++++++++++++++++-- + drivers/s390/crypto/ap_bus.h | 17 +++ + drivers/s390/crypto/vfio_ap_debug.h | 32 +++++ + drivers/s390/crypto/vfio_ap_drv.c | 21 +++ + drivers/s390/crypto/vfio_ap_ops.c | 151 +++++++++++++++++++-- + tools/perf/arch/s390/util/dwarf-regs.c | 3 +- + 58 files changed, 992 insertions(+), 526 deletions(-) + create mode 100644 drivers/s390/crypto/vfio_ap_debug.h +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 (db0dd9cee822 um: virtio_uml: Allow probing from devicetree) +$ 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 (8a900dc390da xtensa: Remove unused early_read_config_byte() et al declarations) +$ 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/pci-bridge.h | 9 --------- + arch/xtensa/kernel/setup.c | 8 ++++---- + arch/xtensa/platforms/iss/network.c | 4 ++-- + 3 files changed, 6 insertions(+), 15 deletions(-) +Merging pidfd/for-next (d52c14f5f9b3 Merge branch 'pidfd.fd_install' 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 +Merge made by the 'ort' strategy. + fs/namespace.c | 118 +++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 64 insertions(+), 54 deletions(-) +Merging fscrypt/master (cdaa1b1941f6 fscrypt: update documentation for direct I/O support) +$ 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. + Documentation/filesystems/fscrypt.rst | 25 +++++++++- + fs/crypto/crypto.c | 8 +++ + fs/crypto/inline_crypt.c | 93 +++++++++++++++++++++++++++++++++++ + fs/ext4/file.c | 10 ++-- + fs/ext4/inode.c | 7 +++ + fs/f2fs/data.c | 7 +++ + fs/f2fs/f2fs.h | 6 ++- + fs/iomap/direct-io.c | 6 +++ + include/linux/fscrypt.h | 18 +++++++ + 9 files changed, 173 insertions(+), 7 deletions(-) +Merging fscache/fscache-next (2522c1b16116 afs: Maintain netfs_i_context::remote_i_size) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/filesystems/netfs_library.rst | 139 +-- + MAINTAINERS | 2 + + fs/9p/cache.c | 10 +- + fs/9p/v9fs.c | 4 +- + fs/9p/v9fs.h | 12 +- + fs/9p/vfs_addr.c | 60 +- + fs/9p/vfs_inode.c | 13 +- + fs/afs/dynroot.c | 1 + + fs/afs/file.c | 41 +- + fs/afs/inode.c | 32 +- + fs/afs/internal.h | 23 +- + fs/afs/super.c | 4 +- + fs/afs/write.c | 10 +- + fs/cachefiles/io.c | 10 +- + fs/ceph/addr.c | 270 +++--- + fs/ceph/cache.c | 28 +- + fs/ceph/cache.h | 15 +- + fs/ceph/caps.c | 14 + + fs/ceph/dir.c | 11 +- + fs/ceph/file.c | 83 +- + fs/ceph/inode.c | 61 +- + fs/ceph/locks.c | 8 +- + fs/ceph/mds_client.c | 69 +- + fs/ceph/mds_client.h | 15 +- + fs/ceph/snap.c | 263 +++--- + fs/ceph/strings.c | 1 + + fs/ceph/super.c | 7 + + fs/ceph/super.h | 25 +- + fs/ceph/xattr.c | 13 +- + fs/cifs/cifsglob.h | 10 +- + fs/cifs/fscache.c | 19 +- + fs/cifs/fscache.h | 2 +- + fs/fscache/internal.h | 11 - + fs/netfs/Makefile | 8 +- + fs/netfs/buffered_read.c | 429 ++++++++++ + fs/netfs/internal.h | 49 +- + fs/netfs/io.c | 656 +++++++++++++++ + fs/netfs/main.c | 20 + + fs/netfs/objects.c | 161 ++++ + fs/netfs/read_helper.c | 1205 --------------------------- + fs/netfs/stats.c | 1 - + fs/nfs/fscache.c | 8 - + include/linux/ceph/ceph_fs.h | 5 +- + include/linux/ceph/libceph.h | 1 + + include/linux/fscache.h | 14 + + include/linux/netfs.h | 162 +++- + include/trace/events/cachefiles.h | 6 +- + include/trace/events/netfs.h | 188 +++-- + net/ceph/messenger_v2.c | 8 +- + 49 files changed, 2297 insertions(+), 1910 deletions(-) + create mode 100644 fs/netfs/buffered_read.c + create mode 100644 fs/netfs/io.c + create mode 100644 fs/netfs/main.c + create mode 100644 fs/netfs/objects.c + delete mode 100644 fs/netfs/read_helper.c +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 (f717a6052f38 Merge branch 'for-next-next-v5.17-20220303' into for-next-20220303) +$ 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/backref.c | 7 +- + fs/btrfs/block-group.c | 36 +- + fs/btrfs/block-group.h | 1 + + fs/btrfs/btrfs_inode.h | 42 +- + fs/btrfs/compression.c | 63 +- + fs/btrfs/compression.h | 10 +- + fs/btrfs/ctree.c | 114 ++-- + fs/btrfs/ctree.h | 93 ++- + fs/btrfs/delalloc-space.c | 18 +- + fs/btrfs/dev-replace.c | 18 +- + fs/btrfs/disk-io.c | 267 +++++--- + fs/btrfs/disk-io.h | 2 + + fs/btrfs/extent-tree.c | 158 +++-- + fs/btrfs/extent_io.c | 156 +++-- + fs/btrfs/extent_map.c | 4 + + fs/btrfs/file-item.c | 76 +-- + fs/btrfs/file.c | 79 ++- + fs/btrfs/free-space-tree.c | 2 + + fs/btrfs/inode.c | 1213 +++++++++++++++++++++++++++++-------- + fs/btrfs/ioctl.c | 309 ++++++++-- + fs/btrfs/lzo.c | 11 +- + fs/btrfs/ordered-data.c | 132 ++-- + fs/btrfs/ordered-data.h | 25 +- + fs/btrfs/print-tree.c | 5 +- + fs/btrfs/qgroup.c | 81 ++- + fs/btrfs/reflink.c | 43 +- + fs/btrfs/relocation.c | 24 +- + fs/btrfs/root-tree.c | 15 + + fs/btrfs/scrub.c | 702 ++++++++++++--------- + fs/btrfs/send.c | 11 +- + fs/btrfs/send.h | 2 +- + fs/btrfs/space-info.c | 9 +- + fs/btrfs/subpage.c | 32 +- + fs/btrfs/subpage.h | 25 + + fs/btrfs/super.c | 96 ++- + fs/btrfs/sysfs.c | 21 +- + fs/btrfs/tests/extent-map-tests.c | 2 + + fs/btrfs/transaction.c | 84 ++- + fs/btrfs/transaction.h | 3 +- + fs/btrfs/tree-checker.c | 109 +++- + fs/btrfs/tree-checker.h | 1 + + fs/btrfs/tree-log.c | 1013 ++++++++++++++++++++----------- + fs/btrfs/tree-log.h | 7 +- + fs/btrfs/volumes.c | 161 +++-- + fs/btrfs/volumes.h | 7 +- + fs/btrfs/zoned.c | 167 +++-- + fs/internal.h | 5 - + fs/ioctl.c | 4 - + fs/read_write.c | 34 +- + fs/remap_range.c | 7 +- + include/linux/fs.h | 2 + + include/trace/events/btrfs.h | 1 + + include/uapi/linux/btrfs.h | 133 ++++ + include/uapi/linux/btrfs_tree.h | 3 + + 54 files changed, 3951 insertions(+), 1694 deletions(-) +Merging ceph/master (ad5255c1ea9c ceph: misc fix for code style and logs) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (3de268c4de06 cifs: truncate the inode and mapping when we simulate fcollapse) +$ 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/smb2ops.c | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 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 (22ba5e99b96f erofs: fix ztailpacking on > 4GiB filesystems) +$ 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 (dd81e1c7d5fb Merge tag 'powerpc-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Already up to date. +Merging ext3/for_next (487606687984 Merge reiserfs deprecation patch.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. + fs/ext2/super.c | 6 ++++- + fs/notify/fanotify/fanotify_user.c | 47 ++++++++++++++++++++++++++------------ + fs/notify/fsnotify.c | 8 ++++--- + fs/notify/mark.c | 4 ++-- + fs/reiserfs/Kconfig | 10 +++++--- + fs/reiserfs/inode.c | 16 ++++--------- + fs/reiserfs/super.c | 2 ++ + include/linux/fsnotify_backend.h | 19 +++++++++++++++ + 8 files changed, 78 insertions(+), 34 deletions(-) +Merging ext4/dev (cc5095747edf ext4: don't BUG if someone dirty pages without asking ext4 first) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Auto-merging fs/ext4/inode.c +Merge made by the 'ort' strategy. + fs/ext4/block_validity.c | 26 ++-- + fs/ext4/ext4.h | 7 +- + fs/ext4/extents.c | 1 - + fs/ext4/fast_commit.c | 78 ++++++++--- + fs/ext4/fast_commit.h | 1 + + fs/ext4/inline.c | 9 +- + fs/ext4/inode.c | 25 ++++ + fs/ext4/mballoc.c | 343 +++++++++++++++++++++++++++-------------------- + fs/ext4/namei.c | 10 +- + fs/ext4/resize.c | 7 +- + fs/ext4/super.c | 75 +++++++---- + fs/jbd2/transaction.c | 70 +++++----- + include/linux/jbd2.h | 3 - + 13 files changed, 401 insertions(+), 254 deletions(-) +Merging f2fs/dev (680af5b824a5 f2fs: quota: fix loop condition at f2fs_quota_sync()) +$ 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/dir.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/namei.c +Auto-merging fs/f2fs/recovery.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/sysfs.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 36 +++++++- + fs/f2fs/acl.c | 21 +++-- + fs/f2fs/checkpoint.c | 43 +++++---- + fs/f2fs/compress.c | 6 +- + fs/f2fs/data.c | 68 +++++++------- + fs/f2fs/debug.c | 3 + + fs/f2fs/dir.c | 12 +-- + fs/f2fs/f2fs.h | 134 +++++++++++++++++++++++----- + fs/f2fs/file.c | 153 +++++++++++++++++--------------- + fs/f2fs/gc.c | 50 ++++++----- + fs/f2fs/inline.c | 4 +- + fs/f2fs/inode.c | 1 + + fs/f2fs/namei.c | 75 ++++++++-------- + fs/f2fs/node.c | 86 +++++++++--------- + fs/f2fs/node.h | 3 + + fs/f2fs/recovery.c | 35 ++++++-- + fs/f2fs/segment.c | 66 +++++++------- + fs/f2fs/segment.h | 5 +- + fs/f2fs/super.c | 81 +++++++++-------- + fs/f2fs/sysfs.c | 16 +++- + fs/f2fs/verity.c | 4 +- + fs/f2fs/xattr.c | 12 +-- + 22 files changed, 565 insertions(+), 349 deletions(-) +Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) +$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity +Already up to date. +Merging fuse/for-next (c086df490257 fuse: move FUSE_SUPER_MAGIC definition to magic.h) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Merge made by the 'ort' strategy. + fs/fuse/inode.c | 3 +-- + fs/fuse/ioctl.c | 9 ++++++--- + include/uapi/linux/magic.h | 1 + + 3 files changed, 8 insertions(+), 5 deletions(-) +Merging gfs2/for-next (b2963932346f gfs2: Remove return value for gfs2_indirect_init) +$ 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/bmap.c | 9 ++++----- + fs/gfs2/file.c | 3 +-- + fs/gfs2/glock.c | 14 ++++++++++++-- + fs/gfs2/inode.c | 51 ++++++++++++++++++++++++++++----------------------- + fs/gfs2/lock_dlm.c | 15 ++++++++++++++- + fs/gfs2/rgrp.c | 16 +++++++++------- + fs/gfs2/rgrp.h | 2 +- + fs/gfs2/super.c | 2 +- + 8 files changed, 70 insertions(+), 42 deletions(-) +Merging jfs/jfs-next (c48a14dca2cb JFS: fix memleak in jfs_mount) +$ 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 (1a927cda94ac Documentation: ksmbd: update Feature Status table) +$ 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. + Documentation/filesystems/cifs/ksmbd.rst | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging nfs/linux-next (6c984083ec24 NFS: Use of mapping_set_error() results in spurious errors) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Merge made by the 'ort' strategy. + fs/nfs/callback_proc.c | 2 +- + fs/nfs/delegation.c | 2 +- + fs/nfs/dir.c | 19 ++++++++------- + fs/nfs/file.c | 2 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 17 +++++++------- + fs/nfs/inode.c | 41 +++++++++++++++------------------ + fs/nfs/internal.h | 14 +++++++++++ + fs/nfs/nfs3xdr.c | 1 + + fs/nfs/nfs42proc.c | 21 +++++++++-------- + fs/nfs/nfs42xattr.c | 7 +++--- + fs/nfs/nfs4file.c | 8 +++---- + fs/nfs/nfs4proc.c | 26 +++++++++------------ + fs/nfs/nfs4state.c | 21 +++++++++++++---- + fs/nfs/nfstrace.h | 7 +++--- + fs/nfs/pnfs.c | 4 ++-- + fs/nfs/proc.c | 1 + + fs/nfs/read.c | 21 ++++++++++------- + fs/nfs/sysfs.c | 14 +++++++++++ + fs/nfs/write.c | 7 ++++-- + include/linux/nfs_fs.h | 13 ++++------- + include/uapi/linux/nfs4.h | 1 + + net/sunrpc/auth_gss/auth_gss.c | 22 +++++++++--------- + net/sunrpc/auth_gss/auth_gss_internal.h | 2 +- + net/sunrpc/auth_gss/gss_krb5_crypto.c | 10 ++++---- + net/sunrpc/auth_gss/gss_krb5_seqnum.c | 4 ++-- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 4 ++-- + net/sunrpc/auth_unix.c | 2 +- + net/sunrpc/clnt.c | 2 +- + net/sunrpc/rpcb_clnt.c | 4 ++-- + net/sunrpc/sched.c | 4 ++-- + net/sunrpc/xprt.c | 2 +- + net/sunrpc/xprtrdma/frwr_ops.c | 2 +- + net/sunrpc/xprtrdma/verbs.c | 4 ++-- + 33 files changed, 178 insertions(+), 133 deletions(-) +Merging nfs-anna/linux-next (d19e0183a883 NFS: Do not report writeback errors in nfs_getattr()) +$ 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 (bf27a962851b fs/lock: only call lm_breaker_owns_lease if there is conflict.) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next +Auto-merging arch/m68k/configs/amiga_defconfig +Auto-merging arch/m68k/configs/apollo_defconfig +Auto-merging arch/m68k/configs/atari_defconfig +Auto-merging arch/m68k/configs/bvme6000_defconfig +Auto-merging arch/m68k/configs/hp300_defconfig +Auto-merging arch/m68k/configs/mac_defconfig +Auto-merging arch/m68k/configs/multi_defconfig +Auto-merging arch/m68k/configs/mvme147_defconfig +Auto-merging arch/m68k/configs/mvme16x_defconfig +Auto-merging arch/m68k/configs/q40_defconfig +Auto-merging arch/m68k/configs/sun3_defconfig +Auto-merging arch/m68k/configs/sun3x_defconfig +Auto-merging arch/mips/configs/malta_defconfig +Auto-merging fs/nfs/nfs4state.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + Documentation/filesystems/locking.rst | 8 +- + arch/alpha/configs/defconfig | 1 - + arch/arm/configs/davinci_all_defconfig | 1 - + arch/arm/configs/ezx_defconfig | 1 - + arch/arm/configs/imote2_defconfig | 1 - + arch/arm/configs/integrator_defconfig | 1 - + arch/arm/configs/iop32x_defconfig | 1 - + arch/arm/configs/keystone_defconfig | 1 - + arch/arm/configs/lart_defconfig | 1 - + arch/arm/configs/netwinder_defconfig | 1 - + arch/arm/configs/versatile_defconfig | 1 - + arch/arm/configs/viper_defconfig | 1 - + arch/arm/configs/zeus_defconfig | 1 - + arch/ia64/configs/zx1_defconfig | 1 - + arch/m68k/configs/amiga_defconfig | 1 - + arch/m68k/configs/apollo_defconfig | 1 - + arch/m68k/configs/atari_defconfig | 1 - + arch/m68k/configs/bvme6000_defconfig | 1 - + arch/m68k/configs/hp300_defconfig | 1 - + arch/m68k/configs/mac_defconfig | 1 - + arch/m68k/configs/multi_defconfig | 1 - + arch/m68k/configs/mvme147_defconfig | 1 - + arch/m68k/configs/mvme16x_defconfig | 1 - + arch/m68k/configs/q40_defconfig | 1 - + arch/m68k/configs/sun3_defconfig | 1 - + arch/m68k/configs/sun3x_defconfig | 1 - + arch/mips/configs/cobalt_defconfig | 1 - + arch/mips/configs/decstation_64_defconfig | 1 - + arch/mips/configs/decstation_defconfig | 1 - + arch/mips/configs/decstation_r4k_defconfig | 1 - + arch/mips/configs/ip22_defconfig | 1 - + arch/mips/configs/ip32_defconfig | 1 - + arch/mips/configs/jazz_defconfig | 1 - + arch/mips/configs/malta_defconfig | 1 - + arch/mips/configs/malta_kvm_defconfig | 1 - + arch/mips/configs/maltaup_xpa_defconfig | 1 - + arch/mips/configs/rm200_defconfig | 1 - + arch/mips/configs/tb0219_defconfig | 1 - + arch/mips/configs/tb0226_defconfig | 1 - + arch/mips/configs/tb0287_defconfig | 1 - + arch/mips/configs/workpad_defconfig | 1 - + arch/parisc/configs/generic-32bit_defconfig | 1 - + arch/powerpc/configs/linkstation_defconfig | 1 - + arch/powerpc/configs/mvme5100_defconfig | 1 - + arch/sh/configs/ap325rxa_defconfig | 1 - + arch/sh/configs/ecovec24_defconfig | 1 - + arch/sh/configs/landisk_defconfig | 1 - + arch/sh/configs/sdk7780_defconfig | 1 - + arch/sh/configs/se7724_defconfig | 1 - + arch/sh/configs/sh03_defconfig | 1 - + arch/sh/configs/sh7785lcr_32bit_defconfig | 1 - + arch/sh/configs/titan_defconfig | 1 - + fs/lockd/svc.c | 24 +-- + fs/locks.c | 20 ++- + fs/nfs/callback.c | 66 +++----- + fs/nfs/nfs4state.c | 1 - + fs/nfsd/Kconfig | 12 +- + fs/nfsd/Makefile | 3 +- + fs/nfsd/filecache.c | 6 +- + fs/nfsd/nfs4state.c | 20 ++- + fs/nfsd/nfs4xdr.c | 10 ++ + fs/nfsd/nfscache.c | 33 ++-- + fs/nfsd/nfsctl.c | 10 +- + fs/nfsd/nfsd.h | 2 +- + fs/nfsd/nfsfh.c | 4 - + fs/nfsd/nfsfh.h | 20 --- + fs/nfsd/nfssvc.c | 25 +-- + fs/nfsd/trace.h | 107 ++++++------ + fs/nfsd/vfs.c | 9 - + fs/nfsd/vfs.h | 2 - + include/linux/fs.h | 1 + + include/linux/sunrpc/svc.h | 26 +-- + include/linux/sunrpc/svc_xprt.h | 12 +- + include/trace/bpf_probe.h | 6 + + include/trace/events/sunrpc.h | 244 +++++++++++++++++----------- + include/trace/perf.h | 6 + + include/trace/trace_events.h | 55 ++++++- + kernel/module.c | 2 +- + kernel/trace/trace_events.c | 6 + + net/sunrpc/svc.c | 50 +++--- + net/sunrpc/svc_xprt.c | 68 +++++--- + net/sunrpc/svcauth.c | 2 + + net/sunrpc/svcauth_unix.c | 60 +++++++ + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 2 +- + 84 files changed, 521 insertions(+), 452 deletions(-) +Merging ntfs3/master (52e00ea6b26e fs/ntfs3: Update valid size if -EIOCBQUEUED) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ntfs3/inode.c +Merge made by the 'ort' strategy. + fs/ntfs3/file.c | 12 +++-- + fs/ntfs3/frecord.c | 10 ++-- + fs/ntfs3/fslog.c | 6 ++- + fs/ntfs3/inode.c | 8 +++- + fs/ntfs3/xattr.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++------- + 5 files changed, 145 insertions(+), 27 deletions(-) +Merging orangefs/for-next (40a74870b2d1 orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (94fd19752b28 ovl: don't fail copy up if no fileattr support on upper) +$ 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 (aa39cc675799 jffs2: GC deadlock reading a page that is used in jffs2_write_begin()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Already up to date. +Merging v9fs/9p-next (22e424feb665 Revert "fs/9p: search open fids first") +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging xfs/for-next (b97cca3ba909 xfs: only bother with sync_filesystem during readonly remount) +$ 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 (95b115332a83 zonefs: remove redundant null bio check) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Auto-merging fs/zonefs/super.c +Merge made by the 'ort' strategy. +Merging iomap/iomap-for-next (ebb7fb1557b1 xfs, iomap: limit individual ioend chain lengths in writeback) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (2d86293c7075 xfs: return errors in xfs_fs_sync_fs) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (80d8e4d3f313 fs/locks: fix fcntl_getlk64/fcntl_setlk64 stub prototypes) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. +Merging vfs/for-next (124f75f864f3 clean overflow checks in count_mounts() a bit) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Auto-merging arch/x86/um/Kconfig +CONFLICT (content): Merge conflict in arch/x86/um/Kconfig +Auto-merging fs/internal.h +Auto-merging fs/namespace.c +Auto-merging fs/read_write.c +Resolved 'arch/x86/um/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 787b16391696] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git +$ git diff -M --stat --summary HEAD^.. + arch/alpha/include/asm/user.h | 6 ------ + arch/arm/include/asm/user.h | 4 ---- + arch/h8300/include/asm/user.h | 4 ---- + arch/ia64/include/asm/user.h | 6 ------ + arch/m68k/include/asm/user.h | 4 ---- + arch/powerpc/include/asm/user.h | 5 ----- + arch/s390/include/asm/user.h | 4 ---- + arch/sh/include/asm/user.h | 6 ------ + arch/um/include/asm/Kbuild | 1 - + arch/x86/include/asm/user_32.h | 4 ---- + arch/x86/include/asm/user_64.h | 4 ---- + arch/x86/lib/csum-partial_64.c | 26 -------------------------- + arch/x86/um/Kconfig | 1 + + fs/internal.h | 2 +- + fs/kernfs/file.c | 7 +------ + fs/namespace.c | 23 ++++++++++++----------- + fs/read_write.c | 1 - + fs/seq_file.c | 4 ++-- + include/linux/seq_file.h | 1 + + 19 files changed, 18 insertions(+), 95 deletions(-) +Merging printk/for-next (c5f75d490fc2 Merge branch 'for-5.18' 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 +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging kernel/printk/printk.c +Auto-merging lib/vsprintf.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 9 ++- + kernel/printk/printk.c | 85 ++++++++++++++++++++++--- + kernel/printk/printk_ringbuffer.c | 52 +++++++++++++-- + kernel/printk/printk_ringbuffer.h | 2 + + lib/vsprintf.c | 49 ++++++++------ + 5 files changed, 161 insertions(+), 36 deletions(-) +Merging pci/next (b3c57902bef6 Merge branch 'remotes/lorenzo/pci/uniphier') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next +Auto-merging MAINTAINERS +Auto-merging drivers/pci/controller/pci-mvebu.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/pci/mvebu-pci.txt | 16 + + .../devicetree/bindings/pci/qcom,pcie.txt | 22 +- + .../bindings/pci/socionext,uniphier-pcie-ep.yaml | 22 +- + Documentation/gpu/vgaarbiter.rst | 2 +- + MAINTAINERS | 1 + + arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 2 - + arch/mips/pci/fixup-sb1250.c | 2 +- + arch/mips/pci/pci-bcm63xx.c | 2 +- + arch/powerpc/platforms/powernv/pci.c | 2 +- + arch/powerpc/sysdev/fsl_pci.c | 2 +- + arch/sh/drivers/pci/pcie-sh7786.c | 2 +- + drivers/gpu/vga/Kconfig | 19 - + drivers/gpu/vga/Makefile | 1 - + drivers/pci/Kconfig | 19 + + drivers/pci/Makefile | 1 + + drivers/pci/controller/Kconfig | 4 + + drivers/pci/controller/dwc/pci-imx6.c | 10 +- + drivers/pci/controller/dwc/pci-keystone.c | 8 +- + drivers/pci/controller/dwc/pci-meson.c | 16 +- + drivers/pci/controller/dwc/pcie-qcom.c | 95 +++-- + drivers/pci/controller/dwc/pcie-uniphier-ep.c | 142 ++++++- + .../pci/controller/mobiveil/pcie-mobiveil-host.c | 2 +- + drivers/pci/controller/pci-aardvark.c | 394 +++++++++++++------ + drivers/pci/controller/pci-loongson.c | 2 +- + drivers/pci/controller/pci-mvebu.c | 416 +++++++++++++++++---- + drivers/pci/controller/pci-tegra.c | 2 +- + drivers/pci/controller/pci-xgene.c | 1 - + drivers/pci/controller/pcie-iproc-bcma.c | 2 +- + drivers/pci/controller/pcie-iproc.c | 11 +- + drivers/pci/controller/pcie-mediatek-gen3.c | 2 +- + drivers/pci/controller/pcie-rcar-host.c | 2 +- + drivers/pci/controller/pcie-rockchip-host.c | 2 +- + drivers/pci/controller/pcie-rockchip.h | 1 - + drivers/pci/endpoint/functions/pci-epf-test.c | 12 +- + drivers/pci/hotplug/acpiphp_glue.c | 7 +- + drivers/pci/hotplug/acpiphp_ibm.c | 5 +- + drivers/pci/hotplug/pciehp_hpc.c | 4 + + drivers/pci/hotplug/shpchp_core.c | 2 +- + drivers/pci/p2pdma.c | 1 + + drivers/pci/pci-acpi.c | 6 +- + drivers/pci/pci-bridge-emul.c | 186 ++++++--- + drivers/pci/pci-bridge-emul.h | 31 +- + drivers/pci/pcie/portdrv_pci.c | 4 +- + drivers/{gpu/vga => pci}/vgaarb.c | 313 ++++++++-------- + include/linux/pci_ids.h | 2 + + include/linux/sizes.h | 2 + + 46 files changed, 1249 insertions(+), 553 deletions(-) + rename drivers/{gpu/vga => pci}/vgaarb.c (90%) +Merging pstore/for-next/pstore (023bbde3db41 pstore: Add prefix to ECC messages) +$ 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/ram_core.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging hid/for-next (cde4b57a1c51 Merge branch 'for-5.17/upstream-fixes' 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. + Documentation/input/event-codes.rst | 6 +- + drivers/hid/Kconfig | 19 ++ + drivers/hid/Makefile | 2 + + drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 7 +- + drivers/hid/hid-apple.c | 305 +++++++++++++++-- + drivers/hid/hid-core.c | 280 ++++++++++++++-- + drivers/hid/hid-elo.c | 7 +- + drivers/hid/hid-google-hammer.c | 2 +- + drivers/hid/hid-ids.h | 14 +- + drivers/hid/hid-input.c | 364 ++++++++++++++++---- + drivers/hid/hid-logitech-dj.c | 1 + + drivers/hid/hid-nintendo.c | 4 + + drivers/hid/hid-quirks.c | 16 + + drivers/hid/hid-razer.c | 125 +++++++ + drivers/hid/hid-sigmamicro.c | 130 ++++++++ + drivers/hid/hid-thrustmaster.c | 8 + + drivers/hid/hid-uclogic-core.c | 258 ++++++++------ + drivers/hid/hid-uclogic-params.c | 198 +++++------ + drivers/hid/hid-uclogic-params.h | 92 ++--- + drivers/hid/hid-uclogic-rdesc.c | 69 ++-- + drivers/hid/hid-uclogic-rdesc.h | 38 +-- + drivers/hid/hid-vivaldi.c | 2 +- + drivers/hid/i2c-hid/i2c-hid-core.c | 591 +++++++++++++++++---------------- + include/linux/hid.h | 23 +- + 24 files changed, 1839 insertions(+), 722 deletions(-) + create mode 100644 drivers/hid/hid-razer.c + create mode 100644 drivers/hid/hid-sigmamicro.c +Merging i2c/i2c/for-next (867dfe1041a0 Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/i2c/i2c-mt65xx.txt | 1 + + .../devicetree/bindings/i2c/i2c-qcom-cci.txt | 4 +- + .../devicetree/bindings/i2c/microchip,corei2c.yaml | 56 +++ + .../devicetree/bindings/i2c/renesas,rcar-i2c.yaml | 6 + + Documentation/firmware-guide/acpi/enumeration.rst | 39 ++ + Documentation/i2c/busses/i2c-i801.rst | 1 + + MAINTAINERS | 1 + + drivers/acpi/acpi_apd.c | 7 +- + drivers/base/property.c | 29 ++ + drivers/i2c/busses/Kconfig | 25 +- + drivers/i2c/busses/Makefile | 4 + + drivers/i2c/busses/i2c-amd-mp2-pci.c | 7 +- + drivers/i2c/busses/i2c-bcm2835.c | 21 +- + drivers/i2c/busses/i2c-ccgx-ucsi.c | 30 ++ + drivers/i2c/busses/i2c-ccgx-ucsi.h | 11 + + drivers/i2c/busses/i2c-cht-wc.c | 11 +- + drivers/i2c/busses/i2c-designware-amdpsp.c | 393 +++++++++++++++++++++ + drivers/i2c/busses/i2c-designware-baytrail.c | 12 +- + drivers/i2c/busses/i2c-designware-common.c | 12 + + drivers/i2c/busses/i2c-designware-core.h | 20 +- + drivers/i2c/busses/i2c-designware-master.c | 11 +- + drivers/i2c/busses/i2c-designware-pcidrv.c | 61 ++-- + drivers/i2c/busses/i2c-designware-platdrv.c | 88 ++++- + drivers/i2c/busses/i2c-i801.c | 19 +- + drivers/i2c/busses/i2c-mt65xx.c | 74 +++- + drivers/i2c/busses/i2c-npcm7xx.c | 16 +- + drivers/i2c/busses/i2c-nvidia-gpu.c | 62 ++-- + drivers/i2c/busses/i2c-pasemi-core.c | 1 - + drivers/i2c/busses/i2c-pasemi-pci.c | 1 + + drivers/i2c/busses/i2c-piix4.c | 213 ++++++++--- + drivers/i2c/busses/i2c-qcom-cci.c | 3 +- + drivers/i2c/busses/i2c-qcom-geni.c | 308 ++++++++++++++-- + drivers/i2c/busses/i2c-rcar.c | 1 + + drivers/i2c/busses/i2c-riic.c | 34 +- + drivers/i2c/busses/i2c-tegra.c | 18 +- + drivers/i2c/busses/i2c-xiic.c | 3 +- + drivers/i2c/i2c-core-acpi.c | 17 +- + drivers/i2c/i2c-core-base.c | 4 +- + drivers/i2c/i2c-core-smbus.c | 14 +- + drivers/i2c/i2c-core.h | 9 + + drivers/i2c/i2c-smbus.c | 5 +- + include/linux/i2c-smbus.h | 8 - + include/linux/ioport.h | 2 + + include/linux/irqdesc.h | 1 + + include/linux/property.h | 1 + + kernel/irq/irqdesc.c | 23 ++ + 46 files changed, 1416 insertions(+), 271 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/microchip,corei2c.yaml + create mode 100644 drivers/i2c/busses/i2c-ccgx-ucsi.c + create mode 100644 drivers/i2c/busses/i2c-ccgx-ucsi.h + create mode 100644 drivers/i2c/busses/i2c-designware-amdpsp.c +Merging i3c/i3c/next (13462ba1815d i3c: master: dw: check return of dw_i3c_master_get_free_pos()) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias) +$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (007e433cf037 hwmon: Add driver for Texas Instruments TMP464 and TMP468) +$ 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 Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/ABI/obsolete/procfs-i8k | 10 + + Documentation/ABI/testing/sysfs-class-hwmon | 8 + + Documentation/admin-guide/kernel-parameters.txt | 35 +- + .../devicetree/bindings/hwmon/adi,adm1275.yaml | 68 ++ + .../devicetree/bindings/hwmon/national,lm90.yaml | 4 +- + .../devicetree/bindings/hwmon/ti,tmp464.yaml | 114 ++++ + .../devicetree/bindings/trivial-devices.yaml | 5 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/hwmon/aquacomputer_d5next.rst | 49 +- + Documentation/hwmon/asus_ec_sensors.rst | 54 ++ + Documentation/hwmon/dell-smm-hwmon.rst | 180 ++++++ + Documentation/hwmon/index.rst | 3 + + Documentation/hwmon/lm70.rst | 7 + + Documentation/hwmon/max6639.rst | 2 +- + Documentation/hwmon/pli1209bc.rst | 75 +++ + Documentation/hwmon/sch5627.rst | 4 + + Documentation/hwmon/sysfs-interface.rst | 4 + + Documentation/hwmon/tmp464.rst | 73 +++ + Documentation/hwmon/xdpe12284.rst | 12 +- + MAINTAINERS | 16 + + arch/x86/Kconfig | 17 - + drivers/hwmon/Kconfig | 49 +- + drivers/hwmon/Makefile | 2 + + drivers/hwmon/adt7310.c | 95 ++- + drivers/hwmon/adt7410.c | 82 ++- + drivers/hwmon/adt7x10.c | 479 ++++++-------- + drivers/hwmon/adt7x10.h | 10 +- + drivers/hwmon/aquacomputer_d5next.c | 379 +++++++---- + drivers/hwmon/asus-ec-sensors.c | 716 +++++++++++++++++++++ + drivers/hwmon/asus_wmi_ec_sensors.c | 3 +- + drivers/hwmon/asus_wmi_sensors.c | 1 + + drivers/hwmon/dell-smm-hwmon.c | 77 ++- + drivers/hwmon/hwmon.c | 40 +- + drivers/hwmon/lm70.c | 16 + + drivers/hwmon/lm83.c | 476 ++++++++------ + drivers/hwmon/max6639.c | 62 +- + drivers/hwmon/mlxreg-fan.c | 84 +-- + drivers/hwmon/nct6775.c | 146 ++++- + drivers/hwmon/occ/common.c | 19 +- + drivers/hwmon/occ/common.h | 2 + + drivers/hwmon/occ/sysfs.c | 46 ++ + drivers/hwmon/pmbus/Kconfig | 33 +- + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/adm1275.c | 40 +- + drivers/hwmon/pmbus/lm25066.c | 14 + + drivers/hwmon/pmbus/pli1209bc.c | 146 +++++ + drivers/hwmon/pmbus/pmbus.h | 1 + + drivers/hwmon/pmbus/pmbus_core.c | 114 ++++ + drivers/hwmon/pmbus/xdpe12284.c | 32 +- + drivers/hwmon/powr1220.c | 235 ++++--- + drivers/hwmon/sch5627.c | 71 ++ + drivers/hwmon/sch5636.c | 10 + + drivers/hwmon/sch56xx-common.c | 44 +- + drivers/hwmon/tc654.c | 104 ++- + drivers/hwmon/tmp464.c | 712 ++++++++++++++++++++ + include/linux/hwmon.h | 2 + + 56 files changed, 4127 insertions(+), 958 deletions(-) + create mode 100644 Documentation/ABI/obsolete/procfs-i8k + create mode 100644 Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml + create mode 100644 Documentation/hwmon/asus_ec_sensors.rst + create mode 100644 Documentation/hwmon/pli1209bc.rst + create mode 100644 Documentation/hwmon/tmp464.rst + create mode 100644 drivers/hwmon/asus-ec-sensors.c + create mode 100644 drivers/hwmon/pmbus/pli1209bc.c + create mode 100644 drivers/hwmon/tmp464.c +Merging jc_docs/docs-next (247097e2bbff docs: reporting-issues.rst: link new document about regressions) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/Makefile | 2 +- + Documentation/admin-guide/blockdev/zram.rst | 20 +- + Documentation/admin-guide/index.rst | 1 + + Documentation/admin-guide/iostats.rst | 6 +- + Documentation/admin-guide/reporting-issues.rst | 73 +- + .../admin-guide/reporting-regressions.rst | 451 +++++++++++++ + Documentation/cdrom/packet-writing.rst | 4 +- + Documentation/conf.py | 131 +--- + Documentation/core-api/entry.rst | 279 ++++++++ + Documentation/core-api/index.rst | 8 + + Documentation/dev-tools/ktap.rst | 31 +- + Documentation/process/handling-regressions.rst | 746 +++++++++++++++++++++ + Documentation/process/index.rst | 1 + + Documentation/process/submitting-patches.rst | 3 +- + Documentation/scheduler/sched-domains.rst | 8 +- + Documentation/sphinx/kerneldoc-preamble.sty | 226 +++++++ + Documentation/sphinx/kfigure.py | 134 +++- + Documentation/trace/osnoise-tracer.rst | 4 +- + Documentation/translations/conf.py | 12 - + Documentation/translations/ja_JP/index.rst | 4 +- + Documentation/translations/ko_KR/index.rst | 5 +- + .../zh_CN/accounting/delay-accounting.rst | 62 +- + .../translations/zh_CN/core-api/index.rst | 2 +- + .../translations/zh_CN/core-api/rbtree.rst | 391 +++++++++++ + Documentation/translations/zh_CN/index.rst | 14 +- + .../translations/zh_CN/power/energy-model.rst | 190 ++++++ + Documentation/translations/zh_CN/power/index.rst | 56 ++ + Documentation/translations/zh_CN/power/opp.rst | 341 ++++++++++ + .../translations/zh_CN/scheduler/index.rst | 4 +- + .../translations/zh_CN/scheduler/sched-energy.rst | 351 ++++++++++ + Documentation/translations/zh_CN/vm/active_mm.rst | 85 +++ + Documentation/translations/zh_CN/vm/balance.rst | 81 +++ + Documentation/translations/zh_CN/vm/damon/api.rst | 32 + + .../translations/zh_CN/vm/damon/design.rst | 139 ++++ + Documentation/translations/zh_CN/vm/damon/faq.rst | 48 ++ + .../translations/zh_CN/vm/damon/index.rst | 33 + + .../translations/zh_CN/vm/free_page_reporting.rst | 38 ++ + Documentation/translations/zh_CN/vm/highmem.rst | 128 ++++ + Documentation/translations/zh_CN/vm/index.rst | 52 ++ + Documentation/translations/zh_TW/index.rst | 4 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 2 +- + Documentation/vm/page_owner.rst | 10 +- + MAINTAINERS | 2 + + scripts/kernel-doc | 354 +++++----- + 44 files changed, 4115 insertions(+), 453 deletions(-) + create mode 100644 Documentation/admin-guide/reporting-regressions.rst + create mode 100644 Documentation/core-api/entry.rst + create mode 100644 Documentation/process/handling-regressions.rst + create mode 100644 Documentation/sphinx/kerneldoc-preamble.sty + delete mode 100644 Documentation/translations/conf.py + create mode 100644 Documentation/translations/zh_CN/core-api/rbtree.rst + create mode 100644 Documentation/translations/zh_CN/power/energy-model.rst + create mode 100644 Documentation/translations/zh_CN/power/index.rst + create mode 100644 Documentation/translations/zh_CN/power/opp.rst + create mode 100644 Documentation/translations/zh_CN/scheduler/sched-energy.rst + create mode 100644 Documentation/translations/zh_CN/vm/active_mm.rst + create mode 100644 Documentation/translations/zh_CN/vm/balance.rst + create mode 100644 Documentation/translations/zh_CN/vm/damon/api.rst + create mode 100644 Documentation/translations/zh_CN/vm/damon/design.rst + create mode 100644 Documentation/translations/zh_CN/vm/damon/faq.rst + create mode 100644 Documentation/translations/zh_CN/vm/damon/index.rst + create mode 100644 Documentation/translations/zh_CN/vm/free_page_reporting.rst + create mode 100644 Documentation/translations/zh_CN/vm/highmem.rst + create mode 100644 Documentation/translations/zh_CN/vm/index.rst +Merging v4l-dvb/master (2b891d3980f6 media: xilinx: csi2rxss: Use mipi-csi2.h) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Auto-merging MAINTAINERS +Auto-merging drivers/memory/mtk-smi.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/media/vimc.rst | 13 + + .../bindings/display/mediatek/mediatek,disp.txt | 9 - + .../devicetree/bindings/media/i2c/hynix,hi846.yaml | 6 +- + .../bindings/media/i2c/maxim,max9286.yaml | 275 +- + .../bindings/media/mediatek,vcodec-decoder.yaml | 169 ++ + .../bindings/media/mediatek,vcodec-encoder.yaml | 179 ++ + .../media/mediatek,vcodec-subdev-decoder.yaml | 265 ++ + .../bindings/media/mediatek-jpeg-decoder.txt | 38 - + .../bindings/media/mediatek-jpeg-decoder.yaml | 80 + + .../bindings/media/mediatek-jpeg-encoder.txt | 35 - + .../bindings/media/mediatek-jpeg-encoder.yaml | 72 + + .../devicetree/bindings/media/mediatek-mdp.txt | 8 - + .../devicetree/bindings/media/mediatek-vcodec.txt | 131 - + .../bindings/media/microchip,csi2dc.yaml | 197 ++ + .../devicetree/bindings/media/nxp,imx7-csi.yaml | 1 + + .../bindings/media/qcom,msm8916-camss.yaml | 10 - + .../bindings/media/qcom,msm8996-camss.yaml | 20 - + .../bindings/media/qcom,sdm660-camss.yaml | 20 - + .../bindings/media/qcom,sdm845-camss.yaml | 17 - + .../bindings/media/qcom,sm8250-camss.yaml | 450 +++ + .../userspace-api/media/lirc.h.rst.exceptions | 3 + + .../userspace-api/media/rc/lirc-dev-intro.rst | 11 +- + .../userspace-api/media/rc/lirc-get-features.rst | 18 - + .../userspace-api/media/v4l/ext-ctrls-codec.rst | 16 +- + .../userspace-api/media/v4l/pixfmt-yuv-luma.rst | 4 +- + .../userspace-api/media/v4l/v4l2grab.c.rst | 2 +- + .../userspace-api/media/v4l/vidioc-qbuf.rst | 2 +- + MAINTAINERS | 30 +- + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 8 +- + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 9 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 15 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 36 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 1 - + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 +- + drivers/gpu/ipu-v3/ipu-csi.c | 6 +- + drivers/iommu/mtk_iommu.c | 34 + + drivers/iommu/mtk_iommu_v1.c | 42 +- + drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 2 + + drivers/media/i2c/Kconfig | 26 + + drivers/media/i2c/Makefile | 2 + + drivers/media/i2c/adv7180.c | 10 +- + drivers/media/i2c/adv748x/adv748x-csi2.c | 18 +- + drivers/media/i2c/adv7511-v4l2.c | 2 +- + drivers/media/i2c/adv7604.c | 2 +- + drivers/media/i2c/adv7842.c | 2 +- + drivers/media/i2c/dw9714.c | 42 +- + drivers/media/i2c/hi847.c | 3012 ++++++++++++++++++++ + drivers/media/i2c/max9286.c | 125 +- + drivers/media/i2c/ml86v7667.c | 5 +- + drivers/media/i2c/mt9m001.c | 8 +- + drivers/media/i2c/mt9m111.c | 14 +- + drivers/media/i2c/ov08d10.c | 1528 ++++++++++ + drivers/media/i2c/ov2740.c | 8 +- + drivers/media/i2c/ov5648.c | 6 +- + drivers/media/i2c/ov5675.c | 32 +- + drivers/media/i2c/ov5693.c | 9 +- + drivers/media/i2c/ov6650.c | 206 +- + drivers/media/i2c/ov8865.c | 8 +- + drivers/media/i2c/ov9640.c | 8 +- + drivers/media/i2c/tc358743.c | 26 +- + drivers/media/i2c/tvp5150.c | 6 +- + drivers/media/pci/bt8xx/bttv-driver.c | 4 +- + drivers/media/pci/cx23885/cx23885-input.c | 2 +- + drivers/media/pci/saa7134/saa7134-video.c | 9 +- + drivers/media/platform/Makefile | 1 + + drivers/media/platform/aspeed-video.c | 219 +- + drivers/media/platform/atmel/Kconfig | 15 + + drivers/media/platform/atmel/Makefile | 4 +- + drivers/media/platform/atmel/atmel-isc-base.c | 397 +-- + drivers/media/platform/atmel/atmel-isc-clk.c | 311 ++ + drivers/media/platform/atmel/atmel-isc.h | 11 + + drivers/media/platform/atmel/atmel-sama5d2-isc.c | 24 + + drivers/media/platform/atmel/atmel-sama7g5-isc.c | 32 +- + drivers/media/platform/atmel/microchip-csi2dc.c | 792 +++++ + drivers/media/platform/coda/coda-common.c | 1 + + drivers/media/platform/coda/imx-vdoa.c | 9 +- + drivers/media/platform/davinci/vpif.c | 111 +- + drivers/media/platform/exynos-gsc/gsc-core.c | 14 +- + drivers/media/platform/exynos4-is/fimc-core.c | 11 +- + drivers/media/platform/exynos4-is/fimc-lite.c | 11 +- + drivers/media/platform/imx-jpeg/mxc-jpeg.c | 18 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 8 +- + drivers/media/platform/meson/ge2d/ge2d.c | 24 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 45 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h | 2 - + drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 40 - + drivers/media/platform/mtk-mdp/mtk_mdp_comp.h | 2 - + drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 1 - + drivers/media/platform/mtk-vcodec/Makefile | 6 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 4 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h | 1 + + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 176 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c | 200 ++ + .../media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h | 56 + + .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 136 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h | 11 +- + .../platform/mtk-vcodec/mtk_vcodec_dec_stateful.c | 2 + + .../platform/mtk-vcodec/mtk_vcodec_dec_stateless.c | 21 + + drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 77 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 1 - + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 19 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 55 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h | 3 +- + .../media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c | 2 + + .../media/platform/mtk-vcodec/mtk_vcodec_intr.c | 30 +- + .../media/platform/mtk-vcodec/mtk_vcodec_intr.h | 5 +- + .../media/platform/mtk-vcodec/mtk_vcodec_util.c | 59 +- + .../media/platform/mtk-vcodec/mtk_vcodec_util.h | 8 +- + .../media/platform/mtk-vcodec/vdec/vdec_h264_if.c | 2 +- + .../platform/mtk-vcodec/vdec/vdec_h264_req_if.c | 2 +- + .../media/platform/mtk-vcodec/vdec/vdec_vp8_if.c | 2 +- + .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 2 +- + drivers/media/platform/mtk-vcodec/vdec_drv_if.c | 21 +- + drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h | 16 +- + drivers/media/platform/mtk-vcodec/vdec_msg_queue.c | 290 ++ + drivers/media/platform/mtk-vcodec/vdec_msg_queue.h | 153 + + drivers/media/platform/mtk-vcodec/vdec_vpu_if.c | 46 +- + drivers/media/platform/mtk-vcodec/vdec_vpu_if.h | 22 + + .../media/platform/mtk-vcodec/venc/venc_h264_if.c | 2 +- + .../media/platform/mtk-vcodec/venc/venc_vp8_if.c | 2 +- + drivers/media/platform/mtk-vpu/mtk_vpu.c | 10 +- + drivers/media/platform/omap3isp/ispstat.c | 5 +- + drivers/media/platform/pxa_camera.c | 21 +- + drivers/media/platform/qcom/camss/Makefile | 3 +- + .../camss/{camss-csid-170.c => camss-csid-gen2.c} | 32 +- + drivers/media/platform/qcom/camss/camss-csid.c | 68 +- + drivers/media/platform/qcom/camss/camss-csid.h | 2 +- + .../platform/qcom/camss/camss-csiphy-2ph-1-0.c | 19 +- + .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 199 +- + drivers/media/platform/qcom/camss/camss-csiphy.c | 42 +- + drivers/media/platform/qcom/camss/camss-csiphy.h | 7 + + drivers/media/platform/qcom/camss/camss-ispif.c | 12 +- + drivers/media/platform/qcom/camss/camss-vfe-170.c | 12 +- + drivers/media/platform/qcom/camss/camss-vfe-480.c | 564 ++++ + drivers/media/platform/qcom/camss/camss-vfe.c | 29 +- + drivers/media/platform/qcom/camss/camss-vfe.h | 4 + + drivers/media/platform/qcom/camss/camss-video.c | 5 +- + drivers/media/platform/qcom/camss/camss.c | 308 +- + drivers/media/platform/qcom/camss/camss.h | 18 + + drivers/media/platform/rcar-isp.c | 32 +- + drivers/media/platform/rcar-vin/rcar-csi2.c | 73 +- + drivers/media/platform/rcar-vin/rcar-vin.h | 2 +- + .../platform/rockchip/rkisp1/rkisp1-capture.c | 28 +- + drivers/media/platform/s5p-g2d/g2d.c | 10 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 11 +- + drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 1 + + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 18 + + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 10 +- + drivers/media/platform/stm32/dma2d/dma2d.c | 9 +- + drivers/media/platform/stm32/stm32-dcmi.c | 53 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h | 2 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 2 +- + drivers/media/platform/ti-vpe/cal-camerarx.c | 6 +- + drivers/media/platform/ti-vpe/cal-video.c | 3 + + drivers/media/platform/vsp1/vsp1_drv.c | 47 +- + drivers/media/platform/xilinx/xilinx-csi2rxss.c | 106 +- + drivers/media/radio/radio-sf16fmi.c | 2 +- + drivers/media/rc/fintek-cir.c | 2 +- + drivers/media/rc/igorplugusb.c | 2 +- + drivers/media/rc/iguanair.c | 2 +- + drivers/media/rc/ir-hix5hd2.c | 2 +- + drivers/media/rc/ir-imon-decoder.c | 2 +- + drivers/media/rc/ir-jvc-decoder.c | 2 +- + drivers/media/rc/ir-mce_kbd-decoder.c | 2 +- + drivers/media/rc/ir-nec-decoder.c | 2 +- + drivers/media/rc/ir-rc5-decoder.c | 2 +- + drivers/media/rc/ir-rc6-decoder.c | 2 +- + drivers/media/rc/ir-rcmm-decoder.c | 2 +- + drivers/media/rc/ir-sanyo-decoder.c | 4 +- + drivers/media/rc/ir-sharp-decoder.c | 2 +- + drivers/media/rc/ir-sony-decoder.c | 2 +- + drivers/media/rc/ir-xmp-decoder.c | 2 +- + drivers/media/rc/ir_toy.c | 2 +- + drivers/media/rc/ite-cir.c | 2 +- + drivers/media/rc/lirc_dev.c | 36 +- + drivers/media/rc/mtk-cir.c | 39 +- + drivers/media/rc/nuvoton-cir.c | 2 +- + drivers/media/rc/rc-core-priv.h | 2 +- + drivers/media/rc/rc-ir-raw.c | 2 - + drivers/media/rc/rc-loopback.c | 6 +- + drivers/media/rc/st_rc.c | 2 +- + drivers/media/rc/sunxi-cir.c | 2 +- + drivers/media/rc/winbond-cir.c | 2 +- + drivers/media/test-drivers/vimc/Kconfig | 1 + + drivers/media/test-drivers/vimc/vimc-capture.c | 9 +- + drivers/media/test-drivers/vimc/vimc-common.h | 7 + + drivers/media/test-drivers/vimc/vimc-core.c | 10 + + drivers/media/test-drivers/vivid/vivid-core.h | 5 +- + drivers/media/test-drivers/vivid/vivid-ctrls.c | 32 +- + .../media/test-drivers/vivid/vivid-kthread-cap.c | 7 +- + .../media/test-drivers/vivid/vivid-kthread-out.c | 9 +- + .../media/test-drivers/vivid/vivid-kthread-touch.c | 7 + + drivers/media/test-drivers/vivid/vivid-sdr-cap.c | 12 +- + drivers/media/test-drivers/vivid/vivid-touch-cap.c | 2 +- + drivers/media/usb/gspca/jl2005bcd.c | 4 +- + drivers/media/usb/uvc/uvc_driver.c | 9 + + drivers/media/v4l2-core/v4l2-ctrls-core.c | 2 +- + drivers/media/v4l2-core/v4l2-dev.c | 68 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 18 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 12 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 53 +- + drivers/media/v4l2-core/v4l2-subdev.c | 8 - + drivers/memory/mtk-smi.c | 14 - + .../media/atomisp/pci/atomisp_compat_css20.c | 4 +- + .../media/atomisp/pci/atomisp_gmin_platform.c | 148 +- + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 21 +- + drivers/staging/media/atomisp/pci/hmm/hmm.c | 7 +- + .../staging/media/atomisp/pci/ia_css_acc_types.h | 5 +- + drivers/staging/media/atomisp/pci/ia_css_env.h | 9 +- + .../media/atomisp/pci/ia_css_event_public.h | 33 +- + drivers/staging/media/atomisp/pci/ia_css_irq.h | 77 +- + .../isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c | 2 +- + .../pci/runtime/debug/interface/ia_css_debug.h | 31 +- + .../staging/media/atomisp/pci/sh_css_firmware.c | 4 + + drivers/staging/media/hantro/TODO | 7 - + drivers/staging/media/hantro/hantro.h | 1 - + drivers/staging/media/hantro/hantro_drv.c | 41 +- + drivers/staging/media/hantro/hantro_g2_hevc_dec.c | 27 +- + drivers/staging/media/hantro/hantro_h1_jpeg_enc.c | 41 +- + drivers/staging/media/hantro/hantro_h1_regs.h | 2 +- + drivers/staging/media/hantro/hantro_hw.h | 11 - + drivers/staging/media/hantro/hantro_jpeg.c | 86 +- + drivers/staging/media/hantro/hantro_jpeg.h | 2 +- + drivers/staging/media/hantro/hantro_v4l2.c | 77 + + .../media/hantro/rockchip_vpu2_hw_jpeg_enc.c | 44 +- + drivers/staging/media/hantro/rockchip_vpu_hw.c | 6 - + drivers/staging/media/imx/imx-media-csi.c | 7 +- + drivers/staging/media/imx/imx6-mipi-csi2.c | 25 +- + drivers/staging/media/imx/imx7-media-csi.c | 32 +- + drivers/staging/media/imx/imx7-mipi-csis.c | 50 +- + drivers/staging/media/imx/imx8mq-mipi-csi2.c | 76 +- + drivers/staging/media/max96712/max96712.c | 2 +- + drivers/staging/media/meson/vdec/esparser.c | 7 +- + drivers/staging/media/meson/vdec/vdec_helpers.c | 8 +- + drivers/staging/media/meson/vdec/vdec_helpers.h | 4 +- + drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 2 +- + drivers/staging/media/zoran/Kconfig | 38 +- + drivers/staging/media/zoran/Makefile | 8 +- + drivers/staging/media/zoran/videocodec.c | 68 +- + drivers/staging/media/zoran/videocodec.h | 4 +- + drivers/staging/media/zoran/zoran.h | 18 +- + drivers/staging/media/zoran/zoran_card.c | 398 ++- + drivers/staging/media/zoran/zoran_device.c | 15 +- + drivers/staging/media/zoran/zoran_device.h | 2 - + drivers/staging/media/zoran/zoran_driver.c | 56 +- + drivers/staging/media/zoran/zr36016.c | 25 +- + drivers/staging/media/zoran/zr36016.h | 2 + + drivers/staging/media/zoran/zr36050.c | 24 +- + drivers/staging/media/zoran/zr36050.h | 2 + + drivers/staging/media/zoran/zr36060.c | 23 +- + drivers/staging/media/zoran/zr36060.h | 2 + + include/media/hevc-ctrls.h | 6 +- + include/media/mipi-csi2.h | 45 + + include/media/rc-core.h | 12 +- + include/media/v4l2-fwnode.h | 61 +- + include/media/v4l2-mediabus.h | 104 +- + include/media/v4l2-subdev.h | 13 - + include/soc/mediatek/smi.h | 20 - + include/uapi/linux/lirc.h | 15 +- + include/uapi/linux/omap3isp.h | 21 +- + 260 files changed, 12108 insertions(+), 2860 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml + create mode 100644 Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml + create mode 100644 Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml + delete mode 100644 Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt + create mode 100644 Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.yaml + delete mode 100644 Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt + create mode 100644 Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.yaml + delete mode 100644 Documentation/devicetree/bindings/media/mediatek-vcodec.txt + create mode 100644 Documentation/devicetree/bindings/media/microchip,csi2dc.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,sm8250-camss.yaml + create mode 100644 drivers/media/i2c/hi847.c + create mode 100644 drivers/media/i2c/ov08d10.c + create mode 100644 drivers/media/platform/atmel/atmel-isc-clk.c + create mode 100644 drivers/media/platform/atmel/microchip-csi2dc.c + create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c + create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h + create mode 100644 drivers/media/platform/mtk-vcodec/vdec_msg_queue.c + create mode 100644 drivers/media/platform/mtk-vcodec/vdec_msg_queue.h + rename drivers/media/platform/qcom/camss/{camss-csid-170.c => camss-csid-gen2.c} (95%) + create mode 100644 drivers/media/platform/qcom/camss/camss-vfe-480.c + create mode 100644 include/media/mipi-csi2.h +Merging v4l-dvb-next/master (2881ca629984 media: Makefiles: sort entries where it fits) +$ 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/common/Makefile | 4 +- + drivers/media/common/videobuf2/Makefile | 6 +- + drivers/media/dvb-frontends/Makefile | 185 +++++++++++++++--------------- + drivers/media/i2c/Makefile | 193 ++++++++++++++++---------------- + drivers/media/pci/Makefile | 18 +-- + drivers/media/platform/Makefile | 111 +++++++----------- + drivers/media/radio/Makefile | 42 +++---- + drivers/media/rc/Makefile | 45 ++++---- + drivers/media/rc/keymaps/Makefile | 33 +++--- + drivers/media/spi/Makefile | 5 +- + drivers/media/test-drivers/Makefile | 9 +- + drivers/media/tuners/Makefile | 65 +++++------ + drivers/media/usb/Makefile | 25 +++-- + drivers/media/v4l2-core/Makefile | 29 +++-- + 14 files changed, 381 insertions(+), 389 deletions(-) +Merging pm/linux-next (7c2ca3c76b25 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 tools/power/x86/intel-speed-select/Makefile +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-thermal | 2 +- + .../admin-guide/acpi/fan_performance_states.rst | 28 + + .../pm/intel_uncore_frequency_scaling.rst | 60 +++ + Documentation/admin-guide/pm/working-state.rst | 1 + + Documentation/x86/index.rst | 1 + + Documentation/x86/intel-hfi.rst | 72 +++ + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/msr-index.h | 6 + + arch/x86/include/asm/pci_x86.h | 10 + + arch/x86/kernel/resource.c | 4 + + arch/x86/pci/acpi.c | 68 ++- + drivers/acpi/Kconfig | 2 +- + drivers/acpi/Makefile | 3 + + drivers/acpi/acpi_lpss.c | 33 +- + drivers/acpi/acpi_platform.c | 2 +- + drivers/acpi/apei/apei-base.c | 13 +- + drivers/acpi/battery.c | 12 + + drivers/acpi/bus.c | 63 ++- + drivers/acpi/ec.c | 90 ++-- + drivers/acpi/fan.h | 44 ++ + drivers/acpi/fan_attr.c | 137 +++++ + drivers/acpi/{fan.c => fan_core.c} | 204 ++++---- + drivers/acpi/internal.h | 2 - + drivers/acpi/osl.c | 19 +- + drivers/acpi/pci_link.c | 2 +- + drivers/acpi/property.c | 29 +- + drivers/acpi/scan.c | 5 +- + drivers/acpi/sleep.c | 2 + + drivers/acpi/tables.c | 2 +- + drivers/acpi/x86/utils.c | 21 + + drivers/base/power/domain.c | 42 +- + drivers/base/power/wakeirq.c | 2 +- + drivers/base/power/wakeup.c | 4 +- + drivers/base/property.c | 32 +- + drivers/cpufreq/cpufreq_governor_attr_set.c | 5 - + drivers/cpufreq/longhaul.c | 4 +- + drivers/pnp/pnpacpi/core.c | 4 +- + drivers/powercap/Kconfig | 8 + + drivers/powercap/Makefile | 1 + + drivers/powercap/dtpm.c | 333 +++++++++--- + drivers/powercap/dtpm_cpu.c | 55 +- + drivers/powercap/dtpm_devfreq.c | 203 ++++++++ + drivers/powercap/dtpm_subsys.h | 22 + + drivers/soc/rockchip/Kconfig | 8 + + drivers/soc/rockchip/Makefile | 1 + + drivers/soc/rockchip/dtpm.c | 65 +++ + drivers/thermal/intel/Kconfig | 14 + + drivers/thermal/intel/Makefile | 1 + + .../intel/int340x_thermal/acpi_thermal_rel.c | 23 +- + .../intel/int340x_thermal/int3400_thermal.c | 5 + + drivers/thermal/intel/intel_hfi.c | 569 +++++++++++++++++++++ + drivers/thermal/intel/intel_hfi.h | 17 + + drivers/thermal/intel/intel_powerclamp.c | 9 +- + drivers/thermal/intel/therm_throt.c | 22 + + drivers/thermal/thermal_netlink.c | 58 ++- + drivers/thermal/thermal_netlink.h | 14 + + drivers/usb/typec/port-mapper.c | 2 +- + include/acpi/acpi_bus.h | 2 + + include/acpi/actypes.h | 4 + + include/acpi/platform/aclinux.h | 5 + + include/asm-generic/vmlinux.lds.h | 11 - + include/linux/acpi.h | 4 +- + include/linux/cpufreq.h | 5 + + include/linux/dtpm.h | 36 +- + include/linux/property.h | 6 +- + include/uapi/linux/thermal.h | 6 +- + kernel/power/hibernate.c | 6 +- + kernel/power/suspend_test.c | 8 +- + kernel/power/swap.c | 8 +- + kernel/sched/cpufreq_schedutil.c | 2 +- + tools/power/cpupower/Makefile | 6 +- + tools/power/cpupower/{ToDo => TODO} | 0 + tools/power/cpupower/lib/acpi_cppc.c | 59 +++ + tools/power/cpupower/lib/acpi_cppc.h | 21 + + tools/power/cpupower/lib/cpufreq.c | 23 +- + tools/power/cpupower/lib/cpufreq.h | 12 + + tools/power/cpupower/man/cpupower-frequency-info.1 | 3 + + tools/power/cpupower/man/cpupower-idle-set.1 | 2 +- + tools/power/cpupower/utils/cpufreq-info.c | 87 ++-- + tools/power/cpupower/utils/helpers/amd.c | 77 +++ + tools/power/cpupower/utils/helpers/cpuid.c | 13 + + tools/power/cpupower/utils/helpers/helpers.h | 22 + + tools/power/cpupower/utils/helpers/misc.c | 60 +++ + tools/power/x86/intel-speed-select/Build | 2 +- + tools/power/x86/intel-speed-select/Makefile | 10 +- + tools/power/x86/intel-speed-select/hfi-events.c | 309 +++++++++++ + tools/power/x86/intel-speed-select/isst-config.c | 54 +- + tools/power/x86/intel-speed-select/isst-daemon.c | 244 +++++++++ + tools/power/x86/intel-speed-select/isst.h | 13 + + 89 files changed, 3096 insertions(+), 485 deletions(-) + create mode 100644 Documentation/admin-guide/pm/intel_uncore_frequency_scaling.rst + create mode 100644 Documentation/x86/intel-hfi.rst + create mode 100644 drivers/acpi/fan_attr.c + rename drivers/acpi/{fan.c => fan_core.c} (75%) + create mode 100644 drivers/powercap/dtpm_devfreq.c + create mode 100644 drivers/powercap/dtpm_subsys.h + create mode 100644 drivers/soc/rockchip/dtpm.c + create mode 100644 drivers/thermal/intel/intel_hfi.c + create mode 100644 drivers/thermal/intel/intel_hfi.h + rename tools/power/cpupower/{ToDo => TODO} (100%) + create mode 100644 tools/power/cpupower/lib/acpi_cppc.c + create mode 100644 tools/power/cpupower/lib/acpi_cppc.h + create mode 100644 tools/power/x86/intel-speed-select/hfi-events.c + create mode 100644 tools/power/x86/intel-speed-select/isst-daemon.c +Merging cpufreq-arm/cpufreq/arm/linux-next (72951a77c00f cpufreq: blocklist Qualcomm sc8280xp and sa8540p in cpufreq-dt-platdev) +$ 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. + arch/arm/boot/dts/imx7s.dtsi | 16 ++++++++++++++ + drivers/cpufreq/cppc_cpufreq.c | 43 ++++++++++++++++++------------------ + drivers/cpufreq/cpufreq-dt-platdev.c | 3 +++ + drivers/cpufreq/qcom-cpufreq-hw.c | 20 ++++++++++++++++- + drivers/cpufreq/qcom-cpufreq-nvmem.c | 2 +- + drivers/cpufreq/scmi-cpufreq.c | 2 +- + 6 files changed, 61 insertions(+), 25 deletions(-) +Merging cpupower/cpupower (8382dce5e483 cpupower: Add "perf" option to print AMD P-State information) +$ 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 (26291c54e111 Linux 5.17-rc2) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Already up to date. +Merging opp/opp/linux-next (f48a0c475c2a Documentation: EM: Describe new registration method using DT) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm64/boot/dts/qcom/msm8996.dtsi +Merge made by the 'ort' strategy. + .../bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 166 +++++ + .../devicetree/bindings/opp/opp-v2-base.yaml | 23 + + .../devicetree/bindings/opp/opp-v2-kryo-cpu.yaml | 257 +++++++ + .../devicetree/bindings/opp/opp-v2-qcom-level.yaml | 60 ++ + .../devicetree/bindings/opp/qcom-nvmem-cpufreq.txt | 796 --------------------- + Documentation/devicetree/bindings/opp/qcom-opp.txt | 19 - + .../devicetree/bindings/power/avs/qcom,cpr.txt | 130 ---- + .../devicetree/bindings/power/avs/qcom,cpr.yaml | 160 +++++ + Documentation/power/energy-model.rst | 10 + + MAINTAINERS | 5 +- + drivers/opp/core.c | 25 + + drivers/opp/debugfs.c | 8 + + drivers/opp/of.c | 108 ++- + drivers/opp/opp.h | 1 + + include/linux/energy_model.h | 2 + + include/linux/pm_opp.h | 12 +- + 16 files changed, 831 insertions(+), 951 deletions(-) + create mode 100644 Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml + create mode 100644 Documentation/devicetree/bindings/opp/opp-v2-kryo-cpu.yaml + create mode 100644 Documentation/devicetree/bindings/opp/opp-v2-qcom-level.yaml + delete mode 100644 Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt + delete mode 100644 Documentation/devicetree/bindings/opp/qcom-opp.txt + delete mode 100644 Documentation/devicetree/bindings/power/avs/qcom,cpr.txt + create mode 100644 Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml +Merging thermal/thermal/linux-next (cef4b473c499 thermal/drivers/brcmstb_thermal: Interrupt is optional) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/thermal/exynos-thermal.txt | 106 ------------ + .../devicetree/bindings/thermal/qcom-lmh.yaml | 1 + + .../devicetree/bindings/thermal/qcom-tsens.yaml | 1 + + .../bindings/thermal/samsung,exynos-thermal.yaml | 184 +++++++++++++++++++++ + MAINTAINERS | 7 +- + drivers/thermal/broadcom/brcmstb_thermal.c | 2 +- + drivers/thermal/qcom/lmh.c | 62 ++++--- + drivers/thermal/qcom/tsens.c | 5 + + drivers/thermal/tegra/tegra-bpmp-thermal.c | 13 +- + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 4 + + 10 files changed, 247 insertions(+), 138 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/thermal/exynos-thermal.txt + create mode 100644 Documentation/devicetree/bindings/thermal/samsung,exynos-thermal.yaml +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 (feae43f8aa88 fs: dlm: print cluster addr if non-cluster node connects) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging rdma/for-next (a80501b89152 RDMA/core: Remove unnecessary statements) +$ 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/cma.c +Auto-merging drivers/infiniband/ulp/rtrs/rtrs-clt.c +Merge made by the 'ort' strategy. + drivers/infiniband/core/addr.c | 1 - + drivers/infiniband/core/cache.c | 1 - + drivers/infiniband/core/cma.c | 2 +- + drivers/infiniband/core/cma_configfs.c | 1 - + drivers/infiniband/core/cq.c | 1 - + drivers/infiniband/core/iwpm_util.h | 1 - + drivers/infiniband/core/sa_query.c | 1 - + drivers/infiniband/core/verbs.c | 9 +- + drivers/infiniband/hw/hfi1/affinity.c | 5 +- + drivers/infiniband/hw/hfi1/debugfs.c | 1 - + drivers/infiniband/hw/hfi1/device.c | 1 - + drivers/infiniband/hw/hfi1/fault.c | 1 - + drivers/infiniband/hw/hfi1/firmware.c | 1 - + drivers/infiniband/hw/irdma/cm.c | 68 +-- + drivers/infiniband/hw/irdma/cm.h | 7 + + drivers/infiniband/hw/irdma/ctrl.c | 592 +++++++++++----------- + drivers/infiniband/hw/irdma/defs.h | 8 +- + drivers/infiniband/hw/irdma/hmc.c | 105 ++-- + drivers/infiniband/hw/irdma/hmc.h | 53 +- + drivers/infiniband/hw/irdma/hw.c | 192 ++++--- + drivers/infiniband/hw/irdma/i40iw_hw.c | 1 - + drivers/infiniband/hw/irdma/i40iw_if.c | 3 +- + drivers/infiniband/hw/irdma/main.c | 27 +- + drivers/infiniband/hw/irdma/main.h | 45 +- + drivers/infiniband/hw/irdma/osdep.h | 41 +- + drivers/infiniband/hw/irdma/pble.c | 77 ++- + drivers/infiniband/hw/irdma/pble.h | 25 +- + drivers/infiniband/hw/irdma/protos.h | 90 ++-- + drivers/infiniband/hw/irdma/puda.c | 132 +++-- + drivers/infiniband/hw/irdma/puda.h | 43 +- + drivers/infiniband/hw/irdma/status.h | 71 --- + drivers/infiniband/hw/irdma/type.h | 113 ++--- + drivers/infiniband/hw/irdma/uda.c | 40 +- + drivers/infiniband/hw/irdma/uda.h | 46 +- + drivers/infiniband/hw/irdma/uk.c | 122 +++-- + drivers/infiniband/hw/irdma/user.h | 62 +-- + drivers/infiniband/hw/irdma/utils.c | 247 +++++---- + drivers/infiniband/hw/irdma/verbs.c | 174 ++----- + drivers/infiniband/hw/irdma/verbs.h | 12 +- + drivers/infiniband/hw/irdma/ws.c | 19 +- + drivers/infiniband/hw/irdma/ws.h | 2 +- + drivers/infiniband/hw/mlx4/alias_GUID.c | 1 - + drivers/infiniband/hw/mlx4/srq.c | 1 - + drivers/infiniband/hw/mlx5/ib_virt.c | 1 - + drivers/infiniband/hw/mlx5/mem.c | 1 - + drivers/infiniband/hw/mlx5/mlx5_ib.h | 12 +- + drivers/infiniband/hw/mlx5/mr.c | 104 ++-- + drivers/infiniband/hw/mlx5/odp.c | 19 +- + drivers/infiniband/hw/mlx5/qp.c | 4 +- + drivers/infiniband/hw/mlx5/srq.c | 1 - + drivers/infiniband/hw/mthca/mthca_main.c | 8 +- + drivers/infiniband/hw/mthca/mthca_profile.c | 2 - + drivers/infiniband/hw/qib/qib_fs.c | 1 - + drivers/infiniband/hw/usnic/usnic_debugfs.c | 1 - + drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c | 1 - + drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 1 - + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 1 - + drivers/infiniband/hw/usnic/usnic_transport.c | 1 - + drivers/infiniband/hw/usnic/usnic_vnic.c | 1 - + drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 10 +- + drivers/infiniband/sw/rxe/rxe.c | 22 +- + drivers/infiniband/sw/rxe/rxe.h | 1 - + drivers/infiniband/sw/rxe/rxe_cq.c | 20 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 27 +- + drivers/infiniband/sw/rxe/rxe_mcast.c | 542 +++++++++++++++----- + drivers/infiniband/sw/rxe/rxe_mmap.c | 1 - + drivers/infiniband/sw/rxe/rxe_net.c | 18 - + drivers/infiniband/sw/rxe/rxe_pool.c | 152 +----- + drivers/infiniband/sw/rxe/rxe_pool.h | 42 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 19 +- + drivers/infiniband/sw/rxe/rxe_queue.c | 10 +- + drivers/infiniband/sw/rxe/rxe_recv.c | 18 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 21 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 58 +-- + drivers/infiniband/sw/rxe/rxe_verbs.h | 26 +- + drivers/infiniband/ulp/ipoib/ipoib_netlink.c | 1 - + drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 1 - + drivers/infiniband/ulp/iser/iser_memory.c | 1 - + drivers/infiniband/ulp/iser/iser_verbs.c | 1 - + drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c | 1 - + drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 3 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 42 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.h | 1 + + drivers/infiniband/ulp/rtrs/rtrs.c | 1 - + drivers/infiniband/ulp/srp/ib_srp.h | 11 +- + drivers/net/ethernet/intel/ice/ice_idc.c | 5 + + include/linux/net/intel/iidc.h | 4 + + 87 files changed, 1722 insertions(+), 1941 deletions(-) + delete mode 100644 drivers/infiniband/hw/irdma/status.h +Merging net-next/master (80901bff8129 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/netdev/net-next.git net-next/master +Auto-merging MAINTAINERS +Auto-merging arch/arm64/boot/dts/xilinx/zynqmp.dtsi +Auto-merging arch/x86/Kconfig +Auto-merging drivers/hwmon/adt7310.c +CONFLICT (content): Merge conflict in drivers/hwmon/adt7310.c +Auto-merging drivers/infiniband/hw/mlx5/mr.c +Auto-merging drivers/infiniband/hw/mlx5/qp.c +Auto-merging include/linux/pci_ids.h +Auto-merging include/linux/sunrpc/svc_xprt.h +Auto-merging init/Kconfig +Auto-merging kernel/trace/bpf_trace.c +Auto-merging net/sunrpc/auth_gss/auth_gss.c +Auto-merging net/sunrpc/svc_xprt.c +Auto-merging net/sunrpc/xprt.c +Auto-merging net/xdp/xsk.c +Auto-merging net/xfrm/xfrm_interface.c +Auto-merging tools/bpf/bpftool/Makefile +Auto-merging tools/lib/bpf/Makefile +Auto-merging tools/perf/util/bpf-loader.c +Resolved 'drivers/hwmon/adt7310.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 485e1e1be6d5] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-timecard | 22 + + Documentation/admin-guide/sysctl/net.rst | 9 + + Documentation/bpf/btf.rst | 45 +- + Documentation/bpf/instruction-set.rst | 215 +- + Documentation/devicetree/bindings/i2c/i2c.txt | 4 + + .../bindings/net/can/allwinner,sun4i-a10-can.yaml | 3 + + .../devicetree/bindings/net/can/bosch,m_can.yaml | 9 +- + .../bindings/net/can/microchip,mcp251xfd.yaml | 3 + + .../devicetree/bindings/net/cdns,macb.yaml | 56 + + .../devicetree/bindings/net/davicom,dm9051.yaml | 62 + + .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 6 + + .../devicetree/bindings/net/dsa/realtek-smi.txt | 240 --- + .../devicetree/bindings/net/dsa/realtek.yaml | 394 ++++ + Documentation/devicetree/bindings/net/fsl-fman.txt | 22 +- + .../bindings/net/mctp-i2c-controller.yaml | 92 + + .../bindings/net/microchip,lan966x-switch.yaml | 2 + + .../devicetree/bindings/net/renesas,etheravb.yaml | 4 +- + .../bindings/net/wireless/mediatek,mt76.yaml | 9 + + .../bindings/phy/transmit-amplitude.yaml | 103 + + Documentation/networking/bonding.rst | 11 + + Documentation/networking/dsa/sja1105.rst | 27 + + Documentation/networking/ethtool-netlink.rst | 19 + + Documentation/networking/mctp.rst | 48 + + Documentation/networking/page_pool.rst | 56 + + Documentation/networking/smc-sysctl.rst | 23 + + MAINTAINERS | 11 +- + arch/alpha/include/uapi/asm/socket.h | 2 + + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 8 + + arch/arm64/net/bpf_jit_comp.c | 5 + + arch/mips/include/uapi/asm/socket.h | 2 + + arch/parisc/include/uapi/asm/socket.h | 2 + + arch/powerpc/net/bpf_jit_comp.c | 2 +- + arch/sparc/include/uapi/asm/socket.h | 2 + + arch/sparc/net/bpf_jit_comp_64.c | 2 +- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/text-patching.h | 1 + + arch/x86/kernel/alternative.c | 34 + + arch/x86/net/bpf_jit_comp.c | 70 +- + drivers/atm/nicstar.c | 10 +- + drivers/bluetooth/btintel.c | 11 +- + drivers/bluetooth/btintel.h | 1 + + drivers/bluetooth/btmrvl_debugfs.c | 2 +- + drivers/bluetooth/btmrvl_sdio.c | 2 +- + drivers/bluetooth/btmtk.h | 35 + + drivers/bluetooth/btmtksdio.c | 276 ++- + drivers/bluetooth/btrtl.c | 8 + + drivers/bluetooth/btusb.c | 14 +- + drivers/bluetooth/hci_h5.c | 5 + + drivers/bluetooth/hci_ll.c | 2 +- + drivers/bluetooth/hci_serdev.c | 3 +- + drivers/bus/moxtet.c | 4 +- + drivers/char/tpm/st33zp24/i2c.c | 5 +- + drivers/char/tpm/st33zp24/spi.c | 9 +- + drivers/char/tpm/st33zp24/st33zp24.c | 3 +- + drivers/char/tpm/st33zp24/st33zp24.h | 2 +- + drivers/char/tpm/tpm_tis_spi_main.c | 3 +- + drivers/clk/clk-lmk04832.c | 4 +- + drivers/gpio/gpio-74x164.c | 4 +- + drivers/gpio/gpio-max3191x.c | 4 +- + drivers/gpio/gpio-max7301.c | 4 +- + drivers/gpio/gpio-mc33880.c | 4 +- + drivers/gpio/gpio-pisosr.c | 4 +- + drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 4 +- + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 4 +- + drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 3 +- + drivers/gpu/drm/panel/panel-innolux-ej030na.c | 4 +- + drivers/gpu/drm/panel/panel-lg-lb035q02.c | 4 +- + drivers/gpu/drm/panel/panel-lg-lg4573.c | 4 +- + drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 4 +- + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-db7430.c | 3 +- + drivers/gpu/drm/panel/panel-samsung-ld9040.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-s6d27a1.c | 3 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c | 3 +- + drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 4 +- + drivers/gpu/drm/panel/panel-sony-acx565akm.c | 4 +- + drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 4 +- + drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 4 +- + drivers/gpu/drm/panel/panel-tpo-tpg110.c | 3 +- + drivers/gpu/drm/panel/panel-widechips-ws2401.c | 3 +- + drivers/gpu/drm/tiny/hx8357d.c | 4 +- + drivers/gpu/drm/tiny/ili9163.c | 4 +- + drivers/gpu/drm/tiny/ili9225.c | 4 +- + drivers/gpu/drm/tiny/ili9341.c | 4 +- + drivers/gpu/drm/tiny/ili9486.c | 4 +- + drivers/gpu/drm/tiny/mi0283qt.c | 4 +- + drivers/gpu/drm/tiny/repaper.c | 4 +- + drivers/gpu/drm/tiny/st7586.c | 4 +- + drivers/gpu/drm/tiny/st7735r.c | 4 +- + drivers/hwmon/adcxx.c | 4 +- + drivers/hwmon/max1111.c | 3 +- + drivers/hwmon/max31722.c | 4 +- + drivers/iio/accel/bma400_spi.c | 4 +- + drivers/iio/accel/bmc150-accel-spi.c | 4 +- + drivers/iio/accel/bmi088-accel-spi.c | 4 +- + drivers/iio/accel/kxsd9-spi.c | 4 +- + drivers/iio/accel/mma7455_spi.c | 4 +- + drivers/iio/accel/sca3000.c | 4 +- + drivers/iio/adc/ad7266.c | 4 +- + drivers/iio/adc/ltc2496.c | 4 +- + drivers/iio/adc/mcp320x.c | 4 +- + drivers/iio/adc/mcp3911.c | 4 +- + drivers/iio/adc/ti-adc12138.c | 4 +- + drivers/iio/adc/ti-ads7950.c | 4 +- + drivers/iio/adc/ti-ads8688.c | 4 +- + drivers/iio/adc/ti-tlc4541.c | 4 +- + drivers/iio/amplifiers/ad8366.c | 4 +- + drivers/iio/common/ssp_sensors/ssp_dev.c | 4 +- + drivers/iio/dac/ad5360.c | 4 +- + drivers/iio/dac/ad5380.c | 4 +- + drivers/iio/dac/ad5446.c | 4 +- + drivers/iio/dac/ad5449.c | 4 +- + drivers/iio/dac/ad5504.c | 4 +- + drivers/iio/dac/ad5592r.c | 4 +- + drivers/iio/dac/ad5624r_spi.c | 4 +- + drivers/iio/dac/ad5686-spi.c | 4 +- + drivers/iio/dac/ad5761.c | 4 +- + drivers/iio/dac/ad5764.c | 4 +- + drivers/iio/dac/ad5791.c | 4 +- + drivers/iio/dac/ad8801.c | 4 +- + drivers/iio/dac/ltc1660.c | 4 +- + drivers/iio/dac/ltc2632.c | 4 +- + drivers/iio/dac/mcp4922.c | 4 +- + drivers/iio/dac/ti-dac082s085.c | 4 +- + drivers/iio/dac/ti-dac7311.c | 3 +- + drivers/iio/frequency/adf4350.c | 4 +- + drivers/iio/gyro/bmg160_spi.c | 4 +- + drivers/iio/gyro/fxas21002c_spi.c | 4 +- + drivers/iio/health/afe4403.c | 4 +- + drivers/iio/magnetometer/bmc150_magn_spi.c | 4 +- + drivers/iio/magnetometer/hmc5843_spi.c | 4 +- + drivers/iio/potentiometer/max5487.c | 4 +- + drivers/iio/pressure/ms5611_spi.c | 4 +- + drivers/iio/pressure/zpa2326_spi.c | 4 +- + drivers/infiniband/hw/mlx5/devx.c | 61 +- + drivers/infiniband/hw/mlx5/mr.c | 15 +- + drivers/infiniband/hw/mlx5/qp.c | 1 + + drivers/infiniband/hw/mlx5/qpc.c | 2 +- + drivers/input/keyboard/applespi.c | 4 +- + drivers/input/misc/adxl34x-spi.c | 4 +- + drivers/input/touchscreen/ads7846.c | 4 +- + drivers/input/touchscreen/cyttsp4_spi.c | 4 +- + drivers/input/touchscreen/tsc2005.c | 4 +- + drivers/leds/leds-cr0014114.c | 4 +- + drivers/leds/leds-dac124s085.c | 4 +- + drivers/leds/leds-el15203000.c | 4 +- + drivers/leds/leds-spi-byte.c | 4 +- + drivers/media/spi/cxd2880-spi.c | 4 +- + drivers/media/spi/gs1662.c | 4 +- + drivers/media/tuners/msi001.c | 3 +- + drivers/mfd/arizona-spi.c | 4 +- + drivers/mfd/da9052-spi.c | 3 +- + drivers/mfd/ezx-pcap.c | 4 +- + drivers/mfd/madera-spi.c | 4 +- + drivers/mfd/mc13xxx-spi.c | 3 +- + drivers/mfd/rsmu_spi.c | 4 +- + drivers/mfd/stmpe-spi.c | 4 +- + drivers/mfd/tps65912-spi.c | 4 +- + drivers/misc/ad525x_dpot-spi.c | 3 +- + drivers/misc/eeprom/eeprom_93xx46.c | 4 +- + drivers/misc/lattice-ecp3-config.c | 4 +- + drivers/misc/lis3lv02d/lis3lv02d_spi.c | 4 +- + drivers/mmc/host/mmc_spi.c | 3 +- + drivers/mtd/devices/mchp23k256.c | 4 +- + drivers/mtd/devices/mchp48l640.c | 4 +- + drivers/mtd/devices/mtd_dataflash.c | 4 +- + drivers/mtd/devices/sst25l.c | 4 +- + drivers/net/Makefile | 2 +- + drivers/net/amt.c | 4 +- + drivers/net/bonding/bond_alb.c | 31 +- + drivers/net/bonding/bond_main.c | 322 ++- + drivers/net/bonding/bond_netlink.c | 59 + + drivers/net/bonding/bond_options.c | 74 +- + drivers/net/bonding/bond_procfs.c | 1 - + drivers/net/can/c_can/c_can_ethtool.c | 9 - + drivers/net/can/dev/bittiming.c | 20 +- + drivers/net/can/m_can/tcan4x5x-core.c | 4 +- + drivers/net/can/softing/softing_main.c | 5 +- + drivers/net/can/spi/hi311x.c | 4 +- + drivers/net/can/spi/mcp251x.c | 4 +- + .../net/can/spi/mcp251xfd/mcp251xfd-chip-fifo.c | 4 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 346 +++- + drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.c | 4 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c | 24 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c | 203 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-rx.c | 12 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd.h | 31 +- + drivers/net/can/usb/etas_es58x/es58x_fd.c | 3 +- + drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 4 +- + drivers/net/can/xilinx_can.c | 9 +- + drivers/net/dsa/Kconfig | 12 +- + drivers/net/dsa/Makefile | 3 +- + drivers/net/dsa/b53/b53_common.c | 84 +- + drivers/net/dsa/b53/b53_priv.h | 22 +- + drivers/net/dsa/b53/b53_serdes.c | 19 +- + drivers/net/dsa/b53/b53_serdes.h | 5 +- + drivers/net/dsa/b53/b53_spi.c | 4 +- + drivers/net/dsa/b53/b53_srab.c | 35 +- + drivers/net/dsa/bcm_sf2.c | 54 +- + drivers/net/dsa/dsa_loop.c | 3 +- + drivers/net/dsa/hirschmann/hellcreek.c | 9 +- + drivers/net/dsa/lan9303-core.c | 16 +- + drivers/net/dsa/lantiq_gswip.c | 9 +- + drivers/net/dsa/microchip/ksz8795.c | 45 +- + drivers/net/dsa/microchip/ksz8795_spi.c | 4 +- + drivers/net/dsa/microchip/ksz9477.c | 118 +- + drivers/net/dsa/microchip/ksz9477_i2c.c | 1 + + drivers/net/dsa/microchip/ksz9477_spi.c | 4 +- + drivers/net/dsa/microchip/ksz_common.c | 21 +- + drivers/net/dsa/microchip/ksz_common.h | 13 +- + drivers/net/dsa/mt7530.c | 17 +- + drivers/net/dsa/mv88e6xxx/chip.c | 569 ++++-- + drivers/net/dsa/mv88e6xxx/chip.h | 11 +- + drivers/net/dsa/mv88e6xxx/global1.h | 1 + + drivers/net/dsa/mv88e6xxx/global1_vtu.c | 5 +- + drivers/net/dsa/mv88e6xxx/global2.h | 3 + + drivers/net/dsa/mv88e6xxx/global2_scratch.c | 28 + + drivers/net/dsa/mv88e6xxx/port.c | 41 +- + drivers/net/dsa/mv88e6xxx/port.h | 16 +- + drivers/net/dsa/mv88e6xxx/serdes.c | 81 +- + drivers/net/dsa/mv88e6xxx/serdes.h | 5 + + drivers/net/dsa/mv88e6xxx/smi.c | 35 +- + drivers/net/dsa/ocelot/felix.c | 767 ++++--- + drivers/net/dsa/ocelot/felix.h | 9 +- + drivers/net/dsa/ocelot/felix_vsc9959.c | 47 +- + drivers/net/dsa/ocelot/seville_vsc9953.c | 48 +- + drivers/net/dsa/qca/ar9331.c | 45 +- + drivers/net/dsa/qca8k.c | 1596 ++++++++++----- + drivers/net/dsa/qca8k.h | 54 +- + drivers/net/dsa/realtek-smi-core.c | 523 ----- + drivers/net/dsa/realtek/Kconfig | 40 + + drivers/net/dsa/realtek/Makefile | 6 + + drivers/net/dsa/realtek/realtek-mdio.c | 290 +++ + drivers/net/dsa/realtek/realtek-smi.c | 581 ++++++ + .../dsa/{realtek-smi-core.h => realtek/realtek.h} | 91 +- + drivers/net/dsa/{ => realtek}/rtl8365mb.c | 703 ++++--- + .../net/dsa/{rtl8366.c => realtek/rtl8366-core.c} | 164 +- + drivers/net/dsa/{ => realtek}/rtl8366rb.c | 460 +++-- + drivers/net/dsa/sja1105/sja1105_flower.c | 47 +- + drivers/net/dsa/sja1105/sja1105_main.c | 200 +- + drivers/net/dsa/sja1105/sja1105_vl.c | 16 +- + drivers/net/dsa/vitesse-vsc73xx-spi.c | 6 +- + drivers/net/dsa/xrs700x/xrs700x.c | 32 +- + drivers/net/ethernet/3com/typhoon.c | 24 +- + drivers/net/ethernet/Kconfig | 1 + + drivers/net/ethernet/Makefile | 1 + + drivers/net/ethernet/agere/et131x.c | 14 +- + drivers/net/ethernet/altera/altera_sgdma.c | 2 +- + drivers/net/ethernet/altera/altera_tse_main.c | 8 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 5 +- + drivers/net/ethernet/asix/ax88796c_main.c | 4 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 36 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 3 + + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 499 ++++- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 152 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h | 5 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +- + drivers/net/ethernet/cadence/macb.h | 4 + + drivers/net/ethernet/cadence/macb_main.c | 63 +- + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 3 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c | 59 +- + drivers/net/ethernet/cortina/gemini.c | 8 + + drivers/net/ethernet/davicom/Kconfig | 31 + + drivers/net/ethernet/davicom/Makefile | 1 + + drivers/net/ethernet/davicom/dm9051.c | 1260 ++++++++++++ + drivers/net/ethernet/davicom/dm9051.h | 162 ++ + drivers/net/ethernet/dec/tulip/pnic.c | 2 +- + drivers/net/ethernet/dlink/sundance.c | 60 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 432 +++- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 32 +- + .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 2 + + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 12 +- + drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h | 6 +- + drivers/net/ethernet/freescale/dpaa2/dpni.c | 2 + + drivers/net/ethernet/freescale/dpaa2/dpni.h | 6 + + drivers/net/ethernet/freescale/enetc/enetc.h | 38 + + drivers/net/ethernet/freescale/enetc/enetc_cbdr.c | 41 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 14 +- + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 150 +- + drivers/net/ethernet/freescale/fec_main.c | 2 +- + drivers/net/ethernet/freescale/fec_ptp.c | 1 - + drivers/net/ethernet/freescale/xgmac_mdio.c | 91 +- + drivers/net/ethernet/fungible/Kconfig | 27 + + drivers/net/ethernet/fungible/Makefile | 7 + + drivers/net/ethernet/fungible/funcore/Makefile | 5 + + drivers/net/ethernet/fungible/funcore/fun_dev.c | 843 ++++++++ + drivers/net/ethernet/fungible/funcore/fun_dev.h | 150 ++ + drivers/net/ethernet/fungible/funcore/fun_hci.h | 1202 +++++++++++ + drivers/net/ethernet/fungible/funcore/fun_queue.c | 601 ++++++ + drivers/net/ethernet/fungible/funcore/fun_queue.h | 175 ++ + drivers/net/ethernet/fungible/funeth/Kconfig | 17 + + drivers/net/ethernet/fungible/funeth/Makefile | 10 + + drivers/net/ethernet/fungible/funeth/fun_port.h | 97 + + drivers/net/ethernet/fungible/funeth/funeth.h | 171 ++ + .../net/ethernet/fungible/funeth/funeth_devlink.c | 40 + + .../net/ethernet/fungible/funeth/funeth_devlink.h | 13 + + .../net/ethernet/fungible/funeth/funeth_ethtool.c | 1162 +++++++++++ + drivers/net/ethernet/fungible/funeth/funeth_ktls.c | 155 ++ + drivers/net/ethernet/fungible/funeth/funeth_ktls.h | 31 + + drivers/net/ethernet/fungible/funeth/funeth_main.c | 2091 ++++++++++++++++++++ + drivers/net/ethernet/fungible/funeth/funeth_rx.c | 826 ++++++++ + .../net/ethernet/fungible/funeth/funeth_trace.h | 117 ++ + drivers/net/ethernet/fungible/funeth/funeth_tx.c | 762 +++++++ + drivers/net/ethernet/fungible/funeth/funeth_txrx.h | 264 +++ + drivers/net/ethernet/google/gve/gve_main.c | 6 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 1 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 79 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 6 + + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 2 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 11 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 13 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 11 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 8 + + drivers/net/ethernet/ibm/ibmvnic.c | 35 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 22 +- + drivers/net/ethernet/intel/i40e/i40e.h | 4 + + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 92 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 155 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 3 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 4 + + drivers/net/ethernet/intel/i40e/i40e_main.c | 52 +- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 25 + + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 36 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 5 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 23 +- + drivers/net/ethernet/intel/iavf/iavf.h | 22 +- + drivers/net/ethernet/intel/iavf/iavf_common.c | 4 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 311 ++- + drivers/net/ethernet/intel/iavf/iavf_status.h | 2 +- + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 62 +- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 194 +- + drivers/net/ethernet/intel/ice/Makefile | 13 +- + drivers/net/ethernet/intel/ice/ice.h | 13 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 276 ++- + drivers/net/ethernet/intel/ice/ice_base.c | 19 +- + drivers/net/ethernet/intel/ice/ice_common.c | 102 +- + drivers/net/ethernet/intel/ice/ice_common.h | 9 + + drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 8 +- + drivers/net/ethernet/intel/ice/ice_eswitch.c | 9 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 11 + + drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 291 ++- + drivers/net/ethernet/intel/ice/ice_flex_pipe.h | 13 + + drivers/net/ethernet/intel/ice/ice_flex_type.h | 40 + + drivers/net/ethernet/intel/ice/ice_fltr.c | 37 +- + drivers/net/ethernet/intel/ice/ice_fltr.h | 10 +- + drivers/net/ethernet/intel/ice/ice_gnss.c | 376 ++++ + drivers/net/ethernet/intel/ice/ice_gnss.h | 50 + + drivers/net/ethernet/intel/ice/ice_idc.c | 6 +- + drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 2 + + drivers/net/ethernet/intel/ice/ice_lib.c | 393 ++-- + drivers/net/ethernet/intel/ice/ice_lib.h | 19 +- + drivers/net/ethernet/intel/ice/ice_main.c | 352 +++- + drivers/net/ethernet/intel/ice/ice_osdep.h | 1 + + .../net/ethernet/intel/ice/ice_pf_vsi_vlan_ops.c | 38 + + .../net/ethernet/intel/ice/ice_pf_vsi_vlan_ops.h | 13 + + drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 31 + + drivers/net/ethernet/intel/ice/ice_ptp_hw.h | 7 + + drivers/net/ethernet/intel/ice/ice_switch.c | 80 + + drivers/net/ethernet/intel/ice/ice_switch.h | 24 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 49 +- + drivers/net/ethernet/intel/ice/ice_txrx.h | 13 +- + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 24 +- + drivers/net/ethernet/intel/ice/ice_txrx_lib.h | 30 +- + drivers/net/ethernet/intel/ice/ice_type.h | 19 + + .../net/ethernet/intel/ice/ice_vf_vsi_vlan_ops.c | 202 ++ + .../net/ethernet/intel/ice/ice_vf_vsi_vlan_ops.h | 19 + + .../ethernet/intel/ice/ice_virtchnl_allowlist.c | 10 + + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 1605 ++++++++++++--- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 17 +- + drivers/net/ethernet/intel/ice/ice_vlan.h | 18 + + drivers/net/ethernet/intel/ice/ice_vlan_mode.c | 439 ++++ + drivers/net/ethernet/intel/ice/ice_vlan_mode.h | 13 + + drivers/net/ethernet/intel/ice/ice_vsi_vlan_lib.c | 707 +++++++ + drivers/net/ethernet/intel/ice/ice_vsi_vlan_lib.h | 32 + + drivers/net/ethernet/intel/ice/ice_vsi_vlan_ops.c | 103 + + drivers/net/ethernet/intel/ice/ice_vsi_vlan_ops.h | 29 + + drivers/net/ethernet/intel/ice/ice_xsk.c | 396 ++-- + drivers/net/ethernet/intel/ice/ice_xsk.h | 27 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 - + drivers/net/ethernet/intel/igb/igb_main.c | 38 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 22 +- + drivers/net/ethernet/intel/igc/igc_main.c | 35 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 19 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 36 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 24 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 10 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 27 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 22 +- + drivers/net/ethernet/jme.c | 3 +- + drivers/net/ethernet/marvell/mvneta.c | 319 +-- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 247 ++- + drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 13 + + .../ethernet/marvell/octeontx2/af/lmac_common.h | 10 + + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 19 + + drivers/net/ethernet/marvell/octeontx2/af/ptp.c | 131 +- + drivers/net/ethernet/marvell/octeontx2/af/ptp.h | 2 + + drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 224 ++- + drivers/net/ethernet/marvell/octeontx2/af/rpm.h | 30 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 3 + + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 117 +- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 17 +- + .../net/ethernet/marvell/octeontx2/nic/Makefile | 3 + + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 79 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 21 + + .../ethernet/marvell/octeontx2/nic/otx2_dcbnl.c | 170 ++ + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 30 +- + .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 50 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 75 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_ptp.c | 8 + + .../net/ethernet/marvell/octeontx2/nic/otx2_ptp.h | 15 + + .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 48 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 6 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 55 +- + drivers/net/ethernet/marvell/prestera/prestera.h | 5 + + .../net/ethernet/marvell/prestera/prestera_acl.c | 124 +- + .../net/ethernet/marvell/prestera/prestera_acl.h | 30 +- + .../net/ethernet/marvell/prestera/prestera_flow.c | 5 +- + .../net/ethernet/marvell/prestera/prestera_flow.h | 3 +- + .../ethernet/marvell/prestera/prestera_flower.c | 87 +- + .../ethernet/marvell/prestera/prestera_flower.h | 1 - + .../net/ethernet/marvell/prestera/prestera_hw.c | 55 + + .../net/ethernet/marvell/prestera/prestera_hw.h | 6 + + .../net/ethernet/marvell/prestera/prestera_main.c | 11 + + .../ethernet/marvell/prestera/prestera_router.c | 412 ++++ + .../ethernet/marvell/prestera/prestera_router_hw.c | 132 +- + .../ethernet/marvell/prestera/prestera_router_hw.h | 44 + + drivers/net/ethernet/mediatek/mtk_star_emac.c | 2 + + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 328 +-- + drivers/net/ethernet/mellanox/mlx5/core/cq.c | 17 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 44 +- + .../net/ethernet/mellanox/mlx5/core/en/params.c | 21 +- + .../net/ethernet/mellanox/mlx5/core/en/params.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en/qos.c | 42 +- + .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en/rss.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en/selq.c | 231 +++ + drivers/net/ethernet/mellanox/mlx5/core/en/selq.h | 51 + + .../ethernet/mellanox/mlx5/core/en/tc/act/accept.c | 8 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/act.c | 73 + + .../ethernet/mellanox/mlx5/core/en/tc/act/act.h | 30 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/csum.c | 5 +- + .../net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c | 27 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/drop.c | 6 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/goto.c | 15 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/mark.c | 3 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/mirred.c | 10 +- + .../mellanox/mlx5/core/en/tc/act/mirred_nic.c | 6 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/mpls.c | 9 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/pedit.c | 11 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/pedit.h | 1 - + .../ethernet/mellanox/mlx5/core/en/tc/act/ptype.c | 3 +- + .../mlx5/core/en/tc/act/redirect_ingress.c | 11 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/sample.c | 40 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/sample.h | 14 + + .../ethernet/mellanox/mlx5/core/en/tc/act/trap.c | 8 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/tun.c | 6 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/vlan.c | 13 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/vlan.h | 1 - + .../mellanox/mlx5/core/en/tc/act/vlan_mangle.c | 9 +- + .../ethernet/mellanox/mlx5/core/en/tc/post_act.c | 68 +- + .../ethernet/mellanox/mlx5/core/en/tc/post_act.h | 8 + + .../net/ethernet/mellanox/mlx5/core/en/tc/sample.c | 89 +- + .../net/ethernet/mellanox/mlx5/core/en/tc/sample.h | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 134 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h | 4 - + .../net/ethernet/mellanox/mlx5/core/en/tc_priv.h | 20 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 65 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.h | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 47 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h | 7 +- + .../mellanox/mlx5/core/en_accel/en_accel.h | 9 - + .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 6 +- + .../mellanox/mlx5/core/en_accel/tls_rxtx.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 114 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 36 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 22 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 77 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 28 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 844 ++++++-- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 39 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 128 +- + .../mellanox/mlx5/core/esw/acl/ingress_ofld.c | 87 + + .../net/ethernet/mellanox/mlx5/core/esw/acl/ofld.h | 15 + + .../ethernet/mellanox/mlx5/core/esw/indir_table.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 19 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 126 +- + .../mellanox/mlx5/core/eswitch_offloads_termtbl.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 14 + + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h | 3 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 25 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 7 + + drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 57 +- + drivers/net/ethernet/mellanox/mlx5/core/fw_reset.h | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 142 +- + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h | 2 + + drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/lib/hv_vhca.h | 7 - + drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/port.c | 20 +- + .../ethernet/mellanox/mlx5/core/steering/fs_dr.c | 11 + + drivers/net/ethernet/mellanox/mlxsw/core.c | 107 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 17 +- + .../mellanox/mlxsw/core_acl_flex_actions.c | 77 + + .../mellanox/mlxsw/core_acl_flex_actions.h | 3 + + drivers/net/ethernet/mellanox/mlxsw/core_env.c | 159 +- + drivers/net/ethernet/mellanox/mlxsw/core_env.h | 3 +- + drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c | 79 +- + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 66 +- + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 76 +- + drivers/net/ethernet/mellanox/mlxsw/resources.h | 2 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 171 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 32 +- + .../net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c | 5 +- + .../ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c | 12 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 91 +- + .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c | 4 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 28 +- + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 53 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 3 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 305 ++- + .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 6 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 3 +- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 6 +- + drivers/net/ethernet/micrel/ks8851_spi.c | 4 +- + drivers/net/ethernet/microchip/enc28j60.c | 4 +- + drivers/net/ethernet/microchip/encx24j600.c | 4 +- + drivers/net/ethernet/microchip/lan743x_ethtool.c | 2 +- + drivers/net/ethernet/microchip/lan743x_main.c | 274 ++- + drivers/net/ethernet/microchip/lan743x_main.h | 62 +- + drivers/net/ethernet/microchip/lan743x_ptp.c | 8 +- + drivers/net/ethernet/microchip/lan966x/Kconfig | 1 + + drivers/net/ethernet/microchip/lan966x/Makefile | 3 +- + .../ethernet/microchip/lan966x/lan966x_ethtool.c | 34 + + .../net/ethernet/microchip/lan966x/lan966x_main.c | 132 +- + .../net/ethernet/microchip/lan966x/lan966x_main.h | 54 + + .../net/ethernet/microchip/lan966x/lan966x_mdb.c | 45 + + .../ethernet/microchip/lan966x/lan966x_phylink.c | 9 + + .../net/ethernet/microchip/lan966x/lan966x_ptp.c | 618 ++++++ + .../net/ethernet/microchip/lan966x/lan966x_regs.h | 121 ++ + .../ethernet/microchip/lan966x/lan966x_switchdev.c | 85 +- + .../net/ethernet/microchip/sparx5/sparx5_main.c | 2 - + .../net/ethernet/microchip/sparx5/sparx5_phylink.c | 10 + + .../ethernet/microchip/sparx5/sparx5_switchdev.c | 31 +- + drivers/net/ethernet/microsoft/mana/gdma_main.c | 4 +- + drivers/net/ethernet/microsoft/mana/mana.h | 15 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 70 +- + drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 35 +- + drivers/net/ethernet/moxa/moxart_ether.c | 4 +- + drivers/net/ethernet/mscc/ocelot.c | 470 ++++- + drivers/net/ethernet/mscc/ocelot.h | 11 +- + drivers/net/ethernet/mscc/ocelot_flower.c | 17 +- + drivers/net/ethernet/mscc/ocelot_io.c | 13 + + drivers/net/ethernet/mscc/ocelot_mrp.c | 64 +- + drivers/net/ethernet/mscc/ocelot_net.c | 76 +- + drivers/net/ethernet/mscc/ocelot_police.c | 41 + + drivers/net/ethernet/mscc/ocelot_police.h | 5 + + drivers/net/ethernet/mscc/ocelot_vcap.c | 1 + + drivers/net/ethernet/netronome/nfp/flower/action.c | 58 + + drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 7 + + drivers/net/ethernet/netronome/nfp/flower/main.h | 49 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 16 +- + .../net/ethernet/netronome/nfp/flower/qos_conf.c | 470 ++++- + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 12 +- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 81 +- + drivers/net/ethernet/netronome/nfp/nfp_net_sriov.h | 3 +- + drivers/net/ethernet/netronome/nfp/nfp_port.h | 3 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 2 +- + drivers/net/ethernet/ni/nixge.c | 5 +- + drivers/net/ethernet/pensando/ionic/ionic.h | 7 +- + .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 17 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 164 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 6 +- + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 6 +- + drivers/net/ethernet/pensando/ionic/ionic_if.h | 6 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 206 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 2 +- + drivers/net/ethernet/pensando/ionic/ionic_main.c | 125 +- + .../net/ethernet/pensando/ionic/ionic_rx_filter.c | 37 +- + drivers/net/ethernet/pensando/ionic/ionic_stats.c | 1 - + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 67 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 3 + + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 90 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 38 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 29 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.h | 1 + + drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 3 +- + drivers/net/ethernet/qualcomm/qca_spi.c | 4 +- + .../net/ethernet/qualcomm/rmnet/rmnet_map_data.c | 4 +- + drivers/net/ethernet/realtek/r8169_main.c | 74 +- + drivers/net/ethernet/realtek/r8169_phy_config.c | 71 +- + drivers/net/ethernet/renesas/ravb_main.c | 15 +- + drivers/net/ethernet/renesas/sh_eth.c | 18 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 2 +- + drivers/net/ethernet/sfc/ef10.c | 26 + + drivers/net/ethernet/sfc/ef100_nic.c | 9 + + drivers/net/ethernet/sfc/efx_channels.c | 63 +- + drivers/net/ethernet/sfc/net_driver.h | 2 + + drivers/net/ethernet/sfc/nic_common.h | 5 + + drivers/net/ethernet/sfc/rx_common.c | 18 +- + drivers/net/ethernet/sfc/rx_common.h | 6 + + drivers/net/ethernet/sfc/siena.c | 8 + + drivers/net/ethernet/socionext/netsec.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 7 +- + .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 37 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 30 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 +- + .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 147 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 22 +- + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 8 +- + drivers/net/ethernet/sun/cassini.c | 5 +- + drivers/net/ethernet/ti/am65-cpsw-switchdev.c | 4 - + drivers/net/ethernet/ti/cpsw_switchdev.c | 4 - + drivers/net/ethernet/vertexcom/mse102x.c | 4 +- + drivers/net/ethernet/wiznet/w5100-spi.c | 4 +- + drivers/net/ethernet/xilinx/Kconfig | 2 +- + drivers/net/ethernet/xilinx/ll_temac.h | 4 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 7 +- + drivers/net/ethernet/xilinx/xilinx_axienet.h | 2 + + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 110 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- + drivers/net/fjes/fjes_main.c | 5 +- + drivers/net/geneve.c | 4 +- + drivers/net/gtp.c | 2 +- + drivers/net/hamradio/dmascc.c | 7 +- + drivers/net/hyperv/netvsc.c | 24 +- + drivers/net/ieee802154/adf7242.c | 4 +- + drivers/net/ieee802154/at86rf230.c | 4 +- + drivers/net/ieee802154/atusb.c | 186 +- + drivers/net/ieee802154/ca8210.c | 6 +- + drivers/net/ieee802154/cc2520.c | 4 +- + drivers/net/ieee802154/mac802154_hwsim.c | 2 +- + drivers/net/ieee802154/mcr20a.c | 4 +- + drivers/net/ieee802154/mrf24j40.c | 4 +- + drivers/net/ipa/gsi_trans.c | 11 + + drivers/net/ipa/gsi_trans.h | 10 + + drivers/net/ipa/ipa_data-v3.1.c | 2 + + drivers/net/ipa/ipa_data-v3.5.1.c | 2 + + drivers/net/ipa/ipa_data-v4.11.c | 2 + + drivers/net/ipa/ipa_data-v4.2.c | 2 + + drivers/net/ipa/ipa_data-v4.5.c | 2 + + drivers/net/ipa/ipa_data-v4.9.c | 2 + + drivers/net/ipa/ipa_data.h | 2 + + drivers/net/ipa/ipa_endpoint.c | 217 +- + drivers/net/ipa/ipa_endpoint.h | 8 +- + drivers/net/loopback.c | 6 +- + drivers/net/macsec.c | 6 +- + drivers/net/macvlan.c | 4 +- + drivers/net/macvtap.c | 6 + + drivers/net/mctp/Kconfig | 12 + + drivers/net/mctp/Makefile | 1 + + drivers/net/mctp/mctp-i2c.c | 1082 ++++++++++ + drivers/net/mdio/mdio-xgene.c | 3 +- + drivers/net/mhi_net.c | 2 +- + drivers/net/ntb_netdev.c | 2 +- + drivers/net/pcs/pcs-xpcs.c | 41 +- + drivers/net/phy/aquantia_main.c | 4 +- + drivers/net/phy/at803x.c | 146 +- + drivers/net/phy/phy-core.c | 22 +- + drivers/net/phy/phylink.c | 90 +- + drivers/net/phy/sfp.c | 48 +- + drivers/net/phy/spi_ks8995.c | 4 +- + drivers/net/rionet.c | 2 +- + drivers/net/sb1000.c | 2 +- + drivers/net/tap.c | 3 +- + drivers/net/team/team.c | 5 + + drivers/net/tun.c | 46 +- + drivers/net/usb/Kconfig | 1 + + drivers/net/usb/asix.h | 4 +- + drivers/net/usb/asix_common.c | 81 +- + drivers/net/usb/asix_devices.c | 22 +- + drivers/net/usb/cdc_mbim.c | 1 + + drivers/net/usb/gl620a.c | 2 +- + drivers/net/usb/hso.c | 2 +- + drivers/net/usb/smsc95xx.c | 25 + + drivers/net/veth.c | 2 +- + drivers/net/virtio_net.c | 3 +- + drivers/net/vrf.c | 2 +- + drivers/net/vxlan/Makefile | 7 + + drivers/net/{vxlan.c => vxlan/vxlan_core.c} | 436 ++-- + drivers/net/vxlan/vxlan_multicast.c | 272 +++ + drivers/net/vxlan/vxlan_private.h | 162 ++ + drivers/net/vxlan/vxlan_vnifilter.c | 999 ++++++++++ + drivers/net/wan/lmc/lmc_main.c | 3 +- + drivers/net/wan/slic_ds26522.c | 3 +- + drivers/net/wireless/ath/ath10k/core.c | 16 + + drivers/net/wireless/ath/ath10k/htt.c | 153 ++ + drivers/net/wireless/ath/ath10k/htt.h | 296 ++- + drivers/net/wireless/ath/ath10k/htt_rx.c | 331 +++- + drivers/net/wireless/ath/ath10k/htt_tx.c | 36 +- + drivers/net/wireless/ath/ath10k/hw.c | 15 +- + drivers/net/wireless/ath/ath10k/hw.h | 27 +- + drivers/net/wireless/ath/ath10k/rx_desc.h | 40 +- + drivers/net/wireless/ath/ath10k/snoc.c | 15 +- + drivers/net/wireless/ath/ath10k/txrx.c | 2 +- + drivers/net/wireless/ath/ath10k/wmi.c | 2 +- + drivers/net/wireless/ath/ath10k/wow.c | 7 +- + drivers/net/wireless/ath/ath11k/core.c | 10 + + drivers/net/wireless/ath/ath11k/core.h | 1 + + drivers/net/wireless/ath/ath11k/debugfs.c | 6 + + drivers/net/wireless/ath/ath11k/dp_rx.c | 195 +- + drivers/net/wireless/ath/ath11k/dp_tx.c | 5 +- + drivers/net/wireless/ath/ath11k/hal_rx.h | 8 +- + drivers/net/wireless/ath/ath11k/hw.c | 16 + + drivers/net/wireless/ath/ath11k/hw.h | 2 + + drivers/net/wireless/ath/ath11k/mac.c | 52 +- + drivers/net/wireless/ath/ath11k/mhi.c | 1 + + drivers/net/wireless/ath/ath11k/peer.c | 40 +- + drivers/net/wireless/ath/ath11k/qmi.c | 3 +- + drivers/net/wireless/ath/ath11k/reg.c | 25 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 4 - + drivers/net/wireless/ath/ath5k/dma.c | 23 +- + drivers/net/wireless/ath/ath5k/eeprom.c | 3 + + drivers/net/wireless/ath/ath9k/eeprom.c | 6 +- + drivers/net/wireless/ath/ath9k/htc_hst.c | 5 + + drivers/net/wireless/ath/dfs_pattern_detector.c | 6 +- + drivers/net/wireless/ath/wcn36xx/main.c | 104 +- + drivers/net/wireless/ath/wcn36xx/txrx.c | 36 + + drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 13 + + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 33 +- + .../broadcom/brcm80211/brcmfmac/firmware.c | 2 + + .../wireless/broadcom/brcm80211/brcmfmac/fwil.c | 34 +- + .../wireless/broadcom/brcm80211/brcmfmac/fwil.h | 28 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 10 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 12 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 78 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 1 - + .../broadcom/brcm80211/include/brcm_hw_ids.h | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 3 + + drivers/net/wireless/intersil/p54/p54spi.c | 4 +- + drivers/net/wireless/marvell/libertas/if_spi.c | 4 +- + drivers/net/wireless/mediatek/mt76/dma.c | 14 +- + drivers/net/wireless/mediatek/mt76/mac80211.c | 30 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 22 +- + drivers/net/wireless/mediatek/mt76/mt7603/main.c | 3 + + .../net/wireless/mediatek/mt76/mt7615/debugfs.c | 15 +- + drivers/net/wireless/mediatek/mt76/mt7615/init.c | 1 - + drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 136 +- + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 12 +- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 220 +- + drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 22 +- + drivers/net/wireless/mediatek/mt76/mt7615/sdio.c | 15 +- + drivers/net/wireless/mediatek/mt76/mt7615/usb.c | 1 + + drivers/net/wireless/mediatek/mt76/mt76_connac.h | 71 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 378 +++- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 117 +- + drivers/net/wireless/mediatek/mt76/mt76x02.h | 3 +- + drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 25 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 30 +- + drivers/net/wireless/mediatek/mt76/mt76x02_regs.h | 2 + + drivers/net/wireless/mediatek/mt76/mt7915/Kconfig | 3 +- + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 217 +- + drivers/net/wireless/mediatek/mt76/mt7915/dma.c | 454 +++-- + drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c | 87 +- + drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h | 9 +- + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 156 +- + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 437 ++-- + drivers/net/wireless/mediatek/mt76/mt7915/mac.h | 15 +- + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 131 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 1323 +++---------- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 54 +- + drivers/net/wireless/mediatek/mt76/mt7915/mmio.c | 577 +++++- + drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 87 +- + drivers/net/wireless/mediatek/mt76/mt7915/pci.c | 259 +-- + drivers/net/wireless/mediatek/mt76/mt7915/regs.h | 586 ++++-- + .../net/wireless/mediatek/mt76/mt7915/testmode.c | 61 +- + .../net/wireless/mediatek/mt76/mt7921/debugfs.c | 37 +- + drivers/net/wireless/mediatek/mt76/mt7921/dma.c | 119 -- + drivers/net/wireless/mediatek/mt76/mt7921/init.c | 10 +- + drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 37 +- + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 36 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 274 +-- + drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 21 +- + drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 125 ++ + .../net/wireless/mediatek/mt76/mt7921/pci_mac.c | 37 +- + .../net/wireless/mediatek/mt76/mt7921/pci_mcu.c | 20 +- + drivers/net/wireless/mediatek/mt76/mt7921/regs.h | 3 + + drivers/net/wireless/mediatek/mt76/mt7921/sdio.c | 15 +- + .../net/wireless/mediatek/mt76/mt7921/sdio_mac.c | 6 +- + .../net/wireless/mediatek/mt76/mt7921/sdio_mcu.c | 38 + + drivers/net/wireless/mediatek/mt76/sdio.c | 14 +- + drivers/net/wireless/mediatek/mt76/sdio.h | 2 + + drivers/net/wireless/mediatek/mt76/sdio_txrx.c | 26 +- + drivers/net/wireless/microchip/wilc1000/spi.c | 9 +- + drivers/net/wireless/ray_cs.c | 6 + + drivers/net/wireless/realtek/rtlwifi/cam.c | 2 +- + drivers/net/wireless/realtek/rtw88/fw.c | 42 +- + drivers/net/wireless/realtek/rtw88/mac80211.c | 5 +- + drivers/net/wireless/realtek/rtw88/main.c | 83 +- + drivers/net/wireless/realtek/rtw88/main.h | 4 +- + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 1 + + drivers/net/wireless/realtek/rtw89/Kconfig | 4 + + drivers/net/wireless/realtek/rtw89/Makefile | 13 +- + drivers/net/wireless/realtek/rtw89/cam.c | 40 +- + drivers/net/wireless/realtek/rtw89/cam.h | 5 + + drivers/net/wireless/realtek/rtw89/coex.c | 11 +- + drivers/net/wireless/realtek/rtw89/core.c | 458 ++++- + drivers/net/wireless/realtek/rtw89/core.h | 102 +- + drivers/net/wireless/realtek/rtw89/debug.c | 93 +- + drivers/net/wireless/realtek/rtw89/fw.c | 147 +- + drivers/net/wireless/realtek/rtw89/fw.h | 140 +- + drivers/net/wireless/realtek/rtw89/mac.c | 93 +- + drivers/net/wireless/realtek/rtw89/mac.h | 22 +- + drivers/net/wireless/realtek/rtw89/mac80211.c | 80 +- + drivers/net/wireless/realtek/rtw89/pci.c | 161 +- + drivers/net/wireless/realtek/rtw89/pci.h | 5 + + drivers/net/wireless/realtek/rtw89/phy.c | 91 +- + drivers/net/wireless/realtek/rtw89/phy.h | 6 + + drivers/net/wireless/realtek/rtw89/reg.h | 18 +- + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 20 +- + drivers/net/wireless/realtek/rtw89/rtw8852a.h | 2 + + drivers/net/wireless/realtek/rtw89/rtw8852ae.c | 39 + + drivers/net/wireless/realtek/rtw89/txrx.h | 3 + + drivers/net/wireless/st/cw1200/cw1200_spi.c | 4 +- + drivers/net/wireless/st/cw1200/wsm.c | 2 +- + drivers/net/wireless/ti/wl1251/spi.c | 4 +- + drivers/net/wireless/ti/wlcore/spi.c | 4 +- + drivers/net/wwan/iosm/iosm_ipc_debugfs.c | 5 +- + drivers/net/wwan/iosm/iosm_ipc_imem.c | 54 +- + drivers/net/wwan/iosm/iosm_ipc_imem.h | 7 + + drivers/net/wwan/iosm/iosm_ipc_mmio.c | 6 +- + drivers/net/wwan/iosm/iosm_ipc_mmio.h | 6 +- + drivers/net/wwan/iosm/iosm_ipc_mux.c | 21 +- + drivers/net/wwan/iosm/iosm_ipc_mux.h | 133 +- + drivers/net/wwan/iosm/iosm_ipc_mux_codec.c | 742 ++++++- + drivers/net/wwan/iosm/iosm_ipc_mux_codec.h | 142 +- + drivers/net/wwan/iosm/iosm_ipc_pcie.c | 1 + + drivers/net/wwan/iosm/iosm_ipc_pcie.h | 1 + + drivers/net/wwan/wwan_core.c | 36 + + drivers/nfc/nfcmrvl/spi.c | 3 +- + drivers/nfc/st-nci/spi.c | 4 +- + drivers/nfc/st-nci/vendor_cmds.c | 2 +- + drivers/nfc/st21nfca/vendor_cmds.c | 4 +- + drivers/nfc/st95hf/core.c | 4 +- + drivers/nfc/trf7970a.c | 4 +- + drivers/platform/chrome/cros_ec.c | 4 +- + drivers/platform/chrome/cros_ec.h | 2 +- + drivers/platform/chrome/cros_ec_i2c.c | 4 +- + drivers/platform/chrome/cros_ec_lpc.c | 4 +- + drivers/platform/chrome/cros_ec_spi.c | 4 +- + drivers/platform/olpc/olpc-xo175-ec.c | 4 +- + drivers/ptp/ptp_clock.c | 11 +- + drivers/ptp/ptp_ocp.c | 232 ++- + drivers/ptp/ptp_pch.c | 195 +- + drivers/ptp/ptp_sysfs.c | 4 +- + drivers/ptp/ptp_vclock.c | 56 +- + drivers/rtc/rtc-ds1302.c | 3 +- + drivers/rtc/rtc-ds1305.c | 4 +- + drivers/rtc/rtc-ds1343.c | 4 +- + drivers/s390/net/lcs.c | 8 +- + drivers/s390/net/qeth_core_main.c | 2 +- + drivers/s390/net/qeth_l3_main.c | 1 - + drivers/soc/fsl/dpio/qbman-portal.c | 8 +- + drivers/spi/spi-mem.c | 6 +- + drivers/spi/spi-slave-system-control.c | 3 +- + drivers/spi/spi-slave-time.c | 3 +- + drivers/spi/spi-tle62x0.c | 3 +- + drivers/spi/spi.c | 11 +- + drivers/spi/spidev.c | 4 +- + drivers/staging/fbtft/fbtft.h | 92 +- + drivers/staging/pi433/pi433_if.c | 4 +- + drivers/staging/wfx/bus_spi.c | 3 +- + drivers/tty/serial/max3100.c | 5 +- + drivers/tty/serial/max310x.c | 3 +- + drivers/tty/serial/sc16is7xx.c | 4 +- + drivers/usb/gadget/udc/max3420_udc.c | 4 +- + drivers/usb/host/max3421-hcd.c | 3 +- + drivers/vhost/net.c | 1 + + drivers/video/backlight/ams369fg06.c | 3 +- + drivers/video/backlight/corgi_lcd.c | 3 +- + drivers/video/backlight/ili922x.c | 3 +- + drivers/video/backlight/l4f00242t03.c | 3 +- + drivers/video/backlight/lms501kf03.c | 3 +- + drivers/video/backlight/ltv350qv.c | 3 +- + drivers/video/backlight/tdo24m.c | 3 +- + drivers/video/backlight/tosa_lcd.c | 4 +- + drivers/video/backlight/vgg2432a4.c | 4 +- + drivers/video/fbdev/omap/lcd_mipid.c | 4 +- + .../omapfb/displays/panel-lgphilips-lb035q02.c | 4 +- + .../omap2/omapfb/displays/panel-nec-nl8048hl11.c | 4 +- + .../omap2/omapfb/displays/panel-sony-acx565akm.c | 4 +- + .../omap2/omapfb/displays/panel-tpo-td028ttec1.c | 4 +- + .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 4 +- + include/linux/bpf-cgroup.h | 24 +- + include/linux/bpf.h | 122 +- + include/linux/bpf_verifier.h | 7 + + include/linux/btf.h | 85 +- + include/linux/btf_ids.h | 13 +- + include/linux/can/bittiming.h | 6 +- + include/linux/compiler_types.h | 3 + + include/linux/dsa/8021q.h | 26 +- + include/linux/dsa/tag_qca.h | 82 + + include/linux/etherdevice.h | 5 +- + include/linux/ethtool.h | 6 + + include/linux/filter.h | 35 +- + include/linux/ieee80211.h | 8 +- + include/linux/if_bridge.h | 1 + + include/linux/if_hsr.h | 16 + + include/linux/inetdevice.h | 1 + + include/linux/ipv6.h | 9 +- + include/linux/linkmode.h | 5 - + include/linux/mii.h | 50 - + include/linux/mlx5/cq.h | 2 + + include/linux/mlx5/driver.h | 19 +- + include/linux/mlx5/fs.h | 1 + + include/linux/mlx5/mlx5_ifc.h | 21 +- + include/linux/net/intel/i40e_client.h | 10 - + include/linux/netdevice.h | 132 +- + include/linux/netfilter.h | 1 + + include/linux/netfilter/nf_conntrack_pptp.h | 38 +- + include/linux/netlink.h | 9 - + include/linux/pci_ids.h | 2 + + include/linux/pcs/pcs-xpcs.h | 3 +- + include/linux/phy.h | 2 +- + include/linux/phylink.h | 4 - + include/linux/ref_tracker.h | 4 + + include/linux/rtnetlink.h | 3 + + include/linux/skbuff.h | 186 +- + include/linux/skmsg.h | 16 +- + include/linux/socket.h | 1 + + include/linux/spi/spi.h | 2 +- + include/linux/ssb/ssb_driver_gige.h | 2 +- + include/linux/sunrpc/svc_xprt.h | 1 + + include/linux/sunrpc/xprt.h | 1 + + include/linux/tcp.h | 1 + + include/linux/udp.h | 5 - + include/linux/uio.h | 17 + + include/linux/wwan.h | 2 + + include/net/addrconf.h | 2 + + include/net/arp.h | 1 + + include/net/ax25.h | 12 - + include/net/bluetooth/hci_core.h | 17 + + include/net/bluetooth/mgmt.h | 16 + + include/net/bond_options.h | 31 +- + include/net/bonding.h | 40 +- + include/net/cfg80211.h | 10 +- + include/net/cfg802154.h | 10 + + include/net/dsa.h | 175 +- + include/net/flow_offload.h | 15 + + include/net/gro.h | 57 +- + include/net/ieee80211_radiotap.h | 4 +- + include/net/if_inet6.h | 2 + + include/net/inet_connection_sock.h | 8 + + include/net/inet_dscp.h | 57 + + include/net/inet_frag.h | 2 + + include/net/inet_timewait_sock.h | 8 +- + include/net/ip.h | 3 +- + include/net/ip6_fib.h | 3 +- + include/net/ip_fib.h | 3 +- + include/net/ipv6.h | 21 +- + include/net/ipv6_frag.h | 1 + + include/net/mac80211.h | 19 +- + include/net/mac802154.h | 12 + + include/net/mctp.h | 28 +- + include/net/mptcp.h | 6 - + include/net/ndisc.h | 5 + + include/net/net_namespace.h | 8 +- + include/net/netfilter/nf_conntrack_acct.h | 1 - + include/net/netfilter/nf_conntrack_bpf.h | 23 + + include/net/netfilter/nf_conntrack_ecache.h | 15 +- + include/net/netfilter/nf_conntrack_extend.h | 18 +- + include/net/netfilter/nf_conntrack_labels.h | 3 - + include/net/netfilter/nf_conntrack_seqadj.h | 3 - + include/net/netfilter/nf_conntrack_timeout.h | 20 +- + include/net/netfilter/nf_conntrack_timestamp.h | 13 - + include/net/netfilter/nf_tables_core.h | 9 + + include/net/netns/core.h | 1 + + include/net/netns/ipv4.h | 11 +- + include/net/netns/ipv6.h | 6 +- + include/net/netns/smc.h | 6 + + include/net/page_pool.h | 133 +- + include/net/pkt_cls.h | 11 + + include/net/pkt_sched.h | 6 - + include/net/request_sock.h | 2 + + include/net/sch_generic.h | 5 - + include/net/sock.h | 28 +- + include/net/switchdev.h | 56 +- + include/net/tc_act/tc_police.h | 30 + + include/net/tcp.h | 23 +- + include/net/udplite.h | 43 - + include/net/vxlan.h | 54 +- + include/net/xdp.h | 108 +- + include/net/xdp_sock_drv.h | 5 +- + include/net/xsk_buff_pool.h | 1 + + include/soc/mscc/ocelot.h | 99 +- + include/soc/mscc/ocelot_vcap.h | 16 + + include/trace/events/mctp.h | 5 +- + include/trace/events/net.h | 14 - + include/trace/events/skb.h | 29 + + include/uapi/asm-generic/socket.h | 2 + + include/uapi/linux/bpf.h | 121 +- + include/uapi/linux/ethtool_netlink.h | 8 + + include/uapi/linux/if_addr.h | 9 +- + include/uapi/linux/if_ether.h | 2 + + include/uapi/linux/if_link.h | 88 + + include/uapi/linux/ioam6_iptunnel.h | 9 + + include/uapi/linux/mctp.h | 18 + + include/uapi/linux/mroute6.h | 1 + + include/uapi/linux/net_dropmon.h | 1 + + include/uapi/linux/netfilter/nfnetlink_queue.h | 1 + + include/uapi/linux/openvswitch.h | 6 + + include/uapi/linux/rtnetlink.h | 13 + + include/uapi/linux/smc.h | 15 + + include/uapi/linux/socket.h | 4 + + init/Kconfig | 4 + + init/main.c | 2 + + kernel/bpf/arraymap.c | 4 +- + kernel/bpf/bpf_iter.c | 20 +- + kernel/bpf/btf.c | 556 +++++- + kernel/bpf/cgroup.c | 179 +- + kernel/bpf/core.c | 318 ++- + kernel/bpf/cpumap.c | 8 +- + kernel/bpf/devmap.c | 3 +- + kernel/bpf/helpers.c | 34 + + kernel/bpf/inode.c | 39 +- + kernel/bpf/preload/Kconfig | 7 +- + kernel/bpf/preload/Makefile | 40 +- + kernel/bpf/preload/bpf_preload.h | 8 +- + kernel/bpf/preload/bpf_preload_kern.c | 119 +- + kernel/bpf/preload/bpf_preload_umd_blob.S | 7 - + kernel/bpf/preload/iterators/Makefile | 6 +- + kernel/bpf/preload/iterators/bpf_preload_common.h | 13 - + kernel/bpf/preload/iterators/iterators.c | 94 - + kernel/bpf/preload/iterators/iterators.lskel.h | 425 ++++ + kernel/bpf/preload/iterators/iterators.skel.h | 412 ---- + kernel/bpf/syscall.c | 64 +- + kernel/bpf/trampoline.c | 6 +- + kernel/bpf/verifier.c | 243 ++- + kernel/trace/bpf_trace.c | 5 + + lib/Kconfig.debug | 12 +- + lib/ref_tracker.c | 19 +- + net/6lowpan/core.c | 1 + + net/8021q/vlan_dev.c | 8 +- + net/Kconfig | 13 + + net/ax25/ax25_route.c | 5 +- + net/batman-adv/bat_iv_ogm.c | 2 +- + net/batman-adv/bat_v_elp.c | 2 +- + net/batman-adv/bat_v_ogm.c | 2 +- + net/batman-adv/bridge_loop_avoidance.c | 1 + + net/batman-adv/distributed-arp-table.c | 2 +- + net/batman-adv/gateway_client.c | 1 + + net/batman-adv/hard-interface.c | 6 +- + net/batman-adv/main.c | 2 +- + net/batman-adv/main.h | 2 +- + net/batman-adv/multicast.c | 3 +- + net/batman-adv/network-coding.c | 2 +- + net/batman-adv/originator.c | 2 +- + net/batman-adv/send.c | 2 +- + net/batman-adv/soft-interface.c | 2 +- + net/batman-adv/tp_meter.c | 2 +- + net/batman-adv/translation-table.c | 2 +- + net/batman-adv/tvlv.c | 2 +- + net/bluetooth/hci_conn.c | 1 + + net/bluetooth/hci_core.c | 5 +- + net/bluetooth/hci_event.c | 89 +- + net/bluetooth/hci_sync.c | 7 +- + net/bluetooth/mgmt.c | 117 +- + net/bluetooth/msft.c | 170 +- + net/bpf/bpf_dummy_struct_ops.c | 6 +- + net/bpf/test_run.c | 277 ++- + net/bridge/br.c | 15 +- + net/bridge/br_forward.c | 2 +- + net/bridge/br_input.c | 11 +- + net/bridge/br_netlink.c | 6 +- + net/bridge/br_private.h | 6 +- + net/bridge/br_switchdev.c | 97 +- + net/bridge/br_vlan.c | 117 +- + net/bridge/netfilter/nf_conntrack_bridge.c | 5 +- + net/caif/caif_dev.c | 2 +- + net/can/gw.c | 25 +- + net/core/dev.c | 582 ++++-- + net/core/drop_monitor.c | 120 +- + net/core/filter.c | 451 ++++- + net/core/flow_dissector.c | 17 + + net/core/gro.c | 16 +- + net/core/gro_cells.c | 36 +- + net/core/link_watch.c | 6 +- + net/core/neighbour.c | 6 +- + net/core/net_namespace.c | 20 +- + net/core/page_pool.c | 102 +- + net/core/rtnetlink.c | 526 ++++- + net/core/skbuff.c | 55 +- + net/core/sock.c | 22 +- + net/core/sock_map.c | 77 +- + net/core/sysctl_net_core.c | 20 +- + net/core/utils.c | 4 +- + net/core/xdp.c | 78 +- + net/dccp/dccp.h | 5 - + net/dccp/ipv4.c | 6 - + net/dccp/ipv6.c | 6 - + net/dccp/minisocks.c | 1 + + net/decnet/dn_nsp_out.c | 3 +- + net/dsa/dsa.c | 40 + + net/dsa/dsa2.c | 127 +- + net/dsa/dsa_priv.h | 105 +- + net/dsa/master.c | 4 - + net/dsa/port.c | 396 +++- + net/dsa/slave.c | 515 +++-- + net/dsa/switch.c | 444 ++++- + net/dsa/tag_8021q.c | 323 ++- + net/dsa/tag_dsa.c | 4 +- + net/dsa/tag_ocelot_8021q.c | 11 +- + net/dsa/tag_qca.c | 85 +- + net/dsa/tag_sja1105.c | 28 +- + net/ethtool/netlink.h | 2 +- + net/ethtool/rings.c | 30 +- + net/hsr/hsr_debugfs.c | 40 +- + net/hsr/hsr_device.c | 10 +- + net/hsr/hsr_forward.c | 7 +- + net/hsr/hsr_framereg.c | 209 +- + net/hsr/hsr_framereg.h | 14 +- + net/hsr/hsr_main.h | 30 +- + net/hsr/hsr_netlink.c | 4 +- + net/ieee802154/6lowpan/core.c | 1 + + net/ieee802154/6lowpan/reassembly.c | 1 + + net/ieee802154/nl-phy.c | 4 +- + net/ipv4/arp.c | 11 +- + net/ipv4/bpf_tcp_ca.c | 28 +- + net/ipv4/devinet.c | 7 + + net/ipv4/fib_frontend.c | 35 +- + net/ipv4/fib_lookup.h | 3 +- + net/ipv4/fib_rules.c | 19 +- + net/ipv4/fib_semantics.c | 58 +- + net/ipv4/fib_trie.c | 58 +- + net/ipv4/icmp.c | 91 +- + net/ipv4/inet_connection_sock.c | 8 +- + net/ipv4/inet_fragment.c | 1 + + net/ipv4/inet_hashtables.c | 53 +- + net/ipv4/inet_timewait_sock.c | 75 +- + net/ipv4/ip_forward.c | 2 +- + net/ipv4/ip_fragment.c | 1 + + net/ipv4/ip_input.c | 32 +- + net/ipv4/ip_options.c | 31 +- + net/ipv4/ip_output.c | 20 +- + net/ipv4/ipmr.c | 20 +- + net/ipv4/netfilter/nf_nat_pptp.c | 24 +- + net/ipv4/nexthop.c | 12 +- + net/ipv4/proc.c | 4 +- + net/ipv4/route.c | 39 +- + net/ipv4/sysctl_net_ipv4.c | 20 +- + net/ipv4/tcp.c | 73 +- + net/ipv4/tcp_bbr.c | 18 +- + net/ipv4/tcp_cubic.c | 17 +- + net/ipv4/tcp_dctcp.c | 18 +- + net/ipv4/tcp_input.c | 53 +- + net/ipv4/tcp_ipv4.c | 169 +- + net/ipv4/tcp_minisocks.c | 7 +- + net/ipv4/tcp_output.c | 22 +- + net/ipv4/udp.c | 22 +- + net/ipv6/addrconf.c | 234 ++- + net/ipv6/af_inet6.c | 24 +- + net/ipv6/exthdrs.c | 8 +- + net/ipv6/fib6_rules.c | 30 +- + net/ipv6/icmp.c | 62 +- + net/ipv6/inet6_hashtables.c | 5 +- + net/ipv6/ioam6.c | 19 +- + net/ipv6/ioam6_iptunnel.c | 59 +- + net/ipv6/ip6_input.c | 3 +- + net/ipv6/ip6_offload.c | 5 +- + net/ipv6/ip6_output.c | 113 +- + net/ipv6/ip6_tunnel.c | 8 + + net/ipv6/ip6mr.c | 53 +- + net/ipv6/ipv6_sockglue.c | 6 +- + net/ipv6/ndisc.c | 55 +- + net/ipv6/netfilter.c | 5 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 1 + + net/ipv6/ping.c | 29 +- + net/ipv6/reassembly.c | 1 + + net/ipv6/route.c | 48 +- + net/ipv6/tcp_ipv6.c | 101 +- + net/ipv6/udp.c | 114 +- + net/ipv6/xfrm6_policy.c | 1 - + net/iucv/iucv.c | 2 +- + net/mac80211/airtime.c | 11 +- + net/mac80211/debugfs.c | 2 + + net/mac80211/debugfs_key.c | 2 +- + net/mac80211/debugfs_netdev.c | 4 +- + net/mac80211/ieee80211_i.h | 2 +- + net/mac80211/mesh.c | 2 +- + net/mac80211/mlme.c | 183 +- + net/mac80211/rc80211_minstrel_ht.c | 2 +- + net/mac80211/rx.c | 2 + + net/mac80211/sta_info.c | 3 +- + net/mac80211/status.c | 14 +- + net/mac80211/util.c | 28 +- + net/mac80211/vht.c | 4 +- + net/mctp/af_mctp.c | 189 +- + net/mctp/device.c | 34 +- + net/mctp/neigh.c | 2 +- + net/mctp/route.c | 149 +- + net/mctp/test/route-test.c | 157 +- + net/mctp/test/utils.c | 1 - + net/mptcp/options.c | 77 +- + net/mptcp/pm.c | 11 +- + net/mptcp/pm_netlink.c | 92 +- + net/mptcp/protocol.h | 29 +- + net/mptcp/sockopt.c | 2 + + net/mptcp/subflow.c | 37 +- + net/netfilter/Makefile | 5 + + net/netfilter/core.c | 3 +- + net/netfilter/ipvs/ip_vs_xmit.c | 6 +- + net/netfilter/nf_conntrack_acct.c | 19 - + net/netfilter/nf_conntrack_bpf.c | 257 +++ + net/netfilter/nf_conntrack_core.c | 102 +- + net/netfilter/nf_conntrack_ecache.c | 47 +- + net/netfilter/nf_conntrack_extend.c | 132 +- + net/netfilter/nf_conntrack_helper.c | 17 - + net/netfilter/nf_conntrack_labels.c | 20 +- + net/netfilter/nf_conntrack_netlink.c | 36 +- + net/netfilter/nf_conntrack_pptp.c | 60 +- + net/netfilter/nf_conntrack_proto_udp.c | 4 +- + net/netfilter/nf_conntrack_seqadj.c | 16 - + net/netfilter/nf_conntrack_timeout.c | 50 +- + net/netfilter/nf_conntrack_timestamp.c | 20 - + net/netfilter/nf_dup_netdev.c | 2 +- + net/netfilter/nf_flow_table_ip.c | 4 +- + net/netfilter/nf_nat_core.c | 28 +- + net/netfilter/nf_synproxy_core.c | 24 +- + net/netfilter/nf_tables_core.c | 16 + + net/netfilter/nfnetlink_cttimeout.c | 11 +- + net/netfilter/nfnetlink_log.c | 6 +- + net/netfilter/nfnetlink_queue.c | 21 +- + net/netfilter/nft_cmp.c | 102 +- + net/netfilter/nft_compat.c | 9 + + net/netfilter/nft_exthdr.c | 96 +- + net/netfilter/nft_fwd_netdev.c | 2 +- + net/nfc/llcp.h | 1 - + net/nfc/llcp_core.c | 9 +- + net/nfc/llcp_sock.c | 49 +- + net/openvswitch/datapath.c | 18 +- + net/openvswitch/datapath.h | 2 - + net/openvswitch/flow.c | 143 +- + net/openvswitch/flow.h | 14 + + net/openvswitch/flow_netlink.c | 26 +- + net/openvswitch/vport.c | 2 +- + net/packet/af_packet.c | 4 +- + net/sched/act_api.c | 2 + + net/sched/act_bpf.c | 2 + + net/sched/act_ct.c | 13 - + net/sched/act_police.c | 62 +- + net/sched/cls_api.c | 45 +- + net/sched/cls_bpf.c | 2 + + net/smc/Makefile | 2 +- + net/smc/af_smc.c | 234 ++- + net/smc/smc.h | 19 +- + net/smc/smc_cdc.c | 24 +- + net/smc/smc_core.c | 2 +- + net/smc/smc_netlink.c | 15 + + net/smc/smc_pnet.c | 3 + + net/smc/smc_sysctl.c | 80 + + net/smc/smc_sysctl.h | 32 + + net/smc/smc_tx.c | 154 +- + net/smc/smc_tx.h | 3 + + net/smc/smc_wr.c | 49 +- + net/sunrpc/auth_gss/auth_gss.c | 10 +- + net/sunrpc/svc_xprt.c | 4 +- + net/sunrpc/xprt.c | 4 +- + net/switchdev/switchdev.c | 232 ++- + net/tipc/msg.h | 23 - + net/tls/tls_sw.c | 3 +- + net/unix/af_unix.c | 250 ++- + net/wireless/pmsr.c | 4 - + net/wireless/scan.c | 9 +- + net/wireless/util.c | 8 +- + net/xdp/xsk.c | 13 +- + net/xdp/xsk_buff_pool.c | 7 + + net/xdp/xsk_queue.h | 19 +- + net/xfrm/xfrm_interface.c | 2 +- + samples/bpf/map_perf_test_user.c | 2 +- + samples/bpf/xdp1_user.c | 24 +- + samples/bpf/xdp_adjust_tail_user.c | 25 +- + samples/bpf/xdp_fwd_user.c | 19 +- + samples/bpf/xdp_redirect_cpu.bpf.c | 8 +- + samples/bpf/xdp_redirect_cpu_user.c | 2 +- + samples/bpf/xdp_redirect_map.bpf.c | 2 +- + samples/bpf/xdp_redirect_map_multi.bpf.c | 2 +- + samples/bpf/xdp_router_ipv4_user.c | 27 +- + samples/bpf/xdp_rxq_info_user.c | 34 +- + samples/bpf/xdp_sample_pkts_user.c | 8 +- + samples/bpf/xdp_sample_user.c | 11 +- + samples/bpf/xdp_sample_user.h | 2 +- + samples/bpf/xdp_tx_iptunnel_user.c | 27 +- + samples/bpf/xdpsock_ctrl_proc.c | 2 +- + samples/bpf/xdpsock_user.c | 10 +- + samples/bpf/xsk_fwd.c | 4 +- + scripts/bpf_doc.py | 124 +- + scripts/pahole-flags.sh | 2 +- + scripts/pahole-version.sh | 13 + + security/device_cgroup.c | 2 +- + security/selinux/nlmsgtab.c | 6 +- + sound/pci/hda/cs35l41_hda_spi.c | 4 +- + sound/soc/codecs/adau1761-spi.c | 3 +- + sound/soc/codecs/adau1781-spi.c | 3 +- + sound/soc/codecs/cs35l41-spi.c | 4 +- + sound/soc/codecs/pcm3168a-spi.c | 4 +- + sound/soc/codecs/pcm512x-spi.c | 3 +- + sound/soc/codecs/tlv320aic32x4-spi.c | 4 +- + sound/soc/codecs/tlv320aic3x-spi.c | 4 +- + sound/soc/codecs/wm0010.c | 4 +- + sound/soc/codecs/wm8804-spi.c | 3 +- + sound/spi/at73c213.c | 4 +- + tools/bpf/bpftool/Documentation/bpftool-gen.rst | 90 + + tools/bpf/bpftool/Documentation/common_options.rst | 13 +- + tools/bpf/bpftool/Makefile | 14 +- + tools/bpf/bpftool/bash-completion/bpftool | 6 +- + tools/bpf/bpftool/btf.c | 2 +- + tools/bpf/bpftool/cgroup.c | 6 +- + tools/bpf/bpftool/common.c | 44 + + tools/bpf/bpftool/feature.c | 29 +- + tools/bpf/bpftool/gen.c | 677 ++++++- + tools/bpf/bpftool/link.c | 3 +- + tools/bpf/bpftool/main.c | 31 +- + tools/bpf/bpftool/main.h | 4 + + tools/bpf/bpftool/map.c | 35 +- + tools/bpf/bpftool/net.c | 2 +- + tools/bpf/bpftool/pids.c | 3 +- + tools/bpf/bpftool/prog.c | 43 +- + tools/bpf/bpftool/struct_ops.c | 4 +- + tools/bpf/resolve_btfids/Makefile | 6 +- + tools/include/uapi/linux/bpf.h | 121 +- + tools/include/uapi/linux/if_link.h | 1 + + tools/lib/bpf/Makefile | 4 +- + tools/lib/bpf/bpf.c | 9 +- + tools/lib/bpf/bpf.h | 8 +- + tools/lib/bpf/bpf_helpers.h | 2 +- + tools/lib/bpf/bpf_tracing.h | 103 +- + tools/lib/bpf/btf.c | 31 +- + tools/lib/bpf/btf.h | 34 +- + tools/lib/bpf/btf_dump.c | 6 +- + tools/lib/bpf/gen_loader.c | 15 +- + tools/lib/bpf/hashmap.c | 3 +- + tools/lib/bpf/libbpf.c | 158 +- + tools/lib/bpf/libbpf.h | 73 +- + tools/lib/bpf/libbpf.map | 9 +- + tools/lib/bpf/libbpf_internal.h | 12 + + tools/lib/bpf/libbpf_legacy.h | 22 + + tools/lib/bpf/netlink.c | 180 +- + tools/lib/bpf/relo_core.c | 79 +- + tools/lib/bpf/relo_core.h | 42 +- + tools/lib/bpf/skel_internal.h | 253 ++- + tools/perf/tests/llvm.c | 2 +- + tools/perf/util/bpf-loader.c | 74 +- + tools/perf/util/bpf_map.c | 28 +- + tools/testing/selftests/bpf/Makefile | 6 +- + tools/testing/selftests/bpf/README.rst | 2 + + .../testing/selftests/bpf/benchs/bench_ringbufs.c | 2 +- + tools/testing/selftests/bpf/benchs/bench_trigger.c | 6 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 46 +- + tools/testing/selftests/bpf/config | 5 + + tools/testing/selftests/bpf/prog_tests/atomics.c | 72 +- + .../selftests/bpf/prog_tests/attach_probe.c | 18 +- + tools/testing/selftests/bpf/prog_tests/bind_perm.c | 20 +- + .../testing/selftests/bpf/prog_tests/bpf_cookie.c | 16 +- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 20 + + .../bpf/prog_tests/bpf_iter_setsockopt_unix.c | 100 + + .../selftests/bpf/prog_tests/bpf_mod_race.c | 230 +++ + tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 52 + + tools/testing/selftests/bpf/prog_tests/btf.c | 25 +- + tools/testing/selftests/bpf/prog_tests/btf_tag.c | 101 +- + .../selftests/bpf/prog_tests/cgroup_attach_multi.c | 12 +- + .../bpf/prog_tests/cgroup_getset_retval.c | 481 +++++ + tools/testing/selftests/bpf/prog_tests/check_mtu.c | 40 +- + .../selftests/bpf/prog_tests/cls_redirect.c | 10 +- + tools/testing/selftests/bpf/prog_tests/core_kern.c | 16 +- + .../selftests/bpf/prog_tests/core_kern_overflow.c | 13 + + .../testing/selftests/bpf/prog_tests/core_reloc.c | 52 +- + .../selftests/bpf/prog_tests/dummy_st_ops.c | 27 +- + .../selftests/bpf/prog_tests/fentry_fexit.c | 24 +- + .../testing/selftests/bpf/prog_tests/fentry_test.c | 7 +- + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 34 +- + .../selftests/bpf/prog_tests/fexit_stress.c | 22 +- + .../testing/selftests/bpf/prog_tests/fexit_test.c | 7 +- + .../selftests/bpf/prog_tests/flow_dissector.c | 33 +- + .../bpf/prog_tests/flow_dissector_load_bytes.c | 24 +- + tools/testing/selftests/bpf/prog_tests/for_each.c | 32 +- + .../selftests/bpf/prog_tests/get_func_args_test.c | 12 +- + .../selftests/bpf/prog_tests/get_func_ip_test.c | 10 +- + .../bpf/prog_tests/get_stackid_cannot_attach.c | 2 +- + .../testing/selftests/bpf/prog_tests/global_data.c | 26 +- + .../selftests/bpf/prog_tests/global_data_init.c | 2 +- + .../selftests/bpf/prog_tests/global_func_args.c | 14 +- + tools/testing/selftests/bpf/prog_tests/kfree_skb.c | 16 +- + .../testing/selftests/bpf/prog_tests/kfunc_call.c | 46 +- + .../selftests/bpf/prog_tests/ksyms_module.c | 27 +- + tools/testing/selftests/bpf/prog_tests/l4lb_all.c | 35 +- + tools/testing/selftests/bpf/prog_tests/log_buf.c | 2 +- + tools/testing/selftests/bpf/prog_tests/map_lock.c | 15 +- + tools/testing/selftests/bpf/prog_tests/map_ptr.c | 16 +- + .../selftests/bpf/prog_tests/modify_return.c | 33 +- + .../testing/selftests/bpf/prog_tests/pkt_access.c | 26 +- + .../selftests/bpf/prog_tests/pkt_md_access.c | 14 +- + .../selftests/bpf/prog_tests/prog_run_opts.c | 77 + + .../selftests/bpf/prog_tests/prog_run_xattr.c | 83 - + .../selftests/bpf/prog_tests/queue_stack_map.c | 46 +- + .../selftests/bpf/prog_tests/raw_tp_test_run.c | 64 +- + .../bpf/prog_tests/raw_tp_writable_test_run.c | 16 +- + .../selftests/bpf/prog_tests/signal_pending.c | 23 +- + tools/testing/selftests/bpf/prog_tests/skb_ctx.c | 81 +- + .../testing/selftests/bpf/prog_tests/skb_helpers.c | 16 +- + .../testing/selftests/bpf/prog_tests/sock_fields.c | 58 +- + .../selftests/bpf/prog_tests/sockmap_basic.c | 86 +- + .../selftests/bpf/prog_tests/sockmap_listen.c | 12 +- + .../testing/selftests/bpf/prog_tests/sockopt_sk.c | 4 +- + tools/testing/selftests/bpf/prog_tests/spinlock.c | 14 +- + .../bpf/prog_tests/stacktrace_build_id_nmi.c | 2 +- + tools/testing/selftests/bpf/prog_tests/syscall.c | 10 +- + tools/testing/selftests/bpf/prog_tests/tailcalls.c | 274 +-- + .../selftests/bpf/prog_tests/task_pt_regs.c | 16 +- + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 436 +++- + .../bpf/prog_tests/test_bpf_syscall_macro.c | 73 + + .../selftests/bpf/prog_tests/test_profiler.c | 14 +- + .../selftests/bpf/prog_tests/test_skb_pkt_end.c | 15 +- + tools/testing/selftests/bpf/prog_tests/timer.c | 7 +- + tools/testing/selftests/bpf/prog_tests/timer_mim.c | 7 +- + tools/testing/selftests/bpf/prog_tests/trace_ext.c | 28 +- + tools/testing/selftests/bpf/prog_tests/xdp.c | 34 +- + .../selftests/bpf/prog_tests/xdp_adjust_frags.c | 146 ++ + .../selftests/bpf/prog_tests/xdp_adjust_tail.c | 251 ++- + .../testing/selftests/bpf/prog_tests/xdp_attach.c | 29 +- + .../testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c | 141 +- + .../selftests/bpf/prog_tests/xdp_cpumap_attach.c | 72 +- + .../selftests/bpf/prog_tests/xdp_devmap_attach.c | 63 +- + tools/testing/selftests/bpf/prog_tests/xdp_info.c | 14 +- + tools/testing/selftests/bpf/prog_tests/xdp_link.c | 26 +- + .../selftests/bpf/prog_tests/xdp_noinline.c | 44 +- + tools/testing/selftests/bpf/prog_tests/xdp_perf.c | 19 +- + .../selftests/bpf/progs/bloom_filter_bench.c | 7 +- + .../testing/selftests/bpf/progs/bloom_filter_map.c | 5 +- + .../selftests/bpf/progs/bpf_iter_setsockopt_unix.c | 60 + + tools/testing/selftests/bpf/progs/bpf_iter_task.c | 54 + + tools/testing/selftests/bpf/progs/bpf_iter_unix.c | 2 +- + tools/testing/selftests/bpf/progs/bpf_loop.c | 9 +- + tools/testing/selftests/bpf/progs/bpf_loop_bench.c | 3 +- + tools/testing/selftests/bpf/progs/bpf_misc.h | 19 + + tools/testing/selftests/bpf/progs/bpf_mod_race.c | 100 + + .../selftests/bpf/progs/bpf_syscall_macro.c | 84 + + .../testing/selftests/bpf/progs/bpf_tracing_net.h | 2 + + .../selftests/bpf/progs/btf_type_tag_user.c | 40 + + .../bpf/progs/cgroup_getset_retval_getsockopt.c | 45 + + .../bpf/progs/cgroup_getset_retval_setsockopt.c | 52 + + tools/testing/selftests/bpf/progs/core_kern.c | 16 + + .../selftests/bpf/progs/core_kern_overflow.c | 22 + + tools/testing/selftests/bpf/progs/fexit_sleep.c | 9 +- + .../selftests/bpf/progs/freplace_cls_redirect.c | 12 +- + .../testing/selftests/bpf/progs/kfunc_call_race.c | 14 + + .../testing/selftests/bpf/progs/kfunc_call_test.c | 52 +- + tools/testing/selftests/bpf/progs/ksym_race.c | 13 + + tools/testing/selftests/bpf/progs/perfbuf_bench.c | 3 +- + tools/testing/selftests/bpf/progs/ringbuf_bench.c | 3 +- + .../testing/selftests/bpf/progs/sample_map_ret0.c | 24 +- + .../selftests/bpf/progs/sockmap_parse_prog.c | 2 - + tools/testing/selftests/bpf/progs/sockopt_sk.c | 35 +- + tools/testing/selftests/bpf/progs/test_bpf_nf.c | 118 ++ + .../progs/{btf_decl_tag.c => test_btf_decl_tag.c} | 0 + tools/testing/selftests/bpf/progs/test_btf_haskv.c | 3 + + tools/testing/selftests/bpf/progs/test_btf_newkv.c | 3 + + tools/testing/selftests/bpf/progs/test_btf_nokv.c | 12 +- + .../testing/selftests/bpf/progs/test_probe_user.c | 15 +- + tools/testing/selftests/bpf/progs/test_ringbuf.c | 3 +- + tools/testing/selftests/bpf/progs/test_sk_lookup.c | 6 + + .../selftests/bpf/progs/test_skb_cgroup_id_kern.c | 12 +- + .../testing/selftests/bpf/progs/test_sock_fields.c | 41 + + .../selftests/bpf/progs/test_sockmap_progs_query.c | 24 + + tools/testing/selftests/bpf/progs/test_tc_dtime.c | 349 ++++ + tools/testing/selftests/bpf/progs/test_tc_edt.c | 12 +- + .../bpf/progs/test_tcp_check_syncookie_kern.c | 12 +- + .../bpf/progs/test_xdp_adjust_tail_grow.c | 10 +- + .../bpf/progs/test_xdp_adjust_tail_shrink.c | 32 +- + .../testing/selftests/bpf/progs/test_xdp_bpf2bpf.c | 2 +- + .../selftests/bpf/progs/test_xdp_update_frags.c | 42 + + .../bpf/progs/test_xdp_with_cpumap_frags_helpers.c | 27 + + .../bpf/progs/test_xdp_with_cpumap_helpers.c | 8 +- + .../bpf/progs/test_xdp_with_devmap_frags_helpers.c | 27 + + .../bpf/progs/test_xdp_with_devmap_helpers.c | 9 +- + tools/testing/selftests/bpf/progs/trace_printk.c | 3 +- + tools/testing/selftests/bpf/progs/trace_vprintk.c | 3 +- + tools/testing/selftests/bpf/progs/trigger_bench.c | 9 +- + .../selftests/bpf/progs/xdp_redirect_multi_kern.c | 2 +- + tools/testing/selftests/bpf/test_cpp.cpp | 87 +- + tools/testing/selftests/bpf/test_lru_map.c | 11 +- + tools/testing/selftests/bpf/test_lwt_seg6local.sh | 170 +- + tools/testing/selftests/bpf/test_maps.c | 2 +- + .../selftests/bpf/test_tcp_check_syncookie.sh | 5 +- + tools/testing/selftests/bpf/test_verifier.c | 48 +- + tools/testing/selftests/bpf/test_xdp_meta.sh | 38 +- + tools/testing/selftests/bpf/test_xdp_redirect.sh | 30 +- + .../selftests/bpf/test_xdp_redirect_multi.sh | 60 +- + tools/testing/selftests/bpf/test_xdp_veth.sh | 39 +- + tools/testing/selftests/bpf/test_xdp_vlan.sh | 66 +- + tools/testing/selftests/bpf/trace_helpers.c | 70 +- + tools/testing/selftests/bpf/trace_helpers.h | 3 +- + tools/testing/selftests/bpf/verifier/calls.c | 75 + + tools/testing/selftests/bpf/verifier/sock.c | 81 +- + tools/testing/selftests/bpf/vmtest.sh | 2 +- + tools/testing/selftests/bpf/xdp_redirect_multi.c | 8 +- + tools/testing/selftests/bpf/xdping.c | 4 +- + tools/testing/selftests/bpf/xdpxceiver.c | 85 +- + tools/testing/selftests/bpf/xdpxceiver.h | 2 +- + tools/testing/selftests/net/.gitignore | 2 +- + tools/testing/selftests/net/Makefile | 3 +- + tools/testing/selftests/net/cmsg_ipv6.sh | 156 ++ + tools/testing/selftests/net/cmsg_sender.c | 504 +++++ + tools/testing/selftests/net/cmsg_so_mark.c | 67 - + tools/testing/selftests/net/cmsg_so_mark.sh | 32 +- + tools/testing/selftests/net/cmsg_time.sh | 83 + + tools/testing/selftests/net/fib_rule_tests.sh | 86 +- + tools/testing/selftests/net/fib_tests.sh | 147 +- + tools/testing/selftests/net/forwarding/Makefile | 1 + + .../selftests/net/forwarding/bridge_locked_port.sh | 180 ++ + .../selftests/net/forwarding/bridge_vlan_aware.sh | 5 +- + .../net/forwarding/bridge_vlan_unaware.sh | 5 +- + .../selftests/net/forwarding/fib_offload_lib.sh | 12 +- + .../net/forwarding/forwarding.config.sample | 2 + + .../selftests/net/forwarding/hw_stats_l3.sh | 332 ++++ + tools/testing/selftests/net/forwarding/lib.sh | 9 + + tools/testing/selftests/net/forwarding/pedit_ip.sh | 201 ++ + .../testing/selftests/net/forwarding/tc_police.sh | 52 + + tools/testing/selftests/net/mptcp/mptcp_connect.sh | 19 + + tools/testing/selftests/net/mptcp/mptcp_join.sh | 972 +++++---- + tools/testing/selftests/net/mptcp/pm_netlink.sh | 18 + + tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 81 +- + tools/testing/selftests/net/mptcp/settings | 2 +- + tools/testing/selftests/net/rtnetlink.sh | 4 +- + .../selftests/net/test_vxlan_vnifiltering.sh | 579 ++++++ + tools/testing/selftests/net/timestamping.c | 4 +- + tools/testing/selftests/ptp/testptp.c | 18 +- + 1537 files changed, 66884 insertions(+), 20472 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/davicom,dm9051.yaml + delete mode 100644 Documentation/devicetree/bindings/net/dsa/realtek-smi.txt + create mode 100644 Documentation/devicetree/bindings/net/dsa/realtek.yaml + create mode 100644 Documentation/devicetree/bindings/net/mctp-i2c-controller.yaml + create mode 100644 Documentation/devicetree/bindings/phy/transmit-amplitude.yaml + create mode 100644 Documentation/networking/smc-sysctl.rst + delete mode 100644 drivers/net/dsa/realtek-smi-core.c + create mode 100644 drivers/net/dsa/realtek/Kconfig + create mode 100644 drivers/net/dsa/realtek/Makefile + create mode 100644 drivers/net/dsa/realtek/realtek-mdio.c + create mode 100644 drivers/net/dsa/realtek/realtek-smi.c + rename drivers/net/dsa/{realtek-smi-core.h => realtek/realtek.h} (51%) + rename drivers/net/dsa/{ => realtek}/rtl8365mb.c (74%) + rename drivers/net/dsa/{rtl8366.c => realtek/rtl8366-core.c} (61%) + rename drivers/net/dsa/{ => realtek}/rtl8366rb.c (78%) + create mode 100644 drivers/net/ethernet/davicom/dm9051.c + create mode 100644 drivers/net/ethernet/davicom/dm9051.h + create mode 100644 drivers/net/ethernet/fungible/Kconfig + create mode 100644 drivers/net/ethernet/fungible/Makefile + create mode 100644 drivers/net/ethernet/fungible/funcore/Makefile + create mode 100644 drivers/net/ethernet/fungible/funcore/fun_dev.c + create mode 100644 drivers/net/ethernet/fungible/funcore/fun_dev.h + create mode 100644 drivers/net/ethernet/fungible/funcore/fun_hci.h + create mode 100644 drivers/net/ethernet/fungible/funcore/fun_queue.c + create mode 100644 drivers/net/ethernet/fungible/funcore/fun_queue.h + create mode 100644 drivers/net/ethernet/fungible/funeth/Kconfig + create mode 100644 drivers/net/ethernet/fungible/funeth/Makefile + create mode 100644 drivers/net/ethernet/fungible/funeth/fun_port.h + create mode 100644 drivers/net/ethernet/fungible/funeth/funeth.h + create mode 100644 drivers/net/ethernet/fungible/funeth/funeth_devlink.c + create mode 100644 drivers/net/ethernet/fungible/funeth/funeth_devlink.h + create mode 100644 drivers/net/ethernet/fungible/funeth/funeth_ethtool.c + create mode 100644 drivers/net/ethernet/fungible/funeth/funeth_ktls.c + create mode 100644 drivers/net/ethernet/fungible/funeth/funeth_ktls.h + create mode 100644 drivers/net/ethernet/fungible/funeth/funeth_main.c + create mode 100644 drivers/net/ethernet/fungible/funeth/funeth_rx.c + create mode 100644 drivers/net/ethernet/fungible/funeth/funeth_trace.h + create mode 100644 drivers/net/ethernet/fungible/funeth/funeth_tx.c + create mode 100644 drivers/net/ethernet/fungible/funeth/funeth_txrx.h + create mode 100644 drivers/net/ethernet/intel/ice/ice_gnss.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_gnss.h + create mode 100644 drivers/net/ethernet/intel/ice/ice_pf_vsi_vlan_ops.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_pf_vsi_vlan_ops.h + create mode 100644 drivers/net/ethernet/intel/ice/ice_vf_vsi_vlan_ops.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_vf_vsi_vlan_ops.h + create mode 100644 drivers/net/ethernet/intel/ice/ice_vlan.h + create mode 100644 drivers/net/ethernet/intel/ice/ice_vlan_mode.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_vlan_mode.h + create mode 100644 drivers/net/ethernet/intel/ice/ice_vsi_vlan_lib.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_vsi_vlan_lib.h + create mode 100644 drivers/net/ethernet/intel/ice/ice_vsi_vlan_ops.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_vsi_vlan_ops.h + create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/selq.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/selq.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/sample.h + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c + create mode 100644 drivers/net/mctp/mctp-i2c.c + create mode 100644 drivers/net/vxlan/Makefile + rename drivers/net/{vxlan.c => vxlan/vxlan_core.c} (94%) + create mode 100644 drivers/net/vxlan/vxlan_multicast.c + create mode 100644 drivers/net/vxlan/vxlan_private.h + create mode 100644 drivers/net/vxlan/vxlan_vnifilter.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852ae.c + create mode 100644 include/linux/dsa/tag_qca.h + create mode 100644 include/net/inet_dscp.h + create mode 100644 include/net/netfilter/nf_conntrack_bpf.h + delete mode 100644 kernel/bpf/preload/bpf_preload_umd_blob.S + delete mode 100644 kernel/bpf/preload/iterators/bpf_preload_common.h + delete mode 100644 kernel/bpf/preload/iterators/iterators.c + create mode 100644 kernel/bpf/preload/iterators/iterators.lskel.h + delete mode 100644 kernel/bpf/preload/iterators/iterators.skel.h + create mode 100644 net/netfilter/nf_conntrack_bpf.c + create mode 100644 net/smc/smc_sysctl.c + create mode 100644 net/smc/smc_sysctl.h + create mode 100755 scripts/pahole-version.sh + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_iter_setsockopt_unix.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_mod_race.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_nf.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_getset_retval.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/core_kern_overflow.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/prog_run_opts.c + delete mode 100644 tools/testing/selftests/bpf/prog_tests/prog_run_xattr.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_bpf_syscall_macro.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_adjust_frags.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_setsockopt_unix.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_misc.h + create mode 100644 tools/testing/selftests/bpf/progs/bpf_mod_race.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_syscall_macro.c + create mode 100644 tools/testing/selftests/bpf/progs/btf_type_tag_user.c + create mode 100644 tools/testing/selftests/bpf/progs/cgroup_getset_retval_getsockopt.c + create mode 100644 tools/testing/selftests/bpf/progs/cgroup_getset_retval_setsockopt.c + create mode 100644 tools/testing/selftests/bpf/progs/core_kern_overflow.c + create mode 100644 tools/testing/selftests/bpf/progs/kfunc_call_race.c + create mode 100644 tools/testing/selftests/bpf/progs/ksym_race.c + create mode 100644 tools/testing/selftests/bpf/progs/test_bpf_nf.c + rename tools/testing/selftests/bpf/progs/{btf_decl_tag.c => test_btf_decl_tag.c} (100%) + create mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_progs_query.c + create mode 100644 tools/testing/selftests/bpf/progs/test_tc_dtime.c + create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_update_frags.c + create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_with_cpumap_frags_helpers.c + create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_with_devmap_frags_helpers.c + create mode 100755 tools/testing/selftests/net/cmsg_ipv6.sh + create mode 100644 tools/testing/selftests/net/cmsg_sender.c + delete mode 100644 tools/testing/selftests/net/cmsg_so_mark.c + create mode 100755 tools/testing/selftests/net/cmsg_time.sh + create mode 100755 tools/testing/selftests/net/forwarding/bridge_locked_port.sh + create mode 100755 tools/testing/selftests/net/forwarding/hw_stats_l3.sh + create mode 100755 tools/testing/selftests/net/forwarding/pedit_ip.sh + create mode 100755 tools/testing/selftests/net/test_vxlan_vnifiltering.sh +Merging bpf-next/for-next (7df5072cc05f bpf: Small BPF verifier log improvements) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Auto-merging arch/x86/Kconfig +Auto-merging tools/bpf/bpftool/Makefile +Merge made by the 'ort' strategy. + Documentation/bpf/verifier.rst | 2 +- + arch/arm64/net/bpf_jit.h | 39 +++- + arch/arm64/net/bpf_jit_comp.c | 241 +++++++++++++++++---- + arch/x86/Kconfig | 2 +- + arch/x86/net/bpf_jit_comp.c | 5 +- + kernel/bpf/Kconfig | 4 + + kernel/bpf/bpf_local_storage.c | 2 +- + kernel/bpf/btf.c | 11 +- + kernel/bpf/cgroup.c | 8 +- + kernel/bpf/core.c | 9 +- + kernel/bpf/hashtab.c | 2 +- + kernel/bpf/helpers.c | 2 +- + kernel/bpf/local_storage.c | 2 +- + kernel/bpf/preload/bpf_preload_kern.c | 7 + + kernel/bpf/reuseport_array.c | 2 +- + kernel/bpf/stackmap.c | 12 +- + kernel/bpf/syscall.c | 5 +- + kernel/bpf/trampoline.c | 2 +- + kernel/bpf/verifier.c | 64 +++--- + lib/Kconfig.debug | 10 + + net/bpf/test_run.c | 5 + + scripts/pahole-flags.sh | 3 + + tools/bpf/bpftool/Makefile | 20 +- + tools/bpf/bpftool/gen.c | 127 +++++++++-- + tools/bpf/bpftool/main.h | 2 +- + tools/bpf/bpftool/prog.c | 7 +- + tools/bpf/bpftool/xlated_dumper.c | 5 +- + tools/lib/bpf/btf_dump.c | 5 + + tools/lib/bpf/libbpf.c | 56 ++--- + tools/testing/selftests/bpf/.gitignore | 1 + + tools/testing/selftests/bpf/Makefile | 3 +- + tools/testing/selftests/bpf/prog_tests/align.c | 218 +++++++++---------- + tools/testing/selftests/bpf/prog_tests/atomics.c | 91 ++------ + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 54 +++-- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 17 +- + tools/testing/selftests/bpf/prog_tests/log_buf.c | 4 +- + tools/testing/selftests/bpf/progs/atomics.c | 28 +-- + tools/testing/selftests/bpf/test_cpp.cpp | 3 + + .../selftests/bpf/verifier/atomic_invalid.c | 6 +- + tools/testing/selftests/bpf/verifier/bounds.c | 4 +- + tools/testing/selftests/bpf/verifier/calls.c | 25 ++- + tools/testing/selftests/bpf/verifier/ctx.c | 4 +- + .../selftests/bpf/verifier/direct_packet_access.c | 2 +- + .../selftests/bpf/verifier/helper_access_var_len.c | 6 +- + tools/testing/selftests/bpf/verifier/jmp32.c | 16 +- + tools/testing/selftests/bpf/verifier/precise.c | 4 +- + tools/testing/selftests/bpf/verifier/raw_stack.c | 4 +- + .../testing/selftests/bpf/verifier/ref_tracking.c | 6 +- + .../selftests/bpf/verifier/search_pruning.c | 2 +- + tools/testing/selftests/bpf/verifier/sock.c | 2 +- + tools/testing/selftests/bpf/verifier/spill_fill.c | 38 ++-- + tools/testing/selftests/bpf/verifier/unpriv.c | 4 +- + .../selftests/bpf/verifier/value_illegal_alu.c | 4 +- + .../selftests/bpf/verifier/value_ptr_arith.c | 4 +- + tools/testing/selftests/bpf/verifier/var_off.c | 2 +- + 55 files changed, 773 insertions(+), 440 deletions(-) +Merging ipsec-next/master (2ecda181682e xfrm: delete duplicated functions that calls same xfrm_api_check()) +$ 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 net/xfrm/xfrm_device.c +Merge made by the 'ort' strategy. + net/xfrm/xfrm_device.c | 14 ++------------ + 1 file changed, 2 insertions(+), 12 deletions(-) +Merging mlx5-next/mlx5-next (45fee8edb4b3 net/mlx5: Add clarification on sync reset failure) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (c828414ac935 netfilter: nft_compat: suppress comment match) +$ 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 (c828414ac935 netfilter: nft_compat: suppress comment match) +$ 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 (8c9fa1be6896 Bluetooth: mediatek: fix the conflict between mtk and msft vendor event) +$ 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_sync.c +Auto-merging net/bluetooth/mgmt.c +Merge made by the 'ort' strategy. + drivers/bluetooth/btmtk.h | 7 +++ + drivers/bluetooth/btmtksdio.c | 122 ++++++++++++++++++++++++++++++++++++++---- + drivers/bluetooth/btusb.c | 22 +++++--- + include/net/bluetooth/mgmt.h | 2 +- + net/bluetooth/6lowpan.c | 1 - + net/bluetooth/eir.h | 20 +++++++ + net/bluetooth/hci_sync.c | 2 +- + net/bluetooth/mgmt.c | 54 ++++++++----------- + 8 files changed, 177 insertions(+), 53 deletions(-) +Merging wireless-next/main (e715f10f3d05 rtw89: get channel parameters of 160MHz bandwidth) +$ git merge -m Merge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/main +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/acpi.c +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/commands.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/rs.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/file.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-csr.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-drv.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mei/main.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mei/net.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/ops.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/tx.c +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/trans.c +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging net/mac80211/mlme.c +CONFLICT (content): Merge conflict in net/mac80211/mlme.c +Auto-merging net/wireless/nl80211.c +Resolved 'net/mac80211/mlme.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7b540602c73e] Merge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/net/wireless/mediatek,mt76.yaml | 33 +- + drivers/bcma/driver_chipcommon.c | 2 +- + drivers/bcma/driver_chipcommon_pmu.c | 6 +- + drivers/bcma/driver_pci_host.c | 6 +- + drivers/bcma/main.c | 4 +- + drivers/bcma/sprom.c | 4 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 2 +- + drivers/net/wireless/ath/ath10k/swap.h | 2 +- + drivers/net/wireless/ath/ath11k/ahb.c | 6 +- + drivers/net/wireless/ath/ath11k/ce.h | 2 +- + drivers/net/wireless/ath/ath11k/core.c | 6 + + drivers/net/wireless/ath/ath11k/core.h | 11 +- + drivers/net/wireless/ath/ath11k/dbring.c | 19 +- + drivers/net/wireless/ath/ath11k/debugfs.c | 509 ++++ + drivers/net/wireless/ath/ath11k/debugfs.h | 180 +- + drivers/net/wireless/ath/ath11k/dp.h | 13 +- + drivers/net/wireless/ath/ath11k/dp_rx.c | 166 +- + drivers/net/wireless/ath/ath11k/dp_tx.c | 30 +- + drivers/net/wireless/ath/ath11k/hal_desc.h | 1 + + drivers/net/wireless/ath/ath11k/hal_rx.c | 471 +++- + drivers/net/wireless/ath/ath11k/hal_rx.h | 135 +- + drivers/net/wireless/ath/ath11k/hw.c | 7 + + drivers/net/wireless/ath/ath11k/hw.h | 1 + + drivers/net/wireless/ath/ath11k/mac.c | 64 +- + drivers/net/wireless/ath/ath11k/mhi.c | 4 +- + drivers/net/wireless/ath/ath11k/pci.c | 10 + + drivers/net/wireless/ath/ath11k/qmi.c | 12 +- + drivers/net/wireless/ath/ath11k/qmi.h | 1 + + drivers/net/wireless/ath/ath11k/rx_desc.h | 6 +- + drivers/net/wireless/ath/ath11k/spectral.c | 2 +- + drivers/net/wireless/ath/ath11k/wmi.c | 300 ++- + drivers/net/wireless/ath/ath11k/wmi.h | 132 + + drivers/net/wireless/ath/ath6kl/wmi.h | 26 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 3 +- + drivers/net/wireless/ath/ath9k/rng.c | 72 +- + drivers/net/wireless/ath/carl9170/fwdesc.h | 2 +- + drivers/net/wireless/ath/carl9170/main.c | 2 +- + drivers/net/wireless/ath/carl9170/wlan.h | 2 +- + drivers/net/wireless/ath/spectral_common.h | 4 +- + drivers/net/wireless/ath/wcn36xx/main.c | 15 +- + drivers/net/wireless/ath/wcn36xx/smd.c | 2 +- + drivers/net/wireless/ath/wcn36xx/txrx.c | 4 +- + drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 2 + + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 3 +- + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/xtlv.h | 2 +- + .../broadcom/brcm80211/include/brcm_hw_ids.h | 1 + + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 38 +- + drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/main.c | 1 + + drivers/net/wireless/intel/iwlwifi/dvm/rx.c | 7 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 18 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 11 +- + .../net/wireless/intel/iwlwifi/fw/api/commands.h | 13 +- + drivers/net/wireless/intel/iwlwifi/fw/api/config.h | 33 - + .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 148 +- + .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 37 +- + drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 19 +- + .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 34 + + drivers/net/wireless/intel/iwlwifi/fw/api/mac.h | 127 +- + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 52 +- + drivers/net/wireless/intel/iwlwifi/fw/api/phy.h | 16 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rfi.h | 10 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rs.h | 6 +- + drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 7 +- + drivers/net/wireless/intel/iwlwifi/fw/api/txq.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 297 ++- + drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 5 +- + drivers/net/wireless/intel/iwlwifi/fw/debugfs.c | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 8 +- + drivers/net/wireless/intel/iwlwifi/fw/img.c | 7 +- + drivers/net/wireless/intel/iwlwifi/fw/img.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/init.c | 5 +- + drivers/net/wireless/intel/iwlwifi/fw/paging.c | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 22 +- + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/smem.c | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/uefi.c | 12 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 12 +- + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 3 + + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 72 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 118 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.h | 2 +- + .../net/wireless/intel/iwlwifi/iwl-eeprom-read.c | 12 +- + drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 30 +- + drivers/net/wireless/intel/iwlwifi/iwl-io.c | 18 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 43 +- + drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 13 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 12 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 59 +- + drivers/net/wireless/intel/iwlwifi/mei/main.c | 10 +- + drivers/net/wireless/intel/iwlwifi/mei/net.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 29 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 18 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 25 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-responder.c | 24 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 189 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 50 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 328 ++- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 16 +- + .../net/wireless/intel/iwlwifi/mvm/offloading.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 34 +- + drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 43 +- + drivers/net/wireless/intel/iwlwifi/mvm/quota.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/rfi.c | 13 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 32 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 2 - + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 294 ++- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 313 ++- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 3 + + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 20 +- + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 11 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 20 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 40 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 35 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 46 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 112 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 49 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 4 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 14 +- + drivers/net/wireless/intel/iwlwifi/queue/tx.c | 97 +- + drivers/net/wireless/intel/iwlwifi/queue/tx.h | 21 +- + drivers/net/wireless/mac80211_hwsim.c | 410 ++- + drivers/net/wireless/mediatek/mt76/mac80211.c | 34 +- + drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 5 - + .../net/wireless/mediatek/mt76/mt7615/debugfs.c | 14 +- + drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 42 +- + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 24 + + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 15 +- + drivers/net/wireless/mediatek/mt76/mt76_connac.h | 5 + + .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 8 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 2 - + drivers/net/wireless/mediatek/mt76/mt7915/Kconfig | 10 + + drivers/net/wireless/mediatek/mt76/mt7915/Makefile | 1 + + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 12 +- + drivers/net/wireless/mediatek/mt76/mt7915/dma.c | 28 +- + drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c | 85 +- + drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h | 13 + + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 105 +- + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 273 +- + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 21 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 131 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 9 + + drivers/net/wireless/mediatek/mt76/mt7915/mmio.c | 132 +- + drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 43 + + drivers/net/wireless/mediatek/mt76/mt7915/regs.h | 289 ++- + drivers/net/wireless/mediatek/mt76/mt7915/soc.c | 1210 +++++++++ + .../net/wireless/mediatek/mt76/mt7915/testmode.c | 43 +- + drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 46 +- + drivers/net/wireless/mediatek/mt76/mt7921/mac.h | 3 + + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 8 +- + drivers/net/wireless/mediatek/mt76/testmode.c | 5 +- + drivers/net/wireless/realtek/rtw88/coex.c | 298 ++- + drivers/net/wireless/realtek/rtw88/coex.h | 5 + + drivers/net/wireless/realtek/rtw88/debug.c | 6 +- + drivers/net/wireless/realtek/rtw88/debug.h | 1 + + drivers/net/wireless/realtek/rtw88/fw.c | 17 +- + drivers/net/wireless/realtek/rtw88/fw.h | 9 + + drivers/net/wireless/realtek/rtw88/mac80211.c | 8 +- + drivers/net/wireless/realtek/rtw88/main.c | 44 +- + drivers/net/wireless/realtek/rtw88/main.h | 48 +- + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 1 + + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 3 +- + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 5 +- + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 47 +- + drivers/net/wireless/realtek/rtw88/sar.c | 8 +- + drivers/net/wireless/realtek/rtw88/tx.c | 2 +- + drivers/net/wireless/realtek/rtw89/core.c | 124 +- + drivers/net/wireless/realtek/rtw89/core.h | 80 +- + drivers/net/wireless/realtek/rtw89/phy.c | 266 +- + drivers/net/wireless/realtek/rtw89/phy.h | 60 + + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c | 62 +- + .../wireless/realtek/rtw89/rtw8852a_rfk_table.c | 2744 ++++++++++---------- + .../wireless/realtek/rtw89/rtw8852a_rfk_table.h | 49 +- + include/linux/ieee80211.h | 339 ++- + include/net/cfg80211.h | 87 +- + include/net/mac80211.h | 6 + + include/uapi/linux/nl80211.h | 95 +- + net/mac80211/Makefile | 3 +- + net/mac80211/agg-rx.c | 20 +- + net/mac80211/cfg.c | 8 + + net/mac80211/chan.c | 5 +- + net/mac80211/eht.c | 76 + + net/mac80211/ieee80211_i.h | 18 + + net/mac80211/main.c | 14 +- + net/mac80211/mesh.c | 5 +- + net/mac80211/mlme.c | 172 +- + net/mac80211/util.c | 238 +- + net/mac80211/vht.c | 34 +- + net/wireless/chan.c | 91 +- + net/wireless/nl80211.c | 137 +- + net/wireless/reg.c | 6 + + net/wireless/util.c | 131 + + 200 files changed, 10684 insertions(+), 3272 deletions(-) + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7915/soc.c + create mode 100644 net/mac80211/eht.c +Merging mtd/mtd/next (2365f91c861c mtd: parsers: trx: allow to use on MediaTek MIPS SoCs) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging drivers/mtd/devices/mchp23k256.c +Auto-merging drivers/mtd/devices/mchp48l640.c +Auto-merging drivers/mtd/mtdcore.c +Auto-merging drivers/mtd/nand/raw/brcmnand/brcmnand.c +Auto-merging drivers/spi/spi-mem.c +Auto-merging include/linux/spi/spi.h +Merge made by the 'ort' strategy. + .../bindings/mtd/cortina,gemini-flash.txt | 24 - + .../devicetree/bindings/mtd/mtd-physmap.yaml | 18 +- + .../bindings/mtd/mxicy,nand-ecc-engine.yaml | 77 ++ + .../devicetree/bindings/mtd/nand-chip.yaml | 70 ++ + .../devicetree/bindings/mtd/nand-controller.yaml | 70 +- + Documentation/devicetree/bindings/mtd/spi-nand.txt | 5 - + .../devicetree/bindings/mtd/spi-nand.yaml | 27 + + .../devicetree/bindings/spi/mxicy,mx25f0a-spi.yaml | 65 ++ + Documentation/devicetree/bindings/spi/spi-mxic.txt | 34 - + .../devicetree/bindings/vendor-prefixes.yaml | 3 + + drivers/mtd/devices/mchp23k256.c | 16 +- + drivers/mtd/devices/mchp48l640.c | 12 +- + drivers/mtd/devices/spear_smi.c | 2 +- + drivers/mtd/mtd_blkdevs.c | 1 + + drivers/mtd/mtdcore.c | 23 +- + drivers/mtd/nand/Kconfig | 6 + + drivers/mtd/nand/Makefile | 1 + + drivers/mtd/nand/core.c | 12 +- + drivers/mtd/nand/ecc-mxic.c | 879 +++++++++++++++++++++ + drivers/mtd/nand/ecc.c | 119 +++ + drivers/mtd/nand/raw/atmel/nand-controller.c | 4 +- + drivers/mtd/nand/raw/atmel/pmecc.c | 4 +- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 2 +- + drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c | 2 +- + drivers/mtd/nand/raw/ingenic/jz4780_bch.c | 2 +- + drivers/mtd/nand/raw/mtk_ecc.c | 2 +- + drivers/mtd/nand/raw/nand_base.c | 2 +- + drivers/mtd/nand/raw/nand_bbt.c | 2 +- + drivers/mtd/nand/raw/omap2.c | 2 +- + drivers/mtd/nand/raw/renesas-nand-controller.c | 2 +- + drivers/mtd/nand/raw/sh_flctl.c | 2 +- + drivers/mtd/nand/spi/core.c | 51 +- + drivers/mtd/nand/spi/macronix.c | 2 +- + drivers/mtd/parsers/Kconfig | 2 +- + drivers/mtd/spi-nor/controllers/aspeed-smc.c | 15 +- + drivers/spi/Kconfig | 1 + + drivers/spi/spi-cadence-quadspi.c | 10 +- + drivers/spi/spi-mem.c | 32 +- + drivers/spi/spi-mxic.c | 340 ++++++-- + include/linux/mtd/mtd.h | 8 +- + include/linux/mtd/nand-ecc-mxic.h | 49 ++ + include/linux/mtd/nand.h | 49 ++ + include/linux/mtd/spinand.h | 2 + + include/linux/spi/spi-mem.h | 26 +- + include/linux/spi/spi.h | 3 + + 45 files changed, 1824 insertions(+), 256 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mtd/cortina,gemini-flash.txt + create mode 100644 Documentation/devicetree/bindings/mtd/mxicy,nand-ecc-engine.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/nand-chip.yaml + delete mode 100644 Documentation/devicetree/bindings/mtd/spi-nand.txt + create mode 100644 Documentation/devicetree/bindings/mtd/spi-nand.yaml + create mode 100644 Documentation/devicetree/bindings/spi/mxicy,mx25f0a-spi.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-mxic.txt + create mode 100644 drivers/mtd/nand/ecc-mxic.c + create mode 100644 include/linux/mtd/nand-ecc-mxic.h +Merging nand/nand/next (ffb16c1c4267 mtd: rawnand: stm32_fmc2: Add NAND Write Protect support) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Auto-merging Documentation/devicetree/bindings/mtd/nand-controller.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mtd/nand-controller.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/mtd/nand/raw/Kconfig +Auto-merging drivers/mtd/nand/raw/brcmnand/brcmnand.c +Auto-merging drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c +Auto-merging drivers/mtd/nand/raw/nand_base.c +Resolved 'Documentation/devicetree/bindings/mtd/nand-controller.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master da6132382e2f] Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/mtd/nand-controller.yaml | 7 + + MAINTAINERS | 1 + + drivers/bcma/driver_chipcommon_nflash.c | 20 ++- + drivers/mtd/nand/onenand/generic.c | 7 +- + drivers/mtd/nand/raw/Kconfig | 13 ++ + drivers/mtd/nand/raw/brcmnand/Makefile | 2 + + drivers/mtd/nand/raw/brcmnand/bcma_nand.c | 132 +++++++++++++++++ + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 160 ++++++++++++++------- + drivers/mtd/nand/raw/brcmnand/brcmnand.h | 29 ++++ + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 27 +++- + drivers/mtd/nand/raw/nand_base.c | 81 +++++------ + drivers/mtd/nand/raw/nandsim.c | 47 +++--- + drivers/mtd/nand/raw/omap_elm.c | 4 +- + drivers/mtd/nand/raw/pl35x-nand-controller.c | 2 +- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 40 +++++- + include/linux/bcma/bcma_driver_chipcommon.h | 5 + + include/linux/mtd/rawnand.h | 2 + + include/linux/platform_data/brcmnand.h | 12 ++ + 18 files changed, 456 insertions(+), 135 deletions(-) + create mode 100644 drivers/mtd/nand/raw/brcmnand/bcma_nand.c + create mode 100644 include/linux/platform_data/brcmnand.h +Merging spi-nor/spi-nor/next (3c552889e431 mtd: spi-nor: renumber flags) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Merge made by the 'ort' strategy. + drivers/mtd/spi-nor/atmel.c | 81 ++++++------ + drivers/mtd/spi-nor/catalyst.c | 6 +- + drivers/mtd/spi-nor/core.c | 265 +++------------------------------------ + drivers/mtd/spi-nor/core.h | 70 +++++------ + drivers/mtd/spi-nor/eon.c | 6 +- + drivers/mtd/spi-nor/esmt.c | 6 +- + drivers/mtd/spi-nor/everspin.c | 6 +- + drivers/mtd/spi-nor/fujitsu.c | 6 +- + drivers/mtd/spi-nor/gigadevice.c | 6 +- + drivers/mtd/spi-nor/intel.c | 6 +- + drivers/mtd/spi-nor/issi.c | 10 +- + drivers/mtd/spi-nor/macronix.c | 14 +-- + drivers/mtd/spi-nor/micron-st.c | 259 ++++++++++++++++++++++++++++++-------- + drivers/mtd/spi-nor/spansion.c | 168 ++++++++++++++++++------- + drivers/mtd/spi-nor/sst.c | 44 +++---- + drivers/mtd/spi-nor/winbond.c | 29 ++--- + drivers/mtd/spi-nor/xilinx.c | 97 ++++++++++++-- + drivers/mtd/spi-nor/xmc.c | 6 +- + include/linux/mtd/spi-nor.h | 18 --- + 19 files changed, 579 insertions(+), 524 deletions(-) +Merging crypto/master (280ee3c3aaa8 crypto: octeontx2 - fix missing unlock) +$ 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 crypto/algapi.c +Auto-merging crypto/api.c +Auto-merging drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/debugfs-hisi-hpre | 178 +-- + Documentation/ABI/testing/debugfs-hisi-sec | 146 +- + Documentation/ABI/testing/debugfs-hisi-zip | 146 +- + MAINTAINERS | 5 + + arch/alpha/include/asm/xor.h | 53 +- + arch/arm/crypto/aes-neonbs-core.S | 105 +- + arch/arm/crypto/aes-neonbs-glue.c | 35 +- + arch/arm/include/asm/xor.h | 42 +- + arch/arm/lib/xor-neon.c | 12 +- + arch/arm64/crypto/Kconfig | 2 +- + arch/arm64/crypto/aes-glue.c | 22 +- + arch/arm64/crypto/aes-modes.S | 18 +- + arch/arm64/crypto/aes-neonbs-core.S | 264 +--- + arch/arm64/crypto/aes-neonbs-glue.c | 97 +- + arch/arm64/crypto/sm3-ce-glue.c | 28 +- + arch/arm64/include/asm/xor.h | 21 +- + arch/arm64/lib/crc32.S | 87 +- + arch/arm64/lib/xor-neon.c | 46 +- + arch/ia64/include/asm/xor.h | 21 +- + arch/powerpc/include/asm/xor_altivec.h | 25 +- + arch/powerpc/lib/xor_vmx.c | 28 +- + arch/powerpc/lib/xor_vmx.h | 27 +- + arch/powerpc/lib/xor_vmx_glue.c | 32 +- + arch/s390/lib/xor.c | 21 +- + arch/sparc/include/asm/xor_32.h | 21 +- + arch/sparc/include/asm/xor_64.h | 42 +- + arch/x86/crypto/Makefile | 3 + + arch/x86/crypto/aes_ctrby8_avx-x86_64.S | 63 +- + arch/x86/crypto/blowfish_glue.c | 12 - + arch/x86/crypto/des3_ede_glue.c | 8 - + arch/x86/crypto/sm3-avx-asm_64.S | 517 +++++++ + arch/x86/crypto/sm3_avx_glue.c | 134 ++ + arch/x86/include/asm/xor.h | 42 +- + arch/x86/include/asm/xor_32.h | 42 +- + arch/x86/include/asm/xor_avx.h | 21 +- + crypto/Kconfig | 25 +- + crypto/algapi.c | 48 +- + crypto/api.c | 19 +- + crypto/asymmetric_keys/signature.c | 2 +- + crypto/asymmetric_keys/x509_parser.h | 2 +- + crypto/async_tx/async_xor.c | 8 +- + crypto/async_tx/raid6test.c | 4 +- + crypto/authenc.c | 2 +- + crypto/cfb.c | 2 +- + crypto/crypto_engine.c | 1 + + crypto/dh.c | 687 ++++++++- + crypto/dh_helper.c | 42 +- + crypto/hmac.c | 4 + + crypto/kpp.c | 29 + + crypto/lrw.c | 1 + + crypto/memneq.c | 22 +- + crypto/rsa-pkcs1pad.c | 38 +- + crypto/sm2.c | 40 +- + crypto/sm3_generic.c | 142 +- + crypto/tcrypt.c | 226 +-- + crypto/testmgr.c | 67 +- + crypto/testmgr.h | 1456 +++++++++++++++++++- + crypto/xts.c | 1 + + drivers/char/hw_random/Kconfig | 2 +- + drivers/char/hw_random/atmel-rng.c | 148 +- + drivers/char/hw_random/cavium-rng-vf.c | 2 +- + drivers/char/hw_random/core.c | 161 ++- + drivers/crypto/Kconfig | 10 + + drivers/crypto/Makefile | 2 +- + .../crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c | 3 + + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 3 + + .../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 3 + + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 2 + + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 3 + + drivers/crypto/amlogic/amlogic-gxl-cipher.c | 2 + + drivers/crypto/atmel-aes.c | 1 + + drivers/crypto/atmel-sha.c | 1 + + drivers/crypto/atmel-tdes.c | 1 + + drivers/crypto/cavium/nitrox/nitrox_mbx.c | 8 +- + drivers/crypto/cavium/nitrox/nitrox_req.h | 2 +- + drivers/crypto/cavium/zip/zip_main.c | 83 +- + drivers/crypto/ccp/ccp-crypto-aes.c | 5 +- + drivers/crypto/ccp/sev-dev.c | 2 +- + drivers/crypto/ccree/cc_buffer_mgr.c | 7 + + drivers/crypto/gemini/sl3516-ce-cipher.c | 6 +- + drivers/crypto/hisilicon/qm.c | 2 +- + drivers/crypto/hisilicon/sec2/sec_crypto.c | 43 +- + drivers/crypto/hisilicon/sec2/sec_crypto.h | 6 +- + drivers/crypto/hisilicon/sec2/sec_main.c | 59 +- + drivers/crypto/marvell/Kconfig | 1 + + drivers/crypto/marvell/octeontx/otx_cptvf_main.c | 1 - + drivers/crypto/marvell/octeontx2/otx2_cpt_common.h | 1 + + .../marvell/octeontx2/otx2_cpt_mbox_common.c | 14 + + drivers/crypto/marvell/octeontx2/otx2_cptlf.h | 19 +- + drivers/crypto/marvell/octeontx2/otx2_cptpf.h | 1 + + drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c | 25 +- + drivers/crypto/marvell/octeontx2/otx2_cptpf_mbox.c | 27 +- + .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 56 +- + drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c | 17 +- + drivers/crypto/mxs-dcp.c | 2 +- + drivers/crypto/nx/nx-common-pseries.c | 4 +- + drivers/crypto/omap-aes.c | 2 +- + drivers/crypto/omap-sham.c | 2 +- + drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c | 23 +- + drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h | 24 - + drivers/crypto/qat/qat_common/Makefile | 1 + + drivers/crypto/qat/qat_common/adf_accel_devices.h | 2 + + drivers/crypto/qat/qat_common/adf_admin.c | 37 + + drivers/crypto/qat/qat_common/adf_common_drv.h | 4 + + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 6 + + drivers/crypto/qat/qat_common/adf_gen4_hw_data.h | 14 + + drivers/crypto/qat/qat_common/adf_gen4_pfvf.c | 42 +- + drivers/crypto/qat/qat_common/adf_gen4_pm.c | 137 ++ + drivers/crypto/qat/qat_common/adf_gen4_pm.h | 44 + + drivers/crypto/qat/qat_common/adf_init.c | 6 + + drivers/crypto/qat/qat_common/adf_isr.c | 42 + + .../crypto/qat/qat_common/icp_qat_fw_init_admin.h | 1 + + drivers/crypto/qat/qat_common/qat_uclo.c | 9 +- + drivers/crypto/rockchip/rk3288_crypto_skcipher.c | 1 - + drivers/crypto/ux500/cryp/cryp_core.c | 2 +- + drivers/crypto/ux500/hash/hash_core.c | 2 +- + drivers/crypto/vmx/Kconfig | 4 + + drivers/crypto/xilinx/Makefile | 1 + + drivers/crypto/xilinx/zynqmp-sha.c | 283 ++++ + drivers/firmware/xilinx/zynqmp.c | 26 + + .../net/ethernet/marvell/octeontx2/af/rvu_cpt.c | 1 + + include/asm-generic/xor.h | 84 +- + include/crypto/algapi.h | 10 +- + include/crypto/dh.h | 26 +- + include/crypto/internal/kpp.h | 158 +++ + include/crypto/sm3.h | 34 +- + include/linux/crypto.h | 9 + + include/linux/firmware/xlnx-zynqmp.h | 8 + + include/linux/raid/xor.h | 21 +- + kernel/padata.c | 2 +- + lib/crc32.c | 14 +- + lib/crc32test.c | 2 +- + lib/crypto/Kconfig | 3 + + lib/crypto/Makefile | 3 + + lib/crypto/sm3.c | 246 ++++ + lib/mpi/mpi-bit.c | 1 + + security/keys/dh.c | 2 +- + 137 files changed, 5655 insertions(+), 1653 deletions(-) + create mode 100644 arch/x86/crypto/sm3-avx-asm_64.S + create mode 100644 arch/x86/crypto/sm3_avx_glue.c + create mode 100644 drivers/crypto/qat/qat_common/adf_gen4_pm.c + create mode 100644 drivers/crypto/qat/qat_common/adf_gen4_pm.h + create mode 100644 drivers/crypto/xilinx/zynqmp-sha.c + create mode 100644 lib/crypto/sm3.c +Merging drm/drm-next (38a15ad9488e Merge tag 'amd-drm-next-5.18-2022-02-25' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +CONFLICT (modify/delete): Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt deleted in drm/drm-next and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt left in tree. +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/bridge/ti-sn65dsi86.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_dsi.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c +Auto-merging drivers/gpu/drm/i915/intel_pch.c +Auto-merging drivers/gpu/drm/i915/intel_pch.h +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_crtc.c +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_drv.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt +rm 'Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt' +$ git commit --no-edit -v -a +[master 02c7dd23bbac] Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/bridge/analogix,anx7625.yaml | 17 + + .../display/bridge/ingenic,jz4780-hdmi.yaml | 82 + + .../bindings/display/bridge/lvds-codec.yaml | 3 +- + .../bindings/display/bridge/ti,sn65dsi83.yaml | 5 +- + .../bindings/display/{panel => }/lvds.yaml | 35 +- + .../bindings/display/mediatek/mediatek,aal.yaml | 77 + + .../bindings/display/mediatek/mediatek,ccorr.yaml | 76 + + .../bindings/display/mediatek/mediatek,color.yaml | 86 + + .../bindings/display/mediatek/mediatek,disp.txt | 210 - + .../bindings/display/mediatek/mediatek,dither.yaml | 76 + + .../bindings/display/mediatek/mediatek,dsc.yaml | 71 + + .../bindings/display/mediatek/mediatek,ethdr.yaml | 147 + + .../bindings/display/mediatek/mediatek,gamma.yaml | 77 + + .../bindings/display/mediatek/mediatek,merge.yaml | 110 + + .../bindings/display/mediatek/mediatek,mutex.yaml | 83 + + .../bindings/display/mediatek/mediatek,od.yaml | 53 + + .../bindings/display/mediatek/mediatek,ovl-2l.yaml | 88 + + .../bindings/display/mediatek/mediatek,ovl.yaml | 103 + + .../display/mediatek/mediatek,postmask.yaml | 69 + + .../bindings/display/mediatek/mediatek,rdma.yaml | 117 + + .../bindings/display/mediatek/mediatek,split.yaml | 58 + + .../bindings/display/mediatek/mediatek,ufoe.yaml | 61 + + .../bindings/display/mediatek/mediatek,wdma.yaml | 86 + + .../display/panel/advantech,idk-1110wr.yaml | 19 +- + .../display/panel/innolux,ee101ia-01d.yaml | 23 +- + .../display/panel/mitsubishi,aa104xd12.yaml | 19 +- + .../display/panel/mitsubishi,aa121td01.yaml | 19 +- + .../bindings/display/panel/panel-lvds.yaml | 57 + + .../bindings/display/panel/panel-simple.yaml | 4 + + .../bindings/display/panel/sgd,gktw70sdae4se.yaml | 19 +- + .../bindings/display/panel/sony,acx424akp.yaml | 11 +- + .../bindings/display/solomon,ssd1307fb.yaml | 1 + + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 15 + + Documentation/driver-api/device-io.rst | 9 + + Documentation/driver-api/dma-buf.rst | 9 - + Documentation/gpu/drm-internals.rst | 6 + + Documentation/gpu/drm-kms-helpers.rst | 26 +- + Documentation/gpu/drm-kms.rst | 6 +- + Documentation/gpu/drm-mm.rst | 2 +- + Documentation/gpu/i915.rst | 1 + + Documentation/gpu/todo.rst | 35 +- + Documentation/gpu/vkms.rst | 2 - + MAINTAINERS | 32 +- + arch/x86/kernel/early-quirks.c | 1 + + drivers/char/agp/ati-agp.c | 8 +- + drivers/char/agp/backend.c | 2 + + drivers/char/agp/frontend.c | 4 +- + drivers/char/agp/nvidia-agp.c | 3 +- + drivers/char/agp/sworks-agp.c | 5 +- + drivers/char/agp/via-agp.c | 3 - + drivers/dma-buf/dma-buf.c | 22 +- + drivers/dma-buf/dma-fence-array.c | 14 + + drivers/dma-buf/dma-fence-chain.c | 15 +- + drivers/dma-buf/dma-resv.c | 82 +- + drivers/dma-buf/heaps/cma_heap.c | 10 +- + drivers/dma-buf/heaps/system_heap.c | 10 +- + drivers/dma-buf/st-dma-resv.c | 26 +- + drivers/dma-buf/udmabuf.c | 4 + + drivers/firmware/sysfb_simplefb.c | 2 +- + drivers/gpu/drm/Kconfig | 18 + + drivers/gpu/drm/Makefile | 15 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/aldebaran.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 63 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 7 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.c | 3 - + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 24 - + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 25 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 96 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 24 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 10 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 76 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 244 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 38 + + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 132 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 149 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 441 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 683 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 140 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 128 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 59 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c | 40 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 126 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c | 40 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c | 65 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 125 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 525 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 77 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 56 + + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 40 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 50 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 250 - + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 419 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 106 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 151 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 63 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 119 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 10 +- + drivers/gpu/drm/amd/amdgpu/athub_v1_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 1 + + drivers/gpu/drm/amd/amdgpu/atom.c | 4 +- + drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 2 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 334 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 234 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 24 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4.h | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 25 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 59 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 105 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 19 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.h | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/mca_v3_0.c | 102 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.h | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 1 + + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 2 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 19 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 19 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 13 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 48 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 20 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h | 2 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 118 +- + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 14 + + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 1 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 69 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4.c | 25 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4.h | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 28 +- + drivers/gpu/drm/amd/amdgpu/si.c | 2 +- + drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 81 +- + drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.h | 6 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 59 +- + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 8 +- + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 3 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 30 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_1.h | 2 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 225 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_7.h | 25 +- + drivers/gpu/drm/amd/amdgpu/umc_v8_7.c | 166 +- + drivers/gpu/drm/amd/amdgpu/umc_v8_7.h | 2 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 2 +- + drivers/gpu/drm/amd/amdkfd/Makefile | 2 - + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 1622 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.h | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 845 - + drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h | 230 - + drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.c | 158 - + drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.h | 293 - + drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 67 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 269 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 62 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c | 3 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_v10.c | 12 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 3 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_vi.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 316 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.h | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 11 +- + drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 11 +- + drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 15 +- + drivers/gpu/drm/amd/amdkfd/kfd_iommu.h | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 24 +- + drivers/gpu/drm/amd/amdkfd/kfd_module.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 67 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 44 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 126 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 155 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 175 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 151 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 11 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 52 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c | 29 +- + drivers/gpu/drm/amd/amdkfd/kfd_pasid.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers.h | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h | 3 +- + .../gpu/drm/amd/amdkfd/kfd_pm4_headers_aldebaran.h | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_diq.h | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_vi.h | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_pm4_opcodes.h | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 196 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 95 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 375 +- + drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 437 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 39 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 3 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 146 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 15 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 126 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 4 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 203 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 293 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 14 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 248 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 64 +- + drivers/gpu/drm/amd/display/dc/Makefile | 8 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 2 - + .../gpu/drm/amd/display/dc/bios/command_table2.c | 4 - + .../amd/display/dc/bios/command_table_helper2.c | 2 + + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 19 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 37 +- + .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 2 + + .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c | 3 +- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 5 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 8 +- + .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 21 +- + .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.h | 2 +- + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 617 + + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.h | 49 + + .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c | 314 + + .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.h | 126 + + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 715 + + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.h | 49 + + .../drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.c | 312 + + .../drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.h | 137 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 75 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 898 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 3 + + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 1540 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dpcd.c | 2 +- + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 24 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 917 - + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 106 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 23 +- + drivers/gpu/drm/amd/display/dc/dc.h | 45 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 88 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 60 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 21 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 6 - + drivers/gpu/drm/amd/display/dc/dc_types.h | 6 - + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 2 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 17 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 3 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.c | 25 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.h | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 4 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 107 +- + .../drm/amd/display/dc/dce112/dce112_resource.c | 2 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 12 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 18 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 3 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 15 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 53 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 19 +- + .../gpu/drm/amd/display/dc/dcn201/dcn201_init.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 7 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 4 +- + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn302/Makefile | 12 - + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 320 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.h | 3 + + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 106 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 6 + + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 11 + + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h | 9 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 28 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.h | 2 + + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 4 +- + .../drm/amd/display/dc/{calcs => dcn315}/Makefile | 36 +- + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 2304 + + .../drm/amd/display/dc/dcn315/dcn315_resource.h | 42 + + drivers/gpu/drm/amd/display/dc/dcn316/Makefile | 56 + + .../drm/amd/display/dc/dcn316/dcn316_resource.c | 2306 + + .../drm/amd/display/dc/dcn316/dcn316_resource.h | 42 + + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 6 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 12 +- + .../drm/amd/display/dc/{ => dml}/calcs/bw_fixed.c | 0 + .../amd/display/dc/{ => dml}/calcs/calcs_logger.h | 0 + .../amd/display/dc/{ => dml}/calcs/custom_float.c | 0 + .../drm/amd/display/dc/{ => dml}/calcs/dce_calcs.c | 48 +- + .../amd/display/dc/{ => dml}/calcs/dcn_calc_auto.c | 0 + .../amd/display/dc/{ => dml}/calcs/dcn_calc_auto.h | 0 + .../amd/display/dc/{ => dml}/calcs/dcn_calc_math.c | 0 + .../drm/amd/display/dc/{ => dml}/calcs/dcn_calcs.c | 0 + .../gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.c | 357 + + .../gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.h | 32 + + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 29 +- + .../drm/amd/display/dc/dml/display_mode_structs.h | 1 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 24 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 3 + + .../gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.c | 2 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 2 +- + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 8 + + .../amd/display/dc/gpio/dcn30/hw_factory_dcn30.c | 4 +- + .../amd/display/dc/gpio/dcn30/hw_translate_dcn30.c | 4 +- + .../amd/display/dc/gpio/dcn315/hw_factory_dcn315.c | 260 + + .../amd/display/dc/gpio/dcn315/hw_factory_dcn315.h | 31 + + .../display/dc/gpio/dcn315/hw_translate_dcn315.c | 374 + + .../display/dc/gpio/dcn315/hw_translate_dcn315.h | 33 + + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 5 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 5 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 13 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 56 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 4 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 2 - + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 5 +- + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 6 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 2 - + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 2 - + drivers/gpu/drm/amd/display/dc/inc/link_dpcd.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 86 +- + drivers/gpu/drm/amd/display/dc/inc/reg_helper.h | 34 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 16 +- + drivers/gpu/drm/amd/display/dc/irq/Makefile | 8 + + .../amd/display/dc/irq/dcn20/irq_service_dcn20.c | 2 +- + .../amd/display/dc/irq/dcn201/irq_service_dcn201.c | 5 - + .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 14 - + .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 6 +- + .../amd/display/dc/irq/dcn315/irq_service_dcn315.c | 438 + + .../amd/display/dc/irq/dcn315/irq_service_dcn315.h | 34 + + drivers/gpu/drm/amd/display/dc/link/Makefile | 30 + + .../gpu/drm/amd/display/dc/link/link_hwss_dio.c | 137 + + .../gpu/drm/amd/display/dc/link/link_hwss_dio.h | 53 + + .../gpu/drm/amd/display/dc/link/link_hwss_dpia.c | 51 + + .../gpu/drm/amd/display/dc/link/link_hwss_dpia.h | 34 + + .../gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.c | 254 + + .../gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.h | 35 + + .../drm/amd/display/dc/link/link_hwss_hpo_frl.c | 43 + + .../drm/amd/display/dc/link/link_hwss_hpo_frl.h | 34 + + drivers/gpu/drm/amd/display/dc/os_types.h | 2 +- + drivers/gpu/drm/amd/display/dc/virtual/Makefile | 2 +- + .../amd/display/dc/virtual/virtual_link_encoder.c | 3 +- + .../drm/amd/display/dc/virtual/virtual_link_hwss.c | 43 + + .../drm/amd/display/dc/virtual/virtual_link_hwss.h | 34 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 2 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 57 +- + drivers/gpu/drm/amd/display/dmub/src/Makefile | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn315.c | 62 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn315.h | 68 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn316.c | 62 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn316.h | 33 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 11 +- + .../drm/amd/display/include/bios_parser_types.h | 2 - + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 13 +- + drivers/gpu/drm/amd/display/include/dal_types.h | 2 + + .../drm/amd/display/include/ddc_service_types.h | 6 + + drivers/gpu/drm/amd/display/include/dpcd_defs.h | 6 +- + .../gpu/drm/amd/display/include/grph_object_defs.h | 2 - + .../gpu/drm/amd/display/include/grph_object_id.h | 2 - + .../drm/amd/display/include/link_service_types.h | 12 - + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 2 +- + .../drm/amd/display/modules/inc/mod_info_packet.h | 3 +- + .../amd/display/modules/info_packet/info_packet.c | 25 +- + drivers/gpu/drm/amd/include/amd_shared.h | 3 +- + .../amd/include/asic_reg/dcn/dcn_3_1_5_offset.h | 15191 ++ + .../amd/include/asic_reg/dcn/dcn_3_1_5_sh_mask.h | 62061 ++++++++ + .../amd/include/asic_reg/dcn/dcn_3_1_6_offset.h | 15682 ++ + .../amd/include/asic_reg/dcn/dcn_3_1_6_sh_mask.h | 62717 ++++++++ + .../asic_reg/{dcn => dpcs}/dpcs_3_0_0_offset.h | 7 + + .../asic_reg/{dcn => dpcs}/dpcs_3_0_0_sh_mask.h | 7 + + .../asic_reg/{dcn => dpcs}/dpcs_3_0_3_offset.h | 0 + .../asic_reg/{dcn => dpcs}/dpcs_3_0_3_sh_mask.h | 0 + .../amd/include/asic_reg/dpcs/dpcs_4_2_2_offset.h | 11957 ++ + .../amd/include/asic_reg/dpcs/dpcs_4_2_2_sh_mask.h | 103633 +++++++++++++ + .../amd/include/asic_reg/dpcs/dpcs_4_2_3_offset.h | 11969 ++ + .../amd/include/asic_reg/dpcs/dpcs_4_2_3_sh_mask.h | 136141 ++++++++++++++++++ + .../drm/amd/include/asic_reg/hdp/hdp_4_0_sh_mask.h | 2 + + .../drm/amd/include/asic_reg/mp/mp_13_0_5_offset.h | 455 + + .../amd/include/asic_reg/mp/mp_13_0_5_sh_mask.h | 672 + + .../drm/amd/include/asic_reg/mp/mp_13_0_8_offset.h | 410 + + .../amd/include/asic_reg/mp/mp_13_0_8_sh_mask.h | 603 + + .../amd/include/asic_reg/umc/umc_6_7_0_offset.h | 6 + + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 9 - + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 13 +- + drivers/gpu/drm/amd/pm/Makefile | 13 +- + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2520 +- + drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c | 95 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 617 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 373 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h | 32 + + drivers/gpu/drm/amd/pm/legacy-dpm/Makefile | 32 + + .../drm/amd/pm/{powerplay => legacy-dpm}/cik_dpm.h | 0 + .../drm/amd/pm/{powerplay => legacy-dpm}/kv_dpm.c | 37 +- + .../drm/amd/pm/{powerplay => legacy-dpm}/kv_dpm.h | 0 + .../drm/amd/pm/{powerplay => legacy-dpm}/kv_smc.c | 0 + drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c | 1081 + + drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.h | 38 + + .../drm/amd/pm/{powerplay => legacy-dpm}/ppsmc.h | 0 + .../amd/pm/{powerplay => legacy-dpm}/r600_dpm.h | 0 + .../drm/amd/pm/{powerplay => legacy-dpm}/si_dpm.c | 188 +- + .../drm/amd/pm/{powerplay => legacy-dpm}/si_dpm.h | 15 +- + .../drm/amd/pm/{powerplay => legacy-dpm}/si_smc.c | 0 + .../pm/{powerplay => legacy-dpm}/sislands_smc.h | 0 + drivers/gpu/drm/amd/pm/powerplay/Makefile | 4 - + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 400 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 8 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 10 +- + .../drm/amd/pm/{ => powerplay}/inc/amd_powerplay.h | 0 + .../gpu/drm/amd/pm/{ => powerplay}/inc/cz_ppsmc.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/fiji_ppsmc.h | 0 + .../amd/pm/{ => powerplay}/inc/hardwaremanager.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/hwmgr.h | 4 - + .../pm/{ => powerplay}/inc/polaris10_pwrvirus.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/power_state.h | 0 + .../gpu/drm/amd/pm/{ => powerplay}/inc/pp_debug.h | 0 + .../gpu/drm/amd/pm/{ => powerplay}/inc/pp_endian.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/pp_thermal.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/ppinterrupt.h | 0 + .../gpu/drm/amd/pm/{ => powerplay}/inc/rv_ppsmc.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu10.h | 0 + .../amd/pm/{ => powerplay}/inc/smu10_driver_if.h | 0 + .../amd/pm/{ => powerplay}/inc/smu11_driver_if.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu71.h | 0 + .../amd/pm/{ => powerplay}/inc/smu71_discrete.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu72.h | 0 + .../amd/pm/{ => powerplay}/inc/smu72_discrete.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu73.h | 0 + .../amd/pm/{ => powerplay}/inc/smu73_discrete.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu74.h | 0 + .../amd/pm/{ => powerplay}/inc/smu74_discrete.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu75.h | 0 + .../amd/pm/{ => powerplay}/inc/smu75_discrete.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/smu7_common.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/smu7_discrete.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/smu7_fusion.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/smu7_ppsmc.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu8.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/smu8_fusion.h | 0 + drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu9.h | 0 + .../amd/pm/{ => powerplay}/inc/smu9_driver_if.h | 0 + .../amd/pm/{ => powerplay}/inc/smu_ucode_xfer_cz.h | 2 +- + .../amd/pm/{ => powerplay}/inc/smu_ucode_xfer_vi.h | 0 + .../gpu/drm/amd/pm/{ => powerplay}/inc/smumgr.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/tonga_ppsmc.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/vega10_ppsmc.h | 0 + .../pm/{ => powerplay}/inc/vega12/smu9_driver_if.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/vega12_ppsmc.h | 0 + .../drm/amd/pm/{ => powerplay}/inc/vega20_ppsmc.h | 0 + .../gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c | 4 +- + .../gpu/drm/amd/pm/powerplay/smumgr/smu10_smumgr.c | 4 +- + .../gpu/drm/amd/pm/powerplay/smumgr/smu7_smumgr.c | 11 +- + .../gpu/drm/amd/pm/powerplay/smumgr/smu9_smumgr.c | 2 +- + .../drm/amd/pm/powerplay/smumgr/vega20_smumgr.c | 8 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 681 +- + .../gpu/drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h | 59 +- + .../{inc => swsmu/inc/pmfw_if}/aldebaran_ppsmc.h | 0 + .../pm/{inc => swsmu/inc/pmfw_if}/arcturus_ppsmc.h | 0 + .../inc/pmfw_if}/smu11_driver_if_arcturus.h | 0 + .../inc/pmfw_if}/smu11_driver_if_cyan_skillfish.h | 0 + .../inc/pmfw_if}/smu11_driver_if_navi10.h | 0 + .../inc/pmfw_if}/smu11_driver_if_sienna_cichlid.h | 24 +- + .../inc/pmfw_if}/smu11_driver_if_vangogh.h | 0 + .../{inc => swsmu/inc/pmfw_if}/smu12_driver_if.h | 0 + .../inc/pmfw_if}/smu13_driver_if_aldebaran.h | 0 + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_5.h | 140 + + .../inc/pmfw_if}/smu13_driver_if_yellow_carp.h | 0 + .../{inc => swsmu/inc/pmfw_if}/smu_v11_0_7_ppsmc.h | 0 + .../{inc => swsmu/inc/pmfw_if}/smu_v11_0_ppsmc.h | 0 + .../pm/{inc => swsmu/inc/pmfw_if}/smu_v11_5_pmfw.h | 0 + .../{inc => swsmu/inc/pmfw_if}/smu_v11_5_ppsmc.h | 0 + .../pm/{inc => swsmu/inc/pmfw_if}/smu_v11_8_pmfw.h | 0 + .../{inc => swsmu/inc/pmfw_if}/smu_v11_8_ppsmc.h | 0 + .../{inc => swsmu/inc/pmfw_if}/smu_v12_0_ppsmc.h | 0 + .../{inc => swsmu/inc/pmfw_if}/smu_v13_0_1_pmfw.h | 0 + .../{inc => swsmu/inc/pmfw_if}/smu_v13_0_1_ppsmc.h | 0 + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_5_pmfw.h | 126 + + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_5_ppsmc.h | 74 + + .../amd/pm/{ => swsmu}/inc/smu_11_0_cdr_table.h | 0 + drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_types.h | 3 + + drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0.h | 0 + .../amd/pm/{ => swsmu}/inc/smu_v11_0_7_pptable.h | 0 + .../drm/amd/pm/{ => swsmu}/inc/smu_v11_0_pptable.h | 0 + drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h | 0 + drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v13_0.h | 1 + + .../drm/amd/pm/{ => swsmu}/inc/smu_v13_0_pptable.h | 0 + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 102 +- + .../drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 80 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 476 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 294 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 70 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 79 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 28 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 10 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 90 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 80 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 1057 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.h | 29 + + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 38 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 250 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 16 +- + drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 10 +- + .../gpu/drm/arm/display/komeda/d71/d71_component.c | 12 +- + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 3 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 3 +- + drivers/gpu/drm/arm/malidp_drv.c | 3 +- + drivers/gpu/drm/armada/armada_drv.c | 3 + + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 3 +- + drivers/gpu/drm/ast/ast_dp501.c | 58 - + drivers/gpu/drm/ast/ast_drv.c | 18 +- + drivers/gpu/drm/ast/ast_drv.h | 39 +- + drivers/gpu/drm/ast/ast_main.c | 2 + + drivers/gpu/drm/ast/ast_mode.c | 426 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 3 +- + drivers/gpu/drm/bridge/Kconfig | 13 + + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/adv7511/adv7511.h | 1 + + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 31 +- + drivers/gpu/drm/bridge/adv7511/adv7533.c | 2 +- + drivers/gpu/drm/bridge/analogix/Kconfig | 4 + + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 2 +- + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 2 +- + .../gpu/drm/bridge/analogix/analogix-i2c-dptx.c | 2 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 2 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 575 +- + drivers/gpu/drm/bridge/analogix/anx7625.h | 79 +- + drivers/gpu/drm/bridge/cadence/Kconfig | 1 + + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 20 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +- + drivers/gpu/drm/bridge/chipone-icn6211.c | 39 +- + drivers/gpu/drm/bridge/ite-it6505.c | 3352 + + drivers/gpu/drm/bridge/ite-it66121.c | 3 - + drivers/gpu/drm/bridge/lontium-lt9611.c | 10 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 4 +- + drivers/gpu/drm/bridge/nwl-dsi.c | 26 +- + drivers/gpu/drm/bridge/panel.c | 12 + + drivers/gpu/drm/bridge/parade-ps8640.c | 33 +- + drivers/gpu/drm/bridge/sii902x.c | 129 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 2 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 21 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 25 +- + drivers/gpu/drm/bridge/tc358767.c | 2 +- + drivers/gpu/drm/bridge/tc358775.c | 4 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 53 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 76 +- + drivers/gpu/drm/dp/Makefile | 9 + + drivers/gpu/drm/{drm_dp_helper.c => dp/drm_dp.c} | 92 +- + drivers/gpu/drm/{ => dp}/drm_dp_aux_bus.c | 4 +- + drivers/gpu/drm/{ => dp}/drm_dp_aux_dev.c | 6 +- + drivers/gpu/drm/{ => dp}/drm_dp_cec.c | 2 +- + drivers/gpu/drm/{ => dp}/drm_dp_dual_mode_helper.c | 2 +- + drivers/gpu/drm/dp/drm_dp_helper_internal.h | 33 + + drivers/gpu/drm/dp/drm_dp_helper_mod.c | 22 + + drivers/gpu/drm/{ => dp}/drm_dp_mst_topology.c | 8 +- + .../drm/{ => dp}/drm_dp_mst_topology_internal.h | 2 +- + drivers/gpu/drm/drm_bridge_connector.c | 15 + + drivers/gpu/drm/drm_buddy.c | 785 + + drivers/gpu/drm/drm_cache.c | 27 +- + drivers/gpu/drm/drm_client.c | 9 +- + drivers/gpu/drm/drm_client_modeset.c | 3 +- + drivers/gpu/drm/drm_color_mgmt.c | 4 + + drivers/gpu/drm/drm_crtc_helper_internal.h | 27 - + drivers/gpu/drm/drm_debugfs.c | 3 + + drivers/gpu/drm/drm_dsc.c | 2 +- + drivers/gpu/drm/drm_edid.c | 107 +- + drivers/gpu/drm/drm_fb_helper.c | 90 +- + drivers/gpu/drm/drm_format_helper.c | 141 +- + drivers/gpu/drm/drm_framebuffer.c | 6 +- + drivers/gpu/drm/drm_gem.c | 33 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 9 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 16 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 22 +- + drivers/gpu/drm/drm_gem_ttm_helper.c | 4 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 25 +- + drivers/gpu/drm/drm_internal.h | 6 +- + drivers/gpu/drm/drm_ioctl.c | 2 +- + drivers/gpu/drm/drm_kms_helper_common.c | 14 - + drivers/gpu/drm/drm_mipi_dbi.c | 8 +- + drivers/gpu/drm/drm_modes.c | 2 +- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 + + drivers/gpu/drm/drm_plane.c | 32 +- + drivers/gpu/drm/drm_prime.c | 4 +- + drivers/gpu/drm/drm_privacy_screen.c | 6 +- + drivers/gpu/drm/drm_privacy_screen_x86.c | 17 + + drivers/gpu/drm/drm_syncobj.c | 61 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 8 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 3 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +- + drivers/gpu/drm/exynos/Kconfig | 1 + + drivers/gpu/drm/exynos/exynos_drm_drv.c | 3 + + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 13 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 3 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 14 +- + drivers/gpu/drm/gma500/gma_display.c | 6 +- + drivers/gpu/drm/gma500/intel_bios.c | 2 +- + drivers/gpu/drm/gma500/mmu.c | 8 +- + drivers/gpu/drm/gma500/psb_drv.c | 3 + + drivers/gpu/drm/gud/gud_pipe.c | 4 +- + drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 3 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 3 +- + drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 3 + + drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 5 +- + drivers/gpu/drm/i915/Kconfig | 2 + + drivers/gpu/drm/i915/Makefile | 8 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 18 +- + drivers/gpu/drm/i915/display/g4x_hdmi.h | 2 +- + drivers/gpu/drm/i915/display/hsw_ips.c | 271 + + drivers/gpu/drm/i915/display/hsw_ips.h | 26 + + drivers/gpu/drm/i915/display/i9xx_plane.c | 105 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 21 +- + drivers/gpu/drm/i915/display/icl_dsi_regs.h | 342 + + drivers/gpu/drm/i915/display/intel_atomic.c | 13 +- + drivers/gpu/drm/i915/display/intel_atomic.h | 2 - + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 225 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 15 +- + drivers/gpu/drm/i915/display/intel_backlight.c | 3 + + drivers/gpu/drm/i915/display/intel_bios.c | 223 +- + drivers/gpu/drm/i915/display/intel_bw.c | 167 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 67 +- + drivers/gpu/drm/i915/display/intel_cdclk.h | 9 +- + drivers/gpu/drm/i915/display/intel_color.c | 119 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 1 + + .../gpu/drm/i915/display/intel_combo_phy_regs.h | 162 + + drivers/gpu/drm/i915/display/intel_crt.h | 2 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 1 + + drivers/gpu/drm/i915/display/intel_cursor.c | 25 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 176 +- + drivers/gpu/drm/i915/display/intel_ddi.h | 2 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 42 +- + drivers/gpu/drm/i915/display/intel_de.h | 1 - + drivers/gpu/drm/i915/display/intel_display.c | 1469 +- + drivers/gpu/drm/i915/display/intel_display.h | 47 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 46 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 46 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 2 +- + drivers/gpu/drm/i915/display/intel_display_trace.h | 1 + + drivers/gpu/drm/i915/display/intel_display_types.h | 55 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 14 +- + drivers/gpu/drm/i915/display/intel_dmc.h | 2 +- + drivers/gpu/drm/i915/display/intel_dp.c | 244 +- + drivers/gpu/drm/i915/display/intel_dp.h | 2 - + drivers/gpu/drm/i915/display/intel_dp_aux.c | 8 +- + drivers/gpu/drm/i915/display/intel_dp_aux.h | 4 - + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 4 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 307 +- + .../gpu/drm/i915/display/intel_dp_link_training.h | 6 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 35 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 12 + + drivers/gpu/drm/i915/display/intel_dpll.h | 1 + + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 80 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 49 +- + drivers/gpu/drm/i915/display/intel_dpt.c | 37 +- + drivers/gpu/drm/i915/display/intel_drrs.c | 107 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 2 + + drivers/gpu/drm/i915/display/intel_dsb.h | 2 +- + drivers/gpu/drm/i915/display/intel_dsi.h | 4 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 40 +- + drivers/gpu/drm/i915/display/intel_dvo_dev.h | 2 +- + drivers/gpu/drm/i915/display/intel_fb_pin.c | 9 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 240 +- + drivers/gpu/drm/i915/display/intel_fbc.h | 7 + + drivers/gpu/drm/i915/display/intel_fbdev.c | 27 +- + drivers/gpu/drm/i915/display/intel_fbdev.h | 7 + + drivers/gpu/drm/i915/display/intel_fdi.c | 5 + + drivers/gpu/drm/i915/display/intel_gmbus.c | 23 +- + drivers/gpu/drm/i915/display/intel_gmbus.h | 1 - + drivers/gpu/drm/i915/display/intel_hdcp.c | 3 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 145 +- + drivers/gpu/drm/i915/display/intel_hdmi.h | 7 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 21 +- + drivers/gpu/drm/i915/display/intel_lspcon.c | 148 +- + drivers/gpu/drm/i915/display/intel_lvds.h | 2 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 119 +- + drivers/gpu/drm/i915/display/intel_opregion.h | 10 + + drivers/gpu/drm/i915/display/intel_overlay.c | 2 + + drivers/gpu/drm/i915/display/intel_pch_display.c | 88 +- + drivers/gpu/drm/i915/display/intel_pch_display.h | 8 + + drivers/gpu/drm/i915/display/intel_plane_initial.c | 14 +- + drivers/gpu/drm/i915/display/intel_pps.c | 22 +- + drivers/gpu/drm/i915/display/intel_psr.c | 119 +- + drivers/gpu/drm/i915/display/intel_sdvo.h | 2 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 238 +- + drivers/gpu/drm/i915/display/intel_snps_phy_regs.h | 75 + + drivers/gpu/drm/i915/display/intel_sprite.c | 65 +- + drivers/gpu/drm/i915/display/intel_tc.c | 2 + + drivers/gpu/drm/i915/display/intel_tc_phy_regs.h | 280 + + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 34 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 54 +- + drivers/gpu/drm/i915/display/intel_vdsc.h | 1 - + drivers/gpu/drm/i915/display/intel_vga.c | 9 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 195 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 34 +- + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 1 + + drivers/gpu/drm/i915/display/vlv_dsi_pll_regs.h | 109 + + drivers/gpu/drm/i915/display/vlv_dsi_regs.h | 480 + + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 2 + + drivers/gpu/drm/i915/gem/i915_gem_context.c | 27 +- + drivers/gpu/drm/i915/gem/i915_gem_context.h | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_create.c | 3 + + drivers/gpu/drm/i915/gem/i915_gem_create.h | 17 + + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 9 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.h | 18 + + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 5 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.h | 15 + + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 242 +- + drivers/gpu/drm/i915/gem/i915_gem_internal.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_internal.h | 23 + + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 39 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 23 + + drivers/gpu/drm/i915/gem/i915_gem_object.h | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 51 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 12 +- + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 20 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 30 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 10 +- + drivers/gpu/drm/i915/gem/i915_gem_throttle.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 17 +- + drivers/gpu/drm/i915/gem/i915_gem_tiling.h | 18 + + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 12 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 13 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_userptr.h | 14 + + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 42 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 7 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 6 +- + .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 6 +- + .../gpu/drm/i915/gem/selftests/i915_gem_migrate.c | 192 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 29 +- + .../gpu/drm/i915/gem/selftests/i915_gem_object.c | 2 +- + drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c | 1 + + drivers/gpu/drm/i915/gem/selftests/mock_context.c | 1 + + drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c | 6 +- + drivers/gpu/drm/i915/gt/gen2_engine_cs.c | 2 + + drivers/gpu/drm/i915/gt/gen6_engine_cs.c | 1 + + drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 23 +- + drivers/gpu/drm/i915/gt/gen7_renderclear.c | 1 + + drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 3 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 37 +- + drivers/gpu/drm/i915/gt/intel_context.c | 4 +- + drivers/gpu/drm/i915/gt/intel_context_sseu.c | 1 + + drivers/gpu/drm/i915/gt/intel_engine.h | 3 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 25 +- + drivers/gpu/drm/i915/gt/intel_engine_regs.h | 246 + + .../gpu/drm/i915/gt/intel_execlists_submission.c | 42 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 134 +- + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 10 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 18 +- + drivers/gpu/drm/i915/gt/intel_gt.h | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c | 1 + + drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c | 2 + + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 11 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_irq.c | 1 + + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 1526 + + drivers/gpu/drm/i915/gt/intel_gtt.c | 6 + + drivers/gpu/drm/i915/gt/intel_gtt.h | 19 +- + drivers/gpu/drm/i915/gt/intel_llc.c | 11 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 47 + + drivers/gpu/drm/i915/gt/intel_lrc.h | 16 +- + drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 15 - + drivers/gpu/drm/i915/gt/intel_mocs.c | 2 +- + drivers/gpu/drm/i915/gt/intel_ppgtt.c | 22 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 16 +- + drivers/gpu/drm/i915/gt/intel_rc6.h | 2 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 6 +- + drivers/gpu/drm/i915/gt/intel_renderstate.c | 2 + + drivers/gpu/drm/i915/gt/intel_reset.c | 29 +- + drivers/gpu/drm/i915/gt/intel_ring.c | 2 + + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 16 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 11 +- + drivers/gpu/drm/i915/gt/intel_sseu.c | 3 +- + drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c | 1 + + drivers/gpu/drm/i915/gt/intel_timeline.c | 5 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 53 +- + drivers/gpu/drm/i915/gt/intel_workarounds_types.h | 2 +- + drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 1 + + drivers/gpu/drm/i915/gt/selftest_execlists.c | 1 + + drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 1 + + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 4 +- + drivers/gpu/drm/i915/gt/selftest_llc.c | 5 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 2 + + drivers/gpu/drm/i915/gt/selftest_migrate.c | 2 + + drivers/gpu/drm/i915/gt/selftest_reset.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_rps.c | 8 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 1 + + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 1 + + drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h | 80 +- + .../gpu/drm/i915/gt/uc/abi/guc_actions_slpc_abi.h | 1 - + drivers/gpu/drm/i915/gt/uc/abi/guc_errors_abi.h | 23 + + drivers/gpu/drm/i915/gt/uc/abi/guc_klvs_abi.h | 82 + + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 128 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 20 + + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 206 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 143 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 39 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 37 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 32 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.h | 3 + + drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 9 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 5 + + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 152 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.c | 1 + + drivers/gpu/drm/i915/gt/uc/intel_huc.h | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 31 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 46 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 2 +- + drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 2 +- + drivers/gpu/drm/i915/gvt/aperture_gm.c | 3 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 4 +- + drivers/gpu/drm/i915/gvt/display.c | 17 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 26 +- + drivers/gpu/drm/i915/gvt/edid.c | 1 + + drivers/gpu/drm/i915/gvt/execlist.c | 2 +- + drivers/gpu/drm/i915/gvt/fb_decoder.c | 49 +- + drivers/gpu/drm/i915/gvt/gtt.c | 70 +- + drivers/gpu/drm/i915/gvt/gtt.h | 4 +- + drivers/gpu/drm/i915/gvt/gvt.h | 2 +- + drivers/gpu/drm/i915/gvt/handlers.c | 38 +- + drivers/gpu/drm/i915/gvt/interrupt.c | 11 +- + drivers/gpu/drm/i915/gvt/interrupt.h | 4 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 2 + + drivers/gpu/drm/i915/gvt/mmio.c | 3 + + drivers/gpu/drm/i915/gvt/mmio_context.c | 6 +- + drivers/gpu/drm/i915/gvt/mmio_context.h | 2 +- + drivers/gpu/drm/i915/gvt/reg.h | 1 - + drivers/gpu/drm/i915/gvt/sched_policy.c | 2 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 2 + + drivers/gpu/drm/i915/gvt/scheduler.h | 2 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 4 +- + drivers/gpu/drm/i915/i915_buddy.c | 466 - + drivers/gpu/drm/i915/i915_buddy.h | 143 - + drivers/gpu/drm/i915/i915_cmd_parser.c | 78 +- + drivers/gpu/drm/i915/i915_cmd_parser.h | 26 + + drivers/gpu/drm/i915/i915_debugfs.c | 20 +- + drivers/gpu/drm/i915/i915_driver.c | 31 +- + drivers/gpu/drm/i915/i915_driver.h | 5 + + drivers/gpu/drm/i915/i915_drv.h | 416 +- + drivers/gpu/drm/i915/i915_file_private.h | 108 + + drivers/gpu/drm/i915/i915_gem.c | 45 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 102 +- + drivers/gpu/drm/i915/i915_gem_evict.h | 28 + + drivers/gpu/drm/i915/i915_gem_gtt.c | 17 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 4 + + drivers/gpu/drm/i915/i915_getparam.c | 4 +- + drivers/gpu/drm/i915/i915_getparam.h | 15 + + drivers/gpu/drm/i915/i915_gpu_error.c | 91 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 11 + + drivers/gpu/drm/i915/i915_ioc32.c | 1 + + drivers/gpu/drm/i915/i915_ioctl.c | 94 + + drivers/gpu/drm/i915/i915_ioctl.h | 14 + + drivers/gpu/drm/i915/i915_irq.c | 25 +- + drivers/gpu/drm/i915/i915_irq.h | 1 + + drivers/gpu/drm/i915/i915_mitigations.c | 1 + + drivers/gpu/drm/i915/i915_mm.h | 3 +- + drivers/gpu/drm/i915/i915_module.c | 7 +- + drivers/gpu/drm/i915/i915_pci.c | 26 +- + drivers/gpu/drm/i915/i915_perf.c | 148 +- + drivers/gpu/drm/i915/i915_perf_oa_regs.h | 137 + + drivers/gpu/drm/i915/i915_perf_types.h | 2 +- + drivers/gpu/drm/i915/i915_pmu.c | 2 + + drivers/gpu/drm/i915/i915_reg.h | 5304 +- + drivers/gpu/drm/i915/i915_reg_defs.h | 128 + + drivers/gpu/drm/i915/i915_request.c | 14 +- + drivers/gpu/drm/i915/i915_request.h | 6 +- + drivers/gpu/drm/i915/i915_scatterlist.c | 11 +- + drivers/gpu/drm/i915/i915_suspend.c | 1 + + drivers/gpu/drm/i915/i915_sysfs.c | 1 + + drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 107 +- + drivers/gpu/drm/i915/i915_ttm_buddy_manager.h | 6 +- + drivers/gpu/drm/i915/i915_utils.h | 15 - + drivers/gpu/drm/i915/i915_vgpu.c | 2 +- + drivers/gpu/drm/i915/i915_vma.c | 572 +- + drivers/gpu/drm/i915/i915_vma.h | 34 +- + drivers/gpu/drm/i915/i915_vma_resource.c | 418 + + drivers/gpu/drm/i915/i915_vma_resource.h | 234 + + drivers/gpu/drm/i915/i915_vma_snapshot.c | 134 - + drivers/gpu/drm/i915/i915_vma_snapshot.h | 112 - + drivers/gpu/drm/i915/i915_vma_types.h | 19 +- + drivers/gpu/drm/i915/intel_device_info.c | 13 +- + drivers/gpu/drm/i915/intel_device_info.h | 9 +- + drivers/gpu/drm/i915/intel_dram.c | 8 +- + drivers/gpu/drm/i915/intel_mchbar_regs.h | 228 + + drivers/gpu/drm/i915/intel_pch.c | 1 + + drivers/gpu/drm/i915/intel_pch.h | 1 + + drivers/gpu/drm/i915/intel_pci_config.h | 85 + + drivers/gpu/drm/i915/intel_pcode.c | 32 +- + drivers/gpu/drm/i915/intel_pcode.h | 12 +- + drivers/gpu/drm/i915/intel_pm.c | 701 +- + drivers/gpu/drm/i915/intel_pm.h | 1 - + drivers/gpu/drm/i915/intel_runtime_pm.c | 2 +- + drivers/gpu/drm/i915/intel_runtime_pm.h | 1 + + drivers/gpu/drm/i915/intel_sbi.c | 1 + + drivers/gpu/drm/i915/intel_step.c | 15 + + drivers/gpu/drm/i915/intel_uncore.c | 75 +- + drivers/gpu/drm/i915/intel_uncore.h | 2 +- + drivers/gpu/drm/i915/intel_wopcm.c | 42 +- + drivers/gpu/drm/i915/pxp/intel_pxp_irq.c | 1 + + drivers/gpu/drm/i915/pxp/intel_pxp_pm.h | 2 +- + drivers/gpu/drm/i915/selftests/i915_buddy.c | 787 - + drivers/gpu/drm/i915/selftests/i915_gem.c | 11 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 29 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 210 +- + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 1 - + drivers/gpu/drm/i915/selftests/i915_request.c | 120 +- + drivers/gpu/drm/i915/selftests/i915_selftest.c | 1 + + drivers/gpu/drm/i915/selftests/i915_vma.c | 31 +- + drivers/gpu/drm/i915/selftests/igt_flush_test.c | 2 +- + drivers/gpu/drm/i915/selftests/igt_spinner.c | 1 + + .../gpu/drm/i915/selftests/intel_memory_region.c | 13 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 13 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 21 +- + drivers/gpu/drm/i915/selftests/mock_gtt.h | 3 +- + drivers/gpu/drm/i915/vlv_sideband.c | 1 + + drivers/gpu/drm/i915/vlv_sideband.h | 2 + + drivers/gpu/drm/i915/vlv_sideband_reg.h | 180 + + drivers/gpu/drm/i915/vlv_suspend.c | 2 + + drivers/gpu/drm/imx/dcss/dcss-drv.c | 3 +- + drivers/gpu/drm/imx/imx-drm-core.c | 3 + + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 75 +- + drivers/gpu/drm/ingenic/ingenic-drm.h | 38 + + drivers/gpu/drm/kmb/kmb_drv.c | 3 +- + drivers/gpu/drm/lib/drm_random.c | 3 +- + drivers/gpu/drm/lib/drm_random.h | 2 + + drivers/gpu/drm/lima/lima_gem.c | 4 +- + drivers/gpu/drm/lima/lima_sched.c | 9 +- + drivers/gpu/drm/mcde/mcde_drv.c | 3 + + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 12 + + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 3 + + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 7 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.h | 5 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 33 +- + drivers/gpu/drm/meson/meson_drv.c | 28 +- + drivers/gpu/drm/meson/meson_osd_afbcd.c | 41 +- + drivers/gpu/drm/meson/meson_osd_afbcd.h | 1 + + drivers/gpu/drm/mgag200/mgag200_drv.c | 20 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 9 +- + drivers/gpu/drm/msm/Kconfig | 1 + + drivers/gpu/drm/msm/dp/dp_audio.c | 2 +- + drivers/gpu/drm/msm/dp/dp_aux.h | 2 +- + drivers/gpu/drm/msm/dp/dp_catalog.c | 2 +- + drivers/gpu/drm/msm/dp/dp_ctrl.c | 2 +- + drivers/gpu/drm/msm/edp/edp.h | 77 + + drivers/gpu/drm/msm/edp/edp_ctrl.c | 1373 + + drivers/gpu/drm/msm/msm_drv.c | 3 + + drivers/gpu/drm/msm/msm_drv.h | 4 +- + drivers/gpu/drm/msm/msm_gem_prime.c | 6 +- + drivers/gpu/drm/msm/msm_ringbuffer.c | 2 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 15 +- + drivers/gpu/drm/nouveau/Kconfig | 1 + + drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_backlight.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_connector.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_dp.c | 17 +- + drivers/gpu/drm/nouveau/nouveau_encoder.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_mem.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_mem.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_svm.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 13 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c | 317 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h | 35 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c | 13 +- + .../gpu/drm/nouveau/nvkm/engine/disp/sorga102.c | 4 + + .../gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c | 14 +- + .../gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c | 18 +- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c | 5 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 3 + + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 1 + + drivers/gpu/drm/panel/Kconfig | 24 +- + drivers/gpu/drm/panel/Makefile | 2 +- + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 8 +- + drivers/gpu/drm/panel/panel-edp.c | 102 +- + drivers/gpu/drm/panel/panel-novatek-nt35560.c | 561 + + drivers/gpu/drm/panel/panel-samsung-atna33xc20.c | 4 +- + drivers/gpu/drm/panel/panel-simple.c | 33 + + drivers/gpu/drm/panel/panel-sony-acx424akp.c | 490 - + drivers/gpu/drm/panfrost/panfrost_features.h | 215 +- + drivers/gpu/drm/panfrost/panfrost_gem.c | 1 + + drivers/gpu/drm/panfrost/panfrost_gpu.c | 35 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 13 +- + drivers/gpu/drm/panfrost/panfrost_regs.h | 1 + + drivers/gpu/drm/qxl/qxl_display.c | 8 +- + drivers/gpu/drm/qxl/qxl_draw.c | 6 +- + drivers/gpu/drm/qxl/qxl_drv.c | 31 +- + drivers/gpu/drm/qxl/qxl_drv.h | 23 +- + drivers/gpu/drm/qxl/qxl_ioctl.c | 41 +- + drivers/gpu/drm/qxl/qxl_object.c | 8 +- + drivers/gpu/drm/qxl/qxl_object.h | 4 +- + drivers/gpu/drm/qxl/qxl_prime.c | 4 +- + drivers/gpu/drm/radeon/atom.c | 3 +- + drivers/gpu/drm/radeon/atombios_dp.c | 2 +- + drivers/gpu/drm/radeon/cik.c | 2 +- + drivers/gpu/drm/radeon/evergreen.c | 2 +- + drivers/gpu/drm/radeon/ni.c | 2 +- + drivers/gpu/drm/radeon/r600.c | 2 +- + drivers/gpu/drm/radeon/radeon.h | 2 - + drivers/gpu/drm/radeon/radeon_connectors.c | 4 +- + drivers/gpu/drm/radeon/radeon_device.c | 19 +- + drivers/gpu/drm/radeon/radeon_display.c | 2 + + drivers/gpu/drm/radeon/radeon_dp_mst.c | 2 +- + drivers/gpu/drm/radeon/radeon_gem.c | 1 + + drivers/gpu/drm/radeon/radeon_kms.c | 7 +- + drivers/gpu/drm/radeon/radeon_mode.h | 4 +- + drivers/gpu/drm/radeon/radeon_object.c | 34 +- + drivers/gpu/drm/radeon/radeon_object.h | 4 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 22 +- + drivers/gpu/drm/radeon/radeon_uvd.c | 5 +- + drivers/gpu/drm/radeon/rv770.c | 2 +- + drivers/gpu/drm/radeon/si.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 3 + + drivers/gpu/drm/rockchip/Kconfig | 2 + + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +- + drivers/gpu/drm/rockchip/cdn-dp-core.h | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 3 + + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 9 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 5 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_rgb.c | 2 +- + drivers/gpu/drm/scheduler/sched_main.c | 9 +- + drivers/gpu/drm/selftests/Makefile | 3 +- + drivers/gpu/drm/selftests/drm_buddy_selftests.h | 15 + + drivers/gpu/drm/selftests/test-drm_buddy.c | 992 + + drivers/gpu/drm/selftests/test-drm_dp_mst_helper.c | 8 +- + drivers/gpu/drm/selftests/test-drm_framebuffer.c | 1 - + drivers/gpu/drm/selftests/test-drm_plane_helper.c | 4 + + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 3 +- + drivers/gpu/drm/solomon/Kconfig | 21 + + drivers/gpu/drm/solomon/Makefile | 2 + + drivers/gpu/drm/solomon/ssd130x-i2c.c | 116 + + drivers/gpu/drm/solomon/ssd130x.c | 843 + + drivers/gpu/drm/solomon/ssd130x.h | 76 + + drivers/gpu/drm/sprd/Kconfig | 1 - + drivers/gpu/drm/sprd/sprd_dpu.c | 5 + + drivers/gpu/drm/sprd/sprd_drm.c | 6 +- + drivers/gpu/drm/sprd/sprd_dsi.c | 5 + + drivers/gpu/drm/sti/sti_drv.c | 3 + + drivers/gpu/drm/stm/drv.c | 8 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 114 +- + drivers/gpu/drm/stm/ltdc.c | 810 +- + drivers/gpu/drm/stm/ltdc.h | 12 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 3 +- + drivers/gpu/drm/tegra/Kconfig | 1 + + drivers/gpu/drm/tegra/dp.c | 2 +- + drivers/gpu/drm/tegra/dpaux.c | 4 +- + drivers/gpu/drm/tegra/drm.c | 3 + + drivers/gpu/drm/tegra/gem.c | 10 +- + drivers/gpu/drm/tegra/sor.c | 2 +- + drivers/gpu/drm/tidss/tidss_drv.c | 3 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 7 +- + drivers/gpu/drm/tiny/arcpgu.c | 3 +- + drivers/gpu/drm/tiny/bochs.c | 20 +- + drivers/gpu/drm/tiny/cirrus.c | 25 +- + drivers/gpu/drm/tiny/gm12u320.c | 7 +- + drivers/gpu/drm/tiny/simpledrm.c | 22 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 23 +- + drivers/gpu/drm/ttm/ttm_range_manager.c | 4 +- + drivers/gpu/drm/ttm/ttm_resource.c | 113 +- + drivers/gpu/drm/ttm/ttm_sys_manager.c | 3 +- + drivers/gpu/drm/ttm/ttm_tt.c | 8 +- + drivers/gpu/drm/tve200/tve200_drv.c | 3 +- + drivers/gpu/drm/udl/udl_modeset.c | 3 +- + drivers/gpu/drm/v3d/v3d_bo.c | 1 + + drivers/gpu/drm/v3d/v3d_debugfs.c | 11 +- + drivers/gpu/drm/v3d/v3d_drv.c | 8 +- + drivers/gpu/drm/v3d/v3d_gem.c | 6 +- + drivers/gpu/drm/v3d/v3d_sched.c | 10 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 20 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 4 +- + drivers/gpu/drm/vc4/vc4_bo.c | 2 - + drivers/gpu/drm/vc4/vc4_drv.c | 33 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 7 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 158 +- + drivers/gpu/drm/vc4/vc4_hdmi.h | 5 +- + drivers/gpu/drm/vc4/vc4_regs.h | 3 + + drivers/gpu/drm/virtio/virtgpu_debugfs.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 3 + + drivers/gpu/drm/virtio/virtgpu_object.c | 1 + + drivers/gpu/drm/vkms/vkms_composer.c | 4 +- + drivers/gpu/drm/vkms/vkms_drv.h | 8 +- + drivers/gpu/drm/vkms/vkms_output.c | 29 +- + drivers/gpu/drm/vkms/vkms_plane.c | 2 +- + drivers/gpu/drm/vkms/vkms_writeback.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 24 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 46 - + drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 3 - + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_system_manager.c | 3 +- + drivers/gpu/drm/xen/xen_drm_front.c | 3 + + drivers/gpu/drm/xen/xen_drm_front_gem.c | 7 +- + drivers/gpu/drm/xen/xen_drm_front_gem.h | 6 +- + drivers/gpu/drm/xlnx/Kconfig | 1 + + drivers/gpu/drm/xlnx/zynqmp_dp.c | 2 +- + drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 3 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 8 +- + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 9 +- + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 11 +- + drivers/misc/fastrpc.c | 4 +- + drivers/platform/chrome/Kconfig | 11 + + drivers/platform/chrome/Makefile | 1 + + drivers/platform/chrome/chromeos_privacy_screen.c | 153 + + drivers/platform/x86/thinkpad_acpi.c | 2 +- + drivers/staging/fbtft/fbtft-core.c | 1 + + drivers/video/fbdev/asiliantfb.c | 2 +- + drivers/video/fbdev/broadsheetfb.c | 1 + + drivers/video/fbdev/core/fb_defio.c | 48 +- + drivers/video/fbdev/core/fbmem.c | 29 +- + drivers/video/fbdev/metronomefb.c | 1 + + drivers/video/fbdev/s3c-fb.c | 2 +- + drivers/video/fbdev/simplefb.c | 65 +- + drivers/video/fbdev/udlfb.c | 1 + + drivers/video/fbdev/vga16fb.c | 5 + + include/drm/bridge/dw_mipi_dsi.h | 4 +- + include/drm/{ => dp}/drm_dp_aux_bus.h | 0 + include/drm/{ => dp}/drm_dp_dual_mode_helper.h | 0 + include/drm/{ => dp}/drm_dp_helper.h | 31 +- + include/drm/{ => dp}/drm_dp_mst_helper.h | 2 +- + include/drm/drm_bridge.h | 7 + + include/drm/drm_buddy.h | 159 + + include/drm/drm_cache.h | 6 +- + include/drm/drm_client.h | 7 +- + include/drm/drm_connector.h | 25 +- + include/drm/drm_crtc.h | 12 +- + include/drm/drm_dsc.h | 2 +- + include/drm/drm_edid.h | 4 +- + include/drm/drm_format_helper.h | 4 + + include/drm/drm_gem.h | 6 +- + include/drm/drm_gem_atomic_helper.h | 6 +- + include/drm/drm_gem_cma_helper.h | 6 +- + include/drm/drm_gem_framebuffer_helper.h | 8 +- + include/drm/drm_gem_shmem_helper.h | 14 +- + include/drm/drm_gem_ttm_helper.h | 6 +- + include/drm/drm_gem_vram_helper.h | 9 +- + include/drm/drm_mipi_dbi.h | 2 +- + include/drm/drm_mode_config.h | 18 +- + include/drm/drm_modeset_lock.h | 1 + + include/drm/drm_module.h | 125 + + include/drm/drm_panel.h | 8 + + include/drm/drm_plane.h | 5 +- + include/drm/drm_prime.h | 6 +- + include/drm/drm_privacy_screen_driver.h | 13 +- + include/drm/gpu_scheduler.h | 3 +- + include/drm/i915_pciids.h | 6 + + include/drm/ttm/ttm_bo_api.h | 10 +- + include/drm/ttm/ttm_kmap_iter.h | 10 +- + include/drm/ttm/ttm_resource.h | 35 +- + include/linux/dma-buf-map.h | 4 +- + include/linux/dma-buf.h | 12 +- + include/linux/dma-fence-array.h | 15 +- + include/linux/dma-fence-chain.h | 18 +- + include/linux/dma-fence.h | 38 + + include/linux/dma-resv.h | 17 +- + include/linux/fb.h | 2 + + include/linux/iosys-map.h | 459 + + include/linux/rwsem.h | 2 +- + include/linux/string_helpers.h | 20 + + include/soc/bcm2835/raspberrypi-firmware.h | 1 + + include/uapi/drm/amdgpu_drm.h | 21 +- + include/uapi/drm/drm_mode.h | 88 +- + include/uapi/drm/panfrost_drm.h | 4 +- + include/uapi/linux/kfd_ioctl.h | 94 +- + security/tomoyo/audit.c | 2 +- + security/tomoyo/common.c | 19 +- + security/tomoyo/common.h | 1 - + 1229 files changed, 476192 insertions(+), 26614 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml + rename Documentation/devicetree/bindings/display/{panel => }/lvds.yaml (84%) + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml + delete mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,dsc.yaml + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,ethdr.yaml + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,merge.yaml + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.yaml + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,od.yaml + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,postmask.yaml + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,split.yaml + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,ufoe.yaml + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,wdma.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/panel-lvds.yaml + delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_test.c + delete mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c + delete mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h + delete mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.c + delete mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c + rename drivers/gpu/drm/amd/display/dc/{calcs => dcn315}/Makefile (57%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn316/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn316/dcn316_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn316/dcn316_resource.h + rename drivers/gpu/drm/amd/display/dc/{ => dml}/calcs/bw_fixed.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dml}/calcs/calcs_logger.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dml}/calcs/custom_float.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dml}/calcs/dce_calcs.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dml}/calcs/dcn_calc_auto.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dml}/calcs/dcn_calc_auto.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dml}/calcs/dcn_calc_math.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dml}/calcs/dcn_calcs.c (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn315/hw_factory_dcn315.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn315/hw_factory_dcn315.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn315/hw_translate_dcn315.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn315/hw_translate_dcn315.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn315/irq_service_dcn315.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn315/irq_service_dcn315.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_hwss_dio.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_hwss_dio.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_hwss_dpia.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_hwss_dpia.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_hwss_hpo_frl.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_hwss_hpo_frl.h + create mode 100644 drivers/gpu/drm/amd/display/dc/virtual/virtual_link_hwss.c + create mode 100644 drivers/gpu/drm/amd/display/dc/virtual/virtual_link_hwss.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn315.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn315.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn316.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn316.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_1_5_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_1_5_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_1_6_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_1_6_sh_mask.h + rename drivers/gpu/drm/amd/include/asic_reg/{dcn => dpcs}/dpcs_3_0_0_offset.h (99%) + rename drivers/gpu/drm/amd/include/asic_reg/{dcn => dpcs}/dpcs_3_0_0_sh_mask.h (99%) + rename drivers/gpu/drm/amd/include/asic_reg/{dcn => dpcs}/dpcs_3_0_3_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{dcn => dpcs}/dpcs_3_0_3_sh_mask.h (100%) + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_4_2_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_4_2_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_4_2_3_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_4_2_3_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_5_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_5_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_8_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_8_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c + create mode 100644 drivers/gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h + create mode 100644 drivers/gpu/drm/amd/pm/legacy-dpm/Makefile + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/cik_dpm.h (100%) + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/kv_dpm.c (99%) + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/kv_dpm.h (100%) + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/kv_smc.c (100%) + create mode 100644 drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c + create mode 100644 drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.h + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/r600_dpm.h (100%) + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/si_dpm.c (98%) + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/si_dpm.h (99%) + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/si_smc.c (100%) + rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/sislands_smc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/amd_powerplay.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/cz_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/fiji_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/hardwaremanager.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/hwmgr.h (99%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/polaris10_pwrvirus.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/power_state.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/pp_debug.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/pp_endian.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/pp_thermal.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/ppinterrupt.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/rv_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu10.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu10_driver_if.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu11_driver_if.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu71.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu71_discrete.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu72.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu72_discrete.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu73.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu73_discrete.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu74.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu74_discrete.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu75.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu75_discrete.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_common.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_discrete.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_fusion.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu8.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu8_fusion.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu9.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu9_driver_if.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu_ucode_xfer_cz.h (99%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu_ucode_xfer_vi.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smumgr.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/tonga_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega10_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega12/smu9_driver_if.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega12_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega20_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h (96%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/aldebaran_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/arcturus_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu11_driver_if_arcturus.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu11_driver_if_cyan_skillfish.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu11_driver_if_navi10.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu11_driver_if_sienna_cichlid.h (99%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu11_driver_if_vangogh.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu12_driver_if.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu13_driver_if_aldebaran.h (100%) + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_5.h + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu13_driver_if_yellow_carp.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v11_0_7_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v11_0_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v11_5_pmfw.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v11_5_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v11_8_pmfw.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v11_8_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v12_0_ppsmc.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v13_0_1_pmfw.h (100%) + rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/pmfw_if}/smu_v13_0_1_ppsmc.h (100%) + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_5_pmfw.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_5_ppsmc.h + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_11_0_cdr_table.h (100%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_types.h (99%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0.h (100%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0_7_pptable.h (100%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0_pptable.h (100%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h (100%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v13_0.h (99%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v13_0_pptable.h (100%) + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.h + create mode 100644 drivers/gpu/drm/bridge/ite-it6505.c + create mode 100644 drivers/gpu/drm/dp/Makefile + rename drivers/gpu/drm/{drm_dp_helper.c => dp/drm_dp.c} (97%) + rename drivers/gpu/drm/{ => dp}/drm_dp_aux_bus.c (99%) + rename drivers/gpu/drm/{ => dp}/drm_dp_aux_dev.c (98%) + rename drivers/gpu/drm/{ => dp}/drm_dp_cec.c (99%) + rename drivers/gpu/drm/{ => dp}/drm_dp_dual_mode_helper.c (99%) + create mode 100644 drivers/gpu/drm/dp/drm_dp_helper_internal.h + create mode 100644 drivers/gpu/drm/dp/drm_dp_helper_mod.c + rename drivers/gpu/drm/{ => dp}/drm_dp_mst_topology.c (99%) + rename drivers/gpu/drm/{ => dp}/drm_dp_mst_topology_internal.h (94%) + create mode 100644 drivers/gpu/drm/drm_buddy.c + create mode 100644 drivers/gpu/drm/i915/display/hsw_ips.c + create mode 100644 drivers/gpu/drm/i915/display/hsw_ips.h + create mode 100644 drivers/gpu/drm/i915/display/icl_dsi_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_combo_phy_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_snps_phy_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_tc_phy_regs.h + create mode 100644 drivers/gpu/drm/i915/display/vlv_dsi_pll_regs.h + create mode 100644 drivers/gpu/drm/i915/display/vlv_dsi_regs.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_create.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_dmabuf.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_domain.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_internal.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_tiling.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_userptr.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_regs.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_regs.h + create mode 100644 drivers/gpu/drm/i915/gt/uc/abi/guc_klvs_abi.h + delete mode 100644 drivers/gpu/drm/i915/i915_buddy.c + delete mode 100644 drivers/gpu/drm/i915/i915_buddy.h + create mode 100644 drivers/gpu/drm/i915/i915_cmd_parser.h + create mode 100644 drivers/gpu/drm/i915/i915_file_private.h + create mode 100644 drivers/gpu/drm/i915/i915_gem_evict.h + create mode 100644 drivers/gpu/drm/i915/i915_getparam.h + create mode 100644 drivers/gpu/drm/i915/i915_ioctl.c + create mode 100644 drivers/gpu/drm/i915/i915_ioctl.h + create mode 100644 drivers/gpu/drm/i915/i915_perf_oa_regs.h + create mode 100644 drivers/gpu/drm/i915/i915_reg_defs.h + create mode 100644 drivers/gpu/drm/i915/i915_vma_resource.c + create mode 100644 drivers/gpu/drm/i915/i915_vma_resource.h + delete mode 100644 drivers/gpu/drm/i915/i915_vma_snapshot.c + delete mode 100644 drivers/gpu/drm/i915/i915_vma_snapshot.h + create mode 100644 drivers/gpu/drm/i915/intel_mchbar_regs.h + create mode 100644 drivers/gpu/drm/i915/intel_pci_config.h + delete mode 100644 drivers/gpu/drm/i915/selftests/i915_buddy.c + create mode 100644 drivers/gpu/drm/i915/vlv_sideband_reg.h + create mode 100644 drivers/gpu/drm/msm/edp/edp.h + create mode 100644 drivers/gpu/drm/msm/edp/edp_ctrl.c + create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt35560.c + delete mode 100644 drivers/gpu/drm/panel/panel-sony-acx424akp.c + create mode 100644 drivers/gpu/drm/selftests/drm_buddy_selftests.h + create mode 100644 drivers/gpu/drm/selftests/test-drm_buddy.c + create mode 100644 drivers/gpu/drm/solomon/Kconfig + create mode 100644 drivers/gpu/drm/solomon/Makefile + create mode 100644 drivers/gpu/drm/solomon/ssd130x-i2c.c + create mode 100644 drivers/gpu/drm/solomon/ssd130x.c + create mode 100644 drivers/gpu/drm/solomon/ssd130x.h + create mode 100644 drivers/platform/chrome/chromeos_privacy_screen.c + rename include/drm/{ => dp}/drm_dp_aux_bus.h (100%) + rename include/drm/{ => dp}/drm_dp_dual_mode_helper.h (100%) + rename include/drm/{ => dp}/drm_dp_helper.h (98%) + rename include/drm/{ => dp}/drm_dp_mst_helper.h (99%) + create mode 100644 include/drm/drm_buddy.h + create mode 100644 include/drm/drm_module.h + create mode 100644 include/linux/iosys-map.h +$ git am -3 ../patches/0001-fix-up-for-media-dt-binding-mediatek-Get-rid-of-medi.patch +Applying: fix up for "media: dt-binding: mediatek: Get rid of mediatek,larb for multimedia HW" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml +M Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml +M Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml +M Documentation/devicetree/bindings/display/mediatek/mediatek,wdma.yaml +$ git add -A . +$ git commit -v -a --amend +[master ce77a89e3dd7] Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git + Date: Fri Mar 4 11:45:55 2022 +1100 +Merging drm-misc/for-linux-next (07f380da3ebd drm/panel: simple: Fix Innolux G070Y2-L01 BPP settings) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/panel/panel-simple.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/imx/parallel-display.c | 8 -------- + drivers/gpu/drm/panel/panel-simple.c | 2 +- + 2 files changed, 1 insertion(+), 9 deletions(-) +Merging amdgpu/drm-next (efa8692773c9 drm/radeon: Add HD-audio component notifier support (v2)) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 31 +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 7 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 21 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 6 - + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 7 - + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 28 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 7 - + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 7 - + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 8 - + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 18 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 4 - + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 8 - + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/mca_v3_0.c | 18 -- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 1 - + drivers/gpu/drm/amd/amdgpu/nv.c | 15 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 8 - + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 3 - + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 73 +++------ + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 9 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 8 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 11 ++ + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 + + drivers/gpu/drm/amd/display/dc/dc.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 1 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 21 +-- + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 9 - + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 4 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.h | 5 + + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 1 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 8 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 68 ++++---- + .../inc/pmfw_if/smu11_driver_if_sienna_cichlid.h | 58 +++++++ + .../drm/amd/pm/swsmu/inc/pmfw_if/smu_v11_5_ppsmc.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 2 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 181 ++++++++++++++------- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 - + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 1 + + drivers/gpu/drm/radeon/radeon.h | 3 + + drivers/gpu/drm/radeon/radeon_audio.c | 95 +++++++++++ + include/uapi/linux/kfd_ioctl.h | 1 + + 63 files changed, 487 insertions(+), 375 deletions(-) +Merging drm-intel/for-linux-next (6b4e414ce8da drm/i915: Pimp async flip debugs) +$ 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/gt/uc/intel_guc_slpc.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/display/g4x_dp.c | 6 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 24 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 1 + + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 7 +- + drivers/gpu/drm/i915/display/intel_backlight.c | 3 +- + drivers/gpu/drm/i915/display/intel_bios.c | 6 + + drivers/gpu/drm/i915/display/intel_crtc.c | 4 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 23 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 12 +- + drivers/gpu/drm/i915/display/intel_display.c | 477 ++++++++++++------- + .../gpu/drm/i915/display/intel_display_debugfs.c | 74 +-- + drivers/gpu/drm/i915/display/intel_display_power.c | 523 +++++---------------- + drivers/gpu/drm/i915/display/intel_display_power.h | 37 +- + .../drm/i915/display/intel_display_power_well.c | 113 +++++ + .../drm/i915/display/intel_display_power_well.h | 153 ++++++ + drivers/gpu/drm/i915/display/intel_display_trace.h | 9 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 6 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp.c | 20 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 3 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 7 +- + drivers/gpu/drm/i915/display/intel_dpt.c | 2 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 7 +- + drivers/gpu/drm/i915/display/intel_fb.c | 15 +- + drivers/gpu/drm/i915/display/intel_fb.h | 1 + + drivers/gpu/drm/i915/display/intel_fbc.c | 5 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 8 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 1 + + drivers/gpu/drm/i915/display/intel_hdmi.c | 3 +- + drivers/gpu/drm/i915/display/intel_plane_initial.c | 1 + + drivers/gpu/drm/i915/display/intel_psr.c | 20 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 8 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 51 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 3 + + drivers/gpu/drm/i915/display/intel_vdsc.c | 16 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 219 ++++++--- + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 3 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 9 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 7 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 3 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 11 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 7 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 3 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 52 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 5 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 3 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 13 +- + drivers/gpu/drm/i915/gt/intel_sseu.c | 9 +- + drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c | 10 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 3 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 5 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 5 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c | 6 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 3 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 14 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c | 20 +- + drivers/gpu/drm/i915/i915_debugfs.c | 17 +- + drivers/gpu/drm/i915/i915_driver.c | 4 +- + drivers/gpu/drm/i915/i915_drv.h | 13 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 9 +- + drivers/gpu/drm/i915/i915_params.c | 7 +- + drivers/gpu/drm/i915/i915_pci.c | 1 + + drivers/gpu/drm/i915/i915_reg.h | 2 + + drivers/gpu/drm/i915/i915_utils.h | 21 +- + drivers/gpu/drm/i915/intel_device_info.c | 8 +- + drivers/gpu/drm/i915/intel_device_info.h | 1 + + drivers/gpu/drm/i915/intel_dram.c | 10 +- + drivers/gpu/drm/i915/intel_pm.c | 49 +- + drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c | 4 +- + drivers/gpu/drm/i915/selftests/i915_active.c | 3 +- + drivers/gpu/drm/i915/vlv_suspend.c | 3 +- + drivers/iommu/intel/iommu.c | 2 +- + include/uapi/drm/drm_fourcc.h | 11 + + 74 files changed, 1233 insertions(+), 994 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_display_power_well.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_power_well.h +Merging drm-tegra/drm/tegra/for-next (b53c24f69199 drm/tegra: Support YVYU, VYUY and YU24 formats) +$ git merge -m Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git drm-tegra/drm/tegra/for-next +Auto-merging drivers/gpu/drm/tegra/dpaux.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/tegra/dc.c | 50 ++++++++++++++++++----------- + drivers/gpu/drm/tegra/dc.h | 7 +++++ + drivers/gpu/drm/tegra/dpaux.c | 3 +- + drivers/gpu/drm/tegra/dsi.c | 4 ++- + drivers/gpu/drm/tegra/hdmi.c | 34 ++++++-------------- + drivers/gpu/drm/tegra/hub.c | 24 ++++++++------ + drivers/gpu/drm/tegra/plane.c | 73 ++++++++++++++++++++++++++++++++++++++----- + drivers/gpu/drm/tegra/plane.h | 2 +- + drivers/gpu/host1x/dev.c | 8 +++-- + 9 files changed, 140 insertions(+), 65 deletions(-) +Merging drm-msm/msm-next (8661f450626f dt-bindings: display/msm: add missing brace in dpu-qcm2290.yaml) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/Kconfig +Auto-merging drivers/gpu/drm/msm/dp/dp_catalog.c +Auto-merging drivers/gpu/drm/msm/dp/dp_ctrl.c +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/gpu/drm/msm/msm_drv.h +Merge made by the 'ort' strategy. + .../bindings/display/msm/dp-controller.yaml | 1 + + .../bindings/display/msm/dpu-msm8998.yaml | 219 ++++++++ + .../bindings/display/msm/dpu-qcm2290.yaml | 215 ++++++++ + .../bindings/display/msm/dsi-controller-main.yaml | 5 +- + .../bindings/display/msm/dsi-phy-10nm.yaml | 36 ++ + drivers/gpu/drm/msm/Kconfig | 9 - + drivers/gpu/drm/msm/Makefile | 3 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 20 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 1 - + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 41 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 23 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 22 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 100 +--- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 28 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 19 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 39 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 36 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 610 ++++++++++++++++++++- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 21 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 6 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 7 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 10 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 11 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 68 +-- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 5 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 28 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 5 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 3 + + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 107 +--- + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 19 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 2 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 19 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 8 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 9 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h | 5 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_mdss.c | 4 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 21 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 2 +- + drivers/gpu/drm/msm/dp/dp_catalog.c | 12 +- + drivers/gpu/drm/msm/dp/dp_catalog.h | 2 +- + .../{disp/dpu1/dpu_io_util.c => dp/dp_clk_util.c} | 69 +-- + .../{disp/dpu1/dpu_io_util.h => dp/dp_clk_util.h} | 8 +- + drivers/gpu/drm/msm/dp/dp_ctrl.c | 102 ++-- + drivers/gpu/drm/msm/dp/dp_ctrl.h | 8 +- + drivers/gpu/drm/msm/dp/dp_debug.c | 28 +- + drivers/gpu/drm/msm/dp/dp_display.c | 196 ++++--- + drivers/gpu/drm/msm/dp/dp_display.h | 2 +- + drivers/gpu/drm/msm/dp/dp_drm.c | 21 +- + drivers/gpu/drm/msm/dp/dp_panel.c | 5 + + drivers/gpu/drm/msm/dp/dp_parser.c | 38 +- + drivers/gpu/drm/msm/dp/dp_parser.h | 4 +- + drivers/gpu/drm/msm/dsi/dsi.c | 4 +- + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 23 + + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 3 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 8 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 65 ++- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 14 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 4 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 122 ++++- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 4 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 4 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 4 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 26 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 7 +- + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 11 +- + drivers/gpu/drm/msm/hdmi/hdmi_phy.c | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c | 7 +- + drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c | 2 +- + drivers/gpu/drm/msm/msm_atomic.c | 15 - + drivers/gpu/drm/msm/msm_debugfs.c | 6 +- + drivers/gpu/drm/msm/msm_drv.c | 160 +----- + drivers/gpu/drm/msm/msm_drv.h | 46 +- + drivers/gpu/drm/msm/msm_fb.c | 41 +- + drivers/gpu/drm/msm/msm_gem.h | 3 + + drivers/gpu/drm/msm/msm_gpu.c | 14 +- + drivers/gpu/drm/msm/msm_gpu.h | 8 +- + drivers/gpu/drm/msm/msm_io_utils.c | 126 +++++ + drivers/gpu/drm/msm/msm_rd.c | 8 +- + 82 files changed, 2046 insertions(+), 990 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/msm/dpu-msm8998.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/dpu-qcm2290.yaml + rename drivers/gpu/drm/msm/{disp/dpu1/dpu_io_util.c => dp/dp_clk_util.c} (61%) + rename drivers/gpu/drm/msm/{disp/dpu1/dpu_io_util.h => dp/dp_clk_util.h} (85%) + create mode 100644 drivers/gpu/drm/msm/msm_io_utils.c +Merging imx-drm/imx-drm/next (20fbfc81e390 drm/imx: imx-tve: Make use of the helper function devm_platform_ioremap_resource()) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Merge made by the 'ort' strategy. + drivers/gpu/drm/imx/imx-tve.c | 4 +--- + drivers/gpu/ipu-v3/ipu-image-convert.c | 9 +++------ + 2 files changed, 4 insertions(+), 9 deletions(-) +Merging etnaviv/etnaviv/next (cdd156955f94 drm/etnaviv: consider completed fence seqno in hang check) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging fbdev/for-next (4f01d09b2bbf video: fbdev: sm712fb: Fix crash in smtcfb_write()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Auto-merging drivers/video/fbdev/core/fbmem.c +Auto-merging drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c +Auto-merging drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c +Auto-merging drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c +Auto-merging drivers/video/fbdev/s3c-fb.c +Auto-merging drivers/video/fbdev/udlfb.c +Merge made by the 'ort' strategy. + .../bindings/display/simple-framebuffer.yaml | 12 +++-- + arch/parisc/include/asm/agp.h | 4 +- + arch/powerpc/include/asm/agp.h | 4 +- + arch/sparc/include/asm/agp.h | 6 +-- + drivers/video/backlight/lm3630a_bl.c | 1 - + drivers/video/backlight/qcom-wled.c | 1 + + drivers/video/fbdev/Kconfig | 2 +- + drivers/video/fbdev/atafb.c | 35 +++++--------- + drivers/video/fbdev/atmel_lcdfb.c | 11 +++-- + drivers/video/fbdev/aty/aty128fb.c | 10 ++-- + drivers/video/fbdev/aty/mach64_ct.c | 4 +- + drivers/video/fbdev/aty/mach64_gx.c | 2 - + drivers/video/fbdev/au1100fb.c | 2 +- + drivers/video/fbdev/au1100fb.h | 2 +- + drivers/video/fbdev/au1200fb.c | 4 +- + drivers/video/fbdev/cirrusfb.c | 16 +++---- + drivers/video/fbdev/controlfb.c | 2 + + drivers/video/fbdev/core/fbcvt.c | 53 +++++++++------------- + drivers/video/fbdev/core/fbmem.c | 8 +--- + drivers/video/fbdev/da8xx-fb.c | 7 ++- + drivers/video/fbdev/imxfb.c | 2 + + drivers/video/fbdev/matrox/matroxfb_base.c | 2 +- + drivers/video/fbdev/mb862xx/mb862xxfb_accel.c | 2 +- + drivers/video/fbdev/mmp/hw/mmp_ctrl.c | 3 +- + drivers/video/fbdev/nvidia/nv_i2c.c | 2 +- + drivers/video/fbdev/ocfb.c | 2 +- + drivers/video/fbdev/omap/lcd_ams_delta.c | 16 +++---- + drivers/video/fbdev/omap/omapfb_main.c | 13 +++--- + .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 8 ++-- + .../omapfb/displays/panel-lgphilips-lb035q02.c | 7 ++- + .../omapfb/displays/panel-sharp-ls037v7dw01.c | 7 ++- + .../omap2/omapfb/displays/panel-sony-acx565akm.c | 2 +- + .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 7 ++- + .../video/fbdev/omap2/omapfb/dss/display-sysfs.c | 3 +- + .../video/fbdev/omap2/omapfb/dss/manager-sysfs.c | 3 +- + .../video/fbdev/omap2/omapfb/dss/overlay-sysfs.c | 3 +- + drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 1 - + drivers/video/fbdev/pxa168fb.c | 15 +++--- + drivers/video/fbdev/pxa3xx-gcu.c | 10 ++-- + drivers/video/fbdev/s3c-fb.c | 20 ++++---- + drivers/video/fbdev/savage/savagefb.h | 1 - + drivers/video/fbdev/savage/savagefb_driver.c | 7 +-- + drivers/video/fbdev/sis/sis_main.c | 2 +- + drivers/video/fbdev/sm712fb.c | 46 +++++-------------- + drivers/video/fbdev/smscufx.c | 3 +- + drivers/video/fbdev/ssd1307fb.c | 7 ++- + drivers/video/fbdev/udlfb.c | 8 ++-- + drivers/video/fbdev/via/lcd.c | 2 +- + drivers/video/fbdev/via/viafbdev.c | 10 ++++ + drivers/video/fbdev/w100fb.c | 15 ++++-- + 50 files changed, 185 insertions(+), 230 deletions(-) +Merging regmap/for-next (2d2329787ba2 regmap: irq: cleanup comments) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Auto-merging drivers/base/regmap/regmap-irq.c +Merge made by the 'ort' strategy. + drivers/base/regmap/regmap-irq.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging sound/for-next (e52b78f89067 sound: core: Remove redundant variable and return the last statement) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/acpi/scan.c +Auto-merging drivers/spi/spi.c +Auto-merging include/linux/spi/spi.h +Auto-merging sound/pci/hda/hda_intel.c +Auto-merging sound/spi/at73c213.c +Merge made by the 'ort' strategy. + MAINTAINERS | 4 +- + drivers/acpi/scan.c | 16 +- + drivers/platform/x86/Kconfig | 12 +- + drivers/platform/x86/Makefile | 2 +- + drivers/platform/x86/i2c-multi-instantiate.c | 174 ---------- + drivers/platform/x86/serial-multi-instantiate.c | 348 ++++++++++++++++++++ + drivers/spi/spi.c | 137 +++++++- + include/linux/spi/spi.h | 20 ++ + include/sound/hda_codec.h | 11 +- + include/sound/hda_verbs.h | 2 +- + include/sound/hdaudio_ext.h | 1 + + sound/hda/ext/hdac_ext_controller.c | 31 +- + sound/mips/snd-n64.c | 9 +- + sound/pci/ca0106/ca0106.h | 18 +- + sound/pci/ca0106/ca0106_main.c | 70 ++-- + sound/pci/ca0106/ca0106_mixer.c | 16 +- + sound/pci/hda/Kconfig | 19 +- + sound/pci/hda/hda_codec.c | 94 ++++-- + sound/pci/hda/hda_intel.c | 21 +- + sound/pci/hda/hda_local.h | 2 - + sound/pci/hda/hda_tegra.c | 33 +- + sound/pci/hda/patch_hdmi.c | 275 ++++++++++++---- + sound/pci/hda/patch_realtek.c | 43 ++- + sound/soc/codecs/hdac_hda.c | 2 +- + sound/sound_core.c | 30 +- + sound/spi/at73c213.c | 27 +- + sound/usb/mixer_s1810c.c | 2 +- + sound/usb/mixer_scarlett_gen2.c | 6 +- + tools/testing/selftests/alsa/mixer-test.c | 412 ++++++++++++++++++++++-- + 29 files changed, 1408 insertions(+), 429 deletions(-) + delete mode 100644 drivers/platform/x86/i2c-multi-instantiate.c + create mode 100644 drivers/platform/x86/serial-multi-instantiate.c +Merging sound-asoc/for-next (6984974883ca Merge remote-tracking branch 'asoc/for-5.18' 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 MAINTAINERS +Auto-merging drivers/gpu/drm/rockchip/cdn-dp-core.c +Auto-merging drivers/gpu/drm/rockchip/cdn-dp-core.h +Auto-merging include/sound/pcm.h +Auto-merging include/uapi/sound/asound.h +Auto-merging sound/soc/codecs/hdac_hda.c +Auto-merging sound/soc/sof/intel/hda.c +Merge made by the 'ort' strategy. + .../bindings/bus/nvidia,tegra210-aconnect.yaml | 1 + + .../bindings/dma/nvidia,tegra210-adma.yaml | 4 +- + .../bindings/interrupt-controller/arm,gic.yaml | 1 + + .../bindings/sound/allwinner,sun4i-a10-i2s.yaml | 5 + + .../devicetree/bindings/sound/arndale.txt | 25 - + .../bindings/sound/davinci-mcasp-audio.txt | 86 --- + .../bindings/sound/davinci-mcasp-audio.yaml | 201 +++++ + .../devicetree/bindings/sound/fsl-asoc-card.txt | 3 + + .../bindings/sound/google,sc7280-herobrine.yaml | 180 +++++ + .../bindings/sound/nvidia,tegra186-dspk.yaml | 4 +- + .../bindings/sound/nvidia,tegra210-admaif.yaml | 4 +- + .../bindings/sound/nvidia,tegra210-adx.yaml | 1 + + .../bindings/sound/nvidia,tegra210-ahub.yaml | 1 + + .../bindings/sound/nvidia,tegra210-amx.yaml | 3 + + .../bindings/sound/nvidia,tegra210-dmic.yaml | 1 + + .../bindings/sound/nvidia,tegra210-i2s.yaml | 1 + + .../bindings/sound/nvidia,tegra210-mixer.yaml | 1 + + .../bindings/sound/nvidia,tegra210-mvc.yaml | 1 + + .../bindings/sound/nvidia,tegra210-sfc.yaml | 1 + + .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 75 +- + .../bindings/sound/qcom,lpass-rx-macro.yaml | 8 + + .../bindings/sound/qcom,lpass-tx-macro.yaml | 8 + + .../bindings/sound/qcom,lpass-va-macro.yaml | 8 + + .../devicetree/bindings/sound/qcom,wcd938x.yaml | 4 + + .../devicetree/bindings/sound/realtek,rt5682s.yaml | 8 +- + .../devicetree/bindings/sound/renesas,rz-ssi.yaml | 3 +- + .../bindings/sound/samsung,aries-wm8994.yaml | 4 + + .../devicetree/bindings/sound/samsung,arndale.yaml | 45 ++ + .../bindings/sound/samsung,smdk-wm8994.txt | 14 - + .../bindings/sound/samsung,smdk5250.yaml | 38 + + .../devicetree/bindings/sound/samsung,snow.yaml | 74 ++ + .../bindings/sound/samsung,tm2-audio.txt | 42 -- + .../devicetree/bindings/sound/samsung,tm2.yaml | 80 ++ + .../devicetree/bindings/sound/simple-card.yaml | 11 + + Documentation/devicetree/bindings/sound/snow.txt | 31 - + .../devicetree/bindings/sound/tas5805m.yaml | 56 ++ + .../devicetree/bindings/sound/tlv320aic31xx.txt | 2 +- + MAINTAINERS | 1 + + arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 28 + + drivers/gpu/drm/rockchip/cdn-dp-core.h | 4 + + include/dt-bindings/sound/tlv320aic31xx-micbias.h | 9 - + include/dt-bindings/sound/tlv320aic31xx.h | 14 + + include/sound/simple_card_utils.h | 1 + + include/sound/soc-acpi.h | 2 - + include/sound/sof.h | 8 + + include/sound/sof/info.h | 1 + + include/sound/sof/topology.h | 2 +- + include/uapi/sound/sof/abi.h | 2 +- + sound/soc/amd/Kconfig | 1 + + sound/soc/amd/acp-config.c | 9 + + sound/soc/amd/acp-pcm-dma.c | 11 +- + sound/soc/amd/acp/Kconfig | 10 + + sound/soc/amd/acp/Makefile | 4 + + sound/soc/amd/acp/acp-legacy-mach.c | 38 +- + sound/soc/amd/acp/acp-mach-common.c | 50 ++ + sound/soc/amd/acp/acp-pci.c | 160 ++++ + sound/soc/amd/acp/acp-pdm.c | 193 +++++ + sound/soc/amd/acp/acp-renoir.c | 186 ++++- + sound/soc/amd/acp/acp-sof-mach.c | 14 + + sound/soc/amd/acp/amd.h | 23 +- + sound/soc/amd/acp/chip_offset_byte.h | 26 + + sound/soc/amd/mach-config.h | 1 + + sound/soc/amd/raven/acp3x-pcm-dma.c | 8 +- + sound/soc/amd/renoir/acp3x-pdm-dma.c | 7 +- + sound/soc/amd/renoir/rn-pci-acp3x.c | 7 +- + sound/soc/amd/renoir/rn_acp3x.h | 3 + + sound/soc/amd/vangogh/acp5x-mach.c | 14 +- + sound/soc/amd/vangogh/acp5x-pcm-dma.c | 73 +- + sound/soc/atmel/atmel_ssc_dai.c | 5 +- + sound/soc/codecs/Kconfig | 29 +- + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/bt-sco.c | 8 +- + sound/soc/codecs/cs42l42.c | 166 ++++- + sound/soc/codecs/cs42l42.h | 7 +- + sound/soc/codecs/cs42l51-i2c.c | 4 +- + sound/soc/codecs/cs42l51.c | 11 +- + sound/soc/codecs/cs42l51.h | 2 +- + sound/soc/codecs/es7134.c | 2 +- + sound/soc/codecs/es7241.c | 30 +- + sound/soc/codecs/es8316.c | 4 +- + sound/soc/codecs/es8328.c | 16 +- + sound/soc/codecs/hdac_hda.c | 7 +- + sound/soc/codecs/inno_rk3036.c | 6 +- + sound/soc/codecs/isabelle.c | 6 +- + sound/soc/codecs/lm49453.c | 10 +- + sound/soc/codecs/lpass-macro-common.c | 67 ++ + sound/soc/codecs/lpass-macro-common.h | 17 + + sound/soc/codecs/lpass-rx-macro.c | 180 ++++- + sound/soc/codecs/lpass-tx-macro.c | 180 ++++- + sound/soc/codecs/lpass-va-macro.c | 116 ++- + sound/soc/codecs/lpass-wsa-macro.c | 159 +++- + sound/soc/codecs/max98088.c | 24 +- + sound/soc/codecs/max98095.c | 36 +- + sound/soc/codecs/max98371.c | 4 +- + sound/soc/codecs/max98390.c | 10 +- + sound/soc/codecs/max98390.h | 2 +- + sound/soc/codecs/max9850.c | 8 +- + sound/soc/codecs/max9860.c | 6 +- + sound/soc/codecs/max9867.c | 14 +- + sound/soc/codecs/max98925.c | 13 +- + sound/soc/codecs/max98926.c | 4 +- + sound/soc/codecs/max98927.c | 12 +- + sound/soc/codecs/max98927.h | 2 +- + sound/soc/codecs/mc13783.c | 15 +- + sound/soc/codecs/ml26124.c | 7 +- + sound/soc/codecs/pcm1681.c | 4 +- + sound/soc/codecs/pcm186x.c | 19 +- + sound/soc/codecs/pcm3060.c | 14 +- + sound/soc/codecs/pcm3060.h | 2 +- + sound/soc/codecs/pcm3168a.c | 172 ++--- + sound/soc/codecs/pcm512x.c | 32 +- + sound/soc/codecs/rt5640.c | 3 - + sound/soc/codecs/rt5663.c | 2 + + sound/soc/codecs/si476x.c | 2 +- + sound/soc/codecs/sti-sas.c | 6 +- + sound/soc/codecs/tas5805m.c | 567 ++++++++++++++ + sound/soc/codecs/tlv320adc3xxx.c | 143 +++- + sound/soc/codecs/tlv320aic31xx.c | 2 +- + sound/soc/codecs/tscs42xx.c | 6 +- + sound/soc/codecs/tscs454.c | 28 +- + sound/soc/codecs/twl4030.c | 12 +- + sound/soc/codecs/uda1334.c | 2 +- + sound/soc/codecs/uda134x.c | 6 +- + sound/soc/codecs/uda1380.c | 10 +- + sound/soc/codecs/wcd-mbhc-v2.c | 26 + + sound/soc/codecs/wcd938x-sdw.c | 1 + + sound/soc/codecs/wcd938x.c | 27 + + sound/soc/codecs/wl1273.c | 4 +- + sound/soc/codecs/wm8731.c | 6 - + sound/soc/codecs/wm8960.c | 13 +- + sound/soc/codecs/wm8962.c | 21 +- + sound/soc/codecs/wm8971.c | 5 +- + sound/soc/codecs/wm_adsp.c | 63 +- + sound/soc/codecs/wsa881x.c | 53 ++ + sound/soc/dwc/dwc-i2s.c | 17 +- + sound/soc/fsl/fsl-asoc-card.c | 7 +- + sound/soc/fsl/fsl_aud2htx.c | 2 +- + sound/soc/fsl/fsl_esai.c | 2 +- + sound/soc/fsl/fsl_sai.c | 11 +- + sound/soc/fsl/fsl_sai.h | 1 + + sound/soc/fsl/fsl_spdif.c | 2 +- + sound/soc/fsl/fsl_ssi.c | 2 +- + sound/soc/fsl/imx-pcm-dma.c | 2 +- + sound/soc/fsl/imx-pcm.h | 7 +- + sound/soc/generic/simple-card-utils.c | 86 ++- + sound/soc/intel/boards/Kconfig | 24 + + sound/soc/intel/boards/Makefile | 12 +- + sound/soc/intel/boards/bdw-rt5650.c | 2 +- + sound/soc/intel/boards/bdw-rt5677.c | 2 +- + sound/soc/intel/boards/broadwell.c | 2 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 2 +- + sound/soc/intel/boards/bxt_rt298.c | 2 +- + sound/soc/intel/boards/bytcht_cx2072x.c | 2 +- + sound/soc/intel/boards/bytcht_da7213.c | 2 +- + sound/soc/intel/boards/bytcht_es8316.c | 2 +- + sound/soc/intel/boards/bytcr_rt5640.c | 2 +- + sound/soc/intel/boards/bytcr_rt5651.c | 2 +- + sound/soc/intel/boards/bytcr_wm5102.c | 2 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 4 +- + sound/soc/intel/boards/cht_bsw_nau8824.c | 4 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- + sound/soc/intel/boards/glk_rt5682_max98357a.c | 2 +- + sound/soc/intel/boards/haswell.c | 2 +- + sound/soc/intel/boards/sof_cirrus_common.c | 163 ++++ + sound/soc/intel/boards/sof_cirrus_common.h | 25 + + sound/soc/intel/boards/sof_es8336.c | 8 + + sound/soc/intel/boards/sof_realtek_common.c | 107 +++ + sound/soc/intel/boards/sof_realtek_common.h | 4 + + sound/soc/intel/boards/sof_rt5682.c | 56 +- + sound/soc/intel/boards/sof_ssp_amp.c | 483 ++++++++++++ + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 48 +- + sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 6 - + sound/soc/intel/common/soc-acpi-intel-byt-match.c | 11 - + sound/soc/intel/common/soc-acpi-intel-cht-match.c | 12 - + sound/soc/intel/common/soc-acpi-intel-cml-match.c | 11 - + sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 4 - + sound/soc/intel/common/soc-acpi-intel-ehl-match.c | 1 - + sound/soc/intel/common/soc-acpi-intel-glk-match.c | 6 - + sound/soc/intel/common/soc-acpi-intel-hda-match.c | 2 - + .../intel/common/soc-acpi-intel-hsw-bdw-match.c | 5 - + sound/soc/intel/common/soc-acpi-intel-icl-match.c | 5 - + sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 7 - + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 19 +- + sound/soc/mediatek/mt8195/mt8195-afe-clk.c | 282 ++++++- + sound/soc/mediatek/mt8195/mt8195-afe-clk.h | 11 + + sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 7 +- + sound/soc/mxs/mxs-saif.c | 5 +- + sound/soc/qcom/Kconfig | 26 + + sound/soc/qcom/Makefile | 6 + + sound/soc/qcom/lpass-cdc-dma.c | 301 ++++++++ + sound/soc/qcom/lpass-cpu.c | 253 ++++++- + sound/soc/qcom/lpass-lpaif-reg.h | 127 +++- + sound/soc/qcom/lpass-platform.c | 635 ++++++++++++++-- + sound/soc/qcom/lpass-sc7280.c | 438 +++++++++++ + sound/soc/qcom/lpass.h | 142 ++++ + sound/soc/qcom/sc7280.c | 284 +++++++ + sound/soc/rockchip/rk3399_gru_sound.c | 20 + + sound/soc/samsung/idma.c | 5 +- + sound/soc/samsung/midas_wm1811.c | 1 + + sound/soc/sh/rz-ssi.c | 109 ++- + sound/soc/soc-compress.c | 14 +- + sound/soc/soc-core.c | 2 +- + sound/soc/soc-generic-dmaengine-pcm.c | 14 +- + sound/soc/soc-topology.c | 103 +-- + sound/soc/sof/Kconfig | 33 +- + sound/soc/sof/Makefile | 17 +- + sound/soc/sof/amd/acp-trace.c | 38 +- + sound/soc/sof/amd/acp.h | 3 +- + sound/soc/sof/compress.c | 274 ++++++- + sound/soc/sof/core.c | 59 +- + sound/soc/sof/debug.c | 565 -------------- + sound/soc/sof/intel/Kconfig | 19 +- + sound/soc/sof/intel/apl.c | 13 +- + sound/soc/sof/intel/cnl.c | 19 +- + sound/soc/sof/intel/hda-dai.c | 122 ++- + sound/soc/sof/intel/hda-dsp.c | 20 +- + sound/soc/sof/intel/hda-ipc.c | 10 +- + sound/soc/sof/intel/hda-loader.c | 118 ++- + sound/soc/sof/intel/hda-pcm.c | 12 +- + sound/soc/sof/intel/hda-probes.c | 104 ++- + sound/soc/sof/intel/hda-stream.c | 122 +-- + sound/soc/sof/intel/hda-trace.c | 23 +- + sound/soc/sof/intel/hda.c | 37 +- + sound/soc/sof/intel/hda.h | 75 +- + sound/soc/sof/intel/icl.c | 13 +- + sound/soc/sof/intel/pci-tng.c | 1 - + sound/soc/sof/intel/tgl.c | 13 +- + sound/soc/sof/{utils.c => iomem-utils.c} | 61 +- + sound/soc/sof/ipc.c | 112 +-- + sound/soc/sof/ops.h | 47 +- + sound/soc/sof/pcm.c | 9 +- + sound/soc/sof/pm.c | 13 +- + sound/soc/sof/sof-client-ipc-flood-test.c | 396 ++++++++++ + sound/soc/sof/sof-client-ipc-msg-injector.c | 192 +++++ + sound/soc/sof/sof-client-probes.c | 821 +++++++++++++++++++++ + sound/soc/sof/sof-client-probes.h | 31 + + sound/soc/sof/sof-client.c | 469 ++++++++++++ + sound/soc/sof/sof-client.h | 67 ++ + sound/soc/sof/sof-pci-dev.c | 8 + + sound/soc/sof/sof-priv.h | 147 ++-- + sound/soc/sof/sof-probes.c | 364 --------- + sound/soc/sof/sof-probes.h | 38 - + sound/soc/sof/sof-utils.c | 77 ++ + sound/soc/sof/sof-utils.h | 19 + + sound/soc/sof/topology.c | 2 +- + sound/soc/sof/trace.c | 9 +- + sound/soc/sunxi/sun4i-i2s.c | 68 +- + sound/soc/tegra/tegra20_spdif.c | 2 +- + sound/soc/tegra/tegra210_ahub.c | 146 +++- + sound/soc/tegra/tegra210_ahub.h | 4 +- + sound/soc/ti/davinci-i2s.c | 5 +- + sound/soc/xilinx/xlnx_formatter_pcm.c | 25 + + sound/soc/xilinx/xlnx_i2s.c | 147 +++- + 255 files changed, 10576 insertions(+), 2785 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/arndale.txt + delete mode 100644 Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt + create mode 100644 Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml + create mode 100644 Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml + create mode 100644 Documentation/devicetree/bindings/sound/samsung,arndale.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/samsung,smdk-wm8994.txt + create mode 100644 Documentation/devicetree/bindings/sound/samsung,smdk5250.yaml + create mode 100644 Documentation/devicetree/bindings/sound/samsung,snow.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt + create mode 100644 Documentation/devicetree/bindings/sound/samsung,tm2.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/snow.txt + create mode 100644 Documentation/devicetree/bindings/sound/tas5805m.yaml + delete mode 100644 include/dt-bindings/sound/tlv320aic31xx-micbias.h + create mode 100644 include/dt-bindings/sound/tlv320aic31xx.h + create mode 100644 sound/soc/amd/acp/acp-pci.c + create mode 100644 sound/soc/amd/acp/acp-pdm.c + create mode 100644 sound/soc/codecs/lpass-macro-common.c + create mode 100644 sound/soc/codecs/lpass-macro-common.h + create mode 100644 sound/soc/codecs/tas5805m.c + create mode 100644 sound/soc/intel/boards/sof_cirrus_common.c + create mode 100644 sound/soc/intel/boards/sof_cirrus_common.h + create mode 100644 sound/soc/intel/boards/sof_ssp_amp.c + create mode 100644 sound/soc/qcom/lpass-cdc-dma.c + create mode 100644 sound/soc/qcom/lpass-sc7280.c + create mode 100644 sound/soc/qcom/sc7280.c + rename sound/soc/sof/{utils.c => iomem-utils.c} (59%) + create mode 100644 sound/soc/sof/sof-client-ipc-flood-test.c + create mode 100644 sound/soc/sof/sof-client-ipc-msg-injector.c + create mode 100644 sound/soc/sof/sof-client-probes.c + create mode 100644 sound/soc/sof/sof-client-probes.h + create mode 100644 sound/soc/sof/sof-client.c + create mode 100644 sound/soc/sof/sof-client.h + delete mode 100644 sound/soc/sof/sof-probes.c + delete mode 100644 sound/soc/sof/sof-probes.h + create mode 100644 sound/soc/sof/sof-utils.c + create mode 100644 sound/soc/sof/sof-utils.h +Merging modules/modules-next (719fce7539cd Merge tag 'soc-fixes-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Already up to date. +Merging input/next (dfafa5602957 Input: da9063 - use devm_delayed_work_autocancel()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging drivers/input/input.c +Auto-merging drivers/input/touchscreen/goodix.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/mtk-pmic-keys.txt | 5 +- + drivers/input/input.c | 45 ++++- + drivers/input/joystick/xpad.c | 2 +- + drivers/input/keyboard/mtk-pmic-keys.c | 55 +++++- + drivers/input/misc/da9063_onkey.c | 13 +- + drivers/input/serio/ps2-gpio.c | 195 +++++++++++++-------- + drivers/input/touchscreen/goodix.c | 61 +++---- + drivers/input/touchscreen/goodix.h | 1 + + drivers/input/touchscreen/tsc200x-core.c | 7 +- + include/linux/input.h | 2 + + 10 files changed, 262 insertions(+), 124 deletions(-) +Merging block/for-next (e2f4ede7e711 Merge branch 'for-5.18/drivers' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging MAINTAINERS +Auto-merging arch/m68k/bvme6000/config.c +Auto-merging arch/m68k/kernel/setup_mm.c +Auto-merging arch/m68k/mvme147/config.c +Auto-merging arch/m68k/mvme16x/config.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/internal.h +Auto-merging fs/iomap/direct-io.c +CONFLICT (content): Merge conflict in fs/iomap/direct-io.c +Auto-merging kernel/exit.c +Auto-merging kernel/power/hibernate.c +Auto-merging kernel/power/swap.c +Resolved 'fs/iomap/direct-io.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5a17244463f8] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-block | 49 ++ + Documentation/block/biodoc.rst | 1164 ---------------------------------- + Documentation/block/capability.rst | 2 +- + Documentation/block/index.rst | 1 - + MAINTAINERS | 1 + + arch/m68k/atari/stdma.c | 1 - + arch/m68k/bvme6000/config.c | 1 - + arch/m68k/emu/nfblock.c | 1 - + arch/m68k/kernel/setup_mm.c | 1 - + arch/m68k/mvme147/config.c | 1 - + arch/m68k/mvme16x/config.c | 1 - + block/Kconfig | 13 + + block/Makefile | 3 +- + block/bdev.c | 11 +- + block/bfq-cgroup.c | 16 +- + block/bfq-iosched.c | 4 +- + block/bfq-iosched.h | 2 - + block/bfq-wf2q.c | 17 +- + block/bio-integrity.c | 1 - + block/bio.c | 183 +++--- + block/blk-cgroup-rwstat.h | 2 +- + block/blk-cgroup.c | 15 +- + block/blk-cgroup.h | 477 ++++++++++++++ + block/blk-core.c | 261 ++++---- + block/blk-crypto-fallback.c | 2 +- + block/blk-crypto-internal.h | 12 + + block/blk-crypto-sysfs.c | 172 +++++ + block/blk-crypto.c | 4 +- + block/blk-flush.c | 4 +- + block/blk-iocost.c | 2 +- + block/blk-iolatency.c | 2 +- + block/blk-ioprio.c | 2 +- + block/blk-lib.c | 46 +- + block/blk-merge.c | 2 - + block/blk-mq-tag.c | 2 +- + block/blk-mq.c | 64 +- + block/blk-sysfs.c | 19 +- + block/blk-throttle.c | 62 +- + block/blk-throttle.h | 16 +- + block/blk-zoned.c | 14 +- + block/blk.h | 8 +- + block/bounce.c | 11 +- + block/disk-events.c | 2 +- + block/elevator.c | 10 +- + block/fops.c | 35 +- + block/genhd.c | 26 +- + block/holder.c | 2 +- + block/partitions/check.h | 1 - + block/partitions/core.c | 1 - + block/partitions/efi.h | 1 - + block/partitions/ldm.h | 1 - + block/sed-opal.c | 2 +- + drivers/base/class.c | 2 +- + drivers/base/core.c | 2 +- + drivers/base/devtmpfs.c | 2 +- + drivers/block/aoe/aoeblk.c | 1 - + drivers/block/aoe/aoecmd.c | 1 - + drivers/block/drbd/drbd_actlog.c | 5 +- + drivers/block/drbd/drbd_bitmap.c | 7 +- + drivers/block/drbd/drbd_int.h | 1 - + drivers/block/drbd/drbd_receiver.c | 32 +- + drivers/block/drbd/drbd_req.c | 5 +- + drivers/block/drbd/drbd_worker.c | 4 +- + drivers/block/floppy.c | 4 +- + drivers/block/loop.c | 41 +- + drivers/block/mtip32xx/mtip32xx.c | 1 - + drivers/block/mtip32xx/mtip32xx.h | 1 - + drivers/block/null_blk/main.c | 54 +- + drivers/block/pktcdvd.c | 12 +- + drivers/block/rnbd/rnbd-clt.c | 26 +- + drivers/block/rnbd/rnbd-clt.h | 1 - + drivers/block/rnbd/rnbd-proto.h | 4 +- + drivers/block/rnbd/rnbd-srv-dev.c | 61 +- + drivers/block/rnbd/rnbd-srv-dev.h | 18 +- + drivers/block/rnbd/rnbd-srv-sysfs.c | 1 - + drivers/block/rnbd/rnbd-srv.c | 46 +- + drivers/block/rnbd/rnbd-srv.h | 1 - + drivers/block/sunvdc.c | 1 - + drivers/block/virtio_blk.c | 66 +- + drivers/block/xen-blkback/blkback.c | 25 +- + drivers/block/zram/zram_drv.c | 17 +- + drivers/cdrom/gdrom.c | 1 - + drivers/char/random.c | 2 +- + drivers/md/Kconfig | 1 + + drivers/md/bcache/io.c | 3 +- + drivers/md/bcache/journal.c | 16 +- + drivers/md/bcache/movinggc.c | 4 +- + drivers/md/bcache/request.c | 22 +- + drivers/md/bcache/super.c | 9 +- + drivers/md/bcache/writeback.c | 4 +- + drivers/md/dm-cache-target.c | 26 +- + drivers/md/dm-core.h | 1 - + drivers/md/dm-crypt.c | 36 +- + drivers/md/dm-io.c | 5 +- + drivers/md/dm-log-writes.c | 39 +- + drivers/md/dm-rq.c | 26 +- + drivers/md/dm-snap.c | 21 +- + drivers/md/dm-thin.c | 41 +- + drivers/md/dm-writecache.c | 7 +- + drivers/md/dm-zoned-metadata.c | 26 +- + drivers/md/dm-zoned-target.c | 3 +- + drivers/md/dm.c | 172 ++--- + drivers/md/md-faulty.c | 4 +- + drivers/md/md-multipath.c | 4 +- + drivers/md/md.c | 29 +- + drivers/md/raid1.c | 42 +- + drivers/md/raid10.c | 30 +- + drivers/md/raid5-cache.c | 19 +- + drivers/md/raid5-ppl.c | 13 +- + drivers/md/raid5.c | 16 +- + drivers/memstick/core/ms_block.c | 64 +- + drivers/memstick/core/ms_block.h | 1 - + drivers/memstick/core/mspro_block.c | 57 +- + drivers/mtd/mtdswap.c | 2 +- + drivers/mtd/nand/raw/sharpsl.c | 1 - + drivers/nvdimm/blk.c | 1 - + drivers/nvdimm/btt.c | 1 - + drivers/nvdimm/btt_devs.c | 1 - + drivers/nvdimm/bus.c | 1 - + drivers/nvdimm/nd_virtio.c | 6 +- + drivers/nvdimm/pfn_devs.c | 1 - + drivers/nvme/host/Kconfig | 8 + + drivers/nvme/host/Makefile | 2 +- + drivers/nvme/host/constants.c | 185 ++++++ + drivers/nvme/host/core.c | 192 ++++-- + drivers/nvme/host/fabrics.c | 9 +- + drivers/nvme/host/fc.c | 22 +- + drivers/nvme/host/ioctl.c | 35 +- + drivers/nvme/host/nvme.h | 31 +- + drivers/nvme/host/rdma.c | 117 ++-- + drivers/nvme/host/tcp.c | 6 +- + drivers/nvme/target/core.c | 4 +- + drivers/nvme/target/fc.c | 12 +- + drivers/nvme/target/io-cmd-bdev.c | 26 +- + drivers/nvme/target/io-cmd-file.c | 17 +- + drivers/nvme/target/loop.c | 6 +- + drivers/nvme/target/nvmet.h | 2 +- + drivers/nvme/target/passthru.c | 7 +- + drivers/nvme/target/rdma.c | 6 +- + drivers/nvme/target/tcp.c | 6 +- + drivers/nvme/target/zns.c | 14 +- + drivers/s390/block/dasd_int.h | 1 - + drivers/s390/block/scm_blk.c | 1 - + drivers/s390/block/scm_blk.h | 1 - + drivers/scsi/scsi_debug.c | 1 - + drivers/scsi/scsi_lib.c | 2 +- + drivers/scsi/scsicam.c | 1 - + drivers/scsi/sd.c | 1 - + drivers/scsi/sr.h | 1 - + drivers/scsi/ufs/ufshpb.c | 4 +- + drivers/target/target_core_iblock.c | 12 +- + drivers/target/target_core_pscsi.c | 1 - + fs/btrfs/check-integrity.c | 1 - + fs/btrfs/disk-io.c | 10 +- + fs/btrfs/extent_io.c | 6 +- + fs/buffer.c | 14 +- + fs/crypto/bio.c | 13 +- + fs/dax.c | 1 - + fs/direct-io.c | 5 +- + fs/erofs/zdata.c | 5 +- + fs/ext4/page-io.c | 8 +- + fs/ext4/readpage.c | 8 +- + fs/f2fs/data.c | 7 +- + fs/fs-writeback.c | 6 +- + fs/gfs2/lops.c | 8 +- + fs/gfs2/meta_io.c | 4 +- + fs/gfs2/ops_fstype.c | 4 +- + fs/gfs2/sys.c | 2 +- + fs/hfs/mdb.c | 2 +- + fs/hfsplus/wrapper.c | 5 +- + fs/internal.h | 4 +- + fs/io-wq.c | 114 ++-- + fs/io_uring.c | 298 ++++----- + fs/iomap/buffered-io.c | 26 +- + fs/iomap/direct-io.c | 8 +- + fs/jfs/jfs_logmgr.c | 11 +- + fs/jfs/jfs_metapage.c | 9 +- + fs/ksmbd/vfs.c | 1 - + fs/mpage.c | 80 +-- + fs/nfs/blocklayout/blocklayout.c | 26 +- + fs/nfs/blocklayout/rpc_pipefs.c | 1 - + fs/nfsd/blocklayout.c | 1 - + fs/nilfs2/segbuf.c | 47 +- + fs/ntfs3/fsntfs.c | 36 +- + fs/ocfs2/cluster/heartbeat.c | 4 +- + fs/squashfs/block.c | 11 +- + fs/stat.c | 49 +- + fs/xfs/xfs_bio_io.c | 14 +- + fs/xfs/xfs_buf.c | 4 +- + fs/xfs/xfs_log.c | 14 +- + fs/zonefs/super.c | 9 +- + include/linux/bio.h | 36 +- + include/linux/blk-cgroup.h | 461 +------------- + include/linux/blk-mq.h | 3 +- + include/linux/blk_types.h | 7 + + include/linux/blkdev.h | 294 ++++++++- + include/linux/genhd.h | 291 --------- + include/linux/nvme-fc-driver.h | 2 +- + include/linux/nvme.h | 11 +- + include/linux/part_stat.h | 2 +- + include/linux/sbitmap.h | 51 +- + include/trace/events/block.h | 49 +- + include/trace/events/io_uring.h | 331 +++++----- + include/uapi/linux/nvme_ioctl.h | 6 +- + init/do_mounts.c | 1 - + kernel/exit.c | 2 +- + kernel/power/hibernate.c | 1 - + kernel/power/swap.c | 6 +- + kernel/sched/core.c | 7 +- + lib/sbitmap.c | 40 +- + mm/page_io.c | 10 +- + security/integrity/ima/ima_policy.c | 1 - + 212 files changed, 3006 insertions(+), 4168 deletions(-) + delete mode 100644 Documentation/block/biodoc.rst + create mode 100644 block/blk-cgroup.h + create mode 100644 block/blk-crypto-sysfs.c + create mode 100644 drivers/nvme/host/constants.c + delete mode 100644 include/linux/genhd.h +Merging device-mapper/for-next (168678d765d3 dm mpath: use DMINFO instead of printk with KERN_INFO) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Auto-merging drivers/md/dm.c +Merge made by the 'ort' strategy. + drivers/md/dm-cache-policy-smq.c | 4 +- + drivers/md/dm-cache-target.c | 10 +- + drivers/md/dm-clone-target.c | 10 +- + drivers/md/dm-core.h | 52 ++--- + drivers/md/dm-crypt.c | 15 +- + drivers/md/dm-delay.c | 5 +- + drivers/md/dm-ima.c | 6 +- + drivers/md/dm-io.c | 8 - + drivers/md/dm-ioctl.c | 2 + + drivers/md/dm-mpath.c | 5 +- + drivers/md/dm-rq.c | 7 +- + drivers/md/dm-stats.c | 34 +++- + drivers/md/dm-stats.h | 11 +- + drivers/md/dm-table.c | 30 ++- + drivers/md/dm-thin-metadata.c | 28 --- + drivers/md/dm-thin-metadata.h | 1 - + drivers/md/dm-thin.c | 10 +- + drivers/md/dm-zoned-metadata.c | 4 +- + drivers/md/dm-zoned-target.c | 1 - + drivers/md/dm-zoned.h | 9 +- + drivers/md/dm.c | 400 ++++++++++++++++++++++++--------------- + include/linux/device-mapper.h | 9 +- + include/uapi/linux/dm-ioctl.h | 4 +- + 23 files changed, 379 insertions(+), 286 deletions(-) +Merging libata/for-next (4dd4d3deb502 ata: ahci: Rename CONFIG_SATA_LPM_MOBILE_POLICY configuration item) +$ 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 drivers/ata/libata-core.c +Auto-merging drivers/ata/pata_hpt37x.c +Auto-merging drivers/ata/sata_fsl.c +Auto-merging include/linux/libata.h +Merge made by the 'ort' strategy. + drivers/ata/Kconfig | 8 +-- + drivers/ata/acard-ahci.c | 2 +- + drivers/ata/ahci.c | 113 +++++++++++++++++---------------- + drivers/ata/ahci.h | 4 +- + drivers/ata/ahci_qoriq.c | 2 +- + drivers/ata/ahci_xgene.c | 2 +- + drivers/ata/ata_piix.c | 5 +- + drivers/ata/libahci.c | 4 +- + drivers/ata/libahci_platform.c | 3 +- + drivers/ata/libata-acpi.c | 29 ++------- + drivers/ata/libata-core.c | 22 +++---- + drivers/ata/libata-eh.c | 49 +++++++-------- + drivers/ata/libata-sata.c | 10 +-- + drivers/ata/libata-scsi.c | 95 ++++++++++++---------------- + drivers/ata/libata-sff.c | 136 ++++++++++++++++++++++------------------ + drivers/ata/libata.h | 2 - + drivers/ata/pata_arasan_cf.c | 3 +- + drivers/ata/pata_artop.c | 31 +++++---- + drivers/ata/pata_atiixp.c | 4 +- + drivers/ata/pata_cs5520.c | 5 +- + drivers/ata/pata_ep93xx.c | 4 +- + drivers/ata/pata_hpt366.c | 49 +++++++++++++-- + drivers/ata/pata_hpt37x.c | 115 +++++++++------------------------ + drivers/ata/pata_hpt3x2n.c | 38 ++++++----- + drivers/ata/pata_imx.c | 15 ++--- + drivers/ata/pata_macio.c | 6 +- + drivers/ata/pata_mpc52xx.c | 5 +- + drivers/ata/pata_ns87415.c | 4 +- + drivers/ata/pata_octeon_cf.c | 4 +- + drivers/ata/pata_pdc202xx_old.c | 2 +- + drivers/ata/pata_platform.c | 18 ++---- + drivers/ata/pata_samsung_cf.c | 12 ++-- + drivers/ata/pata_triflex.c | 5 +- + drivers/ata/sata_fsl.c | 4 +- + drivers/ata/sata_highbank.c | 5 +- + drivers/ata/sata_inic162x.c | 10 +-- + drivers/ata/sata_mv.c | 6 +- + drivers/ata/sata_rcar.c | 33 ++++------ + drivers/ata/sata_svw.c | 10 +-- + drivers/ata/sata_vsc.c | 10 +-- + include/linux/libata.h | 12 +++- + 41 files changed, 418 insertions(+), 478 deletions(-) +Merging pcmcia/pcmcia-next (3928cf08334e pcmcia: db1xxx_ss: restrict to MIPS_DB1XXX boards) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Auto-merging drivers/pcmcia/Kconfig +Merge made by the 'ort' strategy. + drivers/pcmcia/Kconfig | 2 +- + drivers/pcmcia/rsrc_nonstatic.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging mmc/next (1f311c94aabd mmc: rtsx: add 74 Clocks in power on flow) +$ 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. + .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 4 + + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 1 + + .../devicetree/bindings/mmc/litex,mmc.yaml | 78 +++ + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 3 + + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 5 +- + .../devicetree/bindings/mmc/sdhci-am654.yaml | 1 + + .../devicetree/bindings/mmc/sdhci-msm.txt | 1 + + MAINTAINERS | 9 +- + drivers/mmc/core/bus.c | 9 +- + drivers/mmc/core/bus.h | 3 +- + drivers/mmc/core/mmc.c | 16 +- + drivers/mmc/core/sd.c | 25 +- + drivers/mmc/core/sdio.c | 5 +- + drivers/mmc/core/sdio_bus.c | 7 +- + drivers/mmc/host/Kconfig | 13 + + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/davinci_mmc.c | 6 +- + drivers/mmc/host/dw_mmc.c | 5 +- + drivers/mmc/host/litex_mmc.c | 661 +++++++++++++++++++++ + drivers/mmc/host/rtsx_pci_sdmmc.c | 29 +- + drivers/mmc/host/sdhci-of-at91.c | 6 +- + drivers/mmc/host/sdhci-pci-gli.c | 86 ++- + drivers/mmc/host/sdhci-tegra.c | 15 +- + drivers/mmc/host/sdhci_am654.c | 28 +- + drivers/mmc/host/sh_mmcif.c | 7 +- + drivers/mmc/host/sunxi-mmc.c | 9 + + drivers/mmc/host/wmt-sdmmc.c | 7 +- + 27 files changed, 945 insertions(+), 95 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/litex,mmc.yaml + create mode 100644 drivers/mmc/host/litex_mmc.c +Merging mfd/for-mfd-next (7a69f34ab44d mfd: atmel-flexcom: fix compilation warning) +$ 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/hwmon/index.rst +Auto-merging MAINTAINERS +Auto-merging drivers/hwmon/Kconfig +Auto-merging drivers/hwmon/Makefile +Auto-merging drivers/mfd/arizona-spi.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/leds/maxim,max77693.yaml | 105 + + Documentation/devicetree/bindings/mfd/ab8500.txt | 282 --- + Documentation/devicetree/bindings/mfd/max77693.txt | 194 -- + .../devicetree/bindings/mfd/maxim,max77693.yaml | 143 ++ + Documentation/devicetree/bindings/mfd/mt6397.txt | 2 +- + .../devicetree/bindings/mfd/qcom,spmi-pmic.txt | 1 + + .../devicetree/bindings/mfd/qcom,tcsr.txt | 1 + + .../bindings/mfd/samsung,exynos5433-lpass.txt | 72 - + .../bindings/mfd/samsung,exynos5433-lpass.yaml | 117 ++ + .../devicetree/bindings/mfd/silergy,sy7636a.yaml | 82 + + .../devicetree/bindings/mfd/stericsson,ab8500.yaml | 500 +++++ + .../bindings/mfd/stericsson,db8500-prcmu.yaml | 1 + + .../bindings/power/supply/maxim,max77693.yaml | 70 + + .../bindings/regulator/maxim,max77693.yaml | 60 + + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/sy7636a-hwmon.rst | 26 + + MAINTAINERS | 3 +- + drivers/hwmon/Kconfig | 9 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/sy7636a-hwmon.c | 106 + + drivers/iio/temperature/iqs620at-temp.c | 4 +- + drivers/mfd/Kconfig | 10 +- + drivers/mfd/Makefile | 1 - + drivers/mfd/ab8500-core.c | 20 - + drivers/mfd/ab8500-debugfs.c | 2096 -------------------- + drivers/mfd/arizona-i2c.c | 2 +- + drivers/mfd/arizona-spi.c | 2 +- + drivers/mfd/atmel-flexcom.c | 2 +- + drivers/mfd/exynos-lpass.c | 1 - + drivers/mfd/intel-lpss-pci.c | 15 + + drivers/mfd/intel_soc_pmic_core.c | 4 + + drivers/mfd/intel_soc_pmic_crc.c | 35 +- + drivers/mfd/iqs62x.c | 6 +- + drivers/mfd/mt6358-irq.c | 1 + + drivers/mfd/rk808.c | 44 + + drivers/mfd/simple-mfd-i2c.c | 11 + + drivers/mfd/sta2x11-mfd.c | 2 +- + drivers/mfd/stmfx.c | 17 +- + drivers/regulator/Kconfig | 1 - + drivers/regulator/sy7636a-regulator.c | 7 +- + include/linux/mfd/dbx500-prcmu.h | 18 - + include/linux/mfd/iqs62x.h | 7 + + include/linux/mfd/mt6358/registers.h | 7 + + include/linux/mfd/mt6397/core.h | 1 + + include/linux/mfd/rk808.h | 1 + + include/linux/mfd/sy7636a.h | 34 + + 46 files changed, 1401 insertions(+), 2724 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/maxim,max77693.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/ab8500.txt + delete mode 100644 Documentation/devicetree/bindings/mfd/max77693.txt + create mode 100644 Documentation/devicetree/bindings/mfd/maxim,max77693.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/samsung,exynos5433-lpass.txt + create mode 100644 Documentation/devicetree/bindings/mfd/samsung,exynos5433-lpass.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/silergy,sy7636a.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/stericsson,ab8500.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/maxim,max77693.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/maxim,max77693.yaml + create mode 100644 Documentation/hwmon/sy7636a-hwmon.rst + create mode 100644 drivers/hwmon/sy7636a-hwmon.c + delete mode 100644 drivers/mfd/ab8500-debugfs.c + create mode 100644 include/linux/mfd/sy7636a.h +Merging backlight/for-backlight-next (ec961cf32411 backlight: qcom-wled: Respect enabled-strings in set_brightness) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Already up to date. +Merging battery/for-next (ffb983d31519 power: supply: Static data for Samsung batteries) +$ 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 Documentation/ABI/testing/sysfs-class-power +Auto-merging drivers/i2c/busses/i2c-cht-wc.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-power | 8 +- + drivers/extcon/Kconfig | 2 + + drivers/extcon/extcon-intel-cht-wc.c | 240 +++++- + drivers/i2c/busses/i2c-cht-wc.c | 120 ++- + drivers/mfd/intel_soc_pmic_chtwc.c | 40 + + drivers/power/reset/gemini-poweroff.c | 4 +- + drivers/power/supply/Kconfig | 27 +- + drivers/power/supply/Makefile | 2 + + drivers/power/supply/ab8500-bm.h | 79 -- + drivers/power/supply/ab8500_bmdata.c | 86 +-- + drivers/power/supply/ab8500_btemp.c | 342 +-------- + drivers/power/supply/ab8500_chargalg.c | 407 ++-------- + drivers/power/supply/ab8500_charger.c | 47 +- + drivers/power/supply/ab8500_fg.c | 136 ++-- + drivers/power/supply/axp20x_battery.c | 13 +- + drivers/power/supply/axp288_charger.c | 21 +- + drivers/power/supply/axp288_fuel_gauge.c | 273 ++++--- + drivers/power/supply/bq24190_charger.c | 158 +++- + drivers/power/supply/bq25890_charger.c | 396 ++++++++-- + drivers/power/supply/bq25980_charger.c | 2 +- + drivers/power/supply/cpcap-battery.c | 118 ++- + drivers/power/supply/cros_peripheral_charger.c | 37 +- + drivers/power/supply/cros_usbpd-charger.c | 2 +- + drivers/power/supply/da9150-fg.c | 31 +- + drivers/power/supply/ltc2941-battery-gauge.c | 61 +- + drivers/power/supply/max14656_charger_detector.c | 15 +- + drivers/power/supply/max17042_battery.c | 12 +- + drivers/power/supply/max8997_charger.c | 12 +- + drivers/power/supply/mp2629_charger.c | 6 +- + drivers/power/supply/power_supply_core.c | 269 +++++-- + drivers/power/supply/power_supply_hwmon.c | 15 +- + drivers/power/supply/power_supply_sysfs.c | 1 + + drivers/power/supply/rt9455_charger.c | 2 +- + drivers/power/supply/samsung-sdi-battery.c | 919 +++++++++++++++++++++++ + drivers/power/supply/samsung-sdi-battery.h | 13 + + drivers/power/supply/sbs-charger.c | 18 +- + drivers/power/supply/smb347-charger.c | 3 +- + drivers/power/supply/ug3105_battery.c | 486 ++++++++++++ + include/linux/mfd/intel_soc_pmic.h | 8 + + include/linux/platform_data/cros_ec_commands.h | 64 ++ + include/linux/power/bq25890_charger.h | 15 + + include/linux/power_supply.h | 213 +++++- + 42 files changed, 3338 insertions(+), 1385 deletions(-) + create mode 100644 drivers/power/supply/samsung-sdi-battery.c + create mode 100644 drivers/power/supply/samsung-sdi-battery.h + create mode 100644 drivers/power/supply/ug3105_battery.c + create mode 100644 include/linux/power/bq25890_charger.h +Merging regulator/for-next (29bfeed6be0c Merge remote-tracking branch 'regulator/for-5.18' 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/devicetree/bindings/regulator/samsung,s5m8767.yaml +Auto-merging drivers/regulator/Kconfig +Auto-merging include/linux/regulator/driver.h +Merge made by the 'ort' strategy. + .../bindings/regulator/maxim,max8973.yaml | 5 +- + .../devicetree/bindings/regulator/pfuze100.yaml | 6 +- + .../devicetree/bindings/regulator/ti,tps62864.yaml | 63 +++++ + drivers/regulator/Kconfig | 10 + + drivers/regulator/Makefile | 1 + + drivers/regulator/qcom_smd-regulator.c | 4 +- + drivers/regulator/rpi-panel-attiny-regulator.c | 291 +++++++++++++++++---- + drivers/regulator/tps6286x-regulator.c | 159 +++++++++++ + drivers/regulator/virtual.c | 41 ++- + drivers/spi/spi-geni-qcom.c | 7 +- + include/dt-bindings/regulator/ti,tps62864.h | 9 + + 11 files changed, 536 insertions(+), 60 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/ti,tps62864.yaml + create mode 100644 drivers/regulator/tps6286x-regulator.c + create mode 100644 include/dt-bindings/regulator/ti,tps62864.h +Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) +$ git merge -m Merge branch 'next-testing' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git security/next-testing +Auto-merging security/commoncap.c +Merge made by the 'ort' strategy. +Merging apparmor/apparmor-next (c2489617b3b9 apparmor: Fix undefined reference to `zlib_deflate_workspacesize') +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Auto-merging MAINTAINERS +Auto-merging security/apparmor/lsm.c +Merge made by the 'ort' strategy. + MAINTAINERS | 7 ++- + security/apparmor/Kconfig | 86 ++++++++++++++++++++--------- + security/apparmor/apparmorfs.c | 99 +++++++++++++++++++--------------- + security/apparmor/audit.c | 2 +- + security/apparmor/include/apparmor.h | 1 + + security/apparmor/include/apparmorfs.h | 14 +++++ + security/apparmor/include/lib.h | 5 ++ + security/apparmor/label.c | 17 +++--- + security/apparmor/lib.c | 2 +- + security/apparmor/lsm.c | 23 ++++---- + security/apparmor/mount.c | 11 ++-- + security/apparmor/policy.c | 35 ++++++------ + security/apparmor/policy_unpack.c | 37 ++++++++----- + security/apparmor/policy_unpack_test.c | 34 ++++++------ + security/apparmor/procattr.c | 2 +- + 15 files changed, 234 insertions(+), 141 deletions(-) +Merging integrity/next-integrity (cd3bc044af48 KEYS: encrypted: Instantiate key with user-provided decrypted data) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Auto-merging MAINTAINERS +Auto-merging security/integrity/ima/ima_policy.c +Merge made by the 'ort' strategy. + Documentation/security/keys/trusted-encrypted.rst | 25 ++++++-- + MAINTAINERS | 3 + + security/integrity/ima/ima_api.c | 12 ++-- + security/integrity/ima/ima_fs.c | 31 +++++++--- + security/integrity/ima/ima_init.c | 5 +- + security/integrity/ima/ima_main.c | 9 +-- + security/integrity/ima/ima_policy.c | 4 +- + security/integrity/ima/ima_template_lib.c | 7 +-- + security/integrity/integrity.h | 14 ++++- + security/keys/Kconfig | 19 ++++-- + security/keys/encrypted-keys/encrypted.c | 71 +++++++++++++++++------ + 11 files changed, 137 insertions(+), 63 deletions(-) +Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata) +$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next +Already up to date. +Merging selinux/next (cdbec3ede0b8 selinux: shorten the policy capability enum names) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging security/security.c +Auto-merging security/selinux/ima.c +Auto-merging security/selinux/ss/conditional.c +Merge made by the 'ort' strategy. + Documentation/security/SCTP.rst | 26 ++- + include/linux/lsm_hook_defs.h | 2 + + include/linux/lsm_hooks.h | 5 + + include/linux/security.h | 8 + + net/sctp/sm_statefuns.c | 8 +- + security/security.c | 24 ++- + security/selinux/hooks.c | 299 ++++++++++++++--------------- + security/selinux/ibpkey.c | 2 +- + security/selinux/ima.c | 4 +- + security/selinux/include/policycap.h | 21 +- + security/selinux/include/policycap_names.h | 5 +- + security/selinux/include/security.h | 31 +-- + security/selinux/netnode.c | 9 +- + security/selinux/netport.c | 2 +- + security/selinux/selinuxfs.c | 4 +- + security/selinux/ss/avtab.c | 6 +- + security/selinux/ss/conditional.c | 2 - + security/selinux/ss/ebitmap.c | 1 - + security/selinux/ss/ebitmap.h | 6 +- + security/selinux/ss/mls.c | 1 - + security/selinux/ss/policydb.c | 4 +- + security/selinux/ss/services.c | 10 +- + security/selinux/ss/sidtab.c | 4 +- + security/selinux/xfrm.c | 2 +- + 24 files changed, 255 insertions(+), 231 deletions(-) +Merging smack/next (a5cd1ab7ab67 Fix incorrect type in assignment of ipv6 port for audit) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Merge made by the 'ort' strategy. + security/smack/smack_lsm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging tomoyo/master (b9c20da356db workqueue: Warn flushing of kernel-global workqueues) +$ 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/workqueue.h | 15 +++------------ + kernel/workqueue.c | 36 +++++++++++++++++++++++++++++------- + security/tomoyo/load_policy.c | 4 ++-- + 3 files changed, 34 insertions(+), 21 deletions(-) +Merging tpmdd/next (c9e54f38976a integrity: Only use machine keyring when uefi_check_trust_mok_keys is true) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Auto-merging MAINTAINERS +Auto-merging crypto/asymmetric_keys/x509_parser.h +Auto-merging security/integrity/integrity.h +Merge made by the 'ort' strategy. + MAINTAINERS | 2 + + certs/.gitignore | 1 + + certs/Kconfig | 17 +- + certs/Makefile | 14 +- + certs/blacklist.c | 218 ++++++++++++++++----- + certs/system_keyring.c | 44 ++++- + crypto/asymmetric_keys/pkcs7_verify.c | 7 +- + crypto/asymmetric_keys/x509.asn1 | 2 +- + crypto/asymmetric_keys/x509_cert_parser.c | 34 ++-- + crypto/asymmetric_keys/x509_parser.h | 1 - + crypto/asymmetric_keys/x509_public_key.c | 21 +- + drivers/char/tpm/tpm-dev-common.c | 8 +- + drivers/char/tpm/xen-tpmfront.c | 8 +- + drivers/firmware/efi/mokvar-table.c | 2 +- + include/keys/system_keyring.h | 28 ++- + scripts/check-blacklist-hashes.awk | 37 ++++ + security/integrity/Kconfig | 13 ++ + security/integrity/Makefile | 1 + + security/integrity/digsig.c | 15 +- + security/integrity/integrity.h | 17 +- + .../integrity/platform_certs/keyring_handler.c | 44 ++--- + .../integrity/platform_certs/keyring_handler.h | 5 + + security/integrity/platform_certs/load_uefi.c | 4 +- + .../integrity/platform_certs/machine_keyring.c | 77 ++++++++ + security/keys/keyctl_pkey.c | 14 +- + security/keys/trusted-keys/trusted_core.c | 6 +- + tools/certs/print-cert-tbs-hash.sh | 91 +++++++++ + tools/testing/selftests/tpm2/tpm2.py | 31 +++ + tools/testing/selftests/tpm2/tpm2_tests.py | 45 ++++- + 29 files changed, 659 insertions(+), 148 deletions(-) + create mode 100755 scripts/check-blacklist-hashes.awk + create mode 100644 security/integrity/platform_certs/machine_keyring.c + create mode 100755 tools/certs/print-cert-tbs-hash.sh +Merging watchdog/master (cfb92440ee71 Linux 5.17-rc5) +$ 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 (a9b491f6d6de Merge branches 'arm/msm', 'arm/renesas', 'arm/rockchip', 'iommu/fixes', 'x86/vt-d' 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 drivers/iommu/dma-iommu.c +Merge made by the 'ort' strategy. + .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 4 ++ + drivers/iommu/amd/amd_iommu.h | 1 + + drivers/iommu/amd/amd_iommu_types.h | 1 + + drivers/iommu/amd/init.c | 10 +++ + drivers/iommu/amd/io_pgtable.c | 12 ++-- + drivers/iommu/amd/iommu.c | 10 ++- + drivers/iommu/dma-iommu.c | 4 ++ + drivers/iommu/intel/dmar.c | 3 +- + drivers/iommu/iova.c | 73 +++++++++++++++++----- + drivers/iommu/ipmmu-vmsa.c | 14 +++-- + drivers/iommu/msm_iommu.c | 44 ++++--------- + drivers/iommu/rockchip-iommu.c | 7 +-- + drivers/iommu/tegra-gart.c | 6 -- + drivers/iommu/tegra-smmu.c | 6 -- + drivers/vdpa/vdpa_user/iova_domain.c | 11 ++++ + include/linux/iova.h | 15 +---- + 16 files changed, 131 insertions(+), 90 deletions(-) +Merging audit/next (272ceeaea355 audit: log AUDIT_TIME_* records only from rules) +$ 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.h | 4 +++ + kernel/auditsc.c | 87 +++++++++++++++++++++++++++++++++++++++++++------------- + 2 files changed, 71 insertions(+), 20 deletions(-) +Merging devicetree/for-next (dca669354e6f dt-bindings: Another pass removing cases of 'allOf' containing a '$ref') +$ 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/cpus.yaml +Auto-merging Documentation/devicetree/bindings/firmware/arm,scmi.yaml +Auto-merging Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml +Auto-merging Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml +Auto-merging Documentation/devicetree/bindings/memory-controllers/samsung,exynos5422-dmc.yaml +Auto-merging Documentation/devicetree/bindings/net/can/bosch,m_can.yaml +Auto-merging Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml +Auto-merging Documentation/devicetree/bindings/opp/opp-v2-base.yaml +Auto-merging Documentation/devicetree/bindings/phy/ti,omap-usb2.yaml +Auto-merging Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml +Auto-merging Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml +Auto-merging Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Auto-merging Documentation/devicetree/bindings/usb/ti,keystone-dwc3.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/of/unittest.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/arm,cci-400.yaml | 5 + + .../devicetree/bindings/arm/cpu-capacity.txt | 4 +- + Documentation/devicetree/bindings/arm/cpus.yaml | 2 + + .../devicetree/bindings/arm/idle-states.yaml | 80 ++-- + Documentation/devicetree/bindings/arm/pmu.yaml | 2 + + .../bindings/ata/cortina,gemini-sata-bridge.txt | 55 --- + .../bindings/ata/cortina,gemini-sata-bridge.yaml | 109 ++++++ + .../devicetree/bindings/ata/sata_highbank.yaml | 3 + + .../bindings/bus/allwinner,sun50i-a64-de2.yaml | 5 +- + .../devicetree/bindings/clock/ti/ti,clksel.yaml | 51 +++ + .../bindings/connector/usb-connector.yaml | 3 +- + .../bindings/crypto/atmel,at91sam9g46-aes.yaml | 66 ++++ + .../bindings/crypto/atmel,at91sam9g46-sha.yaml | 60 +++ + .../bindings/crypto/atmel,at91sam9g46-tdes.yaml | 64 ++++ + .../devicetree/bindings/crypto/atmel-crypto.txt | 68 ---- + .../bindings/crypto/intel,ixp4xx-crypto.yaml | 15 +- + .../allwinner,sun4i-a10-display-engine.yaml | 2 + + .../bindings/display/brcm,bcm2711-hdmi.yaml | 3 +- + .../bindings/display/bridge/adi,adv7511.yaml | 5 +- + .../bindings/display/bridge/synopsys,dw-hdmi.yaml | 5 +- + .../bindings/display/bridge/toshiba,tc358768.yaml | 7 +- + .../bindings/display/exynos/exynos-mic.txt | 51 --- + .../bindings/display/exynos/exynos5433-decon.txt | 60 --- + .../bindings/display/exynos/exynos7-decon.txt | 65 ---- + .../bindings/display/exynos/exynos_hdmi.txt | 64 ---- + .../bindings/display/exynos/exynos_hdmiddc.txt | 15 - + .../bindings/display/exynos/exynos_hdmiphy.txt | 15 - + .../bindings/display/exynos/exynos_mixer.txt | 26 -- + .../bindings/display/exynos/samsung-fimd.txt | 107 ------ + .../bindings/display/mediatek/mediatek,hdmi.yaml | 5 +- + .../devicetree/bindings/display/msm/gpu.yaml | 2 + + .../devicetree/bindings/display/msm/mdp4.txt | 114 ------ + .../devicetree/bindings/display/msm/mdp4.yaml | 124 +++++++ + .../bindings/display/panel/display-timings.yaml | 3 +- + .../display/panel/leadtek,ltk050h3146w.yaml | 2 +- + .../devicetree/bindings/display/renesas,du.yaml | 10 +- + .../bindings/display/rockchip/rockchip-drm.yaml | 2 + + .../display/samsung/samsung,exynos-hdmi-ddc.yaml | 42 +++ + .../display/samsung/samsung,exynos-hdmi.yaml | 227 ++++++++++++ + .../display/samsung/samsung,exynos-mixer.yaml | 143 ++++++++ + .../display/samsung/samsung,exynos5433-decon.yaml | 148 ++++++++ + .../display/samsung/samsung,exynos5433-mic.yaml | 95 +++++ + .../display/samsung/samsung,exynos7-decon.yaml | 120 ++++++ + .../bindings/display/samsung/samsung,fimd.yaml | 198 ++++++++++ + .../display/sprd/sprd,display-subsystem.yaml | 2 + + .../devicetree/bindings/display/ste,mcde.yaml | 4 +- + .../bindings/display/ti/ti,am65x-dss.yaml | 3 +- + .../devicetree/bindings/dma/dma-router.yaml | 2 + + .../devicetree/bindings/dma/st,stm32-dmamux.yaml | 2 +- + .../bindings/dma/xilinx/xlnx,zynqmp-dma-1.0.yaml | 85 +++++ + .../devicetree/bindings/dma/xilinx/zynqmp_dma.txt | 26 -- + .../bindings/dvfs/performance-domain.yaml | 1 - + .../devicetree/bindings/example-schema.yaml | 14 + + .../devicetree/bindings/firmware/arm,scmi.yaml | 2 +- + .../devicetree/bindings/firmware/arm,scpi.yaml | 2 +- + Documentation/devicetree/bindings/i2c/i2c-imx.yaml | 7 +- + Documentation/devicetree/bindings/i2c/i2c-mpc.yaml | 2 + + .../devicetree/bindings/i2c/i2c-s3c2410.txt | 58 --- + .../devicetree/bindings/i2c/ingenic,i2c.yaml | 4 +- + .../devicetree/bindings/i2c/renesas,riic.yaml | 2 + + .../bindings/i2c/samsung,s3c2410-i2c.yaml | 164 +++++++++ + .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 24 +- + .../devicetree/bindings/input/adc-joystick.yaml | 9 +- + .../bindings/interconnect/qcom,rpmh.yaml | 2 + + .../bindings/interrupt-controller/arm,gic-v3.yaml | 6 +- + .../bindings/interrupt-controller/ti,sci-inta.yaml | 2 + + .../devicetree/bindings/iommu/mediatek,iommu.yaml | 6 +- + .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 6 + + .../bindings/leds/backlight/led-backlight.yaml | 2 + + .../bindings/leds/cznic,turris-omnia-leds.yaml | 3 +- + .../devicetree/bindings/leds/leds-lp50xx.yaml | 3 +- + .../media/allwinner,sun4i-a10-video-engine.yaml | 4 + + .../bindings/media/nxp,imx8mq-mipi-csi2.yaml | 10 +- + .../devicetree/bindings/media/ti,cal.yaml | 4 + + .../memory-controllers/mediatek,smi-larb.yaml | 2 +- + .../memory-controllers/samsung,exynos5422-dmc.yaml | 2 + + .../devicetree/bindings/mfd/google,cros-ec.yaml | 12 +- + .../bindings/mtd/rockchip,nand-controller.yaml | 3 +- + .../bindings/net/allwinner,sun4i-a10-emac.yaml | 4 + + .../devicetree/bindings/net/can/bosch,c_can.yaml | 8 +- + .../devicetree/bindings/net/can/bosch,m_can.yaml | 1 + + .../devicetree/bindings/net/can/fsl,flexcan.yaml | 12 +- + .../bindings/net/can/renesas,rcar-canfd.yaml | 1 + + .../bindings/net/cortina,gemini-ethernet.txt | 92 ----- + .../bindings/net/cortina,gemini-ethernet.yaml | 137 +++++++ + .../devicetree/bindings/net/dsa/dsa-port.yaml | 2 + + .../bindings/net/ethernet-controller.yaml | 4 + + Documentation/devicetree/bindings/net/fsl,fec.yaml | 8 +- + .../bindings/net/intel,ixp4xx-ethernet.yaml | 15 +- + .../devicetree/bindings/net/intel,ixp4xx-hss.yaml | 33 +- + .../devicetree/bindings/net/nxp,dwmac-imx.yaml | 4 + + .../bindings/net/socionext,uniphier-ave4.yaml | 4 + + .../devicetree/bindings/net/stm32-dwmac.yaml | 4 + + .../devicetree/bindings/net/ti,cpsw-switch.yaml | 3 +- + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 5 + + .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 6 - + .../bindings/net/wireless/mediatek,mt76.yaml | 4 + + .../devicetree/bindings/nvmem/qcom,spmi-sdam.yaml | 28 -- + .../devicetree/bindings/opp/opp-v2-base.yaml | 2 + + .../devicetree/bindings/perf/arm,dsu-pmu.yaml | 2 + + .../devicetree/bindings/phy/intel,combo-phy.yaml | 8 + + .../devicetree/bindings/phy/phy-stm32-usbphyc.yaml | 3 +- + .../bindings/phy/samsung,exynos-hdmi-phy.yaml | 44 +++ + .../devicetree/bindings/phy/ti,omap-usb2.yaml | 4 + + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 2 + + .../bindings/pinctrl/canaan,k210-fpioa.yaml | 4 + + .../bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml | 2 + + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 10 +- + .../devicetree/bindings/power/power-domain.yaml | 4 + + .../devicetree/bindings/power/renesas,apmu.yaml | 2 + + .../bindings/power/rockchip,power-controller.yaml | 2 + + .../bindings/power/supply/cw2015_battery.yaml | 6 +- + .../bindings/power/supply/power-supply.yaml | 2 + + .../bindings/power/supply/sbs,sbs-manager.yaml | 4 +- + .../devicetree/bindings/regulator/regulator.yaml | 2 + + .../bindings/regulator/st,stm32-booster.yaml | 2 +- + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 6 + + .../bindings/remoteproc/st,stm32-rproc.yaml | 33 +- + .../bindings/remoteproc/ti,k3-dsp-rproc.yaml | 10 + + .../bindings/remoteproc/ti,k3-r5f-rproc.yaml | 13 +- + .../bindings/remoteproc/ti,omap-remoteproc.yaml | 19 +- + .../bindings/reserved-memory/shared-dma-pool.yaml | 10 + + .../bindings/reset/renesas,rzg2l-usbphy-ctrl.yaml | 3 +- + .../devicetree/bindings/rng/atmel,at91-trng.yaml | 2 +- + .../devicetree/bindings/serial/rda,8810pl-uart.txt | 17 - + .../bindings/serial/rda,8810pl-uart.yaml | 46 +++ + .../bindings/soc/samsung/exynos-usi.yaml | 4 + + .../devicetree/bindings/soc/ti/ti,pruss.yaml | 15 +- + .../bindings/sound/amlogic,gx-sound-card.yaml | 4 +- + .../bindings/sound/google,sc7180-trogdor.yaml | 6 +- + .../devicetree/bindings/sound/imx-audio-card.yaml | 7 +- + .../devicetree/bindings/sound/qcom,sm8250.yaml | 10 +- + .../bindings/sound/samsung,aries-wm8994.yaml | 3 +- + .../bindings/sound/samsung,midas-audio.yaml | 2 - + .../devicetree/bindings/sound/samsung,odroid.yaml | 9 +- + .../devicetree/bindings/sound/sound-dai.yaml | 20 + + .../devicetree/bindings/sound/st,stm32-sai.yaml | 11 +- + .../devicetree/bindings/sound/tlv320adcx140.yaml | 13 +- + .../devicetree/bindings/spi/spi-controller.yaml | 4 +- + .../bindings/thermal/thermal-cooling-devices.yaml | 6 +- + .../devicetree/bindings/thermal/thermal-idle.yaml | 8 +- + .../bindings/timer/arm,armv7m-systick.txt | 26 -- + .../bindings/timer/arm,armv7m-systick.yaml | 54 +++ + .../bindings/timer/nuvoton,npcm7xx-timer.txt | 21 -- + .../bindings/timer/nuvoton,npcm7xx-timer.yaml | 46 +++ + .../devicetree/bindings/timer/renesas,ostm.yaml | 2 + + .../devicetree/bindings/timer/sifive,clint.yaml | 9 +- + .../devicetree/bindings/trivial-devices.yaml | 8 +- + .../devicetree/bindings/usb/dwc3-cavium.txt | 2 +- + .../devicetree/bindings/usb/nvidia,tegra-xudc.yaml | 2 +- + .../devicetree/bindings/usb/renesas,usbhs.yaml | 5 +- + .../devicetree/bindings/usb/st,stusb160x.yaml | 4 +- + .../devicetree/bindings/usb/ti,keystone-dwc3.yaml | 2 +- + .../devicetree/bindings/vendor-prefixes.yaml | 10 +- + .../bindings/watchdog/fsl-imx7ulp-wdt.yaml | 8 +- + .../devicetree/bindings/writing-schema.rst | 2 +- + Documentation/devicetree/of_unittest.rst | 27 +- + MAINTAINERS | 4 +- + drivers/of/unittest.c | 2 +- + scripts/dtc/Makefile | 2 +- + scripts/dtc/of_unittest_expect | 408 +++++++++++++++++++++ + 161 files changed, 2966 insertions(+), 1171 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/ata/cortina,gemini-sata-bridge.txt + create mode 100644 Documentation/devicetree/bindings/ata/cortina,gemini-sata-bridge.yaml + create mode 100644 Documentation/devicetree/bindings/clock/ti/ti,clksel.yaml + create mode 100644 Documentation/devicetree/bindings/crypto/atmel,at91sam9g46-aes.yaml + create mode 100644 Documentation/devicetree/bindings/crypto/atmel,at91sam9g46-sha.yaml + create mode 100644 Documentation/devicetree/bindings/crypto/atmel,at91sam9g46-tdes.yaml + delete mode 100644 Documentation/devicetree/bindings/crypto/atmel-crypto.txt + delete mode 100644 Documentation/devicetree/bindings/display/exynos/exynos-mic.txt + delete mode 100644 Documentation/devicetree/bindings/display/exynos/exynos5433-decon.txt + delete mode 100644 Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt + delete mode 100644 Documentation/devicetree/bindings/display/exynos/exynos_hdmi.txt + delete mode 100644 Documentation/devicetree/bindings/display/exynos/exynos_hdmiddc.txt + delete mode 100644 Documentation/devicetree/bindings/display/exynos/exynos_hdmiphy.txt + delete mode 100644 Documentation/devicetree/bindings/display/exynos/exynos_mixer.txt + delete mode 100644 Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt + delete mode 100644 Documentation/devicetree/bindings/display/msm/mdp4.txt + create mode 100644 Documentation/devicetree/bindings/display/msm/mdp4.yaml + create mode 100644 Documentation/devicetree/bindings/display/samsung/samsung,exynos-hdmi-ddc.yaml + create mode 100644 Documentation/devicetree/bindings/display/samsung/samsung,exynos-hdmi.yaml + create mode 100644 Documentation/devicetree/bindings/display/samsung/samsung,exynos-mixer.yaml + create mode 100644 Documentation/devicetree/bindings/display/samsung/samsung,exynos5433-decon.yaml + create mode 100644 Documentation/devicetree/bindings/display/samsung/samsung,exynos5433-mic.yaml + create mode 100644 Documentation/devicetree/bindings/display/samsung/samsung,exynos7-decon.yaml + create mode 100644 Documentation/devicetree/bindings/display/samsung/samsung,fimd.yaml + create mode 100644 Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dma-1.0.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/xilinx/zynqmp_dma.txt + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-s3c2410.txt + create mode 100644 Documentation/devicetree/bindings/i2c/samsung,s3c2410-i2c.yaml + delete mode 100644 Documentation/devicetree/bindings/net/cortina,gemini-ethernet.txt + create mode 100644 Documentation/devicetree/bindings/net/cortina,gemini-ethernet.yaml + create mode 100644 Documentation/devicetree/bindings/phy/samsung,exynos-hdmi-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/rda,8810pl-uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/rda,8810pl-uart.yaml + create mode 100644 Documentation/devicetree/bindings/sound/sound-dai.yaml + delete mode 100644 Documentation/devicetree/bindings/timer/arm,armv7m-systick.txt + create mode 100644 Documentation/devicetree/bindings/timer/arm,armv7m-systick.yaml + delete mode 100644 Documentation/devicetree/bindings/timer/nuvoton,npcm7xx-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/nuvoton,npcm7xx-timer.yaml + create mode 100755 scripts/dtc/of_unittest_expect +Merging mailbox/mailbox-for-next (869b6ca39c08 dt-bindings: mailbox: Add more protocol and client ID) +$ 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 (a3d3c11c0424 Merge remote-tracking branch 'spi/for-5.18' 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 Documentation/devicetree/bindings/spi/spi-controller.yaml +Auto-merging MAINTAINERS +CONFLICT (modify/delete): arch/arm/mach-pxa/stargate2.c deleted in HEAD and modified in spi/for-next. Version spi/for-next of arch/arm/mach-pxa/stargate2.c left in tree. +Auto-merging drivers/spi/Kconfig +Auto-merging drivers/spi/spi.c +Auto-merging include/linux/spi/spi.h +Auto-merging include/linux/spi/spi.h +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/arm/mach-pxa/stargate2.c +rm 'arch/arm/mach-pxa/stargate2.c' +$ git commit --no-edit -v -a +[master ce65ad0223db] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/mtd/jedec,spi-nor.yaml | 3 +- + .../bindings/spi/mediatek,spi-mt65xx.yaml | 103 +++ + .../bindings/spi/mediatek,spi-mtk-nor.yaml | 4 + + .../bindings/spi/mediatek,spi-slave-mt27xx.yaml | 58 ++ + .../bindings/spi/microchip,mpfs-spi.yaml | 52 ++ + .../bindings/spi/nvidia,tegra210-quad.yaml | 1 + + .../devicetree/bindings/spi/renesas,rspi.yaml | 4 +- + .../devicetree/bindings/spi/spi-controller.yaml | 7 + + .../devicetree/bindings/spi/spi-mt65xx.txt | 68 -- + .../bindings/spi/spi-peripheral-props.yaml | 25 + + .../devicetree/bindings/spi/spi-slave-mt27xx.txt | 33 - + .../bindings/spi/spi-sunplus-sp7021.yaml | 78 ++ + Documentation/driver-api/mtd/index.rst | 2 +- + .../mtd/{intel-spi.rst => spi-intel.rst} | 8 +- + Documentation/spi/pxa2xx.rst | 3 - + MAINTAINERS | 7 + + arch/arm/mach-pxa/corgi.c | 26 +- + arch/arm/mach-pxa/hx4700.c | 10 +- + arch/arm/mach-pxa/icontrol.c | 26 +- + arch/arm/mach-pxa/littleton.c | 10 +- + arch/arm/mach-pxa/magician.c | 12 +- + arch/arm/mach-pxa/poodle.c | 14 +- + arch/arm/mach-pxa/spitz.c | 26 +- + arch/arm/mach-pxa/z2.c | 20 +- + arch/arm/mach-s3c/Kconfig | 12 - + arch/arm/mach-s3c/devs.c | 77 +- + arch/arm/mach-s3c/mach-crag6410-module.c | 13 - + arch/arm/mach-s3c/mach-crag6410.c | 13 +- + arch/arm/mach-s3c/setup-spi-s3c64xx.c | 9 - + arch/arm/mach-s3c/spi-core-s3c24xx.h | 6 - + drivers/mfd/lpc_ich.c | 59 +- + drivers/mtd/spi-nor/controllers/Kconfig | 36 - + drivers/mtd/spi-nor/controllers/Makefile | 3 - + drivers/mtd/spi-nor/controllers/intel-spi.h | 21 - + drivers/spi/Kconfig | 50 ++ + drivers/spi/Makefile | 4 + + drivers/spi/spi-amd.c | 87 ++- + drivers/spi/spi-ath79.c | 34 + + drivers/spi/spi-bcm2835aux.c | 21 +- + drivers/spi/spi-bitbang-txrx.h | 66 ++ + drivers/spi/spi-gpio.c | 42 +- + .../intel-spi-pci.c => spi/spi-intel-pci.c} | 50 +- + .../spi-intel-platform.c} | 21 +- + .../controllers/intel-spi.c => spi/spi-intel.c} | 850 ++++++++++++++------- + drivers/spi/spi-intel.h | 19 + + drivers/spi/spi-lantiq-ssc.c | 8 +- + drivers/spi/spi-mpc512x-psc.c | 47 +- + drivers/spi/spi-mt65xx.c | 23 +- + drivers/spi/spi-mtk-nor.c | 71 +- + drivers/spi/spi-npcm-fiu.c | 6 +- + drivers/spi/spi-pic32.c | 9 +- + drivers/spi/spi-pxa2xx-pci.c | 320 ++++---- + drivers/spi/spi-pxa2xx.c | 68 +- + drivers/spi/spi-rockchip.c | 122 ++- + drivers/spi/spi-s3c24xx.c | 47 +- + drivers/spi/spi-s3c64xx.c | 53 +- + drivers/spi/spi-st-ssc4.c | 31 +- + drivers/spi/spi-stm32.c | 2 +- + drivers/spi/spi-sunplus-sp7021.c | 584 ++++++++++++++ + drivers/spi/spi-tegra114.c | 4 + + drivers/spi/spi-tegra210-quad.c | 53 +- + drivers/spi/spi-topcliff-pch.c | 7 +- + drivers/spi/spi-zynqmp-gqspi.c | 5 +- + drivers/spi/spi.c | 139 +--- + drivers/spi/spidev.c | 31 +- + include/linux/mfd/lpc_ich.h | 2 +- + include/linux/platform_data/spi-s3c64xx.h | 14 +- + .../platform_data/x86/{intel-spi.h => spi-intel.h} | 12 +- + include/linux/spi/pxa2xx_spi.h | 1 - + include/linux/spi/s3c24xx.h | 5 - + include/linux/spi/spi.h | 19 +- + 71 files changed, 2487 insertions(+), 1289 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/mediatek,spi-mt65xx.yaml + create mode 100644 Documentation/devicetree/bindings/spi/mediatek,spi-slave-mt27xx.yaml + create mode 100644 Documentation/devicetree/bindings/spi/microchip,mpfs-spi.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-mt65xx.txt + delete mode 100644 Documentation/devicetree/bindings/spi/spi-slave-mt27xx.txt + create mode 100644 Documentation/devicetree/bindings/spi/spi-sunplus-sp7021.yaml + rename Documentation/driver-api/mtd/{intel-spi.rst => spi-intel.rst} (94%) + delete mode 100644 drivers/mtd/spi-nor/controllers/intel-spi.h + rename drivers/{mtd/spi-nor/controllers/intel-spi-pci.c => spi/spi-intel-pci.c} (84%) + rename drivers/{mtd/spi-nor/controllers/intel-spi-platform.c => spi/spi-intel-platform.c} (65%) + rename drivers/{mtd/spi-nor/controllers/intel-spi.c => spi/spi-intel.c} (55%) + create mode 100644 drivers/spi/spi-intel.h + create mode 100644 drivers/spi/spi-sunplus-sp7021.c + rename include/linux/platform_data/x86/{intel-spi.h => spi-intel.h} (64%) +Merging tip/auto-latest (a66320f04160 Merge branch into tip/master: 'core/core') +$ git merge -m Merge branch 'auto-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/auto-latest +Auto-merging MAINTAINERS +Auto-merging arch/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/kernel/entry-common.c +Auto-merging arch/ia64/include/asm/thread_info.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/include/asm/cpufeatures.h +Auto-merging arch/x86/include/asm/msr-index.h +Auto-merging arch/x86/include/asm/pci_x86.h +Auto-merging drivers/iommu/intel/iommu.c +Auto-merging drivers/mfd/ezx-pcap.c +Auto-merging init/Kconfig +Auto-merging kernel/events/core.c +Auto-merging kernel/exit.c +Auto-merging kernel/kthread.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/cpufreq_schedutil.c +Auto-merging kernel/trace/trace_events.c +Auto-merging kernel/workqueue.c +Merge made by the 'ort' strategy. + Documentation/ABI/removed/sysfs-mce | 37 + + Documentation/ABI/stable/sysfs-devices-system-cpu | 4 + + Documentation/ABI/testing/sysfs-devices-system-cpu | 6 + + Documentation/ABI/testing/sysfs-mce | 32 - + Documentation/admin-guide/sysctl/kernel.rst | 46 +- + Documentation/scheduler/index.rst | 1 + + Documentation/scheduler/sched-debug.rst | 54 + + Documentation/vm/hwpoison.rst | 2 - + Documentation/x86/sva.rst | 53 +- + Documentation/x86/x86_64/boot-options.rst | 9 +- + MAINTAINERS | 2 + + arch/Kconfig | 37 +- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/preempt.h | 19 +- + arch/arm64/kernel/entry-common.c | 28 +- + arch/ia64/include/asm/thread_info.h | 6 +- + arch/x86/Kbuild | 2 + + arch/x86/Kconfig | 4 +- + arch/x86/coco/Makefile | 6 + + arch/x86/{kernel/cc_platform.c => coco/core.c} | 56 +- + arch/x86/events/intel/core.c | 40 +- + arch/x86/events/intel/ds.c | 14 +- + arch/x86/events/intel/lbr.c | 4 +- + arch/x86/events/intel/pt.c | 71 +- + arch/x86/events/intel/uncore_discovery.c | 16 +- + arch/x86/events/intel/uncore_discovery.h | 2 - + arch/x86/include/asm/coco.h | 32 + + arch/x86/include/asm/cpufeatures.h | 6 +- + arch/x86/include/asm/cpumask.h | 10 + + arch/x86/include/asm/disabled-features.h | 7 +- + arch/x86/include/asm/insn.h | 2 +- + arch/x86/include/asm/intel_ds.h | 5 +- + arch/x86/include/asm/intel_pt.h | 2 + + arch/x86/include/asm/kvm_host.h | 3 +- + arch/x86/include/asm/msr-index.h | 2 + + arch/x86/include/asm/page.h | 10 + + arch/x86/include/asm/paravirt_types.h | 4 +- + arch/x86/include/asm/pci_x86.h | 8 + + arch/x86/include/asm/perf_event.h | 2 +- + arch/x86/include/asm/pgtable.h | 13 +- + arch/x86/include/asm/preempt.h | 10 +- + arch/x86/include/asm/processor.h | 2 + + arch/x86/include/asm/ptrace.h | 2 +- + arch/x86/include/asm/set_memory.h | 2 - + arch/x86/include/asm/topology.h | 1 + + arch/x86/include/asm/x86_init.h | 16 + + arch/x86/kernel/Makefile | 5 - + arch/x86/kernel/cpu/amd.c | 35 +- + arch/x86/kernel/cpu/aperfmperf.c | 6 +- + arch/x86/kernel/cpu/common.c | 79 ++ + arch/x86/kernel/cpu/mce/amd.c | 7 +- + arch/x86/kernel/cpu/mce/core.c | 182 +-- + arch/x86/kernel/cpu/mce/intel.c | 42 - + arch/x86/kernel/cpu/mce/internal.h | 31 +- + arch/x86/kernel/cpu/mce/severity.c | 23 +- + arch/x86/kernel/cpu/mshyperv.c | 6 + + arch/x86/kernel/cpu/scattered.c | 1 + + arch/x86/kernel/fpu/core.c | 7 + + arch/x86/kernel/head64.c | 2 +- + arch/x86/kernel/process.c | 5 +- + arch/x86/kernel/traps.c | 55 + + arch/x86/kernel/x86_init.c | 16 +- + arch/x86/kvm/cpuid.c | 3 +- + arch/x86/kvm/emulate.c | 4 +- + arch/x86/kvm/pmu.h | 2 - + arch/x86/kvm/vmx/pmu_intel.c | 4 +- + arch/x86/kvm/x86.c | 6 +- + arch/x86/kvm/x86.h | 7 +- + arch/x86/lib/x86-opcode-map.txt | 111 +- + arch/x86/mm/maccess.c | 7 +- + arch/x86/mm/mem_encrypt_amd.c | 72 +- + arch/x86/mm/mem_encrypt_identity.c | 12 +- + arch/x86/mm/pat/set_memory.c | 31 +- + arch/x86/pci/irq.c | 372 ++++- + drivers/base/cpu.c | 2 +- + drivers/base/topology.c | 20 +- + drivers/iommu/Kconfig | 6 +- + drivers/iommu/Makefile | 2 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 5 +- + drivers/iommu/intel/Kconfig | 2 +- + drivers/iommu/intel/iommu.c | 4 +- + drivers/iommu/intel/svm.c | 9 - + drivers/iommu/ioasid.c | 39 +- + drivers/iommu/iommu-sva-lib.c | 39 +- + drivers/iommu/iommu-sva-lib.h | 7 +- + drivers/mfd/ezx-pcap.c | 4 +- + drivers/misc/hi6421v600-irq.c | 6 +- + drivers/net/usb/lan78xx.c | 7 +- + drivers/pci/pci-driver.c | 21 +- + drivers/staging/greybus/gpio.c | 5 +- + include/asm-generic/bitops/instrumented-atomic.h | 12 +- + .../asm-generic/bitops/instrumented-non-atomic.h | 16 +- + include/linux/atomic/atomic-arch-fallback.h | 38 +- + include/linux/cgroup.h | 4 - + include/linux/cpumask.h | 18 +- + include/linux/entry-common.h | 15 +- + include/linux/ioasid.h | 21 +- + include/linux/jump_label.h | 13 +- + include/linux/kernel.h | 7 +- + include/linux/local_lock_internal.h | 6 +- + include/linux/mm_types.h | 2 +- + include/linux/psi_types.h | 3 + + include/linux/sched.h | 32 +- + include/linux/sched/isolation.h | 43 +- + include/linux/sched/mm.h | 26 + + include/linux/sched/sysctl.h | 4 - + include/linux/sched/task_stack.h | 2 + + include/linux/sched/topology.h | 1 + + include/linux/topology.h | 3 + + include/trace/events/sched.h | 11 +- + include/uapi/linux/perf_event.h | 2 + + include/uapi/linux/rseq.h | 20 +- + init/Kconfig | 1 + + kernel/Kconfig.preempt | 3 +- + kernel/cgroup/cpuset.c | 6 +- + kernel/cpu.c | 4 +- + kernel/entry/common.c | 23 +- + kernel/events/core.c | 5 +- + kernel/exit.c | 1 + + kernel/fork.c | 278 ++-- + kernel/irq/cpuhotplug.c | 4 +- + kernel/irq/irqdesc.c | 4 +- + kernel/irq/manage.c | 4 +- + kernel/kthread.c | 4 +- + kernel/locking/lockdep.c | 43 +- + kernel/locking/lockdep_internals.h | 6 +- + kernel/locking/lockdep_proc.c | 51 +- + kernel/locking/percpu-rwsem.c | 5 +- + kernel/locking/rwsem.c | 2 +- + kernel/rcu/tasks.h | 2 +- + kernel/rcu/tree_plugin.h | 6 +- + kernel/rseq.c | 8 +- + kernel/sched/autogroup.c | 23 + + kernel/sched/autogroup.h | 1 + + kernel/sched/core.c | 371 +++-- + kernel/sched/cpuacct.c | 9 +- + kernel/sched/cpufreq_schedutil.c | 11 +- + kernel/sched/deadline.c | 12 +- + kernel/sched/debug.c | 10 - + kernel/sched/fair.c | 82 +- + kernel/sched/isolation.c | 162 ++- + kernel/sched/psi.c | 46 +- + kernel/sched/rt.c | 32 +- + kernel/sched/sched.h | 187 +-- + kernel/sched/topology.c | 269 ++-- + kernel/softirq.c | 10 +- + kernel/sysctl.c | 11 - + kernel/trace/fgraph.c | 4 +- + kernel/trace/ftrace.c | 4 +- + kernel/trace/trace_events.c | 8 +- + kernel/trace/trace_osnoise.c | 4 +- + kernel/trace/trace_sched_switch.c | 1 + + kernel/trace/trace_sched_wakeup.c | 1 + + kernel/watchdog.c | 2 +- + kernel/workqueue.c | 4 +- + mm/init-mm.c | 4 + + net/core/net-sysfs.c | 6 +- + scripts/atomic/fallbacks/read_acquire | 11 +- + scripts/atomic/fallbacks/set_release | 7 +- + tools/arch/x86/include/asm/insn.h | 2 +- + tools/arch/x86/lib/x86-opcode-map.txt | 111 +- + tools/include/uapi/linux/perf_event.h | 2 + + tools/objtool/arch/x86/decode.c | 11 +- + tools/perf/arch/x86/tests/insn-x86-dat-32.c | 918 +++++++++++++ + tools/perf/arch/x86/tests/insn-x86-dat-64.c | 1426 ++++++++++++++++++++ + tools/perf/arch/x86/tests/insn-x86-dat-src.c | 1189 ++++++++++++++++ + tools/perf/util/branch.c | 4 +- + tools/testing/selftests/rseq/Makefile | 2 +- + .../testing/selftests/rseq/basic_percpu_ops_test.c | 2 +- + tools/testing/selftests/rseq/compiler.h | 30 + + tools/testing/selftests/rseq/param_test.c | 8 +- + tools/testing/selftests/rseq/rseq-abi.h | 151 +++ + tools/testing/selftests/rseq/rseq-arm.h | 110 +- + tools/testing/selftests/rseq/rseq-arm64.h | 79 +- + .../selftests/rseq/rseq-generic-thread-pointer.h | 25 + + tools/testing/selftests/rseq/rseq-mips.h | 71 +- + .../selftests/rseq/rseq-ppc-thread-pointer.h | 30 + + tools/testing/selftests/rseq/rseq-ppc.h | 128 +- + tools/testing/selftests/rseq/rseq-s390.h | 55 +- + tools/testing/selftests/rseq/rseq-skip.h | 2 +- + tools/testing/selftests/rseq/rseq-thread-pointer.h | 19 + + .../selftests/rseq/rseq-x86-thread-pointer.h | 40 + + tools/testing/selftests/rseq/rseq-x86.h | 200 ++- + tools/testing/selftests/rseq/rseq.c | 164 ++- + tools/testing/selftests/rseq/rseq.h | 30 +- + tools/testing/selftests/sgx/Makefile | 2 +- + tools/testing/selftests/sgx/load.c | 9 +- + tools/testing/selftests/sgx/main.c | 9 +- + tools/testing/selftests/x86/check_cc.sh | 2 +- + 189 files changed, 7113 insertions(+), 1771 deletions(-) + create mode 100644 Documentation/ABI/removed/sysfs-mce + create mode 100644 Documentation/scheduler/sched-debug.rst + create mode 100644 arch/x86/coco/Makefile + rename arch/x86/{kernel/cc_platform.c => coco/core.c} (73%) + create mode 100644 arch/x86/include/asm/coco.h + create mode 100644 tools/testing/selftests/rseq/compiler.h + create mode 100644 tools/testing/selftests/rseq/rseq-abi.h + create mode 100644 tools/testing/selftests/rseq/rseq-generic-thread-pointer.h + create mode 100644 tools/testing/selftests/rseq/rseq-ppc-thread-pointer.h + create mode 100644 tools/testing/selftests/rseq/rseq-thread-pointer.h + create mode 100644 tools/testing/selftests/rseq/rseq-x86-thread-pointer.h +Merging clockevents/timers/drivers/next (b22a1c270f53 clocksource/drivers/exynos_mct: Increase the size of name array) +$ 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/boot/dts/dra7.dtsi +Auto-merging drivers/clocksource/timer-ti-dm-systimer.c +Merge made by the 'ort' strategy. + arch/arm/boot/dts/dra7-l4.dtsi | 5 ++-- + arch/arm/boot/dts/dra7.dtsi | 8 +++--- + drivers/clocksource/exynos_mct.c | 39 ++++++++++++++++-------------- + drivers/clocksource/timer-imx-sysctr.c | 2 +- + drivers/clocksource/timer-imx-tpm.c | 12 ++++----- + drivers/clocksource/timer-ti-dm-systimer.c | 4 +-- + 6 files changed, 36 insertions(+), 34 deletions(-) +Merging edac/edac-for-next (9e32472d8b3f Merge branch 'edac-urgent' 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. + drivers/edac/edac_device_sysfs.c | 31 +++++++++++++++++-------------- + drivers/edac/edac_mc.c | 4 ++-- + drivers/edac/edac_pci_sysfs.c | 26 ++++++++++++++------------ + 3 files changed, 33 insertions(+), 28 deletions(-) +Merging irqchip/irq/irqchip-next (1a68edc0dc1f Merge branch irq/plic-cleanups into irq/irqchip-next) +$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next +Auto-merging drivers/irqchip/irq-nvic.c +Auto-merging drivers/irqchip/irq-sifive-plic.c +Auto-merging drivers/pinctrl/pinctrl-starfive.c +CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-starfive.c +Resolved 'drivers/pinctrl/pinctrl-starfive.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7df328d58a3b] Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git +$ git diff -M --stat --summary HEAD^.. + .../interrupt-controller/st,stm32-exti.yaml | 1 + + drivers/gpio/gpio-mt7621.c | 1 - + drivers/gpio/gpio-omap.c | 7 +- + drivers/gpio/gpio-rcar.c | 2 +- + drivers/gpio/gpio-tqmx86.c | 3 +- + drivers/irqchip/irq-ftintc010.c | 1 - + drivers/irqchip/irq-gic-v3.c | 2 +- + drivers/irqchip/irq-gic.c | 104 ++++++++-------- + drivers/irqchip/irq-imx-intmux.c | 8 +- + drivers/irqchip/irq-lpc32xx.c | 34 +++-- + drivers/irqchip/irq-mvebu-pic.c | 28 +++-- + drivers/irqchip/irq-nvic.c | 2 + + drivers/irqchip/irq-renesas-intc-irqpin.c | 3 +- + drivers/irqchip/irq-renesas-irqc.c | 3 +- + drivers/irqchip/irq-sifive-plic.c | 38 ++++-- + drivers/irqchip/irq-stm32-exti.c | 50 ++++++++ + drivers/irqchip/irq-ts4800.c | 25 ++-- + drivers/irqchip/irq-versatile-fpga.c | 46 ++++--- + drivers/irqchip/qcom-pdc.c | 137 +++++---------------- + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 25 ++-- + drivers/pinctrl/pinctrl-starfive.c | 4 +- + include/linux/irq.h | 9 +- + include/linux/irqchip/versatile-fpga.h | 14 --- + include/linux/irqdomain.h | 15 ++- + kernel/irq/chip.c | 29 +++-- + kernel/irq/debugfs.c | 8 +- + kernel/irq/irqdomain.c | 9 +- + 27 files changed, 320 insertions(+), 288 deletions(-) + delete mode 100644 include/linux/irqchip/versatile-fpga.h +Merging ftrace/for-next (864ea0e10cc9 user_events: Add documentation file) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/for-next +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/trace.h +Auto-merging kernel/trace/trace_sched_switch.c +Merge made by the 'ort' strategy. + Documentation/trace/index.rst | 1 + + Documentation/trace/user_events.rst | 216 +++ + include/uapi/linux/user_events.h | 116 ++ + kernel/trace/Kconfig | 14 + + kernel/trace/Makefile | 1 + + kernel/trace/trace.c | 55 +- + kernel/trace/trace.h | 2 +- + kernel/trace/trace_events_hist.c | 30 +- + kernel/trace/trace_events_synth.c | 17 +- + kernel/trace/trace_events_user.c | 1617 +++++++++++++++++++++ + kernel/trace/trace_sched_switch.c | 2 +- + samples/user_events/Makefile | 5 + + samples/user_events/example.c | 91 ++ + tools/testing/selftests/user_events/Makefile | 9 + + tools/testing/selftests/user_events/dyn_test.c | 130 ++ + tools/testing/selftests/user_events/ftrace_test.c | 452 ++++++ + tools/testing/selftests/user_events/perf_test.c | 168 +++ + tools/testing/selftests/user_events/settings | 1 + + 18 files changed, 2902 insertions(+), 25 deletions(-) + create mode 100644 Documentation/trace/user_events.rst + create mode 100644 include/uapi/linux/user_events.h + create mode 100644 kernel/trace/trace_events_user.c + create mode 100644 samples/user_events/Makefile + create mode 100644 samples/user_events/example.c + create mode 100644 tools/testing/selftests/user_events/Makefile + create mode 100644 tools/testing/selftests/user_events/dyn_test.c + create mode 100644 tools/testing/selftests/user_events/ftrace_test.c + create mode 100644 tools/testing/selftests/user_events/perf_test.c + create mode 100644 tools/testing/selftests/user_events/settings +Merging rcu/rcu/next (1498a74770d7 torture: Enable CSD-lock stall reports for scftorture) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging kernel/rcu/tasks.h +Auto-merging kernel/rcu/tree_plugin.h +CONFLICT (content): Merge conflict in kernel/rcu/tree_plugin.h +Resolved 'kernel/rcu/tree_plugin.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 72ba20b3d877] Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git +$ git diff -M --stat --summary HEAD^.. + .../RCU/Design/Requirements/Requirements.rst | 32 + + Documentation/RCU/stallwarn.rst | 18 + + Documentation/admin-guide/kernel-parameters.txt | 83 +- + .../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 + + MAINTAINERS | 2 + + include/linux/interrupt.h | 11 +- + include/linux/rcupdate.h | 4 +- + include/linux/rcutiny.h | 23 +- + include/linux/rcutree.h | 8 +- + include/linux/rcuwait.h | 6 +- + include/linux/srcutree.h | 28 +- + include/trace/events/rcu.h | 9 +- + kernel/rcu/Kconfig.debug | 13 + + kernel/rcu/rcu.h | 15 +- + kernel/rcu/rcu_segcblist.c | 8 +- + kernel/rcu/rcu_segcblist.h | 4 +- + kernel/rcu/rcutorture.c | 132 +- + kernel/rcu/srcutree.c | 583 +++-- + kernel/rcu/tasks.h | 54 +- + kernel/rcu/tree.c | 404 ++-- + kernel/rcu/tree.h | 29 +- + kernel/rcu/tree_exp.h | 160 +- + kernel/rcu/tree_nocb.h | 57 +- + kernel/rcu/tree_plugin.h | 48 +- + kernel/rcu/tree_stall.h | 61 + + kernel/rcu/update.c | 9 + + kernel/scftorture.c | 5 +- + kernel/smp.c | 7 +- + kernel/time/Kconfig | 9 + + kernel/time/clocksource.c | 8 +- + kernel/time/tick-sched.c | 77 +- + kernel/time/tick-sched.h | 4 + + kernel/torture.c | 6 +- + tools/include/nolibc/arch-aarch64.h | 200 ++ + tools/include/nolibc/arch-arm.h | 205 ++ + tools/include/nolibc/arch-i386.h | 197 ++ + tools/include/nolibc/arch-mips.h | 216 ++ + tools/include/nolibc/arch-riscv.h | 205 ++ + tools/include/nolibc/arch-x86_64.h | 216 ++ + tools/include/nolibc/arch.h | 32 + + tools/include/nolibc/ctype.h | 99 + + tools/include/nolibc/errno.h | 27 + + tools/include/nolibc/nolibc.h | 2540 +------------------- + tools/include/nolibc/signal.h | 22 + + tools/include/nolibc/std.h | 49 + + tools/include/nolibc/stdio.h | 296 +++ + tools/include/nolibc/stdlib.h | 311 +++ + tools/include/nolibc/string.h | 212 ++ + tools/include/nolibc/sys.h | 1168 +++++++++ + tools/include/nolibc/time.h | 28 + + tools/include/nolibc/types.h | 184 ++ + tools/include/nolibc/unistd.h | 54 + + tools/memory-model/Documentation/explanation.txt | 51 + + tools/memory-model/Documentation/locking.txt | 320 +++ + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 + + tools/memory-model/scripts/cmplitmushist.sh | 49 +- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 +- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 + + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 + + .../selftests/rcutorture/bin/console-badness.sh | 2 +- + .../testing/selftests/rcutorture/bin/functions.sh | 2 +- + .../testing/selftests/rcutorture/bin/kvm-again.sh | 4 +- + .../selftests/rcutorture/bin/kvm-check-branches.sh | 4 +- + .../selftests/rcutorture/bin/kvm-end-run-stats.sh | 4 +- + .../selftests/rcutorture/bin/kvm-find-errors.sh | 6 + + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 7 +- + .../testing/selftests/rcutorture/bin/kvm-remote.sh | 39 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 20 +- + .../selftests/rcutorture/bin/parse-console.sh | 10 + + tools/testing/selftests/rcutorture/bin/torture.sh | 58 +- + .../selftests/rcutorture/configs/rcu/RUDE01 | 2 +- + .../selftests/rcutorture/configs/rcu/SRCU-N.boot | 1 + + .../selftests/rcutorture/configs/rcu/SRCU-P.boot | 2 + + .../selftests/rcutorture/configs/rcu/TRACE01 | 2 +- + 89 files changed, 6260 insertions(+), 3137 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/include/nolibc/arch-aarch64.h + create mode 100644 tools/include/nolibc/arch-arm.h + create mode 100644 tools/include/nolibc/arch-i386.h + create mode 100644 tools/include/nolibc/arch-mips.h + create mode 100644 tools/include/nolibc/arch-riscv.h + create mode 100644 tools/include/nolibc/arch-x86_64.h + create mode 100644 tools/include/nolibc/arch.h + create mode 100644 tools/include/nolibc/ctype.h + create mode 100644 tools/include/nolibc/errno.h + create mode 100644 tools/include/nolibc/signal.h + create mode 100644 tools/include/nolibc/std.h + create mode 100644 tools/include/nolibc/stdio.h + create mode 100644 tools/include/nolibc/stdlib.h + create mode 100644 tools/include/nolibc/string.h + create mode 100644 tools/include/nolibc/sys.h + create mode 100644 tools/include/nolibc/time.h + create mode 100644 tools/include/nolibc/types.h + create mode 100644 tools/include/nolibc/unistd.h + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh +Merging kvm/next (4dfc4ec2b7f5 Merge branch 'kvm-ppc-cap-210' into kvm-next-5.18) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging MAINTAINERS +Auto-merging arch/s390/include/asm/page.h +Auto-merging arch/s390/include/asm/uaccess.h +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/kvm/emulate.c +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/vmx/nested.c +Auto-merging arch/x86/kvm/vmx/pmu_intel.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/x86.c +CONFLICT (content): Merge conflict in arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/x86.h +Auto-merging virt/kvm/kvm_main.c +Resolved 'arch/x86/kvm/x86.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 252ddff77944] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 30 +- + Documentation/virt/kvm/api.rst | 112 ++++- + MAINTAINERS | 2 +- + arch/s390/include/asm/ctl_reg.h | 2 + + arch/s390/include/asm/page.h | 2 + + arch/s390/include/asm/uaccess.h | 22 + + arch/s390/kvm/gaccess.c | 250 ++++++++++- + arch/s390/kvm/gaccess.h | 84 +++- + arch/s390/kvm/intercept.c | 12 +- + arch/s390/kvm/kvm-s390.c | 132 +++++- + arch/s390/kvm/priv.c | 66 +-- + arch/s390/lib/uaccess.c | 81 +++- + arch/x86/include/asm/kvm-x86-ops.h | 119 ++--- + arch/x86/include/asm/kvm_host.h | 54 ++- + arch/x86/kvm/Kconfig | 7 - + arch/x86/kvm/cpuid.c | 10 +- + arch/x86/kvm/emulate.c | 20 +- + arch/x86/kvm/hyperv.c | 185 ++++---- + arch/x86/kvm/hyperv.h | 6 +- + arch/x86/kvm/i8259.c | 8 +- + arch/x86/kvm/ioapic.c | 6 +- + arch/x86/kvm/kvm_onhyperv.c | 14 + + arch/x86/kvm/kvm_onhyperv.h | 14 +- + arch/x86/kvm/lapic.c | 29 +- + arch/x86/kvm/mmu.h | 38 -- + arch/x86/kvm/mmu/mmu.c | 134 +++--- + arch/x86/kvm/mmu/mmu_audit.c | 303 ------------- + arch/x86/kvm/mmu/mmutrace.h | 23 + + arch/x86/kvm/mmu/paging_tmpl.h | 2 - + arch/x86/kvm/mmu/spte.c | 72 ++- + arch/x86/kvm/mmu/spte.h | 129 ++++-- + arch/x86/kvm/mmu/tdp_iter.c | 8 +- + arch/x86/kvm/mmu/tdp_iter.h | 10 +- + arch/x86/kvm/mmu/tdp_mmu.c | 487 +++++++++++++++------ + arch/x86/kvm/mmu/tdp_mmu.h | 11 +- + arch/x86/kvm/svm/avic.c | 41 +- + arch/x86/kvm/svm/hyperv.h | 35 ++ + arch/x86/kvm/svm/nested.c | 45 +- + arch/x86/kvm/svm/sev.c | 85 ++-- + arch/x86/kvm/svm/svm.c | 134 +++--- + arch/x86/kvm/svm/svm.h | 54 ++- + arch/x86/kvm/svm/svm_onhyperv.h | 25 +- + arch/x86/kvm/trace.h | 14 +- + arch/x86/kvm/vmx/nested.c | 5 +- + arch/x86/kvm/vmx/nested.h | 3 +- + arch/x86/kvm/vmx/pmu_intel.c | 3 +- + arch/x86/kvm/vmx/posted_intr.c | 6 +- + arch/x86/kvm/vmx/posted_intr.h | 4 +- + arch/x86/kvm/vmx/vmx.c | 92 ++-- + arch/x86/kvm/x86.c | 131 +++--- + arch/x86/kvm/x86.h | 2 + + arch/x86/kvm/xen.c | 4 +- + include/asm-generic/hyperv-tlfs.h | 7 + + include/uapi/linux/kvm.h | 11 +- + kernel/static_call.c | 1 + + tools/testing/selftests/kvm/.gitignore | 1 + + tools/testing/selftests/kvm/Makefile | 2 + + tools/testing/selftests/kvm/dirty_log_perf_test.c | 13 +- + tools/testing/selftests/kvm/include/x86_64/evmcs.h | 150 ++++++- + tools/testing/selftests/kvm/include/x86_64/svm.h | 9 +- + .../selftests/kvm/include/x86_64/svm_util.h | 6 + + tools/testing/selftests/kvm/lib/x86_64/svm.c | 6 + + tools/testing/selftests/kvm/s390x/memop.c | 15 + + tools/testing/selftests/kvm/s390x/tprot.c | 227 ++++++++++ + tools/testing/selftests/kvm/x86_64/evmcs_test.c | 64 ++- + tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c | 29 +- + .../testing/selftests/kvm/x86_64/hyperv_svm_test.c | 175 ++++++++ + .../selftests/kvm/x86_64/sev_migrate_tests.c | 125 ++++-- + virt/kvm/kvm_main.c | 9 +- + 69 files changed, 2681 insertions(+), 1336 deletions(-) + delete mode 100644 arch/x86/kvm/mmu/mmu_audit.c + create mode 100644 arch/x86/kvm/svm/hyperv.h + create mode 100644 tools/testing/selftests/kvm/s390x/tprot.c + create mode 100644 tools/testing/selftests/kvm/x86_64/hyperv_svm_test.c +Merging kvm-arm/next (0054348a2011 Merge branch kvm-arm64/misc-5.18 into kvmarm-master/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/include/asm/sysreg.h +Auto-merging arch/arm64/kvm/arm.c +Auto-merging arch/arm64/kvm/hyp/include/hyp/switch.h +Auto-merging arch/arm64/kvm/psci.c +Auto-merging arch/arm64/kvm/sys_regs.c +Auto-merging tools/testing/selftests/kvm/aarch64/vgic_irq.c +Auto-merging tools/testing/selftests/kvm/dirty_log_perf_test.c +Auto-merging tools/testing/selftests/kvm/lib/aarch64/vgic.c +Merge made by the 'ort' strategy. + Documentation/virt/kvm/api.rst | 5 + + Documentation/virt/kvm/devices/vcpu.rst | 34 +++- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/kvm_host.h | 32 +++- + arch/arm64/include/asm/kvm_mmu.h | 4 +- + arch/arm64/include/asm/sysreg.h | 8 + + arch/arm64/include/uapi/asm/kvm.h | 11 ++ + arch/arm64/kernel/fpsimd.c | 8 +- + arch/arm64/kernel/image-vars.h | 3 + + arch/arm64/kvm/Makefile | 2 +- + arch/arm64/kvm/arm.c | 127 ++++--------- + arch/arm64/kvm/debug.c | 26 ++- + arch/arm64/kvm/fpsimd.c | 14 +- + arch/arm64/kvm/hyp/include/hyp/switch.h | 4 + + arch/arm64/kvm/hyp/nvhe/Makefile | 3 +- + arch/arm64/kvm/hyp/nvhe/list_debug.c | 54 ++++++ + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 3 +- + arch/arm64/kvm/hyp/nvhe/stub.c | 22 --- + arch/arm64/kvm/mmu.c | 50 ++++-- + arch/arm64/kvm/pmu-emul.c | 141 +++++++++++---- + arch/arm64/kvm/psci.c | 66 +++++-- + arch/arm64/kvm/sys_regs.c | 74 ++++++-- + arch/arm64/kvm/vmid.c | 196 +++++++++++++++++++++ + include/kvm/arm_pmu.h | 5 + + include/kvm/arm_psci.h | 9 +- + include/linux/perf_event.h | 2 +- + include/uapi/linux/psci.h | 4 + + tools/arch/arm64/include/uapi/asm/kvm.h | 1 + + .../selftests/kvm/aarch64/debug-exceptions.c | 58 +++++- + tools/testing/selftests/kvm/aarch64/get-reg-list.c | 1 + + tools/testing/selftests/kvm/aarch64/vgic_irq.c | 45 +++-- + tools/testing/selftests/kvm/dirty_log_perf_test.c | 10 ++ + tools/testing/selftests/kvm/lib/aarch64/gic_v3.c | 12 +- + tools/testing/selftests/kvm/lib/aarch64/vgic.c | 9 +- + 34 files changed, 796 insertions(+), 248 deletions(-) + create mode 100644 arch/arm64/kvm/hyp/nvhe/list_debug.c + delete mode 100644 arch/arm64/kvm/hyp/nvhe/stub.c + create mode 100644 arch/arm64/kvm/vmid.c +Merging kvms390/next (ee6a569d3bf6 KVM: s390: pv: make use of ultravisor AIV support) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Auto-merging arch/s390/kvm/kvm-s390.c +Merge made by the 'ort' strategy. + arch/s390/include/asm/uv.h | 1 + + arch/s390/kvm/interrupt.c | 54 ++++++++++++++++++++++++++++++++++++++++------ + arch/s390/kvm/kvm-s390.c | 11 +++++++--- + arch/s390/kvm/kvm-s390.h | 11 ++++++++++ + 4 files changed, 68 insertions(+), 9 deletions(-) +Merging xen-tip/linux-next (f66edf684edc xen/pci: Make use of the helper macro LIST_HEAD()) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (4e1f82dce05b Merge branch 'for-5.16-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Merge made by the 'ort' strategy. +Merging workqueues/for-next (bc35f7ef9628 workqueue: Convert the type of pool->nr_running to int) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by the 'ort' strategy. + kernel/workqueue.c | 58 +++++++++++++++++++----------------------------------- + 1 file changed, 20 insertions(+), 38 deletions(-) +Merging drivers-x86/for-next (cb18448bbf1c platform/x86: x86-android-tablets: Lenovo Yoga Tablet 2 830/1050 sound support) +$ 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 Documentation/userspace-api/ioctl/ioctl-number.rst +Auto-merging Documentation/x86/index.rst +Auto-merging MAINTAINERS +Auto-merging drivers/platform/x86/amd-pmc.c +Auto-merging drivers/platform/x86/thinkpad_acpi.c +CONFLICT (content): Merge conflict in drivers/platform/x86/thinkpad_acpi.c +Resolved 'drivers/platform/x86/thinkpad_acpi.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 45ba6e5a1820] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-driver-intel_sdsi | 77 +++ + Documentation/ABI/testing/sysfs-platform-lg-laptop | 1 + + Documentation/admin-guide/laptops/lg-laptop.rst | 2 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 2 + + Documentation/x86/amd_hsmp.rst | 86 +++ + Documentation/x86/index.rst | 1 + + MAINTAINERS | 17 +- + arch/x86/include/asm/amd_hsmp.h | 16 + + arch/x86/include/uapi/asm/amd_hsmp.h | 203 +++++++ + drivers/pinctrl/intel/pinctrl-baytrail.c | 10 + + drivers/platform/surface/surface3-wmi.c | 17 +- + drivers/platform/surface/surface_acpi_notify.c | 3 +- + drivers/platform/x86/Kconfig | 14 + + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/amd-pmc.c | 144 ++++- + drivers/platform/x86/amd_hsmp.c | 425 ++++++++++++++ + drivers/platform/x86/dell/dcdbas.c | 2 +- + drivers/platform/x86/intel/Kconfig | 47 +- + drivers/platform/x86/intel/Makefile | 9 +- + .../intel_cht_int33fe_typec.c => chtwc_int33fe.c} | 65 ++- + drivers/platform/x86/intel/hid.c | 7 +- + drivers/platform/x86/intel/int33fe/Kconfig | 24 - + drivers/platform/x86/intel/int33fe/Makefile | 5 - + .../x86/intel/int33fe/intel_cht_int33fe_common.c | 118 ---- + .../x86/intel/int33fe/intel_cht_int33fe_common.h | 41 -- + .../x86/intel/int33fe/intel_cht_int33fe_microb.c | 61 -- + drivers/platform/x86/intel/int3472/discrete.c | 5 +- + drivers/platform/x86/intel/sdsi.c | 574 +++++++++++++++++++ + drivers/platform/x86/intel/uncore-frequency.c | 452 --------------- + .../platform/x86/intel/uncore-frequency/Kconfig | 21 + + .../platform/x86/intel/uncore-frequency/Makefile | 9 + + .../uncore-frequency/uncore-frequency-common.c | 252 ++++++++ + .../uncore-frequency/uncore-frequency-common.h | 62 ++ + .../x86/intel/uncore-frequency/uncore-frequency.c | 272 +++++++++ + drivers/platform/x86/intel/vbtn.c | 7 +- + drivers/platform/x86/intel/vsec.c | 12 +- + drivers/platform/x86/lg-laptop.c | 57 +- + drivers/platform/x86/thinkpad_acpi.c | 32 +- + drivers/platform/x86/x86-android-tablets.c | 632 +++++++++++++++++++-- + 39 files changed, 2955 insertions(+), 830 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-intel_sdsi + create mode 100644 Documentation/x86/amd_hsmp.rst + create mode 100644 arch/x86/include/asm/amd_hsmp.h + create mode 100644 arch/x86/include/uapi/asm/amd_hsmp.h + create mode 100644 drivers/platform/x86/amd_hsmp.c + rename drivers/platform/x86/intel/{int33fe/intel_cht_int33fe_typec.c => chtwc_int33fe.c} (85%) + delete mode 100644 drivers/platform/x86/intel/int33fe/Kconfig + delete mode 100644 drivers/platform/x86/intel/int33fe/Makefile + delete mode 100644 drivers/platform/x86/intel/int33fe/intel_cht_int33fe_common.c + delete mode 100644 drivers/platform/x86/intel/int33fe/intel_cht_int33fe_common.h + delete mode 100644 drivers/platform/x86/intel/int33fe/intel_cht_int33fe_microb.c + create mode 100644 drivers/platform/x86/intel/sdsi.c + delete mode 100644 drivers/platform/x86/intel/uncore-frequency.c + create mode 100644 drivers/platform/x86/intel/uncore-frequency/Kconfig + create mode 100644 drivers/platform/x86/intel/uncore-frequency/Makefile + create mode 100644 drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c + create mode 100644 drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.h + create mode 100644 drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c +Merging chrome-platform/for-next (b579f139e470 platform/chrome: cros_ec_typec: Update mux flags during partner removal) +$ 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. + MAINTAINERS | 5 ++ + drivers/platform/chrome/cros_ec_typec.c | 97 ++++++++++++++++----------------- + 2 files changed, 53 insertions(+), 49 deletions(-) +Merging hsi/for-next (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds/for-next (e26557a0aa68 leds: pca955x: Allow zero LEDs to be specified) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/leds/common.yaml | 9 ++- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + drivers/leds/flash/leds-sgm3140.c | 1 + + drivers/leds/leds-lm3692x.c | 5 +- + drivers/leds/leds-pca955x.c | 67 +++++++++++----------- + drivers/leds/simple/simatic-ipc-leds.c | 34 ++++++----- + 6 files changed, 65 insertions(+), 53 deletions(-) +Merging ipmi/for-next (f4676c8ec396 ipmi: kcs: aspeed: Remove old bindings support) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/ipmi/ipmi-ipmb.yaml | 8 +++ + MAINTAINERS | 1 + + drivers/char/ipmi/ipmi_ipmb.c | 60 ++++++++++++++++--- + drivers/char/ipmi/ipmi_ssif.c | 2 +- + drivers/char/ipmi/ipmi_watchdog.c | 2 +- + drivers/char/ipmi/kcs_bmc_aspeed.c | 67 +++------------------- + 6 files changed, 69 insertions(+), 71 deletions(-) +Merging driver-core/driver-core-next (4a248f85b3dd Merge 5.17-rc6 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 drivers/base/devtmpfs.c +Auto-merging drivers/gpu/drm/arm/display/komeda/komeda_drv.c +Auto-merging drivers/gpu/drm/armada/armada_drv.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_drv.c +Auto-merging drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +Auto-merging drivers/gpu/drm/ingenic/ingenic-drm-drv.c +Auto-merging drivers/gpu/drm/mcde/mcde_drv.c +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_drv.c +Auto-merging drivers/gpu/drm/meson/meson_drv.c +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_drv.c +Auto-merging drivers/gpu/drm/sprd/sprd_drm.c +Auto-merging drivers/gpu/drm/sti/sti_drv.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_drv.c +Auto-merging drivers/gpu/drm/vc4/vc4_drv.c +Auto-merging drivers/iommu/mtk_iommu.c +Auto-merging drivers/iommu/mtk_iommu_v1.c +Auto-merging drivers/power/supply/ab8500_chargalg.c +CONFLICT (content): Merge conflict in drivers/power/supply/ab8500_chargalg.c +Auto-merging drivers/power/supply/ab8500_charger.c +Auto-merging drivers/power/supply/ab8500_fg.c +Auto-merging sound/pci/hda/patch_realtek.c +Auto-merging sound/soc/codecs/wcd938x.c +Resolved 'drivers/power/supply/ab8500_chargalg.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 385604cff803] Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git +$ git diff -M --stat --summary HEAD^.. + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 4 +- + drivers/base/component.c | 300 ++++++++++++++---------- + drivers/base/dd.c | 4 +- + drivers/base/devtmpfs.c | 2 - + drivers/base/firmware_loader/Kconfig | 5 + + drivers/base/platform.c | 6 +- + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 7 +- + drivers/gpu/drm/armada/armada_drv.c | 17 +- + drivers/gpu/drm/drm_of.c | 7 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 16 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 8 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 7 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 7 +- + drivers/gpu/drm/mcde/mcde_drv.c | 7 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 7 +- + drivers/gpu/drm/meson/meson_drv.c | 10 +- + drivers/gpu/drm/msm/msm_drv.c | 15 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 8 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 7 +- + drivers/gpu/drm/sprd/sprd_drm.c | 7 +- + drivers/gpu/drm/sti/sti_drv.c | 7 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 11 +- + drivers/gpu/drm/vc4/vc4_drv.c | 7 +- + drivers/iommu/mtk_iommu.c | 4 +- + drivers/iommu/mtk_iommu.h | 10 - + drivers/iommu/mtk_iommu_v1.c | 4 +- + drivers/md/bcache/stats.c | 3 +- + drivers/md/bcache/sysfs.c | 15 +- + drivers/md/bcache/sysfs.h | 2 +- + drivers/power/supply/ab8500_charger.c | 8 +- + drivers/power/supply/ab8500_fg.c | 3 +- + drivers/video/fbdev/omap2/omapfb/dss/dss.c | 8 +- + fs/debugfs/inode.c | 10 + + fs/kernfs/dir.c | 9 + + fs/kernfs/kernfs-internal.h | 19 +- + fs/sysfs/mount.c | 2 +- + fs/ubifs/sysfs.c | 3 +- + include/linux/component.h | 24 +- + include/linux/firmware.h | 2 +- + include/linux/kernfs.h | 4 + + kernel/cgroup/cgroup.c | 4 +- + scripts/get_abi.pl | 1 + + scripts/spdxcheck.py | 2 +- + sound/pci/hda/patch_realtek.c | 11 +- + sound/soc/codecs/wcd938x.c | 18 +- + 45 files changed, 303 insertions(+), 339 deletions(-) +Merging usb/usb-next (ca9400ef7f67 Merge 5.17-rc6 into usb-next) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm64/boot/dts/intel/socfpga_agilex.dtsi +Auto-merging arch/arm64/boot/dts/qcom/ipq6018.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/ipq6018.dtsi +Auto-merging arch/arm64/boot/dts/qcom/sc7280-idp.dts +Auto-merging arch/arm64/boot/dts/qcom/sc7280.dtsi +Auto-merging arch/arm64/boot/dts/xilinx/zynqmp.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/xilinx/zynqmp.dtsi +Resolved 'arch/arm64/boot/dts/qcom/ipq6018.dtsi' using previous resolution. +Resolved 'arch/arm64/boot/dts/xilinx/zynqmp.dtsi' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 85dc8ebc3227] Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/configfs-usb-gadget-uac1 | 5 +- + Documentation/ABI/testing/configfs-usb-gadget-uac2 | 7 +- + Documentation/ABI/testing/sysfs-driver-eud | 9 + + .../devicetree/bindings/soc/qcom/qcom,eud.yaml | 77 ++ + .../devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 6 +- + .../bindings/usb/microchip,mpfs-musb.yaml | 59 ++ + .../devicetree/bindings/usb/qcom,dwc3.yaml | 1 + + .../devicetree/bindings/usb/richtek,rt1719.yaml | 85 ++ + .../devicetree/bindings/usb/snps,dwc3.yaml | 13 +- + .../devicetree/bindings/usb/willsemi,wusb3801.yaml | 75 ++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/usb/gadget-testing.rst | 12 +- + MAINTAINERS | 8 + + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 3 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dts | 4 + + arch/arm64/boot/dts/qcom/sc7280.dtsi | 36 + + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 4 +- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 4 +- + drivers/usb/cdns3/cdnsp-debug.h | 305 +++---- + drivers/usb/cdns3/cdnsp-gadget.c | 3 - + drivers/usb/chipidea/udc.c | 2 +- + drivers/usb/common/ulpi.c | 71 +- + drivers/usb/core/devio.c | 32 +- + drivers/usb/core/hcd-pci.c | 2 +- + drivers/usb/core/hub.c | 21 +- + drivers/usb/core/usb-acpi.c | 2 +- + drivers/usb/core/usb.c | 8 + + drivers/usb/dwc2/params.c | 10 + + drivers/usb/dwc3/core.c | 117 ++- + drivers/usb/dwc3/core.h | 13 +- + drivers/usb/dwc3/drd.c | 13 + + drivers/usb/dwc3/dwc3-pci.c | 42 +- + drivers/usb/gadget/function/f_fs.c | 4 +- + drivers/usb/gadget/function/f_mass_storage.c | 70 +- + drivers/usb/gadget/function/f_phonet.c | 4 +- + drivers/usb/gadget/function/f_serial.c | 4 + + drivers/usb/gadget/function/f_uac1.c | 236 ++++- + drivers/usb/gadget/function/f_uac2.c | 476 +++++++--- + drivers/usb/gadget/function/u_audio.c | 238 ++++- + drivers/usb/gadget/function/u_audio.h | 14 +- + drivers/usb/gadget/function/u_uac1.h | 7 +- + drivers/usb/gadget/function/u_uac2.h | 11 +- + drivers/usb/gadget/function/uac_common.h | 9 + + drivers/usb/gadget/legacy/audio.c | 93 +- + drivers/usb/gadget/udc/tegra-xudc.c | 20 +- + drivers/usb/host/ehci-dbg.c | 4 +- + drivers/usb/host/ehci-pci.c | 9 + + drivers/usb/host/ehci-platform.c | 3 +- + drivers/usb/host/ehci-q.c | 7 +- + drivers/usb/host/ehci-sched.c | 4 +- + drivers/usb/host/fotg210-hcd.c | 4 +- + drivers/usb/host/ohci-dbg.c | 4 +- + drivers/usb/host/xhci-dbgcap.c | 145 ++-- + drivers/usb/host/xhci-dbgcap.h | 26 +- + drivers/usb/host/xhci-dbgtty.c | 86 +- + drivers/usb/host/xhci-mem.c | 12 +- + drivers/usb/host/xhci-mtk-sch.c | 7 +- + drivers/usb/host/xhci-mtk.c | 81 +- + drivers/usb/host/xhci-mtk.h | 5 +- + drivers/usb/host/xhci-plat.c | 13 +- + drivers/usb/host/xhci.c | 31 +- + drivers/usb/host/xhci.h | 2 - + drivers/usb/misc/Kconfig | 11 + + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/qcom_eud.c | 251 ++++++ + drivers/usb/typec/Kconfig | 22 + + drivers/usb/typec/Makefile | 2 + + drivers/usb/typec/class.c | 43 + + drivers/usb/typec/rt1719.c | 961 +++++++++++++++++++++ + drivers/usb/typec/tcpm/tcpm.c | 24 +- + drivers/usb/typec/wusb3801.c | 437 ++++++++++ + drivers/usb/usbip/vudc_main.c | 2 +- + include/linux/usb/typec.h | 3 + + 73 files changed, 3754 insertions(+), 683 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-eud + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,eud.yaml + create mode 100644 Documentation/devicetree/bindings/usb/microchip,mpfs-musb.yaml + create mode 100644 Documentation/devicetree/bindings/usb/richtek,rt1719.yaml + create mode 100644 Documentation/devicetree/bindings/usb/willsemi,wusb3801.yaml + create mode 100644 drivers/usb/gadget/function/uac_common.h + create mode 100644 drivers/usb/misc/qcom_eud.c + create mode 100644 drivers/usb/typec/rt1719.c + create mode 100644 drivers/usb/typec/wusb3801.c +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 (c4b9c570965f USB: serial: simple: add Nokia phone driver) +$ 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/Kconfig | 1 + + drivers/usb/serial/usb-serial-simple.c | 7 +++++++ + 2 files changed, 8 insertions(+) +Merging usb-chipidea-next/for-usb-next (78665f57c3fa usb: chipidea: udc: make controller hardware endpoint primed) +$ git merge -m Merge branch 'for-usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git usb-chipidea-next/for-usb-next +Auto-merging drivers/usb/chipidea/udc.c +Merge made by the 'ort' strategy. +Merging tty/tty-next (47b95e8ab731 serial: mvebu-uart: fix return value check in mvebu_uart_clock_probe()) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging arch/arm64/boot/dts/marvell/armada-37xx.dtsi +Auto-merging drivers/tty/serial/max3100.c +Auto-merging drivers/tty/serial/sc16is7xx.c +Auto-merging drivers/tty/serial/sh-sci.c +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c560f0e9154c] Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git +$ git diff -M --stat --summary HEAD^.. + .../clock/marvell,armada-3700-uart-clock.yaml | 59 ++ + .../devicetree/bindings/serial/fsl-lpuart.yaml | 10 +- + .../devicetree/bindings/serial/mtk-uart.txt | 1 + + .../devicetree/bindings/serial/mvebu-uart.txt | 9 +- + .../devicetree/bindings/serial/renesas,sci.yaml | 2 + + .../devicetree/bindings/serial/renesas,scif.yaml | 5 +- + .../devicetree/bindings/serial/samsung_uart.yaml | 2 + + .../bindings/serial/sunplus,sp7021-uart.yaml | 56 ++ + MAINTAINERS | 13 + + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 14 +- + arch/ia64/include/uapi/asm/termbits.h | 209 ------ + arch/xtensa/include/uapi/asm/termbits.h | 221 ------ + drivers/mmc/core/sdio_uart.c | 17 +- + drivers/tty/amiserial.c | 6 +- + drivers/tty/mxser.c | 125 ++-- + drivers/tty/serdev/core.c | 7 +- + drivers/tty/serial/8250/8250_aspeed_vuart.c | 8 +- + drivers/tty/serial/8250/8250_bcm2835aux.c | 52 +- + drivers/tty/serial/8250/8250_exar.c | 37 +- + drivers/tty/serial/8250/8250_lpss.c | 28 +- + drivers/tty/serial/8250/8250_mid.c | 43 +- + drivers/tty/serial/8250/8250_omap.c | 16 +- + drivers/tty/serial/8250/8250_port.c | 39 +- + drivers/tty/serial/8250/Kconfig | 16 +- + drivers/tty/serial/Kconfig | 27 + + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/amba-pl010.c | 174 +++-- + drivers/tty/serial/atmel_serial.c | 25 + + drivers/tty/serial/fsl_linflexuart.c | 46 +- + drivers/tty/serial/fsl_lpuart.c | 20 +- + drivers/tty/serial/imx.c | 20 +- + drivers/tty/serial/jsm/jsm_cls.c | 16 +- + drivers/tty/serial/jsm/jsm_neo.c | 16 +- + drivers/tty/serial/lpc32xx_hs.c | 10 +- + drivers/tty/serial/max3100.c | 1 - + drivers/tty/serial/mcf.c | 7 +- + drivers/tty/serial/mpc52xx_uart.c | 22 +- + drivers/tty/serial/mvebu-uart.c | 596 +++++++++++++++- + drivers/tty/serial/omap-serial.c | 16 +- + drivers/tty/serial/pxa.c | 16 +- + drivers/tty/serial/sc16is7xx.c | 257 ++++++- + drivers/tty/serial/serial-tegra.c | 22 +- + drivers/tty/serial/serial_core.c | 24 +- + drivers/tty/serial/serial_mctrl_gpio.c | 38 + + drivers/tty/serial/serial_mctrl_gpio.h | 18 + + drivers/tty/serial/serial_txx9.c | 5 - + drivers/tty/serial/sh-sci.c | 2 +- + drivers/tty/serial/stm32-usart.c | 3 +- + drivers/tty/serial/sunplus-uart.c | 774 +++++++++++++++++++++ + drivers/tty/serial/vr41xx_siu.c | 15 +- + drivers/tty/tty_port.c | 18 +- + drivers/usb/serial/ark3116.c | 17 +- + drivers/usb/serial/f81232.c | 16 +- + drivers/usb/serial/f81534.c | 16 +- + drivers/usb/serial/mos7720.c | 20 +- + drivers/usb/serial/quatech2.c | 16 +- + drivers/usb/serial/ssu100.c | 16 +- + include/linux/math64.h | 13 + + include/linux/serial.h | 2 + + include/linux/serial_core.h | 2 +- + include/linux/tty_port.h | 3 + + include/uapi/linux/serial_core.h | 6 + + include/uapi/linux/tty.h | 6 +- + 63 files changed, 2259 insertions(+), 1058 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/marvell,armada-3700-uart-clock.yaml + create mode 100644 Documentation/devicetree/bindings/serial/sunplus,sp7021-uart.yaml + delete mode 100644 arch/ia64/include/uapi/asm/termbits.h + delete mode 100644 arch/xtensa/include/uapi/asm/termbits.h + create mode 100644 drivers/tty/serial/sunplus-uart.c +Merging char-misc/char-misc-next (3dd9a926ec23 mmc: rtsx: Fix build errors/warnings for unused variable) +$ 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 Documentation/hwmon/index.rst +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging arch/arm/boot/dts/aspeed-g4.dtsi +Auto-merging arch/arm/boot/dts/aspeed-g5.dtsi +Auto-merging arch/arm/boot/dts/aspeed-g6.dtsi +Auto-merging drivers/firmware/xilinx/zynqmp.c +Auto-merging drivers/hwmon/Kconfig +Auto-merging drivers/hwmon/Makefile +Auto-merging drivers/mmc/host/rtsx_pci_sdmmc.c +Auto-merging drivers/mtd/mtdcore.c +Auto-merging include/linux/firmware/xlnx-zynqmp.h +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d01f45e2e0e8] Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/stable/sysfs-driver-firmware-zynqmp | 141 +++++ + Documentation/ABI/testing/sysfs-bus-peci | 16 + + .../devicetree/bindings/gpio/delta,tn48m-gpio.yaml | 39 ++ + .../devicetree/bindings/mfd/delta,tn48m-cpld.yaml | 90 +++ + .../bindings/nvmem/allwinner,sun4i-a10-sid.yaml | 1 + + .../bindings/nvmem/fsl,layerscape-sfp.yaml | 38 ++ + .../bindings/nvmem/sunplus,sp7021-ocotp.yaml | 86 +++ + .../devicetree/bindings/peci/peci-aspeed.yaml | 72 +++ + .../devicetree/bindings/peci/peci-controller.yaml | 33 ++ + .../bindings/reserved-memory/google,open-dice.yaml | 46 ++ + .../bindings/reset/delta,tn48m-reset.yaml | 35 ++ + Documentation/driver-api/driver-model/devres.rst | 1 + + Documentation/driver-api/nvmem.rst | 28 +- + Documentation/hwmon/index.rst | 2 + + Documentation/hwmon/peci-cputemp.rst | 90 +++ + Documentation/hwmon/peci-dimmtemp.rst | 57 ++ + Documentation/index.rst | 1 + + Documentation/peci/index.rst | 16 + + Documentation/peci/peci.rst | 51 ++ + MAINTAINERS | 42 ++ + arch/arm/boot/dts/aspeed-g4.dtsi | 11 + + arch/arm/boot/dts/aspeed-g5.dtsi | 11 + + arch/arm/boot/dts/aspeed-g6.dtsi | 11 + + drivers/Kconfig | 3 + + drivers/Makefile | 1 + + drivers/accessibility/speakup/speakup_audptr.c | 24 +- + drivers/accessibility/speakup/synth.c | 2 +- + drivers/android/binder_alloc.c | 8 +- + drivers/char/bsr.c | 2 +- + drivers/char/hpet.c | 28 +- + drivers/char/xilinx_hwicap/fifo_icap.c | 2 +- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 6 +- + drivers/comedi/drivers/das16.c | 4 +- + drivers/comedi/drivers/ni_routes.c | 6 +- + drivers/comedi/drivers/pcm3724.c | 1 - + drivers/dio/dio.c | 140 +++-- + drivers/firmware/stratix10-svc.c | 9 +- + drivers/firmware/xilinx/zynqmp.c | 120 ++++ + drivers/fsi/fsi-core.c | 11 +- + drivers/fsi/fsi-master-aspeed.c | 19 +- + drivers/fsi/fsi-occ.c | 87 ++- + drivers/fsi/fsi-sbefifo.c | 53 +- + drivers/fsi/fsi-scom.c | 45 +- + drivers/gpio/Kconfig | 12 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-tn48m.c | 100 ++++ + drivers/greybus/svc.c | 16 +- + drivers/hwmon/Kconfig | 2 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/peci/Kconfig | 31 + + drivers/hwmon/peci/Makefile | 7 + + drivers/hwmon/peci/common.h | 58 ++ + drivers/hwmon/peci/cputemp.c | 592 +++++++++++++++++++ + drivers/hwmon/peci/dimmtemp.c | 630 +++++++++++++++++++++ + drivers/misc/Kconfig | 12 + + drivers/misc/Makefile | 1 + + drivers/misc/cardreader/alcor_pci.c | 9 +- + drivers/misc/cardreader/rtl8411.c | 2 +- + drivers/misc/cardreader/rts5209.c | 2 +- + drivers/misc/cardreader/rts5227.c | 47 ++ + drivers/misc/cardreader/rts5228.c | 23 +- + drivers/misc/cardreader/rts5229.c | 2 +- + drivers/misc/cardreader/rts5249.c | 31 +- + drivers/misc/cardreader/rts5261.c | 35 +- + drivers/misc/cardreader/rtsx_pcr.c | 228 +++----- + drivers/misc/cardreader/rtsx_pcr.h | 3 + + drivers/misc/eeprom/at25.c | 4 +- + drivers/misc/lkdtm/fortify.c | 6 +- + drivers/misc/mei/client.c | 1 + + drivers/misc/mei/hw-me-regs.h | 1 + + drivers/misc/mei/hw-me.c | 43 +- + drivers/misc/mei/init.c | 5 + + drivers/misc/mei/pci-me.c | 10 +- + drivers/misc/ocxl/link.c | 2 +- + drivers/misc/open-dice.c | 208 +++++++ + drivers/misc/sgi-gru/grutables.h | 6 - + drivers/misc/vmw_vmci/vmci_guest.c | 363 +++++++++--- + drivers/mmc/host/rtsx_pci_sdmmc.c | 20 +- + drivers/mtd/mtdcore.c | 13 +- + drivers/mux/core.c | 239 +++++++- + drivers/nvmem/Kconfig | 24 + + drivers/nvmem/Makefile | 4 + + drivers/nvmem/core.c | 47 +- + drivers/nvmem/layerscape-sfp.c | 89 +++ + drivers/nvmem/meson-mx-efuse.c | 3 +- + drivers/nvmem/qfprom.c | 4 +- + drivers/nvmem/sunplus-ocotp.c | 228 ++++++++ + drivers/nvmem/sunxi_sid.c | 6 + + drivers/of/platform.c | 1 + + drivers/peci/Kconfig | 36 ++ + drivers/peci/Makefile | 10 + + drivers/peci/controller/Kconfig | 18 + + drivers/peci/controller/Makefile | 3 + + drivers/peci/controller/peci-aspeed.c | 599 ++++++++++++++++++++ + drivers/peci/core.c | 236 ++++++++ + drivers/peci/cpu.c | 343 +++++++++++ + drivers/peci/device.c | 252 +++++++++ + drivers/peci/internal.h | 136 +++++ + drivers/peci/request.c | 482 ++++++++++++++++ + drivers/peci/sysfs.c | 82 +++ + drivers/pps/clients/pps-gpio.c | 2 +- + drivers/reset/Kconfig | 13 + + drivers/reset/Makefile | 1 + + drivers/reset/reset-tn48m.c | 128 +++++ + drivers/thunderbolt/nvm.c | 6 +- + drivers/w1/slaves/w1_therm.c | 8 +- + include/dt-bindings/reset/delta,tn48m-reset.h | 20 + + include/linux/firmware/intel/stratix10-smc.h | 21 +- + .../linux/firmware/intel/stratix10-svc-client.h | 4 + + include/linux/firmware/xlnx-zynqmp.h | 25 + + include/linux/mux/consumer.h | 18 + + include/linux/nvmem-provider.h | 8 - + include/linux/peci-cpu.h | 40 ++ + include/linux/peci.h | 112 ++++ + include/linux/rtsx_pci.h | 5 +- + include/linux/vmw_vmci_defs.h | 84 ++- + include/trace/events/fsi.h | 86 +++ + include/trace/events/fsi_master_aspeed.h | 12 + + include/uapi/linux/fsi.h | 14 + + kernel/configs/android-recommended.config | 2 +- + tools/testing/selftests/lkdtm/config | 2 +- + 121 files changed, 6879 insertions(+), 590 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-peci + create mode 100644 Documentation/devicetree/bindings/gpio/delta,tn48m-gpio.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/delta,tn48m-cpld.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/fsl,layerscape-sfp.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/sunplus,sp7021-ocotp.yaml + create mode 100644 Documentation/devicetree/bindings/peci/peci-aspeed.yaml + create mode 100644 Documentation/devicetree/bindings/peci/peci-controller.yaml + create mode 100644 Documentation/devicetree/bindings/reserved-memory/google,open-dice.yaml + create mode 100644 Documentation/devicetree/bindings/reset/delta,tn48m-reset.yaml + create mode 100644 Documentation/hwmon/peci-cputemp.rst + create mode 100644 Documentation/hwmon/peci-dimmtemp.rst + create mode 100644 Documentation/peci/index.rst + create mode 100644 Documentation/peci/peci.rst + create mode 100644 drivers/gpio/gpio-tn48m.c + create mode 100644 drivers/hwmon/peci/Kconfig + create mode 100644 drivers/hwmon/peci/Makefile + create mode 100644 drivers/hwmon/peci/common.h + create mode 100644 drivers/hwmon/peci/cputemp.c + create mode 100644 drivers/hwmon/peci/dimmtemp.c + create mode 100644 drivers/misc/open-dice.c + create mode 100644 drivers/nvmem/layerscape-sfp.c + create mode 100644 drivers/nvmem/sunplus-ocotp.c + create mode 100644 drivers/peci/Kconfig + create mode 100644 drivers/peci/Makefile + create mode 100644 drivers/peci/controller/Kconfig + create mode 100644 drivers/peci/controller/Makefile + create mode 100644 drivers/peci/controller/peci-aspeed.c + create mode 100644 drivers/peci/core.c + create mode 100644 drivers/peci/cpu.c + create mode 100644 drivers/peci/device.c + create mode 100644 drivers/peci/internal.h + create mode 100644 drivers/peci/request.c + create mode 100644 drivers/peci/sysfs.c + create mode 100644 drivers/reset/reset-tn48m.c + create mode 100644 include/dt-bindings/reset/delta,tn48m-reset.h + create mode 100644 include/linux/peci-cpu.h + create mode 100644 include/linux/peci.h +Merging extcon/extcon-next (b26c5f03a645 extcon: Fix some kernel-doc comments) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Auto-merging drivers/power/supply/axp288_charger.c +Auto-merging drivers/power/supply/max8997_charger.c +CONFLICT (content): Merge conflict in drivers/power/supply/max8997_charger.c +Auto-merging drivers/usb/dwc3/drd.c +Resolved 'drivers/power/supply/max8997_charger.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 471c31cb75f5] Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git +$ git diff -M --stat --summary HEAD^.. + drivers/extcon/extcon-axp288.c | 4 +-- + drivers/extcon/extcon-intel-int3496.c | 54 +++++++++++++++++++++++++++++----- + drivers/extcon/extcon-usbc-cros-ec.c | 2 +- + drivers/extcon/extcon.c | 8 ++++- + drivers/power/supply/axp288_charger.c | 17 ++++++----- + drivers/power/supply/charger-manager.c | 7 ++--- + drivers/power/supply/max8997_charger.c | 10 +++---- + drivers/usb/dwc3/drd.c | 9 ++---- + drivers/usb/phy/phy-omap-otg.c | 4 +-- + drivers/usb/typec/tcpm/fusb302.c | 4 +-- + include/linux/extcon.h | 2 +- + 11 files changed, 80 insertions(+), 41 deletions(-) +Merging gnss/gnss-next (26291c54e111 Linux 5.17-rc2) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging phy-next/next (c6455af54899 phy: qcom-qmp: add sc8280xp UFS PHY) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +CONFLICT (modify/delete): Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt deleted in phy-next/next and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt left in tree. +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/ata/ahci.h +Auto-merging drivers/ata/libahci_platform.c +Auto-merging drivers/pci/controller/pci-aardvark.c +Auto-merging drivers/usb/host/xhci-plat.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt +rm 'Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt' +$ git commit --no-edit -v -a +[master c43209f46b8d] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/phy/allwinner,sun50i-a64-usb-phy.yaml | 4 +- + .../devicetree/bindings/phy/cdns,dphy-rx.yaml | 42 + + .../devicetree/bindings/phy/cdns,dphy.txt | 20 - + .../devicetree/bindings/phy/cdns,dphy.yaml | 56 + + .../devicetree/bindings/phy/mediatek,tphy.yaml | 2 + + .../bindings/phy/phy-rockchip-naneng-combphy.yaml | 109 ++ + .../devicetree/bindings/phy/qcom,edp-phy.yaml | 4 +- + .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 3 + + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 1 + + .../devicetree/bindings/phy/qcom,usb-hs-phy.txt | 85 -- + .../devicetree/bindings/phy/qcom,usb-hs-phy.yaml | 108 ++ + .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 3 + + .../devicetree/bindings/phy/renesas,usb2-phy.yaml | 3 +- + .../bindings/phy/samsung,dp-video-phy.yaml | 41 + + .../bindings/phy/samsung,exynos5250-sata-phy.yaml | 64 + + .../bindings/phy/samsung,mipi-video-phy.yaml | 113 ++ + .../devicetree/bindings/phy/samsung,usb2-phy.yaml | 102 ++ + .../bindings/phy/samsung,usb3-drd-phy.yaml | 126 ++ + .../devicetree/bindings/phy/samsung-phy.txt | 210 --- + .../devicetree/bindings/trivial-devices.yaml | 2 + + MAINTAINERS | 2 +- + drivers/ata/ahci.h | 2 - + drivers/ata/ahci_mvebu.c | 2 +- + drivers/ata/libahci_platform.c | 2 +- + drivers/pci/controller/pci-aardvark.c | 4 +- + drivers/phy/allwinner/phy-sun4i-usb.c | 41 +- + drivers/phy/amlogic/phy-meson-gxl-usb2.c | 5 +- + drivers/phy/amlogic/phy-meson8b-usb2.c | 9 +- + drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c | 46 +- + drivers/phy/broadcom/phy-brcm-usb-init.c | 36 + + drivers/phy/broadcom/phy-brcm-usb-init.h | 1 + + drivers/phy/broadcom/phy-brcm-usb.c | 11 +- + drivers/phy/cadence/Kconfig | 8 + + drivers/phy/cadence/Makefile | 1 + + drivers/phy/cadence/cdns-dphy-rx.c | 255 ++++ + drivers/phy/cadence/phy-cadence-salvo.c | 7 +- + drivers/phy/cadence/phy-cadence-sierra.c | 82 +- + drivers/phy/freescale/Kconfig | 5 + + drivers/phy/freescale/phy-fsl-imx8m-pcie.c | 3 +- + drivers/phy/marvell/phy-mvebu-a3700-comphy.c | 1350 ++++++++++++++++++-- + drivers/phy/phy-core-mipi-dphy.c | 4 +- + drivers/phy/qualcomm/phy-qcom-edp.c | 9 +- + drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c | 28 +- + drivers/phy/qualcomm/phy-qcom-qmp.c | 3 + + drivers/phy/qualcomm/phy-qcom-qusb2.c | 3 + + drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 5 + + drivers/phy/rockchip/Kconfig | 8 + + drivers/phy/rockchip/Makefile | 1 + + drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 581 +++++++++ + drivers/phy/ti/phy-tusb1210.c | 443 ++++++- + drivers/usb/host/xhci-mvebu.c | 42 - + drivers/usb/host/xhci-mvebu.h | 6 - + drivers/usb/host/xhci-plat.c | 20 +- + drivers/usb/host/xhci-plat.h | 1 - + 54 files changed, 3496 insertions(+), 628 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/cdns,dphy-rx.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/cdns,dphy.txt + create mode 100644 Documentation/devicetree/bindings/phy/cdns,dphy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/phy-rockchip-naneng-combphy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/samsung,dp-video-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/samsung,exynos5250-sata-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/samsung,mipi-video-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/samsung,usb2-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/samsung,usb3-drd-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/samsung-phy.txt + create mode 100644 drivers/phy/cadence/cdns-dphy-rx.c + create mode 100644 drivers/phy/rockchip/phy-rockchip-naneng-combphy.c +$ git am -3 ../patches/0001-merge-fix-for-dt-bindings-phy-qcom-usb-hs-phy-add-MS.patch +Applying: merge fix for "dt-bindings: phy: qcom,usb-hs-phy: add MSM8226 compatible" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml +$ git add -A . +$ git commit -v -a --amend +[master b733d76badbb] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git + Date: Fri Mar 4 15:06:27 2022 +1100 +Merging soundwire/next (266fa94673d3 soundwire: qcom: use __maybe_unused for swrm_runtime_resume()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/soundwire/qcom,sdw.txt | 14 +- + drivers/soundwire/bus.c | 8 +- + drivers/soundwire/intel.c | 4 +- + drivers/soundwire/intel_init.c | 7 +- + drivers/soundwire/qcom.c | 208 ++++- + drivers/soundwire/stream.c | 952 ++++++++++++--------- + 6 files changed, 774 insertions(+), 419 deletions(-) +Merging thunderbolt/next (7f7b571becf3 thunderbolt: Replace acpi_bus_get_device()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Merge made by the 'ort' strategy. + drivers/thunderbolt/acpi.c | 4 +- + drivers/thunderbolt/lc.c | 110 ++++++++++++++++++++++++++++++++++++++++++ + drivers/thunderbolt/nhi.c | 3 +- + drivers/thunderbolt/switch.c | 71 ++++++++++++++++++++++++++- + drivers/thunderbolt/tb.c | 11 +++++ + drivers/thunderbolt/tb.h | 8 +++ + drivers/thunderbolt/tb_regs.h | 9 ++++ + drivers/thunderbolt/tunnel.c | 10 ++++ + 8 files changed, 221 insertions(+), 5 deletions(-) +Merging vfio/next (f8a665b15947 Merge branches 'v5.18/vfio/next/mlx5-migration-v10', 'v5.18/vfio/next/pm-fixes' and 'v5.18/vfio/next/uml-build-fix' into v5.18/vfio/next/next) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Auto-merging MAINTAINERS +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/cmd.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging include/linux/mlx5/driver.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +Merge made by the 'ort' strategy. + MAINTAINERS | 6 + + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 10 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 45 ++ + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 17 +- + drivers/pci/iov.c | 43 ++ + drivers/vfio/pci/Kconfig | 3 + + drivers/vfio/pci/Makefile | 2 + + drivers/vfio/pci/mlx5/Kconfig | 10 + + drivers/vfio/pci/mlx5/Makefile | 4 + + drivers/vfio/pci/mlx5/cmd.c | 259 ++++++++ + drivers/vfio/pci/mlx5/cmd.h | 36 ++ + drivers/vfio/pci/mlx5/main.c | 676 +++++++++++++++++++++ + drivers/vfio/pci/vfio_pci.c | 1 + + drivers/vfio/pci/vfio_pci_core.c | 162 +++-- + drivers/vfio/pci/vfio_pci_rdwr.c | 2 + + drivers/vfio/vfio.c | 296 ++++++++- + include/linux/mlx5/driver.h | 3 + + include/linux/mlx5/mlx5_ifc.h | 147 ++++- + include/linux/pci.h | 15 +- + include/linux/vfio.h | 53 ++ + include/linux/vfio_pci_core.h | 13 + + include/uapi/linux/vfio.h | 406 ++++++------- + 23 files changed, 1919 insertions(+), 291 deletions(-) + create mode 100644 drivers/vfio/pci/mlx5/Kconfig + create mode 100644 drivers/vfio/pci/mlx5/Makefile + create mode 100644 drivers/vfio/pci/mlx5/cmd.c + create mode 100644 drivers/vfio/pci/mlx5/cmd.h + create mode 100644 drivers/vfio/pci/mlx5/main.c +Merging staging/staging-next (b25c7dc13fb8 staging: rts5208: fix Lines should not end with a '('.) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging MAINTAINERS +Auto-merging drivers/staging/fbtft/fbtft.h +CONFLICT (content): Merge conflict in drivers/staging/fbtft/fbtft.h +Auto-merging drivers/staging/pi433/pi433_if.c +Auto-merging drivers/staging/rtl8723bs/core/rtw_recv.c +Auto-merging drivers/staging/wfx/bus_spi.c +Resolved 'drivers/staging/fbtft/fbtft.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ebc56e5fa438] Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/clock/mediatek,mt7621-sysc.yaml | 12 + + .../bindings/staging}/net/wireless/silabs,wfx.yaml | 82 +-- + MAINTAINERS | 1 + + drivers/clk/ralink/clk-mt7621.c | 92 +++- + drivers/mmc/core/quirks.h | 5 + + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/gdm724x/hci_packet.h | 2 +- + drivers/staging/greybus/sdio.c | 1 - + drivers/staging/gs_fpgaboot/Kconfig | 8 - + drivers/staging/gs_fpgaboot/Makefile | 3 - + drivers/staging/gs_fpgaboot/README | 70 --- + drivers/staging/gs_fpgaboot/TODO | 7 - + drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 394 --------------- + drivers/staging/gs_fpgaboot/gs_fpgaboot.h | 41 -- + drivers/staging/gs_fpgaboot/io.c | 105 ---- + drivers/staging/gs_fpgaboot/io.h | 73 --- + drivers/staging/ks7010/ks7010_sdio.c | 4 +- + drivers/staging/most/net/net.c | 2 +- + drivers/staging/most/video/video.c | 2 +- + drivers/staging/mt7621-dts/gbpc1.dts | 4 + + drivers/staging/mt7621-dts/gbpc2.dts | 16 +- + drivers/staging/mt7621-dts/mt7621.dtsi | 53 +- + drivers/staging/nvec/nvec.c | 4 +- + drivers/staging/pi433/TODO | 4 +- + drivers/staging/pi433/pi433_if.c | 176 +++++-- + drivers/staging/pi433/pi433_if.h | 2 - + drivers/staging/pi433/rf69.c | 167 ++---- + drivers/staging/pi433/rf69.h | 3 +- + drivers/staging/pi433/rf69_enum.h | 20 - + drivers/staging/pi433/rf69_registers.h | 2 + + drivers/staging/qlge/qlge_main.c | 11 +- + drivers/staging/r8188eu/Makefile | 2 +- + drivers/staging/r8188eu/core/rtw_ap.c | 240 +++------ + drivers/staging/r8188eu/core/rtw_br_ext.c | 82 +-- + drivers/staging/r8188eu/core/rtw_cmd.c | 49 +- + drivers/staging/r8188eu/core/rtw_fw.c | 314 ++++++++++++ + drivers/staging/r8188eu/core/rtw_ieee80211.c | 37 +- + drivers/staging/r8188eu/core/rtw_ioctl_set.c | 10 - + drivers/staging/r8188eu/core/rtw_iol.c | 14 +- + drivers/staging/r8188eu/core/rtw_mlme.c | 103 +--- + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 439 ++-------------- + drivers/staging/r8188eu/core/rtw_p2p.c | 73 +-- + drivers/staging/r8188eu/core/rtw_pwrctrl.c | 45 +- + drivers/staging/r8188eu/core/rtw_recv.c | 138 ++--- + drivers/staging/r8188eu/core/rtw_rf.c | 62 +-- + drivers/staging/r8188eu/core/rtw_security.c | 193 +------ + drivers/staging/r8188eu/core/rtw_sta_mgt.c | 14 +- + drivers/staging/r8188eu/core/rtw_wlan_util.c | 121 ++--- + drivers/staging/r8188eu/core/rtw_xmit.c | 99 +--- + drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 185 ++----- + drivers/staging/r8188eu/hal/HalPwrSeqCmd.c | 4 +- + drivers/staging/r8188eu/hal/hal_com.c | 36 +- + drivers/staging/r8188eu/hal/hal_intf.c | 3 - + drivers/staging/r8188eu/hal/odm.c | 118 +---- + drivers/staging/r8188eu/hal/odm_HWConfig.c | 44 +- + drivers/staging/r8188eu/hal/odm_RegConfig8188E.c | 7 +- + drivers/staging/r8188eu/hal/odm_debug.c | 6 - + drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 46 +- + drivers/staging/r8188eu/hal/rtl8188e_dm.c | 52 +- + drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 403 +-------------- + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 150 ++---- + drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 24 +- + drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 6 +- + drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 5 - + drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 20 +- + drivers/staging/r8188eu/hal/usb_halinit.c | 432 ++-------------- + drivers/staging/r8188eu/hal/usb_ops_linux.c | 43 +- + drivers/staging/r8188eu/include/Hal8188EPhyCfg.h | 6 +- + drivers/staging/r8188eu/include/HalVerDef.h | 23 - + drivers/staging/r8188eu/include/drv_types.h | 46 +- + drivers/staging/r8188eu/include/hal_com.h | 3 - + drivers/staging/r8188eu/include/hal_intf.h | 48 +- + drivers/staging/r8188eu/include/ieee80211.h | 267 ---------- + drivers/staging/r8188eu/include/odm.h | 50 +- + drivers/staging/r8188eu/include/odm_HWConfig.h | 39 +- + drivers/staging/r8188eu/include/osdep_service.h | 50 +- + drivers/staging/r8188eu/include/recv_osdep.h | 5 - + drivers/staging/r8188eu/include/rtl8188e_dm.h | 3 +- + drivers/staging/r8188eu/include/rtl8188e_hal.h | 97 +--- + drivers/staging/r8188eu/include/rtl8188e_recv.h | 1 - + drivers/staging/r8188eu/include/rtl8188e_spec.h | 2 +- + drivers/staging/r8188eu/include/rtl8188e_xmit.h | 2 + + drivers/staging/r8188eu/include/rtw_br_ext.h | 5 - + drivers/staging/r8188eu/include/rtw_cmd.h | 16 +- + drivers/staging/r8188eu/include/rtw_debug.h | 8 - + drivers/staging/r8188eu/include/rtw_fw.h | 12 + + drivers/staging/r8188eu/include/rtw_mlme.h | 9 +- + drivers/staging/r8188eu/include/rtw_pwrctrl.h | 2 +- + drivers/staging/r8188eu/include/rtw_recv.h | 47 +- + drivers/staging/r8188eu/include/rtw_security.h | 112 ----- + drivers/staging/r8188eu/include/sta_info.h | 48 +- + drivers/staging/r8188eu/include/usb_ops.h | 8 +- + drivers/staging/r8188eu/include/wifi.h | 39 +- + drivers/staging/r8188eu/include/wlan_bssdef.h | 2 +- + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 558 ++++----------------- + drivers/staging/r8188eu/os_dep/mlme_linux.c | 4 - + drivers/staging/r8188eu/os_dep/os_intfs.c | 49 +- + drivers/staging/r8188eu/os_dep/osdep_service.c | 2 - + drivers/staging/r8188eu/os_dep/recv_linux.c | 26 - + drivers/staging/r8188eu/os_dep/usb_intf.c | 125 +---- + drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 24 +- + drivers/staging/r8188eu/os_dep/xmit_linux.c | 6 +- + drivers/staging/rtl8192e/rtllib_debug.h | 54 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 9 +- + .../staging/rtl8192u/ieee80211/ieee80211_crypt.c | 2 +- + .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 2 +- + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 2 +- + .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 2 +- + .../staging/rtl8192u/ieee80211/ieee80211_module.c | 2 +- + drivers/staging/rtl8192u/r8192U_core.c | 45 +- + drivers/staging/rtl8712/rtl871x_recv.c | 4 +- + drivers/staging/rtl8712/rtl871x_recv.h | 8 - + drivers/staging/rtl8723bs/core/rtw_cmd.c | 54 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 11 +- + drivers/staging/rtl8723bs/hal/hal_intf.c | 5 + + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 3 +- + drivers/staging/rtl8723bs/include/rtw_recv.h | 11 - + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 98 ++-- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 6 +- + drivers/staging/rts5208/ms.c | 9 +- + drivers/staging/unisys/visorhba/visorhba_main.c | 2 +- + drivers/staging/unisys/visorinput/visorinput.c | 3 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 10 +- + drivers/staging/vc04_services/interface/TODO | 56 +-- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 34 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 137 +++-- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 2 +- + .../interface/vchiq_arm/vchiq_debugfs.c | 4 +- + .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 7 +- + drivers/staging/vt6656/device.h | 11 +- + drivers/staging/vt6656/mac.c | 14 +- + drivers/staging/vt6656/mac.h | 22 +- + drivers/staging/vt6656/rxtx.c | 8 +- + drivers/staging/vt6656/usbpipe.c | 4 +- + drivers/staging/vt6656/wcmd.c | 13 +- + drivers/staging/wfx/Kconfig | 5 + + drivers/staging/wfx/Makefile | 4 +- + drivers/staging/wfx/bh.c | 68 ++- + drivers/staging/wfx/bh.h | 1 + + drivers/staging/wfx/bus.h | 8 +- + drivers/staging/wfx/bus_sdio.c | 105 ++-- + drivers/staging/wfx/bus_spi.c | 126 ++--- + drivers/staging/wfx/data_rx.c | 10 +- + drivers/staging/wfx/data_rx.h | 5 +- + drivers/staging/wfx/data_tx.c | 152 +++--- + drivers/staging/wfx/data_tx.h | 20 +- + drivers/staging/wfx/debug.c | 80 +-- + drivers/staging/wfx/debug.h | 6 +- + drivers/staging/wfx/fwio.c | 116 ++--- + drivers/staging/wfx/hif_api_cmd.h | 152 +++--- + drivers/staging/wfx/hif_api_general.h | 64 +-- + drivers/staging/wfx/hif_api_mib.h | 68 +-- + drivers/staging/wfx/hif_rx.c | 171 +++---- + drivers/staging/wfx/hif_tx.c | 201 ++++---- + drivers/staging/wfx/hif_tx.h | 67 +-- + drivers/staging/wfx/hif_tx_mib.c | 201 ++++---- + drivers/staging/wfx/hif_tx_mib.h | 67 ++- + drivers/staging/wfx/hwio.c | 168 +++---- + drivers/staging/wfx/hwio.h | 35 +- + drivers/staging/wfx/key.c | 84 ++-- + drivers/staging/wfx/key.h | 5 +- + drivers/staging/wfx/main.c | 267 +++++----- + drivers/staging/wfx/main.h | 12 +- + drivers/staging/wfx/queue.c | 60 +-- + drivers/staging/wfx/queue.h | 13 +- + drivers/staging/wfx/scan.c | 27 +- + drivers/staging/wfx/sta.c | 201 +++----- + drivers/staging/wfx/sta.h | 21 +- + drivers/staging/wfx/traces.h | 33 +- + drivers/staging/wfx/wfx.h | 102 ++-- + include/dt-bindings/reset/mt7621-reset.h | 37 ++ + 172 files changed, 2968 insertions(+), 7180 deletions(-) + rename {drivers/staging/wfx/Documentation/devicetree/bindings => Documentation/devicetree/bindings/staging}/net/wireless/silabs,wfx.yaml (59%) + delete mode 100644 drivers/staging/gs_fpgaboot/Kconfig + delete mode 100644 drivers/staging/gs_fpgaboot/Makefile + delete mode 100644 drivers/staging/gs_fpgaboot/README + delete mode 100644 drivers/staging/gs_fpgaboot/TODO + delete mode 100644 drivers/staging/gs_fpgaboot/gs_fpgaboot.c + delete mode 100644 drivers/staging/gs_fpgaboot/gs_fpgaboot.h + delete mode 100644 drivers/staging/gs_fpgaboot/io.c + delete mode 100644 drivers/staging/gs_fpgaboot/io.h + create mode 100644 drivers/staging/r8188eu/core/rtw_fw.c + delete mode 100644 drivers/staging/r8188eu/hal/odm_debug.c + create mode 100644 drivers/staging/r8188eu/include/rtw_fw.h + create mode 100644 include/dt-bindings/reset/mt7621-reset.h +Merging iio/togreg (0bf126163c3e iio: adc: xilinx-ams: Fix single channel switching sequence) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging .mailmap +CONFLICT (content): Merge conflict in .mailmap +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/iio/accel/bma400_spi.c +Auto-merging drivers/iio/accel/bmc150-accel-core.c +Auto-merging drivers/iio/accel/bmc150-accel-spi.c +Auto-merging drivers/iio/accel/bmi088-accel-spi.c +Auto-merging drivers/iio/accel/fxls8962af-core.c +CONFLICT (content): Merge conflict in drivers/iio/accel/fxls8962af-core.c +Auto-merging drivers/iio/accel/fxls8962af-i2c.c +Auto-merging drivers/iio/accel/fxls8962af-spi.c +Auto-merging drivers/iio/accel/kxsd9-spi.c +Auto-merging drivers/iio/accel/mma7455_spi.c +Auto-merging drivers/iio/accel/mma8452.c +Auto-merging drivers/iio/accel/mma9551.c +Auto-merging drivers/iio/accel/mma9553.c +Auto-merging drivers/iio/adc/ad7124.c +Auto-merging drivers/iio/adc/ti-tsc2046.c +Auto-merging drivers/iio/adc/xilinx-ams.c +Auto-merging drivers/iio/common/ssp_sensors/ssp_dev.c +Auto-merging drivers/iio/dac/ad5592r.c +Auto-merging drivers/iio/dac/ad5686-spi.c +Auto-merging drivers/iio/frequency/adf4350.c +Auto-merging drivers/iio/frequency/admv1013.c +Auto-merging drivers/iio/imu/adis16480.c +Auto-merging drivers/iio/imu/kmx61.c +Auto-merging drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +Auto-merging drivers/iio/industrialio-buffer.c +Auto-merging drivers/iio/magnetometer/bmc150_magn.c +Auto-merging drivers/iio/magnetometer/bmc150_magn_spi.c +Auto-merging drivers/iio/magnetometer/hmc5843_spi.c +Auto-merging drivers/iio/pressure/ms5611_spi.c +Auto-merging drivers/iio/pressure/zpa2326_spi.c +Resolved '.mailmap' using previous resolution. +Resolved 'drivers/iio/accel/fxls8962af-core.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5835e4da1a72] Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git +$ git diff -M --stat --summary HEAD^.. + .mailmap | 1 + + Documentation/ABI/testing/sysfs-bus-iio | 31 + + .../ABI/testing/sysfs-bus-iio-adc-ad7280a | 13 + + .../ABI/testing/sysfs-bus-iio-dac-ltc2688 | 86 ++ + .../ABI/testing/sysfs-bus-iio-frequency-admv1014 | 23 + + Documentation/ABI/testing/sysfs-bus-iio-sx9324 | 28 + + .../devicetree/bindings/iio/accel/adi,adxl367.yaml | 79 + + .../devicetree/bindings/iio/adc/adi,ad7280a.yaml | 77 + + .../bindings/iio/adc/atmel,sama5d2-adc.yaml | 2 - + .../bindings/iio/adc/mediatek,mt2701-auxadc.yaml | 1 + + .../bindings/iio/adc/microchip,mcp3201.yaml | 2 +- + .../bindings/iio/adc/qcom,spmi-iadc.yaml | 2 +- + .../bindings/iio/adc/ti,palmas-gpadc.yaml | 6 +- + .../bindings/iio/afe/temperature-sense-rtd.yaml | 101 ++ + .../bindings/iio/afe/temperature-transducer.yaml | 114 ++ + .../bindings/iio/amplifiers/adi,ada4250.yaml | 50 + + .../devicetree/bindings/iio/dac/adi,ltc2688.yaml | 146 ++ + .../bindings/iio/frequency/adi,admv1014.yaml | 134 ++ + .../bindings/iio/frequency/adi,admv4420.yaml | 55 + + .../bindings/iio/proximity/semtech,sx9324.yaml | 161 ++ + .../bindings/iio/proximity/semtech,sx9360.yaml | 89 ++ + .../devicetree/bindings/iio/st,st-sensors.yaml | 3 + + .../devicetree/bindings/trivial-devices.yaml | 2 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 123 +- + drivers/iio/accel/Kconfig | 62 +- + drivers/iio/accel/Makefile | 3 + + drivers/iio/accel/adis16201.c | 1 + + drivers/iio/accel/adis16209.c | 1 + + drivers/iio/accel/adxl313_core.c | 6 +- + drivers/iio/accel/adxl313_i2c.c | 1 + + drivers/iio/accel/adxl313_spi.c | 1 + + drivers/iio/accel/adxl345.h | 7 +- + drivers/iio/accel/adxl345_core.c | 56 +- + drivers/iio/accel/adxl345_i2c.c | 35 +- + drivers/iio/accel/adxl345_spi.c | 35 +- + drivers/iio/accel/adxl355_core.c | 11 +- + drivers/iio/accel/adxl355_i2c.c | 1 + + drivers/iio/accel/adxl355_spi.c | 1 + + drivers/iio/accel/adxl367.c | 1588 ++++++++++++++++++++ + drivers/iio/accel/adxl367.h | 23 + + drivers/iio/accel/adxl367_i2c.c | 90 ++ + drivers/iio/accel/adxl367_spi.c | 164 ++ + drivers/iio/accel/adxl372.c | 4 +- + drivers/iio/accel/adxl372_i2c.c | 1 + + drivers/iio/accel/adxl372_spi.c | 1 + + drivers/iio/accel/bma180.c | 9 +- + drivers/iio/accel/bma400_core.c | 6 +- + drivers/iio/accel/bma400_i2c.c | 1 + + drivers/iio/accel/bma400_spi.c | 1 + + drivers/iio/accel/bmc150-accel-core.c | 8 +- + drivers/iio/accel/bmc150-accel-i2c.c | 1 + + drivers/iio/accel/bmc150-accel-spi.c | 1 + + drivers/iio/accel/bmi088-accel-core.c | 8 +- + drivers/iio/accel/bmi088-accel-spi.c | 1 + + drivers/iio/accel/da280.c | 6 +- + drivers/iio/accel/da311.c | 6 +- + drivers/iio/accel/dmard06.c | 10 +- + drivers/iio/accel/dmard09.c | 2 +- + drivers/iio/accel/dmard10.c | 7 +- + drivers/iio/accel/fxls8962af-core.c | 8 +- + drivers/iio/accel/fxls8962af-i2c.c | 1 + + drivers/iio/accel/fxls8962af-spi.c | 1 + + drivers/iio/accel/kxsd9-i2c.c | 1 + + drivers/iio/accel/kxsd9-spi.c | 1 + + drivers/iio/accel/kxsd9.c | 6 +- + drivers/iio/accel/mc3230.c | 6 +- + drivers/iio/accel/mma7455_core.c | 6 +- + drivers/iio/accel/mma7455_i2c.c | 1 + + drivers/iio/accel/mma7455_spi.c | 1 + + drivers/iio/accel/mma7660.c | 11 +- + drivers/iio/accel/mma8452.c | 50 +- + drivers/iio/accel/mma9551.c | 12 +- + drivers/iio/accel/mma9551_core.c | 36 +- + drivers/iio/accel/mma9553.c | 12 +- + drivers/iio/accel/ssp_accel_sensor.c | 1 + + drivers/iio/accel/st_accel.h | 2 + + drivers/iio/accel/st_accel_buffer.c | 5 - + drivers/iio/accel/st_accel_core.c | 88 +- + drivers/iio/accel/st_accel_i2c.c | 6 + + drivers/iio/accel/st_accel_spi.c | 1 + + drivers/iio/accel/stk8312.c | 11 +- + drivers/iio/accel/stk8ba50.c | 11 +- + drivers/iio/adc/Kconfig | 11 + + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ab8500-gpadc.c | 14 +- + drivers/iio/adc/ad7091r-base.c | 4 +- + drivers/iio/adc/ad7091r5.c | 1 + + drivers/iio/adc/ad7124.c | 1 + + drivers/iio/adc/ad7192.c | 5 +- + drivers/iio/adc/ad7280a.c | 1111 ++++++++++++++ + drivers/iio/adc/ad7606.c | 4 +- + drivers/iio/adc/ad7606_par.c | 1 + + drivers/iio/adc/ad7606_spi.c | 1 + + drivers/iio/adc/ad7780.c | 1 + + drivers/iio/adc/ad7791.c | 1 + + drivers/iio/adc/ad7793.c | 1 + + drivers/iio/adc/ad_sigma_delta.c | 20 +- + drivers/iio/adc/at91_adc.c | 7 +- + drivers/iio/adc/cpcap-adc.c | 2 +- + drivers/iio/adc/exynos_adc.c | 9 +- + drivers/iio/adc/hi8435.c | 2 +- + drivers/iio/adc/ina2xx-adc.c | 2 +- + drivers/iio/adc/max9611.c | 2 +- + drivers/iio/adc/mt6577_auxadc.c | 16 +- + drivers/iio/adc/palmas_gpadc.c | 10 +- + drivers/iio/adc/qcom-pm8xxx-xoadc.c | 15 +- + drivers/iio/adc/qcom-spmi-vadc.c | 24 +- + drivers/iio/adc/qcom-vadc-common.c | 92 +- + drivers/iio/adc/rcar-gyroadc.c | 6 +- + drivers/iio/adc/rn5t618-adc.c | 7 +- + drivers/iio/adc/rockchip_saradc.c | 9 +- + drivers/iio/adc/rzg2l_adc.c | 4 +- + drivers/iio/adc/stm32-adc-core.c | 17 +- + drivers/iio/adc/stm32-adc.c | 12 +- + drivers/iio/adc/stm32-dfsdm-adc.c | 11 +- + drivers/iio/adc/stm32-dfsdm-core.c | 19 +- + drivers/iio/adc/ti-adc084s021.c | 2 +- + drivers/iio/adc/ti-tsc2046.c | 269 +++- + drivers/iio/adc/twl4030-madc.c | 9 +- + drivers/iio/adc/twl6030-gpadc.c | 10 +- + drivers/iio/adc/vf610_adc.c | 7 +- + drivers/iio/adc/xilinx-ams.c | 11 +- + drivers/iio/afe/iio-rescale.c | 288 +++- + drivers/iio/amplifiers/Kconfig | 11 + + drivers/iio/amplifiers/Makefile | 1 + + drivers/iio/amplifiers/ada4250.c | 403 +++++ + drivers/iio/amplifiers/hmc425a.c | 6 +- + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 2 +- + drivers/iio/buffer/industrialio-hw-consumer.c | 4 +- + drivers/iio/chemical/atlas-ezo-sensor.c | 32 +- + drivers/iio/chemical/atlas-sensor.c | 17 +- + drivers/iio/chemical/bme680_core.c | 4 +- + drivers/iio/chemical/bme680_i2c.c | 1 + + drivers/iio/chemical/bme680_spi.c | 3 +- + drivers/iio/chemical/scd4x.c | 2 +- + drivers/iio/chemical/sps30.c | 2 +- + drivers/iio/common/ms_sensors/ms_sensors_i2c.c | 28 +- + drivers/iio/common/ssp_sensors/ssp_dev.c | 40 +- + drivers/iio/common/ssp_sensors/ssp_iio.c | 7 +- + drivers/iio/common/st_sensors/Kconfig | 2 - + drivers/iio/common/st_sensors/st_sensors_buffer.c | 7 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 28 +- + drivers/iio/common/st_sensors/st_sensors_i2c.c | 2 +- + drivers/iio/common/st_sensors/st_sensors_spi.c | 2 +- + drivers/iio/common/st_sensors/st_sensors_trigger.c | 9 +- + drivers/iio/dac/Kconfig | 11 + + drivers/iio/dac/Makefile | 1 + + drivers/iio/dac/ad5592r-base.c | 5 +- + drivers/iio/dac/ad5592r.c | 1 + + drivers/iio/dac/ad5593r.c | 1 + + drivers/iio/dac/ad5686-spi.c | 1 + + drivers/iio/dac/ad5686.c | 4 +- + drivers/iio/dac/ad5696-i2c.c | 1 + + drivers/iio/dac/ltc2688.c | 1071 +++++++++++++ + drivers/iio/dac/m62332.c | 11 +- + drivers/iio/dac/stm32-dac-core.c | 16 +- + drivers/iio/dac/stm32-dac.c | 9 +- + drivers/iio/dac/vf610_dac.c | 7 +- + drivers/iio/frequency/Kconfig | 20 + + drivers/iio/frequency/Makefile | 2 + + drivers/iio/frequency/ad9523.c | 2 +- + drivers/iio/frequency/adf4350.c | 103 +- + drivers/iio/frequency/admv1013.c | 2 +- + drivers/iio/frequency/admv1014.c | 823 ++++++++++ + drivers/iio/frequency/admv4420.c | 398 +++++ + drivers/iio/gyro/Kconfig | 37 +- + drivers/iio/gyro/adis16136.c | 1 + + drivers/iio/gyro/adis16260.c | 1 + + drivers/iio/gyro/ssp_gyro_sensor.c | 1 + + drivers/iio/gyro/st_gyro_buffer.c | 4 - + drivers/iio/gyro/st_gyro_core.c | 5 +- + drivers/iio/gyro/st_gyro_i2c.c | 1 + + drivers/iio/gyro/st_gyro_spi.c | 1 + + drivers/iio/humidity/dht11.c | 3 +- + drivers/iio/humidity/hdc100x.c | 7 + + drivers/iio/humidity/htu21.c | 1 + + drivers/iio/imu/adis.c | 67 +- + drivers/iio/imu/adis16400.c | 1 + + drivers/iio/imu/adis16460.c | 1 + + drivers/iio/imu/adis16475.c | 1 + + drivers/iio/imu/adis16480.c | 1 + + drivers/iio/imu/adis_buffer.c | 10 +- + drivers/iio/imu/adis_trigger.c | 5 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 5 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 15 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 5 +- + drivers/iio/imu/kmx61.c | 10 +- + drivers/iio/imu/st_lsm9ds0/Kconfig | 28 +- + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c | 3 +- + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c | 1 + + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 1 + + drivers/iio/industrialio-buffer.c | 4 +- + drivers/iio/industrialio-core.c | 2 +- + drivers/iio/industrialio-event.c | 1 + + drivers/iio/inkern.c | 40 +- + drivers/iio/light/apds9300.c | 10 +- + drivers/iio/light/bh1780.c | 12 +- + drivers/iio/light/cm3232.c | 9 +- + drivers/iio/light/isl29018.c | 10 +- + drivers/iio/light/isl29125.c | 7 +- + drivers/iio/light/jsa1212.c | 11 +- + drivers/iio/light/lm3533-als.c | 6 +- + drivers/iio/light/ltr501.c | 20 +- + drivers/iio/light/pa12203001.c | 4 +- + drivers/iio/light/rpr0521.c | 7 +- + drivers/iio/light/st_uvis25_core.c | 4 +- + drivers/iio/light/st_uvis25_i2c.c | 1 + + drivers/iio/light/st_uvis25_spi.c | 1 + + drivers/iio/light/stk3310.c | 11 +- + drivers/iio/light/tcs3414.c | 7 +- + drivers/iio/light/tcs3472.c | 7 +- + drivers/iio/light/tsl2563.c | 10 +- + drivers/iio/light/tsl2772.c | 2 +- + drivers/iio/light/tsl4531.c | 10 +- + drivers/iio/light/us5182d.c | 6 +- + drivers/iio/light/vcnl4035.c | 2 +- + drivers/iio/magnetometer/Kconfig | 35 +- + drivers/iio/magnetometer/ak8975.c | 12 +- + drivers/iio/magnetometer/bmc150_magn.c | 8 +- + drivers/iio/magnetometer/bmc150_magn_i2c.c | 1 + + drivers/iio/magnetometer/bmc150_magn_spi.c | 1 + + drivers/iio/magnetometer/hmc5843_core.c | 8 +- + drivers/iio/magnetometer/hmc5843_i2c.c | 1 + + drivers/iio/magnetometer/hmc5843_spi.c | 1 + + drivers/iio/magnetometer/mag3110.c | 10 +- + drivers/iio/magnetometer/mmc35240.c | 9 +- + drivers/iio/magnetometer/rm3100-core.c | 8 +- + drivers/iio/magnetometer/rm3100-i2c.c | 1 + + drivers/iio/magnetometer/rm3100-spi.c | 1 + + drivers/iio/magnetometer/st_magn_buffer.c | 4 - + drivers/iio/magnetometer/st_magn_core.c | 5 +- + drivers/iio/magnetometer/st_magn_i2c.c | 1 + + drivers/iio/magnetometer/st_magn_spi.c | 1 + + drivers/iio/potentiometer/Kconfig | 6 +- + drivers/iio/potentiometer/ds1803.c | 169 ++- + drivers/iio/pressure/Kconfig | 35 +- + drivers/iio/pressure/dps310.c | 7 + + drivers/iio/pressure/mpl115.c | 2 +- + drivers/iio/pressure/mpl115_i2c.c | 1 + + drivers/iio/pressure/mpl115_spi.c | 1 + + drivers/iio/pressure/mpl3115.c | 10 +- + drivers/iio/pressure/ms5611_core.c | 4 +- + drivers/iio/pressure/ms5611_i2c.c | 1 + + drivers/iio/pressure/ms5611_spi.c | 1 + + drivers/iio/pressure/ms5637.c | 1 + + drivers/iio/pressure/st_pressure_buffer.c | 5 - + drivers/iio/pressure/st_pressure_core.c | 5 +- + drivers/iio/pressure/st_pressure_i2c.c | 1 + + drivers/iio/pressure/st_pressure_spi.c | 1 + + drivers/iio/pressure/zpa2326.c | 12 +- + drivers/iio/pressure/zpa2326_i2c.c | 1 + + drivers/iio/pressure/zpa2326_spi.c | 1 + + drivers/iio/proximity/Kconfig | 34 + + drivers/iio/proximity/Makefile | 3 + + drivers/iio/proximity/as3935.c | 26 +- + drivers/iio/proximity/ping.c | 4 +- + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 7 +- + drivers/iio/proximity/rfd77402.c | 9 +- + drivers/iio/proximity/srf04.c | 12 +- + drivers/iio/proximity/srf08.c | 6 +- + drivers/iio/proximity/sx9310.c | 741 ++------- + drivers/iio/proximity/sx9324.c | 1068 +++++++++++++ + drivers/iio/proximity/sx9360.c | 893 +++++++++++ + drivers/iio/proximity/sx9500.c | 8 +- + drivers/iio/proximity/sx_common.c | 572 +++++++ + drivers/iio/proximity/sx_common.h | 157 ++ + drivers/iio/proximity/vl53l0x-i2c.c | 2 +- + drivers/iio/temperature/max31856.c | 4 +- + drivers/iio/temperature/max31865.c | 4 +- + drivers/iio/temperature/maxim_thermocouple.c | 5 +- + drivers/iio/temperature/mlx90614.c | 12 +- + drivers/iio/temperature/mlx90632.c | 2 +- + drivers/iio/temperature/tmp006.c | 6 +- + drivers/iio/temperature/tmp007.c | 6 +- + drivers/iio/temperature/tsys01.c | 1 + + drivers/iio/temperature/tsys02d.c | 1 + + drivers/iio/test/Kconfig | 10 + + drivers/iio/test/Makefile | 1 + + drivers/iio/test/iio-test-rescale.c | 710 +++++++++ + drivers/iio/trigger/Kconfig | 2 +- + drivers/iio/trigger/stm32-timer-trigger.c | 23 +- + drivers/staging/iio/accel/adis16203.c | 1 + + drivers/staging/iio/accel/adis16240.c | 1 + + drivers/staging/iio/adc/Kconfig | 11 - + drivers/staging/iio/adc/Makefile | 1 - + drivers/staging/iio/adc/ad7280a.c | 1044 ------------- + drivers/staging/iio/adc/ad7280a.h | 37 - + include/linux/iio/adc/qcom-vadc-common.h | 15 +- + include/linux/iio/afe/rescale.h | 36 + + include/linux/iio/iio.h | 2 +- + include/linux/iio/imu/adis.h | 60 +- + include/linux/math.h | 12 + + include/uapi/linux/iio/types.h | 1 + + tools/iio/iio_event_monitor.c | 1 + + 295 files changed, 12309 insertions(+), 2942 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-ad7280a + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-dac-ltc2688 + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-frequency-admv1014 + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-sx9324 + create mode 100644 Documentation/devicetree/bindings/iio/accel/adi,adxl367.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7280a.yaml + create mode 100644 Documentation/devicetree/bindings/iio/afe/temperature-sense-rtd.yaml + create mode 100644 Documentation/devicetree/bindings/iio/afe/temperature-transducer.yaml + create mode 100644 Documentation/devicetree/bindings/iio/amplifiers/adi,ada4250.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ltc2688.yaml + create mode 100644 Documentation/devicetree/bindings/iio/frequency/adi,admv1014.yaml + create mode 100644 Documentation/devicetree/bindings/iio/frequency/adi,admv4420.yaml + create mode 100644 Documentation/devicetree/bindings/iio/proximity/semtech,sx9324.yaml + create mode 100644 Documentation/devicetree/bindings/iio/proximity/semtech,sx9360.yaml + create mode 100644 drivers/iio/accel/adxl367.c + create mode 100644 drivers/iio/accel/adxl367.h + create mode 100644 drivers/iio/accel/adxl367_i2c.c + create mode 100644 drivers/iio/accel/adxl367_spi.c + create mode 100644 drivers/iio/adc/ad7280a.c + create mode 100644 drivers/iio/amplifiers/ada4250.c + create mode 100644 drivers/iio/dac/ltc2688.c + create mode 100644 drivers/iio/frequency/admv1014.c + create mode 100644 drivers/iio/frequency/admv4420.c + create mode 100644 drivers/iio/proximity/sx9324.c + create mode 100644 drivers/iio/proximity/sx9360.c + create mode 100644 drivers/iio/proximity/sx_common.c + create mode 100644 drivers/iio/proximity/sx_common.h + create mode 100644 drivers/iio/test/iio-test-rescale.c + delete mode 100644 drivers/staging/iio/adc/ad7280a.c + delete mode 100644 drivers/staging/iio/adc/ad7280a.h + create mode 100644 include/linux/iio/afe/rescale.h +Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging icc/icc-next (52c85167e413 Merge branch 'icc-msm8939' 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. + .../devicetree/bindings/interconnect/qcom,rpm.yaml | 33 ++++++++++++++++++-- + drivers/interconnect/imx/imx.c | 9 ++++++ + drivers/interconnect/qcom/msm8939.c | 10 +----- + include/linux/interconnect.h | 36 +++++++++++++++++----- + 4 files changed, 70 insertions(+), 18 deletions(-) +Merging dmaengine/next (ea7c8f598c32 dmaengine: idxd: restore traffic class defaults after wq reset) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/renesas,rz-dmac.yaml | 4 +++- + drivers/dma/altera-msgdma.c | 4 +--- + drivers/dma/idxd/device.c | 9 ++++++-- + drivers/dma/imx-sdma.c | 18 +++++++++++++++- + drivers/dma/ioat/init.c | 2 -- + drivers/dma/ptdma/ptdma-dmaengine.c | 24 +++++++++++++++------- + drivers/dma/stm32-dma.c | 1 + + 7 files changed, 46 insertions(+), 16 deletions(-) +Merging cgroup/for-next (88ea791b5665 Merge branch 'for-5.17-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Merge made by the 'ort' strategy. +Merging scsi/for-next (f6de306274ab Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging block/blk-core.c +Auto-merging block/blk-lib.c +CONFLICT (content): Merge conflict in block/blk-lib.c +Auto-merging block/blk-merge.c +Auto-merging block/blk-sysfs.c +Auto-merging block/blk-zoned.c +Auto-merging block/blk.h +Auto-merging block/bounce.c +Auto-merging drivers/block/drbd/drbd_receiver.c +Auto-merging drivers/block/drbd/drbd_req.c +Auto-merging drivers/block/drbd/drbd_worker.c +Auto-merging drivers/block/rnbd/rnbd-clt.c +CONFLICT (content): Merge conflict in drivers/block/rnbd/rnbd-clt.c +Auto-merging drivers/block/rnbd/rnbd-clt.h +Auto-merging drivers/block/rnbd/rnbd-proto.h +Auto-merging drivers/block/rnbd/rnbd-srv.c +Auto-merging drivers/md/dm-core.h +Auto-merging drivers/md/dm-crypt.c +Auto-merging drivers/md/dm-io.c +Auto-merging drivers/md/dm-mpath.c +Auto-merging drivers/md/dm-rq.c +Auto-merging drivers/md/dm-table.c +Auto-merging drivers/md/dm.c +Auto-merging drivers/md/md-multipath.c +Auto-merging drivers/md/raid1.c +Auto-merging drivers/md/raid10.c +Auto-merging drivers/md/raid5.c +Auto-merging drivers/scsi/scsi_debug.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/sg.c +Auto-merging include/linux/bio.h +Auto-merging include/linux/blk_types.h +Auto-merging include/linux/blkdev.h +Auto-merging include/linux/device-mapper.h +Resolved 'block/blk-lib.c' using previous resolution. +Resolved 'drivers/block/rnbd/rnbd-clt.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3e4bf1b095ab] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git +$ git diff -M --stat --summary HEAD^.. + Documentation/scsi/libsas.rst | 2 - + block/blk-core.c | 13 +- + block/blk-lib.c | 88 ----- + block/blk-merge.c | 40 -- + block/blk-settings.c | 16 - + block/blk-sysfs.c | 3 +- + block/blk-zoned.c | 1 - + block/blk.h | 1 - + block/bounce.c | 3 - + drivers/block/drbd/drbd_main.c | 31 +- + drivers/block/drbd/drbd_nl.c | 72 +--- + drivers/block/drbd/drbd_receiver.c | 47 +-- + drivers/block/drbd/drbd_req.c | 1 - + drivers/block/drbd/drbd_worker.c | 5 - + drivers/block/rnbd/rnbd-clt.c | 7 +- + drivers/block/rnbd/rnbd-clt.h | 1 - + drivers/block/rnbd/rnbd-proto.h | 6 - + drivers/block/rnbd/rnbd-srv.c | 3 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 1 + + drivers/md/dm-core.h | 1 - + drivers/md/dm-crypt.c | 1 - + drivers/md/dm-ebs-target.c | 1 - + drivers/md/dm-io.c | 22 +- + drivers/md/dm-linear.c | 1 - + drivers/md/dm-mpath.c | 1 - + drivers/md/dm-rq.c | 3 - + drivers/md/dm-stripe.c | 4 +- + drivers/md/dm-table.c | 29 -- + drivers/md/dm-zone.c | 4 - + drivers/md/dm.c | 15 - + drivers/md/md-linear.c | 1 - + drivers/md/md-multipath.c | 1 - + drivers/md/md.h | 7 - + drivers/md/raid0.c | 2 - + drivers/md/raid1.c | 4 +- + drivers/md/raid10.c | 1 - + drivers/md/raid5.c | 1 - + drivers/message/fusion/mptspi.c | 2 +- + drivers/scsi/53c700.c | 2 - + drivers/scsi/NCR5380.c | 94 +++-- + drivers/scsi/NCR5380.h | 13 +- + drivers/scsi/a2091.c | 25 +- + drivers/scsi/a3000.c | 25 +- + drivers/scsi/aacraid/aachba.c | 43 ++- + drivers/scsi/aacraid/aacraid.h | 24 +- + drivers/scsi/aacraid/comminit.c | 2 +- + drivers/scsi/aacraid/linit.c | 21 +- + drivers/scsi/advansys.c | 22 +- + drivers/scsi/aha152x.c | 268 +++++++------ + drivers/scsi/aha1542.c | 3 +- + drivers/scsi/aha1740.c | 6 +- + drivers/scsi/aic94xx/aic94xx.h | 1 - + drivers/scsi/aic94xx/aic94xx_init.c | 1 - + drivers/scsi/aic94xx/aic94xx_task.c | 9 - + drivers/scsi/aic94xx/aic94xx_tmf.c | 11 +- + drivers/scsi/arm/acornscsi.c | 28 +- + drivers/scsi/arm/{scsi.h => arm_scsi.h} | 37 +- + drivers/scsi/arm/arxescsi.c | 6 +- + drivers/scsi/arm/cumana_1.c | 2 +- + drivers/scsi/arm/cumana_2.c | 8 +- + drivers/scsi/arm/eesox.c | 8 +- + drivers/scsi/arm/fas216.c | 36 +- + drivers/scsi/arm/fas216.h | 4 + + drivers/scsi/arm/oak.c | 2 +- + drivers/scsi/arm/powertec.c | 8 +- + drivers/scsi/arm/queue.c | 6 +- + drivers/scsi/atari_scsi.c | 6 +- + drivers/scsi/be2iscsi/be_main.c | 3 +- + drivers/scsi/bfa/bfad_attr.c | 26 +- + drivers/scsi/bfa/bfad_im.c | 27 +- + drivers/scsi/bfa/bfad_im.h | 16 + + drivers/scsi/bnx2fc/bnx2fc.h | 9 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 8 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 23 +- + drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2 +- + drivers/scsi/bnx2i/bnx2i_iscsi.c | 1 + + drivers/scsi/csiostor/csio_scsi.c | 20 +- + drivers/scsi/csiostor/csio_scsi.h | 10 + + drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 1 + + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 1 + + drivers/scsi/cxlflash/vlun.c | 4 +- + drivers/scsi/dc395x.c | 3 - + drivers/scsi/dmx3191d.c | 2 +- + drivers/scsi/esp_scsi.c | 4 +- + drivers/scsi/esp_scsi.h | 3 +- + drivers/scsi/fcoe/fcoe.c | 1 + + drivers/scsi/fdomain.c | 64 ++-- + drivers/scsi/fnic/fnic.h | 27 +- + drivers/scsi/fnic/fnic_main.c | 1 + + drivers/scsi/fnic/fnic_scsi.c | 289 +++++++------- + drivers/scsi/g_NCR5380.c | 6 +- + drivers/scsi/gvp11.c | 25 +- + drivers/scsi/hisi_sas/hisi_sas.h | 9 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 235 ++---------- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 20 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 12 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 5 +- + drivers/scsi/hptiop.c | 1 + + drivers/scsi/hptiop.h | 4 +- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 9 +- + drivers/scsi/imm.c | 88 ++--- + drivers/scsi/imm.h | 5 + + drivers/scsi/initio.c | 14 +- + drivers/scsi/initio.h | 9 + + drivers/scsi/ips.c | 52 ++- + drivers/scsi/isci/init.c | 1 - + drivers/scsi/isci/request.c | 22 +- + drivers/scsi/isci/request.h | 5 +- + drivers/scsi/isci/task.c | 41 +- + drivers/scsi/isci/task.h | 4 - + drivers/scsi/iscsi_tcp.c | 1 + + drivers/scsi/libfc/fc_fcp.c | 26 +- + drivers/scsi/libiscsi.c | 20 +- + drivers/scsi/libsas/sas_ata.c | 25 +- + drivers/scsi/libsas/sas_discover.c | 6 +- + drivers/scsi/libsas/sas_expander.c | 24 +- + drivers/scsi/libsas/sas_internal.h | 6 + + drivers/scsi/libsas/sas_scsi_host.c | 231 +++++++++++- + drivers/scsi/libsas/sas_task.c | 14 +- + drivers/scsi/lpfc/lpfc_init.c | 1 - + drivers/scsi/mac53c94.c | 27 +- + drivers/scsi/mac53c94.h | 11 + + drivers/scsi/mac_scsi.c | 9 +- + drivers/scsi/megaraid.c | 21 +- + drivers/scsi/megaraid.h | 23 +- + drivers/scsi/megaraid/megaraid_sas.h | 12 + + drivers/scsi/megaraid/megaraid_sas_base.c | 8 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 15 +- + drivers/scsi/mesh.c | 20 +- + drivers/scsi/mesh.h | 11 + + drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h | 122 ++++-- + drivers/scsi/mpi3mr/mpi/mpi30_init.h | 3 + + drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 46 ++- + drivers/scsi/mpi3mr/mpi/mpi30_pci.h | 3 +- + drivers/scsi/mpi3mr/mpi/mpi30_transport.h | 8 +- + drivers/scsi/mpi3mr/mpi3mr.h | 10 +- + drivers/scsi/mpi3mr/mpi3mr_debug.h | 2 +- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 12 +- + drivers/scsi/mpi3mr/mpi3mr_os.c | 161 +++++--- + drivers/scsi/mpt3sas/mpi/mpi2_ioc.h | 6 +- + drivers/scsi/mvme147.c | 16 +- + drivers/scsi/mvsas/mv_defs.h | 5 - + drivers/scsi/mvsas/mv_init.c | 15 +- + drivers/scsi/mvsas/mv_sas.c | 185 +-------- + drivers/scsi/mvsas/mv_sas.h | 3 - + drivers/scsi/mvumi.c | 9 +- + drivers/scsi/mvumi.h | 9 + + drivers/scsi/ncr53c8xx.c | 22 +- + drivers/scsi/ncr53c8xx.h | 6 + + drivers/scsi/nsp32.c | 20 +- + drivers/scsi/nsp32.h | 9 + + drivers/scsi/pcmcia/aha152x_stub.c | 9 +- + drivers/scsi/pcmcia/nsp_cs.c | 246 ++++++------ + drivers/scsi/pcmcia/nsp_cs.h | 8 +- + drivers/scsi/pcmcia/nsp_debug.c | 2 +- + drivers/scsi/pcmcia/qlogic_stub.c | 9 +- + drivers/scsi/pcmcia/sym53c500_cs.c | 47 ++- + drivers/scsi/pm8001/pm8001_ctl.c | 66 ++-- + drivers/scsi/pm8001/pm8001_hwi.c | 469 ++++++++++------------- + drivers/scsi/pm8001/pm8001_init.c | 16 +- + drivers/scsi/pm8001/pm8001_sas.c | 497 +++++++++---------------- + drivers/scsi/pm8001/pm8001_sas.h | 80 +++- + drivers/scsi/pm8001/pm80xx_hwi.c | 472 +++++++++++------------ + drivers/scsi/pm8001/pm80xx_hwi.h | 2 +- + drivers/scsi/ppa.c | 75 ++-- + drivers/scsi/qedf/qedf.h | 10 +- + drivers/scsi/qedf/qedf_io.c | 25 +- + drivers/scsi/qedf/qedf_main.c | 3 +- + drivers/scsi/qedi/qedi_fw.c | 4 +- + drivers/scsi/qedi/qedi_iscsi.c | 1 + + drivers/scsi/qedi/qedi_main.c | 2 - + drivers/scsi/qla1280.c | 21 +- + drivers/scsi/qla1280.h | 3 +- + drivers/scsi/qla2xxx/qla_attr.c | 7 +- + drivers/scsi/qla2xxx/qla_bsg.c | 6 +- + drivers/scsi/qla2xxx/qla_def.h | 55 +-- + drivers/scsi/qla2xxx/qla_edif.c | 25 +- + drivers/scsi/qla2xxx/qla_gbl.h | 7 +- + drivers/scsi/qla2xxx/qla_gs.c | 155 ++++---- + drivers/scsi/qla2xxx/qla_init.c | 227 ++++++----- + drivers/scsi/qla2xxx/qla_inline.h | 2 + + drivers/scsi/qla2xxx/qla_iocb.c | 85 +++-- + drivers/scsi/qla2xxx/qla_isr.c | 10 +- + drivers/scsi/qla2xxx/qla_mbx.c | 37 +- + drivers/scsi/qla2xxx/qla_mid.c | 9 +- + drivers/scsi/qla2xxx/qla_mr.c | 11 +- + drivers/scsi/qla2xxx/qla_nvme.c | 16 +- + drivers/scsi/qla2xxx/qla_nvme.h | 4 + + drivers/scsi/qla2xxx/qla_nx.c | 35 +- + drivers/scsi/qla2xxx/qla_nx.h | 20 +- + drivers/scsi/qla2xxx/qla_nx2.c | 9 +- + drivers/scsi/qla2xxx/qla_os.c | 54 ++- + drivers/scsi/qla2xxx/qla_sup.c | 4 +- + drivers/scsi/qla2xxx/qla_target.c | 34 +- + drivers/scsi/qla2xxx/qla_tmpl.c | 9 +- + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/qla4xxx/ql4_def.h | 16 +- + drivers/scsi/qla4xxx/ql4_os.c | 13 +- + drivers/scsi/qlogicfas.c | 6 +- + drivers/scsi/qlogicfas408.c | 6 +- + drivers/scsi/scsi.h | 46 --- + drivers/scsi/scsi_debug.c | 474 ++++++++++++++++------- + drivers/scsi/scsi_lib.c | 21 +- + drivers/scsi/scsi_sysfs.c | 8 - + drivers/scsi/sd.c | 75 +--- + drivers/scsi/sd_zbc.c | 2 - + drivers/scsi/sg.c | 8 +- + drivers/scsi/sgiwd93.c | 24 +- + drivers/scsi/smartpqi/smartpqi.h | 16 +- + drivers/scsi/smartpqi/smartpqi_init.c | 559 +++++++++++++++++++++------- + drivers/scsi/smartpqi/smartpqi_sis.c | 10 +- + drivers/scsi/smartpqi/smartpqi_sis.h | 1 + + drivers/scsi/sun3_scsi.c | 4 +- + drivers/scsi/sym53c8xx_2/sym_glue.c | 4 +- + drivers/scsi/ufs/ufs.h | 6 + + drivers/scsi/ufs/ufshcd.c | 54 ++- + drivers/scsi/wd33c93.c | 119 +++--- + drivers/scsi/wd33c93.h | 4 + + drivers/scsi/wd719x.c | 12 +- + drivers/scsi/wd719x.h | 1 + + drivers/scsi/zalon.c | 1 + + drivers/target/target_core_user.c | 73 +++- + drivers/usb/image/microtek.c | 8 +- + drivers/usb/storage/debug.c | 1 - + drivers/usb/storage/uas.c | 43 +-- + drivers/usb/storage/usb.c | 2 +- + include/linux/bio.h | 3 - + include/linux/blk_types.h | 2 - + include/linux/blkdev.h | 19 - + include/linux/device-mapper.h | 6 - + include/scsi/libfc.h | 9 + + include/scsi/libiscsi.h | 12 + + include/scsi/libsas.h | 24 +- + include/scsi/sas.h | 7 + + include/scsi/sas_ata.h | 14 +- + include/scsi/scsi_cmnd.h | 15 +- + include/scsi/scsi_host.h | 3 - + include/scsi/viosrp.h | 17 +- + kernel/trace/blktrace.c | 1 - + 239 files changed, 4181 insertions(+), 3918 deletions(-) + rename drivers/scsi/arm/{scsi.h => arm_scsi.h} (75%) + delete mode 100644 drivers/scsi/scsi.h +Merging scsi-mkp/for-next (f2ddbbea7780 scsi: lpfc: Copyright updates for 14.2.0.0 patches) +$ 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/ata/libata-scsi.c +Auto-merging drivers/block/pktcdvd.c +Auto-merging drivers/scsi/lpfc/lpfc.h +Auto-merging drivers/scsi/lpfc/lpfc_els.c +Auto-merging drivers/scsi/lpfc/lpfc_nportdisc.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/sg.c +Auto-merging drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/ufs/ufshpb.c +Auto-merging drivers/target/target_core_pscsi.c +Merge made by the 'ort' strategy. + Documentation/scsi/scsi_eh.rst | 15 +- + drivers/ata/libata-scsi.c | 4 +- + drivers/block/pktcdvd.c | 8 +- + drivers/cdrom/cdrom.c | 1 - + drivers/message/fusion/mptsas.c | 2 +- + drivers/scsi/aha152x.c | 6 +- + drivers/scsi/hisi_sas/hisi_sas.h | 2 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 3 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 127 +- + drivers/scsi/libfc/fc_encode.h | 2 +- + drivers/scsi/libiscsi.c | 6 +- + drivers/scsi/libsas/sas_event.c | 50 +- + drivers/scsi/libsas/sas_internal.h | 4 +- + drivers/scsi/libsas/sas_port.c | 73 +- + drivers/scsi/lpfc/lpfc.h | 98 +- + drivers/scsi/lpfc/lpfc_bsg.c | 349 ++-- + drivers/scsi/lpfc/lpfc_crtn.h | 22 +- + drivers/scsi/lpfc/lpfc_ct.c | 346 ++-- + drivers/scsi/lpfc/lpfc_els.c | 1513 ++++++++++------- + drivers/scsi/lpfc/lpfc_hbadisc.c | 46 +- + drivers/scsi/lpfc/lpfc_hw.h | 16 +- + drivers/scsi/lpfc/lpfc_hw4.h | 38 +- + drivers/scsi/lpfc/lpfc_init.c | 13 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 104 +- + drivers/scsi/lpfc/lpfc_nvme.c | 41 +- + drivers/scsi/lpfc/lpfc_nvme.h | 8 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 85 +- + drivers/scsi/lpfc/lpfc_scsi.c | 598 +++---- + drivers/scsi/lpfc/lpfc_sli.c | 2831 +++++++++++++++----------------- + drivers/scsi/lpfc/lpfc_sli.h | 31 +- + drivers/scsi/lpfc/lpfc_sli4.h | 2 +- + drivers/scsi/lpfc/lpfc_version.h | 6 +- + drivers/scsi/mac53c94.c | 21 +- + drivers/scsi/mac53c94.h | 10 +- + drivers/scsi/mesh.c | 19 +- + drivers/scsi/mesh.h | 10 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 28 +- + drivers/scsi/pm8001/pm80xx_hwi.h | 9 +- + drivers/scsi/qla4xxx/ql4_os.c | 5 +- + drivers/scsi/scsi_bsg.c | 42 +- + drivers/scsi/scsi_debugfs.c | 6 +- + drivers/scsi/scsi_error.c | 47 +- + drivers/scsi/scsi_ioctl.c | 76 +- + drivers/scsi/scsi_lib.c | 118 +- + drivers/scsi/scsi_logging.c | 5 +- + drivers/scsi/scsi_transport_fc.c | 39 +- + drivers/scsi/scsi_transport_iscsi.c | 94 +- + drivers/scsi/scsi_transport_sas.c | 1 - + drivers/scsi/sd.c | 34 +- + drivers/scsi/sg.c | 44 +- + drivers/scsi/sr.c | 30 +- + drivers/scsi/st.c | 30 +- + drivers/scsi/ufs/ufshcd.c | 21 +- + drivers/scsi/ufs/ufshpb.c | 22 +- + drivers/scsi/wd719x.c | 3 +- + drivers/target/target_core_pscsi.c | 67 +- + drivers/target/target_core_pscsi.h | 4 - + drivers/usb/storage/cypress_atacb.c | 1 - + drivers/usb/storage/isd200.c | 4 +- + include/linux/bsg-lib.h | 1 - + include/scsi/fc/fc_ms.h | 4 +- + include/scsi/libiscsi.h | 1 - + include/scsi/libsas.h | 8 +- + include/scsi/scsi_cmnd.h | 16 +- + include/scsi/scsi_device.h | 1 + + include/scsi/scsi_eh.h | 4 +- + include/scsi/scsi_request.h | 31 - + include/scsi/scsi_transport_iscsi.h | 4 +- + 68 files changed, 3713 insertions(+), 3597 deletions(-) + delete mode 100644 include/scsi/scsi_request.h +Merging vhost/linux-next (fae0bd40fab0 virtio_console: break out of buf poll on remove) +$ 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/char/virtio_console.c | 7 ++++++ + drivers/virtio/virtio.c | 56 +++++++++++++++++++++++++++++-------------- + include/linux/virtio.h | 1 - + include/linux/virtio_config.h | 3 ++- + 4 files changed, 47 insertions(+), 20 deletions(-) +Merging rpmsg/for-next (dbba77c2f01b Merge branch 'rproc-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. + drivers/remoteproc/mtk_scp.c | 55 +++++++++++++-------------------- + drivers/remoteproc/remoteproc_debugfs.c | 2 +- + 2 files changed, 22 insertions(+), 35 deletions(-) +Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (37db988c3629 Merge tag 'intel-gpio-v5.18-1' of gitolite.kernel.org:pub/scm/linux/kernel/git/andy/linux-gpio-intel into gpio/for-next) +$ 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 drivers/gpio/Kconfig +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/gpiolib-sysfs.c +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/gpio/gpiolib.h +Merge made by the 'ort' strategy. + .../bindings/gpio/airoha,en7523-gpio.yaml | 66 ++++++++++ + .../devicetree/bindings/gpio/faraday,ftgpio010.txt | 27 ---- + .../bindings/gpio/faraday,ftgpio010.yaml | 65 ++++++++++ + .../devicetree/bindings/gpio/gpio-vf610.yaml | 4 +- + Documentation/devicetree/bindings/gpio/gpio.txt | 2 +- + drivers/gpio/Kconfig | 16 ++- + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-altera-a10sr.c | 3 +- + drivers/gpio/gpio-crystalcove.c | 9 +- + drivers/gpio/gpio-en7523.c | 137 +++++++++++++++++++++ + drivers/gpio/gpio-merrifield.c | 3 + + drivers/gpio/gpio-tegra.c | 1 - + drivers/gpio/gpio-tps68470.c | 5 +- + drivers/gpio/gpiolib-of.c | 10 +- + drivers/gpio/gpiolib-sysfs.c | 100 ++++++--------- + drivers/gpio/gpiolib.c | 35 +++--- + drivers/gpio/gpiolib.h | 41 ++++++ + include/linux/gpio/consumer.h | 35 +++--- + 18 files changed, 418 insertions(+), 142 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/airoha,en7523-gpio.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/faraday,ftgpio010.txt + create mode 100644 Documentation/devicetree/bindings/gpio/faraday,ftgpio010.yaml + create mode 100644 drivers/gpio/gpio-en7523.c +Merging gpio-intel/for-next (a1ce76e89907 gpio: tps68470: Allow building as module) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'gpio/gpio-sim' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-sim/gpio/gpio-sim +Already up to date. +Merging pinctrl/for-next (842366d7cb68 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 MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging drivers/pinctrl/intel/pinctrl-baytrail.c +Auto-merging drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +Auto-merging drivers/pinctrl/pinctrl-starfive.c +Merge made by the 'ort' strategy. + .../bindings/pinctrl/brcm,bcm11351-pinctrl.txt | 2 +- + .../bindings/pinctrl/brcm,bcm4908-pinctrl.yaml | 72 + + .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 1 + + .../bindings/pinctrl/microchip,sparx5-sgpio.yaml | 2 +- + .../bindings/pinctrl/mscc,ocelot-pinctrl.txt | 4 +- + .../bindings/pinctrl/pinctrl-mt8195.yaml | 30 +- + .../bindings/pinctrl/qcom,msm8953-pinctrl.yaml | 2 + + .../devicetree/bindings/pinctrl/qcom,pmic-mpp.yaml | 1 + + .../bindings/pinctrl/qcom,tlmm-common.yaml | 1 - + .../devicetree/bindings/pinctrl/renesas,pfc.yaml | 1 + + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 16 +- + .../bindings/pinctrl/samsung,pinctrl.yaml | 1 + + .../bindings/pinctrl/sunplus,sp7021-pinctrl.yaml | 374 ++++ + MAINTAINERS | 18 + + drivers/pinctrl/Kconfig | 1 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/bcm/Kconfig | 14 + + drivers/pinctrl/bcm/Makefile | 1 + + drivers/pinctrl/bcm/pinctrl-bcm4908.c | 563 ++++++ + drivers/pinctrl/intel/pinctrl-alderlake.c | 317 ++- + drivers/pinctrl/intel/pinctrl-baytrail.c | 55 +- + drivers/pinctrl/intel/pinctrl-icelake.c | 291 ++- + drivers/pinctrl/meson/Kconfig | 6 + + drivers/pinctrl/meson/Makefile | 1 + + drivers/pinctrl/meson/pinctrl-meson-g12a.c | 6 +- + drivers/pinctrl/meson/pinctrl-meson-s4.c | 1232 ++++++++++++ + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 160 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 16 +- + drivers/pinctrl/pinctrl-ocelot.c | 102 + + drivers/pinctrl/pinctrl-starfive.c | 2 +- + drivers/pinctrl/pxa/pinctrl-pxa27x.c | 5 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 13 +- + drivers/pinctrl/qcom/pinctrl-qcm2290.c | 12 + + drivers/pinctrl/qcom/pinctrl-sm8450.c | 106 +- + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 1 + + drivers/pinctrl/renesas/Kconfig | 11 +- + drivers/pinctrl/renesas/Makefile | 1 + + drivers/pinctrl/renesas/core.c | 219 +- + drivers/pinctrl/renesas/pfc-emev2.c | 71 +- + drivers/pinctrl/renesas/pfc-r8a73a4.c | 97 +- + drivers/pinctrl/renesas/pfc-r8a7740.c | 282 +-- + drivers/pinctrl/renesas/pfc-r8a77470.c | 240 +-- + drivers/pinctrl/renesas/pfc-r8a7778.c | 69 +- + drivers/pinctrl/renesas/pfc-r8a7779.c | 118 +- + drivers/pinctrl/renesas/pfc-r8a7790.c | 530 ++--- + drivers/pinctrl/renesas/pfc-r8a7791.c | 322 ++- + drivers/pinctrl/renesas/pfc-r8a7792.c | 446 ++-- + drivers/pinctrl/renesas/pfc-r8a7794.c | 214 +- + drivers/pinctrl/renesas/pfc-r8a77950.c | 119 +- + drivers/pinctrl/renesas/pfc-r8a77951.c | 313 +-- + drivers/pinctrl/renesas/pfc-r8a7796.c | 315 +-- + drivers/pinctrl/renesas/pfc-r8a77965.c | 333 +-- + drivers/pinctrl/renesas/pfc-r8a77970.c | 165 +- + drivers/pinctrl/renesas/pfc-r8a77980.c | 193 +- + drivers/pinctrl/renesas/pfc-r8a77990.c | 333 ++- + drivers/pinctrl/renesas/pfc-r8a77995.c | 200 +- + drivers/pinctrl/renesas/pfc-r8a779a0.c | 105 +- + drivers/pinctrl/renesas/pfc-r8a779f0.c | 2126 ++++++++++++++++++++ + drivers/pinctrl/renesas/pfc-sh7203.c | 1 - + drivers/pinctrl/renesas/pfc-sh7264.c | 1 - + drivers/pinctrl/renesas/pfc-sh7269.c | 1 - + drivers/pinctrl/renesas/pfc-sh73a0.c | 269 +-- + drivers/pinctrl/renesas/pfc-sh7720.c | 1 - + drivers/pinctrl/renesas/pfc-sh7722.c | 1 - + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 4 +- + drivers/pinctrl/renesas/pinctrl.c | 26 +- + drivers/pinctrl/renesas/sh_pfc.h | 176 +- + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 71 + + drivers/pinctrl/samsung/pinctrl-exynos.c | 3 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 2 + + drivers/pinctrl/samsung/pinctrl-samsung.h | 1 + + drivers/pinctrl/sunplus/Kconfig | 22 + + drivers/pinctrl/sunplus/Makefile | 6 + + drivers/pinctrl/sunplus/sppctl.c | 1118 ++++++++++ + drivers/pinctrl/sunplus/sppctl.h | 170 ++ + drivers/pinctrl/sunplus/sppctl_sp7021.c | 583 ++++++ + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 24 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 26 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 64 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 62 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c | 62 +- + include/dt-bindings/gpio/meson-s4-gpio.h | 99 + + include/dt-bindings/pinctrl/sppctl-sp7021.h | 179 ++ + include/dt-bindings/pinctrl/sppctl.h | 31 + + 84 files changed, 9783 insertions(+), 3472 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm4908-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/sunplus,sp7021-pinctrl.yaml + create mode 100644 drivers/pinctrl/bcm/pinctrl-bcm4908.c + create mode 100644 drivers/pinctrl/meson/pinctrl-meson-s4.c + create mode 100644 drivers/pinctrl/renesas/pfc-r8a779f0.c + create mode 100644 drivers/pinctrl/sunplus/Kconfig + create mode 100644 drivers/pinctrl/sunplus/Makefile + create mode 100644 drivers/pinctrl/sunplus/sppctl.c + create mode 100644 drivers/pinctrl/sunplus/sppctl.h + create mode 100644 drivers/pinctrl/sunplus/sppctl_sp7021.c + create mode 100644 include/dt-bindings/gpio/meson-s4-gpio.h + create mode 100644 include/dt-bindings/pinctrl/sppctl-sp7021.h + create mode 100644 include/dt-bindings/pinctrl/sppctl.h +Merging pinctrl-intel/for-next (d25478e1d8f9 pinctrl: icelake: Add Ice Lake-N PCH pin controller support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (babe298e9caa pinctrl: renesas: r8a779f0: Add Ethernet pins, groups, and functions) +$ 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 (3652dc070bad pinctrl: samsung: improve wake irq info on console) +$ 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 (ed14d36498c8 pwm: rcar: Simplify multiplication/shift logic) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Auto-merging Documentation/devicetree/bindings/mfd/google,cros-ec.yaml +Auto-merging Documentation/devicetree/bindings/pwm/pwm-sifive.yaml +Merge made by the 'ort' strategy. + .../devicetree/bindings/mfd/google,cros-ec.yaml | 4 + + .../bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 53 ++++---- + .../devicetree/bindings/pwm/brcm,bcm7038-pwm.yaml | 1 - + .../bindings/pwm/google,cros-ec-pwm.yaml | 5 +- + Documentation/devicetree/bindings/pwm/imx-pwm.yaml | 4 +- + .../devicetree/bindings/pwm/imx-tpm-pwm.yaml | 4 +- + .../devicetree/bindings/pwm/intel,keembay-pwm.yaml | 1 - + .../devicetree/bindings/pwm/intel,lgm-pwm.yaml | 3 + + .../devicetree/bindings/pwm/iqs620a-pwm.yaml | 4 +- + Documentation/devicetree/bindings/pwm/mxs-pwm.yaml | 4 +- + .../devicetree/bindings/pwm/pwm-mtk-disp.txt | 1 + + .../devicetree/bindings/pwm/pwm-rockchip.yaml | 74 +++++------ + .../devicetree/bindings/pwm/pwm-samsung.yaml | 1 - + .../devicetree/bindings/pwm/pwm-sifive.yaml | 4 +- + .../devicetree/bindings/pwm/pwm-tiecap.yaml | 1 - + .../devicetree/bindings/pwm/pwm-tiehrpwm.yaml | 1 - + .../devicetree/bindings/pwm/renesas,pwm-rcar.yaml | 26 ++-- + .../devicetree/bindings/pwm/renesas,tpu-pwm.yaml | 1 - + .../bindings/pwm/toshiba,pwm-visconti.yaml | 4 +- + .../devicetree/bindings/timer/ingenic,tcu.yaml | 1 + + drivers/pwm/pwm-atmel.c | 2 +- + drivers/pwm/pwm-bcm-kona.c | 90 ++++++++----- + drivers/pwm/pwm-brcmstb.c | 52 ++++---- + drivers/pwm/pwm-img.c | 141 ++++++++++----------- + drivers/pwm/pwm-imx1.c | 33 ++++- + drivers/pwm/pwm-jz4740.c | 5 + + drivers/pwm/pwm-lpc18xx-sct.c | 49 +++---- + drivers/pwm/pwm-mediatek.c | 34 ++--- + drivers/pwm/pwm-meson.c | 25 ++-- + drivers/pwm/pwm-pca9685.c | 4 +- + drivers/pwm/pwm-pxa.c | 33 ++++- + drivers/pwm/pwm-raspberrypi-poe.c | 1 - + drivers/pwm/pwm-rcar.c | 2 +- + drivers/pwm/pwm-stmpe.c | 18 ++- + drivers/pwm/pwm-sun4i.c | 70 +++++----- + drivers/pwm/pwm-tegra.c | 59 +++++---- + drivers/pwm/pwm-tiehrpwm.c | 40 +++++- + drivers/pwm/pwm-vt8500.c | 38 +++--- + 38 files changed, 492 insertions(+), 401 deletions(-) +Merging userns/for-next (0ac983f51203 ucounts: Fix systemd LimitNPROC with private users regression) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Already up to date. +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 (f6d344cd5fa6 selftests: Fix build when $(O) points to a relative path) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Auto-merging tools/testing/selftests/kvm/.gitignore +Auto-merging tools/testing/selftests/kvm/Makefile +Auto-merging tools/testing/selftests/net/Makefile +Auto-merging tools/testing/selftests/netfilter/Makefile +Merge made by the 'ort' strategy. + tools/testing/selftests/.gitignore | 1 + + tools/testing/selftests/Makefile | 37 ++++++++---- + tools/testing/selftests/exec/.gitignore | 2 + + tools/testing/selftests/exec/Makefile | 2 +- + .../exec/{binfmt_script => binfmt_script.py} | 0 + tools/testing/selftests/futex/functional/Makefile | 6 +- + tools/testing/selftests/kselftest/runner.sh | 30 +++++++++- + tools/testing/selftests/kvm/.gitignore | 1 + + tools/testing/selftests/kvm/Makefile | 2 +- + tools/testing/selftests/landlock/Makefile | 2 +- + tools/testing/selftests/net/Makefile | 2 +- + tools/testing/selftests/net/mptcp/Makefile | 2 +- + tools/testing/selftests/netfilter/Makefile | 1 + + tools/testing/selftests/rtc/rtctest.c | 66 ++++++++++++++++++++++ + tools/testing/selftests/rtc/settings | 2 +- + tools/testing/selftests/vm/Makefile | 2 +- + tools/testing/selftests/vm/userfaultfd.c | 3 + + 17 files changed, 139 insertions(+), 22 deletions(-) + rename tools/testing/selftests/exec/{binfmt_script => binfmt_script.py} (100%) +Merging livepatching/for-next (b44a7f076ce1 Merge branch 'for-5.18/selftests-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Merge made by the 'ort' strategy. + tools/testing/selftests/livepatch/functions.sh | 22 +++++++++++++++++++--- + tools/testing/selftests/livepatch/test-ftrace.sh | 3 ++- + 2 files changed, 21 insertions(+), 4 deletions(-) +Merging coresight/next (b54f53bc11a5 coresight: Drop unused 'none' enum value for each component) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Auto-merging arch/arm64/Kconfig +Merge made by the 'ort' strategy. + arch/arm64/Kconfig | 6 +- + drivers/hwtracing/coresight/coresight-core.c | 3 - + drivers/hwtracing/coresight/coresight-etm3x-core.c | 4 + + drivers/hwtracing/coresight/coresight-etm4x-core.c | 12 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 38 ++++++- + drivers/hwtracing/coresight/coresight-platform.c | 8 +- + drivers/hwtracing/coresight/coresight-syscfg.c | 2 +- + drivers/hwtracing/coresight/coresight-trbe.c | 125 +++++++++++++++------ + drivers/hwtracing/coresight/coresight-trbe.h | 8 -- + include/linux/coresight.h | 5 - + 10 files changed, 149 insertions(+), 62 deletions(-) +Merging rtc/rtc-next (73ce05302007 rtc: pcf2127: fix bug when reading alarm registers) +$ 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. + .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 84 ++++++++++++++++++---- + drivers/rtc/class.c | 9 +++ + drivers/rtc/rtc-pcf2127.c | 16 ++++- + drivers/rtc/rtc-pcf8523.c | 4 +- + drivers/rtc/rtc-sun6i.c | 24 +++++++ + include/dt-bindings/clock/sun6i-rtc.h | 10 +++ + 6 files changed, 131 insertions(+), 16 deletions(-) + create mode 100644 include/dt-bindings/clock/sun6i-rtc.h +Merging nvdimm/libnvdimm-for-next (2166a9974902 dax: make sure inodes are flushed before destroy cache) +$ 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 fs/dax.c +Merge made by the 'ort' strategy. + drivers/dax/super.c | 1 + + fs/dax.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging at24/at24/for-next (e783362eb54c Linux 5.17-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 (d2bda1500aa8 IDT: Fix Build warnings on some 32bit architectures.) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Merge made by the 'ort' strategy. + drivers/ntb/hw/idt/Makefile | 1 + + 1 file changed, 1 insertion(+) +Merging seccomp/for-next/seccomp (eed09ad26182 samples/seccomp: Adjust sample to also provide kill option) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge -m Merge branch 'for-next' of https://github.com/daniel-walker/cisco-linux.git cisco/for-next +Already up to date. +Merging fsi/next (f2af60bb7ce2 fsi: Add trace events in initialization path) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Already up to date. +Merging slimbus/for-next (e783362eb54c Linux 5.17-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Already up to date. +Merging nvmem/for-next (bdf79b27260b dt-bindings: nvmem: brcm,nvram: add basic NVMEM cells) +$ 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/sunplus,sp7021-ocotp.yaml +CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/nvmem/sunplus,sp7021-ocotp.yaml +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/mtd/mtdcore.c +Resolved 'Documentation/devicetree/bindings/nvmem/sunplus,sp7021-ocotp.yaml' using previous resolution. +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 97db210ae58c] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/nvmem/brcm,nvram.yaml | 25 +++++- + Documentation/devicetree/bindings/nvmem/nvmem.yaml | 3 - + .../bindings/nvmem/sunplus,sp7021-ocotp.yaml | 4 +- + drivers/nvmem/brcm_nvram.c | 90 ++++++++++++++++++++++ + 4 files changed, 114 insertions(+), 8 deletions(-) +Merging xarray/main (22f56b8e890d XArray: Include bitmap.h from xarray.h) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Merge made by the 'ort' strategy. + Documentation/core-api/xarray.rst | 14 +++++++++----- + include/linux/xarray.h | 1 + + 2 files changed, 10 insertions(+), 5 deletions(-) +Merging hyperv/hyperv-next (1d7286729aa6 hv_balloon: rate-limit "Unhandled message" warning) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Auto-merging drivers/hv/vmbus_drv.c +Merge made by the 'ort' strategy. + drivers/hv/channel_mgmt.c | 19 +++++++++---------- + drivers/hv/hv_balloon.c | 2 +- + drivers/hv/hv_common.c | 4 +++- + drivers/hv/hv_snapshot.c | 7 +++++-- + drivers/hv/hyperv_vmbus.h | 14 +++++++------- + drivers/hv/vmbus_drv.c | 4 ++-- + include/uapi/linux/hyperv.h | 11 +++++++++++ + 7 files changed, 38 insertions(+), 23 deletions(-) +Merging auxdisplay/auxdisplay (9ed331f8a0fb auxdisplay: lcd2s: Use proper API to free the instance of charlcd object) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (b77dbc86d604 kdb: Adopt scheduler's task classification) +$ 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 (6880fa6c5660 Linux 5.15-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 fpga/for-next (21f0a239ecab fpga: dfl: pci: Remove usage of the deprecated "pci-dma-compat.h" API) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git fpga/for-next +Merge made by the 'ort' strategy. + drivers/fpga/dfl-pci.c | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) +Merging kunit/test (e783362eb54c Linux 5.17-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 (e783362eb54c Linux 5.17-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 (5debe5bfa02c list: test: Add a test for list_entry_is_head()) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Merge made by the 'ort' strategy. + include/kunit/assert.h | 220 ++++-------- + include/kunit/test.h | 745 +++++++++++------------------------------ + lib/kunit/assert.c | 80 ++--- + lib/kunit/kunit-example-test.c | 42 +++ + lib/kunit/test.c | 35 +- + lib/list-test.c | 61 ++++ + tools/testing/kunit/kunit.py | 24 +- + 7 files changed, 420 insertions(+), 787 deletions(-) +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 (0d02ea60ea13 bus: mhi: ep: Add uevent support for module autoloading) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Auto-merging drivers/bus/mhi/host/pci_generic.c +Merge made by the 'ort' strategy. + drivers/bus/Makefile | 2 +- + drivers/bus/mhi/Kconfig | 28 +- + drivers/bus/mhi/Makefile | 9 +- + drivers/bus/mhi/common.h | 326 ++++++ + drivers/bus/mhi/core/internal.h | 722 ------------- + drivers/bus/mhi/ep/Kconfig | 10 + + drivers/bus/mhi/ep/Makefile | 2 + + drivers/bus/mhi/ep/internal.h | 224 ++++ + drivers/bus/mhi/ep/main.c | 1625 ++++++++++++++++++++++++++++++ + drivers/bus/mhi/ep/mmio.c | 273 +++++ + drivers/bus/mhi/ep/ring.c | 199 ++++ + drivers/bus/mhi/ep/sm.c | 148 +++ + drivers/bus/mhi/host/Kconfig | 31 + + drivers/bus/mhi/{core => host}/Makefile | 4 +- + drivers/bus/mhi/{core => host}/boot.c | 17 +- + drivers/bus/mhi/{core => host}/debugfs.c | 40 +- + drivers/bus/mhi/{core => host}/init.c | 131 ++- + drivers/bus/mhi/host/internal.h | 382 +++++++ + drivers/bus/mhi/{core => host}/main.c | 66 +- + drivers/bus/mhi/{ => host}/pci_generic.c | 1 + + drivers/bus/mhi/{core => host}/pm.c | 36 +- + include/linux/mhi_ep.h | 284 ++++++ + include/linux/mod_devicetable.h | 2 + + scripts/mod/file2alias.c | 10 + + 24 files changed, 3657 insertions(+), 915 deletions(-) + create mode 100644 drivers/bus/mhi/common.h + delete mode 100644 drivers/bus/mhi/core/internal.h + create mode 100644 drivers/bus/mhi/ep/Kconfig + create mode 100644 drivers/bus/mhi/ep/Makefile + create mode 100644 drivers/bus/mhi/ep/internal.h + create mode 100644 drivers/bus/mhi/ep/main.c + create mode 100644 drivers/bus/mhi/ep/mmio.c + create mode 100644 drivers/bus/mhi/ep/ring.c + create mode 100644 drivers/bus/mhi/ep/sm.c + create mode 100644 drivers/bus/mhi/host/Kconfig + rename drivers/bus/mhi/{core => host}/Makefile (54%) + rename drivers/bus/mhi/{core => host}/boot.c (96%) + rename drivers/bus/mhi/{core => host}/debugfs.c (90%) + rename drivers/bus/mhi/{core => host}/init.c (92%) + create mode 100644 drivers/bus/mhi/host/internal.h + rename drivers/bus/mhi/{core => host}/main.c (97%) + rename drivers/bus/mhi/{ => host}/pci_generic.c (99%) + rename drivers/bus/mhi/{core => host}/pm.c (97%) + create mode 100644 include/linux/mhi_ep.h +Merging memblock/for-next (f30b002ccfee memblock: __next_mem_pfn_range_in_zone: remove unneeded local variable nid) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Auto-merging MAINTAINERS +Auto-merging mm/memblock.c +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + mm/memblock.c | 5 +- + tools/include/linux/atomic.h | 2 + + tools/include/linux/cache.h | 10 + + tools/include/linux/debugfs.h | 5 + + tools/include/linux/gfp.h | 28 + + tools/include/linux/io.h | 5 + + tools/include/linux/kernel.h | 6 + + tools/include/linux/mm.h | 42 + + tools/include/linux/pfn.h | 10 + + tools/{testing/radix-tree => include}/linux/slab.h | 25 +- + tools/include/linux/types.h | 10 + + tools/lib/slab.c | 38 + + tools/testing/memblock/.gitignore | 4 + + tools/testing/memblock/Makefile | 54 ++ + tools/testing/memblock/asm/dma.h | 5 + + tools/testing/memblock/internal.h | 12 + + tools/testing/memblock/lib/slab.c | 9 + + tools/testing/memblock/linux/init.h | 34 + + tools/testing/memblock/linux/kernel.h | 12 + + tools/testing/memblock/linux/kmemleak.h | 18 + + tools/testing/memblock/linux/memory_hotplug.h | 19 + + tools/testing/memblock/linux/mmzone.h | 35 + + tools/testing/memblock/linux/printk.h | 25 + + tools/testing/memblock/main.c | 8 + + tools/testing/memblock/mmzone.c | 20 + + tools/testing/memblock/scripts/Makefile.include | 17 + + tools/testing/memblock/tests/basic_api.c | 906 +++++++++++++++++++++ + tools/testing/memblock/tests/basic_api.h | 10 + + tools/testing/memblock/tests/common.c | 27 + + tools/testing/memblock/tests/common.h | 15 + + tools/testing/radix-tree/Makefile | 3 +- + tools/testing/radix-tree/linux.c | 27 - + tools/testing/radix-tree/linux/gfp.h | 33 - + 34 files changed, 1409 insertions(+), 71 deletions(-) + create mode 100644 tools/include/linux/cache.h + create mode 100644 tools/include/linux/debugfs.h + create mode 100644 tools/include/linux/io.h + create mode 100644 tools/include/linux/mm.h + create mode 100644 tools/include/linux/pfn.h + rename tools/{testing/radix-tree => include}/linux/slab.h (61%) + create mode 100644 tools/lib/slab.c + create mode 100644 tools/testing/memblock/.gitignore + create mode 100644 tools/testing/memblock/Makefile + create mode 100644 tools/testing/memblock/asm/dma.h + create mode 100644 tools/testing/memblock/internal.h + create mode 100644 tools/testing/memblock/lib/slab.c + create mode 100644 tools/testing/memblock/linux/init.h + create mode 100644 tools/testing/memblock/linux/kernel.h + create mode 100644 tools/testing/memblock/linux/kmemleak.h + create mode 100644 tools/testing/memblock/linux/memory_hotplug.h + create mode 100644 tools/testing/memblock/linux/mmzone.h + create mode 100644 tools/testing/memblock/linux/printk.h + create mode 100644 tools/testing/memblock/main.c + create mode 100644 tools/testing/memblock/mmzone.c + create mode 100644 tools/testing/memblock/scripts/Makefile.include + create mode 100644 tools/testing/memblock/tests/basic_api.c + create mode 100644 tools/testing/memblock/tests/basic_api.h + create mode 100644 tools/testing/memblock/tests/common.c + create mode 100644 tools/testing/memblock/tests/common.h + delete mode 100644 tools/testing/radix-tree/linux/gfp.h +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge -m Merge branch 'init-user-pointers' of git://git.infradead.org/users/hch/misc.git init/init-user-pointers +Already up to date. +Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) +$ git merge -m Merge branch 'counters' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git counters/counters +Already up to date. +Merging cxl/next (e6e17cc6ed75 cxl/core: Fix cxl_device_lock() class detection) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-cxl | 36 + + Documentation/driver-api/cxl/memory-devices.rst | 315 ++++- + drivers/cxl/Kconfig | 44 +- + drivers/cxl/Makefile | 6 +- + drivers/cxl/acpi.c | 152 +-- + drivers/cxl/core/Makefile | 4 +- + drivers/cxl/core/bus.c | 675 ---------- + drivers/cxl/core/core.h | 2 + + drivers/cxl/core/hdm.c | 276 ++++ + drivers/cxl/core/memdev.c | 44 + + drivers/cxl/core/pci.c | 96 ++ + drivers/cxl/core/pmem.c | 18 +- + drivers/cxl/core/port.c | 1560 +++++++++++++++++++++++ + drivers/cxl/core/regs.c | 67 +- + drivers/cxl/cxl.h | 197 ++- + drivers/cxl/cxlmem.h | 39 + + drivers/cxl/cxlpci.h | 75 ++ + drivers/cxl/mem.c | 228 ++++ + drivers/cxl/pci.c | 383 +++--- + drivers/cxl/pci.h | 34 - + drivers/cxl/pmem.c | 12 +- + drivers/cxl/port.c | 76 ++ + drivers/nvdimm/nd-core.h | 2 +- + lib/Kconfig.debug | 23 + + tools/testing/cxl/Kbuild | 22 +- + tools/testing/cxl/mock_acpi.c | 74 -- + tools/testing/cxl/mock_mem.c | 10 + + tools/testing/cxl/mock_pmem.c | 24 - + tools/testing/cxl/test/cxl.c | 330 ++++- + tools/testing/cxl/test/mem.c | 19 + + tools/testing/cxl/test/mock.c | 91 +- + tools/testing/cxl/test/mock.h | 8 +- + 32 files changed, 3717 insertions(+), 1225 deletions(-) + delete mode 100644 drivers/cxl/core/bus.c + create mode 100644 drivers/cxl/core/hdm.c + create mode 100644 drivers/cxl/core/pci.c + create mode 100644 drivers/cxl/core/port.c + create mode 100644 drivers/cxl/cxlpci.h + create mode 100644 drivers/cxl/mem.c + delete mode 100644 drivers/cxl/pci.h + create mode 100644 drivers/cxl/port.c + create mode 100644 tools/testing/cxl/mock_mem.c + delete mode 100644 tools/testing/cxl/mock_pmem.c +Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller) +$ git merge -m Merge branch 'folio-iomap' of git://git.infradead.org/users/willy/linux.git folio-iomap/folio-iomap +Already up to date. +Merging zstd/zstd-next (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (2baa81c83f6f efifb: Remove redundant efifb_setup_from_dmi stub) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging arch/x86/Kconfig +Auto-merging drivers/video/fbdev/Kconfig +Merge made by the 'ort' strategy. + arch/x86/Kconfig | 6 ++++++ + arch/x86/boot/video-vesa.c | 4 ++-- + drivers/firmware/Kconfig | 6 +++--- + drivers/video/fbdev/Kconfig | 14 ++++---------- + include/linux/efi.h | 4 ---- + 5 files changed, 15 insertions(+), 19 deletions(-) +Merging unicode/for-next (5298d4bfe80f unicode: clean up the Kconfig symbol confusion) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Already up to date. +Merging slab/for-next (d3d59937afdf Merge branch 'for-5.18/trivial' into 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 +Merge made by the 'ort' strategy. + mm/slab_common.c | 2 +- + mm/slob.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging random/master (8497f1bb8d74 wireguard: device: clear keys on VM fork) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Auto-merging MAINTAINERS +Auto-merging drivers/char/hw_random/core.c +Auto-merging drivers/char/random.c +Auto-merging include/linux/mod_devicetable.h +Auto-merging kernel/cpu.c +Auto-merging lib/vsprintf.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 16 +- + MAINTAINERS | 1 + + drivers/char/hw_random/core.c | 1 + + drivers/char/mem.c | 2 +- + drivers/char/random.c | 2860 +++++++++++---------------- + drivers/net/wireguard/device.c | 38 +- + drivers/virt/Kconfig | 11 + + drivers/virt/Makefile | 1 + + drivers/virt/vmgenid.c | 100 + + include/linux/cpuhotplug.h | 2 + + include/linux/hw_random.h | 2 - + include/linux/mod_devicetable.h | 2 +- + include/linux/random.h | 43 +- + include/trace/events/random.h | 233 --- + kernel/cpu.c | 11 + + lib/random32.c | 14 +- + lib/vsprintf.c | 10 +- + 17 files changed, 1363 insertions(+), 1984 deletions(-) + create mode 100644 drivers/virt/vmgenid.c + delete mode 100644 include/trace/events/random.h +Merging landlock/next (a691b9858300 Merge Landlock fixes into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Auto-merging include/linux/syscalls.h +Auto-merging kernel/sysctl.c +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/fs.rst | 50 +++ + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + fs/open.c | 133 ++++++++ + fs/proc/proc_sysctl.c | 2 +- + include/linux/syscalls.h | 1 + + include/linux/sysctl.h | 3 + + include/uapi/asm-generic/unistd.h | 5 +- + include/uapi/linux/trusted-for.h | 18 + + kernel/printk/sysctl.c | 9 - + kernel/sysctl.c | 9 + + samples/landlock/sandboxer.c | 1 + + security/landlock/syscalls.c | 2 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/interpreter/.gitignore | 2 + + tools/testing/selftests/interpreter/Makefile | 21 ++ + tools/testing/selftests/interpreter/config | 1 + + .../selftests/interpreter/trust_policy_test.c | 362 +++++++++++++++++++++ + 34 files changed, 627 insertions(+), 13 deletions(-) + create mode 100644 include/uapi/linux/trusted-for.h + create mode 100644 tools/testing/selftests/interpreter/.gitignore + create mode 100644 tools/testing/selftests/interpreter/Makefile + create mode 100644 tools/testing/selftests/interpreter/config + create mode 100644 tools/testing/selftests/interpreter/trust_policy_test.c +Merging rust/rust-next (847245fe812e 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/index.rst +Auto-merging Documentation/kbuild/kbuild.rst +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/riscv/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/gpio/Makefile +Auto-merging include/uapi/linux/android/binder.h +Auto-merging init/Kconfig +Auto-merging kernel/livepatch/core.c +Auto-merging kernel/printk/printk.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/vsprintf.c +Auto-merging scripts/Makefile.build +Auto-merging scripts/Makefile.lib +Auto-merging scripts/kallsyms.c +Auto-merging scripts/kconfig/confdata.c +Merge made by the 'ort' strategy. + .gitignore | 5 + + .rustfmt.toml | 12 + + Documentation/doc-guide/kernel-doc.rst | 3 + + Documentation/index.rst | 1 + + Documentation/kbuild/kbuild.rst | 4 + + Documentation/process/changes.rst | 42 + + Documentation/rust/arch-support.rst | 35 + + Documentation/rust/coding-guidelines.rst | 153 ++ + Documentation/rust/general-information.rst | 80 + + Documentation/rust/index.rst | 21 + + Documentation/rust/logo.svg | 357 +++ + Documentation/rust/quick-start.rst | 231 ++ + MAINTAINERS | 16 + + Makefile | 156 +- + arch/arm/rust/target.json | 27 + + arch/arm64/rust/target.json | 34 + + arch/powerpc/rust/target.json | 29 + + arch/riscv/Makefile | 1 + + arch/riscv/rust/rv32ima.json | 36 + + arch/riscv/rust/rv32imac.json | 36 + + arch/riscv/rust/rv64ima.json | 36 + + arch/riscv/rust/rv64imac.json | 36 + + arch/x86/rust/target.json | 36 + + drivers/android/Kconfig | 7 + + drivers/android/Makefile | 2 + + drivers/android/allocation.rs | 266 ++ + drivers/android/context.rs | 80 + + drivers/android/defs.rs | 99 + + drivers/android/node.rs | 476 ++++ + drivers/android/process.rs | 961 ++++++++ + drivers/android/range_alloc.rs | 189 ++ + drivers/android/rust_binder.rs | 111 + + drivers/android/thread.rs | 871 +++++++ + drivers/android/transaction.rs | 326 +++ + drivers/gpio/Kconfig | 8 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio_pl061_rust.rs | 370 +++ + include/linux/kallsyms.h | 2 +- + include/linux/spinlock.h | 17 +- + include/uapi/linux/android/binder.h | 28 +- + init/Kconfig | 51 +- + kernel/kallsyms.c | 26 +- + kernel/livepatch/core.c | 4 +- + kernel/printk/printk.c | 5 +- + lib/Kconfig.debug | 144 ++ + lib/rust.h | 14 + + lib/vsprintf.c | 7 + + rust/.gitignore | 7 + + rust/Makefile | 374 +++ + rust/alloc/README.md | 32 + + rust/alloc/alloc.rs | 427 ++++ + rust/alloc/borrow.rs | 498 ++++ + rust/alloc/boxed.rs | 1847 ++++++++++++++ + rust/alloc/collections/mod.rs | 156 ++ + rust/alloc/fmt.rs | 601 +++++ + rust/alloc/lib.rs | 217 ++ + rust/alloc/macros.rs | 126 + + rust/alloc/raw_vec.rs | 549 +++++ + rust/alloc/slice.rs | 1279 ++++++++++ + rust/alloc/str.rs | 624 +++++ + rust/alloc/string.rs | 2864 ++++++++++++++++++++++ + rust/alloc/vec/drain.rs | 159 ++ + rust/alloc/vec/drain_filter.rs | 145 ++ + rust/alloc/vec/into_iter.rs | 356 +++ + rust/alloc/vec/is_zero.rs | 106 + + rust/alloc/vec/mod.rs | 3359 ++++++++++++++++++++++++++ + rust/alloc/vec/partial_eq.rs | 49 + + rust/alloc/vec/set_len_on_drop.rs | 30 + + rust/alloc/vec/spec_extend.rs | 172 ++ + rust/bindgen_parameters | 13 + + rust/build_error.rs | 29 + + rust/compiler_builtins.rs | 57 + + rust/exports.c | 19 + + rust/helpers.c | 529 ++++ + rust/kernel/allocator.rs | 65 + + rust/kernel/amba.rs | 259 ++ + rust/kernel/bindings.rs | 47 + + rust/kernel/bindings_helper.h | 30 + + rust/kernel/buffer.rs | 52 + + rust/kernel/build_assert.rs | 80 + + rust/kernel/c_types.rs | 119 + + rust/kernel/chrdev.rs | 209 ++ + rust/kernel/clk.rs | 75 + + rust/kernel/cred.rs | 73 + + rust/kernel/device.rs | 554 +++++ + rust/kernel/driver.rs | 440 ++++ + rust/kernel/error.rs | 542 +++++ + rust/kernel/file.rs | 147 ++ + rust/kernel/file_operations.rs | 734 ++++++ + rust/kernel/gpio.rs | 477 ++++ + rust/kernel/io_buffer.rs | 153 ++ + rust/kernel/io_mem.rs | 227 ++ + rust/kernel/iov_iter.rs | 81 + + rust/kernel/irq.rs | 409 ++++ + rust/kernel/lib.rs | 261 ++ + rust/kernel/linked_list.rs | 247 ++ + rust/kernel/miscdev.rs | 281 +++ + rust/kernel/mm.rs | 149 ++ + rust/kernel/module_param.rs | 497 ++++ + rust/kernel/of.rs | 63 + + rust/kernel/pages.rs | 144 ++ + rust/kernel/platform.rs | 224 ++ + rust/kernel/power.rs | 118 + + rust/kernel/prelude.rs | 36 + + rust/kernel/print.rs | 417 ++++ + rust/kernel/random.rs | 50 + + rust/kernel/raw_list.rs | 361 +++ + rust/kernel/rbtree.rs | 562 +++++ + rust/kernel/revocable.rs | 163 ++ + rust/kernel/security.rs | 36 + + rust/kernel/static_assert.rs | 39 + + rust/kernel/std_vendor.rs | 150 ++ + rust/kernel/str.rs | 401 +++ + rust/kernel/sync/arc.rs | 500 ++++ + rust/kernel/sync/condvar.rs | 138 ++ + rust/kernel/sync/guard.rs | 150 ++ + rust/kernel/sync/locked_by.rs | 112 + + rust/kernel/sync/mod.rs | 157 ++ + rust/kernel/sync/mutex.rs | 112 + + rust/kernel/sync/revocable_mutex.rs | 184 ++ + rust/kernel/sync/rwsem.rs | 147 ++ + rust/kernel/sync/seqlock.rs | 202 ++ + rust/kernel/sync/spinlock.rs | 180 ++ + rust/kernel/sysctl.rs | 197 ++ + rust/kernel/task.rs | 182 ++ + rust/kernel/types.rs | 486 ++++ + rust/kernel/user_ptr.rs | 175 ++ + rust/macros/helpers.rs | 79 + + rust/macros/lib.rs | 94 + + rust/macros/module.rs | 631 +++++ + samples/Kconfig | 2 + + samples/Makefile | 1 + + samples/rust/Kconfig | 123 + + samples/rust/Makefile | 13 + + samples/rust/rust_chrdev.rs | 50 + + samples/rust/rust_minimal.rs | 35 + + samples/rust/rust_miscdev.rs | 144 ++ + samples/rust/rust_module_parameters.rs | 69 + + samples/rust/rust_platform.rs | 22 + + samples/rust/rust_print.rs | 54 + + samples/rust/rust_random.rs | 61 + + samples/rust/rust_semaphore.rs | 172 ++ + samples/rust/rust_semaphore_c.c | 212 ++ + samples/rust/rust_stack_probing.rs | 36 + + samples/rust/rust_sync.rs | 78 + + scripts/Kconfig.include | 6 +- + scripts/Makefile.build | 65 + + scripts/Makefile.debug | 10 + + scripts/Makefile.lib | 12 + + scripts/Makefile.modfinal | 8 +- + scripts/cc-version.sh | 12 +- + scripts/decode_stacktrace.sh | 14 + + scripts/generate_rust_analyzer.py | 133 + + scripts/is_rust_module.sh | 13 + + scripts/kallsyms.c | 40 +- + scripts/kconfig/confdata.c | 75 + + scripts/min-tool-version.sh | 6 + + scripts/rust-is-available-bindgen-libclang.h | 2 + + scripts/rust-is-available.sh | 158 ++ + tools/include/linux/kallsyms.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + tools/lib/symbol/kallsyms.h | 2 +- + 162 files changed, 34348 insertions(+), 58 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/logo.svg + create mode 100644 Documentation/rust/quick-start.rst + create mode 100644 arch/arm/rust/target.json + create mode 100644 arch/arm64/rust/target.json + create mode 100644 arch/powerpc/rust/target.json + create mode 100644 arch/riscv/rust/rv32ima.json + create mode 100644 arch/riscv/rust/rv32imac.json + create mode 100644 arch/riscv/rust/rv64ima.json + create mode 100644 arch/riscv/rust/rv64imac.json + create mode 100644 arch/x86/rust/target.json + create mode 100644 drivers/android/allocation.rs + create mode 100644 drivers/android/context.rs + create mode 100644 drivers/android/defs.rs + create mode 100644 drivers/android/node.rs + create mode 100644 drivers/android/process.rs + create mode 100644 drivers/android/range_alloc.rs + create mode 100644 drivers/android/rust_binder.rs + create mode 100644 drivers/android/thread.rs + create mode 100644 drivers/android/transaction.rs + create mode 100644 drivers/gpio/gpio_pl061_rust.rs + create mode 100644 lib/rust.h + create mode 100644 rust/.gitignore + create mode 100644 rust/Makefile + create mode 100644 rust/alloc/README.md + create mode 100644 rust/alloc/alloc.rs + create mode 100644 rust/alloc/borrow.rs + create mode 100644 rust/alloc/boxed.rs + create mode 100644 rust/alloc/collections/mod.rs + create mode 100644 rust/alloc/fmt.rs + create mode 100644 rust/alloc/lib.rs + create mode 100644 rust/alloc/macros.rs + create mode 100644 rust/alloc/raw_vec.rs + create mode 100644 rust/alloc/slice.rs + create mode 100644 rust/alloc/str.rs + create mode 100644 rust/alloc/string.rs + create mode 100644 rust/alloc/vec/drain.rs + create mode 100644 rust/alloc/vec/drain_filter.rs + create mode 100644 rust/alloc/vec/into_iter.rs + create mode 100644 rust/alloc/vec/is_zero.rs + create mode 100644 rust/alloc/vec/mod.rs + create mode 100644 rust/alloc/vec/partial_eq.rs + create mode 100644 rust/alloc/vec/set_len_on_drop.rs + create mode 100644 rust/alloc/vec/spec_extend.rs + create mode 100644 rust/bindgen_parameters + create mode 100644 rust/build_error.rs + create mode 100644 rust/compiler_builtins.rs + create mode 100644 rust/exports.c + create mode 100644 rust/helpers.c + create mode 100644 rust/kernel/allocator.rs + create mode 100644 rust/kernel/amba.rs + create mode 100644 rust/kernel/bindings.rs + create mode 100644 rust/kernel/bindings_helper.h + create mode 100644 rust/kernel/buffer.rs + create mode 100644 rust/kernel/build_assert.rs + create mode 100644 rust/kernel/c_types.rs + create mode 100644 rust/kernel/chrdev.rs + create mode 100644 rust/kernel/clk.rs + create mode 100644 rust/kernel/cred.rs + create mode 100644 rust/kernel/device.rs + create mode 100644 rust/kernel/driver.rs + create mode 100644 rust/kernel/error.rs + create mode 100644 rust/kernel/file.rs + create mode 100644 rust/kernel/file_operations.rs + create mode 100644 rust/kernel/gpio.rs + create mode 100644 rust/kernel/io_buffer.rs + create mode 100644 rust/kernel/io_mem.rs + create mode 100644 rust/kernel/iov_iter.rs + create mode 100644 rust/kernel/irq.rs + create mode 100644 rust/kernel/lib.rs + create mode 100644 rust/kernel/linked_list.rs + create mode 100644 rust/kernel/miscdev.rs + create mode 100644 rust/kernel/mm.rs + create mode 100644 rust/kernel/module_param.rs + create mode 100644 rust/kernel/of.rs + create mode 100644 rust/kernel/pages.rs + create mode 100644 rust/kernel/platform.rs + create mode 100644 rust/kernel/power.rs + create mode 100644 rust/kernel/prelude.rs + create mode 100644 rust/kernel/print.rs + create mode 100644 rust/kernel/random.rs + create mode 100644 rust/kernel/raw_list.rs + create mode 100644 rust/kernel/rbtree.rs + create mode 100644 rust/kernel/revocable.rs + create mode 100644 rust/kernel/security.rs + create mode 100644 rust/kernel/static_assert.rs + create mode 100644 rust/kernel/std_vendor.rs + create mode 100644 rust/kernel/str.rs + create mode 100644 rust/kernel/sync/arc.rs + create mode 100644 rust/kernel/sync/condvar.rs + create mode 100644 rust/kernel/sync/guard.rs + create mode 100644 rust/kernel/sync/locked_by.rs + create mode 100644 rust/kernel/sync/mod.rs + create mode 100644 rust/kernel/sync/mutex.rs + create mode 100644 rust/kernel/sync/revocable_mutex.rs + create mode 100644 rust/kernel/sync/rwsem.rs + create mode 100644 rust/kernel/sync/seqlock.rs + create mode 100644 rust/kernel/sync/spinlock.rs + create mode 100644 rust/kernel/sysctl.rs + create mode 100644 rust/kernel/task.rs + create mode 100644 rust/kernel/types.rs + create mode 100644 rust/kernel/user_ptr.rs + create mode 100644 rust/macros/helpers.rs + create mode 100644 rust/macros/lib.rs + create mode 100644 rust/macros/module.rs + create mode 100644 samples/rust/Kconfig + create mode 100644 samples/rust/Makefile + create mode 100644 samples/rust/rust_chrdev.rs + create mode 100644 samples/rust/rust_minimal.rs + create mode 100644 samples/rust/rust_miscdev.rs + create mode 100644 samples/rust/rust_module_parameters.rs + create mode 100644 samples/rust/rust_platform.rs + create mode 100644 samples/rust/rust_print.rs + create mode 100644 samples/rust/rust_random.rs + create mode 100644 samples/rust/rust_semaphore.rs + create mode 100644 samples/rust/rust_semaphore_c.c + create mode 100644 samples/rust/rust_stack_probing.rs + create mode 100644 samples/rust/rust_sync.rs + create mode 100755 scripts/generate_rust_analyzer.py + create mode 100755 scripts/is_rust_module.sh + create mode 100644 scripts/rust-is-available-bindgen-libclang.h + create mode 100755 scripts/rust-is-available.sh +Merging sysctl/sysctl-next (fc12aa67daba kernel/do_mount_initrd: move real_root_dev sysctls to its own file) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Auto-merging include/linux/sched/sysctl.h +CONFLICT (content): Merge conflict in include/linux/sched/sysctl.h +Auto-merging kernel/locking/lockdep.c +Auto-merging kernel/rcu/rcu.h +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/deadline.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/rt.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/topology.c +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +Resolved 'include/linux/sched/sysctl.h' using previous resolution. +Resolved 'kernel/sysctl.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c0108999550c] Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git +$ git diff -M --stat --summary HEAD^.. + include/linux/acct.h | 1 - + include/linux/delayacct.h | 3 - + include/linux/initrd.h | 2 - + include/linux/lockdep.h | 4 - + include/linux/oom.h | 4 - + include/linux/panic.h | 6 - + include/linux/reboot.h | 4 - + include/linux/sched/sysctl.h | 41 ------- + include/linux/writeback.h | 15 --- + init/do_mounts_initrd.c | 22 +++- + kernel/acct.c | 22 +++- + kernel/delayacct.c | 22 +++- + kernel/locking/lockdep.c | 35 +++++- + kernel/panic.c | 26 ++++- + kernel/rcu/rcu.h | 2 + + kernel/reboot.c | 34 +++++- + kernel/sched/core.c | 69 ++++++++--- + kernel/sched/deadline.c | 42 +++++-- + kernel/sched/fair.c | 32 +++++- + kernel/sched/rt.c | 56 ++++++++- + kernel/sched/sched.h | 7 ++ + kernel/sched/topology.c | 25 +++- + kernel/sysctl.c | 268 ------------------------------------------- + mm/oom_kill.c | 38 +++++- + mm/page-writeback.c | 103 +++++++++++++++-- + 25 files changed, 482 insertions(+), 401 deletions(-) +Merging folio/for-next (0488343ba3dd selftests/vm/transhuge-stress: Support file-backed PMD folios) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next +Auto-merging arch/arm64/mm/mmu.c +CONFLICT (modify/delete): arch/nds32/include/asm/pgtable.h deleted in HEAD and modified in folio/for-next. Version folio/for-next of arch/nds32/include/asm/pgtable.h left in tree. +Auto-merging arch/parisc/include/asm/pgtable.h +Auto-merging arch/powerpc/include/asm/book3s/32/pgtable.h +Auto-merging arch/powerpc/include/asm/nohash/32/pgtable.h +Auto-merging arch/powerpc/include/asm/nohash/64/pgtable.h +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Auto-merging drivers/gpu/drm/drm_cache.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_cache.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_svm.c +Auto-merging drivers/nvme/target/io-cmd-bdev.c +Auto-merging drivers/usb/gadget/function/f_mass_storage.c +Auto-merging fs/nfsd/filecache.c +Auto-merging fs/nfsd/vfs.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/mm_types.h +Auto-merging mm/hugetlb.c +Auto-merging mm/memory.c +Auto-merging mm/mmap.c +Auto-merging mm/oom_kill.c +Resolved 'drivers/gpu/drm/drm_cache.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/nds32/include/asm/pgtable.h +rm 'arch/nds32/include/asm/pgtable.h' +$ git commit --no-edit -v -a +[master 07d2027df70b] Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git +$ git diff -M --stat --summary HEAD^.. + Documentation/core-api/pin_user_pages.rst | 18 +- + arch/alpha/include/asm/pgtable.h | 1 + + arch/arc/include/asm/hugepage.h | 1 - + arch/arc/include/asm/pgtable-levels.h | 1 + + arch/arm/include/asm/pgtable-2level.h | 2 + + arch/arm64/mm/mmu.c | 1 + + arch/csky/include/asm/pgtable.h | 1 + + arch/hexagon/include/asm/pgtable.h | 5 + + arch/ia64/include/asm/pgtable.h | 1 + + arch/m68k/include/asm/mcf_pgtable.h | 1 + + arch/m68k/include/asm/motorola_pgtable.h | 1 + + arch/m68k/include/asm/sun3_pgtable.h | 1 + + arch/microblaze/include/asm/pgtable.h | 3 + + arch/mips/include/asm/pgtable.h | 10 +- + arch/nios2/include/asm/pgtable.h | 1 + + arch/openrisc/include/asm/pgtable.h | 1 + + arch/parisc/include/asm/pgtable.h | 1 + + arch/powerpc/include/asm/book3s/32/pgtable.h | 4 +- + arch/powerpc/include/asm/mmu_context.h | 1 - + arch/powerpc/include/asm/nohash/32/pgtable.h | 7 +- + arch/powerpc/include/asm/nohash/64/pgtable.h | 1 + + arch/powerpc/kvm/book3s_hv_uvmem.c | 2 +- + arch/powerpc/mm/book3s64/pgtable.c | 1 + + arch/sh/include/asm/pgtable_32.h | 1 + + arch/sparc/include/asm/pgtable_32.h | 7 +- + arch/um/include/asm/pgtable.h | 1 + + arch/xtensa/include/asm/pgtable.h | 1 + + drivers/block/xen-blkback/xenbus.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 35 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 1 + + drivers/gpu/drm/drm_cache.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_dmem.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_svm.c | 1 + + drivers/infiniband/core/rw.c | 1 + + drivers/nvdimm/pmem.h | 1 + + drivers/nvme/host/pci.c | 1 + + drivers/nvme/target/io-cmd-bdev.c | 1 + + drivers/usb/gadget/function/f_mass_storage.c | 1 + + fs/Kconfig | 2 +- + fs/coda/file.c | 1 + + fs/fuse/virtio_fs.c | 1 + + fs/iomap/fiemap.c | 1 + + fs/nfsd/filecache.c | 1 + + fs/nfsd/vfs.c | 1 + + fs/proc/page.c | 1 + + fs/splice.c | 24 +- + fs/vboxsf/utils.c | 1 + + include/linux/fs.h | 120 ---- + include/linux/hmm.h | 9 +- + include/linux/huge_mm.h | 59 +- + include/linux/hugetlb.h | 5 + + include/linux/ksm.h | 6 +- + include/linux/memremap.h | 46 +- + include/linux/migrate.h | 1 + + include/linux/mm.h | 296 ++++----- + include/linux/mm_inline.h | 11 +- + include/linux/mm_types.h | 26 +- + include/linux/pagemap.h | 146 ++++- + include/linux/rmap.h | 76 ++- + include/linux/swap.h | 9 +- + include/trace/events/vmscan.h | 10 +- + kernel/events/uprobes.c | 13 +- + kernel/futex/core.c | 2 +- + lib/test_hmm.c | 353 ++++++++--- + lib/test_hmm_uapi.h | 22 +- + mm/Kconfig | 7 +- + mm/Makefile | 1 + + mm/damon/paddr.c | 60 +- + mm/debug.c | 18 +- + mm/filemap.c | 59 +- + mm/folio-compat.c | 13 + + mm/gup.c | 533 ++++++++-------- + mm/huge_memory.c | 178 ++---- + mm/hugetlb.c | 15 +- + mm/internal.h | 118 ++-- + mm/khugepaged.c | 15 +- + mm/ksm.c | 32 +- + mm/madvise.c | 5 + + mm/memcontrol.c | 44 +- + mm/memory-failure.c | 22 +- + mm/memory.c | 45 +- + mm/memory_hotplug.c | 13 +- + mm/memremap.c | 75 ++- + mm/migrate.c | 870 ++------------------------ + mm/migrate_device.c | 830 ++++++++++++++++++++++++ + mm/mlock.c | 638 ++++++++----------- + mm/mmap.c | 32 +- + mm/mmzone.c | 7 + + mm/oom_kill.c | 2 +- + mm/page_alloc.c | 3 +- + mm/page_idle.c | 30 +- + mm/page_vma_mapped.c | 58 +- + mm/readahead.c | 108 +++- + mm/rmap.c | 583 +++++++---------- + mm/swap.c | 173 ++--- + mm/truncate.c | 111 ++-- + mm/userfaultfd.c | 14 +- + mm/util.c | 36 +- + mm/vmscan.c | 305 ++++----- + mm/workingset.c | 25 +- + tools/testing/selftests/vm/hmm-tests.c | 123 +++- + tools/testing/selftests/vm/test_hmm.sh | 24 +- + tools/testing/selftests/vm/transhuge-stress.c | 35 +- + 103 files changed, 3470 insertions(+), 3157 deletions(-) + create mode 100644 mm/migrate_device.c +Merging execve/for-next/execve (9e1a3ce0a952 binfmt_elf: Introduce KUnit test) +$ 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 MAINTAINERS +Auto-merging fs/Kconfig.binfmt +Auto-merging fs/binfmt_elf.c +Auto-merging fs/exec.c +Auto-merging include/uapi/linux/elf.h +Auto-merging tools/testing/selftests/exec/Makefile +Merge made by the 'ort' strategy. + MAINTAINERS | 4 ++ + fs/Kconfig.binfmt | 10 ++++ + fs/binfmt_elf.c | 65 ++++++++++++++++---------- + fs/binfmt_elf_fdpic.c | 2 +- + fs/binfmt_elf_test.c | 64 ++++++++++++++++++++++++++ + fs/binfmt_flat.c | 2 + + fs/compat_binfmt_elf.c | 2 + + fs/coredump.c | 39 ++++++++++++++-- + fs/exec.c | 32 +++++++++++-- + include/linux/binfmts.h | 2 + + include/uapi/linux/elf.h | 7 +-- + tools/testing/selftests/exec/Makefile | 1 + + tools/testing/selftests/exec/null-argv.c | 78 ++++++++++++++++++++++++++++++++ + 13 files changed, 270 insertions(+), 38 deletions(-) + create mode 100644 fs/binfmt_elf_test.c + create mode 100644 tools/testing/selftests/exec/null-argv.c +Merging kspp/for-next/kspp (1b01a23d9a48 Merge branch 'for-next/hardening' into for-next/kspp) +$ 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 Makefile +Auto-merging arch/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/sh/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kvm/emulate.c +Auto-merging arch/xtensa/Kconfig +Auto-merging init/main.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/test_kasan.c +Auto-merging mm/Kconfig +Merge made by the 'ort' strategy. + Documentation/process/deprecated.rst | 20 +- + Makefile | 2 - + arch/Kconfig | 24 +- + arch/alpha/mm/init.c | 6 +- + arch/arm/Kconfig | 1 + + arch/arm64/Kconfig | 1 + + arch/m68k/Kconfig | 1 + + arch/m68k/include/asm/cmpxchg.h | 9 +- + arch/m68k/include/asm/current.h | 4 +- + arch/powerpc/Kconfig | 1 + + arch/s390/Kconfig | 1 + + arch/sh/Kconfig | 1 + + arch/um/os-Linux/execvp.c | 1 + + arch/um/os-Linux/time.c | 6 - + arch/x86/Kconfig | 1 + + arch/x86/boot/boot.h | 36 +- + arch/x86/boot/compressed/misc.c | 3 +- + arch/x86/boot/main.c | 2 +- + arch/x86/kvm/emulate.c | 9 +- + arch/x86/kvm/kvm_emulate.h | 6 +- + arch/x86/lib/memcpy_32.c | 1 + + arch/x86/um/shared/sysdep/syscalls_64.h | 5 +- + arch/x86/um/user-offsets.c | 9 +- + arch/xtensa/Kconfig | 1 + + arch/xtensa/include/asm/current.h | 2 + + arch/xtensa/include/asm/stacktrace.h | 8 +- + arch/xtensa/kernel/irq.c | 3 +- + drivers/char/tpm/tpm_vtpm_proxy.c | 2 +- + drivers/hwtracing/intel_th/msu.c | 4 +- + include/linux/compiler_attributes.h | 39 ++ + include/linux/fortify-string.h | 238 ++++++++--- + include/linux/overflow.h | 114 ++++-- + include/linux/randomize_kstack.h | 21 +- + init/main.c | 2 +- + lib/Kconfig.debug | 38 +- + lib/Makefile | 9 +- + lib/{test_overflow.c => overflow_kunit.c} | 518 +++++++++++++----------- + lib/{test_stackinit.c => stackinit_kunit.c} | 269 +++++------- + lib/string_helpers.c | 6 + + lib/test_fortify/read_overflow2_field-memcpy.c | 5 + + lib/test_fortify/read_overflow2_field-memmove.c | 5 + + lib/test_fortify/write_overflow_field-memcpy.c | 5 + + lib/test_fortify/write_overflow_field-memmove.c | 5 + + lib/test_fortify/write_overflow_field-memset.c | 5 + + lib/test_kasan.c | 5 + + mm/Kconfig | 9 + + mm/usercopy.c | 23 +- + scripts/Makefile.clang | 1 + + scripts/Makefile.gcc-plugins | 2 + + scripts/gcc-plugins/stackleak_plugin.c | 29 +- + scripts/test_fortify.sh | 8 +- + security/Kconfig | 5 +- + security/Kconfig.hardening | 10 + + 53 files changed, 963 insertions(+), 578 deletions(-) + rename lib/{test_overflow.c => overflow_kunit.c} (54%) + rename lib/{test_stackinit.c => stackinit_kunit.c} (66%) + create mode 100644 lib/test_fortify/read_overflow2_field-memcpy.c + create mode 100644 lib/test_fortify/read_overflow2_field-memmove.c + create mode 100644 lib/test_fortify/write_overflow_field-memcpy.c + create mode 100644 lib/test_fortify/write_overflow_field-memmove.c + create mode 100644 lib/test_fortify/write_overflow_field-memset.c +$ git am -3 ../patches/drm-kspp-fix.patch +Applying: drm/bridge: it6505: Fix the read buffer array bound +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/bridge/ite-it6505.c +$ git add -A . +$ git commit -v -a --amend +[master 8dae5f70dd6c] Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git + Date: Fri Mar 4 18:45:37 2022 +1100 +$ git am -3 ../patches/drm-kspp-fix-2.patch +Applying: drm/dp: Fix OOB read when handling Post Cursor2 register +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/dp/drm_dp.c +M drivers/gpu/drm/tegra/dp.c +M include/drm/dp/drm_dp_helper.h +$ git add -A . +$ git commit -v -a --amend +[master aa9f1ceebe36] Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git + Date: Fri Mar 4 18:45:37 2022 +1100 +$ git am -3 ../patches/drm-kspp-fix-3.patch +Applying: drm/dp: Fix off-by-one in register cache size +$ git reset HEAD^ +Unstaged changes after reset: +M include/drm/dp/drm_dp_helper.h +$ git add -A . +$ git commit -v -a --amend +[master 012c8e9ea81a] Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git + Date: Fri Mar 4 18:45:37 2022 +1100 +Merging kspp-gustavo/for-next/kspp (91adfbb14c00 Merge branch 'for-next/kspp-fam0' into for-next/kspp) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Auto-merging arch/s390/include/asm/sclp.h +Auto-merging arch/sh/include/asm/thread_info.h +Auto-merging arch/x86/include/asm/pci_x86.h +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +Auto-merging drivers/scsi/mpi3mr/mpi3mr.h +Auto-merging drivers/scsi/qla2xxx/qla_def.h +Auto-merging drivers/staging/r8188eu/include/rtw_cmd.h +Auto-merging fs/ext4/fast_commit.h +Auto-merging fs/ksmbd/transport_rdma.c +Auto-merging include/linux/platform_data/cros_ec_commands.h +Auto-merging include/net/bluetooth/mgmt.h +Auto-merging tools/lib/perf/include/perf/event.h +Merge made by the 'ort' strategy. + arch/alpha/include/asm/hwrpb.h | 2 +- + arch/ia64/include/asm/sal.h | 2 +- + arch/s390/include/asm/ccwgroup.h | 2 +- + arch/s390/include/asm/chsc.h | 2 +- + arch/s390/include/asm/eadm.h | 2 +- + arch/s390/include/asm/fcx.h | 4 ++-- + arch/s390/include/asm/idals.h | 2 +- + arch/s390/include/asm/sclp.h | 2 +- + arch/s390/include/asm/sysinfo.h | 6 +++--- + arch/sh/include/asm/thread_info.h | 2 +- + arch/sparc/include/asm/vio.h | 10 +++++----- + arch/um/include/shared/net_kern.h | 2 +- + arch/x86/include/asm/microcode_amd.h | 2 +- + arch/x86/include/asm/microcode_intel.h | 4 ++-- + arch/x86/include/asm/pci.h | 2 +- + arch/x86/include/asm/pci_x86.h | 2 +- + arch/xtensa/include/asm/bootparam.h | 2 +- + drivers/crypto/caam/pdb.h | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 2 +- + drivers/gpu/drm/nouveau/include/nvfw/hs.h | 2 +- + drivers/hwspinlock/sprd_hwspinlock.c | 3 +-- + drivers/hwtracing/coresight/coresight-config.h | 2 +- + drivers/misc/bcm-vk/bcm_vk.h | 2 +- + drivers/misc/habanalabs/include/common/cpucp_if.h | 6 +++--- + .../misc/habanalabs/include/gaudi/gaudi_packets.h | 4 ++-- + drivers/misc/habanalabs/include/goya/goya_packets.h | 4 ++-- + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 2 +- + drivers/net/ethernet/i825xx/sun3_82586.h | 2 +- + drivers/net/ethernet/marvell/octeontx2/af/npc.h | 6 +++--- + drivers/net/ethernet/qlogic/qed/qed_mfw_hsi.h | 2 +- + drivers/net/ethernet/ti/davinci_mdio.c | 2 +- + drivers/scsi/dpt/dpti_i2o.h | 2 +- + drivers/scsi/elx/libefc_sli/sli4.h | 20 ++++++++++---------- + drivers/scsi/mpi3mr/mpi3mr.h | 2 +- + drivers/scsi/qla2xxx/qla_bsg.h | 4 ++-- + drivers/scsi/qla2xxx/qla_def.h | 2 +- + drivers/scsi/qla2xxx/qla_edif_bsg.h | 4 ++-- + drivers/scsi/qla2xxx/qla_fw.h | 2 +- + drivers/scsi/qla4xxx/ql4_fw.h | 2 +- + drivers/staging/r8188eu/include/rtw_cmd.h | 10 +++++----- + drivers/staging/rtl8712/rtl871x_cmd.h | 8 ++++---- + drivers/staging/rtl8723bs/include/ieee80211.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_cmd.h | 2 +- + .../vc04_services/include/linux/raspberrypi/vchiq.h | 2 +- + drivers/visorbus/vbuschannel.h | 2 +- + fs/cifs/ntlmssp.h | 2 +- + fs/ext4/fast_commit.h | 4 ++-- + fs/ksmbd/ksmbd_netlink.h | 2 +- + fs/ksmbd/ntlmssp.h | 6 +++--- + fs/ksmbd/smb2pdu.h | 8 ++++---- + fs/ksmbd/transport_rdma.c | 2 +- + fs/ksmbd/xattr.h | 2 +- + fs/xfs/scrub/attr.h | 2 +- + include/asm-generic/tlb.h | 4 ++-- + include/linux/greybus/greybus_manifest.h | 4 ++-- + include/linux/greybus/hd.h | 2 +- + include/linux/greybus/module.h | 2 +- + include/linux/i3c/ccc.h | 6 +++--- + include/linux/platform_data/brcmfmac.h | 2 +- + include/linux/platform_data/cros_ec_commands.h | 2 +- + include/net/bluetooth/mgmt.h | 2 +- + include/net/ioam6.h | 2 +- + include/sound/sof/channel_map.h | 4 ++-- + scripts/dtc/libfdt/fdt.h | 4 ++-- + sound/soc/intel/atom/sst-mfld-dsp.h | 4 ++-- + sound/soc/intel/skylake/skl-topology.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + 67 files changed, 112 insertions(+), 113 deletions(-) +Merging akpm-current/current (f5e256748143 ipc/mqueue: use get_tree_nodev() in mqueue_get_tree()) +$ git merge --no-ff akpm-current/current +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +CONFLICT (content): Merge conflict in Documentation/admin-guide/sysctl/kernel.rst +Auto-merging Documentation/vm/page_owner.rst +Auto-merging MAINTAINERS +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/mm/hugetlbpage.c +CONFLICT (modify/delete): arch/nds32/mm/init.c deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of arch/nds32/mm/init.c left in tree. +Auto-merging arch/powerpc/kernel/fadump.c +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/mm/init.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/cpu/mce/core.c +Auto-merging block/bdev.c +Auto-merging block/bfq-iosched.c +Auto-merging drivers/block/drbd/drbd_int.h +Auto-merging drivers/block/drbd/drbd_req.c +Auto-merging drivers/dax/super.c +Auto-merging drivers/iommu/tegra-smmu.c +Auto-merging fs/9p/vfs_inode.c +Auto-merging fs/afs/super.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/buffer.c +Auto-merging fs/ceph/addr.c +Auto-merging fs/ceph/inode.c +Auto-merging fs/ceph/super.c +Auto-merging fs/ceph/super.h +Auto-merging fs/ext2/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/f2fs/compress.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/segment.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/fs-writeback.c +Auto-merging fs/fuse/inode.c +Auto-merging fs/gfs2/super.c +Auto-merging fs/namespace.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfs/write.c +Auto-merging fs/nilfs2/segbuf.c +Auto-merging fs/proc/page.c +Auto-merging fs/reiserfs/super.c +Auto-merging fs/xfs/xfs_buf.c +Auto-merging fs/zonefs/super.c +Auto-merging include/linux/compiler_types.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/hugetlb.h +Auto-merging include/linux/kallsyms.h +Auto-merging include/linux/memremap.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/mm_inline.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/rmap.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/sched/sysctl.h +CONFLICT (content): Merge conflict in include/linux/sched/sysctl.h +Auto-merging include/linux/swap.h +Auto-merging include/linux/uaccess.h +Auto-merging include/linux/xarray.h +Auto-merging init/main.c +Auto-merging kernel/fork.c +Auto-merging kernel/panic.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/sysctl.c +Auto-merging lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merging lib/vsprintf.c +Auto-merging mm/Kconfig +CONFLICT (content): Merge conflict in mm/Kconfig +Auto-merging mm/damon/paddr.c +Auto-merging mm/debug.c +Auto-merging mm/filemap.c +Auto-merging mm/gup.c +Auto-merging mm/huge_memory.c +CONFLICT (content): Merge conflict in mm/huge_memory.c +Auto-merging mm/hugetlb.c +Auto-merging mm/internal.h +CONFLICT (content): Merge conflict in mm/internal.h +Auto-merging mm/ksm.c +Auto-merging mm/maccess.c +Auto-merging mm/madvise.c +Auto-merging mm/memcontrol.c +CONFLICT (content): Merge conflict in mm/memcontrol.c +Auto-merging mm/memory-failure.c +CONFLICT (content): Merge conflict in mm/memory-failure.c +Auto-merging mm/memory.c +CONFLICT (content): Merge conflict in mm/memory.c +Auto-merging mm/memory_hotplug.c +Auto-merging mm/memremap.c +CONFLICT (content): Merge conflict in mm/memremap.c +Auto-merging mm/migrate.c +Auto-merging mm/mlock.c +Auto-merging mm/mmap.c +Auto-merging mm/mmzone.c +Auto-merging mm/oom_kill.c +Auto-merging mm/page-writeback.c +Auto-merging mm/page_alloc.c +Auto-merging mm/page_io.c +Auto-merging mm/readahead.c +Auto-merging mm/rmap.c +CONFLICT (content): Merge conflict in mm/rmap.c +Auto-merging mm/slob.c +Auto-merging mm/swap.c +Auto-merging mm/usercopy.c +Auto-merging mm/userfaultfd.c +Auto-merging mm/vmscan.c +CONFLICT (content): Merge conflict in mm/vmscan.c +Auto-merging mm/workingset.c +CONFLICT (modify/delete): tools/testing/radix-tree/linux/gfp.h deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of tools/testing/radix-tree/linux/gfp.h left in tree. +Auto-merging tools/testing/selftests/vm/Makefile +Auto-merging tools/testing/selftests/vm/userfaultfd.c +Resolved 'Documentation/admin-guide/sysctl/kernel.rst' using previous resolution. +Resolved 'include/linux/sched/sysctl.h' using previous resolution. +Resolved 'lib/Kconfig.debug' using previous resolution. +Resolved 'mm/Kconfig' using previous resolution. +Resolved 'mm/huge_memory.c' using previous resolution. +Resolved 'mm/internal.h' using previous resolution. +Resolved 'mm/memcontrol.c' using previous resolution. +Resolved 'mm/memory-failure.c' using previous resolution. +Resolved 'mm/memory.c' using previous resolution. +Resolved 'mm/memremap.c' using previous resolution. +Resolved 'mm/rmap.c' using previous resolution. +Resolved 'mm/vmscan.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f tools/testing/radix-tree/linux/gfp.h arch/nds32/mm/init.c +rm 'arch/nds32/mm/init.c' +rm 'tools/testing/radix-tree/linux/gfp.h' +$ git commit -v -a +[master 224b02028a75] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-kernel-mm-damon | 274 +++ + Documentation/admin-guide/cgroup-v1/memory.rst | 2 + + Documentation/admin-guide/cgroup-v2.rst | 5 + + Documentation/admin-guide/kdump/kdump.rst | 10 +- + Documentation/admin-guide/kernel-parameters.txt | 7 +- + Documentation/admin-guide/mm/damon/usage.rst | 380 +++- + Documentation/admin-guide/mm/pagemap.rst | 2 +- + Documentation/admin-guide/mm/zswap.rst | 22 +- + Documentation/admin-guide/sysctl/kernel.rst | 33 +- + Documentation/core-api/mm-api.rst | 19 +- + Documentation/filesystems/porting.rst | 6 + + Documentation/filesystems/vfs.rst | 16 +- + Documentation/vm/balance.rst | 2 +- + Documentation/vm/damon/design.rst | 43 +- + Documentation/vm/damon/faq.rst | 2 +- + Documentation/vm/index.rst | 1 + + Documentation/vm/page_owner.rst | 32 +- + Documentation/vm/vmemmap_dedup.rst | 219 ++ + MAINTAINERS | 1 + + arch/arm/Kconfig | 4 +- + arch/arm64/Kconfig | 4 +- + arch/arm64/kernel/setup.c | 3 - + arch/arm64/mm/hugetlbpage.c | 1 + + arch/arm64/mm/init.c | 9 +- + arch/hexagon/mm/init.c | 2 - + arch/ia64/kernel/topology.c | 10 - + arch/ia64/mm/discontig.c | 11 +- + arch/mips/kernel/topology.c | 5 - + arch/openrisc/mm/init.c | 2 - + arch/powerpc/include/asm/fadump-internal.h | 5 - + arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h | 4 +- + arch/powerpc/kernel/fadump.c | 8 +- + arch/powerpc/kernel/sysfs.c | 17 - + arch/riscv/Kconfig | 4 +- + arch/riscv/kernel/setup.c | 3 - + arch/riscv/mm/init.c | 6 +- + arch/s390/kernel/numa.c | 7 - + arch/sh/kernel/topology.c | 5 - + arch/sparc/kernel/sysfs.c | 12 - + arch/sparc/mm/hugetlbpage.c | 1 + + arch/x86/Kconfig | 7 +- + arch/x86/kernel/cpu/mce/core.c | 8 +- + arch/x86/kernel/setup.c | 10 +- + arch/x86/kernel/topology.c | 5 - + arch/x86/mm/numa.c | 33 +- + block/bdev.c | 2 +- + block/bfq-iosched.c | 2 +- + drivers/base/init.c | 1 + + drivers/base/memory.c | 147 +- + drivers/base/node.c | 48 +- + drivers/block/drbd/drbd_int.h | 3 - + drivers/block/drbd/drbd_req.c | 3 +- + drivers/dax/super.c | 2 +- + drivers/iommu/tegra-smmu.c | 4 +- + drivers/of/of_reserved_mem.c | 9 +- + drivers/tty/tty_io.c | 2 +- + drivers/virtio/virtio_mem.c | 9 +- + fs/9p/vfs_inode.c | 2 +- + fs/adfs/super.c | 2 +- + fs/affs/super.c | 2 +- + fs/afs/super.c | 2 +- + fs/befs/linuxvfs.c | 2 +- + fs/bfs/inode.c | 2 +- + fs/btrfs/inode.c | 2 +- + fs/buffer.c | 56 +- + fs/ceph/addr.c | 22 +- + fs/ceph/inode.c | 2 +- + fs/ceph/super.c | 1 + + fs/ceph/super.h | 1 + + fs/cifs/cifsfs.c | 2 +- + fs/coda/inode.c | 2 +- + fs/dcache.c | 3 +- + fs/ecryptfs/super.c | 2 +- + fs/efs/super.c | 2 +- + fs/erofs/super.c | 2 +- + fs/exfat/super.c | 2 +- + fs/ext2/ialloc.c | 5 - + fs/ext2/super.c | 2 +- + fs/ext4/super.c | 2 +- + fs/f2fs/compress.c | 4 +- + fs/f2fs/data.c | 3 +- + fs/f2fs/f2fs.h | 6 + + fs/f2fs/segment.c | 8 +- + fs/f2fs/super.c | 14 +- + fs/fat/dir.c | 2 +- + fs/fat/inode.c | 2 +- + fs/freevxfs/vxfs_super.c | 2 +- + fs/fs-writeback.c | 37 - + fs/fuse/control.c | 17 - + fs/fuse/dev.c | 8 - + fs/fuse/file.c | 17 + + fs/fuse/inode.c | 2 +- + fs/gfs2/super.c | 2 +- + fs/hfs/super.c | 2 +- + fs/hfsplus/super.c | 2 +- + fs/hostfs/hostfs_kern.c | 2 +- + fs/hpfs/super.c | 2 +- + fs/hugetlbfs/inode.c | 2 +- + fs/inode.c | 2 +- + fs/isofs/inode.c | 2 +- + fs/jffs2/super.c | 2 +- + fs/jfs/super.c | 2 +- + fs/minix/inode.c | 5 +- + fs/namei.c | 8 +- + fs/namespace.c | 2 + + fs/nfs/inode.c | 2 +- + fs/nfs/write.c | 14 +- + fs/nilfs2/segbuf.c | 16 - + fs/nilfs2/super.c | 2 +- + fs/ntfs/inode.c | 6 +- + fs/ntfs3/super.c | 2 +- + fs/ocfs2/alloc.c | 2 +- + fs/ocfs2/aops.c | 2 +- + fs/ocfs2/cluster/nodemanager.c | 2 +- + fs/ocfs2/dir.c | 4 +- + fs/ocfs2/dlmfs/dlmfs.c | 2 +- + fs/ocfs2/file.c | 13 +- + fs/ocfs2/inode.c | 2 +- + fs/ocfs2/localalloc.c | 6 +- + fs/ocfs2/namei.c | 51 +- + fs/ocfs2/namei.h | 2 + + fs/ocfs2/ocfs2.h | 4 +- + fs/ocfs2/quota_global.c | 2 +- + fs/ocfs2/refcounttree.c | 15 +- + fs/ocfs2/stack_user.c | 18 +- + fs/ocfs2/super.c | 2 +- + fs/ocfs2/xattr.c | 12 +- + fs/ocfs2/xattr.h | 1 + + fs/openpromfs/inode.c | 2 +- + fs/orangefs/super.c | 2 +- + fs/overlayfs/super.c | 2 +- + fs/pipe.c | 13 +- + fs/proc/base.c | 8 +- + fs/proc/fd.c | 23 +- + fs/proc/inode.c | 2 +- + fs/proc/page.c | 40 +- + fs/proc/task_mmu.c | 9 +- + fs/proc/vmcore.c | 43 +- + fs/qnx4/inode.c | 2 +- + fs/qnx6/inode.c | 2 +- + fs/reiserfs/super.c | 2 +- + fs/romfs/super.c | 2 +- + fs/squashfs/super.c | 2 +- + fs/sysv/inode.c | 2 +- + fs/ubifs/super.c | 2 +- + fs/udf/super.c | 2 +- + fs/ufs/super.c | 2 +- + fs/userfaultfd.c | 11 +- + fs/vboxsf/super.c | 2 +- + fs/xfs/xfs_buf.c | 3 - + fs/xfs/xfs_icache.c | 2 +- + fs/zonefs/super.c | 2 +- + include/linux/backing-dev-defs.h | 8 - + include/linux/backing-dev.h | 50 - + include/linux/balloon_compaction.h | 22 - + include/linux/bitfield.h | 3 + + include/linux/cma.h | 10 + + include/linux/compiler_types.h | 2 - + include/linux/damon.h | 87 +- + include/linux/fs.h | 21 +- + include/linux/gfp.h | 22 +- + include/linux/highmem-internal.h | 10 + + include/linux/hugetlb.h | 8 +- + include/linux/init.h | 11 +- + include/linux/kallsyms.h | 27 + + include/linux/kexec.h | 12 +- + include/linux/list_lru.h | 17 +- + include/linux/log2.h | 4 +- + include/linux/memcontrol.h | 46 +- + include/linux/memory.h | 12 + + include/linux/memory_hotplug.h | 129 +- + include/linux/mempolicy.h | 5 +- + include/linux/memremap.h | 6 + + include/linux/mm.h | 22 +- + include/linux/mm_inline.h | 97 +- + include/linux/mm_types.h | 5 +- + include/linux/mmzone.h | 22 +- + include/linux/nfs_fs_sb.h | 1 + + include/linux/node.h | 25 +- + include/linux/page-flags.h | 90 +- + include/linux/pageblock-flags.h | 7 +- + include/linux/pagemap.h | 7 - + include/linux/rmap.h | 8 +- + include/linux/sched.h | 8 + + include/linux/sched/sysctl.h | 10 + + include/linux/shmem_fs.h | 1 + + include/linux/slab.h | 3 + + include/linux/stddef.h | 6 +- + include/linux/swap.h | 5 +- + include/linux/thread_info.h | 5 +- + include/linux/uaccess.h | 2 - + include/linux/vm_event_item.h | 3 + + include/linux/xarray.h | 9 +- + include/trace/events/mmflags.h | 1 - + include/trace/events/writeback.h | 28 - + include/uapi/linux/userfaultfd.h | 8 +- + init/main.c | 39 +- + ipc/mqueue.c | 16 +- + kernel/cgroup/rstat.c | 13 +- + kernel/configs/debug.config | 2 +- + kernel/dma/contiguous.c | 4 +- + kernel/fork.c | 4 +- + kernel/hung_task.c | 44 + + kernel/kcov.c | 98 +- + kernel/ksysfs.c | 3 +- + kernel/panic.c | 37 +- + kernel/resource.c | 41 +- + kernel/sched/core.c | 21 +- + kernel/sys.c | 19 +- + kernel/sysctl.c | 2 +- + lib/Kconfig.debug | 148 +- + lib/Kconfig.kcsan | 11 - + lib/Kconfig.ubsan | 12 - + lib/lz4/lz4_decompress.c | 8 +- + lib/test_printf.c | 8 +- + lib/ubsan.c | 10 +- + lib/vsprintf.c | 13 +- + lib/xarray.c | 10 +- + mm/Kconfig | 9 + + mm/backing-dev.c | 57 - + mm/balloon_compaction.c | 6 +- + mm/cma.c | 31 +- + mm/cma.h | 1 + + mm/damon/Kconfig | 19 +- + mm/damon/Makefile | 7 +- + mm/damon/core-test.h | 21 +- + mm/damon/core.c | 190 +- + mm/damon/dbgfs-test.h | 85 +- + mm/damon/dbgfs.c | 222 +- + mm/damon/{prmtv-common.c => ops-common.c} | 2 +- + mm/damon/{prmtv-common.h => ops-common.h} | 0 + mm/damon/paddr.c | 36 +- + mm/damon/reclaim.c | 9 +- + mm/damon/sysfs.c | 2596 ++++++++++++++++++++++ + mm/damon/vaddr-test.h | 8 +- + mm/damon/vaddr.c | 43 +- + mm/debug.c | 1 - + mm/fadvise.c | 5 +- + mm/filemap.c | 11 +- + mm/gup.c | 101 +- + mm/highmem.c | 9 +- + mm/hmm.c | 3 +- + mm/huge_memory.c | 37 +- + mm/hugetlb.c | 23 +- + mm/hugetlb_vmemmap.c | 188 +- + mm/hwpoison-inject.c | 7 +- + mm/internal.h | 15 +- + mm/kasan/report.c | 10 +- + mm/kfence/Makefile | 2 +- + mm/ksm.c | 6 +- + mm/list_lru.c | 416 ++-- + mm/maccess.c | 6 + + mm/madvise.c | 94 +- + mm/memcontrol.c | 522 ++--- + mm/memfd.c | 40 +- + mm/memory-failure.c | 147 +- + mm/memory.c | 100 +- + mm/memory_hotplug.c | 135 +- + mm/mempolicy.c | 35 +- + mm/memremap.c | 24 +- + mm/migrate.c | 46 +- + mm/mlock.c | 2 +- + mm/mmap.c | 15 +- + mm/mmzone.c | 7 +- + mm/mprotect.c | 15 +- + mm/oom_kill.c | 3 - + mm/page-writeback.c | 12 - + mm/page_alloc.c | 394 ++-- + mm/page_io.c | 7 +- + mm/page_owner.c | 72 +- + mm/page_table_check.c | 10 +- + mm/percpu-vm.c | 8 +- + mm/ptdump.c | 16 +- + mm/readahead.c | 122 +- + mm/rmap.c | 25 +- + mm/shmem.c | 22 +- + mm/slab.c | 39 +- + mm/slab.h | 25 +- + mm/slob.c | 6 + + mm/slub.c | 42 +- + mm/sparse-vmemmap.c | 242 +- + mm/sparse.c | 28 +- + mm/swap.c | 20 +- + mm/swap_state.c | 2 +- + mm/swapfile.c | 1 + + mm/usercopy.c | 16 +- + mm/userfaultfd.c | 18 +- + mm/vmalloc.c | 104 +- + mm/vmscan.c | 27 +- + mm/vmstat.c | 6 + + mm/workingset.c | 7 +- + mm/zswap.c | 15 +- + net/socket.c | 2 +- + net/sunrpc/rpc_pipe.c | 2 +- + scripts/checkpatch.pl | 27 +- + scripts/spelling.txt | 16 + + tools/perf/builtin-kmem.c | 1 - + tools/testing/selftests/cgroup/cgroup_util.c | 15 +- + tools/testing/selftests/cgroup/cgroup_util.h | 1 + + tools/testing/selftests/cgroup/test_memcontrol.c | 78 + + tools/testing/selftests/damon/Makefile | 1 + + tools/testing/selftests/damon/sysfs.sh | 306 +++ + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 7 +- + tools/testing/selftests/vm/hugepage-mremap.c | 26 +- + tools/testing/selftests/vm/hugepage-vmemmap.c | 144 ++ + tools/testing/selftests/vm/run_vmtests.sh | 14 +- + tools/testing/selftests/vm/userfaultfd.c | 1 + + tools/vm/page_owner_sort.c | 256 ++- + 309 files changed, 7948 insertions(+), 3186 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-damon + create mode 100644 Documentation/vm/vmemmap_dedup.rst + rename mm/damon/{prmtv-common.c => ops-common.c} (99%) + rename mm/damon/{prmtv-common.h => ops-common.h} (100%) + create mode 100644 mm/damon/sysfs.c + create mode 100644 tools/testing/selftests/damon/sysfs.sh + create mode 100644 tools/testing/selftests/vm/hugepage-vmemmap.c +$ git am -3 ../patches/0001-fix-up-for-tools-Move-gfp.h-and-slab.h-from-radix-tr.patch +Applying: fix up for "tools: Move gfp.h and slab.h from radix-tree to lib" +$ git reset HEAD^ +Unstaged changes after reset: +M tools/include/linux/gfp.h +$ git add -A . +$ git commit -v -a --amend +[master 5825fb391eae] Merge branch 'akpm-current/current' + Date: Fri Mar 4 19:36:01 2022 +1100 +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +Rebasing (1/102)
Rebasing (2/102)
Rebasing (3/102)
Rebasing (4/102)
Rebasing (5/102)
Rebasing (6/102)
Rebasing (7/102)
Rebasing (8/102)
Rebasing (9/102)
Rebasing (10/102)
Rebasing (11/102)
Rebasing (12/102)
Rebasing (13/102)
Rebasing (14/102)
Rebasing (15/102)
Rebasing (16/102)
Rebasing (17/102)
Rebasing (18/102)
Rebasing (19/102)
Rebasing (20/102)
Rebasing (21/102)
Rebasing (22/102)
Rebasing (23/102)
Rebasing (24/102)
Rebasing (25/102)
Rebasing (26/102)
Rebasing (27/102)
Rebasing (28/102)
Rebasing (29/102)
Rebasing (30/102)
Rebasing (31/102)
Rebasing (32/102)
Rebasing (33/102)
Rebasing (34/102)
Rebasing (35/102)
Rebasing (36/102)
Rebasing (37/102)
Rebasing (38/102)
Rebasing (39/102)
Rebasing (40/102)
Rebasing (41/102)
Rebasing (42/102)
Rebasing (43/102)
Rebasing (44/102)
Rebasing (45/102)
Rebasing (46/102)
Rebasing (47/102)
Rebasing (48/102)
Rebasing (49/102)
Rebasing (50/102)
Rebasing (51/102)
Rebasing (52/102)
Rebasing (53/102)
Rebasing (54/102)
Rebasing (55/102)
Rebasing (56/102)
Rebasing (57/102)
Rebasing (58/102)
Rebasing (59/102)
Rebasing (60/102)
Rebasing (61/102)
Rebasing (62/102)
Rebasing (63/102)
Rebasing (64/102)
Rebasing (65/102)
Rebasing (66/102)
Rebasing (67/102)
Rebasing (68/102)
Rebasing (69/102)
Rebasing (70/102)
Rebasing (71/102)
Rebasing (72/102)
Rebasing (73/102)
Rebasing (74/102)
Rebasing (75/102)
Rebasing (76/102)
Rebasing (77/102)
Rebasing (78/102)
Rebasing (79/102)
Rebasing (80/102)
Rebasing (81/102)
Rebasing (82/102)
Rebasing (83/102)
Rebasing (84/102)
Rebasing (85/102)
Rebasing (86/102)
Rebasing (87/102)
Rebasing (88/102)
Rebasing (89/102)
Rebasing (90/102)
Rebasing (91/102)
Rebasing (92/102)
Rebasing (93/102)
Rebasing (94/102)
Rebasing (95/102)
Rebasing (96/102)
Rebasing (97/102)
Rebasing (98/102)
Rebasing (99/102)
Rebasing (100/102)
Rebasing (101/102)
Rebasing (102/102)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + cd2ce83be2d8...a43902460ff4 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (a43902460ff4 kselftest/vm: override TARGETS from arguments) +$ git merge --no-ff akpm/master +Merge made by the 'ort' strategy. + Documentation/dev-tools/kasan.rst | 17 +- + arch/arm64/Kconfig | 2 +- + arch/arm64/include/asm/vmalloc.h | 6 + + arch/arm64/include/asm/vmap_stack.h | 5 +- + arch/arm64/kernel/module.c | 5 +- + arch/arm64/mm/pageattr.c | 2 +- + arch/arm64/net/bpf_jit_comp.c | 3 +- + arch/powerpc/mm/book3s64/trace.c | 1 - + arch/s390/kernel/module.c | 2 +- + arch/x86/kernel/module.c | 2 +- + arch/x86/kernel/resource.c | 1 + + arch/x86/mm/init.c | 1 - + fs/dax.c | 82 +----- + include/linux/gfp.h | 35 ++- + include/linux/huge_mm.h | 6 - + include/linux/kasan.h | 106 ++++--- + include/linux/mm.h | 8 - + include/linux/rmap.h | 3 + + include/linux/swap.h | 4 - + include/linux/vmalloc.h | 18 +- + include/trace/events/huge_memory.h | 1 - + include/trace/events/migrate.h | 31 ++ + include/trace/events/mmflags.h | 14 +- + include/trace/events/thp.h | 27 ++ + kernel/fork.c | 9 +- + kernel/scs.c | 12 +- + lib/Kconfig.kasan | 20 +- + lib/test_kasan.c | 239 ++++++++++++++-- + mm/huge_memory.c | 69 +---- + mm/internal.h | 26 +- + mm/kasan/Makefile | 2 +- + mm/kasan/common.c | 4 +- + mm/kasan/hw_tags.c | 211 +++++++++++--- + mm/kasan/kasan.h | 56 +++- + mm/kasan/report.c | 326 ++++++++++++--------- + mm/kasan/report_generic.c | 34 ++- + mm/kasan/report_hw_tags.c | 1 + + mm/kasan/report_sw_tags.c | 15 + + mm/kasan/report_tags.c | 2 +- + mm/kasan/shadow.c | 63 ++-- + mm/khugepaged.c | 11 - + mm/madvise.c | 33 ++- + mm/memory.c | 144 ++++++---- + mm/migrate.c | 4 +- + mm/oom_kill.c | 58 ++-- + mm/page_alloc.c | 152 ++++++---- + mm/page_vma_mapped.c | 5 +- + mm/rmap.c | 130 +++++++-- + mm/swapfile.c | 104 ------- + mm/vmalloc.c | 99 ++++++- + tools/testing/selftests/kselftest.h | 10 + + tools/testing/selftests/vm/.gitignore | 2 + + tools/testing/selftests/vm/Makefile | 4 +- + tools/testing/selftests/vm/config | 2 + + tools/testing/selftests/vm/hugetlb-madvise.c | 410 +++++++++++++++++++++++++++ + tools/testing/selftests/vm/memfd_secret.c | 2 +- + tools/testing/selftests/vm/run_vmtests.sh | 15 +- + tools/testing/selftests/vm/soft-dirty.c | 238 ++++++++++++++++ + tools/testing/selftests/vm/userfaultfd.c | 72 ++--- + 59 files changed, 2113 insertions(+), 853 deletions(-) + create mode 100644 tools/testing/selftests/vm/hugetlb-madvise.c + create mode 100644 tools/testing/selftests/vm/soft-dirty.c diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..905911fefced --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20220304 |