diff options
| author | Mark Brown <broonie@kernel.org> | 2022-02-25 02:10:12 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-02-25 02:10:12 +0000 |
| commit | 44948bd49d878dad6c9707e34f4a06df73c3a800 (patch) | |
| tree | 884826d3185aa89b45dc5f388269bef03aad1ccb | |
| parent | 15aa3a056caa5192fe614cacebf054634b4c5e90 (diff) | |
Add linux-next specific files for 20220224next-20220224
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | Next/SHA1s | 349 | ||||
| -rw-r--r-- | Next/Trees | 349 | ||||
| -rw-r--r-- | Next/merge.log | 12588 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 13287 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..cfba87923afe --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,349 @@ +Name SHA1 +---- ---- +origin 23d04328444a8fa0ca060c5e532220dac8e8bc26 +fixes d06c942efea40e1701ade200477a7449008d9f24 +kbuild-current 754e0b0e35608ed5206d6a67a791563c631cec07 +arc-current e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +arm-current 9f80ccda53b9417236945bc7ece4b519037df74d +arm64-fixes 4f6de676d94ee8ddfc2e7e7cd935fc7cb2feff3a +arm-soc-fixes 98e437f134b3447e22af78e6c71837cd9b404990 +drivers-memory-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +tee-fixes 7e3c6eb44c91f1ba0a92d6f327f60a552d4d36c8 +m68k-current 1a0ae068bf6b6f4233b1f31bf48bcbc47b111ef2 +powerpc-fixes fe663df7825811358531dc2e8a52d9eaa5e3515e +s390-fixes dd9cb842fa9d90653a9b48aba52f89c069f3bc50 +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net 5facf49702b6d994d3f1c72cffa0e83f3858ee19 +bpf 8940e6b669ca1196ce0a0549c819078096390f76 +ipsec 7c76ecd9c99b6e9a771d813ab1aa7fa428b3ade1 +netfilter 277f2bb14361790a70e4b3c649e794b75a91a597 +ipvs 277f2bb14361790a70e4b3c649e794b75a91a597 +wireless 859ae7018316daa4adbc496012dcbbb458d7e510 +rdma-fixes c46fa8911b17e3f808679061a8af8bee219f4602 +sound-current ce345f1e48458837a5b064cac94382c095e00e79 +sound-asoc-fixes 4b0bec6088588a120d33db85b1f0d9f096d1df71 +regmap-fixes d04ad245d67a3991dfea5e108e4c452c2ab39bac +regulator-fixes 9ea28fe70274b8709640e74bdf7d6b8cd027aba1 +spi-fixes 1c5e6bf947c9fa2b12d651a11086be1f1c78a393 +pci-current 3f1271b54edcc692da5a3663f2aa2a64781f9bc3 +driver-core.current d8f7a5484f2188e9af2d9e4e587587d724501b12 +tty.current eebb0f4e894f1e9577a56b337693d1051dd6ebfd +usb.current 32fde84362c40961726a5c91f35ad37355ccc0c6 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes cfc4442c642d568014474b6718ccf65dc7ca6099 +usb-chipidea-fixes f130d08a8d79fd419c339d95eb28ddff72a73f52 +phy 9a8406ba1a9a2965c27e0db1d7753471d12ee9ff +staging.current b6821b0d9b56386d2bf14806f90ec401468c799f +iio-fixes ea85bf906466191b58532bb19f4fbb4591f0a77e +char-misc.current 6c7621890995d089a56a06d11580d185ede7c2f8 +soundwire-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +thunderbolt-fixes cfb92440ee71adcc2105b0890bb01ac3cddb8507 +input-current 7b1f781f2d2460693f43d5f764198df558e3494b +crypto-current c6ce9c5831cae515d375a01b97ae1778689acf19 +vfio-fixes 8704e89349080bd640d1755c46d8cdc359a89748 +kselftest-fixes 6fec1ab67f8d60704cc7de64abcfd389ab131542 +modules-fixes a8e8f851e8299703a005cf23dfb9ec854a2611e5 +dmaengine-fixes cfb92440ee71adcc2105b0890bb01ac3cddb8507 +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes 36415a7964711822e63695ea67fede63979054d9 +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes d40f0b133b44dc8ae2935d935add304496a19044 +reset-fixes 92c959bae2e54ba1e2540ba5f813f7752bd76be1 +mips-fixes 1e6ae0e46e32749b130f1823da30cea9aa2a59a0 +at91-fixes 26077968f8389a68fdb38af3f2c2289ddc95e8ca +omap-fixes 8840f5460a23759403f1f2860429dcbcc2f04a65 +kvm-fixes 991f988b43c5ee82ef681907bfe979bee93a55c2 +kvms390-fixes 0e9ff65f455dfd0a8aea5e7843678ab6fe097e21 +hwmon-fixes 35f165f08950a876f1b95a61d79c93678fba2fd6 +nvdimm-fixes 3dd60fb9d95db9c78fec86ba4df20852a7b974ba +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes 6e60f6a7ae9535f5aee96308302aa3944bbd9616 +vfs-fixes 9d2231c5d74e13b2a0546fee6737ee4446017903 +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes ae09639e3b2a0291b37b122c94dd4f773cd4e513 +samsung-krzk-fixes 442b0c08db7e35980bed6af091877f4dda72ffca +pinctrl-samsung-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +devicetree-fixes 0c0822bcb73f154d96ee648644ec5a8628e3b864 +scsi-fixes 10af115646171afc0217177d6eae92917b785897 +drm-fixes 7c17b3d37f1fa1eb0498cdf63d43ce37b23eaae5 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 28adef861233c6fce47372ebd2070b55eaa8e899 +mmc-fixes 54309fde1a352ad2674ebba004a79f7d20b9f037 +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +hyperv-fixes ffc58bc4af9365d4eea72526bb3cf6a83615c673 +soc-fsl-fixes a222fd8541394b36b13c89d1698d9530afd59a9c +risc-v-fixes 5feef64f4c67068c49f5409d43c67cabf2327f66 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +spdx e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +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 0ea9e1c3dbd4e78f7a82d23fdc959622432e461c +zstd-fixes 88a309465b3f05a100c3b81966982c0f9f5d23a6 +drm-misc-fixes ecbd4912a693b862e25cba0a6990a8c95b00721e +kspp e1558b5e29c6ba534df8553461152b02b9b17af6 +kspp-gustavo 91adfbb14c00b9b4dcd4c9c680c653dd3a8a1919 +kbuild 12335bbb9fc7592bceade734ecb88b05c8981051 +perf 859f7e45542aecaa77fde929232cbcf91b29e11d +compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69 +dma-mapping e62c17f0455a74b182ce6373e2777817256afaa1 +asm-generic 45d9de484a57be37a3730f32682943b643a4785a +arc 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +arm ed43eed0a6ace218a40a3f114673c6acc305ab7b +arm64 43202c19b03b0f8a18b30c0985a9212c306b7e00 +arm-perf 602c873eb52e5717057eb0971258c8eb7440c4a5 +arm-soc 98e437f134b3447e22af78e6c71837cd9b404990 +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 39369380e729cff4d711c720199b258bbcb6c217 +aspeed b9edd69951ab9b209bc17decb8e241b1cf682fff +at91 9be3df0e718c07dcf5b34c6c1c8f96e774d1b392 +drivers-memory b7c3f95f32e0309a88ac1f9bb060ce6d5217e154 +imx-mxs 45550ada88f0253bef38041f2c1d80f6e69bb0ed +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek 896f47a2c39c51a8d372f7a4007d0e2d96325a7b +mvebu fecc54c7ccfe5b8cef8b5a939dc3e4e7ea099bbb +omap f9ecc209330a4837393f7b87f6f95970542b90c6 +qcom 1b2ab1a30acbf0f683e1a220c163816e0d8cd733 +raspberrypi c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca +renesas 77494b5c6a736414fb60a82e47e368b133443306 +reset 89e7a6698fdd6d0cccf5bab11abc51f813944cd8 +rockchip bf19347a78563c1aa31598ca1332f309270f770c +samsung-krzk 39c2a5e0d38a2f1a8e01bcedbc7b5fd52e604868 +scmi 210b966b7e2f873a5dfe631c2f36dbe93094b2ea +stm32 a0977e3dbcb4d9be38ab959a53fa8f4bf11b9279 +sunxi d7ab185b353fa351e87c85b61e74c52b704a0253 +tee ff8187c5dd8fcba091f381125780d8d72a4680cc +tegra 0aeee7376181ea6ce8cc4b01cf4ddb4058ce9aab +ti 7e3580d1f38a29f6587f2e9a788301fc3e15e7f8 +xilinx 3a14f0e614082821ef65de7e1fb39e74c2ee4ee3 +clk 48473a3319f6fd5b9dff9da201ecc9e8db2f4e94 +clk-imx e501cf5e56c6b3461134f9657fff9869bf71bf23 +clk-renesas 73421f2a48e6bd1d1024a09aedbc9c662cb88e77 +clk-samsung 45bd8166a1d821eb8fada3092514a7c8543f537c +csky a0793fdad9a11a32bc6d21317c93c83f4aa82ebc +h8300 1ec10274d436fbe77b821fbdf095b45d0888e46d +m68k 8213c61376877ead2128f2ce1b5935be58bad0da +m68knommu 244e6c2d4e4de4ea5f055ca2a57755fd1105a570 +microblaze fcc619621df50f63b641b18536f908b05d6782a4 +mips fbb1d4b381b058ed60b39f1598532f559b441762 +nds32 07cd7745c6f2081dac0aff7f57ea2b48c86de5fa +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc f4f4d0fba0c51594d8c78dae7982436017b7e2b3 +parisc-hd 54a9405150272f4986c38f817214786ae4232341 +powerpc 5a72345e6a78120368fcc841b570331b6c5a50da +soc-fsl 1ce93cb102e7fcf5d1849044d23ce92b5a71040a +risc-v d56201d9440de302c8cb017761946e585f6cb74f +s390 00abcf5346759a8a0971d8f8f51c9c3ba448da3c +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml db0dd9cee82270e032123169ceff659eced5115d +xtensa 8a900dc390daecbfd0025bd4f12a11d2ed911fb7 +pidfd d52c14f5f9b326049c8b454e3a54d41d9d81063b +fscrypt cdaa1b1941f667814300799ddb74f3079517cd5a +fscache dd81e1c7d5fb126e5fbc5c9e334d7b3ec29a16a0 +afs 26291c54e111ff6ba87a164d85d4a4e134b7315c +btrfs 7ba32505eb7ffbf1c375ccde02fbad0a769f7f5d +ceph 038b8d1d1ab1cce11a158d30bf080ff41a2cfd15 +cifs e5e5d45ed9c8cf4ac6c76379ace0ebdd6819ddeb +configfs 84ec758fb2daa236026506868c8796b0500c047d +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs c678fc27e5aec2eb9e56749e4671fdda9dd9559d +exfat dd81e1c7d5fb126e5fbc5c9e334d7b3ec29a16a0 +ext3 48b0e01109f5fb91eabb6f7c4a487b76942061cc +ext4 dfd42facf1e4ada021b939b4e19c935dcdd55566 +f2fs 297d91439d3864ec48e7a320d59e376f398c962d +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse c086df4902573e2f06c6a2a83452c13a8bc603f5 +gfs2 a4e8145edcfd66b69056c59885770b428eccca59 +jfs c48a14dca2cb57527dde6b960adbe69953935f10 +ksmbd 1a927cda94ac5e6783f243d4b3cd772b1c552ced +nfs cfb92440ee71adcc2105b0890bb01ac3cddb8507 +nfs-anna d19e0183a88306acda07f4a01fedeeffe2a2a06b +nfsd ffcb2895943f05fe4592e46154f3a061fb390ba6 +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 15acceb9f0d6b69ee2263a41a6bd8bfd77dd580b +pci f72ca2da14cf8c8b517b70663993add21f11ea70 +pstore a5d05b07961a2df47d3b4aae3bdae61ac095a43c +hid c0774561bd465b05c6e1a6885bb0b282b2d51b92 +i2c 23c6aefe6d0a9c705d028d71396cd10ea60df537 +i3c 13462ba1815db5a96891293a9cfaa2451f7bd623 +dmi f97a2103f1a75ca70f23deadb4d96a16c4d85e7d +hwmon-staging cae6551f44f112284027512494b927c6c339cb5c +jc_docs b62ef3a1cca0553613adce16515f3640400725b4 +v4l-dvb 127efdbc51fe6064336c0452ce9c910b3e107cf0 +v4l-dvb-next 2b891d3980f6c255459d0e1c29ce2152ec7cf678 +pm 2ecb866af0048e96c331a206a876a935d3649f78 +cpufreq-arm ec1c7ad47664f964c1101fe555b6fde0cb124b38 +cpupower 8382dce5e4835c045f33b8958a5f559d212cdd11 +devfreq 26291c54e111ff6ba87a164d85d4a4e134b7315c +opp 8acf5cb92d9dc0a6eff7a22b01432d0379656e45 +thermal 8ee1c0f6526ce942b7595951c7bb0165010051c2 +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm feae43f8aa88309224b27bbe3a59fcb9aefab6f5 +rdma 748663c8ccf6b2e5a800de19127c2cc1c4423fd2 +net-next e422eef268baa0d08f969d1330f13929a7efc138 +bpf-next 08d4dba6ae77aaec0e0c79dcfcb0613cb7426b2c +ipsec-next 2ecda181682e9ed66dfbd5f8445c5d5a35b984d3 +mlx5-next 45fee8edb4b333af79efad7a99de51718ebda94b +netfilter-next c828414ac935bd3df96a8f7028d9d06a3db441e8 +ipvs-next c828414ac935bd3df96a8f7028d9d06a3db441e8 +bluetooth e8e41e2b99cc4355fdf057fefcaf3db4b1ad6bc6 +wireless-next a0061be4e54b52e5e4ff179c3f817107ddbb2830 +mtd 2365f91c861cbfeef7141c69842848c7b2d3c2db +nand ffb16c1c42670356c579926aabdac0ac7bbc16d8 +spi-nor e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +crypto 0a2a464f863187f97e96ebc6384c052cafd4a54c +drm 0a131b69c141638c1be85c4539c1513426abb2b2 +drm-misc d3cbc6e323c9299d10c8d2e4127c77c7d05d07b1 +amdgpu 3063372f22acec45a6f563055473e0784c0ca3a6 +drm-intel 30424ebae8df0f786835e7a31ad790fa00764f35 +drm-tegra 8913e1aea4b32a866343b14e565c62cec54f3f78 +drm-msm bc2112583a0b473f5c4ba87c00da84abd5d0b3fd +imx-drm 20fbfc81e390180db738c414c1b7ac85d31e24b3 +etnaviv cdd156955f946beaa5f3a00d8ccf90e5a197becc +fbdev 997403e7782a3b9aa6e2b28c6b78793659483af3 +regmap 2d2329787ba2e70eae330f1cecd61a9576fe65de +sound d23c49562a887a8875b144d092034e14b0e279ff +sound-asoc b83eb8be4f2ca9d6beb1a8b66f666ef7039b7a64 +modules a97ac8cb24a3c3ad74794adb83717ef1605d1b47 +input 986c6f7c3fc855032f3457a5a1b7fbcc09c375bb +block bc6115211813f53e6cace38fa5ef85a55dfbcf88 +device-mapper f5b4aee10c024a35901cc2f1b9b4d80986a93937 +libata 9256766fe2df9510cbeee8b458dab5df7df8506e +pcmcia 3928cf08334ed895a31458cbebd8d4ec6d84c080 +mmc 4a85422750e8b0dd683379451c418ec179a1418c +mfd 2152543edc5da4010633a28ef010f510eb174c64 +backlight ec961cf3241153e0f27d850f1bf0f172e7d27a21 +battery 5ac121b81b4051e7fc83d5b3456a5e499d5bd147 +regulator a94e5cd8457fb46866459562ef6c53f9dcc375f7 +security 047843bdb3160e8fb225f3752616ac7257033fe4 +apparmor 13db6c2acdcda3513445839f035c7142e9761049 +integrity cd3bc044af483422cc81a93f23c78c20c978b17c +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5 +selinux b97df7c098c531010e445da88d02b7bf7bf59ef6 +smack e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +tomoyo 39844b7e3084baecef52d1498b5fa81afa2cefa9 +tpmdd c9e54f38976a1c0ec69c0a6208b3fd55fceb01d1 +watchdog cfb92440ee71adcc2105b0890bb01ac3cddb8507 +iommu a9b491f6d6de0cc3287be6cdf9855eafd4f8b461 +audit 272ceeaea355214b301530e262a0df8600bfca95 +devicetree 16234ef1d2aa170e37c27734ab6544633707ba19 +mailbox 869b6ca39c08c5b10eeb29d4b3c4bc433bf8ba5e +spi 4d986ffa036a773456476f70bd0fde2fb1330b7d +tip abe87fe230d7233bce90b7e40f005864954153eb +clockevents e547ffe9e6f497e36bde9d86dbcfbc781946752b +edac 9e32472d8b3fe0ded8000bdd3bf11b267092178c +irqchip 141e6a976c0583cd5339218a4843ea24c550a18d +ftrace 864ea0e10cc90416a01b46f0d47a6f26dc020820 +rcu 1b40a3d2152f568a7fc22535b135525cf7185c81 +kvm 0828824158b1cb8108bb2b1f5eeab5826e6017e7 +kvm-arm 5298e539de74dc5237691013394cc80f2b751fec +kvms390 3d9042f8b923810c169ece02d91c70ec498eff0b +xen-tip f66edf684edcb85c1db0b0aa8cf1a9392ba68a9d +percpu 4e1f82dce05b644d6886d5b3656446d8ec50db20 +workqueues bc35f7ef96284b8c963991357a9278a6beafca54 +drivers-x86 2546c60004309ede8e2d1d5341e0decd90e057bf +chrome-platform b579f139e47037cf98808ccf7511a6deb02f3b18 +hsi e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +leds 8b43ef06ff893f733a0b66e9875518c0230f2715 +ipmi 00d93611f00219bd142aa119c5121793cac30ff0 +driver-core b4ae8c2fb673d2fc60cb8fe645dba4f4db8b0dab +usb a5d847b0afd317df1ed0e3b72fbef72ce4824532 +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 26291c54e111ff6ba87a164d85d4a4e134b7315c +usb-chipidea-next 78665f57c3faa09f123c4818101526e43ae9b6a4 +tty a603ca60cebff8589882427a67f870ed946b3fc8 +char-misc 4c49300d8e676702cc097784007bf11735821d6d +extcon b26c5f03a64538d8897851458ed49af39001a869 +gnss 26291c54e111ff6ba87a164d85d4a4e134b7315c +phy-next 4a4c3cc146b12fea3a25748c43abfb461978bcee +soundwire 63fadaa2c7190ad6fc546a8b95e044bd75422dec +thunderbolt 7f7b571becf3731dfa9aa50bed420e0c988e511d +vfio 2bed2ced40c97b8540ff38df0149e8ecb2bf4c65 +staging 7c6444d8e0f1be30e7fd910e40c0d495c36e6935 +iio 2be8795a609800e5071d868d459ce29232fce2c8 +mux 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +icc 2ccd1d8a2f5d9daaa092060b1f9f779755ef36c7 +dmaengine ea7c8f598c323f6ebaf9ddae01fb2a981fe8c56a +cgroup 88ea791b5665730a864088be384d4f4f6833e63b +scsi 95cd16ea1a66b743862c4b05a6aa25757b63004e +scsi-mkp b709a4caa9d01f89314a4e5aab2e722fc9a5989a +vhost fae0bd40fab0881169991942c5ab11c5464178c3 +rpmsg dbba77c2f01b4c428a97c4657e8cf02359c3250a +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl 667630edb5bacd05ee423cbbb53f236d0122ea34 +gpio-intel a1ce76e89907a69713f729ff21db1efa00f3bb47 +gpio-sim 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +pinctrl c6f1b980aec10a6d413672d72e355afc9665c788 +pinctrl-intel d25478e1d8f9bf9344cf61a9c02fae88d9930f55 +pinctrl-renesas d47a74513f54d297bc3e67861a001d3c9239bf8c +pinctrl-samsung 3652dc070bad335d6feb31402bb4ab1ad58d5cb6 +pwm ed14d36498c8d15be098df4af9ca324f96e9de74 +userns ab135102861ce2198a0c7898206e00bc41e52ade +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest 1900be289b598b2c553b3add13e491c0bb8a8550 +livepatching b44a7f076ce1dac5b7a495f1902db0c5c4ee99d5 +coresight a4dabc3d30ea502fbd34319576f708174e328b72 +rtc 73ce05302007eece23a6acb7dc124c92a2209087 +nvdimm 2166a9974902d277cc03f15027d72c4d6ab2a256 +at24 e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +ntb afe1c85b354c6051761d80479262bd157cfc88f4 +seccomp eed09ad261822a7bdc441ed192c6f444375e5527 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +fsi f2af60bb7ce2fa5397f401cbf65725d9c87329a4 +slimbus e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +nvmem e15d2e3fd7ab614839ced98c7f6d7da3347acc42 +xarray 22f56b8e890d4e2835951b437bb6eeebfd1cb18b +hyperv d57d6fe5bf3463aad1332ecfc7555a6888b04fd9 +auxdisplay 4daa9ff89ef27be43c15995412d6aee393a78200 +kgdb b77dbc86d60459b42ab375e4e23172e7245f2854 +hmm 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +fpga 21f0a239ecab4b6765269af78904512358beb802 +kunit e783362eb54cd99b2cac8b3a9aeac942e6f6ac07 +cfi baaf965f94308301d2dc554d72a87d7432cd5ce6 +kunit-next c2741453478badf571ef020d160053e8d5e1ba94 +trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b +mhi 7ba21a082d3eb40787416dc0d1e980b7de1cc490 +memblock f30b002ccfee8c60c8feb590e145c0b5e8fa4c67 +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +cxl e6e17cc6ed751072513fe16cb595ac09f6821a43 +folio-iomap 4d7bd0eb72e5831ddb1288786a96448b48440825 +zstd 88a309465b3f05a100c3b81966982c0f9f5d23a6 +efi 0ea9e1c3dbd4e78f7a82d23fdc959622432e461c +unicode 5298d4bfe80f6ae6ae2777bcd1357b0022d98573 +slab d3d59937afdff2c5fc66a2b3ab134dbd805cb25e +random 1531605c28d67d636be30056b1fa2dc2d5a01611 +landlock a691b98583000247f9aef62d1190f49725ea2f0b +rust 847245fe812e178d9cdabcec70ebf9d02fb383e1 +sysctl fc12aa67daba87a5ac43a9d3ae80be2e666e2ef9 +maple ebb0f374ab6861586800d15e3c19675d33602793 +folio 8cbcadaf5aefc9a48e83c62b907f6e3ab301965f +akpm-current befa563de846cd9c76117845016d433d3438b7eb +akpm f68d664f07ae99d1a663e2c7bfac2ee888b5bdfd +akpm-current d0a3c0d1cc19536bf915e13b613aa9019c412781 +akpm 0cae6ea3eb63e1890ab00980f3e3fbaa11ae3817 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..34fad98d78d2 --- /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 +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 +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 +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 +nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git://git.libc.org/linux-sh#for-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +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 +maple git https://github.com/oracle/linux-uek.git#maple/mainline +folio git git://git.infradead.org/users/willy/pagecache.git#for-next +akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..01de26cd160c --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,12588 @@ +$ date -R +Thu, 24 Feb 2022 08:01:31 +0000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 54% (4211/7784)
Updating files: 55% (4282/7784)
Updating files: 56% (4360/7784)
Updating files: 57% (4437/7784)
Updating files: 58% (4515/7784)
Updating files: 59% (4593/7784)
Updating files: 60% (4671/7784)
Updating files: 61% (4749/7784)
Updating files: 62% (4827/7784)
Updating files: 63% (4904/7784)
Updating files: 64% (4982/7784)
Updating files: 65% (5060/7784)
Updating files: 66% (5138/7784)
Updating files: 67% (5216/7784)
Updating files: 68% (5294/7784)
Updating files: 69% (5371/7784)
Updating files: 70% (5449/7784)
Updating files: 71% (5527/7784)
Updating files: 72% (5605/7784)
Updating files: 73% (5683/7784)
Updating files: 74% (5761/7784)
Updating files: 75% (5838/7784)
Updating files: 76% (5916/7784)
Updating files: 77% (5994/7784)
Updating files: 78% (6072/7784)
Updating files: 79% (6150/7784)
Updating files: 80% (6228/7784)
Updating files: 81% (6306/7784)
Updating files: 82% (6383/7784)
Updating files: 83% (6461/7784)
Updating files: 84% (6539/7784)
Updating files: 85% (6617/7784)
Updating files: 86% (6695/7784)
Updating files: 87% (6773/7784)
Updating files: 88% (6850/7784)
Updating files: 89% (6928/7784)
Updating files: 90% (7006/7784)
Updating files: 91% (7084/7784)
Updating files: 92% (7162/7784)
Updating files: 93% (7240/7784)
Updating files: 94% (7317/7784)
Updating files: 95% (7395/7784)
Updating files: 96% (7473/7784)
Updating files: 97% (7551/7784)
Updating files: 97% (7562/7784)
Updating files: 98% (7629/7784)
Updating files: 99% (7707/7784)
Updating files: 100% (7784/7784)
Updating files: 100% (7784/7784), done. +HEAD is now at 23d04328444a8 Merge tag 'for-5.17/parisc-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux +Merging origin/master (23d04328444a8 Merge tag 'for-5.17/parisc-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Already up to date. +Merging fixes/fixes (d06c942efea40 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 (754e0b0e35608 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 (e783362eb54cd 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 (9f80ccda53b94 ARM: 9180/1: Thumb2: align ALT_UP() sections in modules sufficiently) +$ 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 (4f6de676d94ee 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 (98e437f134b34 Merge tag 'scmi-fix-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + CREDITS | 6 ++++++ + Documentation/devicetree/bindings/arm/atmel-at91.yaml | 3 ++- + Documentation/devicetree/bindings/usb/dwc2.yaml | 1 + + MAINTAINERS | 2 +- + arch/arm64/boot/dts/arm/juno-base.dtsi | 3 +-- + arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 4 ++-- + drivers/firmware/arm_scmi/driver.c | 2 +- + drivers/tee/optee/ffa_abi.c | 4 +++- + drivers/tee/optee/smc_abi.c | 4 +++- + 9 files changed, 20 insertions(+), 9 deletions(-) +Merging drivers-memory-fixes/fixes (e783362eb54cd 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 (7e3c6eb44c91f Merge tags 'optee-fixes-for-v5.17' and 'optee-fix-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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging m68k-current/for-linus (1a0ae068bf6b6 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 (fe663df782581 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 (dd9cb842fa9d9 s390/cio: verify the driver availability for path_event call) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging sparc/master (05a59d79793d4 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 (80f6e3080bfcf 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 (5facf49702b6d Merge tag 'mlx5-fixes-2022-02-23' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 5 +- + drivers/net/dsa/microchip/ksz_common.c | 26 ++- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 47 +++- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 39 +++- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 17 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.c | 12 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.h | 2 +- + drivers/net/ethernet/faraday/ftgmac100.c | 243 +++++++++++---------- + drivers/net/ethernet/ibm/ibmvnic.c | 6 +- + drivers/net/ethernet/intel/ice/ice.h | 1 - + drivers/net/ethernet/intel/ice/ice_common.c | 2 +- + drivers/net/ethernet/intel/ice/ice_eswitch.c | 1 + + drivers/net/ethernet/intel/ice/ice_main.c | 2 + + drivers/net/ethernet/intel/ice/ice_protocol_type.h | 1 + + drivers/net/ethernet/intel/ice/ice_ptp.c | 5 +- + drivers/net/ethernet/intel/ice/ice_switch.c | 4 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.c | 4 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 42 ++-- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 6 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/act.h | 2 + + .../net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c | 7 + + .../ethernet/mellanox/mlx5/core/en/tc/act/mirred.c | 6 + + .../ethernet/mellanox/mlx5/core/en/tc/act/mpls.c | 11 + + .../net/ethernet/mellanox/mlx5/core/en/tc_priv.h | 1 + + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 3 + + .../mellanox/mlx5/core/en/tc_tun_mplsoudp.c | 33 ++- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 8 + + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 3 +- + .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 12 + + drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 2 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 4 - + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 2 + + .../ethernet/mellanox/mlx5/core/lib/fs_chains.c | 3 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 4 +- + .../mellanox/mlx5/core/steering/dr_icm_pool.c | 120 ++++++---- + .../mellanox/mlx5/core/steering/dr_matcher.c | 20 +- + .../ethernet/mellanox/mlx5/core/steering/dr_ste.c | 32 ++- + .../mellanox/mlx5/core/steering/dr_types.h | 10 + + .../ethernet/mellanox/mlx5/core/steering/fs_dr.c | 33 ++- + .../ethernet/mellanox/mlx5/core/steering/mlx5dr.h | 5 + + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 4 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 2 + + drivers/net/hamradio/6pack.c | 4 +- + drivers/net/mdio/mdio-ipq4019.c | 6 +- + drivers/net/usb/sr9700.c | 2 +- + drivers/vhost/vsock.c | 21 +- + include/linux/bpf.h | 9 +- + include/net/checksum.h | 47 ++-- + include/net/netfilter/nf_tables.h | 2 +- + include/net/netfilter/nf_tables_offload.h | 2 - + include/net/sock.h | 4 +- + kernel/bpf/btf.c | 5 +- + kernel/bpf/helpers.c | 2 + + kernel/bpf/syscall.c | 3 + + net/can/j1939/transport.c | 2 +- + net/core/filter.c | 3 + + net/core/net-sysfs.c | 2 +- + net/core/skbuff.c | 6 +- + net/core/sock.c | 4 +- + net/dsa/master.c | 7 +- + net/dsa/port.c | 29 ++- + net/ipv4/af_inet.c | 5 +- + net/ipv4/ip_output.c | 2 +- + net/ipv4/udp_tunnel_nic.c | 2 +- + net/ipv6/ip6_offload.c | 2 + + net/ipv6/ip6_output.c | 2 +- + net/mptcp/mib.c | 2 + + net/mptcp/mib.h | 2 + + net/mptcp/pm.c | 8 +- + net/mptcp/pm_netlink.c | 29 ++- + net/netfilter/nf_tables_api.c | 16 +- + net/netfilter/nf_tables_offload.c | 3 +- + net/netfilter/nft_dup_netdev.c | 6 + + net/netfilter/nft_fwd_netdev.c | 6 + + net/netfilter/nft_immediate.c | 12 +- + net/netfilter/nft_limit.c | 18 ++ + net/netfilter/xt_socket.c | 2 + + net/sched/act_api.c | 2 +- + net/sched/act_ct.c | 5 - + net/tipc/name_table.c | 2 +- + net/tipc/socket.c | 2 +- + .../testing/selftests/bpf/prog_tests/timer_crash.c | 32 +++ + .../selftests/bpf/progs/test_sockmap_kern.h | 26 ++- + tools/testing/selftests/bpf/progs/timer_crash.c | 54 +++++ + tools/testing/selftests/net/mptcp/diag.sh | 44 +++- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 32 ++- + 90 files changed, 900 insertions(+), 378 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/timer_crash.c + create mode 100644 tools/testing/selftests/bpf/progs/timer_crash.c +Merging bpf/master (8940e6b669ca1 net: dsa: avoid call to __dev_set_promiscuity() while rtnl_mutex isn't held) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Already up to date. +Merging ipsec/master (7c76ecd9c99b6 xfrm: enforce validity of offload input flags) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Auto-merging net/ipv6/ip6_output.c +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 6 +++--- + include/uapi/linux/xfrm.h | 6 ++++++ + net/ipv4/esp4.c | 2 +- + net/ipv6/esp6.c | 2 +- + net/ipv6/ip6_output.c | 11 +++++++---- + net/key/af_key.c | 2 +- + 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 +++++- + 11 files changed, 51 insertions(+), 35 deletions(-) +Merging netfilter/master (277f2bb143617 ibmvnic: schedule failover only if vioctl fails) +$ 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 (277f2bb143617 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 (859ae7018316d mac80211: fix forwarded mesh frames AC & queue selection) +$ git merge -m Merge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/main +Merge made by the 'recursive' strategy. + net/mac80211/agg-tx.c | 10 +++++++++- + net/mac80211/rx.c | 14 +++++--------- + 2 files changed, 14 insertions(+), 10 deletions(-) +Merging rdma-fixes/for-rc (c46fa8911b17e RDMA/rtrs-clt: Move free_permit from free_clt to rtrs_clt_close) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Merge made by the 'recursive' strategy. + drivers/infiniband/hw/qib/qib_sysfs.c | 2 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 39 ++++++++++++++++++---------------- + 2 files changed, 22 insertions(+), 19 deletions(-) +Merging sound-current/for-linus (ce345f1e48458 Merge tag 'asoc-fix-v5.17-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ 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 'recursive' strategy. + sound/soc/codecs/cs4265.c | 3 +-- + sound/soc/soc-ops.c | 4 ++-- + 2 files changed, 3 insertions(+), 4 deletions(-) +Merging sound-asoc-fixes/for-linus (4b0bec6088588 ASoC: codecs: wcd934x: fix return value of wcd934x_rx_hph_mode_put) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/codecs/lpass-rx-macro.c | 12 ++++++++---- + sound/soc/codecs/lpass-va-macro.c | 4 ++-- + sound/soc/codecs/wcd934x.c | 11 +++++++---- + sound/soc/codecs/wcd938x.c | 10 +++++----- + 4 files changed, 22 insertions(+), 15 deletions(-) +Merging regmap-fixes/for-linus (d04ad245d67a3 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 +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-irq.c | 20 ++++++-------------- + 1 file changed, 6 insertions(+), 14 deletions(-) +Merging regulator-fixes/for-linus (9ea28fe70274b 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 +Merge made by the 'recursive' strategy. + drivers/regulator/da9121-regulator.c | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) +Merging spi-fixes/for-linus (1c5e6bf947c9f 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 +Merge made by the 'recursive' strategy. + drivers/spi/spi-rockchip.c | 13 ++++++++++--- + drivers/spi/spi-zynq-qspi.c | 3 +++ + 2 files changed, 13 insertions(+), 3 deletions(-) +Merging pci-current/for-linus (3f1271b54edcc 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 +Merge made by the 'recursive' strategy. + drivers/pci/controller/pci-mvebu.c | 3 ++- + drivers/pci/quirks.c | 14 +++++++++----- + 2 files changed, 11 insertions(+), 6 deletions(-) +Merging driver-core.current/driver-core-linus (d8f7a5484f218 driver core: Free DMA range map when device is released) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Merge made by the 'recursive' strategy. + drivers/base/dd.c | 5 +++++ + 1 file changed, 5 insertions(+) +Merging tty.current/tty-linus (eebb0f4e894f1 sc16is7xx: Fix for incorrect data being transmitted) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/n_gsm.c | 61 +++++++++++++++++++++++++++--------------- + drivers/tty/serial/sc16is7xx.c | 3 +++ + 2 files changed, 42 insertions(+), 22 deletions(-) +Merging usb.current/usb-linus (32fde84362c40 usb: dwc2: drd: fix soft connect when gadget is unconfigured) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/dwc2/core.h | 2 ++ + drivers/usb/dwc2/drd.c | 6 ++++-- + drivers/usb/dwc3/dwc3-pci.c | 21 ++++++++++++++++++--- + drivers/usb/host/xhci.c | 28 +++++++++++++++++++--------- + drivers/usb/typec/tipd/core.c | 7 ++++--- + 5 files changed, 47 insertions(+), 17 deletions(-) +Merging usb-gadget-fixes/fixes (e49d033bddf5b 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 (cfc4442c642d5 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 +Merge made by the 'recursive' strategy. + drivers/usb/serial/ch341.c | 1 - + drivers/usb/serial/option.c | 12 ++++++++++++ + 2 files changed, 12 insertions(+), 1 deletion(-) +Merging usb-chipidea-fixes/for-usb-fixes (f130d08a8d79f 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 +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2043 and retry the command. +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 2364f2d83065b] 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 (9a8406ba1a9a2 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 (b6821b0d9b563 staging: fbtft: fb_st7789v: reset display before initialization) +$ 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 'recursive' strategy. + drivers/staging/fbtft/fb_st7789v.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging iio-fixes/fixes-togreg (ea85bf9064661 iio: imu: st_lsm6dsx: wait for settling time in st_lsm6dsx_read_oneshot) +$ 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 'recursive' strategy. + drivers/iio/accel/bmc150-accel-core.c | 5 ++++- + drivers/iio/accel/fxls8962af-core.c | 12 ++++++++++-- + drivers/iio/accel/fxls8962af-i2c.c | 2 +- + drivers/iio/accel/fxls8962af-spi.c | 2 +- + drivers/iio/accel/fxls8962af.h | 3 ++- + drivers/iio/accel/kxcjk-1013.c | 5 ++++- + drivers/iio/accel/mma9551.c | 5 ++++- + drivers/iio/accel/mma9553.c | 5 ++++- + drivers/iio/adc/ad7124.c | 2 +- + drivers/iio/adc/men_z188_adc.c | 9 ++++++++- + drivers/iio/adc/ti-tsc2046.c | 4 ++-- + drivers/iio/addac/ad74413r.c | 17 ++++++++--------- + drivers/iio/frequency/admv1013.c | 2 +- + drivers/iio/gyro/bmg160_core.c | 5 ++++- + drivers/iio/imu/adis16480.c | 7 ++++++- + drivers/iio/imu/kmx61.c | 5 ++++- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 6 +++++- + drivers/iio/magnetometer/bmc150_magn.c | 5 +++-- + 18 files changed, 72 insertions(+), 29 deletions(-) +Merging char-misc.current/char-misc-linus (6c7621890995d mtd: core: Fix a conflict between MTD and NVMEM on wp-gpios property) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/mtd/mtdcore.c | 2 ++ + drivers/nvmem/core.c | 2 +- + include/linux/nvmem-provider.h | 4 +++- + 3 files changed, 6 insertions(+), 2 deletions(-) +Merging soundwire-fixes/fixes (e783362eb54cd 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 (cfb92440ee71a Linux 5.17-rc5) +$ 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 (7b1f781f2d246 Input: psmouse - set up dependency between PS/2 and SMBus companions) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Already up to date. +Merging crypto-current/master (c6ce9c5831cae 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 (8704e89349080 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 (6fec1ab67f8d6 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 (a8e8f851e8299 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 (cfb92440ee71a 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 (a38fd87484648 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 (36415a7964711 mtd: rawnand: brcmnand: Fixed incorrect sub-page ECC status) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (a61f4661fba40 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 (d40f0b133b44d 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 +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2028 and retry the command. +Merge made by the 'recursive' 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 (92c959bae2e54 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 (1e6ae0e46e327 mips: setup: fix setnocoherentio() boolean setting) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Merge made by the 'recursive' strategy. + arch/mips/kernel/setup.c | 2 +- + arch/mips/kernel/smp.c | 6 +++--- + arch/mips/ralink/mt7621.c | 36 +++++++++++++++++++++++------------- + 3 files changed, 27 insertions(+), 17 deletions(-) +Merging at91-fixes/at91-fixes (26077968f8389 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 (8840f5460a237 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 +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 18 ++++++++++++++ + arch/arm/boot/dts/omap3-devkit8000.dts | 33 -------------------------- + drivers/clocksource/timer-ti-dm-systimer.c | 3 +-- + 3 files changed, 19 insertions(+), 35 deletions(-) +Merging kvm-fixes/master (991f988b43c5e KVM: x86/mmu: make apf token non-zero to fix bug) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Merge made by the 'recursive' strategy. + Documentation/virt/kvm/api.rst | 16 +++++++++++++- + arch/x86/include/asm/kvm_host.h | 1 - + arch/x86/kernel/fpu/xstate.c | 5 ++++- + arch/x86/kernel/kvm.c | 9 +++++--- + arch/x86/kvm/cpuid.c | 5 ++++- + arch/x86/kvm/mmu/mmu.c | 13 ++++++++++- + arch/x86/kvm/x86.c | 49 +++++++++++++++++++++++++++-------------- + include/uapi/linux/kvm.h | 1 + + tools/include/uapi/linux/kvm.h | 1 + + virt/kvm/kvm_main.c | 4 +--- + 10 files changed, 77 insertions(+), 27 deletions(-) +Merging kvms390-fixes/master (0e9ff65f455df 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 (35f165f08950a hwmon: (pmbus) Clear pmbus fault/warning bits after read) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (3dd60fb9d95db 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 (fae8817ae804a 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 (6e60f6a7ae953 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 +Merge made by the 'recursive' strategy. + fs/btrfs/ctree.h | 2 +- + fs/btrfs/extent_map.c | 2 + + fs/btrfs/extent_map.h | 8 ++ + fs/btrfs/file.c | 96 +++++++------------ + fs/btrfs/inode.c | 4 +- + fs/btrfs/ioctl.c | 256 ++++++++++++++++++++++++++++++++++++++++++++++---- + fs/btrfs/lzo.c | 11 +++ + 7 files changed, 295 insertions(+), 84 deletions(-) +Merging vfs-fixes/fixes (9d2231c5d74e1 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 (18a3c5f7abfdf 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 (fe07bfda2fb9c 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 (ae09639e3b2a0 platform/x86: int3472: Add terminator to gpiod_lookup_table) +$ 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 (442b0c08db7e3 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 (e783362eb54cd 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 (0c0822bcb73f1 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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/gpio/sifive,gpio.yaml | 1 - + .../bindings/mfd/ti,j721e-system-controller.yaml | 2 +- + Documentation/devicetree/bindings/phy/ti,omap-usb2.yaml | 2 +- + Documentation/devicetree/bindings/pwm/pwm-sifive.yaml | 1 - + .../devicetree/bindings/riscv/sifive-l2-cache.yaml | 1 - + Documentation/devicetree/bindings/usb/ti,j721e-usb.yaml | 2 +- + .../devicetree/bindings/usb/ti,keystone-dwc3.yaml | 2 +- + MAINTAINERS | 6 ------ + drivers/of/fdt.c | 2 +- + drivers/of/unittest.c | 16 ++++++++-------- + 10 files changed, 13 insertions(+), 22 deletions(-) +Merging scsi-fixes/fixes (10af115646171 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 (7c17b3d37f1fa Merge tag 'amd-drm-fixes-5.17-2022-02-23' of https://gitlab.freedesktop.org/agd5f/linux 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 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 9 ++++-- + drivers/gpu/drm/amd/amdgpu/soc15.c | 9 ++++-- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 17 ++++++----- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 2 ++ + drivers/gpu/drm/amd/display/dc/core/dc.c | 7 +++-- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 4 --- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 32 +++++++++++++++++++- + drivers/gpu/drm/drm_edid.c | 2 +- + drivers/gpu/drm/imx/dcss/Kconfig | 1 + + drivers/gpu/drm/radeon/radeon_uvd.c | 8 ++--- + drivers/gpu/drm/tegra/Kconfig | 1 + + drivers/gpu/drm/tegra/dpaux.c | 7 +++++ + drivers/gpu/drm/tegra/falcon.c | 2 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 8 +++-- + drivers/gpu/drm/vc4/vc4_hdmi.c | 8 +++++ + drivers/gpu/drm/vc4/vc4_hdmi.h | 1 + + drivers/gpu/host1x/syncpt.c | 35 +++++++--------------- + 20 files changed, 104 insertions(+), 57 deletions(-) +Merging amdgpu-fixes/drm-fixes (2c409ba81be25 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 (28adef861233c drm/i915/dg2: Print PHY name properly on calibration error) +$ 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 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_bw.c | 18 ++++++++++++++++-- + drivers/gpu/drm/i915/display/intel_bw.h | 8 ++++---- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 2 +- + drivers/gpu/drm/i915/display/intel_tc.c | 26 ++++++++++++++++++++------ + drivers/gpu/drm/i915/intel_pm.c | 22 +++++++++++----------- + 5 files changed, 52 insertions(+), 24 deletions(-) +Merging mmc-fixes/fixes (54309fde1a352 mmc: block: fix read single on recovery logic) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (bd33335aa93d6 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 +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 5413 and retry the command. +Merge made by the 'recursive' strategy. +Merging gnss-fixes/gnss-linus (e783362eb54cd 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 (ffc58bc4af936 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 (a222fd8541394 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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/arm/freescale/fsl,layerscape-dcfg.txt | 2 +- + Documentation/devicetree/bindings/clock/qoriq-clock.txt | 1 + + MAINTAINERS | 4 ++-- + drivers/soc/fsl/guts.c | 14 +++++++++----- + drivers/soc/fsl/qe/qe.c | 4 ++-- + drivers/soc/fsl/qe/qe_io.c | 2 ++ + include/soc/fsl/dpaa2-fd.h | 3 ++- + include/soc/fsl/qe/immap_qe.h | 3 ++- + include/soc/fsl/qe/qe_tdm.h | 4 +++- + include/soc/fsl/qe/ucc_fast.h | 2 +- + include/soc/fsl/qe/ucc_slow.h | 2 +- + 11 files changed, 26 insertions(+), 15 deletions(-) +Merging risc-v-fixes/fixes (5feef64f4c670 RISC-V: Fix IPI/RFENCE hmask on non-monotonic hartid ordering) +$ 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 (03ba0fe4d09f2 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 (8bb7eca972ad5 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 (e783362eb54cd Linux 5.17-rc1) +$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (ae42f92888463 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 +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-rockchip.c | 56 +++++++++++++++++++++++--------------------- + drivers/gpio/gpiolib.c | 10 ++++++++ + 2 files changed, 39 insertions(+), 27 deletions(-) +Merging gpio-intel-fixes/fixes (e783362eb54cd 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 (6f66db29e2415 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 +Merge made by the 'recursive' strategy. + drivers/pinctrl/intel/pinctrl-tigerlake.c | 1 - + 1 file changed, 1 deletion(-) +Merging erofs-fixes/fixes (24331050a3e6a 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 (8433856947217 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 (92a68053c3468 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 (c3c07fc25f37c 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 'recursive' 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 (c94afc46cae7a 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 +Merge made by the 'recursive' strategy. + mm/memblock.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) +Merging cel-fixes/for-rc (c306d737691ef 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 (1d4df649cbb4b 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 (432b52eea3dcf 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 (13e741b834538 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 +Merge made by the 'recursive' strategy. + tools/arch/x86/include/asm/msr-index.h | 1 + + tools/perf/builtin-script.c | 2 +- + tools/perf/tests/sigtrap.c | 15 +-------------- + tools/perf/util/data.c | 7 +++---- + tools/perf/util/evlist-hybrid.c | 4 ++-- + 5 files changed, 8 insertions(+), 21 deletions(-) +Merging efi-fixes/urgent (0ea9e1c3dbd4e efivars: Respect "block" flag in efivar_entry_set_safe()) +$ 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 'recursive' strategy. + drivers/firmware/efi/libstub/riscv-stub.c | 17 ++++++++++------- + drivers/firmware/efi/vars.c | 5 ++++- + 2 files changed, 14 insertions(+), 8 deletions(-) +Merging zstd-fixes/zstd-linus (88a309465b3f0 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 'recursive' strategy. + include/linux/zstd_lib.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (ecbd4912a693b drm/edid: Always set RGB444) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Already up to date. +Merging kspp/for-next/kspp (e1558b5e29c6b Merge branch 'for-next/pending-fixes' 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 drivers/iio/addac/ad74413r.c +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/process/deprecated.rst | 20 +- + Makefile | 2 - + arch/Kconfig | 24 ++- + arch/alpha/mm/init.c | 6 +- + arch/m68k/include/asm/cmpxchg.h | 9 +- + arch/x86/boot/compressed/misc.c | 3 +- + arch/x86/kvm/emulate.c | 9 +- + arch/x86/kvm/kvm_emulate.h | 6 +- + arch/x86/lib/memcpy_32.c | 1 + + drivers/char/tpm/tpm_vtpm_proxy.c | 2 +- + drivers/gpu/drm/drm_dp_helper.c | 10 - + drivers/gpu/drm/tegra/dp.c | 11 +- + drivers/hwtracing/intel_th/msu.c | 4 +- + drivers/media/platform/omap3isp/ispstat.c | 5 +- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 9 +- + drivers/scsi/mpt3sas/mpi/mpi2_ioc.h | 6 +- + include/drm/drm_dp_helper.h | 4 +- + include/linux/compiler_attributes.h | 39 ++++ + include/linux/etherdevice.h | 5 +- + include/linux/fortify-string.h | 238 +++++++++++++++++++----- + include/linux/overflow.h | 114 ++++++++---- + include/linux/randomize_kstack.h | 21 ++- + include/scsi/viosrp.h | 17 +- + include/uapi/linux/omap3isp.h | 21 ++- + init/main.c | 2 +- + lib/Makefile | 3 +- + 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 | 4 + + lib/test_overflow.c | 159 +++++++++++++--- + scripts/Makefile.gcc-plugins | 2 + + scripts/gcc-plugins/stackleak_plugin.c | 29 ++- + scripts/test_fortify.sh | 8 +- + security/Kconfig | 5 +- + security/Kconfig.hardening | 10 + + 39 files changed, 640 insertions(+), 199 deletions(-) + 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 +Merging kspp-gustavo/for-next/kspp (91adfbb14c00b 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 fs/ksmbd/transport_rdma.c +Merge made by the 'recursive' 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/char/tpm/xen-tpmfront.c | 8 ++++---- + 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 +- + 68 files changed, 116 insertions(+), 117 deletions(-) +Merging kbuild/for-next (12335bbb9fc75 nds32: move core-y in arch/nds32/Makefile to arch/nds32/Kbuild) +$ 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 'recursive' strategy. + Documentation/kbuild/kbuild.rst | 11 +++++++++++ + Documentation/kbuild/makefiles.rst | 2 ++ + Makefile | 18 ++++++++++-------- + arch/microblaze/boot/Makefile | 2 +- + arch/microblaze/boot/dts/Makefile | 2 +- + arch/nds32/Kbuild | 3 +++ + arch/nds32/Makefile | 3 --- + 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 +++ + 34 files changed, 84 insertions(+), 68 deletions(-) +Merging perf/perf/core (859f7e45542ae Merge remote-tracking branch 'torvalds/master' into perf/core) +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Removing tools/perf/pmu-events/arch/x86/sandybridge/uncore.json +Removing tools/perf/pmu-events/arch/x86/ivybridge/uncore.json +Removing tools/perf/pmu-events/arch/x86/haswell/uncore.json +Auto-merging tools/perf/builtin-script.c +Merge made by the 'recursive' strategy. + tools/include/linux/coresight-pmu.h | 2 + + tools/lib/api/fd/array.c | 17 + + tools/lib/api/fd/array.h | 1 + + 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 + + .../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-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 | 1164 ++++- + 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/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 + + 275 files changed, 64551 insertions(+), 53420 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 (7c00621dcaeea 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 (e62c17f0455a7 MAINTAINERS: update maintainer list of DMA MAPPING BENCHMARK) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + kernel/dma/swiotlb.c | 76 +++++++++++++++++----------------------------------- + 2 files changed, 25 insertions(+), 53 deletions(-) +Merging asm-generic/master (45d9de484a57b Merge branch 'set_fs-3' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic into asm-generic) +$ 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 usr/include/Makefile +Auto-merging kernel/events/core.c +Auto-merging arch/sh/include/asm/thread_info.h +Removing arch/sh/include/asm/segment.h +Auto-merging arch/powerpc/lib/sstep.c +Auto-merging arch/parisc/include/asm/uaccess.h +Removing arch/h8300/include/asm/segment.h +Removing arch/csky/include/asm/segment.h +Removing arch/arc/include/asm/segment.h +Auto-merging arch/Kconfig +Merge made by the 'recursive' strategy. + 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/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/sibyte/common/sb_tbprof.c | 6 +- + arch/nds32/Kconfig | 1 - + arch/nds32/include/asm/thread_info.h | 4 - + arch/nds32/include/asm/uaccess.h | 40 +++++----- + arch/nds32/kernel/process.c | 5 +- + arch/nds32/mm/alignment.c | 3 - + 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 | 2 +- + 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/hid/uhid.c | 2 +- + drivers/scsi/sg.c | 5 -- + 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 +- + usr/include/Makefile | 8 -- + 151 files changed, 434 insertions(+), 1327 deletions(-) + 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/sh/include/asm/segment.h + create mode 100644 include/asm-generic/access_ok.h +Merging arc/for-next (6880fa6c56601 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 (ed43eed0a6ace 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 drivers/irqchip/irq-nvic.c +Auto-merging arch/arm/mm/ioremap.c +Removing arch/arm/mach-rpc/include/mach/entry-macro.S +Removing arch/arm/mach-iop32x/include/mach/entry-macro.S +Removing arch/arm/mach-footbridge/include/mach/entry-macro.S +Auto-merging arch/arm/kernel/traps.c +Removing arch/arm/include/asm/hardware/entry-macro-iomd.S +Removing arch/arm/include/asm/entry-macro-multi.S +Auto-merging arch/arm/boot/compressed/Makefile +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Resolved 'arch/arm/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a48b34e0cbf90] Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 42 +++-- + 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/current.h | 46 +++-- + arch/arm/include/asm/elf.h | 3 + + arch/arm/include/asm/entry-macro-multi.S | 40 ---- + 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 | 12 ++ + 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/asm-offsets.c | 3 - + arch/arm/kernel/entry-armv.S | 208 +++++++++++++++++---- + arch/arm/kernel/entry-common.S | 16 +- + arch/arm/kernel/entry-header.S | 47 ++++- + arch/arm/kernel/entry-v7m.S | 39 ++-- + 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 | 50 +++-- + 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-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/context.c | 3 +- + arch/arm/mm/ioremap.c | 18 +- + drivers/irqchip/Kconfig | 1 + + drivers/irqchip/irq-nvic.c | 22 +-- + 63 files changed, 1286 insertions(+), 750 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 (43202c19b03b0 Merge branches 'for-next/coredump', 'for-next/docs', 'for-next/insn', 'for-next/kselftest', 'for-next/linkage', 'for-next/misc', 'for-next/mm', 'for-next/mte', 'for-next/perf' and 'for-next/rng' 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/ia64/Kconfig +Auto-merging arch/arm64/Kconfig +Merge made by the 'recursive' strategy. + Documentation/arm64/booting.rst | 10 +- + Documentation/arm64/memory-tagging-extension.rst | 28 ++- + Documentation/asm-annotations.rst | 11 +- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/archrandom.h | 45 ++++- + arch/arm64/include/asm/debug-monitors.h | 12 -- + arch/arm64/include/asm/insn-def.h | 14 ++ + arch/arm64/include/asm/insn.h | 80 ++++++++- + arch/arm64/include/asm/linkage.h | 24 --- + arch/arm64/include/asm/lse.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/sysreg.h | 4 - + arch/arm64/kernel/Makefile | 1 + + arch/arm64/kernel/elfcore.c | 123 +++++++++++++ + arch/arm64/kernel/entry-common.c | 3 + + arch/arm64/kernel/entry.S | 9 +- + arch/arm64/kernel/mte.c | 3 + + arch/arm64/kvm/hyp/nvhe/cache.S | 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/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 + + 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 +++++++++++++++++---- + 70 files changed, 920 insertions(+), 339 deletions(-) + create mode 100644 arch/arm64/kernel/elfcore.c + create mode 100644 include/linux/kasan-enabled.h +Merging arm-perf/for-next/perf (602c873eb52e5 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 (98e437f134b34 Merge tag 'scmi-fix-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Already up to date. +Merging actions/for-next (444d018d8d387 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 +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 5433 and retry the command. +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (39369380e729c 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 arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.yaml | 12 + + .../devicetree/bindings/vendor-prefixes.yaml | 6 + + 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 ++ + 14 files changed, 1268 insertions(+) + 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 +Merging aspeed/for-next (b9edd69951ab9 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 +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/npcm/nuvoton,gcr.yaml | 48 ++ + MAINTAINERS | 2 + + arch/arm/boot/dts/Makefile | 1 + + .../arm/boot/dts/aspeed-bmc-facebook-bletchley.dts | 320 +++++++---- + arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 4 + + arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 4 + + arch/arm/boot/dts/aspeed-bmc-quanta-s6q.dts | 610 +++++++++++++++++++++ + .../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 +- + 11 files changed, 1300 insertions(+), 120 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/npcm/nuvoton,gcr.yaml + create mode 100644 arch/arm/boot/dts/aspeed-bmc-quanta-s6q.dts +Merging at91/at91-next (9be3df0e718c0 Merge branch 'at91-defconfig' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. +Merging drivers-memory/for-next (b7c3f95f32e03 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 +Removing Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt +Removing Documentation/devicetree/bindings/memory-controllers/ddr/lpddr3.txt +Removing Documentation/devicetree/bindings/memory-controllers/ddr/lpddr3-timings.txt +Removing Documentation/devicetree/bindings/memory-controllers/ddr/lpddr2-timings.txt +Merge made by the 'recursive' strategy. + .../ddr/jedec,lpddr2-timings.yaml | 135 +++++++++++ + .../memory-controllers/ddr/jedec,lpddr2.yaml | 6 +- + .../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 +- + drivers/memory/brcmstb_dpfe.c | 2 +- + drivers/memory/fsl_ifc.c | 9 + + drivers/memory/mtk-smi.c | 57 ++++- + drivers/memory/of_memory.c | 6 +- + 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 +++++++++- + 20 files changed, 887 insertions(+), 350 deletions(-) + 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 +Merging imx-mxs/for-next (45550ada88f02 Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Auto-merging arch/arm64/boot/dts/freescale/mba8mx.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mq.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 24 + + .../devicetree/bindings/power/fsl,imx-gpcv2.yaml | 2 + + .../bindings/soc/imx/fsl,imx8mp-hsio-blk-ctrl.yaml | 78 ++ + .../bindings/soc/imx/fsl,imx8mq-vpu-blk-ctrl.yaml | 71 ++ + 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/vf-colibri-eval-v3.dtsi | 2 +- + arch/arm/configs/imxrt_defconfig | 35 + + arch/arm/mach-imx/Kconfig | 7 + + arch/arm/mach-imx/Makefile | 2 + + arch/arm/mach-imx/mach-imxrt.c | 19 + + 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/configs/defconfig | 126 +- + drivers/bus/imx-weim.c | 135 ++- + drivers/firmware/imx/rm.c | 45 + + drivers/firmware/imx/scu-pd.c | 4 + + drivers/soc/imx/imx8m-blk-ctrl.c | 66 + + drivers/soc/imx/soc-imx.c | 3 - + include/dt-bindings/power/imx8mp-power.h | 35 + + include/dt-bindings/power/imx8mq-power.h | 3 + + include/linux/firmware/imx/svc/rm.h | 5 + + 111 files changed, 7855 insertions(+), 697 deletions(-) + 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/boot/dts/imxrt1050-pinfunc.h + create mode 100644 arch/arm/configs/imxrt_defconfig + create mode 100644 arch/arm/mach-imx/mach-imxrt.c + 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 include/dt-bindings/power/imx8mp-power.h +Merging keystone/next (cb293d3b430e3 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (896f47a2c39c5 Merge branch 'v5.17-next/dts64' 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/arm64/configs/defconfig +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/airoha.yaml | 28 +++++ + .../devicetree/bindings/arm/mediatek.yaml | 4 + + .../bindings/timer/mediatek,mtk-timer.txt | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + .../devicetree/bindings/watchdog/mtk-wdt.txt | 1 + + arch/arm/boot/dts/mt6582-prestigio-pmt5008-3g.dts | 43 +++++++ + arch/arm/boot/dts/mt6582.dtsi | 128 +++++++++++++++++++++ + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 92 ++++++++------- + arch/arm64/configs/defconfig | 2 + + 9 files changed, 261 insertions(+), 40 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/airoha.yaml + create mode 100644 arch/arm/boot/dts/mt6582-prestigio-pmt5008-3g.dts + create mode 100644 arch/arm/boot/dts/mt6582.dtsi +Merging mvebu/for-next (fecc54c7ccfe5 Merge branch 'mvebu/arm' 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 'recursive' strategy. + arch/arm/mach-dove/irq.c | 6 +++--- + arch/arm/mach-mv78xx0/irq.c | 3 +-- + arch/arm/mach-orion5x/irq.c | 2 +- + arch/arm/plat-orion/gpio.c | 8 ++------ + arch/arm/plat-orion/include/plat/orion-gpio.h | 3 +-- + arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 3 ++- + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 4 ++-- + 7 files changed, 12 insertions(+), 17 deletions(-) +Merging omap/for-next (f9ecc209330a4 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 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/am335x-pdu001.dts | 2 +- + .../boot/dts/am335x-sancloud-bbe-extended-wifi.dts | 113 +++++++++++++++++++++ + 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 +++++++- + 6 files changed, 172 insertions(+), 2 deletions(-) + create mode 100644 arch/arm/boot/dts/am335x-sancloud-bbe-extended-wifi.dts +Merging qcom/for-next (1b2ab1a30acbf 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 arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Removing arch/arm64/boot/dts/qcom/sc7280-herobrine.dts +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 0b0e719aa614f] 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/arm/msm/qcom,llcc.yaml | 2 + + Documentation/devicetree/bindings/arm/qcom.yaml | 23 +- + .../devicetree/bindings/clock/qcom,mmcc.yaml | 1 + + .../bindings/clock/qcom,qcm2290-dispcc.yaml | 87 ++ + .../devicetree/bindings/phy/qcom,usb-hs-phy.txt | 1 + + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 16 + + arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts | 30 + + 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 | 39 + + 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/configs/multi_v7_defconfig | 57 +- + arch/arm/mach-qcom/platsmp.c | 3 +- + arch/arm64/boot/dts/qcom/Makefile | 10 +- + 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 +- + arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 6 +- + .../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 | 18 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 56 +- + arch/arm64/boot/dts/qcom/pm6150l.dtsi | 10 + + 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 | 124 +- + 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 | 1103 ++++------------ + 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 | 577 +++++++-- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 3 - + .../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 | 54 +- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 38 +- + 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 | 48 +- + 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 | 425 +++++- + arch/arm64/configs/defconfig | 15 + + 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 | 19 +- + 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 +- + drivers/cpuidle/cpuidle-qcom-spm.c | 28 +- + drivers/firmware/qcom_scm.c | 215 ++-- + drivers/firmware/qcom_scm.h | 7 + + drivers/remoteproc/qcom_q6v5_mss.c | 7 +- + drivers/remoteproc/qcom_q6v5_pas.c | 36 +- + 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 | 3 + + drivers/soc/qcom/socinfo.c | 12 + + include/dt-bindings/clock/qcom,dispcc-qcm2290.h | 34 + + include/linux/qcom_scm.h | 16 +- + include/linux/soc/qcom/llcc-qcom.h | 9 +- + include/linux/soc/qcom/mdt_loader.h | 17 +- + 96 files changed, 7939 insertions(+), 2233 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,qcm2290-dispcc.yaml + 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/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/sdm845-shift-axolotl.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8450-hdk.dts + create mode 100644 drivers/clk/qcom/dispcc-qcm2290.c + create mode 100644 include/dt-bindings/clock/qcom,dispcc-qcm2290.h +Merging raspberrypi/for-next (c5915b53d4c20 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 'recursive' strategy. + arch/arm/boot/dts/bcm2711-rpi-400.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging renesas/next (77494b5c6a736 Merge branches 'renesas-arm-dt-for-v5.18' and 'renesas-drivers-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 +Auto-merging arch/arm64/configs/defconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/renesas.yaml | 9 + + .../bindings/power/renesas,rzg2l-sysc.yaml | 7 +- + MAINTAINERS | 2 + + arch/arm/boot/dts/r9a06g032.dtsi | 11 + + arch/arm/configs/shmobile_defconfig | 4 + + arch/arm64/boot/dts/renesas/Makefile | 3 + + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 9 +- + .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 1 - + arch/arm64/boot/dts/renesas/gmsl-cameras.dtsi | 332 ++++++++++++++ + 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 +- + 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 | 5 + + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 80 ++++ + 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 | 208 +++++++++ + 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/configs/defconfig | 7 + + drivers/soc/renesas/Kconfig | 9 + + drivers/soc/renesas/renesas-soc.c | 68 ++- + include/dt-bindings/clock/r9a07g054-cpg.h | 229 ++++++++++ + 48 files changed, 3002 insertions(+), 444 deletions(-) + 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 include/dt-bindings/clock/r9a07g054-cpg.h +Merging reset/reset/next (89e7a6698fdd6 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 'recursive' 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 (bf19347a78563 Merge branch 'v5.17-armsoc/dtsfixes' 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 +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 13 + + .../devicetree/bindings/soc/rockchip/grf.yaml | 1 + + arch/arm/boot/dts/rk322x.dtsi | 4 +- + arch/arm/boot/dts/rk3288.dtsi | 3 +- + arch/arm64/boot/dts/rockchip/Makefile | 3 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 7 +- + .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 17 +- + .../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 +- + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 31 + + 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 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 6 +- + .../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 | 138 ++++- + 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/rk3568.dtsi | 6 +- + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 214 ++++++- + drivers/clk/rockchip/clk-rk3568.c | 20 +- + drivers/clk/rockchip/clk.c | 3 + + 30 files changed, 1782 insertions(+), 42 deletions(-) + 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 +Merging samsung-krzk/for-next (39c2a5e0d38a2 Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt +Merge made by the 'recursive' strategy. + .../bindings/arm/samsung/samsung-boards.yaml | 2 + + Documentation/devicetree/bindings/arm/tesla.yaml | 27 + + .../devicetree/bindings/clock/tesla,fsd-clock.yaml | 198 +++ + .../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 ----- + .../bindings/soc/samsung/exynos-usi.yaml | 20 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 10 +- + arch/arm/boot/dts/Makefile | 2 + + 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/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/configs/exynos_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/mach-exynos/firmware.c | 4 +- + arch/arm64/Kconfig.platforms | 6 + + arch/arm64/boot/dts/Makefile | 1 + + 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/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/configs/defconfig | 1 + + 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/pinctrl/samsung/pinctrl-exynos-arm64.c | 2 - + drivers/pinctrl/samsung/pinctrl-exynos.c | 4 + + drivers/pinctrl/samsung/pinctrl-samsung.c | 87 +- + include/dt-bindings/clock/fsd-clk.h | 150 ++ + 105 files changed, 9703 insertions(+), 2061 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/tesla.yaml + create mode 100644 Documentation/devicetree/bindings/clock/tesla,fsd-clock.yaml + 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 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/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/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 drivers/clk/samsung/clk-fsd.c + create mode 100644 include/dt-bindings/clock/fsd-clk.h +Merging scmi/for-linux-next (210b966b7e2f8 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 +Merge made by the 'recursive' strategy. + .../devicetree/bindings/firmware/arm,scmi.yaml | 75 +++ + 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 +++++++ + drivers/clk/clk-scmi.c | 71 ++- + 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 +++++++++++++++++---- + include/linux/scmi_protocol.h | 15 + + include/trace/events/scmi.h | 28 + + 18 files changed, 1899 insertions(+), 185 deletions(-) + 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 drivers/firmware/arm_scmi/optee.c +Merging stm32/stm32-next (a0977e3dbcb4d ARM: dts: stm32: remove timer5 duplicate unit-address on stm32f7 series) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/stm32/stm32.yaml | 6 + + arch/arm/boot/dts/Makefile | 1 + + 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 | 81 ++- + arch/arm/boot/dts/stm32mp135f-dk.dts | 7 +- + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 143 +++++- + arch/arm/boot/dts/stm32mp151.dtsi | 29 +- + .../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 | 25 +- + 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 + + 33 files changed, 1141 insertions(+), 121 deletions(-) + create mode 100644 arch/arm/boot/dts/stm32mp157c-emsbc-argon.dts + create mode 100644 arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi +Merging sunxi/sunxi/for-next (d7ab185b353fa 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 +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 5 + + arch/arm/boot/dts/Makefile | 1 + + 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 +++ + 8 files changed, 250 insertions(+), 12 deletions(-) + create mode 100644 arch/arm/boot/dts/sun7i-a20-haoyu-marsboard.dts +Merging tee/next (ff8187c5dd8fc Merge branch 'tee_shm_for_v5.18' 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/smc_abi.c +Auto-merging drivers/tee/optee/ffa_abi.c +Merge made by the 'recursive' strategy. + drivers/char/hw_random/optee-rng.c | 6 +- + 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 ++++------------ + include/linux/tee_drv.h | 138 +++---------- + security/keys/trusted-keys/trusted_tee.c | 23 +-- + 15 files changed, 388 insertions(+), 567 deletions(-) +Merging tegra/for-next (0aeee7376181e 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 +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 42 ++ + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 43 ++ + .../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 31 ++ + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 560 +++++++++++++++++++++ + arch/arm64/configs/defconfig | 1 + + 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 | 81 +++ + drivers/soc/tegra/fuse/fuse-tegra.c | 20 +- + drivers/soc/tegra/pmc.c | 4 +- + include/dt-bindings/clock/tegra234-clock.h | 35 +- + include/dt-bindings/reset/tegra234-reset.h | 16 + + 14 files changed, 843 insertions(+), 5 deletions(-) + create mode 100644 drivers/memory/tegra/tegra234.c +Merging ti/ti-next (7e3580d1f38a2 Merge branch 'ti-k3-dts-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Merge made by the 'recursive' strategy. + 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 + + drivers/firmware/ti_sci.c | 2 +- + drivers/soc/ti/k3-ringacc.c | 15 ++++++-------- + drivers/soc/ti/smartreflex.c | 13 ++++++------ + drivers/soc/ti/wkup_m3_ipc.c | 4 ++-- + include/linux/soc/ti/ti_sci_protocol.h | 2 +- + 24 files changed, 72 insertions(+), 51 deletions(-) +Merging xilinx/for-next (3a14f0e614082 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 'recursive' strategy. + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 76 ++++++++++++++-------------------- + 1 file changed, 32 insertions(+), 44 deletions(-) +Merging clk/clk-next (48473a3319f6f 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 +Removing Documentation/devicetree/bindings/clock/cs2000-cp.txt +Merge made by the 'recursive' 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 | 9 + + 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/ingenic/jz4725b-cgu.c | 3 +- + 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/gcc-msm8994.c | 106 +---- + 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 ++ + 77 files changed, 2144 insertions(+), 754 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 (e501cf5e56c6b clk: imx: Remove audio_mclk_root_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 'recursive' strategy. + .../devicetree/bindings/clock/imxrt1050-clock.yaml | 67 ++++++++ + drivers/clk/imx/Kconfig | 7 + + drivers/clk/imx/Makefile | 4 +- + 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.c | 1 + + drivers/clk/imx/clk-imxrt1050.c | 168 +++++++++++++++++++++ + drivers/clk/imx/clk-scu.h | 1 + + include/dt-bindings/clock/imxrt1050-clock.h | 72 +++++++++ + 10 files changed, 386 insertions(+), 2 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/imxrt1050-clock.yaml + create mode 100644 drivers/clk/imx/clk-imx8dxl-rsrc.c + create mode 100644 drivers/clk/imx/clk-imxrt1050.c + create mode 100644 include/dt-bindings/clock/imxrt1050-clock.h +Merging clk-renesas/renesas-clk (73421f2a48e6b 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 'recursive' strategy. + drivers/clk/renesas/r8a779f0-cpg-mssr.c | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) +Merging clk-samsung/for-next (45bd8166a1d82 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 (a0793fdad9a11 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 (1ec10274d436f 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 drivers/tty/serial/sh-sci.c +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/net/ethernet/smsc/Kconfig +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 arch/h8300/mm/init.c +Auto-merging arch/h8300/kernel/setup.c +Auto-merging arch/h8300/include/asm/processor.h +Auto-merging arch/h8300/Kconfig.cpu +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 6457 and retry the command. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9c7d998fa4e8e] 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 (8213c61376877 m68k: defconfig: Update defconfigs for v5.17-rc3) +$ 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 'recursive' 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 (244e6c2d4e4de 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 'recursive' 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 (fcc619621df50 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 'recursive' 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 (fbb1d4b381b05 MIPS: Modernize READ_IMPLIES_EXEC) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Auto-merging arch/mips/sibyte/common/sb_tbprof.c +CONFLICT (content): Merge conflict in arch/mips/sibyte/common/sb_tbprof.c +Removing arch/mips/include/asm/war.h +Resolved 'arch/mips/sibyte/common/sb_tbprof.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c78ab01633316] Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/mips/Kconfig | 43 +++++++++++++++ + 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/malta_defconfig | 1 + + arch/mips/include/asm/futex.h | 1 - + arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 1 + + arch/mips/include/asm/mipsmtregs.h | 1 - + arch/mips/include/asm/mipsregs.h | 1 - + arch/mips/include/asm/war.h | 73 -------------------------- + arch/mips/kernel/elf.c | 16 ++---- + arch/mips/kernel/entry.S | 1 - + arch/mips/kernel/genex.S | 1 - + 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/delay.c | 1 - + arch/mips/loongson2ef/Platform | 3 +- + arch/mips/loongson64/Platform | 24 ++------- + arch/mips/mm/c-octeon.c | 1 - + arch/mips/mm/c-r4k.c | 1 - + arch/mips/mm/page.c | 5 +- + arch/mips/mm/tlbex.c | 1 - + arch/mips/pci/pci-ar2315.c | 2 +- + arch/mips/sibyte/common/sb_tbprof.c | 2 +- + arch/mips/vdso/Makefile | 3 ++ + 31 files changed, 86 insertions(+), 131 deletions(-) + delete mode 100644 arch/mips/include/asm/war.h +Merging nds32/next (07cd7745c6f20 nds32/setup: remove unused memblock_region variable in setup_memory()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git nds32/next +Auto-merging arch/nds32/Makefile +Auto-merging arch/nds32/Kconfig +CONFLICT (content): Merge conflict in arch/nds32/Kconfig +Auto-merging arch/nds32/Kbuild +CONFLICT (content): Merge conflict in arch/nds32/Kbuild +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 3276 and retry the command. +Resolved 'arch/nds32/Kbuild' using previous resolution. +Resolved 'arch/nds32/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f4ab180982805] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/nds32/Kconfig | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging nios2/for-next (7f7bc20bc41a4 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 (f4f4d0fba0c51 openrisc: remove CONFIG_SET_FS) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Auto-merging arch/openrisc/include/asm/uaccess.h +CONFLICT (content): Merge conflict in arch/openrisc/include/asm/uaccess.h +Resolved 'arch/openrisc/include/asm/uaccess.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2baf7f2b41bf9] Merge branch 'for-next' of git://github.com/openrisc/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/openrisc/include/asm/uaccess.h | 19 +++++++++++++++++++ + arch/openrisc/lib/memcpy.c | 2 +- + 2 files changed, 20 insertions(+), 1 deletion(-) +Merging parisc-hd/for-next (54a9405150272 parisc/unaligned: Tweak 32-bit inline assembly of emulate_sth()) +$ 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/lib/memcpy.c +CONFLICT (content): Merge conflict in arch/parisc/lib/memcpy.c +Auto-merging arch/parisc/kernel/signal.c +Auto-merging arch/parisc/include/asm/uaccess.h +Auto-merging arch/parisc/Kconfig +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 257cfd9554d9b] 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 | 221 ++++++++++--------------- + 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, 1323 insertions(+), 369 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 (5a72345e6a781 powerpc: Fix STACKTRACE=n build) +$ 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/lib/sstep.c +Removing arch/powerpc/kernel/vdso64/vgettimeofday.c +Removing arch/powerpc/kernel/vdso64/note.S +Removing arch/powerpc/kernel/vdso64/gettimeofday.S +Removing arch/powerpc/kernel/vdso64/getcpu.S +Removing arch/powerpc/kernel/vdso64/datapage.S +Removing arch/powerpc/kernel/vdso64/cacheflush.S +Removing arch/powerpc/kernel/vdso64/Makefile +Removing arch/powerpc/kernel/vdso32/Makefile +Removing arch/powerpc/kernel/vdso32/.gitignore +Removing arch/powerpc/kernel/trace/ftrace_32.S +Auto-merging arch/powerpc/kernel/head_book3s_32.S +Merge made by the 'recursive' strategy. + arch/powerpc/Kconfig | 9 +- + arch/powerpc/Makefile | 4 +- + 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/epapr_hcalls.h | 2 +- + arch/powerpc/include/asm/ftrace.h | 62 +++---- + arch/powerpc/include/asm/hugetlb.h | 5 +- + 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 | 5 - + 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/vdso/gettimeofday.h | 69 +------- + arch/powerpc/kernel/Makefile | 6 +- + arch/powerpc/kernel/asm-offsets.c | 2 +- + 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 | 11 +- + 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 | 32 ++-- + arch/powerpc/kernel/trace/ftrace_32.S | 187 --------------------- + .../kernel/trace/{ftrace_64.S => ftrace_low.S} | 14 ++ + .../{ftrace_64_mprofile.S => ftrace_mprofile.S} | 158 ++++++++--------- + 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 | 22 +-- + 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/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/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/pseries/lparcfg.c | 87 ++++++++++ + arch/powerpc/platforms/pseries/mobility.c | 2 +- + 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 +++++++ + 103 files changed, 811 insertions(+), 1070 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} (75%) + 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 +Merging soc-fsl/next (1ce93cb102e7f 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 'recursive' strategy. +Merging risc-v/for-next (d56201d9440de 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 'recursive' 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 (00abcf5346759 Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/include/asm/uaccess.h +Auto-merging arch/s390/include/asm/sclp.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 +- + arch/s390/boot/head.S | 1 - + arch/s390/include/asm/crw.h | 1 - + arch/s390/include/asm/nmi.h | 1 - + arch/s390/include/asm/os_info.h | 2 +- + 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/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 | 1 - + 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 | 2 - + arch/s390/kernel/nmi.c | 1 - + arch/s390/kernel/os_info.c | 12 +-- + arch/s390/kernel/relocate_kernel.S | 3 +- + arch/s390/kernel/smp.c | 3 +- + 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/mm/maccess.c | 23 +++-- + arch/s390/mm/pgalloc.c | 8 +- + arch/s390/mm/vmem.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.h | 1 + + 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 +- + 42 files changed, 284 insertions(+), 124 deletions(-) + create mode 100644 drivers/s390/crypto/vfio_ap_debug.h +Merging sh/for-next (8518e694203d0 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 (dd0d718152e4c 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 (db0dd9cee8227 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 (8a900dc390dae 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 'recursive' 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 (d52c14f5f9b32 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 +Merge made by the 'recursive' strategy. + fs/namespace.c | 118 +++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 64 insertions(+), 54 deletions(-) +Merging fscrypt/master (cdaa1b1941f66 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 'recursive' 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 (dd81e1c7d5fb1 Merge tag 'powerpc-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Already up to date. +$ git am -3 ../patches/0001-fix-up-for-fs-add-is_idmapped_mnt-helper.patch +Applying: fix up for "fs: add is_idmapped_mnt() helper" +Using index info to reconstruct a base tree... +M fs/cachefiles/cache.c +Falling back to patching base and 3-way merge... +Auto-merging fs/cachefiles/cache.c +No changes -- Patch already applied. +Merging afs/afs-next (26291c54e111f 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 (7ba32505eb7ff Merge branch 'for-next-next-v5.17-20220215' into for-next-20220215) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Auto-merging fs/btrfs/lzo.c +CONFLICT (content): Merge conflict in fs/btrfs/lzo.c +Auto-merging fs/btrfs/ioctl.c +CONFLICT (content): Merge conflict in fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +CONFLICT (content): Merge conflict in fs/btrfs/inode.c +Auto-merging fs/btrfs/file.c +CONFLICT (content): Merge conflict in fs/btrfs/file.c +Auto-merging fs/btrfs/extent_map.c +Auto-merging fs/btrfs/ctree.h +CONFLICT (content): Merge conflict in fs/btrfs/ctree.h +Recorded preimage for 'fs/btrfs/ctree.h' +Recorded preimage for 'fs/btrfs/file.c' +Recorded preimage for 'fs/btrfs/inode.c' +Recorded preimage for 'fs/btrfs/ioctl.c' +Recorded preimage for 'fs/btrfs/lzo.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'fs/btrfs/ctree.h'. +Recorded resolution for 'fs/btrfs/file.c'. +Recorded resolution for 'fs/btrfs/inode.c'. +Recorded resolution for 'fs/btrfs/ioctl.c'. +Recorded resolution for 'fs/btrfs/lzo.c'. +[master 8c32c9be7f458] Merge remote-tracking branch 'btrfs/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/block-group.c | 36 +- + fs/btrfs/block-group.h | 1 + + fs/btrfs/btrfs_inode.h | 12 +- + fs/btrfs/compression.c | 59 +- + fs/btrfs/compression.h | 10 +- + fs/btrfs/ctree.c | 66 ++- + fs/btrfs/ctree.h | 103 +++- + fs/btrfs/delalloc-space.c | 18 +- + fs/btrfs/dev-replace.c | 18 +- + fs/btrfs/disk-io.c | 195 ++++-- + fs/btrfs/disk-io.h | 2 + + fs/btrfs/extent-tree.c | 7 +- + fs/btrfs/extent_io.c | 141 +++-- + fs/btrfs/extent_map.c | 4 + + fs/btrfs/file-item.c | 53 +- + fs/btrfs/file.c | 177 ++++-- + fs/btrfs/free-space-tree.c | 2 + + fs/btrfs/inode.c | 1177 +++++++++++++++++++++++++++++-------- + fs/btrfs/ioctl.c | 524 ++++++++++++----- + fs/btrfs/lzo.c | 9 +- + fs/btrfs/ordered-data.c | 132 ++--- + fs/btrfs/ordered-data.h | 25 +- + fs/btrfs/print-tree.c | 1 + + fs/btrfs/qgroup.c | 72 ++- + fs/btrfs/relocation.c | 2 +- + fs/btrfs/scrub.c | 702 +++++++++++++--------- + fs/btrfs/send.c | 11 +- + fs/btrfs/send.h | 2 +- + fs/btrfs/subpage.c | 30 +- + fs/btrfs/subpage.h | 25 + + fs/btrfs/super.c | 28 +- + fs/btrfs/sysfs.c | 21 +- + fs/btrfs/tests/extent-map-tests.c | 2 + + fs/btrfs/transaction.c | 15 + + fs/btrfs/tree-checker.c | 35 +- + fs/btrfs/tree-log.c | 651 ++++++++++++-------- + fs/btrfs/tree-log.h | 7 +- + fs/btrfs/volumes.c | 164 +++--- + fs/btrfs/volumes.h | 7 +- + fs/btrfs/zoned.c | 167 ++++-- + fs/internal.h | 5 - + fs/read_write.c | 34 +- + include/linux/fs.h | 22 + + include/trace/events/btrfs.h | 128 ++++ + include/uapi/linux/btrfs.h | 139 ++++- + include/uapi/linux/btrfs_tree.h | 3 + + 46 files changed, 3530 insertions(+), 1514 deletions(-) +Merging ceph/master (038b8d1d1ab1c libceph: optionally use bounce buffer on recv path in crc mode) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (e5e5d45ed9c8c 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 'recursive' strategy. + fs/cifs/smb2ops.c | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) +Merging configfs/for-next (84ec758fb2daa 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 +Merge made by the 'recursive' strategy. + fs/configfs/dir.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) +Merging ecryptfs/next (682a8e2b41eff 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 (c678fc27e5aec 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 +Merge made by the 'recursive' strategy. + fs/erofs/internal.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging exfat/dev (dd81e1c7d5fb1 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 (48b0e01109f5f reiserfs: get rid of AOP_FLAG_CONT_EXPAND flag) +$ 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 'recursive' strategy. + fs/reiserfs/inode.c | 16 +++++----------- + 1 file changed, 5 insertions(+), 11 deletions(-) +Merging ext4/dev (dfd42facf1e4a Linux 5.17-rc3) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (297d91439d386 f2fs: Restore rwsem lockdep support) +$ 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/sysfs.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/recovery.c +Auto-merging fs/f2fs/namei.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/dir.c +Auto-merging fs/f2fs/data.c +Merge made by the 'recursive' 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 | 3 +- + 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 | 75 +++++++++------- + fs/f2fs/sysfs.c | 16 +++- + fs/f2fs/verity.c | 4 +- + fs/f2fs/xattr.c | 12 +-- + 22 files changed, 562 insertions(+), 348 deletions(-) +Merging fsverity/fsverity (07c99001312cb 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 (c086df4902573 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 'recursive' 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 (a4e8145edcfd6 gfs2: Initialize gh_error in gfs2_glock_nq) +$ 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 'recursive' strategy. + fs/gfs2/bmap.c | 2 +- + 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, 67 insertions(+), 38 deletions(-) +Merging jfs/jfs-next (c48a14dca2cb5 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 (1a927cda94ac5 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 'recursive' strategy. + Documentation/filesystems/cifs/ksmbd.rst | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging nfs/linux-next (cfb92440ee71a Linux 5.17-rc5) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (d19e0183a8830 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 (ffcb2895943f0 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 include/linux/fs.h +Auto-merging arch/mips/configs/malta_defconfig +Auto-merging arch/m68k/configs/sun3x_defconfig +Auto-merging arch/m68k/configs/sun3_defconfig +Auto-merging arch/m68k/configs/q40_defconfig +Auto-merging arch/m68k/configs/mvme16x_defconfig +Auto-merging arch/m68k/configs/mvme147_defconfig +Auto-merging arch/m68k/configs/multi_defconfig +Auto-merging arch/m68k/configs/mac_defconfig +Auto-merging arch/m68k/configs/hp300_defconfig +Auto-merging arch/m68k/configs/bvme6000_defconfig +Auto-merging arch/m68k/configs/atari_defconfig +Auto-merging arch/m68k/configs/apollo_defconfig +Auto-merging arch/m68k/configs/amiga_defconfig +Merge made by the 'recursive' 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/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 +- + 83 files changed, 518 insertions(+), 449 deletions(-) +Merging ntfs3/master (52e00ea6b26e4 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/inode.c +Auto-merging fs/ntfs3/file.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2205 and retry the command. +Merge made by the 'recursive' 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 (40a74870b2d1d 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 (94fd19752b28a 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 (aa39cc675799b 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 (22e424feb6658 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 (b97cca3ba9098 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 +Auto-merging fs/xfs/xfs_super.c +Merge made by the 'recursive' strategy. + fs/xfs/xfs_super.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) +Merging zonefs/for-next (95b115332a835 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 +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 4354 and retry the command. +Merge made by the 'recursive' strategy. +Merging iomap/iomap-for-next (ebb7fb1557b1d 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 (2d86293c70750 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 (80d8e4d3f3133 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 'recursive' strategy. +Merging vfs/for-next (124f75f864f38 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 fs/read_write.c +Auto-merging fs/namespace.c +Auto-merging fs/internal.h +Auto-merging arch/x86/um/Kconfig +CONFLICT (content): Merge conflict in arch/x86/um/Kconfig +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 1953abfbdd25b] 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 (15acceb9f0d6b Merge branch 'for-5.18-panic-deadlocks' 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 lib/vsprintf.c +Auto-merging kernel/printk/printk.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 6 ++ + kernel/printk/printk.c | 79 ++++++++++++++++++++++--- + kernel/printk/printk_ringbuffer.c | 52 ++++++++++++++-- + kernel/printk/printk_ringbuffer.h | 2 + + lib/vsprintf.c | 13 ++-- + 5 files changed, 135 insertions(+), 17 deletions(-) +Merging pci/next (f72ca2da14cf8 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 drivers/pci/controller/pci-mvebu.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/pci/socionext,uniphier-pcie-ep.yaml | 22 +- + MAINTAINERS | 1 + + drivers/pci/controller/Kconfig | 4 + + drivers/pci/controller/dwc/pci-imx6.c | 10 +- + drivers/pci/controller/dwc/pcie-uniphier-ep.c | 142 +++++++- + drivers/pci/controller/pci-aardvark.c | 392 +++++++++++++++------ + drivers/pci/controller/pci-mvebu.c | 64 ++-- + 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/pci-acpi.c | 6 +- + drivers/pci/pci-bridge-emul.c | 11 +- + drivers/pci/pci-bridge-emul.h | 14 +- + 14 files changed, 496 insertions(+), 198 deletions(-) +Merging pstore/for-next/pstore (a5d05b07961a2 pstore/ftrace: Allow immediate recording) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Already up to date. +Merging hid/for-next (c0774561bd465 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 'recursive' strategy. + 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-elo.c | 7 +- + drivers/hid/hid-google-hammer.c | 2 +- + drivers/hid/hid-ids.h | 14 +- + drivers/hid/hid-logitech-dj.c | 1 + + 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 | 205 +++++++----- + drivers/hid/hid-uclogic-params.c | 3 +- + drivers/hid/hid-uclogic-params.h | 8 + + drivers/hid/hid-uclogic-rdesc.c | 20 +- + drivers/hid/i2c-hid/i2c-hid-core.c | 591 +++++++++++++++++---------------- + 17 files changed, 1061 insertions(+), 402 deletions(-) + create mode 100644 drivers/hid/hid-razer.c + create mode 100644 drivers/hid/hid-sigmamicro.c +Merging i2c/i2c/for-next (23c6aefe6d0a9 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 'recursive' 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-designware-amdpsp.c | 392 +++++++++++++++++++++ + drivers/i2c/busses/i2c-designware-baytrail.c | 12 +- + drivers/i2c/busses/i2c-designware-common.c | 12 + + drivers/i2c/busses/i2c-designware-core.h | 18 +- + drivers/i2c/busses/i2c-designware-master.c | 6 + + drivers/i2c/busses/i2c-designware-pcidrv.c | 30 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 60 ++++ + drivers/i2c/busses/i2c-i801.c | 3 + + drivers/i2c/busses/i2c-mt65xx.c | 14 + + 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-rcar.c | 1 + + drivers/i2c/i2c-core-acpi.c | 17 +- + drivers/i2c/i2c-core-base.c | 2 +- + 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/property.h | 1 + + 39 files changed, 970 insertions(+), 174 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 (13462ba1815db 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 (f97a2103f1a75 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 (cae6551f44f11 hwmon: (pmbus) Add regulator supply into macro) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/obsolete/procfs-i8k | 10 + + Documentation/ABI/testing/sysfs-class-hwmon | 8 + + Documentation/admin-guide/kernel-parameters.txt | 35 +- + .../devicetree/bindings/hwmon/national,lm90.yaml | 4 +- + Documentation/hwmon/asus_ec_sensors.rst | 54 ++ + Documentation/hwmon/dell-smm-hwmon.rst | 180 ++++++ + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/max6639.rst | 2 +- + Documentation/hwmon/sysfs-interface.rst | 4 + + MAINTAINERS | 7 + + arch/x86/Kconfig | 17 - + drivers/hwmon/Kconfig | 34 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/adt7310.c | 95 ++- + drivers/hwmon/adt7410.c | 82 ++- + drivers/hwmon/adt7x10.c | 479 ++++++-------- + drivers/hwmon/adt7x10.h | 10 +- + 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 | 39 +- + 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.h | 2 + + drivers/hwmon/occ/sysfs.c | 46 ++ + drivers/hwmon/pmbus/Kconfig | 11 +- + drivers/hwmon/pmbus/lm25066.c | 14 + + drivers/hwmon/pmbus/pmbus.h | 1 + + drivers/hwmon/pmbus/pmbus_core.c | 109 ++++ + drivers/hwmon/powr1220.c | 235 ++++--- + drivers/hwmon/sch5627.c | 10 + + drivers/hwmon/sch5636.c | 10 + + drivers/hwmon/sch56xx-common.c | 44 +- + drivers/hwmon/tc654.c | 104 ++- + 37 files changed, 2418 insertions(+), 795 deletions(-) + create mode 100644 Documentation/ABI/obsolete/procfs-i8k + create mode 100644 Documentation/hwmon/asus_ec_sensors.rst + create mode 100644 drivers/hwmon/asus-ec-sensors.c +Merging jc_docs/docs-next (b62ef3a1cca05 Merge branch 'pdf' into docs-next) +$ 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 +Removing Documentation/translations/conf.py +Merge made by the 'recursive' strategy. + Documentation/Makefile | 2 +- + Documentation/admin-guide/blockdev/zram.rst | 20 +- + Documentation/cdrom/packet-writing.rst | 4 +- + Documentation/conf.py | 81 ++++- + Documentation/core-api/entry.rst | 279 +++++++++++++++ + Documentation/core-api/index.rst | 8 + + Documentation/dev-tools/ktap.rst | 31 +- + Documentation/process/submitting-patches.rst | 3 +- + Documentation/scheduler/sched-domains.rst | 8 +- + Documentation/sphinx/kfigure.py | 134 ++++++- + 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 +- + 33 files changed, 2529 insertions(+), 115 deletions(-) + create mode 100644 Documentation/core-api/entry.rst + 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 (127efdbc51fe6 media: atomisp: fix dummy_ptr check to avoid duplicate active_bo) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Auto-merging drivers/memory/mtk-smi.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/media/mediatek-vcodec.txt +Removing Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt +Removing Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt +Merge made by the 'recursive' strategy. + .../bindings/display/mediatek/mediatek,disp.txt | 9 - + .../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/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/dw9714.c | 42 +- + drivers/media/i2c/hi847.c | 3012 ++++++++++++++++++++ + drivers/media/i2c/max9286.c | 125 +- + drivers/media/i2c/ov08d10.c | 1526 ++++++++++ + drivers/media/i2c/ov2740.c | 8 +- + drivers/media/i2c/ov5648.c | 6 +- + drivers/media/i2c/ov5693.c | 9 +- + drivers/media/i2c/ov6650.c | 192 +- + drivers/media/i2c/ov8865.c | 8 +- + drivers/media/i2c/tc358743.c | 2 +- + 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 | 806 ++++++ + 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/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/pxa_camera.c | 9 +- + 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-3ph-1-0.c | 184 +- + drivers/media/platform/qcom/camss/camss-csiphy.c | 21 +- + 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-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/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/vsp1/vsp1_drv.c | 14 +- + 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/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/v4l2-core/v4l2-ctrls-core.c | 2 +- + drivers/media/v4l2-core/v4l2-dev.c | 68 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 12 +- + 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/imx7-media-csi.c | 32 +- + drivers/staging/media/imx/imx7-mipi-csis.c | 46 +- + 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/rc-core.h | 12 +- + include/media/v4l2-fwnode.h | 61 +- + include/media/v4l2-mediabus.h | 64 +- + include/media/v4l2-subdev.h | 13 - + include/soc/mediatek/smi.h | 20 - + include/uapi/linux/lirc.h | 15 +- + 227 files changed, 11673 insertions(+), 2584 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 +Merging v4l-dvb-next/master (2b891d3980f6c media: xilinx: csi2rxss: Use mipi-csi2.h) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Merge made by the 'recursive' strategy. + Documentation/admin-guide/media/vimc.rst | 13 +++ + .../devicetree/bindings/media/i2c/hynix,hi846.yaml | 6 +- + drivers/gpu/ipu-v3/ipu-csi.c | 6 +- + 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/ml86v7667.c | 5 +- + drivers/media/i2c/mt9m001.c | 8 +- + drivers/media/i2c/mt9m111.c | 14 +-- + drivers/media/i2c/ov08d10.c | 4 +- + drivers/media/i2c/ov5675.c | 32 ++++++- + drivers/media/i2c/ov6650.c | 14 +-- + drivers/media/i2c/ov9640.c | 8 +- + drivers/media/i2c/tc358743.c | 24 +---- + drivers/media/i2c/tvp5150.c | 6 +- + drivers/media/platform/atmel/microchip-csi2dc.c | 20 +--- + drivers/media/platform/meson/ge2d/ge2d.c | 24 ++--- + drivers/media/platform/pxa_camera.c | 12 ++- + .../platform/qcom/camss/camss-csiphy-2ph-1-0.c | 19 +++- + .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 17 +++- + drivers/media/platform/qcom/camss/camss-csiphy.c | 21 +--- + drivers/media/platform/qcom/camss/camss-csiphy.h | 7 ++ + drivers/media/platform/rcar-isp.c | 32 +++++-- + drivers/media/platform/rcar-vin/rcar-csi2.c | 73 +++++++++----- + drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 1 + + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 18 ++++ + drivers/media/platform/ti-vpe/cal-video.c | 3 + + drivers/media/platform/vsp1/vsp1_drv.c | 37 +++++-- + drivers/media/platform/xilinx/xilinx-csi2rxss.c | 106 +++++++++------------ + 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/usb/uvc/uvc_driver.c | 9 ++ + drivers/media/v4l2-core/v4l2-fwnode.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-mipi-csis.c | 4 + + include/media/mipi-csi2.h | 45 +++++++++ + include/media/v4l2-mediabus.h | 44 ++++----- + 42 files changed, 442 insertions(+), 289 deletions(-) + create mode 100644 include/media/mipi-csi2.h +Merging pm/linux-next (2ecb866af0048 Merge branch 'thermal-hfi' 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 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-thermal | 2 +- + 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 + + drivers/acpi/ec.c | 90 ++-- + drivers/acpi/internal.h | 2 - + drivers/acpi/osl.c | 19 +- + drivers/acpi/property.c | 29 +- + drivers/acpi/scan.c | 5 +- + drivers/acpi/sleep.c | 2 + + drivers/acpi/tables.c | 2 +- + 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/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 | 53 ++ + drivers/thermal/thermal_netlink.h | 14 + + include/acpi/actypes.h | 4 + + include/acpi/platform/aclinux.h | 5 + + include/linux/cpufreq.h | 5 + + include/linux/property.h | 6 +- + include/uapi/linux/thermal.h | 6 +- + kernel/power/hibernate.c | 4 +- + kernel/sched/cpufreq_schedutil.c | 2 +- + tools/power/cpupower/{ToDo => TODO} | 0 + tools/power/cpupower/man/cpupower-idle-set.1 | 2 +- + 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 + + 41 files changed, 1532 insertions(+), 137 deletions(-) + create mode 100644 Documentation/x86/intel-hfi.rst + 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/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 (ec1c7ad47664f cpufreq: CPPC: Fix performance/frequency conversion) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Auto-merging include/linux/cpufreq.h +Merge made by the 'recursive' strategy. + Documentation/cpu-freq/cpu-drivers.rst | 3 ++ + .../translations/zh_CN/cpu-freq/cpu-drivers.rst | 2 + + arch/arm/boot/dts/imx7s.dtsi | 16 ++++++++ + drivers/cpufreq/cppc_cpufreq.c | 43 +++++++++++----------- + drivers/cpufreq/cpufreq-dt-platdev.c | 1 + + drivers/cpufreq/cpufreq.c | 4 ++ + drivers/cpufreq/qcom-cpufreq-hw.c | 13 ++++++- + drivers/cpufreq/qcom-cpufreq-nvmem.c | 2 +- + drivers/cpufreq/scmi-cpufreq.c | 2 +- + include/linux/cpufreq.h | 3 ++ + 10 files changed, 63 insertions(+), 26 deletions(-) +Merging cpupower/cpupower (8382dce5e4835 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 +Merge made by the 'recursive' strategy. + tools/power/cpupower/Makefile | 6 +- + 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/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 +++++++++++++++ + 11 files changed, 321 insertions(+), 62 deletions(-) + create mode 100644 tools/power/cpupower/lib/acpi_cppc.c + create mode 100644 tools/power/cpupower/lib/acpi_cppc.h +Merging devfreq/devfreq-next (26291c54e111f 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 (8acf5cb92d9dc dt-bindings: power: avs: qcom,cpr: Convert to DT schema) +$ 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 arch/arm64/boot/dts/qcom/msm8996.dtsi +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/power/avs/qcom,cpr.txt +Removing Documentation/devicetree/bindings/opp/qcom-opp.txt +Removing Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Merge made by the 'recursive' strategy. + .../bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 166 +++++ + .../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 +++++ + MAINTAINERS | 5 +- + drivers/opp/debugfs.c | 5 + + drivers/opp/opp.h | 1 + + 10 files changed, 652 insertions(+), 947 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 (8ee1c0f6526ce thermal/drivers/rz2gl: Add error check for reset_control_deassert()) +$ 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 +Already up to date. +Merging ieee1394/for-next (54b3bd99f094b 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 (feae43f8aa883 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 (748663c8ccf6b IB/cma: Allow XRC INI QPs to set their local ACK timeout) +$ 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/ulp/rtrs/rtrs-clt.c +Auto-merging drivers/infiniband/core/cma.c +Merge made by the 'recursive' 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 | 1 + + 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 | 24 +- + drivers/infiniband/hw/irdma/cm.h | 7 + + drivers/infiniband/hw/irdma/ctrl.c | 39 +- + drivers/infiniband/hw/irdma/i40iw_if.c | 2 +- + drivers/infiniband/hw/irdma/main.c | 10 +- + drivers/infiniband/hw/irdma/main.h | 2 +- + drivers/infiniband/hw/irdma/osdep.h | 1 + + drivers/infiniband/hw/irdma/type.h | 4 + + drivers/infiniband/hw/irdma/verbs.c | 4 +- + 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 | 6 - + 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 | 20 +- + 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 | 450 ++++++++++++++++------ + 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 | 25 +- + 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/net/ethernet/intel/ice/ice_idc.c | 5 + + include/linux/net/intel/iidc.h | 4 + + 65 files changed, 552 insertions(+), 544 deletions(-) +Merging net-next/master (e422eef268baa Merge branch 'add-ethtool-support-for-completion-queue-event-size') +$ 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 tools/testing/selftests/net/mptcp/mptcp_join.sh +CONFLICT (content): Merge conflict in tools/testing/selftests/net/mptcp/mptcp_join.sh +Removing tools/testing/selftests/net/cmsg_so_mark.c +Removing tools/testing/selftests/bpf/prog_tests/prog_run_xattr.c +Auto-merging tools/perf/util/bpf-loader.c +Auto-merging tools/lib/bpf/Makefile +Auto-merging tools/bpf/bpftool/Makefile +Auto-merging net/sunrpc/svc_xprt.c +Auto-merging net/sched/act_ct.c +Auto-merging net/mptcp/pm_netlink.c +Auto-merging net/mptcp/pm.c +Auto-merging net/mac80211/rx.c +Auto-merging net/ipv6/ip6_output.c +Auto-merging net/ipv6/ip6_offload.c +Auto-merging net/ipv4/ip_output.c +Auto-merging net/dsa/port.c +Auto-merging net/dsa/master.c +Auto-merging net/core/sock.c +Auto-merging net/core/skbuff.c +Auto-merging kernel/trace/bpf_trace.c +Removing kernel/bpf/preload/iterators/iterators.skel.h +Removing kernel/bpf/preload/iterators/iterators.c +Removing kernel/bpf/preload/iterators/bpf_preload_common.h +Removing kernel/bpf/preload/bpf_preload_umd_blob.S +Auto-merging init/main.c +Auto-merging init/Kconfig +Auto-merging include/net/sock.h +Auto-merging include/net/bluetooth/mgmt.h +Auto-merging include/linux/sunrpc/svc_xprt.h +Auto-merging drivers/net/ethernet/xilinx/ll_temac_main.c +Auto-merging drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/steering/fs_dr.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_stats.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_rep.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/tc_priv.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/mpls.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/mirred.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h +CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h +Auto-merging drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c +Auto-merging drivers/net/ethernet/intel/ice/ice_switch.c +Auto-merging drivers/net/ethernet/intel/ice/ice_main.c +Auto-merging drivers/net/ethernet/intel/ice/ice_eswitch.c +Auto-merging drivers/net/ethernet/intel/ice/ice_common.c +Auto-merging drivers/net/ethernet/intel/ice/ice.h +Auto-merging drivers/net/ethernet/ibm/ibmvnic.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.h +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c +Removing drivers/net/dsa/realtek-smi-core.c +Auto-merging drivers/net/dsa/microchip/ksz_common.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/arm64/boot/dts/xilinx/zynqmp.dtsi +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/net/dsa/realtek-smi.txt +Recorded preimage for 'drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h' +Recorded preimage for 'drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c' +Resolved 'tools/testing/selftests/net/mptcp/mptcp_join.sh' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h'. +Recorded resolution for 'drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c'. +[master 2c10fb2293244] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/sysctl/net.rst | 9 + + Documentation/bpf/btf.rst | 45 +- + Documentation/bpf/instruction-set.rst | 215 ++- + Documentation/devicetree/bindings/i2c/i2c.txt | 4 + + .../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/ethtool-netlink.rst | 19 + + Documentation/networking/mctp.rst | 48 + + MAINTAINERS | 5 +- + 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/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/dsa/Kconfig | 12 +- + drivers/net/dsa/Makefile | 3 +- + drivers/net/dsa/b53/b53_common.c | 70 +- + drivers/net/dsa/b53/b53_priv.h | 8 +- + drivers/net/dsa/b53/b53_serdes.c | 19 +- + drivers/net/dsa/b53/b53_serdes.h | 5 +- + drivers/net/dsa/b53/b53_srab.c | 35 +- + drivers/net/dsa/bcm_sf2.c | 54 +- + drivers/net/dsa/microchip/ksz8795.c | 45 +- + drivers/net/dsa/microchip/ksz9477.c | 106 +- + drivers/net/dsa/microchip/ksz9477_i2c.c | 1 + + drivers/net/dsa/microchip/ksz_common.c | 12 +- + drivers/net/dsa/microchip/ksz_common.h | 4 + + drivers/net/dsa/mt7530.c | 2 +- + drivers/net/dsa/mv88e6xxx/chip.c | 505 ++++-- + 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 | 36 +- + 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 | 272 ++-- + drivers/net/dsa/qca/ar9331.c | 45 +- + drivers/net/dsa/qca8k.c | 1548 +++++++++++++------ + 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 | 457 +++--- + drivers/net/dsa/xrs700x/xrs700x.c | 29 +- + drivers/net/ethernet/3com/typhoon.c | 24 +- + 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/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 +- + 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 | 1262 +++++++++++++++ + 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 | 103 +- + 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/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_main.c | 9 +- + drivers/net/ethernet/intel/ice/Makefile | 12 +- + drivers/net/ethernet/intel/ice/ice.h | 7 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 255 ++-- + drivers/net/ethernet/intel/ice/ice_base.c | 19 +- + drivers/net/ethernet/intel/ice/ice_common.c | 49 +- + drivers/net/ethernet/intel/ice/ice_common.h | 3 + + 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_idc.c | 6 +- + drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 2 + + drivers/net/ethernet/intel/ice/ice_lib.c | 388 ++--- + drivers/net/ethernet/intel/ice/ice_lib.h | 19 +- + drivers/net/ethernet/intel/ice/ice_main.c | 341 ++++- + 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_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_main.c | 20 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 27 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 20 +- + 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 | 5 +- + .../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/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 +- + .../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 | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 796 +++++++--- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 39 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 128 +- + .../ethernet/mellanox/mlx5/core/esw/indir_table.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 16 - + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 33 +- + .../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 | 16 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 7 + + .../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 | 68 +- + drivers/net/ethernet/mellanox/mlxsw/resources.h | 2 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 151 +- + 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_ethtool.c | 28 +- + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 6 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 3 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 3 +- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 6 +- + 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 | 73 +- + .../net/ethernet/microchip/sparx5/sparx5_main.c | 2 - + .../net/ethernet/microchip/sparx5/sparx5_phylink.c | 10 + + .../ethernet/microchip/sparx5/sparx5_switchdev.c | 10 +- + 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 | 145 +- + drivers/net/ethernet/mscc/ocelot.h | 6 + + drivers/net/ethernet/mscc/ocelot_flower.c | 3 + + drivers/net/ethernet/mscc/ocelot_io.c | 13 + + drivers/net/ethernet/mscc/ocelot_mrp.c | 56 +- + drivers/net/ethernet/mscc/ocelot_vcap.c | 1 + + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 2 +- + 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 | 158 +- + 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 +- + .../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/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/stmicro/stmmac/dwmac-intel.c | 4 +- + 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/ti/am65-cpsw-switchdev.c | 4 - + drivers/net/ethernet/ti/cpsw_switchdev.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/hyperv/netvsc.c | 24 +- + drivers/net/ieee802154/atusb.c | 186 +-- + drivers/net/ieee802154/mac802154_hwsim.c | 2 +- + 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 | 4 +- + drivers/net/macsec.c | 6 +- + drivers/net/macvlan.c | 4 +- + drivers/net/mctp/Kconfig | 12 + + drivers/net/mctp/Makefile | 1 + + drivers/net/mctp/mctp-i2c.c | 1081 +++++++++++++ + 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 | 28 +- + drivers/net/rionet.c | 2 +- + drivers/net/sb1000.c | 2 +- + drivers/net/team/team.c | 5 + + drivers/net/usb/Kconfig | 1 + + drivers/net/usb/asix.h | 4 +- + drivers/net/usb/asix_common.c | 19 +- + 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.c | 2 +- + 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/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 | 5 +- + 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/wsm.c | 2 +- + 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/st-nci/vendor_cmds.c | 2 +- + drivers/nfc/st21nfca/vendor_cmds.c | 4 +- + drivers/ptp/ptp_clock.c | 11 +- + drivers/ptp/ptp_pch.c | 195 +-- + drivers/ptp/ptp_sysfs.c | 4 +- + drivers/ptp/ptp_vclock.c | 56 +- + 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 +- + 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/compiler_types.h | 3 + + include/linux/dsa/tag_qca.h | 82 + + include/linux/ethtool.h | 6 + + include/linux/filter.h | 32 +- + include/linux/ieee80211.h | 8 +- + include/linux/if_bridge.h | 1 + + include/linux/inetdevice.h | 1 + + include/linux/ipv6.h | 9 +- + include/linux/linkmode.h | 5 - + include/linux/mii.h | 50 - + include/linux/mlx5/mlx5_ifc.h | 7 - + include/linux/net/intel/i40e_client.h | 10 - + include/linux/netdevice.h | 90 +- + include/linux/netfilter.h | 1 + + include/linux/netfilter/nf_conntrack_pptp.h | 38 +- + include/linux/netlink.h | 9 - + include/linux/pcs/pcs-xpcs.h | 3 +- + include/linux/phy.h | 2 +- + include/linux/phylink.h | 3 - + include/linux/ref_tracker.h | 4 + + include/linux/skbuff.h | 106 +- + include/linux/skmsg.h | 16 +- + include/linux/socket.h | 1 + + 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 | 58 +- + 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_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 | 2 + + include/net/page_pool.h | 82 +- + 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 | 46 + + include/net/tcp.h | 5 +- + include/net/udplite.h | 43 - + include/net/xdp.h | 108 +- + include/net/xdp_sock_drv.h | 5 +- + include/net/xsk_buff_pool.h | 1 + + include/soc/mscc/ocelot.h | 60 +- + include/soc/mscc/ocelot_vcap.h | 16 + + include/trace/events/mctp.h | 5 +- + include/trace/events/net.h | 14 - + include/trace/events/skb.h | 21 + + include/uapi/asm-generic/socket.h | 2 + + include/uapi/linux/bpf.h | 80 +- + include/uapi/linux/ethtool_netlink.h | 8 + + include/uapi/linux/if_addr.h | 9 +- + include/uapi/linux/if_link.h | 2 + + 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/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/ax25/ax25_route.c | 5 +- + net/batman-adv/multicast.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_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/caif/caif_dev.c | 2 +- + net/can/gw.c | 9 +- + net/core/dev.c | 307 ++-- + net/core/drop_monitor.c | 120 +- + net/core/filter.c | 273 +++- + net/core/gro.c | 16 +- + net/core/gro_cells.c | 36 +- + net/core/link_watch.c | 6 +- + net/core/net_namespace.c | 20 +- + net/core/page_pool.c | 23 +- + net/core/rtnetlink.c | 6 +- + net/core/skbuff.c | 51 +- + net/core/sock.c | 22 +- + net/core/sock_map.c | 77 +- + net/core/sysctl_net_core.c | 14 +- + 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/dsa/dsa2.c | 82 +- + net/dsa/dsa_priv.h | 20 + + net/dsa/master.c | 4 - + net/dsa/port.c | 119 +- + net/dsa/slave.c | 198 ++- + net/dsa/switch.c | 242 ++- + net/dsa/tag_8021q.c | 4 +- + net/dsa/tag_ocelot_8021q.c | 7 + + net/dsa/tag_qca.c | 85 +- + 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 | 14 +- + net/hsr/hsr_netlink.c | 4 +- + net/ieee802154/6lowpan/core.c | 1 + + net/ieee802154/nl-phy.c | 4 +- + net/ipv4/arp.c | 9 +- + 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_hashtables.c | 53 +- + net/ipv4/inet_timewait_sock.c | 75 +- + net/ipv4/ip_input.c | 31 +- + net/ipv4/ip_options.c | 31 +- + net/ipv4/ip_output.c | 6 +- + 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 | 3 +- + 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 | 107 +- + net/ipv4/tcp_minisocks.c | 7 +- + net/ipv4/tcp_output.c | 6 +- + 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_iptunnel.c | 59 +- + net/ipv6/ip6_input.c | 2 +- + net/ipv6/ip6_offload.c | 5 +- + net/ipv6/ip6_output.c | 100 +- + net/ipv6/ip6_tunnel.c | 8 + + net/ipv6/ip6mr.c | 53 +- + net/ipv6/ipv6_sockglue.c | 6 +- + net/ipv6/ndisc.c | 55 +- + net/ipv6/ping.c | 29 +- + net/ipv6/route.c | 48 +- + net/ipv6/tcp_ipv6.c | 53 +- + 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 | 26 +- + 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/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_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_queue.c | 13 + + net/netfilter/nft_cmp.c | 102 +- + net/netfilter/nft_compat.c | 9 + + net/netfilter/nft_exthdr.c | 96 +- + net/openvswitch/datapath.c | 18 +- + net/openvswitch/datapath.h | 2 - + net/openvswitch/flow.c | 3 +- + net/sched/act_ct.c | 13 - + net/sched/act_police.c | 16 +- + net/sched/cls_api.c | 45 +- + net/smc/af_smc.c | 204 ++- + net/smc/smc.h | 13 +- + net/smc/smc_netlink.c | 15 + + net/smc/smc_pnet.c | 3 + + net/smc/smc_tx.c | 60 +- + net/smc/smc_tx.h | 3 + + net/sunrpc/auth_gss/auth_gss.c | 10 +- + net/sunrpc/svc_xprt.c | 4 +- + net/sunrpc/xprt.c | 4 +- + net/switchdev/switchdev.c | 162 +- + 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 +- + 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 +- + 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 | 80 +- + 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 | 2 +- + .../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_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 + + 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 | 973 +++++++----- + 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 +- + tools/testing/selftests/net/timestamping.c | 4 +- + tools/testing/selftests/ptp/testptp.c | 18 +- + 1152 files changed, 46241 insertions(+), 17250 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 + 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/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/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 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_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/pedit_ip.sh +Merging bpf-next/for-next (08d4dba6ae77a bpftool: Bpf skeletons assert type sizes) +$ 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 tools/bpf/bpftool/Makefile +Merge made by the 'recursive' strategy. + kernel/bpf/bpf_local_storage.c | 2 +- + kernel/bpf/btf.c | 8 +- + kernel/bpf/cgroup.c | 8 +- + kernel/bpf/hashtab.c | 2 +- + kernel/bpf/helpers.c | 2 +- + kernel/bpf/local_storage.c | 2 +- + kernel/bpf/reuseport_array.c | 2 +- + kernel/bpf/syscall.c | 5 +- + kernel/bpf/trampoline.c | 2 +- + scripts/pahole-flags.sh | 3 + + tools/bpf/bpftool/Makefile | 6 +- + 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/libbpf.c | 8 +- + tools/testing/selftests/bpf/.gitignore | 1 + + tools/testing/selftests/bpf/Makefile | 3 +- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 17 ++- + tools/testing/selftests/bpf/test_cpp.cpp | 3 + + tools/testing/selftests/bpf/verifier/calls.c | 19 +++ + 21 files changed, 173 insertions(+), 61 deletions(-) +Merging ipsec-next/master (2ecda181682e9 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 'recursive' strategy. + net/xfrm/xfrm_device.c | 14 ++------------ + 1 file changed, 2 insertions(+), 12 deletions(-) +Merging mlx5-next/mlx5-next (45fee8edb4b33 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 +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/port.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +Auto-merging drivers/infiniband/hw/mlx5/qp.c +Merge made by the 'recursive' strategy. + 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/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 +- + .../mellanox/mlx5/core/en_accel/en_accel.h | 9 - + .../mellanox/mlx5/core/esw/acl/ingress_ofld.c | 87 ++++++ + .../net/ethernet/mellanox/mlx5/core/esw/acl/ofld.h | 15 + + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 3 + + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 93 ++---- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 9 +- + 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 +- + include/linux/mlx5/cq.h | 2 + + include/linux/mlx5/driver.h | 19 +- + include/linux/mlx5/fs.h | 1 + + include/linux/mlx5/mlx5_ifc.h | 14 +- + 25 files changed, 640 insertions(+), 284 deletions(-) +Merging netfilter-next/master (c828414ac935b 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 (c828414ac935b 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 (e8e41e2b99cc4 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 include/net/bluetooth/mgmt.h +Merge made by the 'recursive' strategy. + drivers/bluetooth/btmtk.h | 7 +++ + drivers/bluetooth/btmtksdio.c | 122 +++++++++++++++++++++++++++++++++++--- + drivers/bluetooth/btusb.c | 22 ++++--- + include/net/bluetooth/bluetooth.h | 3 +- + include/net/bluetooth/mgmt.h | 2 +- + net/bluetooth/6lowpan.c | 1 - + net/bluetooth/eir.h | 20 +++++++ + net/bluetooth/hci_core.c | 1 + + net/bluetooth/hci_sync.c | 6 +- + net/bluetooth/mgmt.c | 54 +++++++---------- + net/bluetooth/mgmt_util.c | 3 +- + 11 files changed, 183 insertions(+), 58 deletions(-) +Merging wireless-next/main (a0061be4e54b5 rtw88: change rtw_info() to proper message level) +$ 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 net/mac80211/mlme.c +CONFLICT (content): Merge conflict in net/mac80211/mlme.c +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/trans.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/tx.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/ops.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mei/net.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mei/main.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-drv.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-csr.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/file.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/rs.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/commands.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/acpi.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 f3671a23b2edb] Merge branch 'main' of git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git +$ git diff -M --stat --summary HEAD^.. + 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/ath11k/mac.c | 2 +- + .../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/mt7915/init.c | 4 +- + 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 | 98 +- + drivers/net/wireless/realtek/rtw89/core.h | 55 +- + 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 + + 134 files changed, 6360 insertions(+), 2675 deletions(-) + create mode 100644 net/mac80211/eht.c +Merging mtd/mtd/next (2365f91c861cb 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 drivers/mtd/nand/raw/brcmnand/brcmnand.c +Auto-merging drivers/mtd/mtdcore.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/spi/spi-mxic.txt +Removing Documentation/devicetree/bindings/mtd/spi-nand.txt +Removing Documentation/devicetree/bindings/mtd/cortina,gemini-flash.txt +Merge made by the 'recursive' 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 (ffb16c1c42670 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 drivers/mtd/nand/raw/nand_base.c +Auto-merging drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c +Auto-merging drivers/mtd/nand/raw/brcmnand/brcmnand.c +Auto-merging drivers/mtd/nand/raw/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/mtd/nand-controller.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mtd/nand-controller.yaml +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 71627985be564] 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 (e783362eb54cd Linux 5.17-rc1) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (0a2a464f86318 crypto: hisilicon/sec - fix the aead software fallback for engine) +$ 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 drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c +Auto-merging crypto/algapi.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/debugfs-hisi-hpre | 178 +++---- + Documentation/ABI/testing/debugfs-hisi-sec | 146 +++--- + Documentation/ABI/testing/debugfs-hisi-zip | 146 +++--- + 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 | 18 +- + crypto/algapi.c | 6 + + crypto/authenc.c | 2 +- + crypto/hmac.c | 4 + + crypto/lrw.c | 1 + + crypto/memneq.c | 22 +- + crypto/rsa-pkcs1pad.c | 38 +- + crypto/sm2.c | 38 +- + crypto/sm3_generic.c | 142 +----- + crypto/tcrypt.c | 222 +-------- + crypto/testmgr.c | 6 +- + crypto/testmgr.h | 11 + + crypto/xts.c | 1 + + drivers/char/hw_random/Kconfig | 2 +- + drivers/char/hw_random/core.c | 161 +++++-- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.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_req.h | 2 +- + 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 | 4 +- + 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 | 21 +- + drivers/crypto/marvell/octeontx2/otx2_cptpf_mbox.c | 23 +- + .../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 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cpt.c | 1 + + include/asm-generic/xor.h | 84 ++-- + include/crypto/sm3.h | 34 +- + 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 ++++++++++ + 104 files changed, 2681 insertions(+), 1460 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 lib/crypto/sm3.c +Merging drm/drm-next (0a131b69c1416 Merge tag 'amd-drm-next-5.18-2022-02-18' 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 +Auto-merging include/drm/dp/drm_dp_helper.h +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.h +Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c +Auto-merging drivers/gpu/drm/tegra/dpaux.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/tegra/dpaux.c +Auto-merging drivers/gpu/drm/tegra/dp.c +Auto-merging drivers/gpu/drm/tegra/Kconfig +CONFLICT (content): Merge conflict in drivers/gpu/drm/tegra/Kconfig +Auto-merging drivers/gpu/drm/radeon/radeon_uvd.c +Removing drivers/gpu/drm/i915/selftests/i915_buddy.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Removing drivers/gpu/drm/i915/i915_buddy.h +Removing drivers/gpu/drm/i915/i915_buddy.c +Auto-merging drivers/gpu/drm/i915/gvt/gtt.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +Auto-merging drivers/gpu/drm/i915/display/intel_tc.c +Auto-merging drivers/gpu/drm/i915/display/intel_snps_phy.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_snps_phy.c +Auto-merging drivers/gpu/drm/i915/display/intel_opregion.c +Auto-merging drivers/gpu/drm/i915/display/intel_fbc.c +Auto-merging drivers/gpu/drm/i915/display/intel_bw.c +Auto-merging drivers/gpu/drm/i915/Kconfig +Auto-merging drivers/gpu/drm/drm_gem_cma_helper.c +Auto-merging drivers/gpu/drm/drm_edid.c +Auto-merging drivers/gpu/drm/dp/drm_dp.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_resource.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/dc_resource.c +Removing drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Removing drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.h +Removing drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.c +Removing drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h +Removing drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc15.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +Auto-merging MAINTAINERS +Recorded preimage for 'drivers/gpu/drm/amd/display/dc/core/dc_resource.c' +Resolved 'drivers/gpu/drm/i915/display/intel_snps_phy.c' using previous resolution. +Resolved 'drivers/gpu/drm/tegra/Kconfig' using previous resolution. +Resolved 'drivers/gpu/drm/tegra/dpaux.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/display/dc/core/dc_resource.c'. +[master e2c3ce1a8f23d] Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/bridge/lvds-codec.yaml | 1 + + .../bindings/display/bridge/ti,sn65dsi83.yaml | 5 +- + .../bindings/display/panel/panel-simple.yaml | 2 + + .../bindings/display/panel/sony,acx424akp.yaml | 11 +- + 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/todo.rst | 35 +- + Documentation/gpu/vkms.rst | 2 - + MAINTAINERS | 9 +- + 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-resv.c | 46 +- + 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 | 15 + + drivers/gpu/drm/Makefile | 14 +- + drivers/gpu/drm/amd/amdgpu/aldebaran.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 32 +- + 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_bios.c | 38 + + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 22 +- + 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 | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 131 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 551 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 110 +- + 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 | 127 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 14 +- + 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 | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 112 +- + 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 | 4 +- + 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 | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 124 +- + 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 | 17 +- + 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_trace.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 417 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 10 +- + 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_virt.c | 145 + + 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 | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 92 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 4 +- + 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/atombios_dp.c | 2 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- + 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 | 53 +- + 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 | 91 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 16 +- + 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_vi.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 44 +- + 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 | 102 +- + 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 | 7 + + 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 | 19 +- + 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 | 173 +- + 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 | 1610 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 6 +- + 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 | 3 +- + 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 | 195 +- + 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 | 90 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 15 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 108 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 3 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 219 +- + .../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 | 6 +- + drivers/gpu/drm/amd/display/dc/Makefile | 7 +- + 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 | 1 + + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 10 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 16 + + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 5 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 6 +- + .../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/dcn316/dcn316_clk_mgr.c | 706 + + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.h | 49 + + .../drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.c | 328 + + .../drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.h | 128 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 75 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 867 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 1368 +- + 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 | 96 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 16 + + drivers/gpu/drm/amd/display/dc/dc.h | 40 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 59 +- + 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 | 103 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 9 +- + .../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 | 41 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 19 +- + 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 => dcn316}/Makefile | 36 +- + .../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 +- + .../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 +- + .../amd/display/dc/gpio/dcn30/hw_factory_dcn30.c | 4 +- + .../amd/display/dc/gpio/dcn30/hw_translate_dcn30.c | 4 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 1 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 1 + + 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 +- + .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 4 +- + 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 | 1 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 13 +- + 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_dcn316.c | 62 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn316.h | 33 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 4 + + .../drm/amd/display/include/bios_parser_types.h | 2 - + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 7 +- + drivers/gpu/drm/amd/display/include/dal_types.h | 1 + + .../drm/amd/display/include/ddc_service_types.h | 5 + + 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_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_3_offset.h | 11969 ++ + .../amd/include/asic_reg/dpcs/dpcs_4_2_3_sh_mask.h | 136141 ++++++++++++++++++ + .../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 | 615 +- + 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 | 677 +- + .../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 + .../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/smu_11_0_cdr_table.h | 0 + drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_types.h | 0 + 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 | 0 + .../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 | 70 +- + 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 | 16 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 10 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 90 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 76 +- + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 38 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 222 +- + 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/ast/ast_drv.c | 18 +- + drivers/gpu/drm/ast/ast_drv.h | 2 +- + drivers/gpu/drm/ast/ast_main.c | 2 + + drivers/gpu/drm/ast/ast_mode.c | 13 +- + drivers/gpu/drm/bridge/Kconfig | 5 + + 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 | 2 + + 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 | 440 +- + drivers/gpu/drm/bridge/analogix/anx7625.h | 80 +- + 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-it66121.c | 3 - + drivers/gpu/drm/bridge/lontium-lt9611.c | 4 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 4 +- + drivers/gpu/drm/bridge/nwl-dsi.c | 8 +- + 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 | 16 +- + 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 | 4 +- + drivers/gpu/drm/dp/Makefile | 9 + + drivers/gpu/drm/{drm_dp_helper.c => dp/drm_dp.c} | 6 +- + 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_buddy.c | 535 + + drivers/gpu/drm/drm_cache.c | 18 +- + drivers/gpu/drm/drm_client.c | 9 +- + drivers/gpu/drm/drm_color_mgmt.c | 4 + + drivers/gpu/drm/drm_crtc_helper_internal.h | 27 - + drivers/gpu/drm/drm_dsc.c | 2 +- + drivers/gpu/drm/drm_edid.c | 104 +- + drivers/gpu/drm/drm_fb_helper.c | 12 +- + drivers/gpu/drm/drm_gem.c | 12 +- + 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 | 15 +- + 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_kms_helper_common.c | 14 - + drivers/gpu/drm/drm_mipi_dbi.c | 8 +- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 + + drivers/gpu/drm/drm_plane.c | 9 +- + drivers/gpu/drm/drm_prime.c | 4 +- + drivers/gpu/drm/drm_privacy_screen.c | 5 +- + drivers/gpu/drm/drm_privacy_screen_x86.c | 17 + + 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/exynos/Kconfig | 1 + + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 13 +- + 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/gud/gud_pipe.c | 4 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 3 +- + drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 5 +- + drivers/gpu/drm/i915/Kconfig | 2 + + drivers/gpu/drm/i915/Makefile | 4 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 18 +- + drivers/gpu/drm/i915/display/g4x_hdmi.h | 2 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 105 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 7 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 2 + + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 8 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 1 + + drivers/gpu/drm/i915/display/intel_backlight.c | 3 + + drivers/gpu/drm/i915/display/intel_bios.c | 217 +- + drivers/gpu/drm/i915/display/intel_bw.c | 14 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 65 +- + drivers/gpu/drm/i915/display/intel_cdclk.h | 9 +- + 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 | 143 +- + 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 | 572 +- + drivers/gpu/drm/i915/display/intel_display.h | 36 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 7 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 45 +- + 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 | 26 +- + 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 | 167 +- + 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.h | 2 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 - + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 36 + + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 46 +- + drivers/gpu/drm/i915/display/intel_drrs.c | 107 +- + drivers/gpu/drm/i915/display/intel_dsb.h | 2 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 29 +- + drivers/gpu/drm/i915/display/intel_dvo_dev.h | 2 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 238 +- + drivers/gpu/drm/i915/display/intel_fbc.h | 7 + + drivers/gpu/drm/i915/display/intel_gmbus.c | 7 - + 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 | 106 +- + drivers/gpu/drm/i915/display/intel_hdmi.h | 6 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 14 +- + 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 | 56 +- + drivers/gpu/drm/i915/display/intel_opregion.h | 10 + + drivers/gpu/drm/i915/display/intel_overlay.c | 1 + + 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_pps.c | 22 +- + drivers/gpu/drm/i915/display/intel_sdvo.h | 2 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 30 +- + 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 | 26 - + drivers/gpu/drm/i915/display/intel_vdsc.c | 7 +- + drivers/gpu/drm/i915/display/intel_vga.c | 9 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 195 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 + + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 2 + + drivers/gpu/drm/i915/gem/i915_gem_tiling.h | 18 + + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_userptr.h | 14 + + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 3 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 3 +- + .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 6 +- + 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 | 2 + + drivers/gpu/drm/i915/gt/gen7_renderclear.c | 1 + + drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 3 +- + drivers/gpu/drm/i915/gt/intel_engine.h | 1 - + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 4 +- + drivers/gpu/drm/i915/gt/intel_engine_regs.h | 223 + + .../gpu/drm/i915/gt/intel_execlists_submission.c | 2 + + drivers/gpu/drm/i915/gt/intel_ggtt.c | 1 + + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 2 + + drivers/gpu/drm/i915/gt/intel_gt.c | 4 +- + 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 | 10 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_irq.c | 1 + + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 1554 + + drivers/gpu/drm/i915/gt/intel_gtt.c | 1 + + drivers/gpu/drm/i915/gt/intel_llc.c | 10 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 2 + + 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_rc6.c | 16 +- + drivers/gpu/drm/i915/gt/intel_rc6.h | 2 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 1 + + drivers/gpu/drm/i915/gt/intel_reset.c | 4 + + drivers/gpu/drm/i915/gt/intel_ring.c | 1 + + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 12 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 10 +- + 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_workarounds.c | 8 +- + 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_gt_pm.c | 1 + + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 1 + + drivers/gpu/drm/i915/gt/selftest_llc.c | 5 +- + drivers/gpu/drm/i915/gt/selftest_rps.c | 6 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 1 + + .../gpu/drm/i915/gt/uc/abi/guc_actions_slpc_abi.h | 1 - + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 + + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 2 + + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 1 + + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 1 + + drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 2 + + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.h | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 1 + + drivers/gpu/drm/i915/gvt/aperture_gm.c | 1 + + drivers/gpu/drm/i915/gvt/cmd_parser.c | 4 +- + drivers/gpu/drm/i915/gvt/display.c | 17 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 19 +- + drivers/gpu/drm/i915/gvt/edid.c | 1 + + 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 | 36 +- + drivers/gpu/drm/i915/gvt/interrupt.c | 11 +- + drivers/gpu/drm/i915/gvt/interrupt.h | 4 +- + 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 | 76 +- + drivers/gpu/drm/i915/i915_cmd_parser.h | 26 + + drivers/gpu/drm/i915/i915_debugfs.c | 1 + + drivers/gpu/drm/i915/i915_driver.c | 3 + + drivers/gpu/drm/i915/i915_drv.h | 90 +- + drivers/gpu/drm/i915/i915_gem.c | 1 + + drivers/gpu/drm/i915/i915_gem_evict.c | 1 + + drivers/gpu/drm/i915/i915_gem_evict.h | 24 + + drivers/gpu/drm/i915/i915_gem_gtt.c | 1 + + drivers/gpu/drm/i915/i915_getparam.c | 2 + + drivers/gpu/drm/i915/i915_getparam.h | 15 + + drivers/gpu/drm/i915/i915_gpu_error.c | 2 + + 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 | 8 +- + drivers/gpu/drm/i915/i915_mm.h | 3 +- + drivers/gpu/drm/i915/i915_module.c | 3 - + drivers/gpu/drm/i915/i915_pci.c | 24 +- + drivers/gpu/drm/i915/i915_perf.c | 137 +- + 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 | 4103 +- + drivers/gpu/drm/i915/i915_reg_defs.h | 101 + + drivers/gpu/drm/i915/i915_request.c | 1 + + 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 | 37 +- + drivers/gpu/drm/i915/i915_ttm_buddy_manager.h | 4 +- + drivers/gpu/drm/i915/i915_utils.h | 15 - + drivers/gpu/drm/i915/i915_vma.c | 3 +- + drivers/gpu/drm/i915/intel_device_info.c | 13 +- + drivers/gpu/drm/i915/intel_device_info.h | 5 +- + drivers/gpu/drm/i915/intel_dram.c | 7 +- + 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 | 254 +- + drivers/gpu/drm/i915/intel_pm.h | 1 - + drivers/gpu/drm/i915/intel_runtime_pm.c | 3 - + drivers/gpu/drm/i915/intel_sbi.c | 1 + + drivers/gpu/drm/i915/intel_uncore.c | 73 +- + drivers/gpu/drm/i915/intel_uncore.h | 2 +- + drivers/gpu/drm/i915/pxp/intel_pxp_irq.c | 1 + + drivers/gpu/drm/i915/selftests/i915_buddy.c | 787 - + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 1 - + .../gpu/drm/i915/selftests/intel_memory_region.c | 13 +- + 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/ingenic/ingenic-drm-drv.c | 62 +- + drivers/gpu/drm/ingenic/ingenic-drm.h | 38 + + drivers/gpu/drm/lima/lima_gem.c | 3 +- + drivers/gpu/drm/lima/lima_sched.c | 4 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 7 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.h | 5 +- + drivers/gpu/drm/meson/meson_drv.c | 25 +- + drivers/gpu/drm/meson/meson_osd_afbcd.c | 41 +- + drivers/gpu/drm/meson/meson_osd_afbcd.h | 1 + + 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.h | 4 +- + drivers/gpu/drm/msm/msm_gem_prime.c | 6 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 9 + + drivers/gpu/drm/nouveau/Kconfig | 1 + + drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_connector.h | 2 +- + 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_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/omapdrm/omap_gem_dmabuf.c | 1 + + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 8 +- + drivers/gpu/drm/panel/panel-edp.c | 21 +- + drivers/gpu/drm/panel/panel-samsung-atna33xc20.c | 4 +- + drivers/gpu/drm/panel/panel-simple.c | 33 + + drivers/gpu/drm/panfrost/panfrost_features.h | 212 +- + drivers/gpu/drm/panfrost/panfrost_gpu.c | 32 +- + drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 13 +- + drivers/gpu/drm/qxl/qxl_display.c | 8 +- + drivers/gpu/drm/qxl/qxl_draw.c | 6 +- + drivers/gpu/drm/qxl/qxl_drv.h | 10 +- + 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/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_connectors.c | 4 +- + drivers/gpu/drm/radeon/radeon_device.c | 19 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 2 +- + drivers/gpu/drm/radeon/radeon_gem.c | 1 + + drivers/gpu/drm/radeon/radeon_mode.h | 4 +- + drivers/gpu/drm/radeon/radeon_object.c | 1 - + drivers/gpu/drm/radeon/radeon_ttm.c | 4 +- + 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/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_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/selftests/test-drm_dp_mst_helper.c | 8 +- + drivers/gpu/drm/selftests/test-drm_plane_helper.c | 4 + + drivers/gpu/drm/stm/drv.c | 5 + + 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/tegra/Kconfig | 1 + + drivers/gpu/drm/tegra/dp.c | 2 +- + drivers/gpu/drm/tegra/dpaux.c | 4 +- + drivers/gpu/drm/tegra/gem.c | 10 +- + drivers/gpu/drm/tegra/sor.c | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 4 +- + 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 | 77 +- + drivers/gpu/drm/ttm/ttm_sys_manager.c | 3 +- + drivers/gpu/drm/ttm/ttm_tt.c | 8 +- + drivers/gpu/drm/udl/udl_modeset.c | 3 +- + drivers/gpu/drm/v3d/v3d_drv.c | 8 +- + 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_hdmi.c | 132 +- + drivers/gpu/drm/vc4/vc4_hdmi.h | 5 +- + drivers/gpu/drm/vc4/vc4_regs.h | 3 + + drivers/gpu/drm/virtio/virtgpu_gem.c | 3 + + 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_gmrid_manager.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_system_manager.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 +- + .../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/video/fbdev/asiliantfb.c | 2 +- + drivers/video/fbdev/core/fbmem.c | 29 +- + drivers/video/fbdev/s3c-fb.c | 2 +- + drivers/video/fbdev/simplefb.c | 65 +- + 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 | 7 +- + include/drm/{ => dp}/drm_dp_mst_helper.h | 2 +- + include/drm/drm_buddy.h | 150 + + include/drm/drm_cache.h | 6 +- + include/drm/drm_client.h | 7 +- + include/drm/drm_connector.h | 18 +- + include/drm/drm_crtc.h | 12 +- + include/drm/drm_dsc.h | 2 +- + include/drm/drm_edid.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 | 12 +- + 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_modeset_lock.h | 1 + + include/drm/drm_module.h | 125 + + include/drm/drm_plane.h | 2 +- + include/drm/drm_prime.h | 6 +- + include/drm/drm_privacy_screen_driver.h | 13 +- + 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 | 29 +- + include/linux/dma-buf-map.h | 4 +- + include/linux/dma-buf.h | 12 +- + include/linux/dma-resv.h | 4 +- + include/linux/fb.h | 1 + + include/linux/iosys-map.h | 257 + + include/linux/rwsem.h | 2 +- + include/soc/bcm2835/raspberrypi-firmware.h | 1 + + include/uapi/drm/amdgpu_drm.h | 21 +- + include/uapi/drm/panfrost_drm.h | 4 +- + include/uapi/linux/kfd_ioctl.h | 94 +- + 929 files changed, 258056 insertions(+), 19854 deletions(-) + 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/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 => dcn316}/Makefile (57%) + 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/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_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_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_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_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%) + 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%) + 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 (100%) + 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 (100%) + rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v13_0_pptable.h (100%) + create mode 100644 drivers/gpu/drm/dp/Makefile + rename drivers/gpu/drm/{drm_dp_helper.c => dp/drm_dp.c} (99%) + 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/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/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 + 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_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/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/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 (99%) + 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 +Merging drm-misc/for-linux-next (d3cbc6e323c92 drm: panel-orientation-quirks: Add quirk for the 1Netbook OneXPlayer) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Already up to date. +Merging amdgpu/drm-next (3063372f22ace 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 +Removing drivers/gpu/drm/amd/amdgpu/amdgpu_test.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 244 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 105 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 132 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 250 - + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 16 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 8 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 4 + + drivers/gpu/drm/amd/amdgpu/nv.c | 22 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 7 + + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 11 +- + drivers/gpu/drm/amd/amdgpu/umc_v8_7.c | 7 - + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 20 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 1 - + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 61 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 6 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 20 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 2 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 58 +- + drivers/gpu/drm/amd/display/dc/Makefile | 1 + + .../amd/display/dc/bios/command_table_helper2.c | 1 + + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 9 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 23 +- + .../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/dcn31/dcn31_clk_mgr.c | 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 | 329 + + .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.h | 126 + + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 2 +- + .../drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.c | 18 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 35 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 3 + + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 238 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 8 + + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 7 +- + drivers/gpu/drm/amd/display/dc/dc.h | 9 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 31 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 8 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 3 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 12 +- + .../gpu/drm/amd/display/dc/dcn201/dcn201_init.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn315/Makefile | 56 + + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 2304 + + .../drm/amd/display/dc/dcn315/dcn315_resource.h | 42 + + .../drm/amd/display/dc/dml/display_mode_structs.h | 1 + + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 8 + + .../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 | 4 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 4 + + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 2 +- + 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 | 2 +- + .../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/dmub/dmub_srv.h | 1 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 44 + + drivers/gpu/drm/amd/display/dmub/src/Makefile | 4 +- + 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_srv.c | 9 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 6 + + drivers/gpu/drm/amd/display/include/dal_types.h | 1 + + .../drm/amd/display/include/ddc_service_types.h | 1 + + .../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/dpcs/dpcs_4_2_2_offset.h | 11957 ++ + .../amd/include/asic_reg/dpcs/dpcs_4_2_2_sh_mask.h | 103633 ++++++++++++++++++ + .../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 + + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 4 + + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_5.h | 140 + + .../drm/amd/pm/swsmu/inc/pmfw_if/smu_v11_5_ppsmc.h | 2 +- + .../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 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 5 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 1 + + .../drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 12 +- + 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/smu12/renoir_ppt.c | 12 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 3 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 1142 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.h | 28 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 82 +- + drivers/gpu/drm/radeon/radeon.h | 3 + + drivers/gpu/drm/radeon/radeon_audio.c | 95 + + 109 files changed, 201451 insertions(+), 709 deletions(-) + delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_test.c + 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/dcn315/Makefile + 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/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/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/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/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/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/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_5.h + 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 + 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 +$ git am -3 ../patches/0001-fix-up-for-drm-amdgpu-cancel-the-correct-hrtimer-on-.patch +Applying: fix up for "drm/amdgpu: cancel the correct hrtimer on exit" +Using index info to reconstruct a base tree... +M drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c' using previous resolution. +error: Failed to merge in the changes. +hint: Use 'git am --show-current-patch=diff' to see the failed patch +Patch failed at 0001 fix up for "drm/amdgpu: cancel the correct hrtimer on exit" +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +Merging drm-intel/for-linux-next (30424ebae8df0 Merge tag 'drm-intel-gt-next-2022-02-17' of git://anongit.freedesktop.org/drm/drm-intel into drm-intel-next) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging include/drm/dp/drm_dp_helper.h +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Removing drivers/gpu/drm/i915/i915_vma_snapshot.h +Removing drivers/gpu/drm/i915/i915_vma_snapshot.c +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc.h +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_ttm.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/display/intel_snps_phy.c +Auto-merging drivers/gpu/drm/i915/display/intel_opregion.c +Auto-merging drivers/gpu/drm/i915/display/intel_fbc.c +Auto-merging drivers/gpu/drm/i915/display/intel_bw.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_bw.c +Auto-merging drivers/gpu/drm/dp/drm_dp.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/dp/drm_dp.c +Resolved 'drivers/gpu/drm/dp/drm_dp.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/display/intel_bw.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c'. +[master 2d21493e36838] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/i915.rst | 1 + + drivers/gpu/drm/dp/drm_dp.c | 93 + + drivers/gpu/drm/drm_cache.c | 2 +- + drivers/gpu/drm/drm_fb_helper.c | 2 +- + drivers/gpu/drm/i915/Makefile | 4 +- + drivers/gpu/drm/i915/display/hsw_ips.c | 271 ++ + drivers/gpu/drm/i915/display/hsw_ips.h | 26 + + drivers/gpu/drm/i915/display/icl_dsi.c | 14 +- + drivers/gpu/drm/i915/display/icl_dsi_regs.h | 342 +++ + drivers/gpu/drm/i915/display/intel_atomic.c | 11 - + drivers/gpu/drm/i915/display/intel_atomic.h | 2 - + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 217 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 14 +- + drivers/gpu/drm/i915/display/intel_bios.c | 6 + + drivers/gpu/drm/i915/display/intel_bw.c | 153 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 2 + + drivers/gpu/drm/i915/display/intel_color.c | 119 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 33 +- + drivers/gpu/drm/i915/display/intel_display.c | 979 +++----- + drivers/gpu/drm/i915/display/intel_display.h | 11 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 39 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 1 + + drivers/gpu/drm/i915/display/intel_display_types.h | 29 +- + drivers/gpu/drm/i915/display/intel_dp.c | 93 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 307 ++- + .../gpu/drm/i915/display/intel_dp_link_training.h | 4 + + drivers/gpu/drm/i915/display/intel_dp_mst.c | 33 +- + 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 | 44 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 3 + + drivers/gpu/drm/i915/display/intel_dpt.c | 37 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 2 + + drivers/gpu/drm/i915/display/intel_dsi.h | 4 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 11 +- + drivers/gpu/drm/i915/display/intel_fb_pin.c | 9 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- + 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 | 16 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 43 +- + drivers/gpu/drm/i915/display/intel_hdmi.h | 1 + + drivers/gpu/drm/i915/display/intel_hotplug.c | 7 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 63 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 1 + + drivers/gpu/drm/i915/display/intel_plane_initial.c | 14 +- + drivers/gpu/drm/i915/display/intel_psr.c | 119 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 210 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 8 + + drivers/gpu/drm/i915/display/intel_vdsc.c | 47 +- + drivers/gpu/drm/i915/display/intel_vdsc.h | 1 - + 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 | 1 + + 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 | 240 +- + 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 | 9 +- + drivers/gpu/drm/i915/gem/i915_gem_throttle.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 15 +- + 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/selftests/huge_pages.c | 42 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 4 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 3 +- + .../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/gt/gen6_ppgtt.c | 21 +- + 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 | 2 + + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 21 +- + drivers/gpu/drm/i915/gt/intel_engine_regs.h | 23 + + .../gpu/drm/i915/gt/intel_execlists_submission.c | 40 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 133 +- + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 8 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 14 +- + 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_pm_debugfs.c | 1 + + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 2630 ++++++++++---------- + drivers/gpu/drm/i915/gt/intel_gtt.c | 5 + + drivers/gpu/drm/i915/gt/intel_gtt.h | 19 +- + drivers/gpu/drm/i915/gt/intel_llc.c | 1 + + drivers/gpu/drm/i915/gt/intel_lrc.c | 45 + + drivers/gpu/drm/i915/gt/intel_lrc.h | 16 +- + drivers/gpu/drm/i915/gt/intel_ppgtt.c | 22 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 5 +- + drivers/gpu/drm/i915/gt/intel_renderstate.c | 2 + + drivers/gpu/drm/i915/gt/intel_reset.c | 25 +- + drivers/gpu/drm/i915/gt/intel_ring.c | 1 + + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 4 + + drivers/gpu/drm/i915/gt/intel_rps.c | 1 + + drivers/gpu/drm/i915/gt/intel_timeline.c | 5 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 45 +- + drivers/gpu/drm/i915/gt/selftest_execlists.c | 1 + + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 3 +- + 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 | 2 + + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 1 + + drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h | 80 +- + 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 | 126 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 20 + + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 204 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 143 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 38 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 37 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 31 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.h | 3 + + drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 7 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 3 + + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 148 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.c | 1 + + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 31 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 45 +- + 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 | 2 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 7 +- + drivers/gpu/drm/i915/gvt/execlist.c | 2 +- + drivers/gpu/drm/i915/gvt/handlers.c | 2 + + drivers/gpu/drm/i915/gvt/kvmgt.c | 2 + + drivers/gpu/drm/i915/i915_cmd_parser.c | 2 + + drivers/gpu/drm/i915/i915_debugfs.c | 19 +- + drivers/gpu/drm/i915/i915_driver.c | 28 +- + drivers/gpu/drm/i915/i915_driver.h | 5 + + drivers/gpu/drm/i915/i915_drv.h | 328 +-- + drivers/gpu/drm/i915/i915_file_private.h | 108 + + drivers/gpu/drm/i915/i915_gem.c | 44 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 101 +- + drivers/gpu/drm/i915/i915_gem_evict.h | 6 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 16 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 4 + + drivers/gpu/drm/i915/i915_getparam.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 89 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 11 + + drivers/gpu/drm/i915/i915_irq.c | 17 +- + drivers/gpu/drm/i915/i915_irq.h | 1 + + drivers/gpu/drm/i915/i915_mitigations.c | 1 + + drivers/gpu/drm/i915/i915_module.c | 4 + + drivers/gpu/drm/i915/i915_pci.c | 2 + + drivers/gpu/drm/i915/i915_perf.c | 11 +- + drivers/gpu/drm/i915/i915_reg.h | 1203 +-------- + drivers/gpu/drm/i915/i915_reg_defs.h | 27 + + drivers/gpu/drm/i915/i915_request.c | 13 +- + drivers/gpu/drm/i915/i915_request.h | 6 +- + drivers/gpu/drm/i915/i915_vgpu.c | 2 +- + drivers/gpu/drm/i915/i915_vma.c | 569 +++-- + 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.h | 4 +- + drivers/gpu/drm/i915/intel_dram.c | 1 + + 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_pm.c | 451 ++-- + drivers/gpu/drm/i915/intel_runtime_pm.c | 3 + + drivers/gpu/drm/i915/intel_runtime_pm.h | 1 + + drivers/gpu/drm/i915/intel_step.c | 15 + + drivers/gpu/drm/i915/intel_uncore.c | 2 +- + drivers/gpu/drm/i915/intel_wopcm.c | 42 +- + drivers/gpu/drm/i915/pxp/intel_pxp_pm.h | 2 +- + 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 +- + 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 + + 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 +- + include/drm/dp/drm_dp_helper.h | 24 +- + include/linux/iosys-map.h | 218 +- + 206 files changed, 8501 insertions(+), 5678 deletions(-) + 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/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/gt/uc/abi/guc_klvs_abi.h + create mode 100644 drivers/gpu/drm/i915/i915_file_private.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 +Merging drm-tegra/drm/tegra/for-next (8913e1aea4b32 drm/tegra: dpaux: Populate AUX bus) +$ git merge -m Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-msm/msm-next (bc2112583a0b4 drm/msm/gpu: Track global faults per address-space) +$ 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/msm_drv.h +Auto-merging drivers/gpu/drm/msm/dp/dp_ctrl.c +Auto-merging drivers/gpu/drm/msm/dp/dp_catalog.c +Auto-merging drivers/gpu/drm/msm/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/display/msm/dp-controller.yaml | 1 + + .../bindings/display/msm/dpu-msm8998.yaml | 219 ++++++++++ + .../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 | 2 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 5 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 3 +- + 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 | 2 +- + 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 | 460 ++++++++++++++++++++- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 20 +- + 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 | 67 +-- + 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_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/mdp5/mdp5_kms.c | 9 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_mdss.c | 4 +- + 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_host.c | 4 +- + 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_debugfs.c | 6 +- + drivers/gpu/drm/msm/msm_drv.c | 159 +------ + drivers/gpu/drm/msm/msm_drv.h | 40 +- + drivers/gpu/drm/msm/msm_gem.h | 3 + + drivers/gpu/drm/msm/msm_gpu.c | 10 +- + 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 +- + 68 files changed, 1481 insertions(+), 943 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/msm/dpu-msm8998.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 (20fbfc81e3901 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 +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 3559 and retry the command. +Merge made by the 'recursive' 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 (cdd156955f946 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 (997403e7782a3 video: fbdev: via: check the return value of kstrdup()) +$ 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/s3c-fb.c +Auto-merging drivers/video/fbdev/core/fbmem.c +Merge made by the 'recursive' 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 | 19 ++++---- + 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/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 ++++-- + 49 files changed, 174 insertions(+), 194 deletions(-) +Merging regmap/for-next (2d2329787ba2e 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 'recursive' strategy. + drivers/base/regmap/regmap-irq.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging sound/for-next (d23c49562a887 dt-bindings: Document Tegra234 HDA support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging sound/pci/hda/hda_intel.c +Auto-merging include/linux/spi/spi.h +Removing drivers/platform/x86/i2c-multi-instantiate.c +Auto-merging drivers/acpi/scan.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/sound/nvidia,tegra30-hda.yaml | 3 + + 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/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/usb/mixer_s1810c.c | 2 +- + sound/usb/mixer_scarlett_gen2.c | 6 +- + tools/testing/selftests/alsa/mixer-test.c | 412 +++++++++++++++++++-- + 27 files changed, 1373 insertions(+), 401 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 (b83eb8be4f2ca ASoC: sc7280: Really depends on SOUNDWIRE) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Removing sound/soc/sof/sof-probes.h +Removing sound/soc/sof/sof-probes.c +Auto-merging sound/soc/sof/intel/hda.c +Auto-merging sound/soc/codecs/wm_adsp.c +Auto-merging sound/soc/codecs/wcd938x.c +Auto-merging sound/soc/codecs/lpass-rx-macro.c +Auto-merging sound/soc/amd/acp/acp-sof-mach.c +Auto-merging sound/soc/amd/acp/acp-mach-common.c +Removing include/dt-bindings/sound/tlv320aic31xx-micbias.h +Auto-merging drivers/gpu/drm/rockchip/cdn-dp-core.h +Auto-merging drivers/gpu/drm/rockchip/cdn-dp-core.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/sound/snow.txt +Removing Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt +Removing Documentation/devicetree/bindings/sound/samsung,smdk-wm8994.txt +Removing Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt +Removing Documentation/devicetree/bindings/sound/arndale.txt +Merge made by the 'recursive' 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,wcd938x.yaml | 4 + + .../devicetree/bindings/sound/realtek,rt5682s.yaml | 8 +- + .../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/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/Kconfig | 10 + + sound/soc/amd/acp/Makefile | 4 + + sound/soc/amd/acp/acp-legacy-mach.c | 4 +- + sound/soc/amd/acp/acp-mach-common.c | 21 + + sound/soc/amd/acp/acp-pci.c | 160 ++++ + sound/soc/amd/acp/acp-pdm.c | 193 +++++ + sound/soc/amd/acp/acp-renoir.c | 160 ++++ + 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/renoir/rn-pci-acp3x.c | 7 +- + sound/soc/amd/renoir/rn_acp3x.h | 3 + + sound/soc/codecs/Kconfig | 22 +- + sound/soc/codecs/Makefile | 2 + + 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/lpass-rx-macro.c | 2 + + sound/soc/codecs/lpass-tx-macro.c | 2 + + sound/soc/codecs/lpass-wsa-macro.c | 2 + + sound/soc/codecs/max98927.c | 1 + + sound/soc/codecs/pcm3168a.c | 150 ++-- + sound/soc/codecs/rt5640.c | 3 - + sound/soc/codecs/tas5805m.c | 567 ++++++++++++++ + sound/soc/codecs/tlv320adc3xxx.c | 143 +++- + sound/soc/codecs/tlv320aic31xx.c | 2 +- + sound/soc/codecs/wcd938x.c | 27 + + 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/fsl/fsl-asoc-card.c | 7 +- + sound/soc/fsl/fsl_sai.c | 9 + + sound/soc/fsl/fsl_sai.h | 1 + + sound/soc/generic/simple-card-utils.c | 86 ++- + sound/soc/intel/boards/bytcr_wm5102.c | 2 +- + sound/soc/intel/boards/sof_es8336.c | 8 + + sound/soc/intel/boards/sof_rt5682.c | 55 +- + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 6 + + 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 | 3 - + sound/soc/qcom/Kconfig | 14 + + sound/soc/qcom/Makefile | 2 + + sound/soc/qcom/lpass.h | 1 + + 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-core.c | 2 +- + sound/soc/soc-generic-dmaengine-pcm.c | 10 +- + 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 | 32 +- + sound/soc/sof/intel/hda.h | 75 +- + sound/soc/sof/intel/icl.c | 13 +- + 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 | 7 +- + 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 | 144 ++-- + 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/xilinx/xlnx_formatter_pcm.c | 25 + + sound/soc/xilinx/xlnx_i2s.c | 147 +++- + 149 files changed, 6688 insertions(+), 2168 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/tas5805m.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 (c55dc78176e6f module: Move procfs support into a separate file) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Removing kernel/module_signing.c +Auto-merging kernel/module/main.c +Removing kernel/module-internal.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + include/linux/module.h | 9 +- + kernel/Makefile | 5 +- + kernel/module-internal.h | 50 - + kernel/module/Makefile | 17 + + kernel/module/debug_kmemleak.c | 30 + + .../{module_decompress.c => module/decompress.c} | 5 +- + kernel/module/internal.h | 215 ++++ + kernel/module/kallsyms.c | 502 +++++++++ + kernel/module/livepatch.c | 74 ++ + kernel/{module.c => module/main.c} | 1131 +------------------- + kernel/module/procfs.c | 142 +++ + kernel/{module_signature.c => module/signature.c} | 0 + kernel/module/signing.c | 122 +++ + kernel/module/strict_rwx.c | 84 ++ + kernel/module/tree_lookup.c | 109 ++ + kernel/module_signing.c | 45 - + 17 files changed, 1330 insertions(+), 1212 deletions(-) + delete mode 100644 kernel/module-internal.h + create mode 100644 kernel/module/Makefile + create mode 100644 kernel/module/debug_kmemleak.c + rename kernel/{module_decompress.c => module/decompress.c} (99%) + create mode 100644 kernel/module/internal.h + create mode 100644 kernel/module/kallsyms.c + create mode 100644 kernel/module/livepatch.c + rename kernel/{module.c => module/main.c} (75%) + create mode 100644 kernel/module/procfs.c + rename kernel/{module_signature.c => module/signature.c} (100%) + create mode 100644 kernel/module/signing.c + create mode 100644 kernel/module/strict_rwx.c + create mode 100644 kernel/module/tree_lookup.c + delete mode 100644 kernel/module_signing.c +$ git reset --hard HEAD^ +HEAD is now at 8b97aa8db2525 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git +Merging next-20220217 version of modules +$ git merge -m next-20220217/modules a97ac8cb24a3c3ad74794adb83717ef1605d1b47 +Already up to date. +Merging input/next (986c6f7c3fc85 Merge tag 'v5.17-rc4' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/mtk-pmic-keys.txt | 5 +- + drivers/input/joystick/xpad.c | 2 +- + drivers/input/keyboard/mtk-pmic-keys.c | 55 +++++- + drivers/input/serio/ps2-gpio.c | 195 +++++++++++++-------- + drivers/input/touchscreen/tsc200x-core.c | 7 +- + 5 files changed, 186 insertions(+), 78 deletions(-) +Merging block/for-next (bc6115211813f Merge branch 'for-5.18/io_uring' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging security/integrity/ima/ima_policy.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/power/hibernate.c +Auto-merging kernel/exit.c +Removing include/linux/genhd.h +Auto-merging include/linux/blkdev.h +Auto-merging fs/iomap/direct-io.c +CONFLICT (content): Merge conflict in fs/iomap/direct-io.c +Auto-merging fs/io_uring.c +Auto-merging fs/internal.h +Auto-merging fs/f2fs/data.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging drivers/md/dm.c +Auto-merging drivers/block/mtip32xx/mtip32xx.c +Auto-merging drivers/block/loop.c +Auto-merging block/genhd.c +Auto-merging block/elevator.c +Auto-merging block/blk-mq.c +Auto-merging block/blk-core.c +Auto-merging block/bfq-iosched.c +Auto-merging arch/m68k/mvme16x/config.c +Auto-merging arch/m68k/mvme147/config.c +Auto-merging arch/m68k/kernel/setup_mm.c +Auto-merging arch/m68k/bvme6000/config.c +Auto-merging MAINTAINERS +Removing Documentation/block/biodoc.rst +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 8fb79d10e2a67] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git +$ git diff -M --stat --summary HEAD^.. + 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 | 15 + + block/bdev.c | 9 +- + 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.c | 1 - + 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 | 2 +- + 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 | 2 +- + 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/target/io-cmd-bdev.c | 18 +- + drivers/nvme/target/passthru.c | 7 +- + 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 | 3 +- + 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 | 296 ++++----- + 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 | 34 +- + fs/nfs/blocklayout/blocklayout.c | 26 +- + fs/nfs/blocklayout/rpc_pipefs.c | 1 - + fs/nfsd/blocklayout.c | 1 - + fs/nilfs2/segbuf.c | 31 +- + fs/ntfs3/fsntfs.c | 36 +- + fs/ocfs2/cluster/heartbeat.c | 4 +- + fs/squashfs/block.c | 11 +- + fs/stat.c | 47 +- + 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 | 293 ++++++++- + include/linux/genhd.h | 291 --------- + include/linux/part_stat.h | 2 +- + include/linux/sbitmap.h | 51 +- + include/trace/events/block.h | 49 +- + include/trace/events/io_uring.h | 331 +++++----- + 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 - + 188 files changed, 2190 insertions(+), 3961 deletions(-) + delete mode 100644 Documentation/block/biodoc.rst + create mode 100644 block/blk-cgroup.h + delete mode 100644 include/linux/genhd.h +Merging device-mapper/for-next (f5b4aee10c024 dm: remove unnecessary local variables in __bind) +$ 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 'recursive' strategy. + drivers/md/dm-cache-policy-smq.c | 4 +- + 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-rq.c | 7 +- + drivers/md/dm-stats.c | 34 +++- + drivers/md/dm-stats.h | 11 +- + drivers/md/dm-thin-metadata.c | 28 --- + drivers/md/dm-thin-metadata.h | 1 - + drivers/md/dm-thin.c | 2 +- + drivers/md/dm.c | 400 ++++++++++++++++++++++++--------------- + include/linux/device-mapper.h | 9 +- + include/uapi/linux/dm-ioctl.h | 4 +- + 16 files changed, 347 insertions(+), 241 deletions(-) +Merging libata/for-next (9256766fe2df9 ata: pata_hpt37x: merge transfer mode setting methods) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Auto-merging include/linux/libata.h +Auto-merging drivers/ata/sata_fsl.c +Auto-merging drivers/ata/libata-core.c +Merge made by the 'recursive' strategy. + drivers/ata/Kconfig | 2 +- + drivers/ata/acard-ahci.c | 2 +- + drivers/ata/ahci.c | 9 ++- + 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 +++- + 40 files changed, 361 insertions(+), 421 deletions(-) +Merging pcmcia/pcmcia-next (3928cf08334ed 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 +Merge made by the 'recursive' strategy. + drivers/pcmcia/Kconfig | 2 +- + drivers/pcmcia/rsrc_nonstatic.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging mmc/next (4a85422750e8b mmc: mtk-sd: use div64_u64() instead of do_div()) +$ 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 'recursive' 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/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/mtk-sd.c | 2 +- + 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 | 24 +- + drivers/mmc/host/sunxi-mmc.c | 9 + + drivers/mmc/host/wmt-sdmmc.c | 7 +- + 25 files changed, 916 insertions(+), 81 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 (557bf686f1c6f dt-bindings: mfd: Add compatible for the MediaTek MT6366 PMIC) +$ 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 +Removing drivers/mfd/ab8500-debugfs.c +Auto-merging drivers/hwmon/Makefile +Auto-merging drivers/hwmon/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/hwmon/index.rst +Removing Documentation/devicetree/bindings/mfd/samsung,exynos5433-lpass.txt +Removing Documentation/devicetree/bindings/mfd/max77693.txt +Removing Documentation/devicetree/bindings/mfd/ab8500.txt +Merge made by the 'recursive' 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/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/sprd-sc27xx-spi.c | 6 + + 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, 1406 insertions(+), 2723 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 +$ git reset --hard HEAD^ +HEAD is now at a06f973fdafc6 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git +Merging next-20220222 version of mfd +$ git merge -m next-20220222/mfd 2152543edc5da4010633a28ef010f510eb174c64 +Removing drivers/mfd/ab8500-debugfs.c +Auto-merging drivers/hwmon/Makefile +Auto-merging drivers/hwmon/Kconfig +Auto-merging Documentation/hwmon/index.rst +Removing Documentation/devicetree/bindings/mfd/ab8500.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/ab8500.txt | 282 --- + .../devicetree/bindings/mfd/qcom,spmi-pmic.txt | 1 + + .../devicetree/bindings/mfd/qcom,tcsr.txt | 1 + + .../devicetree/bindings/mfd/silergy,sy7636a.yaml | 82 + + .../devicetree/bindings/mfd/stericsson,ab8500.yaml | 500 +++++ + .../bindings/mfd/stericsson,db8500-prcmu.yaml | 1 + + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/sy7636a-hwmon.rst | 26 + + drivers/hwmon/Kconfig | 9 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/sy7636a-hwmon.c | 106 + + 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/intel-lpss-pci.c | 15 + + drivers/mfd/intel_soc_pmic_core.c | 4 + + drivers/mfd/intel_soc_pmic_crc.c | 35 +- + 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/rk808.h | 1 + + include/linux/mfd/sy7636a.h | 34 + + 29 files changed, 880 insertions(+), 2450 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mfd/ab8500.txt + create mode 100644 Documentation/devicetree/bindings/mfd/silergy,sy7636a.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/stericsson,ab8500.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 (ec961cf324115 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 (5ac121b81b405 power: supply: axp288-charger: Set Vhold to 4.4V) +$ 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 include/linux/platform_data/cros_ec_commands.h +Merge made by the 'recursive' strategy. + 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 | 17 + + drivers/power/supply/Makefile | 1 + + drivers/power/supply/ab8500-bm.h | 49 --- + drivers/power/supply/ab8500_bmdata.c | 34 +- + drivers/power/supply/ab8500_btemp.c | 330 ++--------------- + drivers/power/supply/ab8500_chargalg.c | 318 +--------------- + drivers/power/supply/ab8500_charger.c | 47 ++- + drivers/power/supply/ab8500_fg.c | 103 ++++-- + drivers/power/supply/axp20x_battery.c | 13 +- + drivers/power/supply/axp288_charger.c | 14 +- + drivers/power/supply/axp288_fuel_gauge.c | 259 +++++++------ + drivers/power/supply/bq24190_charger.c | 126 +++++-- + drivers/power/supply/bq25890_charger.c | 396 ++++++++++++++++---- + 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/ltc2941-battery-gauge.c | 61 ++-- + drivers/power/supply/mp2629_charger.c | 6 +- + drivers/power/supply/power_supply_core.c | 153 ++++---- + drivers/power/supply/power_supply_hwmon.c | 15 +- + drivers/power/supply/rt9455_charger.c | 2 +- + 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 | 5 +- + 31 files changed, 1872 insertions(+), 1213 deletions(-) + create mode 100644 drivers/power/supply/ug3105_battery.c + create mode 100644 include/linux/power/bq25890_charger.h +Merging regulator/for-next (a94e5cd8457fb regulator: tps62864: Fix bindings for SW property) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Auto-merging drivers/regulator/Kconfig +Merge made by the 'recursive' 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/spi/spi-geni-qcom.c | 7 +- + include/dt-bindings/regulator/ti,tps62864.h | 9 + + 10 files changed, 501 insertions(+), 54 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 (047843bdb3160 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging apparmor/apparmor-next (13db6c2acdcda apparmor: fix aa_label_asxprint return check) +$ 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 security/apparmor/lsm.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 7 ++- + security/apparmor/Kconfig | 86 ++++++++++++++++++++++++---------- + security/apparmor/apparmorfs.c | 36 ++++++++------ + 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 | 29 +++++++----- + security/apparmor/policy_unpack_test.c | 34 +++++++------- + security/apparmor/procattr.c | 2 +- + 15 files changed, 194 insertions(+), 110 deletions(-) +Merging integrity/next-integrity (cd3bc044af483 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 security/integrity/ima/ima_policy.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' 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 (2d743660786ec 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 (1b8b719229197 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 (b97df7c098c53 selinux: use correct type for context length) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Auto-merging security/selinux/ss/conditional.c +Auto-merging security/security.c +Auto-merging include/linux/lsm_hook_defs.h +Merge made by the 'recursive' strategy. + Documentation/security/SCTP.rst | 22 ++- + 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 | 293 +++++++++++++++++------------------- + security/selinux/ibpkey.c | 2 +- + security/selinux/include/security.h | 8 +- + security/selinux/netnode.c | 9 +- + security/selinux/netport.c | 2 +- + security/selinux/selinuxfs.c | 2 + + 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 +- + 21 files changed, 215 insertions(+), 206 deletions(-) +Merging smack/next (e783362eb54cd Linux 5.17-rc1) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Already up to date. +Merging tomoyo/master (39844b7e3084b TOMOYO: fix __setup handlers return values) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Merge made by the 'recursive' strategy. + security/tomoyo/load_policy.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging tpmdd/next (c9e54f38976a1 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 security/integrity/integrity.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' 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/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 ++++- + 28 files changed, 655 insertions(+), 144 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 (cfb92440ee71a 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 (a9b491f6d6de0 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 +Merge made by the 'recursive' 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 (272ceeaea3552 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 'recursive' strategy. + kernel/audit.h | 4 +++ + kernel/auditsc.c | 87 +++++++++++++++++++++++++++++++++++++++++++------------- + 2 files changed, 71 insertions(+), 20 deletions(-) +Merging devicetree/for-next (16234ef1d2aa1 dt-bindings: usb: do not use deprecated synopsys prefix) +$ 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 drivers/of/unittest.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging Documentation/devicetree/bindings/usb/ti,keystone-dwc3.yaml +Removing Documentation/devicetree/bindings/timer/nuvoton,npcm7xx-timer.txt +Removing Documentation/devicetree/bindings/timer/arm,armv7m-systick.txt +Auto-merging Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml +Auto-merging Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml +Removing Documentation/devicetree/bindings/serial/rda,8810pl-uart.txt +Auto-merging Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml +Auto-merging Documentation/devicetree/bindings/phy/ti,omap-usb2.yaml +Auto-merging Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml +Removing Documentation/devicetree/bindings/net/cortina,gemini-ethernet.txt +Auto-merging Documentation/devicetree/bindings/memory-controllers/samsung,exynos5422-dmc.yaml +Auto-merging Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml +Auto-merging Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml +Removing Documentation/devicetree/bindings/i2c/i2c-s3c2410.txt +Auto-merging Documentation/devicetree/bindings/firmware/arm,scmi.yaml +Removing Documentation/devicetree/bindings/dma/xilinx/zynqmp_dma.txt +Removing Documentation/devicetree/bindings/display/msm/mdp4.txt +Removing Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt +Removing Documentation/devicetree/bindings/display/exynos/exynos_mixer.txt +Removing Documentation/devicetree/bindings/display/exynos/exynos_hdmiphy.txt +Removing Documentation/devicetree/bindings/display/exynos/exynos_hdmiddc.txt +Removing Documentation/devicetree/bindings/display/exynos/exynos_hdmi.txt +Removing Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt +Removing Documentation/devicetree/bindings/display/exynos/exynos5433-decon.txt +Removing Documentation/devicetree/bindings/display/exynos/exynos-mic.txt +Removing Documentation/devicetree/bindings/crypto/atmel-crypto.txt +Removing Documentation/devicetree/bindings/ata/cortina,gemini-sata-bridge.txt +Merge made by the 'recursive' 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/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/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 +++++++++++ + .../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 + + .../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/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 +- + .../bindings/i2c/samsung,s3c2410-i2c.yaml | 164 +++++++++++++++ + .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 24 ++- + .../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 + + .../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 + + .../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/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 + + .../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 + + .../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 + + .../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 | 10 + + .../bindings/remoteproc/ti,omap-remoteproc.yaml | 19 +- + .../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 + + .../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 | 8 +- + .../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/trivial-devices.yaml | 8 +- + .../devicetree/bindings/usb/dwc3-cavium.txt | 2 +- + .../devicetree/bindings/usb/nvidia,tegra-xudc.yaml | 2 +- + .../devicetree/bindings/usb/ti,keystone-dwc3.yaml | 2 +- + .../devicetree/bindings/vendor-prefixes.yaml | 10 +- + .../bindings/watchdog/fsl-imx7ulp-wdt.yaml | 8 +- + MAINTAINERS | 4 +- + drivers/of/unittest.c | 2 +- + scripts/dtc/Makefile | 2 +- + 132 files changed, 2457 insertions(+), 1092 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 +Merging mailbox/mailbox-for-next (869b6ca39c08c 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 (4d986ffa036a7 spi: add missing pci_dev_put() before return) +$ 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 include/linux/spi/spi.h +Auto-merging drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c +Auto-merging drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c +Auto-merging drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c +Auto-merging drivers/tty/serial/sc16is7xx.c +Auto-merging drivers/staging/fbtft/fbtft.h +Auto-merging drivers/spi/spi-mem.c +Auto-merging drivers/spi/Kconfig +Auto-merging drivers/net/wireless/microchip/wilc1000/spi.c +Auto-merging drivers/net/ieee802154/mcr20a.c +Auto-merging drivers/net/ieee802154/ca8210.c +Auto-merging drivers/net/ieee802154/at86rf230.c +Removing drivers/mtd/spi-nor/controllers/intel-spi.h +Auto-merging drivers/mtd/devices/mchp48l640.c +Auto-merging drivers/mtd/devices/mchp23k256.c +Auto-merging drivers/mfd/arizona-spi.c +Auto-merging drivers/hwmon/adt7310.c +CONFLICT (content): Merge conflict in drivers/hwmon/adt7310.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/spi/spi-slave-mt27xx.txt +Removing Documentation/devicetree/bindings/spi/spi-mt65xx.txt +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 1463561366d9f] 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 | 102 +++ + .../bindings/spi/mediatek,spi-mtk-nor.yaml | 4 + + .../bindings/spi/mediatek,spi-slave-mt27xx.yaml | 58 ++ + .../bindings/spi/microchip,mpfs-spi.yaml | 52 ++ + .../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 | 79 ++ + 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/stargate2.c | 20 +- + 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/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/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/lpc_ich.c | 59 +- + 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/mtd/spi-nor/controllers/Kconfig | 36 - + drivers/mtd/spi-nor/controllers/Makefile | 3 - + drivers/mtd/spi-nor/controllers/intel-spi.h | 21 - + drivers/net/can/m_can/tcan4x5x-core.c | 4 +- + drivers/net/can/spi/hi311x.c | 4 +- + drivers/net/can/spi/mcp251x.c | 4 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 4 +- + drivers/net/dsa/b53/b53_spi.c | 4 +- + drivers/net/dsa/microchip/ksz8795_spi.c | 4 +- + drivers/net/dsa/microchip/ksz9477_spi.c | 4 +- + drivers/net/dsa/sja1105/sja1105_main.c | 6 +- + drivers/net/dsa/vitesse-vsc73xx-spi.c | 6 +- + drivers/net/ethernet/asix/ax88796c_main.c | 4 +- + 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/qualcomm/qca_spi.c | 4 +- + drivers/net/ethernet/vertexcom/mse102x.c | 4 +- + drivers/net/ethernet/wiznet/w5100-spi.c | 4 +- + drivers/net/ieee802154/adf7242.c | 4 +- + drivers/net/ieee802154/at86rf230.c | 4 +- + drivers/net/ieee802154/ca8210.c | 6 +- + drivers/net/ieee802154/cc2520.c | 4 +- + drivers/net/ieee802154/mcr20a.c | 4 +- + drivers/net/ieee802154/mrf24j40.c | 4 +- + drivers/net/phy/spi_ks8995.c | 4 +- + drivers/net/wan/slic_ds26522.c | 3 +- + drivers/net/wireless/intersil/p54/p54spi.c | 4 +- + drivers/net/wireless/marvell/libertas/if_spi.c | 4 +- + drivers/net/wireless/microchip/wilc1000/spi.c | 4 +- + drivers/net/wireless/st/cw1200/cw1200_spi.c | 4 +- + drivers/net/wireless/ti/wl1251/spi.c | 4 +- + drivers/net/wireless/ti/wlcore/spi.c | 4 +- + drivers/nfc/nfcmrvl/spi.c | 3 +- + drivers/nfc/st-nci/spi.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/rtc/rtc-ds1302.c | 3 +- + drivers/rtc/rtc-ds1305.c | 4 +- + drivers/rtc/rtc-ds1343.c | 4 +- + 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-mem.c | 6 +- + drivers/spi/spi-mpc512x-psc.c | 47 +- + drivers/spi/spi-mt65xx.c | 23 +- + drivers/spi/spi-mtk-nor.c | 71 +- + drivers/spi/spi-pic32.c | 9 +- + 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-slave-system-control.c | 3 +- + drivers/spi/spi-slave-time.c | 3 +- + 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 | 2 + + drivers/spi/spi-tle62x0.c | 3 +- + drivers/spi/spi-topcliff-pch.c | 7 +- + drivers/spi/spi.c | 142 +--- + drivers/spi/spidev.c | 35 +- + 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/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/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 | 16 +- + 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 +- + 261 files changed, 2522 insertions(+), 1731 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 (abe87fe230d72 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 net/core/net-sysfs.c +Auto-merging kernel/sched/cpufreq_schedutil.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/kthread.c +Auto-merging kernel/exit.c +Auto-merging kernel/events/core.c +Auto-merging kernel/cgroup/cpuset.c +Auto-merging init/Kconfig +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/emulate.c +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/include/asm/pci_x86.h +Auto-merging arch/x86/include/asm/msr-index.h +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/include/asm/cpufeatures.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/ia64/include/asm/thread_info.h +Auto-merging arch/arm64/kernel/entry-common.c +Auto-merging arch/arm64/Kconfig +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-devices-system-cpu | 4 + + Documentation/ABI/testing/sysfs-devices-system-cpu | 6 + + Documentation/admin-guide/sysctl/kernel.rst | 46 +- + Documentation/scheduler/index.rst | 1 + + Documentation/scheduler/sched-debug.rst | 54 + + Documentation/x86/sva.rst | 53 +- + 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/Kconfig | 4 +- + arch/x86/events/intel/core.c | 40 +- + arch/x86/events/intel/ds.c | 14 +- + arch/x86/events/intel/pt.c | 71 +- + 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/preempt.h | 10 +- + arch/x86/include/asm/processor.h | 2 + + arch/x86/include/asm/ptrace.h | 2 +- + arch/x86/include/asm/topology.h | 1 + + 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 | 129 +- + arch/x86/kernel/cpu/mce/intel.c | 42 - + arch/x86/kernel/cpu/mce/internal.h | 28 +- + arch/x86/kernel/cpu/mce/severity.c | 2 +- + 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/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/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/pci/controller/vmd.c | 14 +- + drivers/pci/pci-driver.c | 21 +- + 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/cpumask.h | 18 +- + include/linux/entry-common.h | 15 +- + include/linux/ioasid.h | 21 +- + include/linux/irqdesc.h | 1 + + 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 | 13 +- + 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/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 | 27 +- + 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 | 367 +++-- + kernel/sched/cpufreq_schedutil.c | 11 +- + kernel/sched/debug.c | 10 - + kernel/sched/fair.c | 82 +- + kernel/sched/isolation.c | 162 ++- + kernel/sched/psi.c | 46 +- + kernel/sched/sched.h | 187 +-- + kernel/sched/topology.c | 269 ++-- + kernel/softirq.c | 10 +- + kernel/sysctl.c | 11 - + 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/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/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 +- + 153 files changed, 6776 insertions(+), 1555 deletions(-) + create mode 100644 Documentation/scheduler/sched-debug.rst + 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 (e547ffe9e6f49 clocksource/drivers/imx-tpm: Update name of clkevt) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Merge made by the 'recursive' strategy. + drivers/clocksource/timer-imx-sysctr.c | 2 +- + drivers/clocksource/timer-imx-tpm.c | 10 +++++----- + 2 files changed, 6 insertions(+), 6 deletions(-) +Merging edac/edac-for-next (9e32472d8b3fe 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 'recursive' 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 (141e6a976c058 Merge branch irq/misc-5.18 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 +Removing include/linux/irqchip/versatile-fpga.h +Merge made by the 'recursive' strategy. + .../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-renesas-intc-irqpin.c | 3 +- + drivers/irqchip/irq-renesas-irqc.c | 3 +- + drivers/irqchip/irq-stm32-exti.c | 50 ++++++++++ + drivers/irqchip/irq-ts4800.c | 25 +++-- + drivers/irqchip/irq-versatile-fpga.c | 46 +++++---- + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 25 +++-- + drivers/pinctrl/pinctrl-starfive.c | 3 +- + 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 +- + 24 files changed, 264 insertions(+), 166 deletions(-) + delete mode 100644 include/linux/irqchip/versatile-fpga.h +Merging ftrace/for-next (864ea0e10cc90 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 +Merge made by the 'recursive' 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 (1b40a3d2152f5 docs: Add documentation for rude and trace RCU flavors) +$ 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 kernel/rcu/tree_plugin.h +CONFLICT (content): Merge conflict in kernel/rcu/tree_plugin.h +Auto-merging kernel/rcu/tasks.h +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +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 56913070ca2d2] 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 | 42 + + .../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 | 566 +++-- + kernel/rcu/tasks.h | 14 +- + kernel/rcu/tree.c | 394 +-- + kernel/rcu/tree.h | 28 +- + kernel/rcu/tree_exp.h | 174 +- + kernel/rcu/tree_nocb.h | 57 +- + kernel/rcu/tree_plugin.h | 48 +- + kernel/rcu/tree_stall.h | 61 + + kernel/rcu/update.c | 9 + + 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/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 +- + .../testing/selftests/rcutorture/bin/kvm-remote.sh | 39 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 16 +- + .../selftests/rcutorture/bin/parse-console.sh | 10 + + tools/testing/selftests/rcutorture/bin/torture.sh | 56 +- + .../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 +- + 85 files changed, 6151 insertions(+), 3124 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 (0828824158b1c Merge tag 'kvm-s390-next-5.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging virt/kvm/kvm_main.c +Auto-merging include/uapi/linux/kvm.h +CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h +Auto-merging arch/x86/kvm/x86.h +Auto-merging arch/x86/kvm/x86.c +CONFLICT (content): Merge conflict in arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx/pmu_intel.c +Removing arch/x86/kvm/mmu/mmu_audit.c +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kvm/emulate.c +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/include/asm/uaccess.h +Auto-merging MAINTAINERS +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'arch/x86/kvm/x86.c' using previous resolution. +Resolved 'include/uapi/linux/kvm.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 473a40b476a09] 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 (5298e539de74d Merge branch kvm-arm64/psci-1.1 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 tools/testing/selftests/kvm/dirty_log_perf_test.c +Removing arch/arm64/kvm/hyp/nvhe/stub.c +Auto-merging arch/arm64/include/asm/sysreg.h +Auto-merging Documentation/virt/kvm/api.rst +Merge made by the 'recursive' strategy. + Documentation/virt/kvm/api.rst | 5 + + Documentation/virt/kvm/devices/vcpu.rst | 34 +++- + 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 | 64 +++++-- + 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 +- + 33 files changed, 794 insertions(+), 247 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 (3d9042f8b9238 KVM: s390: Add missing vm MEM_OP size check) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging xen-tip/linux-next (f66edf684edcb 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 (4e1f82dce05b6 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (bc35f7ef96284 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 'recursive' strategy. + kernel/workqueue.c | 58 +++++++++++++++++++----------------------------------- + 1 file changed, 20 insertions(+), 38 deletions(-) +Merging drivers-x86/for-next (2546c60004309 platform/x86: Add Intel Software Defined Silicon driver) +$ 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 drivers/platform/x86/thinkpad_acpi.c +Removing drivers/platform/x86/intel/int33fe/intel_cht_int33fe_microb.c +Removing drivers/platform/x86/intel/int33fe/intel_cht_int33fe_common.h +Removing drivers/platform/x86/intel/int33fe/intel_cht_int33fe_common.c +Removing drivers/platform/x86/intel/int33fe/Makefile +Removing drivers/platform/x86/intel/int33fe/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-intel_sdsi | 77 +++ + MAINTAINERS | 5 + + drivers/platform/surface/surface3-wmi.c | 17 +- + drivers/platform/surface/surface_acpi_notify.c | 3 +- + drivers/platform/x86/intel/Kconfig | 33 +- + drivers/platform/x86/intel/Makefile | 5 +- + .../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/vbtn.c | 7 +- + drivers/platform/x86/intel/vsec.c | 12 +- + drivers/platform/x86/thinkpad_acpi.c | 17 +- + drivers/platform/x86/x86-android-tablets.c | 352 +++++++++++-- + 19 files changed, 1092 insertions(+), 336 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-intel_sdsi + 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 +Merging chrome-platform/for-next (b579f139e4703 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 'recursive' strategy. + MAINTAINERS | 5 ++ + drivers/platform/chrome/cros_ec_typec.c | 97 ++++++++++++++++----------------- + 2 files changed, 53 insertions(+), 49 deletions(-) +Merging hsi/for-next (e783362eb54cd 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 (8b43ef06ff893 leds: simatic-ipc-leds: Don't directly deref ioremap_resource() returned ptr) +$ 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 'recursive' 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/simple/simatic-ipc-leds.c | 34 ++++++++++++---------- + 5 files changed, 30 insertions(+), 21 deletions(-) +Merging ipmi/for-next (00d93611f0021 ipmi:ipmb: Add the ability to have a separate slave and master device) +$ 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 'recursive' 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 | 1 + + 6 files changed, 63 insertions(+), 11 deletions(-) +Merging driver-core/driver-core-next (b4ae8c2fb673d driver core: cleanup double words comments) +$ 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 net/sunrpc/sysfs.c +Auto-merging drivers/power/supply/ab8500_fg.c +Auto-merging drivers/power/supply/ab8500_chargalg.c +CONFLICT (content): Merge conflict in drivers/power/supply/ab8500_chargalg.c +Auto-merging drivers/base/devtmpfs.c +Auto-merging drivers/base/dd.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 7c3ac7a60cc45] 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^.. + drivers/base/component.c | 242 ++++++++++++++++----------------- + drivers/base/dd.c | 4 +- + drivers/base/devtmpfs.c | 2 - + drivers/base/platform.c | 6 +- + drivers/md/bcache/stats.c | 3 +- + drivers/md/bcache/sysfs.c | 15 +- + drivers/md/bcache/sysfs.h | 2 +- + drivers/power/supply/ab8500_chargalg.c | 6 - + drivers/power/supply/ab8500_fg.c | 3 +- + fs/kernfs/kernfs-internal.h | 1 - + fs/ubifs/sysfs.c | 3 +- + include/linux/component.h | 18 +-- + include/linux/firmware.h | 2 +- + scripts/get_abi.pl | 1 + + scripts/spdxcheck.py | 2 +- + 15 files changed, 153 insertions(+), 157 deletions(-) +Merging usb/usb-next (a5d847b0afd31 usb: dwc3: pci: Also apply Bay Trail GPIO mappings to ulpi-device) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging drivers/usb/host/xhci.c +Auto-merging drivers/usb/dwc3/dwc3-pci.c +CONFLICT (content): Merge conflict in drivers/usb/dwc3/dwc3-pci.c +Auto-merging arch/arm64/boot/dts/xilinx/zynqmp.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/xilinx/zynqmp.dtsi +Auto-merging arch/arm64/boot/dts/qcom/sc7280.dtsi +Auto-merging arch/arm64/boot/dts/qcom/sc7280-idp.dts +Auto-merging arch/arm64/boot/dts/qcom/ipq6018.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/ipq6018.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Resolved 'arch/arm64/boot/dts/qcom/ipq6018.dtsi' using previous resolution. +Resolved 'arch/arm64/boot/dts/xilinx/zynqmp.dtsi' using previous resolution. +Resolved 'drivers/usb/dwc3/dwc3-pci.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 913df16aca7eb] 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/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/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 | 43 +- + 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-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 | 10 +- + 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 | 10 + + 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 + + 70 files changed, 3740 insertions(+), 679 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 (e49d033bddf5b 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 (26291c54e111f Linux 5.17-rc2) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/for-usb-next (78665f57c3faa 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 +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 3693 and retry the command. +Merge made by the 'recursive' strategy. +Merging tty/tty-next (a603ca60cebff serial: 8250_aspeed_vuart: add PORT_ASPEED_VUART port type) +$ 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 drivers/tty/serial/sh-sci.c +Auto-merging drivers/tty/serial/max3100.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/serial/fsl-lpuart.yaml | 10 +- + .../devicetree/bindings/serial/mtk-uart.txt | 1 + + .../devicetree/bindings/serial/renesas,sci.yaml | 2 + + .../devicetree/bindings/serial/renesas,scif.yaml | 5 +- + .../devicetree/bindings/serial/samsung_uart.yaml | 2 + + drivers/tty/amiserial.c | 6 +- + drivers/tty/mxser.c | 109 +++++++++------------ + drivers/tty/serdev/core.c | 7 +- + drivers/tty/serial/8250/8250_aspeed_vuart.c | 2 +- + drivers/tty/serial/8250/8250_bcm2835aux.c | 52 ++++++++-- + drivers/tty/serial/8250/8250_exar.c | 37 +++---- + drivers/tty/serial/8250/8250_mid.c | 24 ++--- + drivers/tty/serial/8250/8250_port.c | 8 ++ + drivers/tty/serial/Kconfig | 1 + + 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/max3100.c | 1 - + drivers/tty/serial/mcf.c | 7 +- + 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/sh-sci.c | 2 +- + drivers/tty/serial/stm32-usart.c | 3 +- + drivers/tty/tty_port.c | 18 ++-- + include/linux/serial_core.h | 2 +- + include/linux/tty_port.h | 3 + + include/uapi/linux/serial_core.h | 3 + + 29 files changed, 299 insertions(+), 197 deletions(-) +Merging char-misc/char-misc-next (4c49300d8e676 thunderbolt: Drop duplicate NULL checks around nvmem_unregister()) +$ 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 include/linux/nvmem-provider.h +Auto-merging drivers/nvmem/core.c +Auto-merging drivers/mtd/mtdcore.c +Auto-merging drivers/hwmon/Makefile +Auto-merging drivers/hwmon/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/hwmon/index.rst +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-peci | 16 + + .../bindings/nvmem/allwinner,sun4i-a10-sid.yaml | 1 + + .../bindings/nvmem/fsl,layerscape-sfp.yaml | 38 ++ + .../devicetree/bindings/peci/peci-aspeed.yaml | 72 +++ + .../devicetree/bindings/peci/peci-controller.yaml | 33 ++ + .../bindings/reserved-memory/google,open-dice.yaml | 46 ++ + 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 | 26 + + 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/hpet.c | 28 +- + drivers/comedi/drivers/das16.c | 4 +- + drivers/comedi/drivers/pcm3724.c | 1 - + drivers/dio/dio.c | 140 +++-- + 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/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/rts5228.c | 2 +- + drivers/misc/cardreader/rts5229.c | 2 +- + drivers/misc/cardreader/rts5249.c | 31 +- + drivers/misc/cardreader/rts5261.c | 2 +- + drivers/misc/cardreader/rtsx_pcr.c | 164 ++---- + drivers/misc/cardreader/rtsx_pcr.h | 1 + + drivers/misc/eeprom/at25.c | 4 +- + drivers/misc/mei/pci-me.c | 10 +- + drivers/misc/open-dice.c | 208 +++++++ + drivers/misc/vmw_vmci/vmci_guest.c | 335 +++++++++-- + drivers/mmc/host/rtsx_pci_sdmmc.c | 44 +- + drivers/mtd/mtdcore.c | 13 +- + drivers/mux/core.c | 239 +++++++- + drivers/nvmem/Kconfig | 12 + + drivers/nvmem/Makefile | 2 + + drivers/nvmem/core.c | 47 +- + drivers/nvmem/layerscape-sfp.c | 89 +++ + drivers/nvmem/meson-mx-efuse.c | 3 +- + drivers/nvmem/qfprom.c | 2 +- + 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/thunderbolt/nvm.c | 6 +- + 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 + + tools/testing/selftests/lkdtm/config | 2 +- + 89 files changed, 5609 insertions(+), 494 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-peci + create mode 100644 Documentation/devicetree/bindings/nvmem/fsl,layerscape-sfp.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/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/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/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 include/linux/peci-cpu.h + create mode 100644 include/linux/peci.h +Merging extcon/extcon-next (b26c5f03a6453 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/usb/dwc3/drd.c +Auto-merging drivers/power/supply/axp288_charger.c +Merge made by the 'recursive' strategy. + 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 (26291c54e111f 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 (4a4c3cc146b12 phy: qcom: Program SSC only if supported by sink) +$ 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. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a96bd4bb36d37] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/phy/mediatek,tphy.yaml | 1 + + .../devicetree/bindings/phy/qcom,edp-phy.yaml | 4 +- + .../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 +++++++++++++++++++++ + drivers/phy/amlogic/phy-meson-gxl-usb2.c | 5 +- + drivers/phy/amlogic/phy-meson8b-usb2.c | 9 +- + drivers/phy/cadence/phy-cadence-sierra.c | 82 +++++++++++----- + drivers/phy/freescale/Kconfig | 5 + + drivers/phy/freescale/phy-fsl-imx8m-pcie.c | 3 +- + drivers/phy/qualcomm/phy-qcom-edp.c | 9 +- + drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c | 28 +++--- + drivers/phy/qualcomm/phy-qcom-qusb2.c | 3 + + 13 files changed, 208 insertions(+), 135 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml +Merging soundwire/next (63fadaa2c7190 soundwire: stream: make enable/disable/deprepare idempotent) +$ 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 'recursive' strategy. + drivers/soundwire/bus.c | 8 +- + drivers/soundwire/intel.c | 4 +- + drivers/soundwire/intel_init.c | 7 +- + drivers/soundwire/stream.c | 952 +++++++++++++++++++++++------------------ + 4 files changed, 556 insertions(+), 415 deletions(-) +Merging thunderbolt/next (7f7b571becf37 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 'recursive' 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 (2bed2ced40c97 vfio/iommu_type1: replace kfree with kvfree) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging staging/staging-next (7c6444d8e0f1b staging: r8188eu: remove unnecessary braces in if statements) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging drivers/staging/wfx/bus_spi.c +Auto-merging drivers/staging/r8188eu/include/rtw_cmd.h +Removing drivers/staging/r8188eu/hal/odm_debug.c +Auto-merging drivers/staging/pi433/pi433_if.c +Removing drivers/staging/gs_fpgaboot/io.h +Removing drivers/staging/gs_fpgaboot/io.c +Removing drivers/staging/gs_fpgaboot/gs_fpgaboot.h +Removing drivers/staging/gs_fpgaboot/gs_fpgaboot.c +Removing drivers/staging/gs_fpgaboot/TODO +Removing drivers/staging/gs_fpgaboot/README +Removing drivers/staging/gs_fpgaboot/Makefile +Removing drivers/staging/gs_fpgaboot/Kconfig +Auto-merging drivers/staging/fbtft/fbtft.h +CONFLICT (content): Merge conflict in drivers/staging/fbtft/fbtft.h +Auto-merging MAINTAINERS +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 2bcf8f59df2c4] 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 | 3 +- + drivers/staging/pi433/pi433_if.c | 168 +++++-- + drivers/staging/pi433/rf69.c | 123 ++--- + drivers/staging/pi433/rf69.h | 2 + + 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 | 234 +++------ + 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 | 416 ++------------- + drivers/staging/r8188eu/core/rtw_p2p.c | 73 +-- + drivers/staging/r8188eu/core/rtw_pwrctrl.c | 45 +- + drivers/staging/r8188eu/core/rtw_recv.c | 84 +--- + 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 | 385 +------------- + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 150 ++---- + drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 24 +- + drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 4 +- + drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 5 - + drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 20 +- + drivers/staging/r8188eu/hal/usb_halinit.c | 412 ++------------- + 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 | 45 +- + drivers/staging/r8188eu/include/hal_com.h | 3 - + drivers/staging/r8188eu/include/hal_intf.h | 46 +- + drivers/staging/r8188eu/include/ieee80211.h | 266 ---------- + 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 | 96 +--- + 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 | 11 - + 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 | 7 +- + 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/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/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/usbpipe.c | 4 +- + drivers/staging/wfx/Kconfig | 5 + + drivers/staging/wfx/Makefile | 3 +- + drivers/staging/wfx/bh.c | 67 ++- + 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 | 98 ++-- + drivers/staging/wfx/data_rx.c | 10 +- + drivers/staging/wfx/data_rx.h | 5 +- + drivers/staging/wfx/data_tx.c | 144 +++--- + drivers/staging/wfx/data_tx.h | 20 +- + drivers/staging/wfx/debug.c | 80 +-- + drivers/staging/wfx/debug.h | 6 +- + drivers/staging/wfx/fwio.c | 113 ++--- + drivers/staging/wfx/hif_api_cmd.h | 150 +++--- + drivers/staging/wfx/hif_api_general.h | 64 +-- + drivers/staging/wfx/hif_api_mib.h | 68 +-- + drivers/staging/wfx/hif_rx.c | 168 +++---- + drivers/staging/wfx/hif_tx.c | 194 ++++--- + drivers/staging/wfx/hif_tx.h | 67 +-- + drivers/staging/wfx/hif_tx_mib.c | 202 ++++---- + drivers/staging/wfx/hif_tx_mib.h | 67 ++- + drivers/staging/wfx/hwio.c | 171 +++---- + drivers/staging/wfx/hwio.h | 35 +- + drivers/staging/wfx/key.c | 84 ++-- + drivers/staging/wfx/key.h | 5 +- + drivers/staging/wfx/main.c | 264 +++++----- + drivers/staging/wfx/main.h | 12 +- + drivers/staging/wfx/queue.c | 51 +- + drivers/staging/wfx/queue.h | 13 +- + drivers/staging/wfx/scan.c | 27 +- + drivers/staging/wfx/sta.c | 194 +++---- + drivers/staging/wfx/sta.h | 22 +- + drivers/staging/wfx/traces.h | 33 +- + drivers/staging/wfx/wfx.h | 102 ++-- + include/dt-bindings/reset/mt7621-reset.h | 37 ++ + 155 files changed, 2803 insertions(+), 6802 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 (2be8795a60980 MAINTAINERS: add maintainer for ADMV1014 driver) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Removing drivers/staging/iio/adc/ad7280a.h +Removing drivers/staging/iio/adc/ad7280a.c +Auto-merging drivers/iio/pressure/zpa2326_spi.c +Auto-merging drivers/iio/pressure/ms5611_spi.c +Auto-merging drivers/iio/magnetometer/hmc5843_spi.c +Auto-merging drivers/iio/magnetometer/bmc150_magn_spi.c +Auto-merging drivers/iio/magnetometer/bmc150_magn.c +Auto-merging drivers/iio/industrialio-buffer.c +Auto-merging drivers/iio/imu/kmx61.c +Auto-merging drivers/iio/imu/adis16480.c +Auto-merging drivers/iio/frequency/admv1013.c +Auto-merging drivers/iio/frequency/adf4350.c +Auto-merging drivers/iio/dac/ad5686-spi.c +Auto-merging drivers/iio/dac/ad5592r.c +Auto-merging drivers/iio/common/ssp_sensors/ssp_dev.c +Auto-merging drivers/iio/adc/ti-tsc2046.c +Auto-merging drivers/iio/adc/ad7124.c +Auto-merging drivers/iio/accel/mma9553.c +Auto-merging drivers/iio/accel/mma9551.c +Auto-merging drivers/iio/accel/mma7455_spi.c +Auto-merging drivers/iio/accel/kxsd9-spi.c +Auto-merging drivers/iio/accel/fxls8962af-spi.c +Auto-merging drivers/iio/accel/fxls8962af-i2c.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/bmi088-accel-spi.c +Auto-merging drivers/iio/accel/bmc150-accel-spi.c +Auto-merging drivers/iio/accel/bmc150-accel-core.c +Auto-merging drivers/iio/accel/bma400_spi.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging .mailmap +CONFLICT (content): Merge conflict in .mailmap +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 2756f72f75fb6] 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-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/frequency/adi,admv1014.yaml | 134 ++ + .../bindings/iio/proximity/semtech,sx9324.yaml | 161 ++ + .../bindings/iio/proximity/semtech,sx9360.yaml | 89 ++ + .../devicetree/bindings/iio/st,st-sensors.yaml | 3 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 106 +- + 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_core.c | 2 +- + drivers/iio/accel/adxl345_i2c.c | 1 + + drivers/iio/accel/adxl345_spi.c | 1 + + 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 | 8 +- + drivers/iio/adc/vf610_adc.c | 7 +- + drivers/iio/afe/iio-rescale.c | 13 +- + 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/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/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 | 10 + + drivers/iio/frequency/Makefile | 1 + + 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/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/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/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/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 + + 273 files changed, 8623 insertions(+), 2801 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-ad7280a + 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/frequency/adi,admv1014.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/frequency/admv1014.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 + delete mode 100644 drivers/staging/iio/adc/ad7280a.c + delete mode 100644 drivers/staging/iio/adc/ad7280a.h +Merging mux/for-next (0fcfb00b28c0b 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 (2ccd1d8a2f5d9 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 'recursive' strategy. + .../devicetree/bindings/interconnect/qcom,rpm.yaml | 33 ++++++++++++++++++++-- + drivers/interconnect/imx/imx.c | 9 ++++++ + drivers/interconnect/qcom/msm8939.c | 10 +------ + 3 files changed, 41 insertions(+), 11 deletions(-) +Merging dmaengine/next (ea7c8f598c323 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 'recursive' 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 (88ea791b56657 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 +Already up to date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (95cd16ea1a66b 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 drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/scsi_debug.c +Auto-merging drivers/scsi/qla2xxx/qla_def.h +Auto-merging drivers/scsi/mpi3mr/mpi3mr.h +Merge made by the 'recursive' strategy. + drivers/message/fusion/mptspi.c | 2 +- + drivers/scsi/aic94xx/aic94xx_task.c | 9 - + drivers/scsi/bfa/bfad_attr.c | 26 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 7 +- + drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 8 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 3 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 3 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 3 +- + drivers/scsi/isci/request.c | 15 +- + drivers/scsi/isci/request.h | 5 +- + drivers/scsi/isci/task.c | 23 +- + drivers/scsi/libsas/sas_ata.c | 4 +- + drivers/scsi/libsas/sas_discover.c | 6 +- + drivers/scsi/libsas/sas_scsi_host.c | 2 +- + drivers/scsi/lpfc/lpfc_init.c | 1 - + 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 | 159 ++++++--- + drivers/scsi/mvsas/mv_init.c | 4 +- + drivers/scsi/mvsas/mv_sas.c | 6 +- + drivers/scsi/pm8001/pm8001_ctl.c | 61 ++-- + drivers/scsi/pm8001/pm8001_hwi.c | 7 - + drivers/scsi/pm8001/pm8001_sas.c | 4 - + drivers/scsi/pm8001/pm80xx_hwi.c | 5 - + drivers/scsi/qedi/qedi_main.c | 2 - + drivers/scsi/qla2xxx/qla_attr.c | 7 +- + drivers/scsi/qla2xxx/qla_bsg.c | 6 +- + drivers/scsi/qla2xxx/qla_def.h | 18 +- + drivers/scsi/qla2xxx/qla_edif.c | 25 +- + drivers/scsi/qla2xxx/qla_gbl.h | 5 +- + drivers/scsi/qla2xxx/qla_gs.c | 155 ++++----- + drivers/scsi/qla2xxx/qla_init.c | 199 ++++++----- + drivers/scsi/qla2xxx/qla_inline.h | 2 + + drivers/scsi/qla2xxx/qla_iocb.c | 85 +++-- + 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_os.c | 41 ++- + 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/scsi_debug.c | 474 ++++++++++++++++++-------- + drivers/scsi/scsi_lib.c | 21 +- + drivers/scsi/scsi_sysfs.c | 8 - + drivers/scsi/smartpqi/smartpqi.h | 16 +- + drivers/scsi/smartpqi/smartpqi_init.c | 545 ++++++++++++++++++++++-------- + drivers/scsi/smartpqi/smartpqi_sis.c | 10 +- + drivers/scsi/smartpqi/smartpqi_sis.h | 1 + + drivers/scsi/ufs/ufs.h | 6 + + drivers/scsi/ufs/ufshcd.c | 52 +++ + drivers/usb/storage/usb.c | 2 +- + include/scsi/libsas.h | 3 +- + include/scsi/sas_ata.h | 6 +- + include/scsi/scsi_cmnd.h | 1 + + include/scsi/scsi_host.h | 3 - + 65 files changed, 1547 insertions(+), 845 deletions(-) +Merging scsi-mkp/for-next (b709a4caa9d01 scsi: pm8001: Fix pm8001_info() message format) +$ 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 include/linux/device-mapper.h +Auto-merging include/linux/blkdev.h +Auto-merging include/linux/blk_types.h +Auto-merging include/linux/bio.h +Auto-merging drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/sg.c +Auto-merging drivers/scsi/sd.c +Removing drivers/scsi/scsi.h +Auto-merging drivers/scsi/qla2xxx/qla_def.h +Auto-merging drivers/scsi/qedi/qedi_fw.c +Auto-merging drivers/md/raid5.c +Auto-merging drivers/md/raid10.c +Auto-merging drivers/md/raid1.c +Auto-merging drivers/md/md-multipath.c +Auto-merging drivers/md/dm.c +Auto-merging drivers/md/dm-rq.c +Auto-merging drivers/md/dm-io.c +Auto-merging drivers/md/dm-crypt.c +Auto-merging drivers/md/dm-core.h +Auto-merging drivers/block/rnbd/rnbd-srv.c +Auto-merging drivers/block/rnbd/rnbd-proto.h +Auto-merging drivers/block/rnbd/rnbd-clt.h +Auto-merging drivers/block/rnbd/rnbd-clt.c +CONFLICT (content): Merge conflict in drivers/block/rnbd/rnbd-clt.c +Auto-merging drivers/block/drbd/drbd_worker.c +Auto-merging drivers/block/drbd/drbd_req.c +Auto-merging drivers/block/drbd/drbd_receiver.c +Auto-merging block/bounce.c +Auto-merging block/blk.h +Auto-merging block/blk-zoned.c +Auto-merging block/blk-sysfs.c +Auto-merging block/blk-merge.c +Auto-merging block/blk-lib.c +CONFLICT (content): Merge conflict in block/blk-lib.c +Auto-merging block/blk-core.c +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 883147b778ce5] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/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/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_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_im.c | 27 +- + drivers/scsi/bfa/bfad_im.h | 16 + + drivers/scsi/bnx2fc/bnx2fc.h | 9 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 1 + + drivers/scsi/bnx2fc/bnx2fc_io.c | 23 +- + 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 | 227 ++----------- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 17 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 9 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 +- + drivers/scsi/hptiop.c | 1 + + drivers/scsi/hptiop.h | 4 +- + 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 | 7 +- + drivers/scsi/isci/task.c | 18 - + 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 | 21 +- + drivers/scsi/libsas/sas_expander.c | 24 +- + drivers/scsi/libsas/sas_internal.h | 6 + + drivers/scsi/libsas/sas_scsi_host.c | 229 ++++++++++++- + drivers/scsi/libsas/sas_task.c | 14 +- + 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/mpi3mr_os.c | 2 +- + drivers/scsi/mvme147.c | 16 +- + drivers/scsi/mvsas/mv_defs.h | 5 - + drivers/scsi/mvsas/mv_init.c | 11 +- + drivers/scsi/mvsas/mv_sas.c | 179 +--------- + 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 | 5 +- + drivers/scsi/pm8001/pm8001_hwi.c | 462 +++++++++++--------------- + drivers/scsi/pm8001/pm8001_init.c | 16 +- + drivers/scsi/pm8001/pm8001_sas.c | 491 ++++++++++------------------ + drivers/scsi/pm8001/pm8001_sas.h | 80 ++++- + drivers/scsi/pm8001/pm80xx_hwi.c | 467 ++++++++++++-------------- + 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/qla1280.c | 21 +- + drivers/scsi/qla1280.h | 3 +- + drivers/scsi/qla2xxx/qla_def.h | 37 ++- + drivers/scsi/qla2xxx/qla_gbl.h | 2 +- + drivers/scsi/qla2xxx/qla_init.c | 28 +- + drivers/scsi/qla2xxx/qla_isr.c | 10 +- + 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 | 13 +- + 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/sd.c | 75 +---- + drivers/scsi/sd_zbc.c | 2 - + drivers/scsi/sg.c | 8 +- + drivers/scsi/sgiwd93.c | 24 +- + drivers/scsi/smartpqi/smartpqi_init.c | 14 +- + drivers/scsi/sun3_scsi.c | 4 +- + drivers/scsi/sym53c8xx_2/sym_glue.c | 4 +- + drivers/scsi/ufs/ufshcd.c | 2 - + 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 ++- + 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 | 21 +- + include/scsi/sas.h | 7 + + include/scsi/sas_ata.h | 8 + + include/scsi/scsi_cmnd.h | 14 +- + kernel/trace/blktrace.c | 1 - + 196 files changed, 2616 insertions(+), 3057 deletions(-) + rename drivers/scsi/arm/{scsi.h => arm_scsi.h} (75%) + delete mode 100644 drivers/scsi/scsi.h +Merging vhost/linux-next (fae0bd40fab08 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 'recursive' 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 (dbba77c2f01b4 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 'recursive' strategy. + drivers/remoteproc/mtk_scp.c | 55 +++++++++++++-------------------- + drivers/remoteproc/remoteproc_debugfs.c | 2 +- + 2 files changed, 22 insertions(+), 35 deletions(-) +Merging gpio/for-next (7ac5548882334 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 (667630edb5bac gpiolib: sysfs: Simplify edge handling in the code) +$ 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/gpiolib.h +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/gpio/gpiolib-sysfs.c +Removing Documentation/devicetree/bindings/gpio/faraday,ftgpio010.txt +Merge made by the 'recursive' 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 | 10 ++ + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-en7523.c | 137 +++++++++++++++++++++ + 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 +++--- + 13 files changed, 400 insertions(+), 133 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 (a1ce76e89907a 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 +Auto-merging drivers/gpio/Kconfig +Merge made by the 'recursive' strategy. + drivers/gpio/Kconfig | 6 +----- + drivers/gpio/gpio-altera-a10sr.c | 3 ++- + drivers/gpio/gpio-crystalcove.c | 9 ++++++++- + drivers/gpio/gpio-merrifield.c | 3 +++ + drivers/gpio/gpio-tegra.c | 1 - + drivers/gpio/gpio-tps68470.c | 5 ++++- + 6 files changed, 18 insertions(+), 9 deletions(-) +Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0b 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 (c6f1b980aec10 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 drivers/pinctrl/pinctrl-starfive.c +CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-starfive.c +Auto-merging drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +Auto-merging MAINTAINERS +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 1a58ab074844f] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/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 - + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 16 +- + .../bindings/pinctrl/samsung,pinctrl.yaml | 1 + + .../bindings/pinctrl/sunplus,sp7021-pinctrl.yaml | 374 ++++++ + MAINTAINERS | 18 + + drivers/gpio/gpio-tegra186.c | 14 +- + 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/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-k210.c | 4 +- + drivers/pinctrl/pinctrl-ocelot.c | 102 ++ + drivers/pinctrl/pinctrl-starfive.c | 5 +- + 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 | 6 +- + drivers/pinctrl/renesas/pfc-r8a7779.c | 8 +- + drivers/pinctrl/renesas/pfc-r8a7790.c | 45 +- + drivers/pinctrl/renesas/pfc-r8a7791.c | 35 +- + drivers/pinctrl/renesas/pfc-r8a77990.c | 22 +- + drivers/pinctrl/renesas/pfc-r8a77995.c | 100 +- + drivers/pinctrl/renesas/pfc-r8a779a0.c | 42 +- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 4 +- + drivers/pinctrl/renesas/pinctrl.c | 2 +- + 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 | 18 +- + 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 + + 59 files changed, 5226 insertions(+), 342 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/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 (d25478e1d8f9b 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 +Merge made by the 'recursive' strategy. + drivers/pinctrl/intel/pinctrl-alderlake.c | 317 +++++++++++++++++++++++++++++- + drivers/pinctrl/intel/pinctrl-baytrail.c | 55 +++++- + drivers/pinctrl/intel/pinctrl-icelake.c | 291 ++++++++++++++++++++++++++- + 3 files changed, 652 insertions(+), 11 deletions(-) +Merging pinctrl-renesas/renesas-pinctrl (d47a74513f54d pinctrl: renesas: Remove unneeded #include <linux/gpio.h>) +$ 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 +Merge made by the 'recursive' strategy. + drivers/pinctrl/renesas/core.c | 213 +++++++++++++-- + 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 | 110 ++------ + drivers/pinctrl/renesas/pfc-r8a7790.c | 485 +++++++++++++-------------------- + drivers/pinctrl/renesas/pfc-r8a7791.c | 287 ++++++++----------- + 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 | 311 ++++++++------------- + drivers/pinctrl/renesas/pfc-r8a77995.c | 102 +++---- + drivers/pinctrl/renesas/pfc-r8a779a0.c | 63 ++--- + 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.c | 24 +- + drivers/pinctrl/renesas/sh_pfc.h | 167 +++++------- + 28 files changed, 1769 insertions(+), 3124 deletions(-) +Merging pinctrl-samsung/for-next (3652dc070bad3 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 (ed14d36498c8d 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/pwm/pwm-sifive.yaml +Merge made by the 'recursive' 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 (ab135102861ce ucounts: Fix systemd LimigtNPROC 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 +Merge made by the 'recursive' strategy. + kernel/user_namespace.c | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) +Merging ktest/for-next (170f4869e6627 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 (1900be289b598 selftests/lkdtm: Add UBSAN config) +$ 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/net/Makefile +Auto-merging tools/testing/selftests/kvm/Makefile +Merge made by the 'recursive' strategy. + tools/testing/selftests/Makefile | 32 +++++++++++++++------- + 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/Makefile | 2 +- + tools/testing/selftests/landlock/Makefile | 2 +- + tools/testing/selftests/net/Makefile | 2 +- + tools/testing/selftests/net/mptcp/Makefile | 2 +- + tools/testing/selftests/vm/Makefile | 2 +- + tools/testing/selftests/vm/userfaultfd.c | 3 ++ + 11 files changed, 63 insertions(+), 20 deletions(-) + rename tools/testing/selftests/exec/{binfmt_script => binfmt_script.py} (100%) +Merging livepatching/for-next (b44a7f076ce1d 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 'recursive' 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 (a4dabc3d30ea5 coresight: etm4x: Add lock for reading virtual context ID comparator) +$ 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 'recursive' strategy. + arch/arm64/Kconfig | 6 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 2 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 10 +- + 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 -- + 7 files changed, 109 insertions(+), 52 deletions(-) +Merging rtc/rtc-next (73ce05302007e 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 'recursive' 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 (2166a9974902d 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 'recursive' strategy. + drivers/dax/super.c | 1 + + fs/dax.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging at24/at24/for-next (e783362eb54cd 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 (afe1c85b354c6 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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 ++++---- + drivers/ntb/hw/idt/Makefile | 1 + + drivers/ntb/hw/intel/ntb_hw_gen4.c | 17 ++++++++++++++++- + drivers/ntb/hw/intel/ntb_hw_gen4.h | 16 ++++++++++++++++ + drivers/ntb/msi.c | 6 ++---- + 5 files changed, 39 insertions(+), 9 deletions(-) +Merging seccomp/for-next/seccomp (eed09ad261822 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 (9e98c678c2d6a 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 (f2af60bb7ce2f 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 (e783362eb54cd 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 (e15d2e3fd7ab6 dt-bindings: nvmem: Add bindings doc for Sunplus OCOTP driver) +$ 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 drivers/nvmem/qfprom.c +Auto-merging drivers/nvmem/Makefile +CONFLICT (content): Merge conflict in drivers/nvmem/Makefile +Auto-merging drivers/nvmem/Kconfig +CONFLICT (content): Merge conflict in drivers/nvmem/Kconfig +Auto-merging drivers/mtd/mtdcore.c +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/nvmem/Kconfig' using previous resolution. +Resolved 'drivers/nvmem/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 444789f37964a] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/nvmem/sunplus,sp7021-ocotp.yaml | 86 ++++++++ + MAINTAINERS | 6 + + drivers/nvmem/Kconfig | 12 ++ + drivers/nvmem/Makefile | 2 + + drivers/nvmem/qfprom.c | 2 +- + drivers/nvmem/sunplus-ocotp.c | 228 +++++++++++++++++++++ + 6 files changed, 335 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/nvmem/sunplus,sp7021-ocotp.yaml + create mode 100644 drivers/nvmem/sunplus-ocotp.c +Merging xarray/main (22f56b8e890d4 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 'recursive' strategy. + Documentation/core-api/xarray.rst | 14 +++++++++----- + include/linux/xarray.h | 1 + + 2 files changed, 10 insertions(+), 5 deletions(-) +Merging hyperv/hyperv-next (d57d6fe5bf346 drivers: hv: log when enabling crash_kexec_post_notifiers) +$ 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 'recursive' strategy. + drivers/hv/channel_mgmt.c | 19 +++++++++---------- + 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 +++++++++++ + 6 files changed, 37 insertions(+), 22 deletions(-) +Merging auxdisplay/auxdisplay (4daa9ff89ef27 auxdisplay: charlcd: checking for pointer reference before dereferencing) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (b77dbc86d6045 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 (6880fa6c56601 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 (21f0a239ecab4 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 'recursive' strategy. + drivers/fpga/dfl-pci.c | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) +Merging kunit/test (e783362eb54cd 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 (baaf965f94308 mtd: hyperbus: rpc-if: fix bug in rpcif_hb_remove) +$ 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 (c2741453478ba kunit: cleanup assertion macro internal variables) +$ 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 'recursive' 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 +- + tools/testing/kunit/kunit.py | 24 +- + 6 files changed, 359 insertions(+), 787 deletions(-) +Merging trivial/for-next (081c8919b02bc 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 (7ba21a082d3eb bus: mhi: pci_generic: Add mru_default for Quectel EM1xx series) +$ 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/pci_generic.c +Merge made by the 'recursive' strategy. + drivers/bus/mhi/pci_generic.c | 1 + + 1 file changed, 1 insertion(+) +Merging memblock/for-next (f30b002ccfee8 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 +Removing tools/testing/radix-tree/linux/gfp.h +Auto-merging mm/memblock.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' 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 (38b082236e77d 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 (e71ba9452f0b5 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 (e6e17cc6ed751 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 +Removing tools/testing/cxl/mock_pmem.c +Auto-merging lib/Kconfig.debug +Removing drivers/cxl/pci.h +Removing drivers/cxl/core/bus.c +Merge made by the 'recursive' 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 (4d7bd0eb72e58 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 (88a309465b3f0 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 (0ea9e1c3dbd4e efivars: Respect "block" flag in efivar_entry_set_safe()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Already up to date. +Merging unicode/for-next (5298d4bfe80f6 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 (d3d59937afdff 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 'recursive' strategy. + mm/slab_common.c | 2 +- + mm/slob.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging random/master (1531605c28d67 random: use proper cycles_t type for random_get_entropy()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Auto-merging kernel/cpu.c +Removing include/trace/events/random.h +Auto-merging drivers/char/random.c +Auto-merging drivers/char/hw_random/core.c +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Merge made by the 'recursive' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 16 +- + drivers/char/hw_random/core.c | 1 + + drivers/char/random.c | 2876 +++++++++++---------------- + include/linux/cpuhotplug.h | 2 + + include/linux/hw_random.h | 2 - + include/linux/random.h | 23 +- + include/trace/events/random.h | 233 --- + kernel/cpu.c | 11 + + lib/random32.c | 2 - + 9 files changed, 1217 insertions(+), 1949 deletions(-) + delete mode 100644 include/trace/events/random.h +Merging landlock/next (a691b98583000 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 tools/testing/selftests/Makefile +Auto-merging kernel/sysctl.c +Auto-merging include/linux/syscalls.h +Merge made by the 'recursive' 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 (847245fe812e1 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 tools/lib/perf/include/perf/event.h +Auto-merging scripts/kconfig/confdata.c +Auto-merging scripts/kallsyms.c +Auto-merging scripts/Makefile.lib +Auto-merging scripts/Makefile.build +Auto-merging lib/vsprintf.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/printk/printk.c +Auto-merging kernel/livepatch/core.c +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/android/binder.h +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging arch/riscv/Makefile +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/kbuild/kbuild.rst +Auto-merging Documentation/index.rst +Merge made by the 'recursive' 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 (fc12aa67daba8 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 kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +Auto-merging kernel/sched/topology.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/rcu/rcu.h +Auto-merging kernel/locking/lockdep.c +Auto-merging include/linux/sched/sysctl.h +CONFLICT (content): Merge conflict in include/linux/sched/sysctl.h +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 3b560d45915eb] 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 maple/maple/mainline (ebb0f374ab686 mm/mmap.c: Pass in mapping to __vma_link_file()) +$ git merge -m Merge branch 'maple/mainline' of https://github.com/oracle/linux-uek.git maple/maple/mainline +Auto-merging tools/testing/radix-tree/linux.c +CONFLICT (content): Merge conflict in tools/testing/radix-tree/linux.c +Auto-merging tools/testing/radix-tree/Makefile +CONFLICT (content): Merge conflict in tools/testing/radix-tree/Makefile +Auto-merging tools/include/linux/slab.h +CONFLICT (content): Merge conflict in tools/include/linux/slab.h +Removing mm/vmacache.c +Auto-merging mm/oom_kill.c +Auto-merging mm/mprotect.c +Auto-merging mm/memory.c +Auto-merging mm/init-mm.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/fair.c +Auto-merging kernel/fork.c +Auto-merging kernel/events/core.c +Auto-merging kernel/acct.c +Auto-merging init/main.c +Removing include/linux/vmacache.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/mm_types.h +Auto-merging fs/exec.c +Auto-merging drivers/tee/optee/call.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_userptr.c +Auto-merging arch/parisc/kernel/cache.c +CONFLICT (content): Merge conflict in arch/parisc/kernel/cache.c +Auto-merging MAINTAINERS +Auto-merging Documentation/core-api/index.rst +Resolved 'arch/parisc/kernel/cache.c' using previous resolution. +Resolved 'tools/include/linux/slab.h' using previous resolution. +Resolved 'tools/testing/radix-tree/Makefile' using previous resolution. +Resolved 'tools/testing/radix-tree/linux.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d640e788c938e] Merge branch 'maple/mainline' of https://github.com/oracle/linux-uek.git +$ git diff -M --stat --summary HEAD^.. + Documentation/core-api/index.rst | 1 + + Documentation/core-api/maple_tree.rst | 218 + + MAINTAINERS | 12 + + arch/arm64/kernel/vdso.c | 3 +- + arch/parisc/kernel/cache.c | 9 +- + arch/powerpc/kernel/vdso.c | 6 +- + arch/powerpc/mm/book3s32/tlb.c | 11 +- + arch/powerpc/mm/book3s64/subpage_prot.c | 13 +- + arch/riscv/kernel/vdso.c | 3 +- + arch/s390/kernel/vdso.c | 3 +- + arch/s390/mm/gmap.c | 6 +- + arch/um/kernel/tlb.c | 14 +- + arch/x86/entry/vdso/vma.c | 9 +- + arch/x86/kernel/tboot.c | 2 +- + arch/xtensa/kernel/syscall.c | 18 +- + drivers/firmware/efi/efi.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 14 +- + drivers/misc/cxl/fault.c | 45 +- + drivers/tee/optee/call.c | 18 +- + drivers/xen/privcmd.c | 2 +- + fs/binfmt_elf.c | 6 +- + fs/coredump.c | 33 +- + fs/exec.c | 12 +- + fs/proc/base.c | 5 +- + fs/proc/internal.h | 2 +- + fs/proc/task_mmu.c | 74 +- + fs/proc/task_nommu.c | 45 +- + fs/userfaultfd.c | 49 +- + include/linux/maple_tree.h | 683 + + include/linux/mm.h | 77 +- + include/linux/mm_types.h | 43 +- + include/linux/mm_types_task.h | 12 - + include/linux/sched.h | 1 - + include/linux/userfaultfd_k.h | 7 +- + include/linux/vm_event_item.h | 4 - + include/linux/vmacache.h | 28 - + include/linux/vmstat.h | 6 - + include/trace/events/maple_tree.h | 123 + + include/trace/events/mmap.h | 71 + + init/main.c | 2 + + ipc/shm.c | 21 +- + kernel/acct.c | 11 +- + kernel/bpf/task_iter.c | 10 +- + kernel/debug/debug_core.c | 12 - + kernel/events/core.c | 3 +- + kernel/events/uprobes.c | 9 +- + kernel/fork.c | 58 +- + kernel/sched/fair.c | 10 +- + lib/Kconfig.debug | 17 +- + lib/Makefile | 3 +- + lib/maple_tree.c | 6957 ++++ + lib/test_maple_tree.c | 37404 +++++++++++++++++++ + mm/Makefile | 2 +- + mm/damon/vaddr-test.h | 37 +- + mm/damon/vaddr.c | 53 +- + mm/debug.c | 14 +- + mm/gup.c | 9 +- + mm/huge_memory.c | 4 +- + mm/init-mm.c | 4 +- + mm/internal.h | 78 +- + mm/khugepaged.c | 13 +- + mm/ksm.c | 18 +- + mm/madvise.c | 2 +- + mm/memcontrol.c | 6 +- + mm/memory.c | 33 +- + mm/mempolicy.c | 58 +- + mm/mlock.c | 34 +- + mm/mmap.c | 2088 +- + mm/mprotect.c | 7 +- + mm/mremap.c | 22 +- + mm/msync.c | 2 +- + mm/nommu.c | 124 +- + mm/oom_kill.c | 3 +- + mm/pagewalk.c | 2 +- + mm/swapfile.c | 4 +- + mm/util.c | 32 - + mm/vmacache.c | 117 - + mm/vmstat.c | 4 - + tools/include/linux/slab.h | 4 + + tools/testing/radix-tree/.gitignore | 2 + + tools/testing/radix-tree/Makefile | 9 +- + tools/testing/radix-tree/generated/autoconf.h | 1 + + tools/testing/radix-tree/linux.c | 160 +- + tools/testing/radix-tree/linux/kernel.h | 1 + + tools/testing/radix-tree/linux/lockdep.h | 2 + + tools/testing/radix-tree/linux/maple_tree.h | 7 + + tools/testing/radix-tree/maple.c | 59 + + tools/testing/radix-tree/trace/events/maple_tree.h | 3 + + 88 files changed, 47382 insertions(+), 1843 deletions(-) + create mode 100644 Documentation/core-api/maple_tree.rst + create mode 100644 include/linux/maple_tree.h + delete mode 100644 include/linux/vmacache.h + create mode 100644 include/trace/events/maple_tree.h + create mode 100644 lib/maple_tree.c + create mode 100644 lib/test_maple_tree.c + delete mode 100644 mm/vmacache.c + create mode 100644 tools/testing/radix-tree/linux/maple_tree.h + create mode 100644 tools/testing/radix-tree/maple.c + create mode 100644 tools/testing/radix-tree/trace/events/maple_tree.h +Merging folio/for-next (8cbcadaf5aefc 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 mm/util.c +Auto-merging mm/oom_kill.c +CONFLICT (content): Merge conflict in mm/oom_kill.c +Auto-merging mm/mmap.c +CONFLICT (content): Merge conflict in mm/mmap.c +Auto-merging mm/mlock.c +Auto-merging mm/memory.c +Auto-merging mm/memcontrol.c +Auto-merging mm/madvise.c +Auto-merging mm/ksm.c +Auto-merging mm/khugepaged.c +Auto-merging mm/internal.h +CONFLICT (content): Merge conflict in mm/internal.h +Auto-merging mm/huge_memory.c +Auto-merging mm/gup.c +Auto-merging mm/debug.c +Auto-merging mm/Makefile +Auto-merging kernel/events/uprobes.c +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/fs.h +Auto-merging fs/nfsd/vfs.c +Auto-merging drivers/usb/gadget/function/f_mass_storage.c +Auto-merging drivers/nvme/target/io-cmd-bdev.c +Auto-merging drivers/gpu/drm/drm_cache.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_cache.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +Auto-merging arch/powerpc/include/asm/nohash/64/pgtable.h +Auto-merging arch/powerpc/include/asm/nohash/32/pgtable.h +Auto-merging arch/powerpc/include/asm/book3s/32/pgtable.h +Auto-merging arch/parisc/include/asm/pgtable.h +Auto-merging arch/arm64/mm/mmu.c +Resolved 'drivers/gpu/drm/drm_cache.c' using previous resolution. +Resolved 'mm/internal.h' using previous resolution. +Resolved 'mm/mmap.c' using previous resolution. +Resolved 'mm/oom_kill.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b6c5bdbc5539f] 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/nds32/include/asm/pgtable.h | 1 + + 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 | 113 ++-- + mm/khugepaged.c | 17 +- + 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 | 869 ++------------------------ + mm/migrate_device.c | 830 ++++++++++++++++++++++++ + mm/mlock.c | 638 ++++++++----------- + mm/mmap.c | 6 +- + 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 | 556 +++++++--------- + mm/swap.c | 173 ++--- + mm/truncate.c | 110 ++-- + 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 +- + 104 files changed, 3454 insertions(+), 3116 deletions(-) + create mode 100644 mm/migrate_device.c +$ git commit -v -a +On branch master +nothing to commit, working tree clean +$ 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/nds32/include/asm/pgtable.h | 1 + + 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 | 113 ++-- + mm/khugepaged.c | 17 +- + 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 | 869 ++------------------------ + mm/migrate_device.c | 830 ++++++++++++++++++++++++ + mm/mlock.c | 638 ++++++++----------- + mm/mmap.c | 18 +- + 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 | 556 +++++++--------- + mm/swap.c | 173 ++--- + mm/truncate.c | 110 ++-- + 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 +- + 104 files changed, 3457 insertions(+), 3125 deletions(-) + create mode 100644 mm/migrate_device.c +$ 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' +Branch 'akpm' set up to track remote branch 'akpm/master' from 'origin'. +$ git rebase --onto master remotes/origin/akpm/master-base +
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 4b738f94b3a64...f68d664f07ae9 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (f68d664f07ae9 Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git) +$ git merge --no-ff akpm/master +Already up to date. +Merging akpm-current/current (d0a3c0d1cc195 ipc/mqueue: use get_tree_nodev() in mqueue_get_tree()) +$ git merge --no-ff akpm-current/current +Auto-merging tools/testing/selftests/vm/Makefile +Auto-merging tools/testing/selftests/net/Makefile +Auto-merging tools/testing/selftests/kvm/Makefile +Auto-merging tools/testing/selftests/futex/functional/Makefile +Auto-merging tools/testing/selftests/exec/Makefile +Auto-merging tools/testing/selftests/Makefile +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 mm/vmstat.c +Auto-merging mm/vmscan.c +CONFLICT (content): Merge conflict in mm/vmscan.c +Auto-merging mm/userfaultfd.c +Auto-merging mm/rmap.c +CONFLICT (content): Merge conflict in mm/rmap.c +Auto-merging mm/readahead.c +Auto-merging mm/page_io.c +Auto-merging mm/page_alloc.c +Auto-merging mm/mprotect.c +Auto-merging mm/mmzone.c +Auto-merging mm/mmap.c +CONFLICT (content): Merge conflict in mm/mmap.c +Auto-merging mm/mlock.c +Auto-merging mm/migrate.c +Auto-merging mm/memremap.c +CONFLICT (content): Merge conflict in mm/memremap.c +Auto-merging mm/mempolicy.c +Auto-merging mm/memory_hotplug.c +Auto-merging mm/memory.c +CONFLICT (content): Merge conflict in mm/memory.c +Auto-merging mm/memory-failure.c +CONFLICT (content): Merge conflict in mm/memory-failure.c +Auto-merging mm/memcontrol.c +CONFLICT (content): Merge conflict in mm/memcontrol.c +Auto-merging mm/madvise.c +Auto-merging mm/maccess.c +Auto-merging mm/ksm.c +Auto-merging mm/internal.h +CONFLICT (content): Merge conflict in mm/internal.h +Auto-merging mm/hugetlb.c +Auto-merging mm/huge_memory.c +CONFLICT (content): Merge conflict in mm/huge_memory.c +Auto-merging mm/gup.c +Auto-merging mm/filemap.c +Auto-merging mm/debug.c +Auto-merging mm/damon/vaddr.c +Auto-merging mm/damon/vaddr-test.h +Auto-merging mm/damon/paddr.c +Auto-merging mm/Kconfig +Auto-merging lib/vsprintf.c +Auto-merging lib/test_kasan.c +Auto-merging lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merging kernel/sysctl.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/panic.c +Auto-merging kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merging init/main.c +Auto-merging include/linux/vm_event_item.h +Auto-merging include/linux/uaccess.h +Auto-merging include/linux/sched/sysctl.h +CONFLICT (content): Merge conflict in include/linux/sched/sysctl.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/rmap.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/mm_inline.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/memremap.h +Auto-merging include/linux/kasan.h +CONFLICT (content): Merge conflict in include/linux/kasan.h +Auto-merging include/linux/kallsyms.h +Auto-merging include/linux/hugetlb.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/compiler_types.h +Auto-merging fs/xfs/xfs_buf.c +Auto-merging fs/userfaultfd.c +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/proc/page.c +Auto-merging fs/proc/base.c +Auto-merging fs/nilfs2/segbuf.c +Auto-merging fs/namespace.c +Auto-merging fs/fs-writeback.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/segment.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/compress.c +Auto-merging fs/exec.c +Auto-merging fs/coredump.c +CONFLICT (content): Merge conflict in fs/coredump.c +Auto-merging fs/buffer.c +Auto-merging fs/binfmt_elf.c +Auto-merging drivers/iommu/tegra-smmu.c +Auto-merging drivers/block/drbd/drbd_req.c +Auto-merging drivers/block/drbd/drbd_int.h +Auto-merging block/bfq-iosched.c +Auto-merging arch/xtensa/include/asm/pgtable.h +Auto-merging arch/x86/kernel/cpu/mce/core.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/um/include/asm/pgtable.h +Auto-merging arch/sparc/mm/init_64.c +Auto-merging arch/sparc/include/asm/pgtable_32.h +Auto-merging arch/riscv/mm/init.c +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/Kconfig +Auto-merging arch/parisc/include/asm/pgtable.h +Auto-merging arch/openrisc/include/asm/pgtable.h +Auto-merging arch/nios2/include/asm/pgtable.h +Auto-merging arch/nds32/include/asm/pgtable.h +Auto-merging arch/mips/include/asm/pgtable.h +Auto-merging arch/microblaze/include/asm/pgtable.h +Auto-merging arch/m68k/include/asm/sun3_pgtable.h +Auto-merging arch/m68k/include/asm/motorola_pgtable.h +Auto-merging arch/m68k/include/asm/mcf_pgtable.h +Auto-merging arch/ia64/include/asm/pgtable.h +Auto-merging arch/hexagon/include/asm/pgtable.h +Auto-merging arch/csky/include/asm/pgtable.h +Auto-merging arch/arm64/net/bpf_jit_comp.c +Auto-merging arch/arm64/mm/hugetlbpage.c +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/lib/uaccess_with_memcpy.c +Auto-merging arch/arm/Kconfig +Auto-merging arch/alpha/mm/init.c +Auto-merging arch/alpha/include/asm/pgtable.h +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +CONFLICT (content): Merge conflict in Documentation/admin-guide/sysctl/kernel.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging .mailmap +Resolved 'Documentation/admin-guide/sysctl/kernel.rst' using previous resolution. +Recorded preimage for 'fs/coredump.c' +Recorded preimage for 'include/linux/kasan.h' +Resolved 'include/linux/sched/sysctl.h' using previous resolution. +Recorded preimage for 'kernel/fork.c' +Resolved 'lib/Kconfig.debug' 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. +Recorded preimage for 'mm/mmap.c' +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 commit -v -a +Recorded resolution for 'fs/coredump.c'. +Recorded preimage for 'include/linux/kasan.h' +Recorded preimage for 'kernel/fork.c' +Recorded resolution for 'mm/mmap.c'. +[master 88c9b9446c8e2] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 3 + + 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 | 3 +- + Documentation/admin-guide/mm/damon/usage.rst | 30 +- + Documentation/admin-guide/mm/zswap.rst | 22 +- + Documentation/admin-guide/sysctl/kernel.rst | 27 +- + Documentation/core-api/mm-api.rst | 19 +- + Documentation/dev-tools/kasan.rst | 17 +- + 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 | 35 +- + Documentation/vm/vmemmap_dedup.rst | 225 ++++++++++ + MAINTAINERS | 5 +- + arch/alpha/include/asm/pgtable.h | 17 - + arch/alpha/mm/init.c | 37 ++ + arch/arc/include/asm/pgtable-bits-arcv2.h | 17 - + arch/arc/mm/mmap.c | 41 ++ + arch/arm/Kconfig | 4 +- + arch/arm/include/asm/pgtable.h | 18 - + arch/arm/lib/uaccess_with_memcpy.c | 2 +- + arch/arm/mm/mmu.c | 44 +- + arch/arm64/Kconfig | 5 +- + arch/arm64/include/asm/mman.h | 24 - + arch/arm64/include/asm/pgtable-prot.h | 18 - + arch/arm64/include/asm/pgtable.h | 11 - + arch/arm64/include/asm/vmalloc.h | 6 + + arch/arm64/include/asm/vmap_stack.h | 5 +- + arch/arm64/kernel/module.c | 5 +- + arch/arm64/kernel/setup.c | 3 - + arch/arm64/mm/hugetlbpage.c | 1 + + arch/arm64/mm/init.c | 9 +- + arch/arm64/mm/mmap.c | 78 ++++ + arch/arm64/mm/pageattr.c | 2 +- + arch/arm64/net/bpf_jit_comp.c | 3 +- + arch/csky/include/asm/pgtable.h | 18 - + arch/csky/mm/init.c | 32 ++ + arch/hexagon/include/asm/pgtable.h | 24 - + arch/hexagon/mm/init.c | 69 ++- + arch/ia64/include/asm/pgtable.h | 17 - + arch/ia64/kernel/topology.c | 10 - + arch/ia64/mm/discontig.c | 11 +- + arch/ia64/mm/init.c | 41 +- + arch/m68k/include/asm/mcf_pgtable.h | 59 --- + arch/m68k/include/asm/motorola_pgtable.h | 22 - + arch/m68k/include/asm/sun3_pgtable.h | 22 - + arch/m68k/mm/init.c | 104 +++++ + arch/m68k/mm/motorola.c | 48 +- + arch/microblaze/include/asm/pgtable.h | 17 - + arch/microblaze/mm/init.c | 41 ++ + arch/mips/include/asm/pgtable.h | 22 - + arch/mips/kernel/topology.c | 5 - + arch/mips/mm/cache.c | 60 +-- + arch/nds32/include/asm/pgtable.h | 17 - + arch/nds32/mm/init.c | 1 - + arch/nds32/mm/mmap.c | 37 ++ + arch/nios2/include/asm/pgtable.h | 16 - + arch/nios2/mm/init.c | 45 ++ + arch/openrisc/include/asm/pgtable.h | 18 - + arch/openrisc/mm/init.c | 43 +- + arch/parisc/include/asm/pgtable.h | 20 - + arch/parisc/mm/init.c | 40 ++ + arch/powerpc/include/asm/fadump-internal.h | 5 - + arch/powerpc/include/asm/mman.h | 12 - + arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h | 4 +- + arch/powerpc/include/asm/pgtable.h | 19 - + arch/powerpc/kernel/fadump.c | 8 +- + arch/powerpc/kernel/sysfs.c | 17 - + arch/powerpc/mm/book3s64/trace.c | 1 - + arch/powerpc/mm/mmap.c | 59 +++ + arch/riscv/Kconfig | 4 +- + arch/riscv/include/asm/pgtable.h | 16 - + arch/riscv/kernel/setup.c | 3 - + arch/riscv/mm/init.c | 48 +- + arch/s390/include/asm/pgtable.h | 17 - + arch/s390/kernel/module.c | 2 +- + arch/s390/kernel/numa.c | 7 - + arch/s390/mm/mmap.c | 33 ++ + arch/sh/include/asm/pgtable.h | 17 - + arch/sh/kernel/topology.c | 5 - + arch/sh/mm/mmap.c | 38 ++ + arch/sparc/include/asm/mman.h | 6 - + arch/sparc/include/asm/pgtable_32.h | 19 - + arch/sparc/include/asm/pgtable_64.h | 19 - + arch/sparc/kernel/sysfs.c | 12 - + arch/sparc/mm/hugetlbpage.c | 1 + + arch/sparc/mm/init_32.c | 35 ++ + arch/sparc/mm/init_64.c | 70 ++- + arch/um/include/asm/pgtable.h | 17 - + arch/um/kernel/mem.c | 35 ++ + arch/x86/Kconfig | 8 +- + arch/x86/include/asm/pgtable.h | 5 - + arch/x86/include/asm/pgtable_types.h | 19 - + arch/x86/include/uapi/asm/mman.h | 14 - + arch/x86/kernel/cpu/mce/core.c | 8 +- + arch/x86/kernel/module.c | 2 +- + arch/x86/kernel/setup.c | 10 +- + arch/x86/kernel/topology.c | 5 - + arch/x86/mm/Makefile | 2 +- + arch/x86/mm/init.c | 1 - + arch/x86/mm/mem_encrypt_amd.c | 6 - + arch/x86/mm/numa.c | 33 +- + arch/x86/mm/pgprot.c | 71 +++ + arch/x86/um/mem_32.c | 2 +- + arch/xtensa/include/asm/pgtable.h | 18 - + arch/xtensa/mm/init.c | 35 ++ + 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/iommu/tegra-smmu.c | 4 +- + drivers/of/of_reserved_mem.c | 9 +- + drivers/virtio/virtio_mem.c | 9 +- + fs/binfmt_elf.c | 65 +-- + fs/binfmt_elf_fdpic.c | 2 +- + fs/binfmt_flat.c | 2 + + fs/buffer.c | 56 ++- + fs/ceph/addr.c | 22 +- + fs/ceph/super.c | 1 + + fs/ceph/super.h | 1 + + fs/coredump.c | 37 +- + fs/exec.c | 26 +- + fs/ext2/ialloc.c | 5 - + fs/f2fs/compress.c | 4 +- + fs/f2fs/data.c | 3 +- + fs/f2fs/f2fs.h | 6 + + fs/f2fs/segment.c | 8 +- + fs/f2fs/super.c | 6 +- + fs/fat/dir.c | 2 +- + fs/fs-writeback.c | 37 -- + fs/fuse/control.c | 17 - + fs/fuse/dev.c | 8 - + fs/fuse/file.c | 17 + + fs/minix/inode.c | 3 +- + fs/namei.c | 8 +- + fs/namespace.c | 2 + + fs/nfs/write.c | 14 +- + fs/nilfs2/segbuf.c | 16 - + fs/ntfs/inode.c | 4 + + fs/ocfs2/alloc.c | 2 +- + fs/ocfs2/aops.c | 2 +- + fs/ocfs2/cluster/nodemanager.c | 2 +- + fs/ocfs2/dir.c | 4 +- + 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/xattr.c | 12 +- + fs/ocfs2/xattr.h | 1 + + fs/pipe.c | 13 +- + fs/proc/base.c | 8 +- + fs/proc/fd.c | 23 +- + fs/proc/page.c | 40 +- + fs/proc/task_mmu.c | 6 +- + fs/proc/vmcore.c | 43 +- + fs/userfaultfd.c | 11 +- + fs/xfs/xfs_buf.c | 3 - + include/linux/backing-dev-defs.h | 8 - + include/linux/backing-dev.h | 50 --- + include/linux/balloon_compaction.h | 22 - + include/linux/binfmts.h | 2 + + include/linux/bitfield.h | 3 + + include/linux/cma.h | 10 + + include/linux/compiler_types.h | 2 - + include/linux/damon.h | 81 ++-- + include/linux/fs.h | 10 +- + include/linux/gfp.h | 57 ++- + include/linux/highmem-internal.h | 10 + + include/linux/hugetlb.h | 8 +- + include/linux/init.h | 11 +- + include/linux/kallsyms.h | 27 ++ + include/linux/kasan.h | 110 ++++- + include/linux/kexec.h | 12 +- + include/linux/log2.h | 4 +- + include/linux/memcontrol.h | 5 +- + 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 | 28 +- + include/linux/mm_inline.h | 97 ++-- + include/linux/mm_types.h | 5 +- + include/linux/mman.h | 4 - + 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/shmem_fs.h | 1 + + include/linux/stddef.h | 6 +- + include/linux/thread_info.h | 5 +- + include/linux/uaccess.h | 2 - + include/linux/vm_event_item.h | 3 + + include/linux/vmalloc.h | 18 +- + include/trace/events/migrate.h | 31 ++ + include/trace/events/mmflags.h | 15 +- + include/trace/events/thp.h | 27 ++ + include/trace/events/writeback.h | 28 -- + include/uapi/linux/userfaultfd.h | 8 +- + init/main.c | 39 +- + ipc/mqueue.c | 14 + + kernel/dma/contiguous.c | 4 +- + kernel/fork.c | 14 +- + kernel/hung_task.c | 44 ++ + kernel/kcov.c | 98 ++-- + kernel/ksysfs.c | 3 +- + kernel/panic.c | 24 +- + kernel/resource.c | 41 +- + kernel/sched/core.c | 21 +- + kernel/scs.c | 4 +- + kernel/sys.c | 19 +- + kernel/sysctl.c | 2 +- + lib/Kconfig.debug | 100 ++++- + lib/Kconfig.kasan | 20 +- + lib/Kconfig.kcsan | 11 - + lib/Kconfig.ubsan | 12 - + lib/lz4/lz4_decompress.c | 8 +- + lib/test_kasan.c | 244 ++++++++-- + lib/test_printf.c | 8 +- + lib/ubsan.c | 10 +- + lib/vsprintf.c | 13 +- + mm/Kconfig | 6 + + mm/backing-dev.c | 57 --- + mm/balloon_compaction.c | 6 +- + mm/cma.c | 31 +- + mm/cma.h | 1 + + mm/damon/Kconfig | 12 +- + mm/damon/Makefile | 6 +- + mm/damon/core-test.h | 21 +- + mm/damon/core.c | 167 ++++--- + mm/damon/dbgfs-test.h | 85 ++-- + mm/damon/dbgfs.c | 220 +++++---- + 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 | 7 +- + mm/damon/vaddr-test.h | 8 +- + mm/damon/vaddr.c | 43 +- + mm/debug.c | 1 - + mm/debug_vm_pgtable.c | 31 +- + mm/fadvise.c | 5 +- + mm/filemap.c | 11 +- + mm/gup.c | 101 +---- + mm/highmem.c | 9 +- + mm/hmm.c | 3 +- + mm/huge_memory.c | 38 +- + mm/hugetlb.c | 27 +- + mm/hugetlb_vmemmap.c | 190 +------- + mm/hwpoison-inject.c | 7 +- + mm/internal.h | 15 +- + mm/kasan/Makefile | 2 +- + mm/kasan/common.c | 4 +- + mm/kasan/hw_tags.c | 211 +++++++-- + mm/kasan/kasan.h | 32 +- + mm/kasan/report.c | 42 +- + mm/kasan/shadow.c | 63 ++- + mm/kfence/Makefile | 2 +- + mm/ksm.c | 6 +- + mm/maccess.c | 6 + + mm/madvise.c | 94 ++-- + mm/memcontrol.c | 334 +++++++------- + mm/memfd.c | 16 +- + mm/memory-failure.c | 114 ++--- + mm/memory.c | 92 ++-- + mm/memory_hotplug.c | 135 ++---- + mm/mempolicy.c | 35 +- + mm/memremap.c | 24 +- + mm/migrate.c | 50 ++- + mm/mlock.c | 2 +- + mm/mmap.c | 56 +-- + mm/mmzone.c | 7 +- + mm/mprotect.c | 15 +- + mm/page_alloc.c | 542 +++++++++++++---------- + mm/page_io.c | 7 +- + mm/page_owner.c | 72 ++- + mm/percpu-vm.c | 8 +- + mm/ptdump.c | 16 +- + mm/readahead.c | 122 ++++- + mm/rmap.c | 45 +- + mm/shmem.c | 15 +- + mm/sparse-vmemmap.c | 246 ++++++++-- + mm/sparse.c | 28 +- + mm/usercopy.c | 16 +- + mm/userfaultfd.c | 18 +- + mm/vmalloc.c | 203 ++++++--- + mm/vmscan.c | 27 +- + mm/vmstat.c | 6 + + mm/zswap.c | 15 +- + scripts/checkpatch.pl | 27 +- + scripts/spelling.txt | 16 + + tools/perf/builtin-kmem.c | 1 - + tools/testing/radix-tree/linux/gfp.h | 32 ++ + 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/exec/Makefile | 1 + + tools/testing/selftests/exec/null-argv.c | 78 ++++ + tools/testing/selftests/kselftest.h | 10 + + tools/testing/selftests/memfd/memfd_test.c | 1 + + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 1 + + tools/testing/selftests/vm/hugepage-mremap.c | 26 +- + tools/testing/selftests/vm/hugepage-vmemmap.c | 144 ++++++ + tools/testing/selftests/vm/map_fixed_noreplace.c | 49 +- + tools/testing/selftests/vm/memfd_secret.c | 2 +- + tools/testing/selftests/vm/run_vmtests.sh | 14 +- + tools/vm/page_owner_sort.c | 216 +++++++-- + 321 files changed, 6136 insertions(+), 3559 deletions(-) + create mode 100644 Documentation/vm/vmemmap_dedup.rst + create mode 100644 arch/x86/mm/pgprot.c + rename mm/damon/{prmtv-common.c => ops-common.c} (99%) + rename mm/damon/{prmtv-common.h => ops-common.h} (100%) + create mode 100644 tools/testing/radix-tree/linux/gfp.h + create mode 100644 tools/testing/selftests/exec/null-argv.c + create mode 100644 tools/testing/selftests/vm/hugepage-vmemmap.c +$ 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' +Branch 'akpm' set up to track remote branch 'akpm/master' from 'origin'. +$ git rebase --onto master remotes/origin/akpm/master-base +Rebasing (1/12)
Rebasing (2/12)
Rebasing (3/12)
Rebasing (4/12)
Rebasing (5/12)
Rebasing (6/12)
Rebasing (7/12)
Rebasing (8/12)
Rebasing (9/12)
Rebasing (10/12)
Rebasing (11/12)
Rebasing (12/12)
warning: notes ref refs/notes/commits is invalid +
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 304a6bb90634f...0cae6ea3eb63e akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (0cae6ea3eb63e mm/huge_memory: remove stale page_trans_huge_mapcount()) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + include/linux/mm.h | 5 - + include/linux/swap.h | 4 - + include/trace/events/huge_memory.h | 1 - + mm/huge_memory.c | 61 +--- + mm/khugepaged.c | 11 - + mm/madvise.c | 33 ++- + mm/memory.c | 121 +++++--- + mm/rmap.c | 6 +- + mm/swapfile.c | 104 ------- + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 1 + + tools/testing/selftests/vm/hugetlb-madvise.c | 410 +++++++++++++++++++++++++++ + tools/testing/selftests/vm/run_vmtests.sh | 15 +- + tools/testing/selftests/vm/userfaultfd.c | 69 ++--- + 14 files changed, 590 insertions(+), 252 deletions(-) + create mode 100644 tools/testing/selftests/vm/hugetlb-madvise.c diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..22f0b8b38bfa --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20220224 |